Merge pull request #1068 from guardian/ph-20240828-1113-fix

NotificationHandler update for Membership2023
guardian · Aug 29, 2024 · e16f683 · e16f683
2 parents 17ef15a + 6f8966a
commit e16f683
Showing 1 changed file with 15 additions and 1 deletion.
diff --git a/lambda/src/main/scala/pricemigrationengine/handlers/NotificationHandler.scala b/lambda/src/main/scala/pricemigrationengine/handlers/NotificationHandler.scala
@@ -281,8 +281,22 @@ object NotificationHandler extends CohortHandler {
       cohortSpec: CohortSpec,
       contact: SalesforceContact
   ): Either[NotificationHandlerFailure, SalesforceAddress] = {
+    def targetAddressMembership2023(
+        contact: SalesforceContact
+    ): Either[NotificationHandlerFailure, SalesforceAddress] = {
+      (for {
+        billingAddress <- requiredField(contact.OtherAddress, "Contact.OtherAddress")
+        _ <- requiredField(billingAddress.street, "Contact.OtherAddress.street")
+        _ <- requiredField(billingAddress.city, "Contact.OtherAddress.city")
+      } yield billingAddress).left.flatMap(_ =>
+        Right(SalesforceAddress(Some(""), Some(""), Some(""), Some(""), Some("")))
+      )
+    }
+
     MigrationType(cohortSpec) match {
-      case DigiSubs2023 => Right(SalesforceAddress(Some(""), Some(""), Some(""), Some(""), Some("")))
+      case DigiSubs2023            => Right(SalesforceAddress(Some(""), Some(""), Some(""), Some(""), Some("")))
+      case Membership2023Monthlies => targetAddressMembership2023(contact)
+      case Membership2023Annuals   => targetAddressMembership2023(contact)
       case _ =>
         (for {
           billingAddress <- requiredField(contact.OtherAddress, "Contact.OtherAddress")