Skip to content

SO-6216: Unnecessary changed on source and target conflict #1309

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

Draft
AAAlinaaa wants to merge 2 commits into
base: 7.x
Choose a base branch
from
Draft

SO-6216: Unnecessary changed on source and target conflict #1309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4572da3
SO-6216: Add test case to reproduce unnecessary status conflict
AAAlinaaa Jul 16, 2024
a244dfe
SO-6216: Add second test for relationship in extension module
AAAlinaaa Jul 17, 2024
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: 12 additions & 0 deletions ....core.rest.tests/src/com/b2international/snowowl/snomed/core/rest/SnomedRestFixtures.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,6 +437,18 @@ public static void inactivateMember(IBranchPath memberPath, String memberId) {
.then()
.statusCode(204);
}

public static void activateRelationship(IBranchPath relationshipPath, String relationshipId) {
updateComponent(
relationshipPath,
SnomedComponentType.RELATIONSHIP,
relationshipId,
Json.object(
"active", true,
"commitComment", "Activated relationship"
)
).statusCode(204);
}

public static void inactivateRelationship(IBranchPath relationshipPath, String relationshipId) {
updateComponent(
Expand Down
136 changes: 132 additions & 4 deletions ...ests/src/com/b2international/snowowl/snomed/core/rest/ext/SnomedExtensionUpgradeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import static com.b2international.snowowl.snomed.core.rest.SnomedApiTestConstants.INT_CODESYSTEM;
import static com.b2international.snowowl.snomed.core.rest.SnomedComponentRestRequests.createComponent;
import static com.b2international.snowowl.snomed.core.rest.SnomedComponentRestRequests.getComponent;
import static com.b2international.snowowl.snomed.core.rest.SnomedComponentRestRequests.updateComponent;
import static com.b2international.snowowl.snomed.core.rest.SnomedMergingRestRequests.createMerge;
import static com.b2international.snowowl.snomed.core.rest.SnomedMergingRestRequests.waitForMergeJob;
import static com.b2international.snowowl.snomed.core.rest.SnomedRestFixtures.*;
Expand All @@ -33,10 +34,7 @@
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertTrue;

import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;

Expand Down Expand Up @@ -82,6 +80,7 @@
import com.fasterxml.jackson.databind.JsonNode;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Iterables;
import com.google.inject.util.Modules;

/**
* @since 4.7
Expand Down Expand Up @@ -1661,6 +1660,135 @@ public void upgrade31DuplicateDescriptionAfterDerivedPropertyToggle() {
getDescription(upgradeCodeSystem.getCodeSystemURI(), descriptionId);
}

@Test
public void upgrade32InactivateRelationshipOnIntAndExt() throws Exception {
// prepare extension on the latest int version
CodeSystem extension = createExtension(latestInternationalVersion, branchPath.lastSegment());

//Create international concept with a relationship
String intConceptId = createConcept(new CodeSystemURI(SNOMEDCT), createConceptRequestBody(Concepts.ROOT_CONCEPT, Concepts.MODULE_SCT_CORE)
.with("namespaceId", ""));


IBranchPath mainPath = BranchPathUtils.createMainPath();
String relationshipId = createNewRelationship(mainPath, intConceptId, Concepts.IS_A, Concepts.PROCEDURE_SITE_DIRECT);

// version INT
String firstSIVersion = getNextAvailableEffectiveDateAsString(SNOMEDCT);
createVersion(SNOMEDCT, firstSIVersion, firstSIVersion).statusCode(201);

// create upgrade to the latest SI version
CodeSystem upgradeCodeSystem = createExtensionUpgrade(extension.getCodeSystemURI(), CodeSystemURI.branch(SNOMEDCT, firstSIVersion));

//Inactivate relationship on EXT
inactivateRelationship(BranchPathUtils.createPath(upgradeCodeSystem.getBranchPath()), relationshipId);

Boolean success = CodeSystemRequests.prepareComplete(upgradeCodeSystem.getShortName())
.build(upgradeCodeSystem.getRepositoryId())
.execute(getBus())
.getSync(1, TimeUnit.MINUTES);
assertTrue(success);

//Create new version after upgrade
String extVersion = getNextAvailableEffectiveDateAsString(extension.getShortName());
createVersion(extension.getShortName(), extVersion, extVersion).statusCode(201);

//Inactivate relationship on INT
inactivateRelationship(mainPath, relationshipId);

// version INT & upgrade EXT again
String secondSIVersion = getNextAvailableEffectiveDateAsString(SNOMEDCT);
createVersion(SNOMEDCT, secondSIVersion, secondSIVersion).statusCode(201);

CodeSystem secondUpgradeCodeSystem = createExtensionUpgrade(extension.getCodeSystemURI(), CodeSystemURI.branch(SNOMEDCT, secondSIVersion));
Boolean result = CodeSystemRequests.prepareComplete(secondUpgradeCodeSystem.getShortName())
.build(upgradeCodeSystem.getRepositoryId())
.execute(getBus())
.getSync(1, TimeUnit.MINUTES);
assertTrue(result);

// Activate relationship on INT
activateRelationship(mainPath, relationshipId);

//Version INT and upgrade EXT again
String thirdSIVersion = getNextAvailableEffectiveDateAsString(SNOMEDCT);
createVersion(SNOMEDCT, thirdSIVersion, thirdSIVersion).statusCode(201);

//Without a bug fix this will produce a conflict and the upgrade will fail
createExtensionUpgrade(extension.getCodeSystemURI(), CodeSystemURI.branch(SNOMEDCT, thirdSIVersion));
}

@Test
public void upgrade33InactivateDonatedRelationshipOnIntAndExt() throws Exception {
// prepare extension on the latest int version
CodeSystem extension = createExtension(latestInternationalVersion, branchPath.lastSegment());
String extensionModuleId = createModule(extension);
Map<String, Object> properties = Map.of("moduleIds", List.of(extensionModuleId));

CodeSystemRequests.prepareUpdateCodeSystem(extension.getShortName()).setAdditionalProperties(properties);

//Create international concept with a relationship
String intConceptId = createConcept(new CodeSystemURI(SNOMEDCT), createConceptRequestBody(Concepts.ROOT_CONCEPT, Concepts.MODULE_SCT_CORE)
.with("namespaceId", ""));


IBranchPath mainPath = BranchPathUtils.createMainPath();
String relationshipId = createNewRelationship(mainPath, intConceptId, Concepts.IS_A, Concepts.PROCEDURE_SITE_DIRECT);

// version INT
String firstSIVersion = getNextAvailableEffectiveDateAsString(SNOMEDCT);
createVersion(SNOMEDCT, firstSIVersion, firstSIVersion).statusCode(201);

// create upgrade to the latest SI version
CodeSystem upgradeCodeSystem = createExtensionUpgrade(extension.getCodeSystemURI(), CodeSystemURI.branch(SNOMEDCT, firstSIVersion));

//Inactivate relationship on EXT and change its mnodule to the extension module
updateComponent(
BranchPathUtils.createPath(upgradeCodeSystem.getBranchPath()),
SnomedComponentType.RELATIONSHIP,
relationshipId,
Json.object(
"active", false,
"moduleId", extensionModuleId,
"commitComment", "Inactivated relationship"
)
).statusCode(204);

Boolean success = CodeSystemRequests.prepareComplete(upgradeCodeSystem.getShortName())
.build(upgradeCodeSystem.getRepositoryId())
.execute(getBus())
.getSync(1, TimeUnit.MINUTES);
assertTrue(success);

//Create new version after upgrade
String extVersion = getNextAvailableEffectiveDateAsString(extension.getShortName());
createVersion(extension.getShortName(), extVersion, extVersion).statusCode(201);

//Inactivate relationship on INT
inactivateRelationship(mainPath, relationshipId);

// version INT & upgrade EXT again
String secondSIVersion = getNextAvailableEffectiveDateAsString(SNOMEDCT);
createVersion(SNOMEDCT, secondSIVersion, secondSIVersion).statusCode(201);

CodeSystem secondUpgradeCodeSystem = createExtensionUpgrade(extension.getCodeSystemURI(), CodeSystemURI.branch(SNOMEDCT, secondSIVersion));
Boolean result = CodeSystemRequests.prepareComplete(secondUpgradeCodeSystem.getShortName())
.build(upgradeCodeSystem.getRepositoryId())
.execute(getBus())
.getSync(1, TimeUnit.MINUTES);
assertTrue(result);

// Activate relationship on INT
activateRelationship(mainPath, relationshipId);

//Version INT and upgrade EXT again
String thirdSIVersion = getNextAvailableEffectiveDateAsString(SNOMEDCT);
createVersion(SNOMEDCT, thirdSIVersion, thirdSIVersion).statusCode(201);

//Without a bug fix this will produce a conflict and the upgrade will fail
createExtensionUpgrade(extension.getCodeSystemURI(), CodeSystemURI.branch(SNOMEDCT, thirdSIVersion));
}

private void assertState(String branchPath, String compareWith, BranchState expectedState) {
BaseRevisionBranching branching = ApplicationContext.getServiceForClass(RepositoryManager.class).get(SnomedDatastoreActivator.REPOSITORY_UUID).service(BaseRevisionBranching.class);
assertEquals(expectedState, branching.getBranchState(branchPath, compareWith));
Expand Down