Merge branch 'preprint-institutions-list-api' of https://github.com/j…

…ohnetordoff/osf.io into institutional-affilation-clean-up

* 'preprint-institutions-list-api' of https://github.com/johnetordoff/osf.io:
  add preprint institution affiliation endpoint

# Conflicts:
#	api/preprints/permissions.py
#	api/preprints/serializers.py
#	api/preprints/urls.py
#	api/preprints/views.py
#	api_tests/preprints/views/test_preprint_institutions.py

api/preprints/permissions.py

@@ -157,7 +157,6 @@ def has_object_permission(self, request, view, obj):
 
 class PreprintInstitutionPermission(permissions.BasePermission):
  def has_object_permission(self, request, view, obj):
- print(obj, obj.is_public)
  if obj.is_public:
  return True
 

api/preprints/serializers.py

@@ -7,6 +7,7 @@
 
 from api.base.exceptions import Conflict, JSONAPIException
 from api.base.serializers import (
+ BaseAPISerializer,
  JSONAPISerializer,
  IDField,
  TypeField,
@@ -542,7 +543,7 @@ def update(self, instance, validated_data):
  })
 
 
-class PreprintsInstitutionsSerializer(BaseAPISerializer):
+class PreprintsInstitutionRelationshipSerializer(BaseAPISerializer):
  id = IDField(read_only=True, source='_id')
  name = ser.CharField(read_only=True)
  type = ser.SerializerMethodField(read_only=True)
@@ -563,6 +564,7 @@ def get_related_url(self, obj):
 
  class Meta:
  type_ = 'institutions'
+<<<<<<< HEAD
 
  def update(self, preprint, validated_data):
  user = self.context['request'].user
@@ -589,3 +591,5 @@ def create(self, validated_data):
  raise exceptions.ValidationError(list(e)[0])
  preprint.save()
  return preprint
+=======
+>>>>>>> 0678dc2c58c4aa7277d885568e3253ce4b5e8c8d

api/preprints/urls.py

@@ -20,6 +20,5 @@
  re_path(r'^(?P<preprint_id>\w+)/requests/$', views.PreprintRequestListCreate.as_view(), name=views.PreprintRequestListCreate.view_name),
  re_path(r'^(?P<preprint_id>\w+)/subjects/$', views.PreprintSubjectsList.as_view(), name=views.PreprintSubjectsList.view_name),
  re_path(r'^(?P<preprint_id>\w+)/institutions/$', views.PreprintInstitutionsList.as_view(), name=views.PreprintInstitutionsList.view_name),
- re_path(r'^(?P<preprint_id>\w+)/relationships/institutions/$', views.PreprintInstitutionsList.as_view(), name=views.PreprintInstitutionsList.view_name),
-
+ re_path(r'^(?P<preprint_id>\w+)/relationships/institutions/$', views.PreprintInstitutionsRelationshipList.as_view(), name=views.PreprintInstitutionsRelationshipList.view_name),
 ]

api/preprints/views.py

@@ -68,6 +68,10 @@
 from api.base.metrics import PreprintMetricsViewMixin
 from osf.metrics import PreprintDownload, PreprintView
 from api.institutions.serializers import InstitutionSerializer
+from api.base.parsers import JSONAPIRelationshipParser
+from api.base.parsers import JSONAPIRelationshipParserForRegularJSON
+from api.preprints.serializers import PreprintsInstitutionRelationshipSerializer
+from api.nodes.permissions import WriteOrPublicForRelationshipInstitutions
 
 
 class PreprintMixin(NodeMixin):
@@ -633,19 +637,44 @@ class PreprintInstitutionsList(JSONAPIBaseView, generics.ListAPIView, ListFilter
  PreprintInstitutionPermission,
  )
 
- required_read_scopes = [CoreScopes.NODE_BASE_READ, CoreScopes.INSTITUTION_READ]
+ required_read_scopes = [CoreScopes.PREPRINTS_READ, CoreScopes.INSTITUTION_READ]
  required_write_scopes = [CoreScopes.NULL]
  serializer_class = InstitutionSerializer
 
  model = Institution
- view_category = 'nodes'
- view_name = 'node-institutions'
-
- ordering = ('-id',)
+ view_category = 'preprints'
+ view_name = 'preprints-institutions'
 
  def get_resource(self):
  return self.get_preprint()
 
  def get_queryset(self):
- resource = self.get_resource()
- return resource.affiliated_institutions.all() or []
+ return self.get_resource().affiliated_institutions.all()
+
+
+class PrprintInstitutionsRelationship(JSONAPIBaseView, generics.RetrieveUpdateDestroyAPIView, generics.CreateAPIView, PreprintMixin):
+ """ """
+ permission_classes = (
+ drf_permissions.IsAuthenticatedOrReadOnly,
+ base_permissions.TokenHasScope,
+ WriteOrPublicForRelationshipInstitutions,
+ )
+ required_read_scopes = [CoreScopes.NODE_BASE_READ]
+ required_write_scopes = [CoreScopes.NODE_BASE_WRITE]
+ serializer_class = PreprintsInstitutionRelationshipSerializer
+ parser_classes = (JSONAPIRelationshipParser, JSONAPIRelationshipParserForRegularJSON, )
+
+ view_category = 'preprints'
+ view_name = 'preprint-relationships-institutions'
+
+ def get_resource(self):
+ return self.get_preprint(check_object_permissions=False)
+
+ def get_object(self):
+ preprint = self.get_resource()
+ obj = {
+ 'data': preprint.affiliated_institutions.all(),
+ 'self': preprint,
+ }
+ self.check_object_permissions(self.request, obj)
+ return obj

api_tests/preprints/views/test_preprint_institutions.py

@@ -112,6 +112,13 @@ def user(self):
  return AuthUserFactory()
 
  @pytest.fixture()
+<<<<<<< HEAD
+=======
+ def institution(self):
+ return InstitutionFactory()
+
+ @pytest.fixture()
+>>>>>>> 0678dc2c58c4aa7277d885568e3253ce4b5e8c8d
  def public_preprint(self):
  return PreprintFactory()