Skip to content

Promote methods to AbstractNotification #309

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bbimber merged 1 commit into from
Oct 30, 2026
Merged

Promote methods to AbstractNotification #309

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 0 additions & 40 deletions SivStudies/src/org/labkey/sivstudies/notification/SivStudiesDataValidationNotification.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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");
Expand All @@ -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("<b>WARNING: There are ").append(count).append(" " + message + "</b><br>\n");
msg.append("<p><a href='").append(getExecuteQueryUrl(c, schemaName, queryName, null, filter)).append("'>Click here to view them</a><br>\n\n");
msg.append("<hr>\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");
Expand Down