Merge branch 'BC-5836-Add-News-to-KNLDeletion' into BC-5836-and-BC-6424…

…-news-testing

apps/server/src/modules/deletion/deletion-api.module.ts

@@ -19,6 +19,7 @@ import { FilesStorageClientModule } from '@modules/files-storage-client';
 import { DeletionRequestsController } from './controller/deletion-requests.controller';
 import { DeletionExecutionsController } from './controller/deletion-executions.controller';
 import { DeletionRequestUc } from './uc';
+import { NewsModule } from '../news';
 
 @Module({
 	imports: [
@@ -37,6 +38,7 @@ import { DeletionRequestUc } from './uc';
 		RegistrationPinModule,
 		FilesStorageClientModule,
 		TaskModule,
+		NewsModule,
 		RocketChatModule.forRoot({
 			uri: Configuration.get('ROCKET_CHAT_URI') as string,
 			adminId: Configuration.get('ROCKET_CHAT_ADMIN_ID') as string,

apps/server/src/modules/deletion/uc/deletion-request.uc.spec.ts

@@ -18,6 +18,7 @@ import { FilesStorageClientAdapterService } from '@src/modules/files-storage-cli
 import { DomainName, OperationType } from '@shared/domain/types';
 import { TaskService } from '@modules/task';
 import { DomainOperationBuilder } from '@shared/domain/builder';
+import { NewsService } from '@src/modules/news/service/news.service';
 import { DeletionStatusModel } from '../domain/types';
 import { DeletionLogService } from '../services/deletion-log.service';
 import { DeletionRequestService } from '../services';
@@ -47,6 +48,7 @@ describe(DeletionRequestUc.name, () => {
 	let filesStorageClientAdapterService: DeepMocked<FilesStorageClientAdapterService>;
 	let dashboardService: DeepMocked<DashboardService>;
 	let taskService: DeepMocked<TaskService>;
+	let newsService: DeepMocked<NewsService>;
 
 	beforeAll(async () => {
 		module = await Test.createTestingModule({
@@ -124,6 +126,7 @@ describe(DeletionRequestUc.name, () => {
 					provide: TaskService,
 					useValue: createMock<TaskService>(),
 				},
+				{ provide: NewsService, useValue: createMock<NewsService>() },
 			],
 		}).compile();
 
@@ -145,6 +148,7 @@ describe(DeletionRequestUc.name, () => {
 		filesStorageClientAdapterService = module.get(FilesStorageClientAdapterService);
 		dashboardService = module.get(DashboardService);
 		taskService = module.get(TaskService);
+		newsService = module.get(NewsService);
 		await setupEntities();
 	});
 
@@ -241,6 +245,10 @@ describe(DeletionRequestUc.name, () => {
 					new ObjectId().toHexString(),
 				]);
 
+				const newsUpdated = DomainOperationBuilder.build(DomainName.LESSONS, OperationType.UPDATE, 1, [
+					new ObjectId().toHexString(),
+				]);
+
 				const parentEmail = '[email protected]';
 
 				const pseudonymsDeleted = DomainOperationBuilder.build(DomainName.PSEUDONYMS, OperationType.DELETE, 1, [
@@ -307,6 +315,7 @@ describe(DeletionRequestUc.name, () => {
 				taskService.removeCreatorIdFromTasks.mockResolvedValueOnce(tasksModifiedByRemoveCreatorId);
 				taskService.removeUserFromFinished.mockResolvedValueOnce(tasksModifiedByRemoveUserFromFinished);
 				taskService.deleteTasksByOnlyCreator.mockResolvedValueOnce(tasksDeleted);
+				newsService.deleteCreatorOrUpdaterReference.mockResolvedValueOnce(newsUpdated);
 
 				return {
 					deletionRequestToExecute,
@@ -534,14 +543,24 @@ describe(DeletionRequestUc.name, () => {
 				expect(taskService.removeUserFromFinished).toHaveBeenCalledWith(deletionRequestToExecute.targetRefId);
 			});
 
+			it('should call newsService.deleteCreatorOrUpdaterReference to update News without creatorId', async () => {
+				const { deletionRequestToExecute } = setup();
+
+				deletionRequestService.findAllItemsToExecute.mockResolvedValueOnce([deletionRequestToExecute]);
+
+				await uc.executeDeletionRequests();
+
+				expect(newsService.deleteCreatorOrUpdaterReference).toHaveBeenCalledWith(deletionRequestToExecute.targetRefId);
+			});
+
 			it('should call deletionLogService.createDeletionLog to create logs for deletionRequest', async () => {
 				const { deletionRequestToExecute } = setup();
 
 				deletionRequestService.findAllItemsToExecute.mockResolvedValueOnce([deletionRequestToExecute]);
 
 				await uc.executeDeletionRequests();
 
-				expect(deletionLogService.createDeletionLog).toHaveBeenCalledTimes(12);
+				expect(deletionLogService.createDeletionLog).toHaveBeenCalledTimes(13);
 			});
 		});
 

apps/server/src/modules/deletion/uc/deletion-request.uc.ts

@@ -16,6 +16,7 @@ import { FilesStorageClientAdapterService } from '@modules/files-storage-client'
 import { TaskService } from '@modules/task';
 import { DomainOperation } from '@shared/domain/interface';
 import { DomainOperationBuilder } from '@shared/domain/builder/domain-operation.builder';
+import { NewsService } from '@src/modules/news/service/news.service';
 import { DeletionRequestLogResponseBuilder, DeletionTargetRefBuilder } from '../builder';
 import { DeletionRequestBodyProps, DeletionRequestLogResponse, DeletionRequestResponse } from '../controller/dto';
 import { DeletionRequest, DeletionLog } from '../domain';
@@ -41,7 +42,8 @@ export class DeletionRequestUc {
 		private readonly registrationPinService: RegistrationPinService,
 		private readonly filesStorageClientAdapterService: FilesStorageClientAdapterService,
 		private readonly dashboardService: DashboardService,
-		private readonly taskService: TaskService
+		private readonly taskService: TaskService,
+		private readonly newsService: NewsService
 	) {
 		this.logger.setContext(DeletionRequestUc.name);
 	}
@@ -111,6 +113,7 @@ export class DeletionRequestUc {
 				this.removeUserFromRocketChat(deletionRequest),
 				this.removeUsersDashboard(deletionRequest),
 				this.removeUserFromTasks(deletionRequest),
+				this.removeUsersDataFromNews(deletionRequest),
 			]);
 			await this.deletionRequestService.markDeletionRequestAsExecuted(deletionRequest.id);
 		} catch (error) {
@@ -370,4 +373,17 @@ export class DeletionRequestUc {
 			modifiedTasksRef
 		);
 	}
+
+	private async removeUsersDataFromNews(deletionRequest: DeletionRequest) {
+		this.logger.debug({ action: 'removeUsersDataFromNews', deletionRequest });
+		const newsModified = await this.newsService.deleteCreatorOrUpdaterReference(deletionRequest.targetRefId);
+
+		await this.logDeletion(
+			deletionRequest,
+			newsModified.domain,
+			newsModified.operation,
+			newsModified.count,
+			newsModified.refs
+		);
+	}
 }

apps/server/src/modules/news/controller/dto/news.response.ts

@@ -103,7 +103,7 @@ export class NewsResponse {
 	@ApiProperty({
 		description: 'Reference to the User that created the News entity',
 	})
-	creator: UserInfoResponse;
+	creator?: UserInfoResponse;
 
 	@ApiPropertyOptional({
 		description: 'Reference to the User that updated the News entity',

apps/server/src/modules/news/mapper/news.mapper.ts

@@ -10,7 +10,6 @@ export class NewsMapper {
 	static mapToResponse(news: News): NewsResponse {
 		const target = TargetInfoMapper.mapToResponse(news.target);
 		const school = SchoolInfoMapper.mapToResponse(news.school);
-		const creator = UserInfoMapper.mapToResponse(news.creator);
 
 		const dto = new NewsResponse({
 			id: news.id,
@@ -23,12 +22,14 @@ export class NewsMapper {
 			targetModel: news.targetModel,
 			target,
 			school,
-			creator,
 			createdAt: news.createdAt,
 			updatedAt: news.updatedAt,
 			permissions: news.permissions,
 		});
 
+		if (news.creator) {
+			dto.creator = UserInfoMapper.mapToResponse(news.creator);
+		}
 		if (news.updater) {
 			dto.updater = UserInfoMapper.mapToResponse(news.updater);
 		}

apps/server/src/modules/news/news.module.ts

@@ -5,11 +5,12 @@ import { AuthorizationModule } from '@modules/authorization';
 import { NewsController } from './controller/news.controller';
 import { TeamNewsController } from './controller/team-news.controller';
 import { NewsUc } from './uc/news.uc';
+import { NewsService } from './service/news.service';
 
 @Module({
 	imports: [AuthorizationModule, LoggerModule],
 	controllers: [NewsController, TeamNewsController],
-	providers: [NewsUc, NewsRepo],
-	exports: [NewsUc],
+	providers: [NewsUc, NewsRepo, NewsService],
+	exports: [NewsUc, NewsService],
 })
 export class NewsModule {}

apps/server/src/modules/news/service/news.service.spec.ts

@@ -0,0 +1,151 @@
+import { ObjectId } from '@mikro-orm/mongodb';
+import { Test, TestingModule } from '@nestjs/testing';
+import { createMock, DeepMocked } from '@golevelup/ts-jest';
+import { setupEntities, teamNewsFactory, userFactory } from '@shared/testing';
+import { Logger } from '@src/core/logger';
+import { NewsRepo } from '@shared/repo';
+import { DomainOperationBuilder } from '@shared/domain/builder';
+import { DomainName, OperationType } from '@shared/domain/types';
+import { NewsService } from './news.service';
+
+describe(NewsService.name, () => {
+	let module: TestingModule;
+	let service: NewsService;
+	let repo: DeepMocked<NewsRepo>;
+
+	beforeAll(async () => {
+		module = await Test.createTestingModule({
+			providers: [
+				NewsService,
+				{
+					provide: NewsRepo,
+					useValue: createMock<NewsRepo>(),
+				},
+				{
+					provide: Logger,
+					useValue: createMock<Logger>(),
+				},
+			],
+		}).compile();
+
+		service = module.get(NewsService);
+		repo = module.get(NewsRepo);
+
+		await setupEntities();
+	});
+
+	afterEach(() => {
+		repo.findByCreatorOrUpdaterId.mockClear();
+		repo.save.mockClear();
+	});
+
+	afterAll(async () => {
+		await module.close();
+	});
+
+	describe('deleteCreatorReference', () => {
+		const setup = () => {
+			const user1 = userFactory.build();
+			const user2 = userFactory.build();
+			const anotherUserId = new ObjectId().toHexString();
+
+			const news1 = teamNewsFactory.buildWithId({
+				creator: user1,
+			});
+			const news2 = teamNewsFactory.buildWithId({
+				updater: user2,
+			});
+			const news3 = teamNewsFactory.buildWithId({
+				creator: user1,
+				updater: user2,
+			});
+
+			const expectedResultWithDeletedCreator = DomainOperationBuilder.build(DomainName.NEWS, OperationType.UPDATE, 2, [
+				news1.id,
+				news3.id,
+			]);
+
+			const expectedResultWithDeletedUpdater = DomainOperationBuilder.build(DomainName.NEWS, OperationType.UPDATE, 2, [
+				news2.id,
+				news3.id,
+			]);
+
+			const expectedResultWithoutUpdatedNews = DomainOperationBuilder.build(
+				DomainName.NEWS,
+				OperationType.UPDATE,
+				0,
+				[]
+			);
+
+			return {
+				anotherUserId,
+				expectedResultWithDeletedCreator,
+				expectedResultWithDeletedUpdater,
+				expectedResultWithoutUpdatedNews,
+				user1,
+				user2,
+				news1,
+				news2,
+				news3,
+			};
+		};
+
+		describe('when user is creator of news', () => {
+			it('it should be removed from news', async () => {
+				const { user1, news1, news3 } = setup();
+
+				repo.findByCreatorOrUpdaterId.mockResolvedValueOnce([[news1, news3], 2]);
+
+				await service.deleteCreatorOrUpdaterReference(user1.id);
+
+				expect(news1.creator).toBeUndefined();
+				expect(news3.creator).toBeUndefined();
+			});
+
+			it('it should return response for 2 news updated', async () => {
+				const { expectedResultWithDeletedCreator, user1, news1, news3 } = setup();
+
+				repo.findByCreatorOrUpdaterId.mockResolvedValueOnce([[news1, news3], 2]);
+
+				const result = await service.deleteCreatorOrUpdaterReference(user1.id);
+
+				expect(result).toEqual(expectedResultWithDeletedCreator);
+			});
+		});
+
+		describe('when user is updater of news', () => {
+			it('user should be removed from updater', async () => {
+				const { user2, news2, news3 } = setup();
+
+				repo.findByCreatorOrUpdaterId.mockResolvedValueOnce([[news2, news3], 2]);
+
+				await service.deleteCreatorOrUpdaterReference(user2.id);
+
+				expect(news2.updater).toBeUndefined();
+				expect(news3.updater).toBeUndefined();
+			});
+
+			it('it should return response for 2 news updated', async () => {
+				const { expectedResultWithDeletedUpdater, user2, news2, news3 } = setup();
+
+				repo.findByCreatorOrUpdaterId.mockResolvedValueOnce([[news2, news3], 2]);
+
+				const result = await service.deleteCreatorOrUpdaterReference(user2.id);
+
+				expect(result).toEqual(expectedResultWithDeletedUpdater);
+			});
+		});
+
+		describe('when user is neither creator nor updater', () => {
+			it('should return response with 0 updated news', async () => {
+				const { anotherUserId, expectedResultWithoutUpdatedNews } = setup();
+
+				repo.findByCreatorOrUpdaterId.mockResolvedValueOnce([[], 0]);
+
+				const result = await service.deleteCreatorOrUpdaterReference(anotherUserId);
+
+				expect(result).toEqual(expectedResultWithoutUpdatedNews);
+			});
+		});
+	});
+});

apps/server/src/modules/news/service/news.service.ts

@@ -0,0 +1,58 @@
+import { Injectable } from '@nestjs/common';
+import { DomainName, EntityId, OperationType, StatusModel } from '@shared/domain/types';
+import { Logger } from '@src/core/logger';
+import { DataDeletionDomainOperationLoggable } from '@shared/common/loggable';
+import { NewsRepo } from '@shared/repo';
+import { DomainOperationBuilder } from '@shared/domain/builder';
+import { DomainOperation } from '@shared/domain/interface';
+import { News } from '@shared/domain/entity';
+
+@Injectable()
+export class NewsService {
+	constructor(private readonly newsRepo: NewsRepo, private readonly logger: Logger) {
+		this.logger.setContext(NewsService.name);
+	}
+
+	public async deleteCreatorOrUpdaterReference(userId: EntityId): Promise<DomainOperation> {
+		this.logger.info(
+			new DataDeletionDomainOperationLoggable(
+				'Deleting user data from News',
+				DomainName.NEWS,
+				userId,
+				StatusModel.PENDING
+			)
+		);
+
+		const [newsWithUserData, counterOfNews] = await this.newsRepo.findByCreatorOrUpdaterId(userId);
+
+		newsWithUserData.forEach((newsEntity) => {
+			newsEntity.removeCreatorReference(userId);
+			newsEntity.removeUpdaterReference(userId);
+		});
+
+		await this.newsRepo.save(newsWithUserData);
+
+		const result = DomainOperationBuilder.build(
+			DomainName.NEWS,
+			OperationType.UPDATE,
+			counterOfNews,
+			this.getNewsId(newsWithUserData)
+		);
+
+		this.logger.info(
+			new DataDeletionDomainOperationLoggable(
+				'Successfully removed user data from News',
+				DomainName.NEWS,
+				userId,
+				StatusModel.FINISHED,
+				counterOfNews,
+				0
+			)
+		);
+		return result;
+	}
+
+	private getNewsId(news: News[]): EntityId[] {
+		return news.map((item) => item.id);
+	}
+}