test fixtures refactorings

guardian · Sep 26, 2024 · 1d97779 · 1d97779
1 parent 5f398b3
commit 1d97779
Show file tree

Hide file tree

Showing 119 changed files with 85,358 additions and 14,943 deletions.
diff --git a/...da/src/main/scala/pricemigrationengine/migrations/Newspaper2024Migration/Estimation.scala b/...da/src/main/scala/pricemigrationengine/migrations/Newspaper2024Migration/Estimation.scala
@@ -65,7 +65,7 @@ object Estimation {
     ratePlans match {
       case Nil =>
         Left(
-          s"[error 93a21a48] Subscription ${subscription.subscriptionNumber} was found to have zero newsPaperDeliveryRatePlans making determination of rate plan name impossible"
+          s"[error 93a21a48] Subscription ${subscription.subscriptionNumber} was found to have zero RatePlans making determination of rate plan name impossible"
         )
       case ratePlan :: Nil => {
         (for {
@@ -88,7 +88,7 @@ object Estimation {
       }
       case _ =>
         Left(
-          s"[error 93a21a48] Subscription ${subscription.subscriptionNumber} was found to have more than one newsPaperDeliveryRatePlans making determination of rate plan name impossible"
+          s"[error 93a21a48] Subscription ${subscription.subscriptionNumber} was found to have more than one RatePlans making determination of rate plan name impossible"
         )
     }
   }

diff --git a/lambda/src/test/resources/Convention.md b/lambda/src/test/resources/Convention.md
@@ -1 +1 @@
-Use the `Core` directory for engine core functions and `Migrations` for migration specific tests.
+Use the `Core` directory for engine core functions (including testing the model), `Handlers` to test the various handlers and `Migrations` for migration specific tests.
diff --git a/...s/Vouchers2022/AnnualVoucher/Account.json → ...re/AmendmentData/Discount25%/Account.json b/...s/Vouchers2022/AnnualVoucher/Account.json → ...re/AmendmentData/Discount25%/Account.json
diff --git a/...s/Vouchers2022/Discount25%/Catalogue.json → .../AmendmentData/Discount25%/Catalogue.json b/...s/Vouchers2022/Discount25%/Catalogue.json → .../AmendmentData/Discount25%/Catalogue.json
diff --git a/...chers2022/Discount25%/InvoicePreview.json → ...dmentData/Discount25%/InvoicePreview.json b/...chers2022/Discount25%/InvoicePreview.json → ...dmentData/Discount25%/InvoicePreview.json
diff --git a/...ouchers2022/Discount25%/Subscription.json → ...endmentData/Discount25%/Subscription.json b/...ouchers2022/Discount25%/Subscription.json → ...endmentData/Discount25%/Subscription.json
diff --git a/...y/EchoLegacy/EverydayMonthly/Account.json → ...Core/AmendmentData/Everyday+/Account.json b/...y/EchoLegacy/EverydayMonthly/Account.json → ...Core/AmendmentData/Everyday+/Account.json
diff --git a/...ewspaperDelivery/Everyday+/Catalogue.json → ...re/AmendmentData/Everyday+/Catalogue.json b/...ewspaperDelivery/Everyday+/Catalogue.json → ...re/AmendmentData/Everyday+/Catalogue.json
diff --git a/...perDelivery/Everyday+/InvoicePreview.json → ...endmentData/Everyday+/InvoicePreview.json b/...perDelivery/Everyday+/InvoicePreview.json → ...endmentData/Everyday+/InvoicePreview.json
diff --git a/...paperDelivery/Everyday+/Subscription.json → ...AmendmentData/Everyday+/Subscription.json b/...paperDelivery/Everyday+/Subscription.json → ...AmendmentData/Everyday+/Subscription.json
diff --git a/...ons/Vouchers2022/Discount25%/Account.json → ...mentData/Everyday+Discounted/Account.json b/...ons/Vouchers2022/Discount25%/Account.json → ...mentData/Everyday+Discounted/Account.json
diff --git a/...2/Everyday+Discounted/InvoicePreview.json → ...a/Everyday+Discounted/InvoicePreview.json b/...2/Everyday+Discounted/InvoicePreview.json → ...a/Everyday+Discounted/InvoicePreview.json
diff --git a/...022/Everyday+Discounted/Subscription.json → ...ata/Everyday+Discounted/Subscription.json b/...022/Everyday+Discounted/Subscription.json → ...ata/Everyday+Discounted/Subscription.json
diff --git a/...grations/Vouchers2022/InvoicePreview.json → ...re/AmendmentData/Misc/InvoicePreview.json b/...grations/Vouchers2022/InvoicePreview.json → ...re/AmendmentData/Misc/InvoicePreview.json
diff --git a/...nvoicePreviewTermEndsBeforeMigration.json → ...nvoicePreviewTermEndsBeforeMigration.json b/...nvoicePreviewTermEndsBeforeMigration.json → ...nvoicePreviewTermEndsBeforeMigration.json
diff --git a/...tions/Vouchers2022/Everyday+/Account.json → ...s/Core/AmendmentData/Monthly/Account.json b/...tions/Vouchers2022/Everyday+/Account.json → ...s/Core/AmendmentData/Monthly/Account.json
diff --git a/...uchers2022/HolidayCredited/Catalogue.json → ...Core/AmendmentData/Monthly/Catalogue.json b/...uchers2022/HolidayCredited/Catalogue.json → ...Core/AmendmentData/Monthly/Catalogue.json
diff --git a/.../Vouchers2022/Monthly/InvoicePreview.json → ...AmendmentData/Monthly/InvoicePreview.json b/.../Vouchers2022/Monthly/InvoicePreview.json → ...AmendmentData/Monthly/InvoicePreview.json
diff --git a/...ns/Vouchers2022/Monthly/Subscription.json → ...e/AmendmentData/Monthly/Subscription.json b/...ns/Vouchers2022/Monthly/Subscription.json → ...e/AmendmentData/Monthly/Subscription.json
diff --git a/...livery/EchoLegacy/Quarterly2/Account.json → ...mendmentData/Pre2020Everyday/Account.json b/...livery/EchoLegacy/Quarterly2/Account.json → ...mendmentData/Pre2020Everyday/Account.json
diff --git a/...NewspaperDelivery/Everyday/Catalogue.json → ...ndmentData/Pre2020Everyday/Catalogue.json b/...NewspaperDelivery/Everyday/Catalogue.json → ...ndmentData/Pre2020Everyday/Catalogue.json
diff --git a/...ivery/Pre2020Everyday/InvoicePreview.json → ...tData/Pre2020Everyday/InvoicePreview.json b/...ivery/Pre2020Everyday/InvoicePreview.json → ...tData/Pre2020Everyday/InvoicePreview.json
diff --git a/...elivery/Pre2020Everyday/Subscription.json → ...entData/Pre2020Everyday/Subscription.json b/...elivery/Pre2020Everyday/Subscription.json → ...entData/Pre2020Everyday/Subscription.json
diff --git a/...EchoLegacy/SaturdayQuarterly/Account.json → .../AmendmentData/Pre2020SixDay/Account.json b/...EchoLegacy/SaturdayQuarterly/Account.json → .../AmendmentData/Pre2020SixDay/Account.json
diff --git a/...erDelivery/Pre2020Everyday/Catalogue.json → ...mendmentData/Pre2020SixDay/Catalogue.json b/...erDelivery/Pre2020Everyday/Catalogue.json → ...mendmentData/Pre2020SixDay/Catalogue.json
diff --git a/...elivery/Pre2020SixDay/InvoicePreview.json → ...entData/Pre2020SixDay/InvoicePreview.json b/...elivery/Pre2020SixDay/InvoicePreview.json → ...entData/Pre2020SixDay/InvoicePreview.json
diff --git a/...rDelivery/Pre2020SixDay/Subscription.json → ...dmentData/Pre2020SixDay/Subscription.json b/...rDelivery/Pre2020SixDay/Subscription.json → ...dmentData/Pre2020SixDay/Subscription.json
diff --git a/...ery/EchoLegacy/SixdayMonthly/Account.json → ...AmendmentData/Pre2020Sixday2/Account.json b/...ery/EchoLegacy/SixdayMonthly/Account.json → ...AmendmentData/Pre2020Sixday2/Account.json
diff --git a/...aperDelivery/Pre2020SixDay/Catalogue.json → ...endmentData/Pre2020Sixday2/Catalogue.json b/...aperDelivery/Pre2020SixDay/Catalogue.json → ...endmentData/Pre2020Sixday2/Catalogue.json
diff --git a/...livery/Pre2020Sixday2/InvoicePreview.json → ...ntData/Pre2020Sixday2/InvoicePreview.json b/...livery/Pre2020Sixday2/InvoicePreview.json → ...ntData/Pre2020Sixday2/InvoicePreview.json
diff --git a/...Delivery/Pre2020Sixday2/Subscription.json → ...mentData/Pre2020Sixday2/Subscription.json b/...Delivery/Pre2020Sixday2/Subscription.json → ...mentData/Pre2020Sixday2/Subscription.json
diff --git a/...hers2022/Everyday+Discounted/Account.json → ...endmentData/QuarterlyVoucher/Account.json b/...hers2022/Everyday+Discounted/Account.json → ...endmentData/QuarterlyVoucher/Account.json
diff --git a/...Vouchers2022/AnnualVoucher/Catalogue.json → ...dmentData/QuarterlyVoucher/Catalogue.json b/...Vouchers2022/AnnualVoucher/Catalogue.json → ...dmentData/QuarterlyVoucher/Catalogue.json
diff --git a/...2022/QuarterlyVoucher/InvoicePreview.json → ...Data/QuarterlyVoucher/InvoicePreview.json b/...2022/QuarterlyVoucher/InvoicePreview.json → ...Data/QuarterlyVoucher/InvoicePreview.json
diff --git a/...rs2022/QuarterlyVoucher/Subscription.json → ...ntData/QuarterlyVoucher/Subscription.json b/...rs2022/QuarterlyVoucher/Subscription.json → ...ntData/QuarterlyVoucher/Subscription.json
diff --git a/...ery/EchoLegacy/SundayMonthly/Account.json → .../Core/AmendmentData/Saturday/Account.json b/...ery/EchoLegacy/SundayMonthly/Account.json → .../Core/AmendmentData/Saturday/Account.json
diff --git a/...perDelivery/Pre2020Sixday2/Catalogue.json → ...ore/AmendmentData/Saturday/Catalogue.json b/...perDelivery/Pre2020Sixday2/Catalogue.json → ...ore/AmendmentData/Saturday/Catalogue.json
diff --git a/...aperDelivery/Saturday/InvoicePreview.json → ...mendmentData/Saturday/InvoicePreview.json b/...aperDelivery/Saturday/InvoicePreview.json → ...mendmentData/Saturday/InvoicePreview.json
diff --git a/...spaperDelivery/Saturday/Subscription.json → .../AmendmentData/Saturday/Subscription.json b/...spaperDelivery/Saturday/Subscription.json → .../AmendmentData/Saturday/Subscription.json
diff --git a/...hers2022/EverydayDiscount25%/Account.json → ...ndmentData/SemiAnnualVoucher/Account.json b/...hers2022/EverydayDiscount25%/Account.json → ...ndmentData/SemiAnnualVoucher/Account.json
diff --git a/...chers2022/QuarterlyVoucher/Catalogue.json → ...mentData/SemiAnnualVoucher/Catalogue.json b/...chers2022/QuarterlyVoucher/Catalogue.json → ...mentData/SemiAnnualVoucher/Catalogue.json
diff --git a/...022/SemiAnnualVoucher/InvoicePreview.json → ...ata/SemiAnnualVoucher/InvoicePreview.json b/...022/SemiAnnualVoucher/InvoicePreview.json → ...ata/SemiAnnualVoucher/InvoicePreview.json
diff --git a/...s2022/SemiAnnualVoucher/Subscription.json → ...tData/SemiAnnualVoucher/Subscription.json b/...s2022/SemiAnnualVoucher/Subscription.json → ...tData/SemiAnnualVoucher/Subscription.json
diff --git a/...ry/EchoLegacy/WeekendMonthly/Account.json → ...s/Core/AmendmentData/Sixday+/Account.json b/...ry/EchoLegacy/WeekendMonthly/Account.json → ...s/Core/AmendmentData/Sixday+/Account.json
diff --git a/...NewspaperDelivery/Saturday/Catalogue.json → ...Core/AmendmentData/Sixday+/Catalogue.json b/...NewspaperDelivery/Saturday/Catalogue.json → ...Core/AmendmentData/Sixday+/Catalogue.json
diff --git a/...paperDelivery/Sixday+/InvoicePreview.json → ...AmendmentData/Sixday+/InvoicePreview.json b/...paperDelivery/Sixday+/InvoicePreview.json → ...AmendmentData/Sixday+/InvoicePreview.json
diff --git a/...wspaperDelivery/Sixday+/Subscription.json → ...e/AmendmentData/Sixday+/Subscription.json b/...wspaperDelivery/Sixday+/Subscription.json → ...e/AmendmentData/Sixday+/Subscription.json
diff --git a/.../NewspaperDelivery/Everyday+/Account.json → ...es/Core/AmendmentData/Sixday/Account.json b/.../NewspaperDelivery/Everyday+/Account.json → ...es/Core/AmendmentData/Sixday/Account.json
diff --git a/.../NewspaperDelivery/Sixday+/Catalogue.json → .../Core/AmendmentData/Sixday/Catalogue.json b/.../NewspaperDelivery/Sixday+/Catalogue.json → .../Core/AmendmentData/Sixday/Catalogue.json
diff --git a/...spaperDelivery/Sixday/InvoicePreview.json → .../AmendmentData/Sixday/InvoicePreview.json b/...spaperDelivery/Sixday/InvoicePreview.json → .../AmendmentData/Sixday/InvoicePreview.json
diff --git a/...ewspaperDelivery/Sixday/Subscription.json → ...re/AmendmentData/Sixday/Subscription.json b/...ewspaperDelivery/Sixday/Subscription.json → ...re/AmendmentData/Sixday/Subscription.json
diff --git a/...s/NewspaperDelivery/Everyday/Account.json → ...es/Core/AmendmentData/Sunday/Account.json b/...s/NewspaperDelivery/Everyday/Account.json → ...es/Core/AmendmentData/Sunday/Account.json
diff --git a/...s/NewspaperDelivery/Sixday/Catalogue.json → .../Core/AmendmentData/Sunday/Catalogue.json b/...s/NewspaperDelivery/Sixday/Catalogue.json → .../Core/AmendmentData/Sunday/Catalogue.json
diff --git a/...spaperDelivery/Sunday/InvoicePreview.json → .../AmendmentData/Sunday/InvoicePreview.json b/...spaperDelivery/Sunday/InvoicePreview.json → .../AmendmentData/Sunday/InvoicePreview.json
diff --git a/...ewspaperDelivery/Sunday/Subscription.json → ...re/AmendmentData/Sunday/Subscription.json b/...ewspaperDelivery/Sunday/Subscription.json → ...re/AmendmentData/Sunday/Subscription.json
diff --git a/...aperDelivery/Pre2020Everyday/Account.json → ...mentData/Waitrose25%Discount/Account.json b/...aperDelivery/Pre2020Everyday/Account.json → ...mentData/Waitrose25%Discount/Account.json
diff --git a/...s/NewspaperDelivery/Sunday/Catalogue.json → ...ntData/Waitrose25%Discount/Catalogue.json b/...s/NewspaperDelivery/Sunday/Catalogue.json → ...ntData/Waitrose25%Discount/Catalogue.json
diff --git a/...y/Waitrose25%Discount/InvoicePreview.json → ...a/Waitrose25%Discount/InvoicePreview.json b/...y/Waitrose25%Discount/InvoicePreview.json → ...a/Waitrose25%Discount/InvoicePreview.json
diff --git a/...ery/Waitrose25%Discount/Subscription.json → ...ata/Waitrose25%Discount/Subscription.json b/...ery/Waitrose25%Discount/Subscription.json → ...ata/Waitrose25%Discount/Subscription.json
diff --git a/...spaperDelivery/Pre2020SixDay/Account.json → ...s/Core/AmendmentData/Weekend/Account.json b/...spaperDelivery/Pre2020SixDay/Account.json → ...s/Core/AmendmentData/Weekend/Account.json
diff --git a/...livery/Waitrose25%Discount/Catalogue.json → ...Core/AmendmentData/Weekend/Catalogue.json b/...livery/Waitrose25%Discount/Catalogue.json → ...Core/AmendmentData/Weekend/Catalogue.json
diff --git a/...paperDelivery/Weekend/InvoicePreview.json → ...AmendmentData/Weekend/InvoicePreview.json b/...paperDelivery/Weekend/InvoicePreview.json → ...AmendmentData/Weekend/InvoicePreview.json
diff --git a/...wspaperDelivery/Weekend/Subscription.json → ...e/AmendmentData/Weekend/Subscription.json b/...wspaperDelivery/Weekend/Subscription.json → ...e/AmendmentData/Weekend/Subscription.json
diff --git a/...Vouchers2022/HolidayCredited/Account.json → ...criptionUpdate/AnnualVoucher/Account.json b/...Vouchers2022/HolidayCredited/Account.json → ...criptionUpdate/AnnualVoucher/Account.json
diff --git a/...hers2022/SemiAnnualVoucher/Catalogue.json → ...iptionUpdate/AnnualVoucher/Catalogue.json b/...hers2022/SemiAnnualVoucher/Catalogue.json → ...iptionUpdate/AnnualVoucher/Catalogue.json
diff --git a/...ers2022/AnnualVoucher/InvoicePreview.json → ...nUpdate/AnnualVoucher/InvoicePreview.json b/...ers2022/AnnualVoucher/InvoicePreview.json → ...nUpdate/AnnualVoucher/InvoicePreview.json
diff --git a/...chers2022/AnnualVoucher/Subscription.json → ...ionUpdate/AnnualVoucher/Subscription.json b/...chers2022/AnnualVoucher/Subscription.json → ...ionUpdate/AnnualVoucher/Subscription.json
diff --git a/...rations/Vouchers2022/Monthly/Account.json → ...raSubscriptionUpdate/Monthly/Account.json b/...rations/Vouchers2022/Monthly/Account.json → ...raSubscriptionUpdate/Monthly/Account.json
diff --git a/...tions/Vouchers2022/Monthly/Catalogue.json → ...SubscriptionUpdate/Monthly/Catalogue.json b/...tions/Vouchers2022/Monthly/Catalogue.json → ...SubscriptionUpdate/Monthly/Catalogue.json
diff --git a/lambda/src/test/resources/Core/ZuoraSubscriptionUpdate/Monthly/InvoicePreview.json b/lambda/src/test/resources/Core/ZuoraSubscriptionUpdate/Monthly/InvoicePreview.json
@@ -0,0 +1,153 @@
+{
+  "accountId": "accId",
+  "invoiceItems": [
+    {
+      "id": "itemId",
+      "subscriptionName": "A-S12345678",
+      "subscriptionId": "subId",
+      "subscriptionNumber": "A-S12345678",
+      "serviceStartDate": "2020-05-28",
+      "serviceEndDate": "2020-06-27",
+      "chargeAmount": 5.99,
+      "chargeDescription": "",
+      "chargeName": "Monday",
+      "chargeNumber": "C-01467522",
+      "chargeId": "chargeId",
+      "productName": "Newspaper Voucher",
+      "quantity": 1,
+      "taxAmount": 0E-9,
+      "unitOfMeasure": "",
+      "chargeDate": "2020-05-06 10:33:28",
+      "chargeType": "Recurring",
+      "processingType": "Charge",
+      "appliedToItemId": null
+    },
+    {
+      "id": "itemId",
+      "subscriptionName": "A-S12345678",
+      "subscriptionId": "subId",
+      "subscriptionNumber": "A-S12345678",
+      "serviceStartDate": "2020-05-28",
+      "serviceEndDate": "2020-06-27",
+      "chargeAmount": 5.99,
+      "chargeDescription": "",
+      "chargeName": "Tuesday",
+      "chargeNumber": "C-01467523",
+      "chargeId": "chargeId",
+      "productName": "Newspaper Voucher",
+      "quantity": 1,
+      "taxAmount": 0E-9,
+      "unitOfMeasure": "",
+      "chargeDate": "2020-05-06 10:33:28",
+      "chargeType": "Recurring",
+      "processingType": "Charge",
+      "appliedToItemId": null
+    },
+    {
+      "id": "itemId",
+      "subscriptionName": "A-S12345678",
+      "subscriptionId": "subId",
+      "subscriptionNumber": "A-S12345678",
+      "serviceStartDate": "2020-05-28",
+      "serviceEndDate": "2020-06-27",
+      "chargeAmount": 8.68,
+      "chargeDescription": "",
+      "chargeName": "Saturday",
+      "chargeNumber": "C-01467524",
+      "chargeId": "chargeId",
+      "productName": "Newspaper Voucher",
+      "quantity": 1,
+      "taxAmount": 0E-9,
+      "unitOfMeasure": "",
+      "chargeDate": "2020-05-06 10:33:28",
+      "chargeType": "Recurring",
+      "processingType": "Charge",
+      "appliedToItemId": null
+    },
+    {
+      "id": "itemId",
+      "subscriptionName": "A-S12345678",
+      "subscriptionId": "subId",
+      "subscriptionNumber": "A-S12345678",
+      "serviceStartDate": "2020-05-28",
+      "serviceEndDate": "2020-06-27",
+      "chargeAmount": 5.99,
+      "chargeDescription": "",
+      "chargeName": "Thursday",
+      "chargeNumber": "C-01467525",
+      "chargeId": "chargeId",
+      "productName": "Newspaper Voucher",
+      "quantity": 1,
+      "taxAmount": 0E-9,
+      "unitOfMeasure": "",
+      "chargeDate": "2020-05-06 10:33:28",
+      "chargeType": "Recurring",
+      "processingType": "Charge",
+      "appliedToItemId": null
+    },
+    {
+      "id": "itemId",
+      "subscriptionName": "A-S12345678",
+      "subscriptionId": "subId",
+      "subscriptionNumber": "A-S12345678",
+      "serviceStartDate": "2020-05-28",
+      "serviceEndDate": "2020-06-27",
+      "chargeAmount": 5.99,
+      "chargeDescription": "",
+      "chargeName": "Friday",
+      "chargeNumber": "C-01467526",
+      "chargeId": "chargeId",
+      "productName": "Newspaper Voucher",
+      "quantity": 1,
+      "taxAmount": 0E-9,
+      "unitOfMeasure": "",
+      "chargeDate": "2020-05-06 10:33:28",
+      "chargeType": "Recurring",
+      "processingType": "Charge",
+      "appliedToItemId": null
+    },
+    {
+      "id": "itemId",
+      "subscriptionName": "A-S12345678",
+      "subscriptionId": "subId",
+      "subscriptionNumber": "A-S12345678",
+      "serviceStartDate": "2020-05-28",
+      "serviceEndDate": "2020-06-27",
+      "chargeAmount": 5.99,
+      "chargeDescription": "",
+      "chargeName": "Wednesday",
+      "chargeNumber": "C-01467527",
+      "chargeId": "chargeId",
+      "productName": "Newspaper Voucher",
+      "quantity": 1,
+      "taxAmount": 0E-9,
+      "unitOfMeasure": "",
+      "chargeDate": "2020-05-06 10:33:28",
+      "chargeType": "Recurring",
+      "processingType": "Charge",
+      "appliedToItemId": null
+    },
+    {
+      "id": "itemId",
+      "subscriptionName": "A-S12345678",
+      "subscriptionId": "subId",
+      "subscriptionNumber": "A-S12345678",
+      "serviceStartDate": "2020-05-28",
+      "serviceEndDate": "2020-06-27",
+      "chargeAmount": 8.99,
+      "chargeDescription": "",
+      "chargeName": "Sunday",
+      "chargeNumber": "C-01467528",
+      "chargeId": "chargeId",
+      "productName": "Newspaper Voucher",
+      "quantity": 1,
+      "taxAmount": 0E-9,
+      "unitOfMeasure": "",
+      "chargeDate": "2020-05-06 10:33:28",
+      "chargeType": "Recurring",
+      "processingType": "Charge",
+      "appliedToItemId": null
+    }
+  ],
+  "success": true
+}