From a2290ba8393dda059cda5f9b7bae0fccd63944c8 Mon Sep 17 00:00:00 2001
From: gianmarcoplutino <gianmarco.plutino@pagopa.it>
Date: Wed, 27 Nov 2024 09:20:44 +0100
Subject: [PATCH] feat: updated saveTokenAttachment

---
 .../onboarding/service/OnboardingService.java |  5 ++---
 .../service/OnboardingServiceTest.java        | 19 -------------------
 2 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/apps/onboarding-functions/src/main/java/it/pagopa/selfcare/onboarding/service/OnboardingService.java b/apps/onboarding-functions/src/main/java/it/pagopa/selfcare/onboarding/service/OnboardingService.java
index 92dfcfe6c..4681432ad 100644
--- a/apps/onboarding-functions/src/main/java/it/pagopa/selfcare/onboarding/service/OnboardingService.java
+++ b/apps/onboarding-functions/src/main/java/it/pagopa/selfcare/onboarding/service/OnboardingService.java
@@ -146,8 +146,6 @@ public void saveTokenWithAttachment(OnboardingAttachment onboardingAttachment) {
 
     Onboarding onboarding = onboardingAttachment.getOnboarding();
 
-    //  if (checkTokenExist(onboarding)) return;
-
     Product product = productService.getProductIsValid(onboarding.getProductId());
 
     File contract = contractService.retrieveAttachment(onboardingAttachment, product.getTitle());
@@ -173,6 +171,7 @@ private void saveToken(OnboardingWorkflow onboardingWorkflow, Product product, S
 
     // Persist token entity
     Token token = buildBaseToken(onboarding, digest);
+    token.setId(onboarding.getId());
     token.setContractTemplate(onboardingWorkflow.getContractTemplatePath(product));
     token.setContractVersion(onboardingWorkflow.getContractTemplateVersion(product));
     token.setContractFilename(
@@ -191,6 +190,7 @@ private void saveTokenAttachment(
 
     // Persist token entity
     Token token = buildBaseToken(onboarding, digest);
+    token.setId(UUID.randomUUID().toString());
     token.setContractTemplate(attachmentTemplate.getTemplatePath());
     token.setContractVersion(attachmentTemplate.getTemplateVersion());
     token.setContractFilename(
@@ -204,7 +204,6 @@ private void saveTokenAttachment(
   private Token buildBaseToken(Onboarding onboarding, String digest) {
     log.debug("creating Token for onboarding {} ...", onboarding.getId());
     Token token = new Token();
-    token.setId(UUID.randomUUID().toString());
     token.setOnboardingId(onboarding.getId());
     token.setCreatedAt(LocalDateTime.now());
     token.setUpdatedAt(LocalDateTime.now());
diff --git a/apps/onboarding-functions/src/test/java/it/pagopa/selfcare/onboarding/service/OnboardingServiceTest.java b/apps/onboarding-functions/src/test/java/it/pagopa/selfcare/onboarding/service/OnboardingServiceTest.java
index 66259b4b0..99b97301e 100644
--- a/apps/onboarding-functions/src/test/java/it/pagopa/selfcare/onboarding/service/OnboardingServiceTest.java
+++ b/apps/onboarding-functions/src/test/java/it/pagopa/selfcare/onboarding/service/OnboardingServiceTest.java
@@ -343,25 +343,6 @@ void saveTokenAttachment() {
     assertEquals(digestExpected, tokenArgumentCaptor.getValue().getChecksum());
   }
 
-  /*
-    @Test
-    void saveTokenAttachment_shouldSkipIfTokenExists() {
-      Onboarding onboarding = createOnboarding();
-      AttachmentTemplate attachmentTemplate = createDummyAttachmentTemplate();
-      OnboardingAttachment onboardingAttachment = new OnboardingAttachment();
-      onboardingAttachment.setOnboarding(onboarding);
-      onboardingAttachment.setAttachment(attachmentTemplate);
-      Token token = createDummyToken();
-
-      when(tokenRepository.findByOnboardingId(onboarding.getId())).thenReturn(Optional.of(token));
-
-      onboardingService.saveTokenWithAttachment(onboardingAttachment);
-
-      Mockito.verify(tokenRepository, Mockito.times(1)).findByOnboardingId(onboarding.getId());
-      Mockito.verifyNoMoreInteractions(tokenRepository);
-    }
-  */
-
   @Test
   void loadContract() {