Fix stale ABV notification (#1492)

* Create FB to adjust comparetype

* Document ETL schedule in comment

Author: brentlogan

onprc_ehr/src/org/labkey/onprc_ehr/notification/AvailableBloodVolumeNotification.java

@@ -11,6 +11,7 @@
 import org.labkey.api.query.QueryService;
 import org.labkey.api.security.User;
 
+import java.util.Calendar;
 import java.util.Date;
 
 
@@ -32,9 +33,14 @@ public String getEmailSubject(Container c)
     {
         return "Available Blood Volume Alert: " + getDateTimeFormat(c).format(new Date());
     }
-    /* From Hugh Crank:
+
+    /* Mathematica push:
      * Server mkt7: Runs at :55 from 4:55am to 7:55pm
      * Server mkt8: Runs at :25 from 4:25am to 7:25pm
+     *
+     * ABV ETL:
+     * :01 and :31 after the hour for hours between 05:00 and 20:00
+     * 0 1,31 5-20 ? * * *
      */
     @Override
     public String getCronString()
@@ -45,44 +51,52 @@ public String getCronString()
     @Override
     public String getScheduleDescription()
     {
-        return "15 minutes after every hour between 06:15 and 19:15.";
+        return "15 min past every hour from 06:15 to 19:15.";
     }
 
     @Override
     public String getDescription()
     {
-        return "Sends an alert on status of Available Blood Volume data from Mathematica.";
+        return "Sends status of available blood volume data from Mathematica.";
     }
 
     @Override
     public String getMessageBodyHTML(Container c, User u)
     {
         StringBuilder msg = new StringBuilder();
-
-        AvailableBloodCheck(c, u, msg);
-
+        availableBloodCheck(c, u, msg);
         return msg.toString();
     }
-    /* jonesga 5/8/2024 labkeyPublic.labkeyPublic.ValidateAvailableBloodProcess
-     */
-    protected void AvailableBloodCheck(final Container c, User u, final StringBuilder msg)
+
+    protected void availableBloodCheck(final Container c, User u, final StringBuilder msg)
     {
-        SimpleFilter filter = new SimpleFilter(FieldKey.fromString("date"), new Date(), CompareType.DATE_GTE);
-        TableInfo ti = QueryService.get().getUserSchema(u, c, "onprc_ehr").getTable("ValidateAvailableBloodProcess", ContainerFilter.Type.AllFolders.create(c, u));
-//        ((ContainerFilterable) ti).setContainerFilter(ContainerFilter.Type.AllFolders.create(u);
-        TableSelector ts = new TableSelector(ti, null, null);
+        Calendar cal = Calendar.getInstance();
+        cal.add(Calendar.HOUR, -1);
+        Date staleTime = cal.getTime();
+
+        TableInfo ti = QueryService.get().getUserSchema(u, c, "onprc_ehr").getTable("AvailableBloodVolume", ContainerFilter.Type.AllFolders.create(c, u));
 
+        if (ti == null)
+        {
+            msg.append("<b>ERROR: Unable to access onprc_ehr.AvailableBloodVolume table.</b><br>\n");
+            return;
+        }
+
+        SimpleFilter filter = new SimpleFilter(FieldKey.fromString("datecreated"), staleTime, CompareType.LTE);
+        TableSelector ts = new TableSelector(ti, filter, null);
         long count = ts.getRowCount();
+
         if (count > 0)
         {
-            msg.append("<b>The available blood volume data from Mathematica is stale.</b><br>\n");
-            msg.append("<p><a href='" + getExecuteQueryUrl(c, "onprc_ehr", "ValidateAvailableBloodProcess", null) + "'>Click here to view labkeyPublic.AvailableBloodVolume.</a><br>\n\n");
-            msg.append("</p><br><hr>");
+            msg.append("<b>WARNING: The available blood volume data from Mathematica is stale (last updated more than 1 hour ago).</b><br>\n");
+            msg.append("<p>View <a href='").append(getExecuteQueryUrl(c, "onprc_ehr", "AvailableBloodVolume", null)).append("'>onprc_ehr.AvailableBloodVolume</a>.</p>\n");
+            msg.append("<br>");
         }
         else
         {
-            msg.append("The available blood volume data from Mathematica is current.<br><hr>");
-            msg.append("<p><a href='" + getExecuteQueryUrl(c, "onprc_ehr", "ValidateAvailableBloodProcess", null) + "'>Click here to view labkeyPublic.AvailableBloodVolume.</a><br>\n\n");
-            msg.append("</p><br><hr>");
+            msg.append("<b>OK:</b> The available blood volume data from Mathematica is current (updated within the last hour).<br>\n");
+            msg.append("<p>View <a href='").append(getExecuteQueryUrl(c, "onprc_ehr", "AvailableBloodVolume", null)).append("'>onprc_ehr.AvailableBloodVolume</a>.</p>\n");
+            msg.append("<br>");
         }
-    }}
+    }
+}