Skip to content
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

Jump to bottom

SO-4633: Ensure description inactivator member inactivation is possible #753

Open
wants to merge 4 commits into
base: 7.x
Choose a base branch
from
Open

SO-4633: Ensure description inactivator member inactivation is possible #753

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d551d1b
SO-4633: Ensure description inactivator member inactivation is possible
AAAlinaaa Feb 2, 2021
fbb608e
SO-4633: Add test for inactivation indicator member status change
AAAlinaaa Feb 3, 2021
1e5b4d7
SO-4663: Remove erroneous reliance on updated component
AAAlinaaa Feb 3, 2021
f0bd323
SO-4633: Refactor inactivation indicator status change logic at update
AAAlinaaa Feb 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Next Next commit
SO-4633: Ensure description inactivator member inactivation is possible
  • Loading branch information
@AAAlinaaa
AAAlinaaa committed Feb 2, 2021
commit d551d1b659c16df0ddfe531e454d033204e93d02
20 changes: 20 additions & 0 deletions ...om/b2international/snowowl/snomed/datastore/request/BaseComponentMemberUpdateRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,26 @@ protected final boolean ensureMemberActive(final TransactionContext context, fin

}
}

protected final boolean ensureStatusChanged(final TransactionContext context, final SnomedReferenceSetMember existingMember,
final SnomedComponentDocument componentToUpdate, final SnomedRefSetMemberIndexEntry.Builder updatedMember) {
if (!existingMember.isActive() && componentToUpdate.isActive()) {
if (LOG.isDebugEnabled()) { LOG.debug("Reactivating {} member {}.", getMemberType(), existingMember.getId()); }
updatedMember.active(true);
updateModule(context, existingMember, updatedMember, context.service(ModuleIdProvider.class).apply(componentToUpdate));
unsetEffectiveTime(existingMember, updatedMember);
return true;
} else if (existingMember.isActive() && !componentToUpdate.isActive()) {
if (LOG.isDebugEnabled()) { LOG.debug("Inactivating {} member {}.", getMemberType(), existingMember.getId()); }
updatedMember.active(false);
updateModule(context, existingMember, updatedMember, context.service(ModuleIdProvider.class).apply(componentToUpdate));
unsetEffectiveTime(existingMember, updatedMember);
return true;
} else {
if (LOG.isDebugEnabled()) { LOG.debug("{} member {} already {}, not updating.", getMemberType(), existingMember.getId(), componentToUpdate.isActive() ? "active" : "inactive"); }
return false;
}
}

protected final boolean removeOrDeactivate(final TransactionContext context, final SnomedReferenceSetMember existingMember, final SnomedRefSetMemberIndexEntry.Builder updatedMember) {
if (!existingMember.isReleased()) {
Expand Down
2 changes: 1 addition & 1 deletion ...international/snowowl/snomed/datastore/request/SnomedInactivationReasonUpdateRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ protected void doExecute(TransactionContext context, SnomedComponentDocument com
if (Objects.equals(existingValueId, inactivationValueId)) {

// Exact match, just make sure that the member is active
changed = ensureMemberActive(context, existingMember, updatedMember);
changed = ensureStatusChanged(context, existingMember, componentToUpdate, updatedMember);

} else if (!CLEAR.equals(inactivationValueId)) {
// Re-use this member, if the intention was not to remove the existing value
Expand Down