Don't include facts from ended resources.

Author: cjohns-scottlogic

digital_land/package/datasetparquet.py

@@ -190,10 +190,11 @@ def load_entities(self):
         # If there are still matches then pick the first resource (and fact, just to make sure)
         query = f"""
             SELECT {fields_str} FROM (
-                SELECT {fields_str}, CASE WHEN resource_csv."end-date" IS NULL THEN '2999-12-31' ELSE resource_csv."end-date" END AS resource_end_date
+                SELECT {fields_str}, resource_csv."end-date" AS resource_end_date
                 FROM temp_table
                 LEFT JOIN read_csv_auto('collection/resource.csv') resource_csv
                 ON temp_table.resource = resource_csv.resource
+                WHERE resource_end_date IS NULL OR resource_end_date > current_date
                 QUALIFY ROW_NUMBER() OVER (
                     PARTITION BY entity, field
                     ORDER BY priority, "entry-date" DESC, "entry-number" DESC, resource_end_date DESC, temp_table.resource, fact