Skip to content

Fix transaction boundary problem with ParticipantCategoryListener #7309

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 2 commits into from
Jan 7, 2026
Merged

Fix transaction boundary problem with ParticipantCategoryListener #7309

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c8d9223
Fix transaction boundary problem with ParticipantCategoryListener
labkey-jeckels Jan 5, 2026
58e157c
Merge branch 'develop' into fb_categoryListener
labkey-jeckels Jan 6, 2026
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
127 changes: 27 additions & 100 deletions study/src/org/labkey/study/model/ParticipantGroupManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,9 +443,7 @@ private List<ParticipantCategoryImpl> _getParticipantCategories(Container c, Use
List<ParticipantCategoryImpl> filtered = new ArrayList<>();

// TODO: Switch ParticipantCategoryImpl internals from arrays to lists... but not right now
categories.stream().filter(category -> category.canRead(c, user)).forEach(category -> {
filtered.add(category);
});
categories.stream().filter(category -> category.canRead(c, user)).forEach(filtered::add);
return filtered;
}

Expand All @@ -454,11 +452,10 @@ public ParticipantCategoryImpl setParticipantCategory(Container c, User user, Pa
{
DbScope scope = StudySchema.getInstance().getSchema().getScope();

ParticipantCategoryImpl ret;
try (DbScope.Transaction transaction = scope.ensureTransaction())
{
ParticipantCategoryImpl ret;
boolean isUpdate = !def.isNew();
List<Throwable> errors;

ret = _saveParticipantCategory(c, user, def);

Expand All @@ -477,33 +474,23 @@ public ParticipantCategoryImpl setParticipantCategory(Container c, User user, Pa
}
transaction.commit();
ParticipantGroupCache.uncache(c);
}

if (def.isNew())
errors = fireCreatedCategory(user, ret);
else
errors = fireUpdateCategory(user, ret);
if (def.isNew())
fireCreatedCategory(user, ret);
else
fireUpdateCategory(user, ret);

if (!errors.isEmpty())
{
Throwable first = errors.get(0);
if (first instanceof RuntimeException)
throw (RuntimeException) first;
else
throw new RuntimeException(first);
}
return ret;
}
return ret;
}

public ParticipantCategoryImpl setParticipantCategory(Container c, User user, ParticipantCategoryImpl def) throws ValidationException
{
DbScope scope = StudySchema.getInstance().getSchema().getScope();

ParticipantCategoryImpl ret;
try (DbScope.Transaction transaction = scope.ensureTransaction())
{
ParticipantCategoryImpl ret;
List<Throwable> errors;

ret = _saveParticipantCategory(c, user, def);

switch (ParticipantCategory.Type.valueOf(ret.getType()))
Expand All @@ -515,22 +502,14 @@ public ParticipantCategoryImpl setParticipantCategory(Container c, User user, Pa
}
transaction.commit();
ParticipantGroupCache.uncache(c);
}

if (def.isNew())
errors = fireCreatedCategory(user, ret);
else
errors = fireUpdateCategory(user, ret);
if (def.isNew())
fireCreatedCategory(user, ret);
else
fireUpdateCategory(user, ret);

if (!errors.isEmpty())
{
Throwable first = errors.get(0);
if (first instanceof RuntimeException)
throw (RuntimeException) first;
else
throw new RuntimeException(first);
}
return ret;
}
return ret;
}

private ParticipantCategoryImpl _saveParticipantCategory(Container c, User user, ParticipantCategoryImpl def) throws ValidationException
Expand Down Expand Up @@ -771,9 +750,6 @@ private ParticipantCategoryImpl modifyParticipantCategory(Container c, User user

try (DbScope.Transaction transaction = scope.ensureTransaction())
{
ParticipantCategoryImpl ret;
List<Throwable> errors;

List<ParticipantGroup> groups = getParticipantGroups(c, user, def);
if (groups.size() != 1)
throw new RuntimeException("Expected one group in category " + def.getLabel());
Expand All @@ -794,22 +770,11 @@ private ParticipantCategoryImpl modifyParticipantCategory(Container c, User user
}
transaction.commit();
ParticipantGroupCache.uncache(c);

//Reselect
ret = getParticipantCategory(c, user, def.getRowId());

errors = fireUpdateCategory(user, ret);

if (!errors.isEmpty())
{
Throwable first = errors.get(0);
if (first instanceof RuntimeException)
throw (RuntimeException) first;
else
throw new RuntimeException(first);
}
return ret;
}
//Reselect
ParticipantCategoryImpl ret = getParticipantCategory(c, user, def.getRowId());
fireUpdateCategory(user, ret);
return ret;
}

private void addGroupParticipants(Container c, User user, ParticipantGroup group, String[] participantsToAdd) throws ValidationException
Expand Down Expand Up @@ -1012,17 +977,9 @@ public void deleteParticipantCategory(Container c, User user, ParticipantCategor

ParticipantGroupCache.uncache(c);
transaction.commit();

List<Throwable> errors = fireDeleteCategory(user, def);
if (!errors.isEmpty())
{
Throwable first = errors.get(0);
if (first instanceof RuntimeException)
throw (RuntimeException) first;
else
throw new RuntimeException(first);
}
}

fireDeleteCategory(user, def);
}

public void deleteParticipantGroup(Container c, User user, ParticipantGroup group) throws ValidationException
Expand Down Expand Up @@ -1109,58 +1066,28 @@ public static void removeCategoryListener(ParticipantCategoryListener listener)
_listeners.remove(listener);
}

private static List<Throwable> fireDeleteCategory(User user, ParticipantCategoryImpl category)
private static void fireDeleteCategory(User user, ParticipantCategoryImpl category)
{
List<Throwable> errors = new ArrayList<>();

for (ParticipantCategoryListener l : _listeners)
{
try
{
l.categoryDeleted(user, category);
}
catch (Throwable t)
{
errors.add(t);
}
l.categoryDeleted(user, category);
}
return errors;
}

private static List<Throwable> fireUpdateCategory(User user, ParticipantCategoryImpl category)
private static void fireUpdateCategory(User user, ParticipantCategoryImpl category)
{
List<Throwable> errors = new ArrayList<>();

for (ParticipantCategoryListener l : _listeners)
{
try
{
l.categoryUpdated(user, category);
}
catch (Throwable t)
{
errors.add(t);
}
l.categoryUpdated(user, category);
}
return errors;
}

private static List<Throwable> fireCreatedCategory(User user, ParticipantCategoryImpl category)
private static void fireCreatedCategory(User user, ParticipantCategoryImpl category)
{
List<Throwable> errors = new ArrayList<>();

for (ParticipantCategoryListener l : _listeners)
{
try
{
l.categoryCreated(user, category);
}
catch (Throwable t)
{
errors.add(t);
}
l.categoryCreated(user, category);
}
return errors;
}

public void clearCache(Container c)
Expand Down