exclude weekends from tag_in_3_days count

server/xpub-model/entities/audit/data-access.js

@@ -114,27 +114,31 @@ with audits as (
   and ae.changes->>'status' in ('xml-review', 'xml-triage', 'repo-ready')
   and ae.original_data->>'status' = 'xml-qa'
 ), taggers as (
-  select aa.manuscript_id, aa.manuscript_version, aa.created, ab.sent
+  select manuscript_id, manuscript_version, sent, created, sum(case when extract ('ISODOW' from date_range) < 6 then 1 else 0 end) as diff
   from (
-    select at.manuscript_id, at.manuscript_version, min(at.created) created from audits at 
-    where at.user_id in (
-      select user_id from team t where t.role_name='tagger'
-    )
-    and at.changes->>'type' = 'PMC'
-    group by at.manuscript_id, at.manuscript_version
-    union 
-    select a.manuscript_id, a.manuscript_version, a.created created from audits a
-    where a.user_id in (
-      select user_id from team t where t.role_name='admin'
-    )
-    and a.changes::text ~* '(re-|re)tag'
-    and a.changes->>'notes_type'='userMessage'
-  ) aa join (
-    select att.manuscript_id, att.manuscript_version, min(att.created) sent from audits att 
-    where att.changes->>'status' = 'tagging' and att.original_data->>'status' = 'submitted'
-    group by att.manuscript_id, att.manuscript_version
-  ) ab on 
-    aa.manuscript_id = ab.manuscript_id and aa.manuscript_version = ab.manuscript_version
+    select aa.manuscript_id, aa.manuscript_version, ab.sent, aa.created, generate_series(ab.sent, aa.created - interval '1 day', '1 day'::interval) as date_range
+    from (
+      select at.manuscript_id, at.manuscript_version, min(at.created) created from audits at 
+      where at.user_id in (
+        select user_id from team t where t.role_name='tagger'
+      )
+      and at.changes->>'type' = 'PMC'
+      group by at.manuscript_id, at.manuscript_version
+      union 
+      select a.manuscript_id, a.manuscript_version, a.created created from audits a
+      where a.user_id in (
+        select user_id from team t where t.role_name='admin'
+      )
+      and a.changes::text ~* '(re-|re)tag'
+      and a.changes->>'notes_type'='userMessage'
+    ) aa join (
+      select att.manuscript_id, att.manuscript_version, min(att.created) sent from audits att 
+      where att.changes->>'status' = 'tagging' and att.original_data->>'status' = 'submitted'
+      group by att.manuscript_id, att.manuscript_version
+    ) ab on 
+      aa.manuscript_id = ab.manuscript_id and aa.manuscript_version = ab.manuscript_version
+  ) t
+  group by manuscript_id, manuscript_version, sent, created
 )
 select display_mth, submitted, xml_review, xml_review_within_10_days, 
   CASE WHEN xml_review=0 THEN 0 ELSE xml_review_within_10_days*100/xml_review END xml_review_within_10_days_perc,
@@ -167,7 +171,7 @@ full outer join (
 ) qa on top.mth = qa.mth
 full outer join (
   select TO_CHAR(date_trunc('month', tag.created AT TIME ZONE 'Europe/London') , 'YYYYMM') mth, count(*) xml_tagging,
-  SUM(CASE WHEN DATE_PART('DAY', tag.created-tag.sent) < 4 THEN 1 ELSE 0 END) xml_tagging_within_3_days
+  SUM(CASE WHEN tag.diff < 4 THEN 1 ELSE 0 END) xml_tagging_within_3_days
   from taggers tag
   group by mth
 ) tagging on top.mth = tagging.mth