add check for if task results are string and parse JSON

client/src/components/Manifest/UpdateRcra/UpdateRcra.tsx

@@ -23,7 +23,10 @@ export function UpdateRcra({ taskId }: UpdateRcraProps) {
   });
 
   if (data?.status === 'SUCCESS') {
-    const resp = data?.result;
+    let resp = data?.result;
+    if (typeof resp === 'string') {
+      resp = JSON.parse(resp);
+    }
     return <Navigate to={`/manifest/${resp.manifestTrackingNumber}/view`} />;
   }
 

server/apps/trak/models/manifest_models.py

@@ -22,12 +22,9 @@ def draft_mtn():
     A callable that returns a timestamped draft MTN in lieu of an
     official MTN from e-Manifest
     """
-    manifests = Manifest.objects.all()
-    if not manifests:
-        max_id = 1
-    else:
-        max_id = manifests.aggregate(Max("id"))
-    return f"{str(max_id).zfill(9)}DFT"
+    mtn_count: int = Manifest.objects.all().count()
+    print(mtn_count)
+    return f"{str(mtn_count).zfill(9)}DFT"
 
 
 def validate_mtn(value):

server/apps/trak/serializers/manifest_ser.py

@@ -10,6 +10,7 @@
     CorrectionInfo,
     ImportInfo,
     PortOfEntry,
+    draft_mtn,
 )
 from apps.trak.serializers.handler_ser import HandlerSerializer
 from apps.trak.serializers.signature_ser import ESignatureSerializer
@@ -221,6 +222,12 @@ def update(self, instance, validated_data: Dict) -> Manifest:
     def create(self, validated_data: Dict) -> Manifest:
         return self.Meta.model.objects.save(**validated_data)
 
+    def validate(self, data):
+        if data["mtn"] == "" and data["status"] == "NotAssigned":
+            data["mtn"] = draft_mtn()
+        print("data", data)
+        return super().validate(data)
+
     # https://www.django-rest-framework.org/api-guide/serializers/#overriding-serialization-and-deserialization-behavior
     def to_representation(self, instance) -> str:
         """

server/apps/trak/tasks/manifest_task.py

@@ -113,7 +113,7 @@ def create_rcra_manifest(self, *, manifest: dict, username: str):
     except ManifestServiceError as exc:
         logger.error(f"failed to create manifest ({manifest}): {exc.message}")
         task_status.update_task_status(status="FAILURE", results=exc.message)
-        return exc
+        return {"error": exc.message}
     except Exception as exc:
         logger.error("error: ", exc)
         task_status.update_task_status(status="FAILURE", results={"result": str(exc)})

server/fixtures/dev_data.yaml

@@ -130,8 +130,6 @@
   pk: 1
   fields:
     user: 2
-    rcra_api_key: mockRcraKey
-    rcra_api_id: mockRcraInfoId
     rcra_username: dpgraham4401
     phone_number: null
     email: [email protected]