diff --git a/SivStudies/src/org/labkey/sivstudies/notification/SivStudiesDataValidationNotification.java b/SivStudies/src/org/labkey/sivstudies/notification/SivStudiesDataValidationNotification.java index 70a795905..208c19513 100644 --- a/SivStudies/src/org/labkey/sivstudies/notification/SivStudiesDataValidationNotification.java +++ b/SivStudies/src/org/labkey/sivstudies/notification/SivStudiesDataValidationNotification.java @@ -5,13 +5,9 @@ import org.labkey.api.data.CompareType; import org.labkey.api.data.Container; import org.labkey.api.data.SimpleFilter; -import org.labkey.api.data.TableInfo; -import org.labkey.api.data.TableSelector; import org.labkey.api.ldk.notification.AbstractNotification; import org.labkey.api.module.ModuleLoader; import org.labkey.api.query.FieldKey; -import org.labkey.api.query.QueryService; -import org.labkey.api.query.UserSchema; import org.labkey.api.security.User; import org.labkey.api.study.Study; import org.labkey.api.study.StudyService; @@ -88,23 +84,6 @@ public String getEmailSubject(Container c) return msg.toString(); } - private TableInfo getTableInfo(User u, Container c, String schemaName, String queryName) - { - UserSchema us = QueryService.get().getUserSchema(u, c, schemaName); - if (us == null) - { - throw new IllegalStateException("Missing user schema: " + schemaName); - } - - TableInfo ti = us.getTable(queryName); - if (ti == null) - { - throw new IllegalStateException("Missing table: " + schemaName + "." + queryName); - } - - return ti; - } - private void duplicateInfectionCheck(Container c, User u, StringBuilder msg) { genericQueryCheck(c, u, msg, "study", "duplicateInfectionDates", "duplicate infection date records"); @@ -115,25 +94,6 @@ private void infectionAnchorDateDiscordance(Container c, User u, StringBuilder m genericQueryCheck(c, u, msg, "study", "infectionAnchorDateDiscordance", "records with discordant treatment and anchor date SIV infection records"); } - private void genericQueryCheck(Container c, User u, StringBuilder msg, String schemaName, String queryName, String message) - { - genericQueryCheck(c, u, msg, schemaName, queryName, message, null); - } - - private void genericQueryCheck(Container c, User u, StringBuilder msg, String schemaName, String queryName, String message, @Nullable SimpleFilter filter) - { - TableInfo ti = getTableInfo(u, c, schemaName, queryName); - - TableSelector ts = new TableSelector(ti, filter, null); - long count = ts.getRowCount(); - if (count > 0) - { - msg.append("WARNING: There are ").append(count).append(" " + message + "
\n"); - msg.append("

Click here to view them
\n\n"); - msg.append("


\n\n"); - } - } - private void pvlWithoutInfectionDate(Container c, User u, StringBuilder msg) { genericQueryCheck(c, u, msg, "study", "pvlWithoutInfectionDate", "animals with PVL data but no record of SIV infection");