Delete getPhotosFromAlbumPageAndImageNumber and corresponding URL #76

This is only used when uploading analog scans, will have to find a fix to the now arising analog physical archival problem in the future.

src/django_backend/fg/api/views.py

@@ -225,31 +225,6 @@ def get_queryset(self):
         return models.Photo.objects.filter(id__in=ids)
 
 
-class PhotoListFromAlbumPageAndImageNumber(ViewSet):
-    permission_classes = [IsFG]
-
-    def get_queryset(self):
-        user = self.request.user
-        if (user.groups.exists() and user.is_active and 'FG' in user.groups.all()) or user.is_superuser:
-            album = self.request.query_params.get('album')
-            page = self.request.query_params.get('page')
-            image_numbers = self.request.query_params.get(
-                'image_numbers', []).split(',')
-            photos = models.Photo.objects.filter(
-                album=album, page=page, image_number__in=image_numbers)
-            pids = []
-            for photo in photos:
-                pids.append(photo.id)
-            return pids
-
-        return []
-
-    def list(self, request):
-        ids = IDInfo(self.get_queryset())
-        serializer = serializers.PhotoByIDSerializer(ids)
-        return Response(serializer.data)
-
-
 class OrderViewSet(ModelViewSet):
     """
     API endpoint that allows for viewing and editing orders

src/django_backend/fg/urls.py

@@ -3,6 +3,7 @@
 from rest_framework import routers
 from .api import views as api_views
 from .fg_auth import views as auth_views
+
 # from rest_framework_jwt.views import obtain_jwt_token, refresh_jwt_token
 
 router = routers.DefaultRouter()
@@ -33,9 +34,9 @@
     url(r'^api/auth/', include('rest_framework.urls', namespace='rest_framework')),
     # APIVIEW endpoints
     url(r'^api/photos/latest-splash', api_views.LatestSplashPhotoView.as_view(), name="latest-splash"),
-    url(r'^api/photos/list-from-info', api_views.PhotoListFromAlbumPageAndImageNumber.as_view({'get':'list'}), name='list-from-info'),
     url(r'^api/photos/list-from-ids', api_views.PhotoListFromIds.as_view(), name="list-from-ids"),
-    url(r'^api/photos/metadata/(?P<photo_id>\d+)', api_views.PhotoMetadataViewSet.as_view({'get': 'list'}), name="metadata"),
+    url(r'^api/photos/metadata/(?P<photo_id>\d+)', api_views.PhotoMetadataViewSet.as_view({'get': 'list'}),
+        name="metadata"),
     url(r'^api/users/fg', auth_views.FgUsersView.as_view(), name="fg-users"),
     url(r'^api/users/power', auth_views.PowerUsersView.as_view(), name="fg-users")
 ]