avniproject/avni-server#866 | use disabled_in_cognito and last_activated_date_time info to filter out users to nudge

Author: himeshr

rwb/src/main/resources/custom_query_insert.sql

@@ -6,9 +6,11 @@ VALUES (DEFAULT, '69f9f68d-7870-4ea4-b69f-49f68da0c17a', 'Inactive users', 'WITH
              join user_group ug on u.id = ug.user_id and ug.is_voided = false
              join groups g on g.id = ug.group_id and g.is_voided = false
     where g.name = ''Primary Users''
-      and u.is_voided = false
+        and u.disabled_in_cognito = false
+        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
@@ -18,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 =
@@ -28,21 +30,21 @@ 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 encounter_type.is_voided)
                               and (e.is_voided is null or e.is_voided = false)
-                              and wo.organisation_id = :org_id
+                              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
                   left join work_orders wo on wo.address_id = cam.addresslevel_id
-                  left join closed_work_orders cwo on cwo.address_id = cam.addresslevel_id
+                  left join closed_work_orders cwo on cwo.wo_id = wo.wo_id
          where c.is_voided = false
          group by 1
          having count(wo.wo_id) = null
-             OR count(wo.wo_id) > count(cwo.wo_id)
+             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
@@ -56,13 +58,12 @@ 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
+                  union
+                  select muid
                       from active_user_ids);',
         :org_id,
         false,

rwb/src/main/resources/select_inactive_users_id.sql

@@ -4,7 +4,9 @@ WITH primary_users as (
              join user_group ug on u.id = ug.user_id and ug.is_voided = false
              join groups g on g.id = ug.group_id and g.is_voided = false
     where g.name = 'Primary Users'
-      and u.is_voided = false
+        and u.disabled_in_cognito = false
+        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 (
          select i.id wo_id, i.address_id, organisation_id
@@ -20,10 +22,10 @@ WITH primary_users as (
                             from work_orders wo
                                      join encounter e on wo.wo_id = e.individual_id
                             where e.encounter_type_id =
-                                                                   (select id
-                                                                    from encounter_type
-                                                                    where name = 'Work order endline'
-                                                                      and organisation_id = (select id from organisation where db_user = :org_db_user)
+                                  (select id
+                                   from encounter_type
+                                   where name = 'Work order endline'
+                                     and organisation_id = (select id from organisation where db_user = :org_db_user)
                                      and not encounter_type.is_voided)
                               and (e.is_voided is null or e.is_voided = false)
                               and wo.organisation_id = (select id from organisation where db_user = :org_db_user)
@@ -57,8 +59,8 @@ WITH primary_users as (
 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);
+where user_id in (select cuid
+                  from active_user_ids
+                  union
+                  select muid
+                  from active_user_ids);