Skip to content

Feature bug fixes 20260331 #954

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
misbahulislam2 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Feature bug fixes 20260331 #954

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a45f0ae
Updated Address logic
misbahulislam2 Apr 1, 2026
0970706
Added paymentpendingdetained changes to appealsubmitted
misbahulislam2 Apr 2, 2026
cee2c3b
Added PaymentPendingDetained to all states
misbahulislam2 Apr 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 20 additions & 25 deletions Databricks/ACTIVE/APPEALS/GOLD_APPEAL_SUBMITTED_JSON.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
"outputs": [],
"source": [
"import shared_functions.paymentPending as PP\n",
"import shared_functions.paymentPendingDetained as PPD\n",
"import shared_functions.appealSubmitted as APS\n",
"from shared_functions.DQRules import base_DQRules, build_rule_expression, build_dq_rules_dependencies"
]
Expand Down Expand Up @@ -218,11 +219,7 @@
"cell_type": "markdown",
"metadata": {
"application/vnd.databricks.v1+cell": {
"cellMetadata": {
"batchId": -6018114963734290,
"byteLimit": 2048000,
"rowLimit": 10000
},
"cellMetadata": {},
"inputWidgets": {},
"nuid": "e818dd62-dc2f-4b3b-bac0-f9216f747357",
"showTitle": false,
Expand Down Expand Up @@ -264,7 +261,8 @@
"silver_h = spark.table(\"hive_metastore.ariadm_active_appeals.silver_history_detail\")\n",
"bronze_hearing_centres = spark.table(\"hive_metastore.ariadm_active_appeals.bronze_hearing_centres\")\n",
"bronze_derive_hearing_centres = spark.table(\"hive_metastore.ariadm_active_appeals.bronze_derive_hearing_centres\")\n",
"bronze_HORef_cleansing = spark.table(\"hive_metastore.ariadm_active_appeals.bronze_HORef_cleansing\")"
"bronze_HORef_cleansing = spark.table(\"hive_metastore.ariadm_active_appeals.bronze_HORef_cleansing\")\n",
"bronze_detention_centres = spark.table(\"hive_metastore.ariadm_active_appeals.bronze_detention_centres\")"
]
},
{
Expand Down Expand Up @@ -411,21 +409,14 @@
"inputWidgets": {},
"nuid": "3c102932-86cd-491c-ba77-39fc6a8d92e9",
"showTitle": true,
"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
}
},
"tableResultSettingsMap": {},
"title": "Function: paymentType"
}
},
"outputs": [],
"source": [
"df, df_audit = APS.paymentType(silver_m1, silver_m4)\n",
"# df.display()"
"# display(df)"
]
},
{
Expand Down Expand Up @@ -600,26 +591,26 @@
},
"outputs": [],
"source": [
"def mainAppealSubmitted(silver_segmentation, silver_m1, silver_m2, silver_m3, silver_m4, silver_c, silver_h, bronze_remissions, bronze_countryFromAddress, bronze_HORef_cleansing, bronze_hearing_centres, bronze_derive_hearing_centres):\n",
"def mainAppealSubmitted(silver_segmentation, silver_m1, silver_m2, silver_m3, silver_m4, silver_c, silver_h, bronze_remissions, bronze_countryFromAddress, bronze_HORef_cleansing, bronze_hearing_centres, bronze_derive_hearing_centres, bronze_detention_centres):\n",
"\n",
" AppealState = \"appealSubmitted\"\n",
"\n",
" # Aggregate details\n",
" AppealType_df, AppealType_df_audit = PP.appealType(silver_m1)\n",
" caseData_df, caseData_df_audit = PP.caseData(silver_m1, silver_m2, silver_m3, silver_h, bronze_hearing_centres, bronze_derive_hearing_centres)\n",
" caseData_df, caseData_df_audit = PPD.caseData(silver_m1, silver_m2, silver_m3, silver_h, bronze_hearing_centres, bronze_derive_hearing_centres,bronze_detention_centres)\n",
" flagsLabels_df, flagsLabels_df_audit = PP.flagsLabels(silver_m1, silver_m2, silver_c)\n",
" appellantDetails_df, appellantDetails_df_audit = PP.appellantDetails(silver_m1, silver_m2, silver_c, bronze_countryFromAddress,bronze_HORef_cleansing)\n",
" appellantDetails_df, appellantDetails_df_audit = PPD.appellantDetails(silver_m1, silver_m2, silver_c, bronze_countryFromAddress,bronze_HORef_cleansing)\n",
" legalRepDetails_df, legalRepDetails_df_audit = PP.legalRepDetails(silver_m1, bronze_countryFromAddress)\n",
" partyID_df, partyID_df_audit = PP.partyID(silver_m1, silver_m3, silver_c)\n",
" payment_df, payment_df_audit = APS.paymentType(silver_m1, silver_m4)\n",
" homeOfficeDetails_df, homeOfficeDetails_df_audit = PP.homeOfficeDetails(silver_m1, silver_m2, silver_c, bronze_HORef_cleansing)\n",
" remissionTypes_df, remissionTypes_df_audit = APS.remissionTypes(silver_m1, bronze_remission_lookup_df, silver_m4)\n",
" sponsorDetails_df, sponsorDetails_df_audit = PP.sponsorDetails(silver_m1, silver_c)\n",
" general_df, general_df_audit = PP.general(silver_m1, silver_m2, silver_m3, silver_h, bronze_hearing_centres, bronze_derive_hearing_centres)\n",
" sponsorDetails_df, sponsorDetails_df_audit = PPD.sponsorDetails(silver_m1, silver_c)\n",
" general_df, general_df_audit = PPD.general(silver_m1, silver_m2, silver_m3, silver_h, bronze_hearing_centres, bronze_derive_hearing_centres,bronze_detention_centres)\n",
" generalDefault_df = PP.generalDefault(silver_m1)\n",
" documents_df, documents_df_audit = PP.documents(silver_m1)\n",
" caseState_df, caseState_df_audit = PP.caseState(silver_m1, AppealState)\n",
" detainedState_df, detainedState_df_audit = PP.detainedState(silver_m1)\n",
" detainedState_df, detainedState_df_audit = PPD.detained(silver_m1,silver_m2,bronze_detention_centres)\n",
" silver_segmentation_df = silver_segmentation\n",
"\n",
" # Join all aggregated data with Appeal Case Details\n",
Expand Down Expand Up @@ -686,7 +677,7 @@
"\n",
"# bronze_HORef_cleansing = spark.table(\"hive_metastore.ariadm_active_appeals.bronze_HORef_cleansing\")\n",
"\n",
"# df_final, df_audit = mainAppealSubmitted(silver_segmentation,silver_m1, silver_m2, silver_m3,silver_m4, silver_c,silver_h, bronze_remissions, bronze_countryFromAddress, bronze_HORef_cleansing)\n",
"# df_final, df_audit = mainAppealSubmitted(silver_segmentation,silver_m1, silver_m2, silver_m3,silver_m4, silver_c,silver_h, bronze_remissions, bronze_countryFromAddress, bronze_HORef_cleansing,bronze_detention_centres)\n",
"\n",
"# display(df_final)"
]
Expand Down Expand Up @@ -882,6 +873,7 @@
" bronze_derive_hearing_centres = dlt.read(\"bronze_derive_hearing_centres\")\n",
" bronze_interpreter_languages = dlt.read(\"bronze_interpreter_languages\")\n",
" bronze_listing_location = dlt.read(\"bronze_listing_location\")\n",
" bronze_detention_centres = dlt.read(\"bronze_detention_centres\")\n",
" silver_segmentation = dlt.read(\"stg_segmentation_states\").filter(col(\"TargetState\") == lit(AppealState))\n",
" except:\n",
" silver_m1 = spark.table(\"hive_metastore.ariadm_active_appeals.silver_appealcase_detail\").filter(col(\"dv_targetState\") == lit(AppealState)).distinct()\n",
Expand All @@ -899,15 +891,16 @@
" bronze_derive_hearing_centres = spark.table(\"hive_metastore.ariadm_active_appeals.bronze_derive_hearing_centres\")\n",
" bronze_interpreter_languages = spark.table(\"hive_metastore.ariadm_active_appeals.bronze_interpreter_languages\")\n",
" bronze_listing_location = spark.table(\"hive_metastore.ariadm_active_appeals.bronze_listing_location\")\n",
" bronze_detention_centres = spark.table(\"hive_metastore.ariadm_active_appeals.bronze_detention_centres\")\n",
" silver_segmentation = spark.table(\"hive_metastore.ariadm_active_appeals.stg_segmentation_states\").filter(col(\"TargetState\") == lit(AppealState))\n",
" bronze_ended_states = spark.table(\"hive_metastore.ariadm_active_appeals.bronze_ended_states\")\n",
" \n",
" df_final, df_audit = mainAppealSubmitted(silver_segmentation, silver_m1, silver_m2, silver_m3, silver_m4, silver_c, silver_h, bronze_remissions, bronze_countryFromAddress, bronze_HORef_cleansing, bronze_hearing_centres, bronze_derive_hearing_centres)\n",
" df_final, df_audit = mainAppealSubmitted(silver_segmentation, silver_m1, silver_m2, silver_m3, silver_m4, silver_c, silver_h, bronze_remissions, bronze_countryFromAddress, bronze_HORef_cleansing, bronze_hearing_centres, bronze_derive_hearing_centres,bronze_detention_centres)\n",
" \n",
" df_final = build_dq_rules_dependencies(df_final, silver_m1, silver_m2, silver_m3, silver_m4, silver_m6, silver_c,silver_h,\n",
" bronze_countries_postal_lookup_df, bronze_HORef_cleansing, bronze_remissions,\n",
" bronze_interpreter_languages, bronze_listing_location,bronze_ended_states,\n",
" bronze_hearing_centres, bronze_derive_hearing_centres)\n",
" bronze_hearing_centres, bronze_derive_hearing_centres, bronze_detention_centres)\n",
" \n",
" df_final = df_final.withColumn(\"is_valid\", expr(dq_rules))\n",
"\n",
Expand Down Expand Up @@ -1052,6 +1045,7 @@
" bronze_remissions = dlt.read(\"bronze_remissions\").distinct()\n",
" bronze_countryFromAddress = dlt.read(\"bronze_countries_countryFromAddress\")\n",
" bronze_HORef_cleansing = dlt.read(\"bronze_HORef_cleansing\")\n",
" bronze_detention_centres = dlt.read(\"bronze_detention_centres\")\n",
" silver_segmentation = dlt.read(\"stg_segmentation_states\").filter(col(\"TargetState\") == lit(AppealState))\n",
" except:\n",
" silver_m1 = spark.table(\"hive_metastore.ariadm_active_appeals.silver_appealcase_detail\").filter(col(\"dv_targetState\") == lit(AppealState)).distinct()\n",
Expand All @@ -1071,9 +1065,10 @@
" bronze_remissions = spark.table(\"hive_metastore.ariadm_active_appeals.bronze_remissions\").distinct()\n",
" bronze_countryFromAddress = spark.table(\"hive_metastore.ariadm_active_appeals.bronze_countries_countryFromAddress\")\n",
" bronze_HORef_cleansing = spark.table(\"hive_metastore.ariadm_active_appeals.bronze_HORef_cleansing\")\n",
" bronze_detention_centres = spark.table(\"hive_metastore.ariadm_active_appeals.bronze_detention_centres\")\n",
" silver_segmentation = spark.table(\"hive_metastore.ariadm_active_appeals.stg_segmentation_states\").filter(col(\"TargetState\") == lit(AppealState))\n",
" \n",
" df_final,df_audit = mainAppealSubmitted(silver_segmentation,silver_m1, silver_m2, silver_m3, silver_m4, silver_c, silver_h, bronze_remission_lookup_df, bronze_countryFromAddress, bronze_HORef_cleansing, bronze_hearing_centres, bronze_derive_hearing_centres)\n",
" df_final,df_audit = mainAppealSubmitted(silver_segmentation,silver_m1, silver_m2, silver_m3, silver_m4, silver_c, silver_h, bronze_remission_lookup_df, bronze_countryFromAddress, bronze_HORef_cleansing, bronze_hearing_centres, bronze_derive_hearing_centres,bronze_detention_centres)\n",
"\n",
" return df_audit"
]
Expand Down
Loading
Loading