Merge pull request #12982 from transcom/MAIN-B-19065-fix-current-bug-…

…delete-docs MAIN - B-19065 fix-current-bug-delete-docs
transcom · Jun 11, 2024 · ed55043 · ed55043
2 parents 9c0b4a0 + 9d52c4a
commit ed55043
Show file tree

Hide file tree

Showing 10 changed files with 97 additions and 6 deletions.
diff --git a/pkg/gen/internalapi/embedded_spec.go b/pkg/gen/internalapi/embedded_spec.go
diff --git a/pkg/gen/internalapi/internaloperations/uploads/delete_upload_parameters.go b/pkg/gen/internalapi/internaloperations/uploads/delete_upload_parameters.go
diff --git a/pkg/gen/internalapi/internaloperations/uploads/delete_upload_urlbuilder.go b/pkg/gen/internalapi/internaloperations/uploads/delete_upload_urlbuilder.go
diff --git a/pkg/handlers/internalapi/uploads.go b/pkg/handlers/internalapi/uploads.go
@@ -122,6 +122,17 @@ func (h DeleteUploadHandler) Handle(params uploadop.DeleteUploadParams) middlewa
 				return handlers.ResponseForError(appCtx.Logger(), err), err
 			}
 
+			var ppmShipmentStatus models.PPMShipmentStatus
+
+			if params.PpmID != nil {
+				ppmShipmentId, _ := uuid.FromString(params.PpmID.String())
+				ppmShipment, err := models.FetchPPMShipmentByPPMShipmentID(appCtx.DB(), ppmShipmentId)
+				if err != nil {
+					return handlers.ResponseForError(appCtx.Logger(), err), err
+				}
+				ppmShipmentStatus = ppmShipment.Status
+			}
+
 			if params.OrderID != nil {
 				orderID, _ := uuid.FromString(params.OrderID.String())
 				move, e := models.FetchMoveByOrderID(appCtx.DB(), orderID)
@@ -157,8 +168,8 @@ func (h DeleteUploadHandler) Handle(params uploadop.DeleteUploadParams) middlewa
 				appCtx.Logger().Error("error retrieving move associated with this upload", zap.Error(err))
 			}
 
-			//If move status is not DRAFT, upload cannot be deleted
-			if *uploadInformation.MoveStatus != models.MoveStatusDRAFT {
+			//If move status is not DRAFT and customer is not uploading ppm docs, upload cannot be deleted
+			if (*uploadInformation.MoveStatus != models.MoveStatusDRAFT) && (ppmShipmentStatus != models.PPMShipmentStatusWaitingOnCustomer) {
 				return uploadop.NewDeleteUploadForbidden(), fmt.Errorf("deletion not permitted Move is not in 'DRAFT' status")
 			}
 

diff --git a/src/pages/MyMove/PPM/Closeout/Expenses/Expenses.jsx b/src/pages/MyMove/PPM/Closeout/Expenses/Expenses.jsx
@@ -87,7 +87,7 @@ const Expenses = () => {
   };
 
   const handleUploadDelete = (uploadId, fieldName, setFieldTouched, setFieldValue) => {
-    deleteUpload(uploadId)
+    deleteUpload(uploadId, null, mtoShipment?.ppmShipment?.id)
       .then(() => {
         const filteredUploads = mtoShipment.ppmShipment.movingExpenses[currentIndex][fieldName].uploads.filter(
           (upload) => upload.id !== uploadId,

diff --git a/src/pages/MyMove/PPM/Closeout/ProGear/ProGear.jsx b/src/pages/MyMove/PPM/Closeout/ProGear/ProGear.jsx
@@ -96,7 +96,7 @@ const ProGear = () => {
   };
 
   const handleUploadDelete = (uploadId, fieldName, setFieldTouched, setFieldValue) => {
-    deleteUpload(uploadId)
+    deleteUpload(uploadId, null, mtoShipment?.ppmShipment?.id)
       .then(() => {
         const filteredUploads = mtoShipment.ppmShipment.proGearWeightTickets[currentIndex][fieldName].uploads.filter(
           (upload) => upload.id !== uploadId,

diff --git a/src/pages/MyMove/PPM/Closeout/WeightTickets/WeightTickets.jsx b/src/pages/MyMove/PPM/Closeout/WeightTickets/WeightTickets.jsx
@@ -93,7 +93,7 @@ const WeightTickets = () => {
   };
 
   const handleUploadDelete = (uploadId, fieldName, setFieldTouched, setFieldValue) => {
-    deleteUpload(uploadId)
+    deleteUpload(uploadId, null, mtoShipment?.ppmShipment?.id)
       .then(() => {
         const filteredUploads = mtoShipment.ppmShipment.weightTickets[currentIndex][fieldName].uploads.filter(
           (upload) => upload.id !== uploadId,

diff --git a/src/services/internalApi.js b/src/services/internalApi.js
@@ -248,12 +248,13 @@ export async function createUploadForPPMDocument(ppmShipmentId, documentId, file
   );
 }
 
-export async function deleteUpload(uploadId, orderId) {
+export async function deleteUpload(uploadId, orderId, ppmId) {
   return makeInternalRequest(
     'uploads.deleteUpload',
     {
       uploadId,
       orderId,
+      ppmId,
     },
     {
       normalize: false,

diff --git a/swagger-def/internal.yaml b/swagger-def/internal.yaml
@@ -3075,6 +3075,11 @@ paths:
           type: string
           format: uuid
           description: ID of the order that the upload belongs to
+        - in: query
+          name: ppmId
+          type: string
+          format: uuid
+          description: Optional PPM shipment ID related to the upload
       responses:
         "204":
           description: deleted

diff --git a/swagger/internal.yaml b/swagger/internal.yaml
@@ -4371,6 +4371,11 @@ paths:
           type: string
           format: uuid
           description: ID of the order that the upload belongs to
+        - in: query
+          name: ppmId
+          type: string
+          format: uuid
+          description: Optional PPM shipment ID related to the upload
       responses:
         '204':
           description: deleted