Update notification

Author: bbimber

SivStudies/resources/queries/study/duplicatePVLs.sql

@@ -1,12 +1,21 @@
 SELECT
-t.Id,
-t.date,
-t.sampleType,
-t.assayType,
-t.target,
-t.result,
-t.dataSource
+    t.Id,
+    t.date,
+    t.sampleType,
+    t.assayType,
+    t.target,
+    t.result,
+    t.resultOORIndicator,
+    t.dataSource,
+    t.lsid,
+    t.created,
+    v.maxLsid,
+    CASE WHEN t.lsid = v.maxLsid THEN TRUE ELSE FALSE END as isMostRecent
 
 FROM study.viralLoads t
-
-WHERE t.lsid IN (SELECT lsid FROM study.viralLoads v GROUP BY v.Id, v.date, v.sampleType, v.assayType HAVING count(*) > 1)
+         INNER JOIN (
+    SELECT v.Id, v.date, v.sampleType, v.assayType, max(v.lsid) as maxLsid
+    FROM study.viralLoads v
+    GROUP BY v.Id, v.date, v.sampleType, v.assayType
+    HAVING count(*) > 1
+) v ON (v.Id = t.Id AND v.date = t.date AND v.sampleType = t.sampleType AND v.assayType = t.assayType)

SivStudies/src/org/labkey/sivstudies/notification/SivStudiesDataValidationNotification.java

@@ -78,6 +78,7 @@ public String getEmailSubject(Container c)
         idsMissingFromDemographics(c, u, msg);
         missingArtRecord(c, u, msg);
         missingAnchorDates(c, u, msg);
+        duplicatePVLs(c, u, msg);
 
         if (!msg.isEmpty())
         {
@@ -175,6 +176,17 @@ private void missingAnchorDates(Container c, User u, StringBuilder msg)
         genericQueryCheck(c, u, msg, "study", "missingAnchorDates", "records missing from the anchor dates table");
     }
 
+    private void duplicatePVLs(Container c, User u, StringBuilder msg)
+    {
+        Study s = StudyService.get().getStudy(getTargetContainer(c));
+        if (s == null)
+        {
+            return;
+        }
+
+        genericQueryCheck(c, u, msg, "study", "duplicatePVLs", "duplicate PVL records");
+    }
+
     protected Container getTargetContainer(Container c)
     {
         return c.isWorkbookOrTab() ? c.getParent() : c;