Skip to content

Commit

Permalink
avniproject/avni-server#825 | Update rwb nudge custom query
Browse files Browse the repository at this point in the history
  • Loading branch information
@himeshr
himeshr committed Feb 12, 2025
1 parent 9bd4e8c commit a713c3c
Show file tree
Hide file tree
Showing 2 changed files with 113 additions and 17 deletions.
73 changes: 73 additions & 0 deletions rwb/src/main/resources/custom_query_insert.sql
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
INSERT INTO public.custom_query (id, uuid, name, query, organisation_id, is_voided, version, created_by_id,
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
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
),
work_orders as (
select i.id wo_id, i.address_id, organisation_id
from individual i
where i.is_voided = false
and i.subject_type_id = (select id
from subject_type
where name = ''Work Order''
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
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)
and not encounter_type.is_voided)
and (e.is_voided is null or e.is_voided = false)
and wo.organisation_id = :org_id
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
where c.is_voided = false
group by 1
having count(wo.wo_id) = null
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'')
then ind.created_by_id end) as cuid,
ind.last_modified_by_id as muid
from individual ind
where ind.last_modified_date_time > TO_TIMESTAMP(:cutOffDate, ''YYYY-MM-DDTHH24:MI:ss.MS'')
UNION
select (case
when enc.created_date_time > TO_TIMESTAMP(:cutOffDate, ''YYYY-MM-DDTHH24:MI:ss.MS'')
then enc.created_by_id end) as cuid,
enc.last_modified_by_id as muid
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
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);',
:org_id,
false,
0,
1,
1,
now(),
now());
57 changes: 40 additions & 17 deletions rwb/src/main/resources/select_inactive_users_id.sql
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,45 @@
WITH impacted_users as (
WITH open_work_orders as (select i.id open_wo_id, i.address_id
from individual i
left join encounter e on i.id = e.individual_id
where i.is_voided = false
and i.subject_type_id = (select id from subject_type where name = 'Work Order' and organisation_id = (select id from organisation where db_user = 'rwbniti') and not subject_type.is_voided)
and e.encounter_type_id =
(select id from encounter_type where name = 'Work order endline' and organisation_id = (select id from organisation where db_user = 'rwbniti') and not encounter_type.is_voided)
and (e.is_voided is null or e.is_voided = false)
and i.organisation_id = (select id from organisation where db_user = 'rwbniti')
group by 1
having count(e.id) = 1) -- Use = 1 for testing, < 1 for prod
select distinct u.id user_id, u.username first_name
from open_work_orders owo
join virtual_catchment_address_mapping_table cam on cam.addresslevel_id = owo.address_id
join users u on u.catchment_id = cam.catchment_id and u.is_voided = false
WITH primary_users as (
select distinct u.id user_id, u.name first_name, catchment_id
from 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
),
work_orders as (
select i.id wo_id, i.address_id, organisation_id
from individual i
where i.is_voided = false
and i.subject_type_id = (select id
from subject_type
where name = 'Work Order'
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
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)
and not encounter_type.is_voided)
and (e.is_voided is null or e.is_voided = false)
and wo.organisation_id = :org_id
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
where c.is_voided = false
group by 1
having count(wo.wo_id) = null
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')
then ind.created_by_id end) as cuid,
Expand All @@ -33,7 +55,8 @@ WITH impacted_users as (
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 impacted_users iu
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
Expand Down

0 comments on commit a713c3c

Please sign in to comment.