Merge pull request #944 from hmcts/fix-active-aplsubmitted-paymentstatus

Fix for ticket 1911. ref_txn_df1 was referencing wrong table. values …

Author: AndrewHMCTS

Databricks/ACTIVE/APPEALS/GOLD_APPEAL_SUBMITTED_JSON.ipynb

@@ -218,7 +218,11 @@
    "cell_type": "markdown",
    "metadata": {
     "application/vnd.databricks.v1+cell": {
-     "cellMetadata": {},
+     "cellMetadata": {
+      "batchId": -6018114963734290,
+      "byteLimit": 2048000,
+      "rowLimit": 10000
+     },
      "inputWidgets": {},
      "nuid": "e818dd62-dc2f-4b3b-bac0-f9216f747357",
      "showTitle": false,
@@ -407,14 +411,21 @@
      "inputWidgets": {},
      "nuid": "3c102932-86cd-491c-ba77-39fc6a8d92e9",
      "showTitle": true,
-     "tableResultSettingsMap": {},
+     "tableResultSettingsMap": {
+      "0": {
+       "dataGridStateBlob": "{\"version\":1,\"tableState\":{\"columnPinning\":{\"left\":[\"#row_number#\"],\"right\":[]},\"columnSizing\":{},\"columnVisibility\":{}},\"settings\":{\"columns\":{}},\"syncTimestamp\":1775056717427}",
+       "filterBlob": "{\"version\":1,\"filterGroups\":[],\"syncTimestamp\":1775051018238}",
+       "queryPlanFiltersBlob": "[]",
+       "tableResultIndex": 0
+      }
+     },
      "title": "Function: paymentType"
     }
    },
    "outputs": [],
    "source": [
     "df, df_audit = APS.paymentType(silver_m1, silver_m4)\n",
-    "# display(df)"
+    "# df.display()"
    ]
   },
   {

Databricks/ACTIVE/APPEALS/shared_functions/appealSubmitted.py

@@ -60,7 +60,7 @@ def paymentType(silver_m1, silver_m4):
 
     ref_txn_df1 = (
         silver_m4.alias("m4")
-            .join(ref_txn_df.alias("ref_txn"), col("m4.TransactionId") == col("ref_txn.ReferringTransactionId"), "left_anti")
+            .join(ref_txn_df1.alias("ref_txn"), col("m4.TransactionId") == col("ref_txn.ReferringTransactionId"), "left_anti")
             .select("CaseNo", "TransactionId", "TransactionTypeId", "Amount", "SumBalance", "SumTotalPay")
     )
 
@@ -160,7 +160,7 @@ def paymentType(silver_m1, silver_m4):
             .otherwise(lit(None))
             .alias("dv_paymentStatus"),
         )
-        .select(
+    .select(
             "CaseNo",
             "feeAmountGbp",
             "feeDescription",
@@ -177,9 +177,10 @@ def paymentType(silver_m1, silver_m4):
             "rpDcAppealHearingOption",
             "paidDate",
             "paidAmount",
-            "additionalPaymentInfo",
+            "additionalPaymentInfo"
         )
     )
+
     payment_audit_final = (
         payment_audit.alias("audit")
         .join(paid_amount.alias("paid_amount"), ["CaseNo"], "left")

tests/active/appealSubmitted/aps_paymentType_test.py

@@ -106,11 +106,18 @@ def test_paymentStatus(self, spark):
 
             resultList = df.orderBy(col("CaseNo").cast("int")).select("paymentStatus").collect()
 
-            assert resultList[0][0] == "Paid" and resultList[1][0] == "Paid" and resultList[2][0] == "Paid" and resultList[3][0] == "Paid"
+            assert resultList[0][0] == "Paid" 
+            assert resultList[1][0] == "Paid" 
+            assert resultList[2][0] == "Paid" 
+            assert resultList[3][0] == "Paid"
             assert resultList[4][0] is None 
-            assert resultList[5][0] == "Paid" and resultList[6][0] == "Paid" and resultList[7][0] == "Paid"
-            assert resultList[8][0] == "Paid" and resultList[9][0] == "Payment pending"
-            assert resultList[10][0] == "Paid" and resultList[11][0] == 'Payment pending' #ignore TransactionTypeId == 6, 19
+            assert resultList[5][0] == "Paid" 
+            assert resultList[6][0] == "Paid" 
+            assert resultList[7][0] == "Paid"
+            assert resultList[8][0] == "Payment pending" 
+            assert resultList[9][0] == "Payment pending"
+            assert resultList[10][0] == "Paid"
+            assert resultList[11][0] == 'Paid' #ignore TransactionTypeId == 6, 19
 
     def test_paAppealTypePaymentOption(self, spark):
         with patch('Databricks.ACTIVE.APPEALS.shared_functions.appealSubmitted.PP') as PP: