Merge branch '12.1'

Author: himeshr

rwb/src/main/resources/custom_query_insert.sql

@@ -2,11 +2,13 @@ INSERT INTO public.custom_query (id, uuid, name, query, organisation_id, is_void
                                  last_modified_by_id, created_date_time, last_modified_date_time)
 VALUES (DEFAULT, '69f9f68d-7870-4ea4-b69f-49f68da0c17a', 'Inactive users', 'WITH primary_users as (
     select distinct u.id user_id, u.name first_name, catchment_id
-    from users u
+    from public.users u
              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
@@ -28,19 +30,19 @@ 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 (
          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
                                      when ind.created_date_time > TO_TIMESTAMP(:cutOffDate, ''YYYY-MM-DDTHH24:MI:ss.MS'')
@@ -60,10 +62,10 @@ 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
+                      from active_user_ids where cuid is not null
                       union
                       select muid
-                      from active_user_ids);',
+                      from active_user_ids where muid is not null);',
         :org_id,
         false,
         0,

rwb/src/main/resources/select_inactive_users_id.sql

@@ -1,10 +1,12 @@
 WITH primary_users as (
     select distinct u.id user_id, u.name first_name, catchment_id
-    from users u
+    from public.users u
              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)
@@ -58,7 +60,7 @@ 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
+                      from active_user_ids where cuid is not null
                       union
                       select muid
-                      from active_user_ids);
+                      from active_user_ids where muid is not null);

rwb/src/main/resources/select_inactive_users_logic.md

@@ -0,0 +1,87 @@
+# RWB Inactive Users Custom Query Business Logic
+================================================
+
+This document summarizes the business logic behind **"RWB Inactive Users"** PostgreSQL query that identifies specific users based on their group membership, catchment areas, and work order status.
+
+## Overview
+
+------------
+
+The query involves several steps to filter users who meet certain criteria related to their group membership, catchment areas, and recent activity.
+
+## Steps Involved
+
+------------------
+
+### 1. **Primary Users Identification**
+
+--------------------------------------
+
+- **Purpose**: Identify users who belong to the 'Primary Users' group and are not disabled in Cognito.
+- **Conditions**:
+  - Users must be part of the 'Primary Users' group.
+  - Users must not be disabled in Cognito (`disabled_in_cognito = false`).
+  - Users must either have no `last_activated_date_time` or it must be older than 3 days (`last_activated_date_time is null OR last_activated_date_time < now() - INTERVAL '3 DAYS'`).
+  - Users must not be voided (`is_voided = false`).
+
+
+### 2. **Work Orders Identification**
+
+--------------------------------------
+
+- **Purpose**: Identify work orders that are not voided and belong to a specific organization.
+- **Conditions**:
+  - Work orders must not be voided (`is_voided = false`).
+  - Work orders must be of type 'Work Order' for a specific organization (`subject_type_id` matches the 'Work Order' type for the organization identified by `:org_db_user`).
+
+
+### 3. **Closed Work Orders Identification**
+
+--------------------------------------------
+
+- **Purpose**: Identify work orders that have been closed.
+- **Conditions**:
+  - Work orders must have an encounter of type 'Work order endline' for the same organization.
+  - The encounter must not be voided (`is_voided is null or is_voided = false`).
+  - There must be exactly one such encounter per work order (`having count(e.id) = 1`).
+
+
+### 4. **Catchments Without Work Orders or At Least One Open Work Order**
+
+-------------------------------------------------------------------
+
+- **Purpose**: Identify catchment areas that either have no work orders or have more open work orders than closed ones.
+- **Conditions**:
+  - Catchments must not be voided (`is_voided = false`).
+  - Either there are no work orders (`count(wo.wo_id) = null`), or there are more work orders than closed work orders (`count(wo.wo_id) > count(cwo.wo_id)`).
+
+
+### 5. **Active User IDs**
+
+-------------------------
+
+- **Purpose**: Identify user IDs that have been active recently (created or modified entities after a certain cutoff date).
+- **Conditions**:
+  - For individuals and encounters, if the creation or modification date is after the specified cutoff date, the created_by_id or last_modified_by_id is considered an active user ID.
+
+
+### 6. **Final Selection**
+
+-------------------------
+
+- **Purpose**: Select primary users who are in catchments without work orders or at least one open work order and have not been active recently.
+- **Conditions**:
+  - Users must be primary users in catchments identified in step 4.
+  - Users must not have been active recently (their IDs must not be in the list of active user IDs).
+
+
+## Summary
+
+----------
+
+This query identifies primary users in catchments without work order or atleast one open wor-order, who have not been recently active in the system. It ensures that these users meet all the specified criteria related to their group membership, catchment areas, and recent activity.
+
+## IMPORTANT Additional Details
+
+- The CutOffDate for determining in-activity is 3 Days from current date.
+- Also, if the user has been nudged in the last 3 days, we do not nudge him again.