move InstitutionRelated into institutions folder

CenterForOpenScience · Jul 5, 2024 · 07bf405 · 07bf405
1 parent ce081ce
commit 07bf405
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 15 deletions.
diff --git a/api/base/permissions.py b/api/base/permissions.py
@@ -172,4 +172,3 @@ def has_object_permission(self, request, view, obj):
  return resource.is_public or resource.can_view(auth)
  else:
  return resource.has_permission(auth.user, osf_permissions.WRITE)
-
diff --git a/api/institutions/serializers.py b/api/institutions/serializers.py
@@ -292,3 +292,9 @@ def get_absolute_url(self, obj):
  'version': 'v2',
  },
  )
+
+
+class InstitutionRelated(JSONAPIRelationshipSerializer):
+ id = ser.CharField(source='_id', required=False, allow_null=True)
+ class Meta:
+ type_ = 'institutions'
diff --git a/api/nodes/serializers.py b/api/nodes/serializers.py
@@ -7,7 +7,6 @@
 )
 from api.base.serializers import (
  VersionedDateTimeField, HideIfRegistration, IDField,
- JSONAPIRelationshipSerializer,
  JSONAPISerializer, LinksField,
  NodeFileHyperLinkField, RelationshipField,
  ShowIfVersion, TargetTypeField, TypeField,
@@ -1467,13 +1466,10 @@ def get_storage_addons_url(self, obj):
  },
  )
 
-class InstitutionRelated(JSONAPIRelationshipSerializer):
- id = ser.CharField(source='_id', required=False, allow_null=True)
- class Meta:
- type_ = 'institutions'
-
 
 class NodeInstitutionsRelationshipSerializer(BaseAPISerializer):
+ from api.institutions.serializers import InstitutionRelated # Avoid circular import
+
  data = ser.ListField(child=InstitutionRelated())
  links = LinksField({
  'self': 'get_self_url',

diff --git a/api/preprints/serializers.py b/api/preprints/serializers.py
@@ -21,7 +21,6 @@
  WaterbutlerLink,
  HideIfPreprint,
  LinkedNodesRelationshipSerializer,
- JSONAPIRelationshipSerializer,
 )
 from api.base.utils import absolute_reverse, get_user_auth
 from api.base.parsers import NO_DATA_ERROR
@@ -534,14 +533,8 @@ def update(self, instance, validated_data):
  })
 
 
-class InstitutionRelated(JSONAPIRelationshipSerializer):
- id = ser.CharField(source='_id', required=False, allow_null=True)
-
- class Meta:
- type_ = 'institutions'
-
-
 class PreprintsInstitutionsRelationshipSerializer(BaseAPISerializer):
+ from api.institutions.serializers import InstitutionRelated # Avoid circular import
  data = ser.ListField(child=InstitutionRelated())
 
  links = LinksField({