From 19644325bc26878411a415b2aea9e3e44da27c17 Mon Sep 17 00:00:00 2001
From: Riccardo Torsoli <riccardo.torsoli@nttdata.com>
Date: Thu, 27 Jul 2023 11:05:47 +0200
Subject: [PATCH] PIN-3142 Corrected submission tests

---
 .../agreementprocess/AgreementSubmissionSpec.scala | 14 ++++++++++----
 .../interop/agreementprocess/SpecHelper.scala      |  2 ++
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/test/scala/it/pagopa/interop/agreementprocess/AgreementSubmissionSpec.scala b/src/test/scala/it/pagopa/interop/agreementprocess/AgreementSubmissionSpec.scala
index c44933f2..10c58cf9 100644
--- a/src/test/scala/it/pagopa/interop/agreementprocess/AgreementSubmissionSpec.scala
+++ b/src/test/scala/it/pagopa/interop/agreementprocess/AgreementSubmissionSpec.scala
@@ -82,7 +82,8 @@ class AgreementSubmissionSpec extends AnyWordSpecLike with SpecHelper with Scala
       val descriptor =
         SpecData.publishedDescriptor.copy(agreementApprovalPolicy = Automatic.some, attributes = descriptorAttr)
       val eService   = SpecData.eService.copy(descriptors = Seq(descriptor), producerId = producerId)
-      val consumer   = SpecData.tenant.copy(id = requesterOrgId, attributes = tenantAttr)
+      val consumer   =
+        SpecData.tenant.copy(id = requesterOrgId, attributes = tenantAttr, mails = List(SpecData.validEmail))
       val producer   = SpecData.tenant.copy(id = producerId)
       val agreement  =
         SpecData.draftAgreement.copy(
@@ -129,7 +130,8 @@ class AgreementSubmissionSpec extends AnyWordSpecLike with SpecHelper with Scala
         SpecData.publishedDescriptor.copy(agreementApprovalPolicy = Manual.some, attributes = descriptorAttr)
       val eService            =
         SpecData.eService.copy(producerId = consumerAndProducer, descriptors = Seq(descriptor))
-      val consumer            = SpecData.tenant.copy(id = consumerAndProducer, attributes = tenantAttr)
+      val consumer            =
+        SpecData.tenant.copy(id = consumerAndProducer, attributes = tenantAttr, mails = List(SpecData.validEmail))
       val producer            = consumer
       val agreement           =
         SpecData.draftAgreement.copy(
@@ -282,7 +284,8 @@ class AgreementSubmissionSpec extends AnyWordSpecLike with SpecHelper with Scala
 
       val descriptor = SpecData.publishedDescriptor.copy(attributes = descriptorAttr)
       val eService   = SpecData.eService.copy(descriptors = Seq(descriptor))
-      val consumer   = SpecData.tenant.copy(id = requesterOrgId, attributes = tenantAttr)
+      val consumer   =
+        SpecData.tenant.copy(id = requesterOrgId, attributes = tenantAttr, mails = List(SpecData.validEmail))
       val agreement  =
         SpecData.draftAgreement.copy(eserviceId = eService.id, descriptorId = descriptor.id, consumerId = consumer.id)
       val payload    = AgreementSubmissionPayload(Some("consumer-notes"))
@@ -304,6 +307,7 @@ class AgreementSubmissionSpec extends AnyWordSpecLike with SpecHelper with Scala
       mockAgreementsRetrieve(Nil)
       mockEServiceRetrieve(eService.id, eService)
       mockTenantRetrieve(consumer.id, consumer)
+      mockTenantRetrieve(agreement.consumerId, consumer)
       mockAgreementUpdate(agreement.id, expectedSeed, agreement)
 
       Get() ~> service.submitAgreement(agreement.id.toString, payload) ~> check {
@@ -318,7 +322,8 @@ class AgreementSubmissionSpec extends AnyWordSpecLike with SpecHelper with Scala
 
       val descriptor = SpecData.publishedDescriptor.copy(attributes = descriptorAttr)
       val eService   = SpecData.eService.copy(descriptors = Seq(descriptor))
-      val consumer   = SpecData.tenant.copy(id = requesterOrgId, attributes = tenantAttr)
+      val consumer   =
+        SpecData.tenant.copy(id = requesterOrgId, attributes = tenantAttr, mails = List(SpecData.validEmail))
       val agreement  =
         SpecData.draftAgreement.copy(eserviceId = eService.id, descriptorId = descriptor.id, consumerId = consumer.id)
       val payload    = AgreementSubmissionPayload(Some("consumer-notes"))
@@ -340,6 +345,7 @@ class AgreementSubmissionSpec extends AnyWordSpecLike with SpecHelper with Scala
       mockAgreementsRetrieve(Nil)
       mockEServiceRetrieve(eService.id, eService)
       mockTenantRetrieve(consumer.id, consumer)
+      mockTenantRetrieve(agreement.consumerId, consumer)
       mockAgreementUpdate(agreement.id, expectedSeed, agreement)
 
       Get() ~> service.submitAgreement(agreement.id.toString, payload) ~> check {
diff --git a/src/test/scala/it/pagopa/interop/agreementprocess/SpecHelper.scala b/src/test/scala/it/pagopa/interop/agreementprocess/SpecHelper.scala
index 00da0732..7c3e28e7 100644
--- a/src/test/scala/it/pagopa/interop/agreementprocess/SpecHelper.scala
+++ b/src/test/scala/it/pagopa/interop/agreementprocess/SpecHelper.scala
@@ -325,6 +325,7 @@ trait SpecHelper extends MockFactory {
     mockAttributeManagementServiceRetrieve(SpecData.clientAttribute(UUID.randomUUID()))
     mockAttributeManagementServiceRetrieve(SpecData.clientAttribute(UUID.randomUUID()))
     mockTenantRetrieve(consumer.id, consumer)
+    mockTenantRetrieve(agreement.consumerId, consumer)
     mockAgreementUpdate(
       agreement.id,
       expectedSeed,
@@ -357,6 +358,7 @@ trait SpecHelper extends MockFactory {
     mockAgreementsRetrieve(Nil)
     mockEServiceRetrieve(eService.id, eService)
     mockTenantRetrieve(consumer.id, consumer)
+    mockTenantRetrieve(agreement.consumerId, consumer)
     mockTenantRetrieve(producer.id, producer)
     mockAgreementUpdate(
       agreement.id,