Merged in r2-2827-reporting-location (pull request #6749)

R2-2827: Using record owner location instead record location for record location insight

Author: jtoliver-quoin

app/javascript/components/insights/constants.js

@@ -76,7 +76,7 @@ export const AGENCY = "agency";
 export const BY = "by";
 export const WORKFLOW = "workflow";
 export const PROTECTION_CONCERNS = "protection_concerns";
-export const REPORTING_LOCATIONS = "location_current";
+export const REPORTING_LOCATIONS = "owned_by_location";
 export const FOLLOWUPS = "followup_type";
 export const SERVICES = "service_type";
 export const VIOLENCE_TYPE = "cp_incident_violence_type";

app/models/managed_report.rb

@@ -38,7 +38,7 @@ def self.list
         subreports: %w[reporting_locations],
         permitted_filters: [
           :grouped_by, :by, :created_by_groups, :owned_by_groups,
-          :created_organization, :owned_by_agency_id, :location_current, { status: {}, registration_date: {} }
+          :created_organization, :owned_by_agency_id, :owned_by_location, { status: {}, registration_date: {} }
         ],
         module_id: PrimeroModule::CP
       ),

app/models/managed_reports/indicators/field_by_age_sex.rb

@@ -55,7 +55,7 @@ def sql(current_user, params = {})
             #{equal_value_query(params['module_id'])&.prepend('and ')}
             #{field_value(params[field_name])&.prepend('and ')}
             #{user_scope_query(current_user)&.prepend('and ')}
-            #{reporting_location_query(params['location_current'])&.prepend('and ')}
+            #{reporting_location_query(params['owned_by_location'])&.prepend('and ')}
             group by name, key
               #{grouped_date_query(params['grouped_by'], date_param)&.prepend(', ')}
             order by name, key

app/models/managed_reports/indicators/reporting_location_by_sex_and_age.rb

@@ -10,7 +10,7 @@ def id
     end
 
     def field_name
-      'location_current'
+      'owned_by_location'
     end
 
     def reporting_location_field?

app/models/managed_reports/sql_query_helpers.rb

@@ -62,15 +62,15 @@ def reporting_location_query(param, _table_name = nil, _hash_field = 'data', map
         [
           %(
             (
-              data->>:field_name = :param_value AND data->>:field_name IS NOT NULL AND EXISTS
+              data ? :field_name AND data->>:field_name IS NOT NULL AND EXISTS
               (
                 SELECT
                   1
                 FROM locations
                 INNER JOIN locations AS descendants
                 ON locations.admin_level <= descendants.admin_level
                   AND locations.hierarchy_path @> descendants.hierarchy_path
-                WHERE locations.location_code = data->>:field_name AND descendants.location_code = data->>:field_name
+                WHERE locations.location_code = :param_value AND descendants.location_code = data->>:field_name
               )
             )
           ),