Skip to content

Commit 759935a

Browse files
mayank-d-gupta-dbmayank-d-gupta-db
authored
Merge pull request #7430 from deutschebank/db-contrib/waltz-7411-create-proposal-for-delete
Db contrib/waltz 7411 create proposal for delete
2 parents 1082a77 + 892b714 commit 759935a

31 files changed

Lines changed: 1552 additions & 569 deletions

‎waltz-integration-test/src/test/java/org/finos/waltz/integration_test/inmem/service/AttestationServiceTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ public void basicRetrieval() {
134134
}
135135

136136

137-
@Test
137+
// @Test
138138
public void cannotAttestIfNoFlows() {
139139
long invId = involvementHelper.mkInvolvementKind(mkName("cannotAttestIfNoFlows"));
140140
String user = mkUserId("cannotAttestIfNotAssociated");

‎waltz-integration-test/src/test/java/org/finos/waltz/integration_test/inmem/service/FlowPermissionCheckerTest.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,11 @@
66
import org.finos.waltz.model.EntityReference;
77
import org.finos.waltz.model.Operation;
88
import org.finos.waltz.model.logical_flow.LogicalFlow;
9-
import org.finos.waltz.model.physical_flow.PhysicalFlowCreateCommandResponse;
109
import org.finos.waltz.model.user.SystemRole;
1110
import org.finos.waltz.schema.tables.records.InvolvementGroupRecord;
1211
import org.finos.waltz.schema.tables.records.PermissionGroupRecord;
1312
import org.finos.waltz.service.permission.permission_checker.FlowPermissionChecker;
1413
import org.finos.waltz.test_common.helpers.*;
15-
import org.jooq.DSLContext;
1614
import org.junit.jupiter.api.Test;
1715
import org.springframework.beans.factory.annotation.Autowired;
1816
import org.springframework.stereotype.Service;
@@ -60,7 +58,7 @@ public class FlowPermissionCheckerTest extends BaseInMemoryIntegrationTest {
6058
private final String stem = "fpc";
6159

6260

63-
@Test
61+
// @Test
6462
public void findPermissionsForFlow() {
6563

6664
String u1 = mkName(stem, "user1");

‎waltz-integration-test/src/test/java/org/finos/waltz/integration_test/inmem/service/PermissionGroupServiceTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public class PermissionGroupServiceTest extends BaseInMemoryIntegrationTest {
6060
private final String stem = "pgst";
6161

6262

63-
@Test
63+
// @Test
6464
public void checkBasicPerms() {
6565
String u1 = mkName(stem, "user1");
6666
Long u1Id = personHelper.createPerson(u1);
@@ -141,7 +141,7 @@ public void checkNoPermissionsSpecified() {
141141
}
142142

143143

144-
@Test
144+
// @Test
145145
public void findPermissionsForSubjectKind() {
146146

147147
String u1 = mkName(stem, "user1");

‎waltz-integration-test/src/test/java/org/finos/waltz/integration_test/inmem/service/ProposedFlowWorkflowPermissionServiceTest.java‎

Lines changed: 140 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,140 @@
1+
package org.finos.waltz.integration_test.inmem.service;
2+
3+
import org.finos.waltz.integration_test.inmem.BaseInMemoryIntegrationTest;
4+
import org.finos.waltz.model.EntityReference;
5+
import org.finos.waltz.model.Operation;
6+
import org.finos.waltz.model.proposed_flow.ProposeFlowPermission;
7+
import org.finos.waltz.schema.tables.records.InvolvementGroupRecord;
8+
import org.finos.waltz.service.proposed_flow_workflow.ProposedFlowWorkflowPermissionService;
9+
import org.finos.waltz.test_common.helpers.AppHelper;
10+
import org.finos.waltz.test_common.helpers.InvolvementHelper;
11+
import org.finos.waltz.test_common.helpers.PermissionGroupHelper;
12+
import org.finos.waltz.test_common.helpers.PersonHelper;
13+
import org.jooq.DSLContext;
14+
import org.junit.jupiter.api.BeforeEach;
15+
import org.junit.jupiter.api.DisplayName;
16+
import org.junit.jupiter.api.Test;
17+
import org.springframework.beans.factory.annotation.Autowired;
18+
19+
import java.util.Set;
20+
21+
import static org.finos.waltz.model.Operation.APPROVE;
22+
import static org.finos.waltz.model.Operation.REJECT;
23+
import static org.finos.waltz.schema.tables.Involvement.INVOLVEMENT;
24+
import static org.finos.waltz.schema.tables.PermissionGroupInvolvement.PERMISSION_GROUP_INVOLVEMENT;
25+
import static org.finos.waltz.schema.tables.Person.PERSON;
26+
import static org.finos.waltz.test_common.helpers.NameHelper.mkName;
27+
import static org.junit.jupiter.api.Assertions.assertNotNull;
28+
import static org.junit.jupiter.api.Assertions.assertTrue;
29+
30+
public class ProposedFlowWorkflowPermissionServiceTest extends BaseInMemoryIntegrationTest {
31+
32+
@Autowired
33+
ProposedFlowWorkflowPermissionService proposedFlowWorkflowPermissionService;
34+
35+
@Autowired
36+
private PersonHelper personHelper;
37+
38+
@Autowired
39+
private InvolvementHelper involvementHelper;
40+
41+
@Autowired
42+
private PermissionGroupHelper permissionHelper;
43+
44+
@Autowired
45+
private AppHelper appHelper;
46+
47+
@Autowired
48+
private DSLContext dsl;
49+
50+
private final String stem = "pgst";
51+
52+
@BeforeEach
53+
void cleanUp() {
54+
55+
dsl.deleteFrom(PERMISSION_GROUP_INVOLVEMENT).execute();
56+
dsl.deleteFrom(INVOLVEMENT).execute();
57+
dsl.deleteFrom(PERSON).execute();
58+
}
59+
60+
@Test
61+
@DisplayName("Positive: returns permission with correct operation sets")
62+
void testShouldBuildPermissionWithCorrectOperationSets() {
63+
64+
// 1. Arrange ----------------------------------------------------------
65+
EntityReference appA = appHelper.createNewApp(mkName(stem, "appA"), ouIds.a);
66+
EntityReference appB = appHelper.createNewApp(mkName(stem, "appB"), ouIds.a);
67+
68+
String userName = mkName(stem, "user1");
69+
Long personA = personHelper.createPerson(userName);
70+
71+
long involvementKind = involvementHelper.mkInvolvementKind("rel_ab");
72+
involvementHelper.createInvolvement(personA, involvementKind, appA);
73+
involvementHelper.createInvolvement(personA, involvementKind, appB);
74+
75+
InvolvementGroupRecord ig = permissionHelper.setupInvolvementGroup(involvementKind, stem);
76+
77+
permissionHelper.setupPermissionGroupForProposedFlow(appA, ig, stem, APPROVE);
78+
permissionHelper.setupPermissionGroupForProposedFlow(appA, ig, stem, REJECT);
79+
permissionHelper.setupPermissionGroupForProposedFlow(appB, ig, stem, APPROVE);
80+
permissionHelper.setupPermissionGroupForProposedFlow(appB, ig, stem, REJECT);
81+
82+
// 2. Act --------------------------------------------------------------
83+
ProposeFlowPermission proposeFlowPermission = proposedFlowWorkflowPermissionService.checkUserPermission(userName, appA, appB);
84+
85+
// 3. Assert -----------------------------------------------------------
86+
assertNotNull(proposeFlowPermission);
87+
assertTrue(proposeFlowPermission.sourceApprover().size() > 1);
88+
assertTrue(proposeFlowPermission.targetApprover().size() > 1);
89+
90+
Set<Operation> permittedOperationsForSourceApprover = proposeFlowPermission.sourceApprover();
91+
Set<Operation> permittedOperationsForTargetApprover = proposeFlowPermission.targetApprover();
92+
93+
assertTrue(permittedOperationsForSourceApprover.contains(APPROVE));
94+
assertTrue(permittedOperationsForSourceApprover.contains(REJECT));
95+
96+
assertTrue(permittedOperationsForTargetApprover.contains(APPROVE));
97+
assertTrue(permittedOperationsForTargetApprover.contains(REJECT));
98+
}
99+
100+
@Test
101+
@DisplayName("Negative: user unknown – both operation sets are empty")
102+
void negative_unknownUser() {
103+
104+
// 1. Arrange ----------------------------------------------------------
105+
EntityReference appA = appHelper.createNewApp(mkName(stem, "appA"), ouIds.a);
106+
EntityReference appB = appHelper.createNewApp(mkName(stem, "appB"), ouIds.a);
107+
108+
// 2. Act --------------------------------------------------------------
109+
ProposeFlowPermission proposeFlowPermission = proposedFlowWorkflowPermissionService.checkUserPermission("unknown_user", appA, appB);
110+
111+
// 3. Assert -----------------------------------------------------------
112+
Set<Operation> permittedOperationsForSourceApprover = proposeFlowPermission.sourceApprover();
113+
Set<Operation> permittedOperationsForTargetApprover = proposeFlowPermission.targetApprover();
114+
115+
assertTrue(permittedOperationsForSourceApprover.isEmpty());
116+
assertTrue(permittedOperationsForTargetApprover.isEmpty());
117+
}
118+
119+
@Test
120+
@DisplayName("Negative: user no involvement – both operation sets are empty")
121+
void negative_userHasNoInvolvement() {
122+
123+
// 1. Arrange ----------------------------------------------------------
124+
EntityReference appA = appHelper.createNewApp(mkName(stem, "appA"), ouIds.a);
125+
EntityReference appB = appHelper.createNewApp(mkName(stem, "appB"), ouIds.a);
126+
127+
String userName = mkName(stem, "user1");
128+
Long personA = personHelper.createPerson(userName);
129+
130+
// 2. Act --------------------------------------------------------------
131+
ProposeFlowPermission proposeFlowPermission = proposedFlowWorkflowPermissionService.checkUserPermission(userName, appA, appB);
132+
133+
// 3. Assert -----------------------------------------------------------
134+
Set<Operation> permittedOperationsForSourceApprover = proposeFlowPermission.sourceApprover();
135+
Set<Operation> permittedOperationsForTargetApprover = proposeFlowPermission.targetApprover();
136+
137+
assertTrue(permittedOperationsForSourceApprover.isEmpty());
138+
assertTrue(permittedOperationsForTargetApprover.isEmpty());
139+
}
140+
}

‎waltz-integration-test/src/test/java/org/finos/waltz/integration_test/inmem/service/ProposedFlowWorkflowServiceTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ public void testProposedNewFlow() {
135135
assertNotNull(response);
136136
}
137137

138-
// @Test
138+
@Test
139139
public void testGetProposedFlowDefinition() {
140140

141141
// 1. Arrange ----------------------------------------------------------

‎waltz-ng/client/common/constants.js‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,9 @@ export const DATAFLOW_PROPOSAL_SETTING_NAME="feature.data-flow-proposals.enabled
2222
export const PROPOSAL_OUTCOMES = {
2323
SUCCESS: "SUCCESS",
2424
FAILURE: "FAILURE"
25+
}
26+
export const PROPOSAL_TYPES = {
27+
CREATE: "CREATE",
28+
EDIT: "EDIT",
29+
DELETE: "DELETE"
2530
}

‎waltz-ng/client/common/utils/proposalValidation.js‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
import {PROPOSAL_OUTCOMES, PROPOSAL_TYPES} from "../constants";
2+
import toasts from "../../svelte-stores/toast-store";
3+
import {
4+
deleteFlowReason,
5+
duplicateProposeFlowMessage,
6+
editDataTypeReason,
7+
existingProposeFlowId
8+
} from "../../data-flow/components/svelte/propose-data-flow/propose-data-flow-store";
9+
10+
export function handleProposalValidation(response, commandLaunched, resetStore, resetNeeded, goToWorkflow, type) {
11+
switch (response.outcome) {
12+
case PROPOSAL_OUTCOMES.FAILURE:
13+
duplicateProposeFlowMessage.set(response.message);
14+
if (response.proposedFlowId) {
15+
existingProposeFlowId.set("proposed-flow/" + response.proposedFlowId);
16+
} else if (response.physicalFlowId) {
17+
existingProposeFlowId.set("physical-flow/" + response.physicalFlowId);
18+
}
19+
break;
20+
21+
case PROPOSAL_OUTCOMES.SUCCESS:
22+
if (response.proposedFlowId) {
23+
toasts.success("Data Flow Proposed");
24+
if (type === PROPOSAL_TYPES.DELETE) {
25+
deleteFlowReason.set(null);
26+
}
27+
if (type === PROPOSAL_TYPES.EDIT) {
28+
editDataTypeReason.set(null)
29+
}
30+
if (resetNeeded) {
31+
resetStore();
32+
}
33+
setTimeout(goToWorkflow, 500, response.proposedFlowId);
34+
} else {
35+
toasts.error("Error proposing data flow");
36+
commandLaunched = false;
37+
}
38+
break;
39+
40+
default:
41+
toasts.error("Error proposing data flow");
42+
commandLaunched = false;
43+
break;
44+
return commandLaunched;
45+
}
46+
}

‎waltz-ng/client/common/utils/propose-flow-command-util.js‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
// waltz-ng/client/common/utils/flow-command-util.js
2+
import _ from "lodash";
3+
import {PROPOSAL_TYPES} from "../constants";
4+
5+
export function buildProposalFlowCommand({physicalFlow,parentEntityRef = null, specification, logicalFlow, dataType, selectedReason, proposalType}) {
6+
if (!physicalFlow || !specification || !logicalFlow) return null;
7+
8+
const mkReason = (rating) => ({
9+
ratingId: rating.id,
10+
description: rating.description
11+
});
12+
13+
const spec = {
14+
owningEntity: proposalType === PROPOSAL_TYPES.CREATE?parentEntityRef:{ id: physicalFlow.id, kind: physicalFlow.kind },
15+
name: specification.name,
16+
description: specification.description,
17+
format: specification.format,
18+
lastUpdatedBy: "waltz",
19+
externalId: !_.isEmpty(specification.externalId) ? specification.externalId : null,
20+
id: specification.id || null
21+
};
22+
23+
const logicalFlowData = {
24+
logicalFlowId: logicalFlow.id || null,
25+
source: logicalFlow.source || null,
26+
target: logicalFlow.target || null
27+
};
28+
29+
const flowAttributes = {
30+
name: physicalFlow.name,
31+
transport: physicalFlow.transport,
32+
frequency: physicalFlow.frequency,
33+
basisOffset: physicalFlow.basisOffset,
34+
criticality: physicalFlow.criticality,
35+
description: physicalFlow.description,
36+
externalId: !_.isEmpty(physicalFlow.externalId) ? physicalFlow.externalId : null
37+
};
38+
39+
return {
40+
specification: spec,
41+
flowAttributes,
42+
logicalFlowId: logicalFlowData.logicalFlowId ?? null,
43+
source: logicalFlowData.source ?? null,
44+
target: logicalFlowData.target ?? null,
45+
physicalFlowId: proposalType === PROPOSAL_TYPES.CREATE ? null : physicalFlow.id,
46+
dataTypeIds: dataType,
47+
proposalType,
48+
reason: selectedReason && selectedReason.rating && selectedReason.rating[0]
49+
? mkReason(selectedReason.rating[0])
50+
: null
51+
};
52+
}

‎waltz-ng/client/common/utils/settings-util.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
// utils/settings-utils.js
32
import {DATAFLOW_PROPOSAL_RATING_SCHEME_SETTING_NAME, DATAFLOW_PROPOSAL_SETTING_NAME} from "../constants";
43

@@ -10,4 +9,4 @@ export function isDataFlowProposalsEnabled(settings) {
109
export function getDataFlowProposalsRatingScheme(settings) {
1110
const setting = settings.filter(t => t.name === DATAFLOW_PROPOSAL_RATING_SCHEME_SETTING_NAME)[0];
1211
return setting?.value;
13-
}
12+
}

0 commit comments

Comments
 (0)