nosu
/
taskana
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TSK-859: make unlinking child from parent through import possible

This commit is contained in:
BVier 2019-05-27 11:32:07 +02:00 committed by Mustapha Zorgati
parent 04e34a70f3
commit 5a1d3f5321
2 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
rest/taskana-rest-spring-test/src/test/java/pro/taskana/rest/ClassificationDefinitionControllerIntTest.java
View File

@ -337,6 +337,37 @@ public class ClassificationDefinitionControllerIntTest {
assertNotEquals(wrongParentCl.getClassificationId(), childCl.getParentId());
}
@Test
public void testChangeParentByImportingExistingClassification() throws IOException, InterruptedException {
ClassificationSummaryResource child1 = this.getClassificationWithKeyAndDomain("L110105", "DOMAIN_A");
assertEquals("L11010", child1.getParentKey());
child1.setParentId("CLI:100000000000000000000000000000000002");
child1.setParentKey("L10303");
String withNewParent = objMapper.writeValueAsString(child1);
ClassificationSummaryResource child2 = this.getClassificationWithKeyAndDomain("L110107", "DOMAIN_A");
assertEquals("L11010", child2.getParentKey());
child2.setParentId("");
child2.setParentKey("");
String withoutParent = objMapper.writeValueAsString(child2);
List<String> clList = new ArrayList<>();
clList.add(withNewParent);
clList.add(withoutParent);
ResponseEntity<String> response = importRequest(clList);
assertEquals(HttpStatus.OK, response.getStatusCode());
Thread.sleep(10);
LOGGER.debug("Wait for 10 s to give the system a chance to update");
ClassificationSummaryResource childWithNewParent = this.getClassificationWithKeyAndDomain("L110105", "DOMAIN_A");
assertEquals(child1.parentKey, childWithNewParent.parentKey);
ClassificationSummaryResource childWithoutParent = this.getClassificationWithKeyAndDomain("L110107", "DOMAIN_A");
assertEquals(child2.parentId, childWithoutParent.parentId);
assertEquals(child2.parentKey, childWithoutParent.parentKey);
}
private ClassificationResource createClassification(String id, String key, String domain, String parentId,
String parentKey) {
ClassificationResource classificationResource = new ClassificationResource();

4
rest/taskana-rest-spring/src/main/java/pro/taskana/rest/ClassificationDefinitionController.java
View File

@ -187,7 +187,7 @@ public class ClassificationDefinitionController {
Classification child = classificationService
.getClassification(childRes.getKey(), childRes.getDomain());
String parentKey = childrenInFile.get(childRes);
String parentId = classificationService.getClassification(parentKey, childRes.getDomain()).getId();
String parentId = (parentKey == null) ? "" : classificationService.getClassification(parentKey, childRes.getDomain()).getId();
child.setParentKey(parentKey);
child.setParentId(parentId);
classificationService.updateClassification(child);
@ -206,6 +206,8 @@ public class ClassificationDefinitionController {
currentClassification.setCategory(cl.category);
currentClassification.setIsValidInDomain(cl.isValidInDomain);
currentClassification.setName(cl.name);
currentClassification.setParentId(cl.parentId);
currentClassification.setParentKey(cl.parentKey);
currentClassification.setDescription(cl.description);
currentClassification.setPriority(cl.priority);
currentClassification.setServiceLevel(cl.serviceLevel);