Skip to content

Refactor Admission Case ID to use the SNPRC Sequencer #859

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
jallentxbiomed merged 4 commits into from
Nov 24, 2025
Merged

Refactor Admission Case ID to use the SNPRC Sequencer #859

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b788614
Added admit ID to Sequencer and unique index to caseid
jallentxbiomed Nov 3, 2025
5e265b6
removed snd etl value change
jallentxbiomed Nov 4, 2025
6023dd6
remove ActiveVets query
jallentxbiomed Nov 4, 2025
921a089
added scale to species
jallentxbiomed Nov 12, 2025
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
12 changes: 0 additions & 12 deletions snprc_ehr/resources/queries/snprc_ehr/ActiveVets.sql
View file
Open in desktop

This file was deleted.

6 changes: 6 additions & 0 deletions snprc_ehr/resources/referenceStudy/study/datasets/datasets_metadata.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,6 +394,11 @@
<datatype>varchar</datatype>
</column>
</columns>
<indices>
<index type="unique">
<column>caseid</column>
</index>
</indices>
<tableTitle>Cases</tableTitle>
</table>
<table tableName="matings" tableDbType="TABLE">
Expand Down Expand Up @@ -1498,6 +1503,7 @@
<datatype>varchar</datatype>
<nullable>false</nullable>
<columnTitle>Species code (3 char)</columnTitle>
<scale>10</scale>
</column>
<column columnName="project">
<datatype>integer</datatype>
Expand Down
3 changes: 2 additions & 1 deletion snprc_ehr/src/org/labkey/snprc_ehr/SNPRC_EHRSequencer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@

public enum SNPRC_EHRSequencer
{
ANIMALID("org.labkey.snprc_ehr.domain.AnimalId", 100);
ANIMALID("org.labkey.snprc_ehr.domain.AnimalId", 100),
ADMITID("org.labkey.snprc_ehr.domain.AdmitId", 300000);
// "last value assigned" is stored in the table - not the same as CAMP which is the "next value to assign"
// new sequences are added here
// example:
Expand Down
11 changes: 2 additions & 9 deletions snprc_ehr/src/org/labkey/snprc_ehr/query/SNPRC_EHRTriggerHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
import org.labkey.api.security.UserManager;
import org.labkey.api.util.PageFlowUtil;
import org.labkey.snprc_ehr.SNPRC_EHRSchema;
import org.labkey.snprc_ehr.SNPRC_EHRSequencer;

import java.sql.ResultSet;
import java.sql.SQLException;
Expand Down Expand Up @@ -222,15 +223,7 @@ public Integer getNextDietCode()
*/
public Integer getNextCaseId()
{
DbSchema dbStudySchema = SNPRC_EHRSchema.getInstance().getStudySchema();
SQLFragment sql = new SQLFragment("SELECT MAX(c.caseid) AS MAX_CODE FROM ");
sql.append(getTableInfo("study", "cases"), "c");
SqlSelector sqlSelector = new SqlSelector(dbStudySchema, sql);

Integer caseId = sqlSelector.getObject(Integer.class);

// if table has been truncated - reseed the caseid at 1
return (caseId == null) ? 1 : caseId + 1;
return SNPRC_EHRSequencer.ADMITID.getNext(getContainer(), getUser());
}

public Map<String, Object> getExtraContext()
Expand Down
Loading