Skip to content

Issue 44283: Age is not calculated for new animals on snapshot #264

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
labkey-jeckels merged 4 commits into from
Nov 17, 2021
Merged

Issue 44283: Age is not calculated for new animals on snapshot #264

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
7dbb092
Issue 44283: Age is not calculated for new animals on snapshot
Nov 16, 2021
5c70475
Avoid double-refreshing the demographics cache when we add a new stud…
Nov 16, 2021
c2cfd25
Attempt 2 to minimize recaching
Nov 17, 2021
dcc4334
Accept the double-recaching perf hit to fix test cases
Nov 17, 2021
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
3 changes: 1 addition & 2 deletions ehr/resources/queries/study/Demographics.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,10 @@ function onInit(event, helper){
});
}

function onUpsert(helper, scriptErrors, row, oldRow){
function onUpsert(helper, scriptErrors, row, oldRow) {
//NOTE: this should be getting set by the birth, death, arrival & departure tables
//ALSO: it should be rare to insert directly into this table. usually this record will be created by inserting into either birth or arrival
if (!row.calculated_status && !helper.isETL()){
row.calculated_status = helper.getJavaHelper().getCalculatedStatusValue(row.Id);
}

}
2 changes: 1 addition & 1 deletion ehr/src/org/labkey/ehr/demographics/EHRDemographicsServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ else if (existing.getProps().isEmpty() && record.getProps().isEmpty())
_cache.put(key, record);
}

private void recacheRecords(Container c, List<String> ids)
public void recacheRecords(Container c, List<String> ids)
{
for (String id : ids)
{
Expand Down
6 changes: 5 additions & 1 deletion ehr/src/org/labkey/ehr/utils/TriggerScriptHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -826,7 +826,11 @@ public void createDemographicsRecord(String id, Map<String, Object> props) throw
if (errors.hasErrors())
throw errors;

EHRDemographicsServiceImpl.get().getAnimal(getContainer(), id);
// The normal (re)caching of demographics providers runs before the study module has done its bookkeeping and
// inserted a row into study.participant, which means that calculated lookup values like the animal's current
// age won't resolve until AFTER the call to insertRows() has completed. Thus, refresh the cache for this new
// animal an extra time. See ticket 44283.
EHRDemographicsServiceImpl.get().recacheRecords(getContainer(), Collections.singletonList(id));
}

public void updateDemographicsRecord(List<Map<String, Object>> updatedRows) throws QueryUpdateServiceException, SQLException, BatchValidationException, InvalidKeyException
Expand Down