Merge pull request #1275 from guardian/ph-20251016-1616-row

Set canonical definition of ROW

Author: shtukas

lambda/src/main/scala/pricemigrationengine/migrations/GuardianWeekly2025Migration.scala

@@ -153,6 +153,29 @@ object GuardianWeekly2025Migration {
     } yield date
   }
 
+  def determineSubscriptionLocalisation(
+      subscription: ZuoraSubscription,
+      invoiceList: ZuoraInvoiceList,
+      account: ZuoraAccount
+  ): Option[SubscriptionLocalisation] = {
+    for {
+      ratePlan <- SI2025RateplanFromSubAndInvoices.determineRatePlan(
+        subscription,
+        invoiceList
+      )
+      currency <- SI2025Extractions.determineCurrency(ratePlan)
+    } yield {
+      val country = account.soldToContact.country
+      val isROWUSD = currency == "USD" && country != "United States"
+      val isROWGBP = currency == "GBP" && country != "United Kingdom"
+      if (isROWUSD || isROWGBP) {
+        RestOfWorld
+      } else {
+        Domestic
+      }
+    }
+  }
+
   // ------------------------------------------------
   // Primary Functions:
   //
@@ -182,8 +205,7 @@ object GuardianWeekly2025Migration {
         .determineCurrency(ratePlan)
         .map(logValue("currency"))
       oldPrice = logValue("oldPrice")(SI2025Extractions.determineOldPrice(ratePlan))
-      localisation <- SubscriptionLocalisation
-        .determineSubscriptionLocalisation(subscription, invoiceList, account)
+      localisation <- determineSubscriptionLocalisation(subscription, invoiceList, account)
         .map(logValue("localisation"))
       billingPeriod <- SI2025Extractions
         .determineBillingPeriod(ratePlan)

lambda/src/main/scala/pricemigrationengine/model/SubscriptionLocalisation.scala

@@ -33,10 +33,7 @@ object SubscriptionLocalisation {
       )
       currency <- SI2025Extractions.determineCurrency(ratePlan)
     } yield {
-      val country = account.soldToContact.country
-      val isROWUSD = currency == "USD" && country != "United States"
-      val isROWGBP = currency == "GBP" && country != "United Kingdom"
-      if (isROWUSD || isROWGBP) {
+      if (currency == "USD" && account.soldToContact.country != "United States") {
         RestOfWorld
       } else {
         Domestic

lambda/src/test/resources/Migrations/GuardianWeekly2025/SubscriptionLocalisation/subscription1/account.json

@@ -0,0 +1,48 @@
+{
+  "basicInfo" : {
+    "id" : "ACCOUNT-ID",
+    "name" : "ACCOUNT-NAME",
+    "accountNumber" : "ACCOUNT-NUMBER",
+    "notes" : null,
+    "status" : "Active",
+    "crmId" : "ACCOUNT-NAME",
+    "batch" : "Batch1",
+    "invoiceTemplateId" : "2c92a0fb49377eae014951ca848e074b",
+    "communicationProfileId" : null,
+    "profileNumber" : null,
+    "purchaseOrderNumber" : null,
+    "customerServiceRepName" : null,
+    "ScrubbedOn__c" : null,
+    "IdentityId__c" : "IdentityId__c",
+    "sfContactId__c" : "sfContactId__c",
+    "CCURN__c" : null,
+    "SpecialDeliveryInstructions__c" : null,
+    "NonStandardDataReason__c" : null,
+    "Scrubbed__c" : null,
+    "ProcessingAdvice__c" : null,
+    "CreatedRequestId__c" : null,
+    "RetryStatus__c" : null,
+    "salesRep" : null,
+    "creditMemoTemplateId" : null,
+    "debitMemoTemplateId" : null,
+    "summaryStatementTemplateId" : null,
+    "sequenceSetId" : null
+  },
+  "billingAndPayment" : null,
+  "metrics" : {
+    "balance" : 0.000000000,
+    "currency" : "USD",
+    "totalInvoiceBalance" : 0.000000000,
+    "creditBalance" : 0.000000000,
+    "totalDebitMemoBalance" : 0.000000000,
+    "unappliedPaymentAmount" : 0.000000000,
+    "unappliedCreditMemoAmount" : 0.000000000,
+    "contractedMrr" : 30.000000000
+  },
+  "billToContact" : null,
+  "soldToContact" : {
+    "country" : "United States"
+  },
+  "taxInfo" : null,
+  "success" : true
+}