Finish files upload

Author: marcoacierno

backend/api/files_upload/permissions.py

@@ -37,9 +37,11 @@ def _check_proposal_material(self, user, input: "UploadFileInput") -> bool:
         conference_code = input.data.conference_code
 
         try:
-            proposal = Submission.objects.for_conference_code(
-                conference_code
-            ).get_by_hashid(proposal_id)
+            proposal = (
+                Submission.objects.for_conference_code(conference_code)
+                .filter(status=Submission.STATUS.accepted)
+                .get_by_hashid(proposal_id)
+            )
         except (Submission.DoesNotExist, IndexError):
             return False
 

backend/api/files_upload/tests/mutations/test_upload_file.py

@@ -1,6 +1,6 @@
 import pytest
 from files_upload.models import File
-from submissions.tests.factories import SubmissionFactory
+from submissions.tests.factories import AcceptedSubmissionFactory, SubmissionFactory
 from conferences.tests.factories import ConferenceFactory
 from django.test import override_settings
 
@@ -64,7 +64,7 @@ def test_upload_participant_avatar_to_invalid_conf_fails(graphql_client, user):
 
 
 def test_upload_proposal_material_file(graphql_client, user):
-    proposal = SubmissionFactory(speaker=user)
+    proposal = AcceptedSubmissionFactory(speaker=user)
     graphql_client.force_login(user)
 
     response = _upload_file(
@@ -88,7 +88,26 @@ def test_upload_proposal_material_file(graphql_client, user):
 
 
 def test_cannot_upload_proposal_material_file_if_not_speaker(graphql_client, user):
-    proposal = SubmissionFactory()
+    proposal = AcceptedSubmissionFactory()
+    graphql_client.force_login(user)
+
+    response = _upload_file(
+        graphql_client,
+        {
+            "proposalMaterial": {
+                "filename": "test.txt",
+                "proposalId": proposal.hashid,
+                "conferenceCode": proposal.conference.code,
+            }
+        },
+    )
+
+    assert not response["data"]
+    assert response["errors"][0]["message"] == "You cannot upload files of this type"
+
+
+def test_cannot_upload_proposal_material_file_if_not_accepted(graphql_client, user):
+    proposal = SubmissionFactory(status="proposed")
     graphql_client.force_login(user)
 
     response = _upload_file(
@@ -129,7 +148,7 @@ def test_cannot_upload_proposal_material_file_with_invalid_proposal_id(
 def test_cannot_upload_proposal_material_file_with_invalid_proposal_id_for_conference(
     graphql_client, user
 ):
-    proposal = SubmissionFactory()
+    proposal = AcceptedSubmissionFactory()
     graphql_client.force_login(user)
 
     response = _upload_file(
@@ -151,7 +170,7 @@ def test_cannot_upload_proposal_material_file_with_invalid_proposal_id_for_confe
     "file_type", [File.Type.PARTICIPANT_AVATAR, File.Type.PROPOSAL_MATERIAL]
 )
 def test_superusers_can_upload_anything(graphql_client, admin_superuser, file_type):
-    proposal = SubmissionFactory()
+    proposal = AcceptedSubmissionFactory()
     graphql_client.force_login(admin_superuser)
 
     req_input = {}

backend/api/submissions/mutations.py

@@ -20,10 +20,10 @@
 from i18n.strings import LazyI18nString
 from languages.models import Language
 from participants.models import Participant
-from submissions.models import Submission as SubmissionModel
+from submissions.models import ProposalMaterial, Submission as SubmissionModel
 from submissions.tasks import notify_new_cfp_submission
 
-from .types import Submission
+from .types import Submission, SubmissionMaterialInput
 
 FACEBOOK_LINK_MATCH = re.compile(r"^http(s)?:\/\/(www\.)?facebook\.com\/")
 LINKEDIN_LINK_MATCH = re.compile(r"^http(s)?:\/\/(www\.)?linkedin\.com\/")
@@ -247,6 +247,7 @@ class UpdateSubmissionInput(BaseSubmissionInput):
 
     topic: Optional[ID] = strawberry.field(default=None)
     tags: list[ID] = strawberry.field(default_factory=list)
+    materials: list[SubmissionMaterialInput] = strawberry.field(default_factory=list)
 
 
 SendSubmissionOutput = Annotated[
@@ -301,6 +302,42 @@ def update_submission(
 
         instance.save()
 
+        materials_to_create = []
+        materials_to_update = []
+        materials_to_delete = []
+
+        existing_materials = list(instance.materials.all())
+        for material in input.materials:
+            existing_material = next(
+                (m for m in existing_materials if m.id == material.id), None
+            )
+            if existing_material:
+                existing_material.name = material.name
+                existing_material.url = material.url
+                existing_material.file_id = material.file_id
+                materials_to_update.append(existing_material)
+            else:
+                materials_to_create.append(
+                    ProposalMaterial(
+                        proposal=instance,
+                        name=material.name,
+                        url=material.url,
+                        file_id=material.file_id,
+                    )
+                )
+
+        for material in existing_materials:
+            if material not in materials_to_update:
+                materials_to_delete.append(material)
+
+        ProposalMaterial.objects.filter(
+            id__in=[m.id for m in materials_to_delete]
+        ).delete()
+        ProposalMaterial.objects.bulk_create(materials_to_create)
+        ProposalMaterial.objects.bulk_update(
+            materials_to_update, fields=["name", "url", "file_id"]
+        )
+
         Participant.objects.update_or_create(
             user_id=request.user.id,
             conference=conference,

backend/api/submissions/types.py

@@ -81,6 +81,7 @@ class ProposalMaterial:
     id: strawberry.ID
     name: str
     url: str | None
+    file_id: str | None
     file_url: str | None
     file_mime_type: str | None
 
@@ -90,6 +91,7 @@ def from_django(cls, material):
             id=material.id,
             name=material.name,
             url=material.url,
+            file_id=material.file_id,
             file_url=material.file.url if material.file_id else None,
             file_mime_type=material.file.mime_type if material.file_id else None,
         )
@@ -199,3 +201,11 @@ def materials(self, info) -> list[ProposalMaterial]:
 class SubmissionsPagination:
     submissions: list[Submission]
     total_pages: int
+
+
+@strawberry.input
+class SubmissionMaterialInput:
+    name: str
+    id: strawberry.ID | None = None
+    url: str | None = None
+    file_id: str | None = None

backend/submissions/tests/factories.py

@@ -127,6 +127,10 @@ def _after_postgeneration(cls, obj, create, results=None):
             obj.save()
 
 
+class AcceptedSubmissionFactory(SubmissionFactory):
+    status = "accepted"
+
+
 class SubmissionCommentFactory(DjangoModelFactory):
     class Meta:
         model = SubmissionComment

frontend/src/components/cfp-form/index.tsx

@@ -32,6 +32,30 @@ import { AvailabilitySection } from "./availability-section";
 import { MaterialsSection } from "./materials-section";
 import { ProposalSection } from "./proposal-section";
 
+export type GetErrorsKey =
+  | "validationTitle"
+  | "validationAbstract"
+  | "validationLanguages"
+  | "validationType"
+  | "validationDuration"
+  | "validationElevatorPitch"
+  | "validationNotes"
+  | "validationAudienceLevel"
+  | "validationTags"
+  | "validationSpeakerLevel"
+  | "validationPreviousTalkVideo"
+  | "validationShortSocialSummary"
+  | "validationSpeakerBio"
+  | "validationSpeakerWebsite"
+  | "validationSpeakerPhoto"
+  | "validationSpeakerTwitterHandle"
+  | "validationSpeakerInstagramHandle"
+  | "validationSpeakerLinkedinUrl"
+  | "validationSpeakerFacebookUrl"
+  | "validationSpeakerMastodonHandle"
+  | "validationMaterials"
+  | "nonFieldErrors";
+
 export type CfpFormFields = ParticipantFormFields & {
   type: string;
   title: { it?: string; en?: string };
@@ -51,7 +75,9 @@ export type CfpFormFields = ParticipantFormFields & {
 };
 
 export type SubmissionStructure = {
+  id: string;
   type: { id: string };
+  status: string;
   title: string;
   elevatorPitch: string;
   abstract: string;
@@ -66,6 +92,14 @@ export type SubmissionStructure = {
   speakerLevel: string;
   tags: { id: string }[];
   shortSocialSummary: string;
+  materials: {
+    id: string;
+    name: string;
+    url: string;
+    fileId: string;
+    fileUrl: string;
+    fileMimeType: string;
+  }[];
 };
 
 type Props = {
@@ -173,6 +207,7 @@ export const CfpForm = ({
         participantData.me.participant?.photoId,
       acceptedPrivacyPolicy: formState.values.acceptedPrivacyPolicy,
       speakerAvailabilities: formState.values.speakerAvailabilities,
+      materials: formState.values.materials,
     });
   };
 
@@ -223,6 +258,16 @@ export const CfpForm = ({
       );
       formState.setField("shortSocialSummary", submission!.shortSocialSummary);
       formState.setField("acceptedPrivacyPolicy", true);
+      formState.setField(
+        "materials",
+        submission!.materials.map((material) => ({
+          type: material.fileId ? "file" : "link",
+          id: material.id,
+          fileId: material.fileId,
+          url: material.url,
+          name: material.name,
+        })),
+      );
     }
 
     if (participantData.me.participant) {
@@ -274,30 +319,7 @@ export const CfpForm = ({
     submissionData?.mutationOp.__typename === "SendSubmissionErrors";
 
   /* todo refactor to avoid multiple __typename? */
-  const getErrors = (
-    key:
-      | "validationTitle"
-      | "validationAbstract"
-      | "validationLanguages"
-      | "validationType"
-      | "validationDuration"
-      | "validationElevatorPitch"
-      | "validationNotes"
-      | "validationAudienceLevel"
-      | "validationTags"
-      | "validationSpeakerLevel"
-      | "validationPreviousTalkVideo"
-      | "validationShortSocialSummary"
-      | "validationSpeakerBio"
-      | "validationSpeakerWebsite"
-      | "validationSpeakerPhoto"
-      | "validationSpeakerTwitterHandle"
-      | "validationSpeakerInstagramHandle"
-      | "validationSpeakerLinkedinUrl"
-      | "validationSpeakerFacebookUrl"
-      | "validationSpeakerMastodonHandle"
-      | "nonFieldErrors",
-  ): string[] =>
+  const getErrors = (key: GetErrorsKey): string[] =>
     (submissionData?.mutationOp.__typename === "SendSubmissionErrors" &&
       submissionData!.mutationOp.errors[key]) ||
     [];
@@ -331,14 +353,19 @@ export const CfpForm = ({
         conferenceData={conferenceData}
       />
 
-      <Spacer size="medium" />
+      {submission?.status === "accepted" && (
+        <>
+          <Spacer size="medium" />
 
-      <MaterialsSection
-        formState={formState}
-        getErrors={getErrors}
-        formOptions={formOptions}
-        conferenceData={conferenceData}
-      />
+          <MaterialsSection
+            formState={formState}
+            getErrors={getErrors}
+            formOptions={formOptions}
+            conferenceData={conferenceData}
+            submission={submission}
+          />
+        </>
+      )}
 
       <Spacer size="medium" />