Fix get contract

pagopa · Dec 20, 2024 · 29c5794 · 29c5794
1 parent 51a43f2
commit 29c5794
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/...functions/src/main/java/it/pagopa/selfcare/onboarding/service/ContractServiceDefault.java b/...functions/src/main/java/it/pagopa/selfcare/onboarding/service/ContractServiceDefault.java
@@ -51,7 +51,6 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Optional;
 import java.util.UUID;
 import java.util.function.Function;
@@ -423,7 +422,7 @@ public File retrieveAttachment(OnboardingAttachment onboardingAttachment, String
 
   @Override
   public Optional<File> getLogoFile() {
-    if (Objects.nonNull(isLogoEnable) && isLogoEnable) {
+    if (Boolean.TRUE.equals(isLogoEnable)) {
 
       StringBuilder stringBuilder =
           new StringBuilder(

diff --git a/...nboarding-ms/src/main/java/it/pagopa/selfcare/onboarding/service/TokenServiceDefault.java b/...nboarding-ms/src/main/java/it/pagopa/selfcare/onboarding/service/TokenServiceDefault.java
@@ -39,8 +39,7 @@ public Uni<List<Token>> getToken(String onboardingId) {
     }
     @Override
     public Uni<RestResponse<File>> retrieveContractNotSigned(String onboardingId) {
-        return Token.find("onboardingId = ?1 and type = ?2", onboardingId, INSTITUTION.name())
-                .firstResult()
+        return Token.findById(onboardingId)
                 .map(Token.class::cast)
                 .onItem().transformToUni(token ->
                             Uni.createFrom().item(() -> azureBlobClient.getFileAsPdf(String.format("%s%s/%s", onboardingMsConfig.getContractPath(), onboardingId, token.getContractFilename())))

diff --git a/...rding-ms/src/test/java/it/pagopa/selfcare/onboarding/service/TokenServiceDefaultTest.java b/...rding-ms/src/test/java/it/pagopa/selfcare/onboarding/service/TokenServiceDefaultTest.java
@@ -62,11 +62,10 @@ void retrieveContractNotSigned() {
         token.setContractFilename("fileName");
         token.setType(TokenType.INSTITUTION);
         ReactivePanacheQuery queryPage = mock(ReactivePanacheQuery.class);
-        when(queryPage.firstResult()).thenReturn(Uni.createFrom().item(token));
 
         PanacheMock.mock(Token.class);
-        when(Token.find("onboardingId = ?1 and type = ?2", onboardingId, INSTITUTION.name()))
-                .thenReturn(queryPage);
+        when(Token.findById(onboardingId))
+                .thenReturn(Uni.createFrom().item(token));
 
         when(azureBlobClient.getFileAsPdf(anyString())).thenReturn(new File("fileName"));