Skip to content

Commit 9d6d50e

Browse files
committed
Change import_datetime to import_date to account for changes to the new source data tables
1 parent 6367b85 commit 9d6d50e

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

scripts/jobs/data_and_insight/person_matching_module.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@ def prepare_clean_council_tax_data(spark: SparkSession, council_tax_account: Dat
385385
A DataFrame after preparing and cleaning data from multiple council tax tables.
386386
"""
387387
council_tax_occupation = council_tax_occupation.filter(
388-
(col("live_ind") == 1) & (col("vacation_date") > col("import_datetime")))
388+
(col("live_ind") == 1) & (col("vacation_date") > col("import_date")))
389389

390390
council_tax_property_occupancy = council_tax_occupation \
391391
.join(council_tax_property, "property_ref") \
@@ -538,19 +538,19 @@ def prepare_clean_housing_benefit_data(hb_member_df: DataFrame,
538538
.withColumnRenamed("addr2", "address_line_2") \
539539
.withColumnRenamed("addr3", "address_line_3") \
540540
.withColumnRenamed("addr4", "address_line_4") \
541-
.filter((col("from_date") < col("import_datetime")) & (col("to_date") > col("import_datetime"))) \
541+
.filter((col("from_date") < col("import_date")) & (col("to_date") > col("import_date"))) \
542542
.select(col("claim_id"), col("claim_house_id"), col("address_line_1"), col("address_line_2"),
543543
col("address_line_3"), col("address_line_4"), col("post_code"), col("uprn"))
544544

545545
housing_benefit_rent_assessment = hb_rent_assessment_df \
546546
.withColumn("source_filter", when((col("dhp_ind") == 1) & (col("type_ind") > 1), "DHP").otherwise("HB")) \
547-
.filter((col("from_date") < col("import_datetime")) & (col("to_date") > col("import_datetime"))
547+
.filter((col("from_date") < col("import_date")) & (col("to_date") > col("import_date"))
548548
& ((col("type_ind") == 1) | (col("dhp_ind") == 1)) & (col("model_amt") > 0)) \
549549
.select(col("claim_id"), col("source_filter"))
550550

551551
housing_benefit_ctax_assessment = hb_ctax_assessment_df \
552552
.withColumn("source_filter", lit("CTS")) \
553-
.filter((col("from_date") < col("import_datetime")) & (col("to_date") > col("import_datetime"))
553+
.filter((col("from_date") < col("import_date")) & (col("to_date") > col("import_date"))
554554
& (col("model_amt") > 0) & ((col("type_ind") == 1) | (col("dhp_ind") == 1))) \
555555
.select(col("claim_id"), col("source_filter"))
556556

0 commit comments

Comments
 (0)