Merge branch 'main' into MCIL-23-update-terminal

.github/workflows/pre-merge-postman-test.yaml

@@ -1,4 +1,4 @@
-name: Pull request review
+name: Postman Test
 
 on:
   pull_request:

build.gradle

@@ -12,8 +12,8 @@ repositories {
 
 dependencies {
     implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")
-    implementation 'io.quarkus:quarkus-resteasy-reactive-jackson'
     implementation 'io.quarkus:quarkus-resteasy-reactive'
+    implementation 'io.quarkus:quarkus-resteasy-reactive-jackson'
     implementation 'io.quarkus:quarkus-arc'
     implementation "org.projectlombok:lombok:${lombokVersion}"
     implementation 'io.quarkus:quarkus-hibernate-validator'

gradle.properties

@@ -8,7 +8,7 @@ quarkusPlatformVersion=3.7.3
 lombokVersion=1.18.30
 jacocoToolVersion=0.8.11
 
-sonarPluginVersion=4.4.1.3373
+sonarPluginVersion=5.0.0.4638
 sonarProjectKey=pagopa_mil-terminal-registry
 
 projectVersion=1.3.0

gradle/verification-metadata.xml

@@ -4902,6 +4902,11 @@
             <sha256 value="37b316009dad2438e5102910e54ddb414a755cab23213d7dc9a712e35d8eabbf" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.sonarqube" name="org.sonarqube.gradle.plugin" version="5.0.0.4638">
+         <artifact name="org.sonarqube.gradle.plugin-5.0.0.4638.pom">
+            <sha256 value="46558329c0f7c7cedb888778cbab2e9e327fc12ced6b4f4f55032f2bf9925b79" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.sonarsource.parent" name="parent" version="59.0.29">
          <artifact name="parent-59.0.29.pom">
             <sha1 value="16417adadfb28cbb1094184257cf952975c79e11" origin="Generated by Gradle"/>
@@ -4942,6 +4947,14 @@
             <sha256 value="11206426c9be18ce39741b8c7d1721bfe414e99d964f69153c1796f1fb837bcc" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.sonarsource.scanner.gradle" name="sonarqube-gradle-plugin" version="5.0.0.4638">
+         <artifact name="sonarqube-gradle-plugin-5.0.0.4638.jar">
+            <sha256 value="9fab1df676229a432cff70f168497c5ff12d8c11776b6a54ac3de862094670cb" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="sonarqube-gradle-plugin-5.0.0.4638.module">
+            <sha256 value="1cc22402989d76af0905ab0d29f23532161c78b0099327d37e5637e4b1425228" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.sonatype.oss" name="oss-parent" version="5">
          <artifact name="oss-parent-5.pom">
             <sha1 value="3ae20880ad3d5da6b1caec19e3de7e70dd2dd762" origin="Generated by Gradle"/>

src/main/java/it/pagopa/swclient/mil/dao/PageMetadata.java

@@ -1,4 +1,7 @@
 package it.pagopa.swclient.mil.dao;
 
+import io.quarkus.runtime.annotations.RegisterForReflection;
+
+@RegisterForReflection
 public record PageMetadata(int size, long totalElements, int totalPages) {
 }

src/main/java/it/pagopa/swclient/mil/dao/TerminalEntity.java

@@ -1,6 +1,7 @@
 package it.pagopa.swclient.mil.dao;
 
 import io.quarkus.mongodb.panache.common.MongoEntity;
+import org.bson.codecs.pojo.annotations.BsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
@@ -15,10 +16,13 @@
 public class TerminalEntity {
 
     @BsonId
+    @BsonProperty("terminalUuid")
     private String terminalUuid;
 
+    @BsonProperty("terminalHandler")
     private String terminalHandler;
 
+    @BsonProperty("serviceProviderId")
     private String serviceProviderId;
 
     private Terminal terminal;

src/main/java/it/pagopa/swclient/mil/dao/TerminalPageResponse.java

@@ -1,6 +1,8 @@
 package it.pagopa.swclient.mil.dao;
 
 import java.util.List;
+import io.quarkus.runtime.annotations.RegisterForReflection;
 
+@RegisterForReflection
 public record TerminalPageResponse(List<TerminalEntity> terminals, PageMetadata page) {
 }

src/test/java/it/pagopa/swclient/mil/service/TerminalServiceTest.java

@@ -73,17 +73,25 @@ void testCreateTerminal_Failure() {
 
     @Test
     void whenGetTerminalListThenSuccess() {
+        TerminalEntity terminalEntity1 = new TerminalEntity();
+        TerminalEntity terminalEntity2 = new TerminalEntity();
+        terminalEntity1.terminalUuid = "uuid1";
+        terminalEntity1.serviceProviderId = "serviceProviderId";
+        terminalEntity2.terminalUuid = "uuid2";
+        terminalEntity2.serviceProviderId = "serviceProviderId";
+        List<TerminalEntity> terminalEntities= List.of(terminalEntity1,terminalEntity2);
+
         ReactivePanacheQuery<TerminalEntity> query = Mockito.mock(ReactivePanacheQuery.class);
         Mockito.when(query.page(anyInt(), anyInt())).thenReturn(query);
-        Mockito.when(query.list()).thenReturn(Uni.createFrom().item(mockedList()));
+        Mockito.when(query.list()).thenReturn(Uni.createFrom().item(terminalEntities));
         Mockito.when(terminalRepository.find("serviceProviderId", "serviceProviderId")).thenReturn(query);
 
         var terminalList = terminalService.getTerminalListPaged("serviceProviderId", 0, 10);
-
         terminalList
                 .subscribe()
                 .withSubscriber(UniAssertSubscriber.create())
-                .assertItem(mockedList());
+                .assertItem(terminalEntities);
+
     }
 
     @Test
@@ -98,7 +106,7 @@ void whenGetTerminalCountThenSuccess() {
                 .withSubscriber(UniAssertSubscriber.create())
                 .assertItem(10L);
     }
-
+  
     @Test
     void testFindTerminal_Success() {
         ReactivePanacheQuery<TerminalEntity> query = Mockito.mock(ReactivePanacheQuery.class);

src/test/java/it/pagopa/swclient/mil/util/TerminalTestData.java

@@ -28,7 +28,7 @@ public static TerminalEntity getCorrectTerminalEntity() {
         terminalEntity.setTerminalUuid("c7a1b24b0583477292ebdbaa");
         terminalEntity.setTerminalHandler("45856");
         terminalEntity.setTerminal(terminal);
-
+      
         return terminalEntity;
     }
 }

src/test/postman/mil-terminal-registry.postman_collection.json

@@ -8,7 +8,7 @@
 	},
 	"item": [
 		{
-			"name": "getTerminalRegistryAccessToken",
+			"name": "Get Terminal Registry Access Token",
 			"event": [
 				{
 					"listen": "test",
@@ -57,7 +57,7 @@
 				"header": [
 					{
 						"key": "RequestId",
-						"value": "{{$guid}}",
+						"value": "{{requestId}}",
 						"type": "text"
 					},
 					{
@@ -99,22 +99,29 @@
 			"response": []
 		},
 		{
-			"name": "createTerminal",
+			"name": "Create New Terminal",
+			"event": [
+				{
+					"listen": "test",
+					"script": {
+						"exec": [
+							"pm.test(\"Status code is 201\", function () {",
+							"    pm.response.to.have.status(201);",
+							"});",
+							""
+						],
+						"type": "text/javascript",
+						"packages": {}
+					}
+				}
+			],
 			"request": {
 				"method": "POST",
 				"header": [
 					{
 						"description": "(Required) Request Id that will be logged by services",
 						"key": "RequestId",
-						"value": "{{$guid}}"
-					},
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					},
-					{
-						"key": "Accept",
-						"value": "application/json"
+						"value": "{{requestId}}"
 					}
 				],
 				"body": {
@@ -138,6 +145,57 @@
 				"description": "Creates a new terminal"
 			},
 			"response": []
+		},
+		{
+			"name": "Get Terminal List",
+			"event": [
+				{
+					"listen": "test",
+					"script": {
+						"exec": [
+							"pm.test(\"Status code is 200\", function () {",
+							"    pm.response.to.have.status(200);",
+							"});",
+							""
+						],
+						"type": "text/javascript",
+						"packages": {}
+					}
+				}
+			],
+			"request": {
+				"method": "GET",
+				"header": [
+					{
+						"description": "(Required) Request Id that will be logged by services",
+						"key": "RequestId",
+						"value": "{{requestId}}"
+					}
+				],
+				"url": {
+					"raw": "{{MIL_TR_BASE_URL}}/terminals?page={{getTerminalPage}}&size={{getTerminalPageSize}}",
+					"host": [
+						"{{MIL_TR_BASE_URL}}"
+					],
+					"path": [
+						"terminals"
+					],
+					"query": [
+						{
+							"key": "page",
+							"value": "{{getTerminalPage}}",
+							"description": "(Required) Number of the requested page of data"
+						},
+						{
+							"key": "size",
+							"value": "{{getTerminalPageSize}}",
+							"description": "(Required) Size of the requested page of data"
+						}
+					]
+				},
+				"description": "Returns a page of terminals"
+			},
+			"response": []
 		}
 	],
 	"auth": {
@@ -224,6 +282,18 @@
 		{
 			"key": "mil_auth_api_version",
 			"value": "1.0.0"
+		},
+		{
+			"key": "getTerminalPage",
+			"value": "0"
+		},
+		{
+			"key": "getTerminalPageSize",
+			"value": "10"
+		},
+		{
+			"key": "requestId",
+			"value": "d0d654e6-97da-4848-b568-99fedccb642b"
 		}
 	]
 }