add the extraction of the subject from jwt token and update the relat…

…ive tests
pagopa · Jan 31, 2025 · f048952 · f048952
1 parent 966afb4
commit f048952
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 6 deletions.
diff --git a/src/main/java/it/gov/pagopa/rtp/activator/controller/rtp/RtpDtoMapper.java b/src/main/java/it/gov/pagopa/rtp/activator/controller/rtp/RtpDtoMapper.java
@@ -34,7 +34,7 @@ public Rtp toRtpWithSpCr(CreateRtpDto createRtpDto, String subject) {
         .payerId(createRtpDto.getPayer().getPayerId()).payeeName(createRtpDto.getPayee().getName())
         .payeeId(createRtpDto.getPayee().getPayeeId()).rtpSpId("rtpSpId").iban("iban")
         .subject(createRtpDto.getPaymentNotice().getSubject())
-        .SpCreditor(subject)
+        .spCreditor(subject)
         .payTrxRef(createRtpDto.getPayee().getPayTrxRef()).flgConf("flgConf").build();
   }
 

diff --git a/src/main/java/it/gov/pagopa/rtp/activator/domain/rtp/Rtp.java b/src/main/java/it/gov/pagopa/rtp/activator/domain/rtp/Rtp.java
@@ -9,7 +9,7 @@
 public record Rtp(String noticeNumber, BigDecimal amount, String description, LocalDate expiryDate,
     String payerId, String payerName, String payeeName, String payeeId, ResourceID resourceID,
     String subject, LocalDateTime savingDateTime, String rtpSpId, String iban,
-    String payTrxRef, String flgConf, RtpStatus status, String SpCreditor) {
+    String payTrxRef, String flgConf, RtpStatus status, String spCreditor) {
 
   public Rtp toRtpWithActivationInfo(String rtpSpId) {
     return Rtp.builder()
@@ -27,7 +27,7 @@ public Rtp toRtpWithActivationInfo(String rtpSpId) {
         .expiryDate(this.expiryDate())
         .resourceID(this.resourceID())
         .subject(this.subject())
-        .SpCreditor(this.SpCreditor())
+        .spCreditor(this.spCreditor())
         .savingDateTime(this.savingDateTime())
         .status(RtpStatus.CREATED)
         .build();
@@ -49,7 +49,7 @@ public Rtp toRtpSent(Rtp rtp) {
         .expiryDate(rtp.expiryDate())
         .resourceID(rtp.resourceID())
         .subject(this.subject())
-        .SpCreditor(this.SpCreditor())
+        .spCreditor(this.spCreditor())
         .savingDateTime(rtp.savingDateTime())
         .status(RtpStatus.SENT)
         .build();

diff --git a/src/main/java/it/gov/pagopa/rtp/activator/repository/rtp/RtpEntity.java b/src/main/java/it/gov/pagopa/rtp/activator/repository/rtp/RtpEntity.java
@@ -34,4 +34,6 @@ public class RtpEntity {
   private String payTrxRef;
   private String flgConf;
   private String status;
+  private String spCreditor;
+
 }
diff --git a/src/main/java/it/gov/pagopa/rtp/activator/repository/rtp/RtpMapper.java b/src/main/java/it/gov/pagopa/rtp/activator/repository/rtp/RtpMapper.java
@@ -29,6 +29,7 @@ public Rtp toDomain(RtpEntity rtpEntity) {
         .flgConf(rtpEntity.getFlgConf())
         .subject(rtpEntity.getSubject())
         .status(RtpStatus.valueOf(rtpEntity.getStatus()))
+        .spCreditor(rtpEntity.getSpCreditor())
         .build();
   }
 
@@ -50,6 +51,7 @@ public RtpEntity toDbEntity(Rtp rtp) {
         .flgConf(rtp.flgConf())
         .subject(rtp.subject())
         .status(rtp.status().name())
+        .spCreditor(rtp.spCreditor())
         .build();
   }
 }
diff --git a/src/test/java/it/gov/pagopa/rtp/activator/controller/rtp/RtpDtoMapperTest.java b/src/test/java/it/gov/pagopa/rtp/activator/controller/rtp/RtpDtoMapperTest.java
@@ -99,6 +99,6 @@ void testTtoRtpWithSpCroRtp() {
     assertThat(rtp.iban()).isEqualTo("iban");
     assertThat(rtp.payTrxRef()).isEqualTo(createRtpDto.getPayee().getPayTrxRef());
     assertThat(rtp.flgConf()).isEqualTo("flgConf");
-    assertThat(rtp.SpCreditor()).isEqualTo(subject);
+    assertThat(rtp.spCreditor()).isEqualTo(subject);
   }
 }
diff --git a/src/test/java/it/gov/pagopa/rtp/activator/controller/rtp/SendAPIControllerImplTest.java b/src/test/java/it/gov/pagopa/rtp/activator/controller/rtp/SendAPIControllerImplTest.java
@@ -86,7 +86,7 @@ void setup() {
         .savingDateTime(LocalDateTime.now()).rtpSpId(rtpSpId)
         .payerName(payerName)
         .subject(subject)
-        .SpCreditor(SpCreditor)
+        .spCreditor(SpCreditor)
         .iban(iban).payTrxRef(payTrxRef)
         .flgConf(flgConf).build();
 

diff --git a/src/test/java/it/gov/pagopa/rtp/activator/repository/rtp/RtpDBRepositoryTest.java b/src/test/java/it/gov/pagopa/rtp/activator/repository/rtp/RtpDBRepositoryTest.java
@@ -54,6 +54,7 @@ void testSaveRtp() {
         .payTrxRef("ABC/124")
         .flgConf("Y")
         .status(RtpStatus.CREATED)
+        .spCreditor("PagoPA")
         .build();
 
     RtpEntity rtpEntity = RtpEntity.builder()
@@ -71,6 +72,7 @@ void testSaveRtp() {
         .payTrxRef(rtp.payTrxRef())
         .flgConf(rtp.flgConf())
         .status("CREATED")
+        .spCreditor("PagoPA")
         .build();
 
     when(rtpDB.save(any())).thenReturn(Mono.just(rtpEntity));
@@ -94,6 +96,7 @@ void testSaveRtp() {
           assertEquals(rtp.payTrxRef(), savedRtp.payTrxRef());
           assertEquals(rtp.flgConf(), savedRtp.flgConf());
           assertEquals(rtp.status(), savedRtp.status());
+          assertEquals(rtp.spCreditor(), rtpEntity.getSpCreditor());
         })
         .verifyComplete();
   }

diff --git a/src/test/java/it/gov/pagopa/rtp/activator/repository/rtp/RtpDtoMapperTest.java b/src/test/java/it/gov/pagopa/rtp/activator/repository/rtp/RtpDtoMapperTest.java
@@ -44,6 +44,7 @@ void toDomain() {
         .payTrxRef("ABC/124")
         .flgConf("Y")
         .status(RtpStatus.CREATED.name())
+        .spCreditor("PagoPA")
         .build();
 
     Rtp rtp = rtpMapper.toDomain(rtpEntity);
@@ -64,6 +65,7 @@ void toDomain() {
     assertEquals(rtpEntity.getPayTrxRef(), rtp.payTrxRef());
     assertEquals(rtpEntity.getFlgConf(), rtp.flgConf());
     assertEquals(rtpEntity.getStatus(), rtp.status().name());
+    assertEquals(rtpEntity.getSpCreditor(), rtp.spCreditor());
   }
 
   @Test
@@ -86,6 +88,7 @@ void toDbEntity() {
         .payTrxRef("ABC/124")
         .flgConf("Y")
         .status(RtpStatus.CREATED)
+        .spCreditor("PagoPA")
         .build();
 
     RtpEntity rtpEntity = rtpMapper.toDbEntity(rtp);
@@ -106,5 +109,6 @@ void toDbEntity() {
     assertEquals(rtp.payTrxRef(), rtpEntity.getPayTrxRef());
     assertEquals(rtp.flgConf(), rtpEntity.getFlgConf());
     assertEquals(rtp.status().name(), rtpEntity.getStatus());
+    assertEquals(rtp.spCreditor(), rtpEntity.getSpCreditor());
   }
 }