Merge pull request #2067 from bcgov/feature/ALCS-2319-remove-condition-card-on-archive

ALCS-2319 Remove card relationship on archive

Author: fbarreta

services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition.entity.ts

@@ -86,5 +86,5 @@ export class ApplicationDecisionCondition extends Base {
   @ManyToOne(() => ApplicationDecisionConditionCard, (conditionCard) => conditionCard.conditions, {
     nullable: true,
   })
-  conditionCard: ApplicationDecisionConditionCard;
+  conditionCard: ApplicationDecisionConditionCard | null;
 }

services/apps/alcs/src/alcs/card/card.module.ts

@@ -15,6 +15,7 @@ import { CardType } from './card-type/card-type.entity';
 import { CardController } from './card.controller';
 import { Card } from './card.entity';
 import { CardService } from './card.service';
+import { ApplicationDecisionCondition } from '../application-decision/application-decision-condition/application-decision-condition.entity';
 
 @Module({
   imports: [
@@ -25,18 +26,13 @@ import { CardService } from './card.service';
       CardSubtaskType,
       CardSubtask,
       CardHistory,
+      ApplicationDecisionCondition,
     ]),
     CodeModule,
     MessageModule,
   ],
   controllers: [CardSubtaskController, CardController],
-  providers: [
-    CardStatusService,
-    CardService,
-    CardSubtaskService,
-    CardSubscriber,
-    CardProfile,
-  ],
+  providers: [CardStatusService, CardService, CardSubtaskService, CardSubscriber, CardProfile],
   exports: [CardStatusService, CardService, CardSubtaskService],
 })
 export class CardModule {}

services/apps/alcs/src/alcs/card/card.service.spec.ts

@@ -7,10 +7,7 @@ import { Test, TestingModule } from '@nestjs/testing';
 import { getRepositoryToken } from '@nestjs/typeorm';
 import * as config from 'config';
 import { Repository } from 'typeorm';
-import {
-  initBoardMockEntity,
-  initCardMockEntity,
-} from '../../../test/mocks/mockEntities';
+import { initBoardMockEntity, initCardMockEntity } from '../../../test/mocks/mockEntities';
 import { User } from '../../user/user.entity';
 import { Board } from '../board/board.entity';
 import { MessageService } from '../message/message.service';
@@ -20,18 +17,21 @@ import { CARD_TYPE, CardType } from './card-type/card-type.entity';
 import { CardUpdateServiceDto } from './card.dto';
 import { Card } from './card.entity';
 import { CardService } from './card.service';
+import { ApplicationDecisionCondition } from '../application-decision/application-decision-condition/application-decision-condition.entity';
 
 describe('CardService', () => {
   let service: CardService;
   let cardRepositoryMock: DeepMocked<Repository<Card>>;
   let cardTypeRepositoryMock: DeepMocked<Repository<CardType>>;
+  let applicationConditionRepositoryMock: DeepMocked<Repository<ApplicationDecisionCondition>>;
   let mockCardEntity;
   let mockSubtaskService: DeepMocked<CardSubtaskService>;
   let mockNotificationService: DeepMocked<MessageService>;
 
   beforeEach(async () => {
     cardRepositoryMock = createMock<Repository<Card>>();
     cardTypeRepositoryMock = createMock<Repository<CardType>>();
+    applicationConditionRepositoryMock = createMock<Repository<ApplicationDecisionCondition>>();
     mockCardEntity = initCardMockEntity();
     mockSubtaskService = createMock();
     mockNotificationService = createMock();
@@ -52,6 +52,10 @@ describe('CardService', () => {
           provide: getRepositoryToken(CardType),
           useValue: cardTypeRepositoryMock,
         },
+        {
+          provide: getRepositoryToken(ApplicationDecisionCondition),
+          useValue: applicationConditionRepositoryMock,
+        },
         {
           provide: CONFIG_TOKEN,
           useValue: config,
@@ -71,6 +75,8 @@ describe('CardService', () => {
 
     cardRepositoryMock.findOne.mockResolvedValue(mockCardEntity);
     cardRepositoryMock.save.mockResolvedValue(mockCardEntity);
+    applicationConditionRepositoryMock.save.mockResolvedValue(new ApplicationDecisionCondition());
+    applicationConditionRepositoryMock.find.mockResolvedValue([new ApplicationDecisionCondition()]);
     cardTypeRepositoryMock = module.get(getRepositoryToken(CardType));
   });
 
@@ -89,11 +95,7 @@ describe('CardService', () => {
       boardUuid: mockCardEntity.boardUuid,
     };
 
-    const result = await service.update(
-      new User(),
-      mockCardEntity.uuid,
-      payload,
-    );
+    const result = await service.update(new User(), mockCardEntity.uuid, payload);
     expect(result).toStrictEqual(mockCardEntity);
     expect(cardRepositoryMock.save).toHaveBeenCalledTimes(1);
     expect(cardRepositoryMock.save).toHaveBeenCalledWith(mockCardEntity);
@@ -108,12 +110,8 @@ describe('CardService', () => {
 
     cardRepositoryMock.findOne.mockResolvedValue(null);
 
-    await expect(
-      service.update(new User(), mockCardEntity.uuid, payload),
-    ).rejects.toMatchObject(
-      new ServiceValidationException(
-        `Card for with ${mockCardEntity.uuid} not found`,
-      ),
+    await expect(service.update(new User(), mockCardEntity.uuid, payload)).rejects.toMatchObject(
+      new ServiceValidationException(`Card for with ${mockCardEntity.uuid} not found`),
     );
     expect(cardRepositoryMock.save).toBeCalledTimes(0);
   });
@@ -145,9 +143,7 @@ describe('CardService', () => {
     cardTypeRepositoryMock.findOne.mockResolvedValue(null);
 
     await expect(service.create(fakeType, board)).rejects.toMatchObject(
-      new ServiceValidationException(
-        `Provided type does not exist ${fakeType}`,
-      ),
+      new ServiceValidationException(`Provided type does not exist ${fakeType}`),
     );
 
     expect(cardRepositoryMock.save).toBeCalledTimes(0);
@@ -219,15 +215,10 @@ describe('CardService', () => {
 
     expect(mockNotificationService.create).toHaveBeenCalledTimes(1);
 
-    const createNotificationServiceDto =
-      mockNotificationService.create.mock.calls[0][0];
+    const createNotificationServiceDto = mockNotificationService.create.mock.calls[0][0];
     expect(createNotificationServiceDto.actor).toStrictEqual(fakeAuthor);
-    expect(createNotificationServiceDto.receiverUuid).toStrictEqual(
-      mockUserUuid,
-    );
-    expect(createNotificationServiceDto.title).toStrictEqual(
-      "You've been assigned",
-    );
+    expect(createNotificationServiceDto.receiverUuid).toStrictEqual(mockUserUuid);
+    expect(createNotificationServiceDto.title).toStrictEqual("You've been assigned");
     expect(createNotificationServiceDto.targetType).toStrictEqual('card');
   });
 

services/apps/alcs/src/alcs/card/card.service.ts

@@ -13,6 +13,7 @@ import { CardSubtaskService } from './card-subtask/card-subtask.service';
 import { CARD_TYPE, CardType } from './card-type/card-type.entity';
 import { CardDetailedDto, CardDto, CardUpdateServiceDto } from './card.dto';
 import { Card } from './card.entity';
+import { ApplicationDecisionCondition } from '../application-decision/application-decision-condition/application-decision-condition.entity';
 
 @Injectable()
 export class CardService {
@@ -29,6 +30,8 @@ export class CardService {
     private cardRepository: Repository<Card>,
     @InjectRepository(CardType)
     private cardTypeRepository: Repository<CardType>,
+    @InjectRepository(ApplicationDecisionCondition)
+    private applicationConditionRepository: Repository<ApplicationDecisionCondition>,
     @Inject(CONFIG_TOKEN) private config: IConfig,
     private subtaskService: CardSubtaskService,
     private notificationService: MessageService,
@@ -191,6 +194,19 @@ export class CardService {
     const subtaskUuids = card.subtasks.map((subtask) => subtask.uuid);
     await this.subtaskService.deleteMany(subtaskUuids);
 
+    const conditions = await this.applicationConditionRepository.find({
+      where: {
+        conditionCard: {
+          cardUuid: uuid,
+        },
+      },
+    });
+
+    conditions.forEach((c) => {
+      c.conditionCard = null;
+      this.applicationConditionRepository.save(c);
+    });
+
     card.archived = true;
     await this.cardRepository.save(card);
     await this.cardRepository.softRemove(card);