1 files changed, 42 insertions, 16 deletions

diff --git a/workflow-designer-be/src/main/java/org/onap/sdc/workflow/api/impl/WorkflowVersionControllerImpl.java b/workflow-designer-be/src/main/java/org/onap/sdc/workflow/api/impl/WorkflowVersionControllerImpl.java
index 49c31f5b..0570ac85 100644
--- a/workflow-designer-be/src/main/java/org/onap/sdc/workflow/api/impl/WorkflowVersionControllerImpl.java
+++ b/workflow-designer-be/src/main/java/org/onap/sdc/workflow/api/impl/WorkflowVersionControllerImpl.java
@@ -2,22 +2,24 @@ package org.onap.sdc.workflow.api.impl;
 
 import static org.onap.sdc.workflow.api.RestConstants.USER_ID_HEADER_PARAM;
 
-import java.util.Collection;
-import java.util.List;
-import java.util.Optional;
 import org.onap.sdc.workflow.api.WorkflowVersionController;
 import org.onap.sdc.workflow.api.types.CollectionWrapper;
+import org.onap.sdc.workflow.api.types.VersionRequestDto;
+import org.onap.sdc.workflow.persistence.types.ArtifactEntity;
+import org.onap.sdc.workflow.persistence.types.WorkflowVersion;
 import org.onap.sdc.workflow.services.WorkflowVersionManager;
-import org.openecomp.sdc.versioning.dao.types.Version;
-import org.openecomp.sdc.versioning.types.VersionCreationMethod;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.core.io.InputStreamResource;
 import org.springframework.core.io.Resource;
+import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -32,32 +34,56 @@ public class WorkflowVersionControllerImpl implements WorkflowVersionController
     }
 
     @Override
-    public CollectionWrapper<Version> list(@PathVariable("id") String id,@RequestHeader(USER_ID_HEADER_PARAM) String user) {
-        return new CollectionWrapper<>(workflowVersionManager.list(id));
+    public CollectionWrapper<WorkflowVersion> list(@PathVariable("workflowId") String workflowId,
+                      @RequestHeader(USER_ID_HEADER_PARAM) String user) {
+        return new CollectionWrapper<>(workflowVersionManager.list(workflowId));
     }
 
     @Override
-    public ResponseEntity<?>  create(@PathVariable("id") String id,@RequestBody Version version,
+    public ResponseEntity<WorkflowVersion> create(@PathVariable("workflowId") String workflowId,@RequestBody VersionRequestDto versionRequest,
             @RequestHeader(USER_ID_HEADER_PARAM) String user) {
 
-         Version createdVersion = workflowVersionManager.create(id, version);
-
+        WorkflowVersion createdVersion = workflowVersionManager.create(workflowId, versionRequest);
         return new ResponseEntity<>(createdVersion, HttpStatus.CREATED);
     }
 
     @Override
-    public Version get(@PathVariable("id") String id,@PathVariable("versionId") String versionId,
+    public WorkflowVersion get(@PathVariable("workflowId") String workflowId,@PathVariable("versionId") String versionId,
             @RequestHeader(USER_ID_HEADER_PARAM)  String user) {
-        Version version = new Version(versionId);
-        return workflowVersionManager.get(id,version);
+        return workflowVersionManager.get(workflowId,versionId);
     }
 
     @Override
-    public void update(@PathVariable("id") String id, @PathVariable("versionId") String versionId,
-            @RequestBody Version version, @RequestHeader(USER_ID_HEADER_PARAM) String user) {
+    public void update(@RequestBody WorkflowVersion version,@PathVariable("workflowId") String workflowId,
+            @PathVariable("versionId") String versionId, @RequestHeader(USER_ID_HEADER_PARAM) String user) {
 
         version.setId(versionId);
-        workflowVersionManager.update(id,version);
+        workflowVersionManager.update(workflowId,version);
+    }
+
+    @Override
+    public void createArtifact(@RequestBody MultipartFile fileToUpload, @PathVariable("workflowId") String workflowId,
+            @PathVariable("versionId") String versionId,@RequestHeader(USER_ID_HEADER_PARAM) String user) {
+
+            workflowVersionManager.uploadArtifact(workflowId,new WorkflowVersion(versionId),fileToUpload);
+
+    }
+
+    @Override
+    public ResponseEntity<Resource> getArtifact(@PathVariable("workflowId") String workflowId,
+            @PathVariable("versionId") String versionId, @RequestHeader(USER_ID_HEADER_PARAM) String user) {
+        WorkflowVersion requestedVersion = new WorkflowVersion(versionId);
+        ArtifactEntity artifact = workflowVersionManager.getArtifact(workflowId, requestedVersion);
+
+        return ResponseEntity.ok()
+                             .header(HttpHeaders.CONTENT_DISPOSITION, "attachment;filename=" + artifact.getFileName())
+                             .contentType(MediaType.APPLICATION_OCTET_STREAM)
+                             .body(new InputStreamResource(artifact.getArtifactData()));
     }
 
+    @Override
+    public void deleteArtifact(@PathVariable("workflowId") String workflowId, @PathVariable("versionId") String versionId,
+            @RequestHeader(USER_ID_HEADER_PARAM) String user) {
+
+    }
 }