From b5df7cfa9fae230eaee737eca13c20923d992ed2 Mon Sep 17 00:00:00 2001
From: Ole Anders Eidjord <ole.anders.eidjord@vigoiks.no>
Date: Tue, 23 Apr 2024 11:58:03 +0200
Subject: [PATCH] ARKIV-267 Return Status

---
 .../instance/gateway/InstanceController.java       | 14 +++++++++++---
 .../no/fintlabs/instance/gateway/model/Status.java | 13 +++++++++++++
 2 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100644 src/main/java/no/fintlabs/instance/gateway/model/Status.java

diff --git a/src/main/java/no/fintlabs/instance/gateway/InstanceController.java b/src/main/java/no/fintlabs/instance/gateway/InstanceController.java
index 4bf936c..0abb78c 100644
--- a/src/main/java/no/fintlabs/instance/gateway/InstanceController.java
+++ b/src/main/java/no/fintlabs/instance/gateway/InstanceController.java
@@ -3,6 +3,7 @@
 import lombok.extern.slf4j.Slf4j;
 import no.fintlabs.gateway.instance.InstanceProcessor;
 import no.fintlabs.gateway.instance.kafka.ArchiveCaseIdRequestService;
+import no.fintlabs.instance.gateway.model.Status;
 import no.fintlabs.instance.gateway.model.vigo.IncomingInstance;
 import no.fintlabs.resourceserver.security.client.sourceapplication.SourceApplicationAuthorizationUtil;
 import org.springframework.http.ResponseEntity;
@@ -43,8 +44,8 @@ public Mono<ResponseEntity<?>> postIncomingInstance(
         );
     }
 
-    @GetMapping("{instanceId}/status")
-    public Mono<ResponseEntity<String>> getStatus(
+    @GetMapping("status/{instanceId}")
+    public Mono<ResponseEntity<Status>> getInstanceStatus(
             @AuthenticationPrincipal Mono<Authentication> authenticationMono,
             @PathVariable String instanceId
     ) {
@@ -55,10 +56,17 @@ public Mono<ResponseEntity<String>> getStatus(
                     log.debug("Get status for instance: {} in sourceApplication: {}", instanceId, applicationId);
 
                     return archiveCaseIdRequestService.getArchiveCaseId(applicationId, instanceId)
-                            .map(ResponseEntity::ok)
+                            .map(caseId -> ResponseEntity.ok(toStatus(instanceId, caseId)))
                             .orElse(ResponseEntity.notFound().build());
                 }
         );
     }
 
+    private static Status toStatus(String instanceId, String caseId) {
+        return Status.builder()
+                .instansId(instanceId)
+                .saksreferanse(caseId)
+                .build();
+    }
+
 }
diff --git a/src/main/java/no/fintlabs/instance/gateway/model/Status.java b/src/main/java/no/fintlabs/instance/gateway/model/Status.java
new file mode 100644
index 0000000..1374c6d
--- /dev/null
+++ b/src/main/java/no/fintlabs/instance/gateway/model/Status.java
@@ -0,0 +1,13 @@
+package no.fintlabs.instance.gateway.model;
+
+import lombok.Builder;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+
+@Getter
+@EqualsAndHashCode
+@Builder
+public class Status {
+    private final String instansId;
+    private final String saksreferanse;
+}