fix metrics tagging limiting by total check date

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

@@ -99,13 +99,15 @@ with audits as (
   select au.* from audit.audit_log au
   inner join manuscript m on au.manuscript_id = m.id 
   where m.organization_id='${orgId}'
-  and au.created between date_trunc('month', current_date AT TIME ZONE 'Europe/London' - '${endMonth} month'::interval)
-    and date_trunc('month', current_date AT TIME ZONE 'Europe/London' - '${startMonth -
-      1} month'::interval)
-  and (
-    au.changes->>'status' is not null or 
-    au.changes->>'type' = 'PMC' or 
-    au.changes::text ~* '(re-|re)tag'
+  and au.changes->>'type' = 'PMC' 
+  or (
+    au.created between date_trunc('month', current_date AT TIME ZONE 'Europe/London' - '${endMonth} month'::interval)
+      and date_trunc('month', current_date AT TIME ZONE 'Europe/London' - '${startMonth -
+        1} month'::interval)
+    and (
+      au.changes->>'status' is not null or 
+      au.changes::text ~* '(re-|re)tag'
+    )
   )
 ), external as (
   select * from audits ae where ae.user_id not in (
@@ -118,12 +120,15 @@ with audits as (
   from (
     select aa.manuscript_id, aa.manuscript_version, ab.sent, aa.created, generate_series(ab.sent, aa.created - '1 day'::interval, '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
+      select * 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
+      ) am where am.created between date_trunc('month', current_date AT TIME ZONE 'Europe/London' - '${endMonth} month'::interval) and date_trunc('month', current_date AT TIME ZONE 'Europe/London' - '${startMonth -
+      1} month'::interval)
       union 
       select a.manuscript_id, a.manuscript_version, a.created created from audits a
       where a.user_id in (
@@ -132,7 +137,7 @@ with audits as (
       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 
+      select att.manuscript_id, att.manuscript_version, min(att.created) sent from audit.audit_log att
       where att.changes->>'status' = 'tagging' and att.original_data->>'status' = 'submitted'
       group by att.manuscript_id, att.manuscript_version
     ) ab on