update for check performance

Dockerfile

@@ -1,17 +1,18 @@
-FROM adoptopenjdk/openjdk11:alpine-jre as builder
-
-ARG JAR_FILE=target/*.jar
-COPY ${JAR_FILE}  application.jar
-RUN java -Djarmode=layertools -jar application.jar extract
+#
+# Build
+#
+FROM maven:3.8.4-jdk-11-slim as buildtime
+WORKDIR /build
+COPY . .
+RUN mvn clean package -Dmaven.test.skip=true
 
-FROM adoptopenjdk/openjdk11:alpine-jre
 
-RUN addgroup -S spring && adduser -S spring -G spring
-USER spring:spring
+FROM adoptopenjdk/openjdk11:alpine-jre as builder
+COPY --from=buildtime /build/target/*.jar application.jar
+RUN java -Djarmode=layertools -jar application.jar extract
 
-ADD --chown=spring:spring https://github.com/microsoft/ApplicationInsights-Java/releases/download/3.1.1/applicationinsights-agent-3.1.1.jar /applicationinsights-agent.jar
-COPY --chown=spring:spring docker/applicationinsights.json ./applicationinsights.json
 
+FROM ghcr.io/pagopa/docker-base-springboot-openjdk11:v1.0.1@sha256:bbbe948e91efa0a3e66d8f308047ec255f64898e7f9250bdb63985efd3a95dbf
 COPY --chown=spring:spring  --from=builder dependencies/ ./
 COPY --chown=spring:spring  --from=builder snapshot-dependencies/ ./
 # https://github.com/moby/moby/issues/37965#issuecomment-426853382
@@ -20,6 +21,3 @@ COPY --chown=spring:spring  --from=builder spring-boot-loader/ ./
 COPY --chown=spring:spring  --from=builder application/ ./
 
 EXPOSE 8080
-
-COPY --chown=spring:spring docker/run.sh ./run.sh
-ENTRYPOINT ["./run.sh"]

helm/Chart.yaml

@@ -2,9 +2,9 @@ apiVersion: v2
 name: pagopa-spontaneous-payments
 description: Microservice that handles spontaneous payments for pagoPA
 type: application
-version: 1.0.0
-appVersion: 1.0.0
+version: 0.1.0-22
+appVersion: 0.1.0-22
 dependencies:
-- name: microservice-chart
-  version: 1.21.0
-  repository: "https://pagopa.github.io/aks-microservice-chart-blueprint"
+  - name: microservice-chart
+    version: 1.21.0
+    repository: "https://pagopa.github.io/aks-microservice-chart-blueprint"

helm/values-dev.yaml

@@ -4,7 +4,7 @@ microservice-chart:
   fullnameOverride: ""
   image:
     repository: pagopadcommonacr.azurecr.io/pagopaspontaneouspayments
-    tag: "0.1.0" #improve
+    tag: "0.1.0-22" #improve
     pullPolicy: Always
   livenessProbe:
     httpGet:

helm/values-prod.yaml

@@ -4,7 +4,7 @@ microservice-chart:
   fullnameOverride: ""
   image:
     repository: pagopapcommonacr.azurecr.io/pagopaspontaneouspayments
-    tag: "0.1.0" #improve
+    tag: "0.1.0-22" #improve
     pullPolicy: Always
   livenessProbe:
     httpGet:

helm/values-uat.yaml

@@ -4,7 +4,7 @@ microservice-chart:
   fullnameOverride: ""
   image:
     repository: pagopaucommonacr.azurecr.io/pagopaspontaneouspayments
-    tag: "0.1.0" #improve
+    tag: "0.1.0-22" #improve
     pullPolicy: Always
   livenessProbe:
     httpGet:

load-test/src/create_spontaneous_payment.js

@@ -4,7 +4,7 @@ import { SharedArray } from 'k6/data';
 
 import { generateFakeFiscalCode, randomString } from './modules/helpers.js';
 
-import { createCreditorInstitutionEnrollment, getCiCode} from "./modules/gps_client.js";
+import { createCreditorInstitutionEnrollment } from "./modules/gps_client.js";
 
 export let options = JSON.parse(open(__ENV.TEST_TYPE));
 
@@ -22,48 +22,48 @@ const gpdUrlBasePath = `${vars.gpdBaseUrl}`;
 
 const creditor_institution_code = `organizationNew`;
 
-//export function setup() {
-//	// 2. setup code (once)
-//	// The setup code runs, setting up the test environment (optional) and generating data
-//	// used to reuse code for the same VU
-//	const params = {
-//		headers: {
-//			'Content-Type': 'application/json'
-//		},
-//	};
-//	const response = createCreditorInstitutionEnrollment(rootUrl, params, creditor_institution_code);
-//
-//    console.log(`setup ... ${response.status}`);
-//
-////    check(response, {
-////        "status is 201 or 409": (response) => (response.status === 201 || response.status === 409),
-////    });
-//
-//	// precondition is moved to default fn because in this stage
-//	// __VU is always 0 and cannot be used to create env properly
-//}
+export function setup() {
+	// 2. setup code (once)
+	// The setup code runs, setting up the test environment (optional) and generating data
+	// used to reuse code for the same VU
+	const params = {
+		headers: {
+			'Content-Type': 'application/json'
+		},
+	};
+	const response = createCreditorInstitutionEnrollment(rootUrl, params, creditor_institution_code);
+
+    console.log(`setup ... ${response.status}`);
+
+    check(response, {
+        "status is 201 or 409": (res) => (res.status === 201 || res.status === 409),
+    });
+
+	// precondition is moved to default fn because in this stage
+	// __VU is always 0 and cannot be used to create env properly
+}
 
 function precondition() {
 	// no pre conditions
 }
 
-//function postcondition(iupd, params) {
-//
-//	// Delete the newly created debt position.
-//	let tag = {
-//		gpdMethod: "DeleteDebtPosition",
-//	};
-//
-//	let url = `${gpdUrlBasePath}/organizations/${creditor_institution_code}/debtpositions/${iupd}`;
-//
-//	let r = http.del(url, params);
-//
-//	console.log("DeleteDebtPosition call - creditor_institution_code " + creditor_institution_code + ", iupd " + iupd + ", Status " + r.status);
-//
-//	check(r, {
-//		"DeleteDebtPosition status is 200": (_r) => r.status === 200,
-//	}, tag);
-//}
+function postcondition(iupd, params) {
+
+	// Delete the newly created debt position.
+	let tag = {
+		gpdMethod: "DeleteDebtPosition",
+	};
+
+	let url = `${gpdUrlBasePath}/organizations/${creditor_institution_code}/debtpositions/${iupd}`;
+
+	let r = http.del(url, params);
+
+	console.log("DeleteDebtPosition call - creditor_institution_code " + creditor_institution_code + ", iupd " + iupd + ", Status " + r.status);
+
+	check(r, {
+		"DeleteDebtPosition status is 200": (_r) => r.status === 200,
+	}, tag);
+}
 
 export default function() {
 
@@ -125,9 +125,9 @@ export default function() {
 	}, tag);
 
 	// If flag delete_debt_position is set to true the debit position is deleted after being created
-//	if (r.status === 201 && delete_debt_position === "true") {
-//		postcondition(r.json().iupd, params);
-//	}
+	if (r.status === 201 && delete_debt_position === "true") {
+		postcondition(r.json().iupd, params);
+	}
 
 
 }

load-test/src/local.environment.json

@@ -2,7 +2,7 @@
   "environment": [
     {
       "env": "local",
-      "host": "http://localhost:55397",
+      "host": "https://api.dev.platform.pagopa.it/gps/spontaneous-payments-service/v1",
       "basePath": "organizations",
       "gpdBaseUrl": "https://api.dev.platform.pagopa.it/gpd/api/v1",
       "deleteDebtPosition": true

openapi/openapi.json

@@ -4,7 +4,7 @@
     "title": "PagoPA API Spontaneous Payment",
     "description": "Progetto Gestione Pagamenti Spontanei",
     "termsOfService": "https://www.pagopa.gov.it/",
-    "version": "0.1.0-1"
+    "version": "0.1.0-22"
   },
   "servers": [
     {

pom.xml

@@ -13,7 +13,7 @@
 
     <groupId>it.gov.pagopa</groupId>
     <artifactId>spontaneouspayment</artifactId>
-    <version>0.1.0-1</version>
+    <version>0.1.0-22</version>
     <name>Gestione Pagamenti Spontanei</name>
     <description>Progetto Gestione Pagamenti Spontanei</description>
 
@@ -22,7 +22,7 @@
         <testcontainers.version>1.17.2</testcontainers.version>
         <springfox-version>3.0.0</springfox-version>
         <springdoc-version>1.6.9</springdoc-version>
-        <cosmos-data-version>3.21.0</cosmos-data-version>
+        <cosmos-data-version>3.28.1</cosmos-data-version>
         <openfeign-version>3.1.3</openfeign-version>
         <modelmapper-version>3.1.0</modelmapper-version>
         <json.version>20220320</json.version>

src/main/java/it/gov/pagopa/spontaneouspayment/config/CosmosDBConfiguration.java

@@ -9,7 +9,6 @@
 import com.azure.core.credential.AzureKeyCredential;
 import com.azure.cosmos.CosmosClientBuilder;
 import com.azure.cosmos.DirectConnectionConfig;
-import com.azure.cosmos.GatewayConnectionConfig;
 import com.azure.spring.data.cosmos.config.AbstractCosmosConfiguration;
 import com.azure.spring.data.cosmos.config.CosmosConfig;
 import com.azure.spring.data.cosmos.core.ResponseDiagnostics;
@@ -42,11 +41,10 @@ public class CosmosDBConfiguration extends AbstractCosmosConfiguration {
     CosmosClientBuilder getCosmosClientBuilder() {
         AzureKeyCredential azureKeyCredential = new AzureKeyCredential(key);
         DirectConnectionConfig directConnectionConfig = new DirectConnectionConfig();
-        GatewayConnectionConfig gatewayConnectionConfig = new GatewayConnectionConfig();
         return new CosmosClientBuilder()
                 .endpoint(uri)
                 .credential(azureKeyCredential)
-                .directMode(directConnectionConfig, gatewayConnectionConfig);
+                .directMode(directConnectionConfig);
     }
 
     @Override

src/main/java/it/gov/pagopa/spontaneouspayment/config/LoggingAspect.java

@@ -97,15 +97,15 @@ public Object logExecutionTime(ProceedingJoinPoint joinPoint) throws Throwable {
         long startTime = System.currentTimeMillis();
         Object result = joinPoint.proceed();
         long endTime = System.currentTimeMillis();
-        log.trace("Time taken for Execution of {} is: {}ms", joinPoint.getSignature().toShortString(), (endTime - startTime));
+        log.info("Time taken for Execution of {} is: {}ms", joinPoint.getSignature().toShortString(), (endTime - startTime));
         return result;
     }
 
     @Around(value = "repository() || service()")
     public Object logTrace(ProceedingJoinPoint joinPoint) throws Throwable {
-        log.debug("Call method {} - args: {}", joinPoint.getSignature().toShortString(), joinPoint.getArgs());
+        log.info("Call method {} - args: {}", joinPoint.getSignature().toShortString(), joinPoint.getArgs());
         Object result = joinPoint.proceed();
-        log.debug("Return method {} - result: {}", joinPoint.getSignature().toShortString(), result);
+        log.info("Return method {} - result: {}", joinPoint.getSignature().toShortString(), result);
         return result;
     }
 }

src/main/java/it/gov/pagopa/spontaneouspayment/entity/Organization.java

@@ -17,7 +17,7 @@
 import java.time.LocalDateTime;
 import java.util.List;
 
-@Container(containerName = "${azure.cosmos.ec-container-name}", autoCreateContainer = false)
+@Container(containerName = "${azure.cosmos.ec-container-name}", autoCreateContainer = false, ru="1000")
 @Getter
 @Setter
 @NoArgsConstructor

src/main/java/it/gov/pagopa/spontaneouspayment/entity/Service.java

@@ -16,7 +16,7 @@
 import java.time.LocalDateTime;
 import java.util.List;
 
-@Container(containerName = "${azure.cosmos.service-container-name}", autoCreateContainer = false)
+@Container(containerName = "${azure.cosmos.service-container-name}", autoCreateContainer = false, ru="1000")
 @Getter
 @Setter
 @NoArgsConstructor

src/main/java/it/gov/pagopa/spontaneouspayment/service/PaymentsService.java

@@ -27,6 +27,7 @@
 import it.gov.pagopa.spontaneouspayment.model.ServicePropertyModel;
 import it.gov.pagopa.spontaneouspayment.model.SpontaneousPaymentModel;
 import it.gov.pagopa.spontaneouspayment.model.enumeration.PropertyType;
+import it.gov.pagopa.spontaneouspayment.model.enumeration.Status;
 import it.gov.pagopa.spontaneouspayment.model.response.PaymentOptionModel;
 import it.gov.pagopa.spontaneouspayment.model.response.PaymentPositionModel;
 import it.gov.pagopa.spontaneouspayment.model.response.TransferModel;
@@ -35,7 +36,6 @@
 import it.gov.pagopa.spontaneouspayment.service.client.ExternalServiceClient;
 import it.gov.pagopa.spontaneouspayment.service.client.GpdClient;
 import it.gov.pagopa.spontaneouspayment.service.client.IuvGeneratorClient;
-import it.gov.pagopa.spontaneouspayment.model.enumeration.Status;
 import lombok.AllArgsConstructor;
 import lombok.NoArgsConstructor;
 
@@ -79,14 +79,16 @@ public PaymentPositionModel createSpontaneousPayment(@NotBlank String organizati
         var serviceConfiguration = getServiceDetails(spontaneousPayment.getService());
 
         // check if the relationship between organization and enrollment to service exists
-        checkServiceOrganization(organizationFiscalCode, serviceConfiguration);
+        checkServiceOrganization(orgConfiguration, serviceConfiguration);
 
         // checks if the service is in suitable state and the request contains the properties required by the configured service
         checkServiceConfiguration(spontaneousPayment, serviceConfiguration);
 
         return createDebtPosition(organizationFiscalCode, orgConfiguration, serviceConfiguration, spontaneousPayment);
+
     }
 
+
     /**
      * check if the credit institution's status is ENABLED
      *
@@ -143,10 +145,10 @@ private PaymentPositionModel createDebtPosition(String organizationFiscalCode,
                 .filter(e -> e.getServiceId().equals(serviceConfiguration.getId()))
                 .findAny()
                 .orElseThrow(() -> new AppException(AppError.ENROLLMENT_TO_SERVICE_NOT_FOUND, serviceConfiguration.getId(), organizationFiscalCode));
-
+        
         // call the external service to get the PO
         PaymentOptionModel po = this.callExternalService(spontaneousPayment, serviceConfiguration);
-
+        
         // generate IUV
         String iuv = this.callIuvGeneratorService(organizationFiscalCode, enrollment);
 
@@ -158,14 +160,13 @@ private PaymentPositionModel createDebtPosition(String organizationFiscalCode,
         transfer.setCategory(serviceConfiguration.getTransferCategory());
         transfer.setIban(enrollment.getIban());
         transfer.setPostalIban(enrollment.getPostalIban());
-
+      
         // Payment Position to create
         PaymentPositionModel pp = modelMapper.map(spontaneousPayment.getDebtor(), PaymentPositionModel.class);
         pp.setIupd(iupdPrefix + iuv);
         pp.setCompanyName(orgConfiguration.getCompanyName());
         pp.addPaymentOptions(po);
-
-
+
         return gpdClient.createDebtPosition(organizationFiscalCode, pp);
     }
 
@@ -199,12 +200,13 @@ private String callIuvGeneratorService(String organizationFiscalCode, ServiceRef
         return Optional.ofNullable(iuvObj).orElseThrow(() -> new AppException(AppError.IUV_ACQUISITION_ERROR, organizationFiscalCode, auxDigit, segregationCode)).getIuv();
     }
 
-    private void checkServiceOrganization(@NotBlank String organizationFiscalCode,
-                                          @NotNull it.gov.pagopa.spontaneouspayment.entity.Service service) {
-        var org = orgRepository.getCreditInstitutionByOrgFiscCodeAndServiceId(organizationFiscalCode, service.getId());
-        if (org.isEmpty()) {
-            throw new AppException(AppError.ORGANIZATION_SERVICE_NOT_FOUND, organizationFiscalCode, service.getId());
-        }
+
+    private void checkServiceOrganization(@NotNull Organization organization,
+    		@NotNull it.gov.pagopa.spontaneouspayment.entity.Service service) {
+    	Optional<ServiceRef> enrollment = organization.getEnrollments().stream().filter(e -> e.getServiceId().equals(service.getId())).findAny();
+    	if (enrollment.isEmpty()) {
+    		throw new AppException(AppError.ORGANIZATION_SERVICE_NOT_FOUND, organization.getFiscalCode(), service.getId());
+    	}
     }
 
     private it.gov.pagopa.spontaneouspayment.entity.Service getServiceDetails(@NotNull ServiceModel service) {

src/main/java/it/gov/pagopa/spontaneouspayment/service/client/IuvGeneratorClient.java

@@ -3,8 +3,8 @@
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.retry.annotation.Backoff;
 import org.springframework.retry.annotation.Retryable;
-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 feign.FeignException;
@@ -18,7 +18,7 @@ public interface IuvGeneratorClient {
 
     @Retryable(exclude = FeignException.FeignClientException.class, maxAttemptsExpression = "${retry.iuv-generator.maxAttempts}",
             backoff = @Backoff(delayExpression = "${retry.iuv-generator.maxDelay}"))
-    @GetMapping(value = "/organizations/{organizationfiscalcode}/iuv")
+    @PostMapping(value = "/organizations/{organizationfiscalcode}/iuv")
     IuvGenerationModelResponse generateIUV(@PathVariable("organizationfiscalcode") String organizationFiscalCode,
                                             @RequestBody IuvGenerationModel paymentPositionModel);