diff --git a/docmanager_backend/document_requests/serializers.py b/docmanager_backend/document_requests/serializers.py index 62f4748..396629a 100644 --- a/docmanager_backend/document_requests/serializers.py +++ b/docmanager_backend/document_requests/serializers.py @@ -24,8 +24,7 @@ class DocumentRequestCreationSerializer(serializers.ModelSerializer): documents = DocumentRequestUnitCreationSerializer(many=True, required=True) college = serializers.CharField(max_length=64) purpose = serializers.CharField(max_length=512) - type = serializers.ChoiceField( - choices=DocumentRequest.TYPE_CHOICES, required=True) + type = serializers.ChoiceField(choices=DocumentRequest.TYPE_CHOICES, required=True) class Meta: model = DocumentRequest @@ -59,8 +58,8 @@ class DocumentRequestUnitSerializer(serializers.ModelSerializer): class Meta: model = DocumentRequestUnit - fields = ["id", "document", "copies"] - read_only_fields = ["id", "document", "copies"] + fields = ["document", "copies"] + read_only_fields = ["document", "copies"] class DocumentRequestUnitWithFileSerializer(serializers.ModelSerializer): @@ -68,15 +67,12 @@ class DocumentRequestUnitWithFileSerializer(serializers.ModelSerializer): class Meta: model = DocumentRequestUnit - fields = ["id", "document", "copies"] - read_only_fields = ["id", "document", "copies"] + fields = ["document", "copies"] + read_only_fields = ["document", "copies"] class DocumentRequestSerializer(serializers.ModelSerializer): documents = serializers.SerializerMethodField() - requester = serializers.SlugRelatedField( - many=False, slug_field="email", queryset=CustomUser.objects.all(), required=False - ) purpose = serializers.CharField(max_length=512) date_requested = serializers.DateTimeField( format="%m-%d-%Y %I:%M %p", read_only=True @@ -113,40 +109,6 @@ class DocumentRequestSerializer(serializers.ModelSerializer): return serializer_class(obj.documents, many=True).data -class FullDocumentRequestSerializer(serializers.ModelSerializer): - documents = DocumentRequestUnitWithFileSerializer() - requester = serializers.SlugRelatedField( - many=False, slug_field="email", queryset=CustomUser.objects.all(), required=False - ) - purpose = serializers.CharField(max_length=512) - date_requested = serializers.DateTimeField( - format="%m-%d-%Y %I:%M %p", read_only=True - ) - - class Meta: - model = DocumentRequest - fields = [ - "id", - "requester", - "college", - "type", - "purpose", - "date_requested", - "documents", - "status", - ] - read_only_fields = [ - "id", - "requester", - "college", - "type", - "purpose", - "date_requested", - "documents", - "status", - ] - - class DocumentRequestUpdateSerializer(serializers.ModelSerializer): status = serializers.ChoiceField( choices=DocumentRequest.STATUS_CHOICES, required=True diff --git a/docmanager_backend/document_requests/urls.py b/docmanager_backend/document_requests/urls.py index 75c922d..15d71f3 100644 --- a/docmanager_backend/document_requests/urls.py +++ b/docmanager_backend/document_requests/urls.py @@ -3,12 +3,10 @@ from .views import ( DocumentRequestCreateView, DocumentRequestListView, DocumentRequestUpdateView, - DocumentRequestFullListView ) urlpatterns = [ path("create/", DocumentRequestCreateView.as_view()), path("list/", DocumentRequestListView.as_view()), - path("list/head/", DocumentRequestFullListView.as_view()), path("update//", DocumentRequestUpdateView.as_view()), ] diff --git a/docmanager_backend/document_requests/views.py b/docmanager_backend/document_requests/views.py index 4272030..9c496ca 100644 --- a/docmanager_backend/document_requests/views.py +++ b/docmanager_backend/document_requests/views.py @@ -42,19 +42,6 @@ class DocumentRequestListView(generics.ListAPIView): return queryset -class DocumentRequestFullListView(generics.ListAPIView): - """ - Returns document requests. Always returns the link to download the document. - Head is able to view all document requests here. Staff and clients have no access - """ - - http_method_names = ["get"] - serializer_class = DocumentRequestSerializer - pagination_class = PageNumberPagination - permission_classes = [IsAuthenticated, IsHead] - queryset = DocumentRequest.objects.all() - - class DocumentRequestUpdateView(generics.UpdateAPIView): """ Used by head approve or deny document requests.