From bfd6a7c1b75484bbde0a9a054a49e73385fe6b1a Mon Sep 17 00:00:00 2001 From: sudan45 Date: Mon, 8 Jan 2024 10:14:59 +0545 Subject: [PATCH] update organization filter test case --- apps/assessment_registry/dashboard_schema.py | 9 +++++---- apps/assessment_registry/filter_set.py | 6 ++++++ .../assessment_registry/tests/test_dashboard_schema.py | 10 +++++----- apps/organization/tests/test_schemas.py | 8 ++++---- 4 files changed, 20 insertions(+), 13 deletions(-) diff --git a/apps/assessment_registry/dashboard_schema.py b/apps/assessment_registry/dashboard_schema.py index b30f8ced76..93afc68416 100644 --- a/apps/assessment_registry/dashboard_schema.py +++ b/apps/assessment_registry/dashboard_schema.py @@ -710,7 +710,7 @@ def resolve_assessment_by_data_collection_technique_and_geolocation(root: Assess admin_level_id=models.F("assessment_registry__locations__admin_level_id"), ) .annotate(count=Count("assessment_registry__locations")) - .values('data_collection_technique', 'geo_area', 'region', 'admin_level_id') + .values('data_collection_technique', 'geo_area', 'region', 'admin_level_id', 'count') .order_by("assessment_registry__locations") ) @@ -725,7 +725,7 @@ def resolve_assessment_by_sampling_approach_and_geolocation(root: AssessmentDash admin_level_id=models.F("assessment_registry__locations__admin_level_id"), ) .annotate(count=Count("assessment_registry__locations")) - .values('sampling_approach', 'geo_area', 'region', 'admin_level_id') + .values('sampling_approach', 'geo_area', 'region', 'admin_level_id', 'count') .order_by("assessment_registry__locations") ) @@ -740,7 +740,7 @@ def resolve_assessment_by_proximity_and_geolocation(root: AssessmentDashboardSta admin_level_id=models.F("assessment_registry__locations__admin_level_id"), ) .annotate(count=Count("assessment_registry__locations")) - .values('proximity', 'geo_area', 'region', 'admin_level_id') + .values('proximity', 'geo_area', 'region', 'admin_level_id', 'count') .order_by("assessment_registry__locations") ) @@ -755,6 +755,7 @@ def resolve_assessment_by_unit_of_analysis_and_geolocation(root: AssessmentDashb admin_level_id=models.F("assessment_registry__locations__admin_level_id"), ) .annotate(count=Count("assessment_registry__locations")) + .values('geo_area', 'region', 'admin_level_id', 'unit_of_analysis', 'count') .order_by("assessment_registry__locations") ) @@ -769,7 +770,7 @@ def resolve_assessment_by_unit_of_reporting_and_geolocation(root: AssessmentDash admin_level_id=models.F("assessment_registry__locations__admin_level_id"), ) .annotate(count=Count("assessment_registry__locations")) - .values('unit_of_reporting' 'geo_area', 'region', 'admin_level_id') + .values('unit_of_reporting', 'geo_area', 'region', 'admin_level_id') .order_by("assessment_registry__locations") ) diff --git a/apps/assessment_registry/filter_set.py b/apps/assessment_registry/filter_set.py index 90068d6e73..ae86c1a582 100644 --- a/apps/assessment_registry/filter_set.py +++ b/apps/assessment_registry/filter_set.py @@ -38,6 +38,12 @@ def filter_focuses(self, qs, _, value): def filter_sectors(self, qs, _, value): return qs if value is None else qs.filter(sectors__overlap=value) + def filter_details_type(self, qs, _, value): + return qs if value is None else qs.filter(details_type__overlap=value) + + def filter_coordinated_joint(self, qs, _, value): + return qs if value is None else qs.filter(coordinated_joint__overlap=value) + AssessmentDashboardFilterDataType, AssessmentDashboardFilterDataInputType = generate_type_for_filter_set( AssessmentDashboardFilterSet, diff --git a/apps/assessment_registry/tests/test_dashboard_schema.py b/apps/assessment_registry/tests/test_dashboard_schema.py index 17c012f95e..8450d1bfd5 100644 --- a/apps/assessment_registry/tests/test_dashboard_schema.py +++ b/apps/assessment_registry/tests/test_dashboard_schema.py @@ -344,8 +344,8 @@ def _query_check(filter=None, **kwargs): self.assertEqual(content["collectionTechniqueCount"][1]["dataCollectionTechnique"], "KEY_INFORMAT_INTERVIEW") self.assertEqual(content["assessmentByOverTime"][0]["count"], 1) self.assertEqual(content["assessmentByOverTime"][0]["date"], str(date.today())) - self.assertEqual(content["assessmentGeographicAreas"][0]["geoArea"], self.geo_area1.id) - self.assertEqual(content["assessmentGeographicAreas"][1]["geoArea"], self.geo_area2.id) + self.assertEqual(content["assessmentGeographicAreas"][0]["geoArea"], str(self.geo_area1.id)) + self.assertEqual(content["assessmentGeographicAreas"][1]["geoArea"], str(self.geo_area2.id)) self.assertEqual(content["assessmentByOverTime"][0]["count"], 1) self.assertEqual(content["assessmentByOverTime"][0]["date"], str(date.today())) self.assertEqual(content["assessmentPerFrameworkPillar"][0]["date"], str(date.today())) @@ -356,13 +356,13 @@ def _query_check(filter=None, **kwargs): self.assertEqual( content['assessmentByDataCollectionTechniqueAndGeolocation'][1]['dataCollectionTechnique'], "KEY_INFORMAT_INTERVIEW") - self.assertEqual(content['assessmentByDataCollectionTechniqueAndGeolocation'][0]['geoArea'], self.geo_area1.id) - self.assertEqual(content['assessmentByDataCollectionTechniqueAndGeolocation'][1]['geoArea'], self.geo_area1.id) + self.assertEqual(content['assessmentByDataCollectionTechniqueAndGeolocation'][0]['geoArea'], str(self.geo_area1.id)) + self.assertEqual(content['assessmentByDataCollectionTechniqueAndGeolocation'][1]['geoArea'], str(self.geo_area1.id)) self.assertEqual(content['assessmentByDataCollectionTechniqueAndGeolocation'][0]['count'], 1) self.assertEqual(content['assessmentByDataCollectionTechniqueAndGeolocation'][1]['count'], 1) self.assertEqual(content['assessmentByProximityAndGeolocation'][0]['count'], 2) self.assertEqual(content['assessmentByProximityAndGeolocation'][0]['proximity'], "FACE_TO_FACE") - self.assertEqual(content['assessmentByProximityAndGeolocation'][0]['geoArea'], self.geo_area1.id) + self.assertEqual(content['assessmentByProximityAndGeolocation'][0]['geoArea'], str(self.geo_area1.id)) # assessment Dashboard tab 3 self.assertEqual(content['medianQualityScoreByAnalyticalDensityDate'][0]['sector'], "FOOD_SECURITY") self.assertEqual(content['medianQualityScoreByAnalyticalDensityDate'][0]['sectorDisplay'], "Food Security") diff --git a/apps/organization/tests/test_schemas.py b/apps/organization/tests/test_schemas.py index 2877d464bf..142ea99218 100644 --- a/apps/organization/tests/test_schemas.py +++ b/apps/organization/tests/test_schemas.py @@ -42,12 +42,12 @@ def test_organization_query(self): query MyQuery ( $verified: Boolean $search: String - $usedInProject: ID + $usedInProjectByLead: ID ) { organizations( search: $search verified: $verified - usedInProject: $usedInProject + usedInProjectByLead: $usedInProjectByLead ordering: DESC_TITLE ) { results { @@ -98,10 +98,10 @@ def test_organization_query(self): 'verified': False, }, [org7, org6, org5, org3, org1]), (user, { - 'usedInProject': str(project.id), + 'usedInProjectByLead': str(project.id), }, [org6, org5, org3, org2, org1]), (non_member_user, { - 'usedInProject': str(project.id), + 'usedInProjectByLead': str(project.id), # Return all the organizations (Filter not applied) }, all_org), # unaccent search