Add view endpoint and test

smecalculus · Mar 4, 2024 · 72f4cf3 · 72f4cf3
1 parent ef94861
commit 72f4cf3
Show file tree

Hide file tree

Showing 28 changed files with 392 additions and 45 deletions.
diff --git a/app/sepuling-java/src/it/java/smecalculus/bezmen/messaging/SepulkaClientIT.java b/app/sepuling-java/src/it/java/smecalculus/bezmen/messaging/SepulkaClientIT.java
@@ -11,6 +11,7 @@
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import smecalculus.bezmen.construction.SepulkaClientBeans;
+import smecalculus.bezmen.core.SepulkaMessageDm;
 import smecalculus.bezmen.core.SepulkaMessageDm.RegistrationRequest;
 import smecalculus.bezmen.core.SepulkaMessageDmEg;
 import smecalculus.bezmen.core.SepulkaService;
@@ -44,4 +45,24 @@ void shouldRegisterSepulka() {
                 .ignoringExpectedNullFields()
                 .isEqualTo(expectedResponse);
     }
+
+    @Test
+    void shouldViewSepulka() {
+        // given
+        var externalId = UUID.randomUUID().toString();
+        // and
+        var request = SepulkaMessageEmEg.viewRequest(externalId);
+        // and
+        when(serviceMock.view(any(SepulkaMessageDm.ViewRequest.class)))
+                .thenReturn(SepulkaMessageDmEg.viewResponse(externalId).build());
+        // and
+        var expectedResponse = SepulkaMessageEmEg.viewResponse(externalId);
+        // when
+        var actualResponse = externalClient.view(request);
+        // then
+        assertThat(actualResponse)
+                .usingRecursiveComparison()
+                .ignoringExpectedNullFields()
+                .isEqualTo(expectedResponse);
+    }
 }
diff --git a/app/sepuling-java/src/main/java/smecalculus/bezmen/core/SepulkaServiceImpl.java b/app/sepuling-java/src/main/java/smecalculus/bezmen/core/SepulkaServiceImpl.java
@@ -3,14 +3,12 @@
 import static java.util.UUID.randomUUID;
 
 import java.time.LocalDateTime;
-import java.util.Collections;
-import java.util.List;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
-import smecalculus.bezmen.core.SepulkaMessageDm.PreviewRequest;
-import smecalculus.bezmen.core.SepulkaMessageDm.PreviewResponse;
 import smecalculus.bezmen.core.SepulkaMessageDm.RegistrationRequest;
 import smecalculus.bezmen.core.SepulkaMessageDm.RegistrationResponse;
+import smecalculus.bezmen.core.SepulkaMessageDm.ViewRequest;
+import smecalculus.bezmen.core.SepulkaMessageDm.ViewResponse;
 import smecalculus.bezmen.storage.SepulkaDao;
 
 @RequiredArgsConstructor
@@ -37,7 +35,7 @@ public RegistrationResponse register(RegistrationRequest request) {
     }
 
     @Override
-    public List<PreviewResponse> view(PreviewRequest request) {
-        return Collections.emptyList();
+    public ViewResponse view(ViewRequest request) {
+        return new ViewResponse(request.externalId());
     }
 }
diff --git a/app/sepuling-java/src/main/java/smecalculus/bezmen/messaging/SepulkaClientImpl.java b/app/sepuling-java/src/main/java/smecalculus/bezmen/messaging/SepulkaClientImpl.java
@@ -5,6 +5,8 @@
 import smecalculus.bezmen.core.SepulkaService;
 import smecalculus.bezmen.messaging.SepulkaMessageEm.RegistrationRequest;
 import smecalculus.bezmen.messaging.SepulkaMessageEm.RegistrationResponse;
+import smecalculus.bezmen.messaging.SepulkaMessageEm.ViewRequest;
+import smecalculus.bezmen.messaging.SepulkaMessageEm.ViewResponse;
 import smecalculus.bezmen.validation.EdgeValidator;
 
 @RequiredArgsConstructor
@@ -26,4 +28,12 @@ public RegistrationResponse register(RegistrationRequest requestEdge) {
         var response = service.register(request);
         return mapper.toEdge(response);
     }
+
+    @Override
+    public ViewResponse view(ViewRequest requestEdge) {
+        validator.validate(requestEdge);
+        var request = mapper.toDomain(requestEdge);
+        var response = service.view(request);
+        return mapper.toEdge(response);
+    }
 }
diff --git a/...sepuling-java/src/main/java/smecalculus/bezmen/messaging/springmvc/SepulkaController.java b/...sepuling-java/src/main/java/smecalculus/bezmen/messaging/springmvc/SepulkaController.java
@@ -4,13 +4,17 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import smecalculus.bezmen.messaging.SepulkaClient;
+import smecalculus.bezmen.messaging.SepulkaMessageEm;
 import smecalculus.bezmen.messaging.SepulkaMessageEm.RegistrationRequest;
 import smecalculus.bezmen.messaging.SepulkaMessageEm.RegistrationResponse;
+import smecalculus.bezmen.messaging.SepulkaMessageEm.ViewResponse;
 
 @RestController
 @RequestMapping("sepulkas")
@@ -21,8 +25,16 @@ public class SepulkaController {
     private SepulkaClient client;
 
     @PostMapping
-    ResponseEntity<RegistrationResponse> register(@RequestBody RegistrationRequest requestEdge) {
-        var responseEdge = client.register(requestEdge);
-        return ResponseEntity.status(HttpStatus.CREATED).body(responseEdge);
+    ResponseEntity<RegistrationResponse> register(@RequestBody RegistrationRequest request) {
+        var response = client.register(request);
+        return ResponseEntity.status(HttpStatus.CREATED).body(response);
+    }
+
+    @GetMapping("/{externalId}")
+    ResponseEntity<ViewResponse> view(@PathVariable("externalId") String externalId) {
+        var request = new SepulkaMessageEm.ViewRequest();
+        request.setExternalId(externalId);
+        var response = client.view(request);
+        return ResponseEntity.status(HttpStatus.OK).body(response);
     }
 }
diff --git a/app/sepuling-kotlin/src/it/kotlin/smecalculus/bezmen/messaging/SepulkaClientIT.kt b/app/sepuling-kotlin/src/it/kotlin/smecalculus/bezmen/messaging/SepulkaClientIT.kt
@@ -17,6 +17,7 @@ import java.util.UUID
 @ExtendWith(SpringExtension::class)
 @ContextConfiguration(classes = [SepulkaClientBeans::class])
 abstract class SepulkaClientIT {
+
     @Autowired
     private lateinit var externalClient: SepulkaClient
 
@@ -42,4 +43,24 @@ abstract class SepulkaClientIT {
             .ignoringExpectedNullFields()
             .isEqualTo(expectedResponse)
     }
+
+    @Test
+    fun shouldViewSepulka() {
+        // given
+        val externalId = UUID.randomUUID().toString()
+        // and
+        val request = SepulkaMessageEmEg.viewRequest(externalId)
+        // and
+        whenever(serviceMock.view(any(SepulkaMessageDm.ViewRequest::class.java)))
+            .thenReturn(SepulkaMessageDmEg.viewResponse(externalId).build())
+        // and
+        val expectedResponse = SepulkaMessageEmEg.viewResponse(externalId)
+        // when
+        val actualResponse = externalClient.view(request)
+        // then
+        assertThat(actualResponse)
+            .usingRecursiveComparison()
+            .ignoringExpectedNullFields()
+            .isEqualTo(expectedResponse)
+    }
 }
diff --git a/app/sepuling-kotlin/src/main/kotlin/smecalculus/bezmen/core/SepulkaServiceImpl.kt b/app/sepuling-kotlin/src/main/kotlin/smecalculus/bezmen/core/SepulkaServiceImpl.kt
@@ -1,9 +1,9 @@
 package smecalculus.bezmen.core
 
-import smecalculus.bezmen.core.SepulkaMessageDm.PreviewRequest
-import smecalculus.bezmen.core.SepulkaMessageDm.PreviewResponse
 import smecalculus.bezmen.core.SepulkaMessageDm.RegistrationRequest
 import smecalculus.bezmen.core.SepulkaMessageDm.RegistrationResponse
+import smecalculus.bezmen.core.SepulkaMessageDm.ViewRequest
+import smecalculus.bezmen.core.SepulkaMessageDm.ViewResponse
 import smecalculus.bezmen.storage.SepulkaDao
 import java.time.LocalDateTime
 import java.util.UUID
@@ -25,7 +25,7 @@ class SepulkaServiceImpl(
         return converter.toMessage(sepulkaSaved).build()
     }
 
-    override fun view(request: PreviewRequest): List<PreviewResponse> {
-        return listOf()
+    override fun view(request: ViewRequest): ViewResponse {
+        return ViewResponse(request.externalId)
     }
 }
diff --git a/app/sepuling-kotlin/src/main/kotlin/smecalculus/bezmen/messaging/SepulkaClientImpl.kt b/app/sepuling-kotlin/src/main/kotlin/smecalculus/bezmen/messaging/SepulkaClientImpl.kt
@@ -3,6 +3,8 @@ package smecalculus.bezmen.messaging
 import smecalculus.bezmen.core.SepulkaService
 import smecalculus.bezmen.messaging.SepulkaMessageEm.RegistrationRequest
 import smecalculus.bezmen.messaging.SepulkaMessageEm.RegistrationResponse
+import smecalculus.bezmen.messaging.SepulkaMessageEm.ViewRequest
+import smecalculus.bezmen.messaging.SepulkaMessageEm.ViewResponse
 import smecalculus.bezmen.validation.EdgeValidator
 
 class SepulkaClientImpl(
@@ -16,4 +18,11 @@ class SepulkaClientImpl(
         val response = service.register(request)
         return mapper.toEdge(response)
     }
+
+    override fun view(requestEdge: ViewRequest): ViewResponse {
+        validator.validate(requestEdge)
+        val request = mapper.toDomain(requestEdge)
+        val response = service.view(request)
+        return mapper.toEdge(response)
+    }
 }
diff --git a/...puling-kotlin/src/main/kotlin/smecalculus/bezmen/messaging/springmvc/SepulkaController.kt b/...puling-kotlin/src/main/kotlin/smecalculus/bezmen/messaging/springmvc/SepulkaController.kt
@@ -2,13 +2,17 @@ package smecalculus.bezmen.messaging.springmvc
 
 import org.springframework.http.HttpStatus
 import org.springframework.http.ResponseEntity
+import org.springframework.web.bind.annotation.GetMapping
+import org.springframework.web.bind.annotation.PathVariable
 import org.springframework.web.bind.annotation.PostMapping
 import org.springframework.web.bind.annotation.RequestBody
 import org.springframework.web.bind.annotation.RequestMapping
 import org.springframework.web.bind.annotation.RestController
 import smecalculus.bezmen.messaging.SepulkaClient
 import smecalculus.bezmen.messaging.SepulkaMessageEm.RegistrationRequest
 import smecalculus.bezmen.messaging.SepulkaMessageEm.RegistrationResponse
+import smecalculus.bezmen.messaging.SepulkaMessageEm.ViewRequest
+import smecalculus.bezmen.messaging.SepulkaMessageEm.ViewResponse
 
 @RestController
 @RequestMapping("sepulkas")
@@ -17,9 +21,19 @@ class SepulkaController(
 ) {
     @PostMapping
     fun register(
-        @RequestBody requestEdge: RegistrationRequest,
+        @RequestBody request: RegistrationRequest,
     ): ResponseEntity<RegistrationResponse> {
-        val responseEdge = client.register(requestEdge)
-        return ResponseEntity.status(HttpStatus.CREATED).body(responseEdge)
+        val response = client.register(request)
+        return ResponseEntity.status(HttpStatus.CREATED).body(response)
+    }
+
+    @GetMapping("/{externalId}")
+    fun register(
+        @PathVariable("externalId") externalId: String,
+    ): ResponseEntity<ViewResponse> {
+        val request = ViewRequest()
+        request.externalId = externalId
+        val response = client.view(request)
+        return ResponseEntity.status(HttpStatus.OK).body(response)
     }
 }
diff --git a/lib/abstraction-client/src/main/java/smecalculus/bezmen/messaging/SepulkaClient.java b/lib/abstraction-client/src/main/java/smecalculus/bezmen/messaging/SepulkaClient.java
@@ -2,10 +2,14 @@
 
 import smecalculus.bezmen.messaging.SepulkaMessageEm.RegistrationRequest;
 import smecalculus.bezmen.messaging.SepulkaMessageEm.RegistrationResponse;
+import smecalculus.bezmen.messaging.SepulkaMessageEm.ViewRequest;
+import smecalculus.bezmen.messaging.SepulkaMessageEm.ViewResponse;
 
 /**
  * Port: client side
  */
 public interface SepulkaClient {
     RegistrationResponse register(RegistrationRequest request);
+
+    ViewResponse view(ViewRequest request);
 }
diff --git a/lib/abstraction-client/src/main/java/smecalculus/bezmen/messaging/SepulkaMessageEm.java b/lib/abstraction-client/src/main/java/smecalculus/bezmen/messaging/SepulkaMessageEm.java
@@ -14,8 +14,23 @@ public static class RegistrationRequest {
 
     @Data
     public static class RegistrationResponse {
+        String externalId;
+    }
+
+    @Data
+    public static class SearchResponse {
+        String externalId;
+    }
+
+    @Data
+    public static class ViewRequest {
         @NotNull
         @Size(min = 1, max = 64)
         String externalId;
     }
+
+    @Data
+    public static class ViewResponse {
+        String externalId;
+    }
 }
diff --git a/lib/abstraction-client/src/main/java/smecalculus/bezmen/messaging/SepulkaMessageEmEg.java b/lib/abstraction-client/src/main/java/smecalculus/bezmen/messaging/SepulkaMessageEmEg.java
@@ -3,6 +3,8 @@
 import java.util.UUID;
 import smecalculus.bezmen.messaging.SepulkaMessageEm.RegistrationRequest;
 import smecalculus.bezmen.messaging.SepulkaMessageEm.RegistrationResponse;
+import smecalculus.bezmen.messaging.SepulkaMessageEm.ViewRequest;
+import smecalculus.bezmen.messaging.SepulkaMessageEm.ViewResponse;
 
 public abstract class SepulkaMessageEmEg {
     public static RegistrationRequest registrationRequest() {
@@ -28,4 +30,28 @@ public static RegistrationResponse registrationResponse(String externalId) {
         responseEdge.setExternalId(externalId);
         return responseEdge;
     }
+
+    public static ViewRequest viewRequest() {
+        var requestEdge = new ViewRequest();
+        requestEdge.setExternalId(UUID.randomUUID().toString());
+        return requestEdge;
+    }
+
+    public static ViewRequest viewRequest(String id) {
+        var requestEdge = viewRequest();
+        requestEdge.setExternalId(id);
+        return requestEdge;
+    }
+
+    public static ViewResponse viewResponse() {
+        var responseEdge = new ViewResponse();
+        responseEdge.setExternalId(UUID.randomUUID().toString());
+        return responseEdge;
+    }
+
+    public static ViewResponse viewResponse(String externalId) {
+        var responseEdge = viewResponse();
+        responseEdge.setExternalId(externalId);
+        return responseEdge;
+    }
 }
diff --git a/lib/abstraction/src/main/java/smecalculus/bezmen/core/SepulkaMessageDm.java b/lib/abstraction/src/main/java/smecalculus/bezmen/core/SepulkaMessageDm.java
@@ -11,8 +11,8 @@ public record RegistrationRequest(@NonNull String externalId) {}
     public record RegistrationResponse(@NonNull String externalId) {}
 
     @Builder
-    public record PreviewRequest(@NonNull String externalId) {}
+    public record ViewRequest(@NonNull String externalId) {}
 
     @Builder
-    public record PreviewResponse(@NonNull String externalId) {}
+    public record ViewResponse(@NonNull String externalId) {}
 }
diff --git a/lib/abstraction/src/main/java/smecalculus/bezmen/core/SepulkaMessageDmEg.java b/lib/abstraction/src/main/java/smecalculus/bezmen/core/SepulkaMessageDmEg.java
@@ -2,6 +2,7 @@
 
 import java.util.UUID;
 import smecalculus.bezmen.core.SepulkaMessageDm.RegistrationResponse;
+import smecalculus.bezmen.core.SepulkaMessageDm.ViewResponse;
 
 public class SepulkaMessageDmEg {
     public static RegistrationResponse.Builder registrationResponse() {
@@ -11,4 +12,12 @@ public static RegistrationResponse.Builder registrationResponse() {
     public static RegistrationResponse.Builder registrationResponse(String externalId) {
         return registrationResponse().externalId(externalId);
     }
+
+    public static ViewResponse.Builder viewResponse() {
+        return ViewResponse.builder().externalId(UUID.randomUUID().toString());
+    }
+
+    public static ViewResponse.Builder viewResponse(String externalId) {
+        return viewResponse().externalId(externalId);
+    }
 }
diff --git a/lib/abstraction/src/main/java/smecalculus/bezmen/core/SepulkaService.java b/lib/abstraction/src/main/java/smecalculus/bezmen/core/SepulkaService.java
@@ -1,13 +1,12 @@
 package smecalculus.bezmen.core;
 
-import java.util.List;
-import smecalculus.bezmen.core.SepulkaMessageDm.PreviewRequest;
-import smecalculus.bezmen.core.SepulkaMessageDm.PreviewResponse;
 import smecalculus.bezmen.core.SepulkaMessageDm.RegistrationRequest;
 import smecalculus.bezmen.core.SepulkaMessageDm.RegistrationResponse;
+import smecalculus.bezmen.core.SepulkaMessageDm.ViewRequest;
+import smecalculus.bezmen.core.SepulkaMessageDm.ViewResponse;
 
 public interface SepulkaService {
     RegistrationResponse register(RegistrationRequest request);
 
-    List<PreviewResponse> view(PreviewRequest request);
+    ViewResponse view(ViewRequest request);
 }
diff --git a/lib/essentials/pom.xml b/lib/essentials/pom.xml
@@ -14,12 +14,17 @@
   <packaging>jar</packaging>
 
   <dependencies>
-    <!--ABSTRACTION-->
+    <!--CORE-->
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>abstraction</artifactId>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>testing</artifactId>
+      <scope>test</scope>
+    </dependency>
     <!--SERDE-->
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>