Filter all location queries by validity

individual/gql_mutations.py

@@ -4,6 +4,7 @@
 from django.db.models import Subquery, Q
 from django.utils.translation import gettext as _
 
+from core import filter_validity
 from core.gql.gql_mutations.base_mutation import BaseHistoryModelDeleteMutationMixin, BaseMutation, \
     BaseHistoryModelUpdateMutationMixin, BaseHistoryModelCreateMutationMixin
 from core.schema import OpenIMISMutation
@@ -167,7 +168,12 @@ def _validate_mutation(cls, user, **data):
                 IndividualConfig.gql_individual_delete_perms):
             raise PermissionDenied(_("unauthorized"))
 
-        locations_id = list(Location.objects.filter(individuals__id__in=data['ids']).values_list('id', flat=True))
+        locations_id = list(
+            Location.objects.filter(
+                individuals__id__in=data['ids'],
+                *filter_validity()
+            ).values_list('id', flat=True)
+        )
         if len(locations_id)>0 and not LocationManager().is_allowed(
                 user,
                 locations_id
@@ -209,7 +215,12 @@ def _validate_mutation(cls, user, **data):
                 IndividualConfig.gql_individual_undo_delete_perms):
             raise PermissionDenied(_("unauthorized"))
 
-        locations_id = list(Location.objects.filter(individuals__id__in=data['ids']).values_list('id', flat=True))
+        locations_id = list(
+            Location.objects.filter(
+                individuals__id__in=data['ids'],
+                *filter_validity()
+            ).values_list('id', flat=True)
+        )
         if len(locations_id)>0 and not LocationManager().is_allowed(
                 user,
                 locations_id
@@ -318,7 +329,12 @@ def _validate_mutation(cls, user, **data):
                 IndividualConfig.gql_group_delete_perms):
             raise PermissionDenied(_("unauthorized"))
 
-        locations_id = list(Location.objects.filter(groups__id__in=data['ids']).values_list('id', flat=True))
+        locations_id = list(
+            Location.objects.filter(
+                groups__id__in=data['ids'],
+                *filter_validity()
+            ).values_list('id', flat=True)
+        )
         if len(locations_id)>0 and not LocationManager().is_allowed(
                 user,
                 locations_id
@@ -442,10 +458,12 @@ def _validate_mutation(cls, user, **data):
         if not user.has_perms(
                 IndividualConfig.gql_group_delete_perms):
             raise PermissionDenied(_("unauthorized"))
-        locations_qs = list(Location.objects.filter(
-            Q(groups__groupindividuals__id__in=data['ids'])|
-            Q(individuals__groupindividuals__id__in=data['ids'])
-        ).values_list('id', flat=True))
+        locations_qs = list(
+            Location.objects.filter(
+                Q(groups__groupindividuals__id__in=data['ids'])|
+                Q(individuals__groupindividuals__id__in=data['ids'])
+            ).filter(*filter_validity()).values_list('id', flat=True)
+        )
         # must first check if locations_qs exists in case none of the groups or individuals has location
         if len(locations_qs)>0 and not LocationManager().is_allowed(
                 user,

individual/management/commands/fake_individuals.py

@@ -9,6 +9,7 @@
 from individual.models import GroupIndividual
 from individual.tests.test_helpers import generate_random_string
 from location.models import Location
+from core import filter_validity
 from core.models import User
 
 
@@ -65,7 +66,7 @@ def handle(self, *args, **options):
         location_qs = Location.objects
         if user:
             location_qs = Location.get_queryset(location_qs, user)
-        permitted_locations = list(location_qs.filter(type='V'))
+        permitted_locations = list(location_qs.filter(type='V', *filter_validity()))
 
         individuals = []
         num_individuals = 100

individual/services.py

@@ -9,6 +9,7 @@
 from django.db import transaction
 
 from calculation.services import get_calculation_object
+from core import filter_validity
 from core.custom_filters import CustomFilterWizardStorage
 from core.models import User
 from core.services import BaseService
@@ -661,14 +662,14 @@ def _query_location_district_ids(df):
         query = Q()
         for _, row in unique_tuples.iterrows():
             query |= Q(name=row['location_name'], code=row['location_code'])
-        locations = Location.objects.filter(type="V").filter(query)
+        locations = Location.objects.filter(type="V", *filter_validity()).filter(query)
         return {(loc.name, loc.code): loc.parent.parent.id for loc in locations}
 
     @staticmethod
     def _query_duplicate_village_name_code():
         return (
             Location.objects
-            .filter(type="V")
+            .filter(type="V", *filter_validity())
             .values('name', 'code')
             .annotate(name_count=Count('id'))
             .filter(name_count__gt=1)

individual/workflows/base_individual_update.py

@@ -88,6 +88,7 @@ def process_update_individuals_workflow(user_uuid, upload_uuid):
                     ON loc."LocationName" = f."Json_ext"->>'location_name'
                     AND loc."LocationCode" = f."Json_ext"->>'location_code'
                     AND loc."LocationType"='V'
+                    AND loc."ValidityTo" IS NULL
             WHERE individual_individual."UUID" = (f."Json_ext" ->> 'ID')::UUID
             returning individual_individual."UUID", f."UUID" as "individualdatasource_id")
 

individual/workflows/base_individual_upload.py

@@ -71,6 +71,7 @@ def process_import_individuals_workflow(user_uuid, upload_uuid):
                     ON loc."LocationName" = ds."Json_ext"->>'location_name'
                     AND loc."LocationCode" = ds."Json_ext"->>'location_code'
                     AND loc."LocationType"='V'
+                    AND loc."ValidityTo" IS NULL
             WHERE ds.upload_id=current_upload_id 
                 AND ds.individual_id is null
                 AND ds."isDeleted"=False

individual/workflows/individual_update_valid.py

@@ -93,6 +93,7 @@ def process_update_valid_individuals_workflow(user_uuid, upload_uuid, accepted=N
                     ON loc."LocationName" = ids."Json_ext"->>'location_name'
                     AND loc."LocationCode" = ids."Json_ext"->>'location_code'
                     AND loc."LocationType"='V'
+                    AND loc."ValidityTo" IS NULL
             WHERE individual_individual."UUID" = (ids."Json_ext" ->> 'ID')::UUID
             AND ids.upload_id = current_upload_id
             AND validations ->> 'validation_errors' = '[]'
@@ -215,6 +216,7 @@ def process_update_valid_individuals_workflow(user_uuid, upload_uuid, accepted=N
                     ON loc."LocationName" = ids."Json_ext"->>'location_name'
                     AND loc."LocationCode" = ids."Json_ext"->>'location_code'
                     AND loc."LocationType"='V'
+                    AND loc."ValidityTo" IS NULL
             WHERE individual_individual."UUID" = (ids."Json_ext" ->> 'ID')::UUID 
             AND ids.upload_id = current_upload_id
             AND (ids."UUID" = ANY(accepted))

individual/workflows/individual_upload_valid.py

@@ -78,6 +78,7 @@ def process_import_valid_individuals_workflow(user_uuid, upload_uuid, accepted=N
                     ON loc."LocationName" = ds."Json_ext"->>'location_name'
                     AND loc."LocationCode" = ds."Json_ext"->>'location_code'
                     AND loc."LocationType"='V'
+                    AND loc."ValidityTo" IS NULL
             WHERE ds.upload_id = current_upload_id
                 AND ds.individual_id IS NULL 
                 AND ds."isDeleted" = False 
@@ -195,6 +196,7 @@ def process_import_valid_individuals_workflow(user_uuid, upload_uuid, accepted=N
                     ON loc."LocationName" = ds."Json_ext"->>'location_name'
                     AND loc."LocationCode" = ds."Json_ext"->>'location_code'
                     AND loc."LocationType"='V'
+                    AND loc."ValidityTo" IS NULL
             WHERE ds.upload_id = current_upload_id 
                 AND ds.individual_id IS NULL
                 AND ds."isDeleted" = False