Skip to content

Commit fce6c0c

Browse files
Refactor Admission Case ID to use the SNPRC Sequencer (#859)
* Added admit ID to Sequencer and unique index to caseid * removed snd etl value change * remove ActiveVets query * added scale to species
1 parent e8a16e8 commit fce6c0c

File tree

4 files changed

+10
-22
lines changed

4 files changed

+10
-22
lines changed

snprc_ehr/resources/queries/snprc_ehr/ActiveVets.sql

Lines changed: 0 additions & 12 deletions
This file was deleted.

snprc_ehr/resources/referenceStudy/study/datasets/datasets_metadata.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -394,6 +394,11 @@
394394
<datatype>varchar</datatype>
395395
</column>
396396
</columns>
397+
<indices>
398+
<index type="unique">
399+
<column>caseid</column>
400+
</index>
401+
</indices>
397402
<tableTitle>Cases</tableTitle>
398403
</table>
399404
<table tableName="matings" tableDbType="TABLE">
@@ -1498,6 +1503,7 @@
14981503
<datatype>varchar</datatype>
14991504
<nullable>false</nullable>
15001505
<columnTitle>Species code (3 char)</columnTitle>
1506+
<scale>10</scale>
15011507
</column>
15021508
<column columnName="project">
15031509
<datatype>integer</datatype>

snprc_ehr/src/org/labkey/snprc_ehr/SNPRC_EHRSequencer.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@
3030

3131
public enum SNPRC_EHRSequencer
3232
{
33-
ANIMALID("org.labkey.snprc_ehr.domain.AnimalId", 100);
33+
ANIMALID("org.labkey.snprc_ehr.domain.AnimalId", 100),
34+
ADMITID("org.labkey.snprc_ehr.domain.AdmitId", 300000);
3435
// "last value assigned" is stored in the table - not the same as CAMP which is the "next value to assign"
3536
// new sequences are added here
3637
// example:

snprc_ehr/src/org/labkey/snprc_ehr/query/SNPRC_EHRTriggerHelper.java

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
import org.labkey.api.security.UserManager;
4141
import org.labkey.api.util.PageFlowUtil;
4242
import org.labkey.snprc_ehr.SNPRC_EHRSchema;
43+
import org.labkey.snprc_ehr.SNPRC_EHRSequencer;
4344

4445
import java.sql.ResultSet;
4546
import java.sql.SQLException;
@@ -222,15 +223,7 @@ public Integer getNextDietCode()
222223
*/
223224
public Integer getNextCaseId()
224225
{
225-
DbSchema dbStudySchema = SNPRC_EHRSchema.getInstance().getStudySchema();
226-
SQLFragment sql = new SQLFragment("SELECT MAX(c.caseid) AS MAX_CODE FROM ");
227-
sql.append(getTableInfo("study", "cases"), "c");
228-
SqlSelector sqlSelector = new SqlSelector(dbStudySchema, sql);
229-
230-
Integer caseId = sqlSelector.getObject(Integer.class);
231-
232-
// if table has been truncated - reseed the caseid at 1
233-
return (caseId == null) ? 1 : caseId + 1;
226+
return SNPRC_EHRSequencer.ADMITID.getNext(getContainer(), getUser());
234227
}
235228

236229
public Map<String, Object> getExtraContext()

0 commit comments

Comments
 (0)