avniproject/avni-server#866 | Update custom Query Insert sql

Author: himeshr

rwb/src/main/resources/custom_query_insert.sql

@@ -10,7 +10,7 @@ VALUES (DEFAULT, '69f9f68d-7870-4ea4-b69f-49f68da0c17a', 'Inactive users', 'WITH
         and u.last_activated_date_time is null OR u.last_activated_date_time < now() - INTERVAL ''3 DAYS''
         and u.is_voided = false
 ),
-        work_orders as (
+     work_orders as (
          select i.id wo_id, i.address_id, organisation_id
          from individual i
          where i.is_voided = false
@@ -20,7 +20,7 @@ VALUES (DEFAULT, '69f9f68d-7870-4ea4-b69f-49f68da0c17a', 'Inactive users', 'WITH
                                       and organisation_id = (select id from organisation where db_user = :org_db_user)
                                       and not subject_type.is_voided)
      ),
-        closed_work_orders as (select wo.wo_id, wo.address_id
+     closed_work_orders as (select wo.wo_id, wo.address_id
                             from work_orders wo
                                      join encounter e on wo.wo_id = e.individual_id
                             where e.encounter_type_id =
@@ -33,7 +33,7 @@ VALUES (DEFAULT, '69f9f68d-7870-4ea4-b69f-49f68da0c17a', 'Inactive users', 'WITH
                               and wo.organisation_id = (select id from organisation where db_user = :org_db_user)
                             group by 1, 2
                             having count(e.id) = 1),
-        catchments_without_work_orders_or_atleast_one_open_work_order as (
+     catchments_without_work_orders_or_atleast_one_open_work_order as (
          select c.id
          from catchment c
                   join virtual_catchment_address_mapping_table cam on cam.catchment_id = c.id
@@ -44,7 +44,7 @@ VALUES (DEFAULT, '69f9f68d-7870-4ea4-b69f-49f68da0c17a', 'Inactive users', 'WITH
          having count(wo.wo_id) = null
              OR count( wo.wo_id) > count( cwo.wo_id)
      ),
-        active_user_ids as (select (case
+     active_user_ids as (select (case
                                      when ind.created_date_time > TO_TIMESTAMP(:cutOffDate, ''YYYY-MM-DDTHH24:MI:ss.MS'')
                                          then ind.created_by_id end) as cuid,
                                 ind.last_modified_by_id              as muid
@@ -58,13 +58,14 @@ VALUES (DEFAULT, '69f9f68d-7870-4ea4-b69f-49f68da0c17a', 'Inactive users', 'WITH
                          from encounter enc
                          where enc.last_modified_date_time > TO_TIMESTAMP(:cutOffDate, ''YYYY-MM-DDTHH24:MI:ss.MS'')
                          order by 1 asc)
-select distinct user_id, first_name from primary_users pu
+select distinct user_id, first_name
+from primary_users pu
          join catchments_without_work_orders_or_atleast_one_open_work_order cat on pu.catchment_id = cat.id
 where user_id not in (select cuid
-                  from active_user_ids
-                  union
-                  select muid
-                      from active_user_ids);',
+                      from active_user_ids where cuid is not null
+                      union
+                      select muid
+                      from active_user_ids where muid is not null);',
         :org_id,
         false,
         0,