Skip to content

Commit 5ae2067

Browse files
authored
Promote methods to AbstractNotification (#309)
This backports a simple refactor from discvr26.7 to release26.7, so it can be used by ONPRC EHR modules: LabKey/onprcEHRModules#1968 Related to: LabKey/LabDevKitModules#324
2 parents e089a4a + 1253c29 commit 5ae2067

1 file changed

Lines changed: 0 additions & 40 deletions

File tree

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

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,9 @@
55
import org.labkey.api.data.CompareType;
66
import org.labkey.api.data.Container;
77
import org.labkey.api.data.SimpleFilter;
8-
import org.labkey.api.data.TableInfo;
9-
import org.labkey.api.data.TableSelector;
108
import org.labkey.api.ldk.notification.AbstractNotification;
119
import org.labkey.api.module.ModuleLoader;
1210
import org.labkey.api.query.FieldKey;
13-
import org.labkey.api.query.QueryService;
14-
import org.labkey.api.query.UserSchema;
1511
import org.labkey.api.security.User;
1612
import org.labkey.api.study.Study;
1713
import org.labkey.api.study.StudyService;
@@ -88,23 +84,6 @@ public String getEmailSubject(Container c)
8884
return msg.toString();
8985
}
9086

91-
private TableInfo getTableInfo(User u, Container c, String schemaName, String queryName)
92-
{
93-
UserSchema us = QueryService.get().getUserSchema(u, c, schemaName);
94-
if (us == null)
95-
{
96-
throw new IllegalStateException("Missing user schema: " + schemaName);
97-
}
98-
99-
TableInfo ti = us.getTable(queryName);
100-
if (ti == null)
101-
{
102-
throw new IllegalStateException("Missing table: " + schemaName + "." + queryName);
103-
}
104-
105-
return ti;
106-
}
107-
10887
private void duplicateInfectionCheck(Container c, User u, StringBuilder msg)
10988
{
11089
genericQueryCheck(c, u, msg, "study", "duplicateInfectionDates", "duplicate infection date records");
@@ -115,25 +94,6 @@ private void infectionAnchorDateDiscordance(Container c, User u, StringBuilder m
11594
genericQueryCheck(c, u, msg, "study", "infectionAnchorDateDiscordance", "records with discordant treatment and anchor date SIV infection records");
11695
}
11796

118-
private void genericQueryCheck(Container c, User u, StringBuilder msg, String schemaName, String queryName, String message)
119-
{
120-
genericQueryCheck(c, u, msg, schemaName, queryName, message, null);
121-
}
122-
123-
private void genericQueryCheck(Container c, User u, StringBuilder msg, String schemaName, String queryName, String message, @Nullable SimpleFilter filter)
124-
{
125-
TableInfo ti = getTableInfo(u, c, schemaName, queryName);
126-
127-
TableSelector ts = new TableSelector(ti, filter, null);
128-
long count = ts.getRowCount();
129-
if (count > 0)
130-
{
131-
msg.append("<b>WARNING: There are ").append(count).append(" " + message + "</b><br>\n");
132-
msg.append("<p><a href='").append(getExecuteQueryUrl(c, schemaName, queryName, null, filter)).append("'>Click here to view them</a><br>\n\n");
133-
msg.append("<hr>\n\n");
134-
}
135-
}
136-
13797
private void pvlWithoutInfectionDate(Container c, User u, StringBuilder msg)
13898
{
13999
genericQueryCheck(c, u, msg, "study", "pvlWithoutInfectionDate", "animals with PVL data but no record of SIV infection");

0 commit comments

Comments
 (0)