fix: Fix random value on postman test (#19)

pagopa · Jan 13, 2025 · bc7e96a · bc7e96a
1 parent 87bc149
commit bc7e96a
Show file tree

Hide file tree

Showing 5 changed files with 64 additions and 36 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -102,13 +102,7 @@ RUN mkdir -p src/main/java && \
 
 USER ${APP_USER}
 
-RUN gradle openApiGeneratePayhub dependencies --no-daemon
-
-RUN gradle openApiGeneratePdndClient dependencies --no-daemon
-
-RUN gradle openApiGenerateAnprApiC030 dependencies --no-daemon
-
-RUN gradle openApiGenerateAnprApiC003 dependencies --no-daemon
+RUN gradle dependenciesBuild dependencies --no-daemon
 
 #
 # 🏗️ Build Stage

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -46,6 +46,7 @@ dependencies {
 	implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310")
 	implementation("org.openapitools:jackson-databind-nullable:$openApiToolsVersion")
 	implementation("io.micrometer:micrometer-tracing-bridge-otel:$micrometerVersion")
+	implementation("io.micrometer:micrometer-registry-prometheus")
 
 	// validation token jwt
 	implementation("com.auth0:java-jwt:$javaJwtVersion")
@@ -98,7 +99,19 @@ configurations {
 }
 
 tasks.compileJava {
-	dependsOn("openApiGeneratePayhub","openApiGeneratePdndClient","openApiGenerateAnprApiC030", "openApiGenerateAnprApiC003")
+	dependsOn("dependenciesBuild")
+}
+
+tasks.register("dependenciesBuild") {
+	group = "AutomaticallyGeneratedCode"
+	description = "grouping all together automatically generate code tasks"
+
+	dependsOn(
+		"openApiGeneratePDNDSERVICES",
+		"openApiGeneratePdndClient",
+		"openApiGenerateAnprApiC030",
+		"openApiGenerateAnprApiC003"
+	)
 }
 
 configure<SourceSetContainer> {
@@ -112,7 +125,7 @@ springBoot {
 	mainClass.value("it.gov.pagopa.payhub.pdnd.PayhubPdndApplication")
 }
 
-tasks.register<org.openapitools.generator.gradle.plugin.tasks.GenerateTask>("openApiGeneratePayhub") {
+tasks.register<org.openapitools.generator.gradle.plugin.tasks.GenerateTask>("openApiGeneratePDNDSERVICES") {
 	group = "openapi"
 	description = "description"
 
@@ -127,10 +140,10 @@ tasks.register<org.openapitools.generator.gradle.plugin.tasks.GenerateTask>("ope
 		"useSpringBoot3" to "true",
 		"interfaceOnly" to "true",
 		"useTags" to "true",
-		"generateConstructorWithAllArgs" to "false",
+		"useBeanValidation" to "true",
+		"generateConstructorWithAllArgs" to "true",
 		"generatedConstructorWithRequiredArgs" to "true",
-		"additionalModelTypeAnnotations" to "@lombok.Data @lombok.Builder @lombok.AllArgsConstructor",
-		"serializationLibrary" to "jackson"
+		"additionalModelTypeAnnotations" to "@lombok.Builder"
 	))
 }
 

diff --git a/gradle.lockfile b/gradle.lockfile
@@ -21,6 +21,7 @@ io.micrometer:micrometer-commons:1.14.2=compileClasspath
 io.micrometer:micrometer-core:1.14.2=compileClasspath
 io.micrometer:micrometer-jakarta9:1.14.2=compileClasspath
 io.micrometer:micrometer-observation:1.14.2=compileClasspath
+io.micrometer:micrometer-registry-prometheus:1.14.2=compileClasspath
 io.micrometer:micrometer-tracing-bridge-otel:1.4.1=compileClasspath
 io.micrometer:micrometer-tracing:1.4.1=compileClasspath
 io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator:2.9.0-alpha=compileClasspath
@@ -34,6 +35,10 @@ io.opentelemetry:opentelemetry-sdk-logs:1.43.0=compileClasspath
 io.opentelemetry:opentelemetry-sdk-metrics:1.43.0=compileClasspath
 io.opentelemetry:opentelemetry-sdk-trace:1.43.0=compileClasspath
 io.opentelemetry:opentelemetry-sdk:1.43.0=compileClasspath
+io.prometheus:prometheus-metrics-config:1.3.5=compileClasspath
+io.prometheus:prometheus-metrics-core:1.3.5=compileClasspath
+io.prometheus:prometheus-metrics-model:1.3.5=compileClasspath
+io.prometheus:prometheus-metrics-tracer-common:1.3.5=compileClasspath
 io.swagger.core.v3:swagger-annotations-jakarta:2.2.25=compileClasspath
 io.swagger.core.v3:swagger-core-jakarta:2.2.25=compileClasspath
 io.swagger.core.v3:swagger-models-jakarta:2.2.25=compileClasspath

diff --git a/postman/p4pa-pdnd-services-E2E.postman_collection.json b/postman/p4pa-pdnd-services-E2E.postman_collection.json
@@ -1,11 +1,11 @@
 {
 	"info": {
-		"_postman_id": "2474956e-ea82-4ca1-a3f4-19579b4b7f67",
-		"name": "P4PA-PDND-Service API",
+		"_postman_id": "21c09e17-4ba6-4b2f-ab0c-71d1e4fd1c97",
+		"name": "p4pa-pdnd-services-E2E",
 		"description": "API and Models.",
 		"schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json",
 		"_exporter_id": "15747968",
-		"_collection_link": "https://warped-astronaut-141685.postman.co/workspace/P4PA~9a8b7dd5-97b6-4dd0-b3f5-95f25fd0b455/collection/15747968-2474956e-ea82-4ca1-a3f4-19579b4b7f67?action=share&source=collection_link&creator=15747968"
+		"_collection_link": "https://warped-astronaut-141685.postman.co/workspace/P4PA~9a8b7dd5-97b6-4dd0-b3f5-95f25fd0b455/collection/15747968-21c09e17-4ba6-4b2f-ab0c-71d1e4fd1c97?action=share&source=collection_link&creator=15747968"
 	},
 	"item": [
 		{
@@ -27,13 +27,13 @@
 									"pm.test(\"p4paAuth - 01_authtoken jwt - Verify response body\", function () {\r",
 									"    let jsonResponse = pm.response.json();\r",
 									"\r",
-									"    pm.expect(jsonResponse).have.property(\"accessToken\")\r",
-									"    pm.expect(jsonResponse).have.property(\"tokenType\")\r",
-									"    pm.expect(jsonResponse).have.property(\"expiresIn\")\r",
+									"    pm.expect(jsonResponse).have.property(\"access_token\")\r",
+									"    pm.expect(jsonResponse).have.property(\"token_type\")\r",
+									"    pm.expect(jsonResponse).have.property(\"expires_in\")\r",
 									"});\r",
 									"\r",
 									"let jsonResponse = pm.response.json();\r",
-									"pm.collectionVariables.set(\"accessToken\", jsonResponse.accessToken);\r",
+									"pm.collectionVariables.set(\"accessToken\", jsonResponse.access_token);\r",
 									""
 								],
 								"type": "text/javascript",
@@ -45,12 +45,11 @@
 						"method": "POST",
 						"header": [],
 						"url": {
-							"raw": "{{p4paAuthBaseUrl}}/payhub/auth/token?client_id=piattaforma-unitaria&grant_type=urn:ietf:params:oauth:grant-type:token-exchange&subject_token={{tokenExchange_subjectToken}}&subject_issuer={{tokenExchange_issuer}}&scope=openid&subject_token_type=urn:ietf:params:oauth:token-type:jwt",
+							"raw": "{{p4paAuthBaseUrl}}/auth/token?client_id=piattaforma-unitaria&grant_type=urn:ietf:params:oauth:grant-type:token-exchange&subject_token={{tokenExchange_subjectToken}}&subject_issuer={{tokenExchange_issuer}}&scope=openid&subject_token_type=urn:ietf:params:oauth:token-type:jwt",
 							"host": [
 								"{{p4paAuthBaseUrl}}"
 							],
 							"path": [
-								"payhub",
 								"auth",
 								"token"
 							],
@@ -103,12 +102,12 @@
 									"pm.test(\"MyPay - 02_getCitizenData - check response and reading citizen data\", function () {\r",
 									"    let jsonResponse = pm.response.json();\r",
 									"\r",
-									"    pm.expect(jsonResponse).to.have.property(\"firstName\", \"Julieta\");\r",
-									"    pm.expect(jsonResponse).to.have.property(\"lastName\", \"Lindgren\");\r",
-									"    pm.expect(jsonResponse).to.have.property(\"dateOfBirth\", \"1975-03-09\");\r",
+									"    pm.expect(jsonResponse).to.have.property(\"firstName\", \"Norris\");\r",
+									"    pm.expect(jsonResponse).to.have.property(\"lastName\", \"Jones\");\r",
+									"    pm.expect(jsonResponse).to.have.property(\"dateOfBirth\", \"2005-07-28\");\r",
 									"    \r",
 									"    pm.expect(jsonResponse).to.have.property(\"address\");\r",
-									"    pm.expect(jsonResponse.address).to.have.property(\"street\", \"Turner Run\");\r",
+									"    pm.expect(jsonResponse.address).to.have.property(\"street\", \"Barabara Passage\");\r",
 									"    pm.expect(jsonResponse.address).to.have.property(\"city\", \"Roma\");\r",
 									"    pm.expect(jsonResponse.address).to.have.property(\"postalCode\", \"00100\");\r",
 									"    pm.expect(jsonResponse.address).to.have.property(\"country\", \"Italia\");\r",
@@ -129,9 +128,9 @@
 							}
 						],
 						"url": {
-							"raw": "{{baseUrlPdnd}}/anpr-service-e002/citizen?fiscalCode={{fiscalCode}}",
+							"raw": "{{pdndServicesBaseUrl}}/anpr-service-e002/citizen?fiscalCode={{fiscalCode}}",
 							"host": [
-								"{{baseUrlPdnd}}"
+								"{{pdndServicesBaseUrl}}"
 							],
 							"path": [
 								"anpr-service-e002",
@@ -468,10 +467,6 @@
 		}
 	],
 	"variable": [
-		{
-			"key": "baseUrlPdnd",
-			"value": "https://hub.internal.dev.p4pa.pagopa.it/p4papdnd"
-		},
 		{
 			"key": "fiscalCode",
 			"value": "DNTCRL65S67M126K",

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -1,3 +1,6 @@
+server:
+  http: "\${SERVER_PORT:8080}"
+
 spring:
     application:
       name: ${artifactId}
@@ -8,17 +11,35 @@ spring:
         enabled: "\${VIRTUAL_THREADS_ENABLED:true}"
 
 management:
+    endpoints:
+      jmx:
+        exposure.include: "*"
+      web:
+        exposure:
+          include: health, info, prometheus, metrics
+        base-path: /actuator
     endpoint:
       health:
         probes.enabled: true
         group:
           readiness.include: "*"
           liveness.include: livenessState,diskSpace,ping
-    endpoints:
-      jmx:
-        exposure.include: "*"
-      web:
-        exposure.include: info, health
+      prometheus:
+        enabled: true
+    metrics:
+      tags:
+        application: ${artifactId}
+      export:
+        prometheus:
+          enabled: true
+          step: 1m
+          descriptions: true
+      enable:
+        jvm: true
+        process: true
+        system: true
+        http: true
+        logback: true
 
 app:
     pdnd: