Merge pull request #1671 from rocket-admin/backend_group_ceadr_permissions_responce

feat: add cedarPolicy to group and connection data structures and update related tests

Author: Artuomka

backend/src/entities/company-info/utils/build-found-company-info-ds.ts

@@ -39,6 +39,7 @@ export function buildFoundCompanyFullInfoDs(
 					id: group.id,
 					isMain: group.isMain,
 					title: group.title,
+					cedarPolicy: group.cedarPolicy,
 					users: group.users.map((user) => buildSimpleUserInfoDs(user)).filter((user) => !!user),
 				};
 			}),

backend/src/entities/connection/application/dto/found-user-groups-in-connection.dto.ts

@@ -12,6 +12,9 @@ export class FoundGroupInConnectionDTO {
 	@ApiProperty()
 	isMain: boolean;
 
+	@ApiProperty()
+	cedarPolicy: string | null;
+
 	@ApiProperty({ required: false, isArray: true, type: SimpleFoundUserInfoDs })
 	users?: Array<SimpleFoundUserInfoDs>;
 }

backend/src/entities/connection/utils/build-found-user-group-in-connection-dto.util.ts

@@ -12,6 +12,7 @@ export function buildFoundUserGroupInConnectionDto(
 			id: group.id,
 			title: group.title,
 			isMain: group.isMain,
+			cedarPolicy: group.cedarPolicy,
 			users: group.users?.length ? group.users.map((user) => buildSimpleUserInfoDs(user)) : undefined,
 		},
 		accessLevel,

backend/src/entities/group/application/data-sctructures/found-user-groups.ds.ts

@@ -11,6 +11,9 @@ export class FoundGroupDataInfoDs {
 
 	@ApiProperty()
 	isMain: boolean;
+
+	@ApiProperty()
+	cedarPolicy: string | null;
 }
 
 export class FoundGroupDataWithUsersDs extends FoundGroupDataInfoDs {

backend/src/entities/group/use-cases/find-all-user-groups.use.case.ts

@@ -35,13 +35,14 @@ export class FindAllUserGroupsUseCase extends AbstractUseCase<string, FoundUserG
 			groups: groupsWithAccessLevels.map((g) => {
 				const {
 					accessLevel,
-					group: { id, isMain, title },
+					group: { id, isMain, title, cedarPolicy },
 				} = g;
 				return {
 					group: {
 						id: id,
 						title: title,
 						isMain: isMain,
+						cedarPolicy: cedarPolicy,
 					},
 					accessLevel: accessLevel,
 				};

backend/src/entities/group/use-cases/update-group-title.use.case.ts

@@ -44,6 +44,7 @@ export class UpdateGroupTitleUseCase
 			id: updatedGroup.id,
 			title: updatedGroup.title,
 			isMain: updatedGroup.isMain,
+			cedarPolicy: updatedGroup.cedarPolicy,
 		};
 	}
 }

backend/test/ava-tests/non-saas-tests/non-saas-company-info-e2e.test.ts

@@ -138,10 +138,11 @@ test.serial(`${currentTest} should return full found company info for company ad
 		t.is(Object.hasOwn(foundCompanyInfoRO.connections[0], 'author'), true);
 		t.is(Object.hasOwn(foundCompanyInfoRO.connections[0], 'groups'), true);
 		t.is(foundCompanyInfoRO.connections[0].groups.length > 0, true);
-		t.is(Object.keys(foundCompanyInfoRO.connections[0].groups[0]).length, 4);
+		t.is(Object.keys(foundCompanyInfoRO.connections[0].groups[0]).length, 5);
 		t.is(Object.hasOwn(foundCompanyInfoRO.connections[0].groups[0], 'id'), true);
 		t.is(Object.hasOwn(foundCompanyInfoRO.connections[0].groups[0], 'title'), true);
 		t.is(Object.hasOwn(foundCompanyInfoRO.connections[0].groups[0], 'isMain'), true);
+		t.is(Object.hasOwn(foundCompanyInfoRO.connections[0].groups[0], 'cedarPolicy'), true);
 		t.is(Object.hasOwn(foundCompanyInfoRO.connections[0].groups[0], 'users'), true);
 		t.is(foundCompanyInfoRO.connections[0].groups[0].users.length > 0, true);
 		t.is(Object.keys(foundCompanyInfoRO.connections[0].groups[0].users[0]).length, 9);

backend/test/ava-tests/non-saas-tests/non-saas-connection-e2e.test.ts

@@ -1124,6 +1124,7 @@ test.serial(`${currentTest} should return connection without deleted group resul
 	const _groupId = result[0].group.id;
 
 	t.is(Object.hasOwn(result[0].group, 'title'), true);
+	t.is(Object.hasOwn(result[0].group, 'cedarPolicy'), true);
 	t.is(result[0].accessLevel, AccessLevelEnum.edit);
 
 	const index = result

backend/test/ava-tests/non-saas-tests/non-saas-group-e2e.test.ts

@@ -117,6 +117,7 @@ test.serial(`${currentTest} should return all user groups`, async (t) => {
 
 		t.is(Object.hasOwn(result[1].group, 'users'), true);
 		t.is(Object.hasOwn(result[0].group, 'title'), true);
+		t.is(Object.hasOwn(result[0].group, 'cedarPolicy'), true);
 		t.is(Object.hasOwn(result[0].group, 'connection'), false);
 		t.is(result[1].accessLevel, AccessLevelEnum.edit);
 	} catch (e) {
@@ -636,6 +637,7 @@ test.serial(`${currentTest} should return an delete result`, async (t) => {
 		t.is(result.length, 1);
 
 		t.is(result[0].group.title, 'Admin');
+		t.is(Object.hasOwn(result[0].group, 'cedarPolicy'), true);
 		t.is(result[0].accessLevel, AccessLevelEnum.edit);
 
 		const index = result

backend/test/ava-tests/saas-tests/company-info-e2e.test.ts

@@ -139,10 +139,11 @@ test.serial(`${currentTest} should return full found company info for company ad
 		t.is(Object.hasOwn(foundCompanyInfoRO.connections[0], 'author'), true);
 		t.is(Object.hasOwn(foundCompanyInfoRO.connections[0], 'groups'), true);
 		t.is(foundCompanyInfoRO.connections[0].groups.length > 0, true);
-		t.is(Object.keys(foundCompanyInfoRO.connections[0].groups[0]).length, 4);
+		t.is(Object.keys(foundCompanyInfoRO.connections[0].groups[0]).length, 5);
 		t.is(Object.hasOwn(foundCompanyInfoRO.connections[0].groups[0], 'id'), true);
 		t.is(Object.hasOwn(foundCompanyInfoRO.connections[0].groups[0], 'title'), true);
 		t.is(Object.hasOwn(foundCompanyInfoRO.connections[0].groups[0], 'isMain'), true);
+		t.is(Object.hasOwn(foundCompanyInfoRO.connections[0].groups[0], 'cedarPolicy'), true);
 		t.is(Object.hasOwn(foundCompanyInfoRO.connections[0].groups[0], 'users'), true);
 		t.is(foundCompanyInfoRO.connections[0].groups[0].users.length > 0, true);
 		t.is(Object.keys(foundCompanyInfoRO.connections[0].groups[0].users[0]).length, 9);