From 691678cb7c0309ac247ac8c71095a5cf91653f5b Mon Sep 17 00:00:00 2001
From: Doris Lam <dlam@jpl.nasa.gov>
Date: Wed, 14 Sep 2022 11:14:13 -0700
Subject: [PATCH] return element json if artifact mime type not found

---
 .../artifacts/service/DefaultArtifactService.java  | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/artifacts/src/main/java/org/openmbee/mms/artifacts/service/DefaultArtifactService.java b/artifacts/src/main/java/org/openmbee/mms/artifacts/service/DefaultArtifactService.java
index 3a1c0f094..5c4aae384 100644
--- a/artifacts/src/main/java/org/openmbee/mms/artifacts/service/DefaultArtifactService.java
+++ b/artifacts/src/main/java/org/openmbee/mms/artifacts/service/DefaultArtifactService.java
@@ -52,7 +52,7 @@ public ArtifactResponse get(String projectId, String refId, String id, Map<Strin
         NodeService nodeService = getNodeService(projectId);
         ElementJson elementJson = getElement(nodeService, projectId, refId, id, params);
 
-        ArtifactJson artifact = getExistingArtifact(ArtifactJson.getArtifacts(elementJson), params);
+        ArtifactJson artifact = getExistingArtifact(ArtifactJson.getArtifacts(elementJson), params, elementJson);
         byte[] data = artifactStorage.get(artifact.getLocation(), elementJson, artifact.getMimeType());
         ArtifactResponse response = new ArtifactResponse();
         response.setData(data);
@@ -99,7 +99,7 @@ public ElementsResponse disassociate(String projectId, String refId, String id,
         ElementJson elementJson = getElement(nodeService, projectId, refId, id, params);
 
         List<ArtifactJson> artifacts = ArtifactJson.getArtifacts(elementJson);
-        ArtifactJson artifact = getExistingArtifact(artifacts, params);
+        ArtifactJson artifact = getExistingArtifact(artifacts, params, elementJson);
         artifacts.remove(artifact);
         ArtifactJson.setArtifacts(elementJson, artifacts);
         ElementsRequest elementsRequest = new ElementsRequest();
@@ -124,7 +124,7 @@ private ElementJson attachOrUpdateArtifact(ElementJson elementJson, String artif
         List<ArtifactJson> artifacts = ArtifactJson.getArtifacts(elementJson);
         ArtifactJson artifact;
         try {
-            artifact = getExistingArtifact(artifacts, mimeType, null);
+            artifact = getExistingArtifact(artifacts, mimeType, null, elementJson);
         } catch(NotFoundException ex) {
             artifact = new ArtifactJson();
             artifacts.add(artifact);
@@ -140,11 +140,11 @@ private ElementJson attachOrUpdateArtifact(ElementJson elementJson, String artif
         return elementJson;
     }
 
-    private ArtifactJson getExistingArtifact(List<ArtifactJson> artifacts, Map<String, String> params) {
-        return getExistingArtifact(artifacts, params.get(ArtifactConstants.MIMETYPE_PARAM), params.get(ArtifactConstants.EXTENSION_PARAM));
+    private ArtifactJson getExistingArtifact(List<ArtifactJson> artifacts, Map<String, String> params, ElementJson element) {
+        return getExistingArtifact(artifacts, params.get(ArtifactConstants.MIMETYPE_PARAM), params.get(ArtifactConstants.EXTENSION_PARAM), element);
     }
 
-    private ArtifactJson getExistingArtifact(List<ArtifactJson> artifacts, String mimeType, String extension) {
+    private ArtifactJson getExistingArtifact(List<ArtifactJson> artifacts, String mimeType, String extension, ElementJson element) {
         if(mimeType == null && extension == null) {
             throw new BadRequestException("Missing mimetype or extension");
         }
@@ -155,7 +155,7 @@ private ArtifactJson getExistingArtifact(List<ArtifactJson> artifacts, String mi
         if(existing.isPresent()) {
             return existing.get();
         }
-        throw new NotFoundException("Artifact not found");
+        throw new NotFoundException(element);
     }
 
     private String getFileExtension(MultipartFile file) {