Merge branch 'P4ADEV-1648-WF-PaymentsReportingIngestion-worker-dao-fo…

…r-saving-data-' of https://github.com/pagopa/p4pa-workflow-worker into P4ADEV-1653-WF-IngestionFlowFile-worker-dao-for-saving-data

# Conflicts:
#	src/main/java/it/gov/pagopa/pu/worker/paymentsreporting/IngestionFlowFileDaoImpl.java
#	src/main/java/it/gov/pagopa/pu/worker/paymentsreporting/mapper/IngestionFlowFileMapper.java

build.gradle.kts

@@ -39,14 +39,14 @@ repositories {
 val springDocOpenApiVersion = "2.6.0"
 val openApiToolsVersion = "0.2.6"
 val micrometerVersion = "1.4.0"
-val p4paActivitiesVersion = "1.+"
+val p4paActivitiesVersion = "1.13.0"
 
 dependencies {
 	implementation("org.springframework.boot:spring-boot-starter")
 	implementation("org.springframework.boot:spring-boot-starter-web")
 	implementation("org.springframework.boot:spring-boot-starter-actuator")
-    implementation("org.springframework.boot:spring-boot-starter-data-jpa")
-    implementation("io.micrometer:micrometer-tracing-bridge-otel:$micrometerVersion")
+  implementation("org.springframework.boot:spring-boot-starter-data-jpa")
+  implementation("io.micrometer:micrometer-tracing-bridge-otel:$micrometerVersion")
 	implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:$springDocOpenApiVersion")
 	implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310")
 	implementation("org.openapitools:jackson-databind-nullable:$openApiToolsVersion")
@@ -60,8 +60,8 @@ dependencies {
 	testImplementation ("org.projectlombok:lombok")
 
 
-    // p4pa activities library
-    implementation("it.gov.pagopa.payhub:p4pa-payhub-activities:$p4paActivitiesVersion")
+  // p4pa activities library
+  implementation("it.gov.pagopa.payhub:p4pa-payhub-activities:$p4paActivitiesVersion")
 
 }
 

gradle.lockfile

@@ -34,7 +34,7 @@ io.opentelemetry:opentelemetry-sdk:1.37.0=compileClasspath
 io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=compileClasspath
 io.swagger.core.v3:swagger-core-jakarta:2.2.22=compileClasspath
 io.swagger.core.v3:swagger-models-jakarta:2.2.22=compileClasspath
-it.gov.pagopa.payhub:p4pa-payhub-activities:1.12.4-SNAPSHOT=compileClasspath
+it.gov.pagopa.payhub:p4pa-payhub-activities:1.13.0=compileClasspath
 jakarta.activation:jakarta.activation-api:2.1.3=compileClasspath
 jakarta.annotation:jakarta.annotation-api:2.1.1=compileClasspath
 jakarta.persistence:jakarta.persistence-api:3.1.0=compileClasspath

src/main/java/it/gov/pagopa/pu/worker/service/IngestionFlowFileDaoImpl.java → src/main/java/it/gov/pagopa/pu/worker/ingestionflowfile/IngestionFlowFileDaoImpl.java

@@ -1,4 +1,4 @@
-package it.gov.pagopa.pu.worker.service;
+package it.gov.pagopa.pu.worker.ingestionflowfile;
 
 import it.gov.pagopa.payhub.activities.dao.IngestionFlowFileDao;
 import it.gov.pagopa.payhub.activities.dto.IngestionFlowFileDTO;
@@ -13,11 +13,6 @@ public Optional<IngestionFlowFileDTO> findById(Long ingestionFlowFileId) {
     return Optional.empty();
   }
 
-  @Override
-  public String findErrorFileUrl(Long ingestionFlowFileId) {
-    return null;
-  }
-
   @Override
   public boolean updateStatus(Long ingestionFlowFileId, String status) {
     return false;

src/main/java/it/gov/pagopa/pu/worker/ingestionflowfile/mapper/IngestionFlowFileMapper.java

@@ -0,0 +1,4 @@
+package it.gov.pagopa.pu.worker.ingestionflowfile.mapper;
+
+public class IngestionFlowFileMapper {
+}

src/main/java/it/gov/pagopa/pu/worker/service/PaymentsReportingDaoImpl.java → src/main/java/it/gov/pagopa/pu/worker/paymentsreporting/PaymentsReportingDaoImpl.java

@@ -1,8 +1,8 @@
-package it.gov.pagopa.pu.worker.service;
+package it.gov.pagopa.pu.worker.paymentsreporting;
 
 import it.gov.pagopa.payhub.activities.dao.PaymentsReportingDao;
 import it.gov.pagopa.payhub.activities.dto.paymentsreporting.PaymentsReportingDTO;
-import it.gov.pagopa.pu.worker.mapper.PaymentsReportingMapper;
+import it.gov.pagopa.pu.worker.paymentsreporting.mapper.PaymentsReportingMapper;
 import it.gov.pagopa.pu.worker.paymentsreporting.model.PaymentsReporting;
 import it.gov.pagopa.pu.worker.paymentsreporting.service.PaymentsReportingService;
 import org.springframework.stereotype.Service;

src/main/java/it/gov/pagopa/pu/worker/mapper/PaymentsReportingMapper.java → src/main/java/it/gov/pagopa/pu/worker/paymentsreporting/mapper/PaymentsReportingMapper.java

@@ -1,4 +1,4 @@
-package it.gov.pagopa.pu.worker.mapper;
+package it.gov.pagopa.pu.worker.paymentsreporting.mapper;
 
 import it.gov.pagopa.payhub.activities.dto.paymentsreporting.PaymentsReportingDTO;
 import it.gov.pagopa.pu.worker.paymentsreporting.model.PaymentsReporting;

src/test/java/it/gov/pagopa/pu/worker/mapper/PaymentsReportingMapperTest.java

@@ -1,6 +1,7 @@
 package it.gov.pagopa.pu.worker.mapper;
 
 import it.gov.pagopa.payhub.activities.dto.paymentsreporting.PaymentsReportingDTO;
+import it.gov.pagopa.pu.worker.paymentsreporting.mapper.PaymentsReportingMapper;
 import it.gov.pagopa.pu.worker.paymentsreporting.model.PaymentsReporting;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;

src/test/java/it/gov/pagopa/pu/worker/service/PaymentsReportingDaoImplTest.java

@@ -1,7 +1,8 @@
 package it.gov.pagopa.pu.worker.service;
 
 import it.gov.pagopa.payhub.activities.dto.paymentsreporting.PaymentsReportingDTO;
-import it.gov.pagopa.pu.worker.mapper.PaymentsReportingMapper;
+import it.gov.pagopa.pu.worker.paymentsreporting.mapper.PaymentsReportingMapper;
+import it.gov.pagopa.pu.worker.paymentsreporting.PaymentsReportingDaoImpl;
 import it.gov.pagopa.pu.worker.paymentsreporting.model.PaymentsReporting;
 import it.gov.pagopa.pu.worker.paymentsreporting.service.PaymentsReportingService;
 import org.junit.jupiter.api.BeforeEach;