Merge pull request #915 from bcgov/feature/ALCS-1068

Delete their cards when deleting recons/modifications
bcgov · Aug 25, 2023 · f29c77c · f29c77c
2 parents ce144fc + f8779be
commit f29c77c
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 3 deletions.
diff --git a/...cs/application-decision/application-modification/application-modification.service.spec.ts b/...cs/application-decision/application-modification/application-modification.service.spec.ts
@@ -242,16 +242,18 @@ describe('ApplicationModificationService', () => {
     expect(modificationRepoMock.save).toHaveBeenCalledTimes(0);
   });
 
-  it('should call softRemove on delete', async () => {
+  it('should archive the card and call softRemove on delete', async () => {
     const uuid = 'fake';
     modificationRepoMock.softRemove.mockResolvedValue({} as any);
+    cardServiceMock.archive.mockResolvedValue();
 
     await service.delete(uuid);
 
     expect(modificationRepoMock.findOneBy).toBeCalledWith({
       uuid,
     });
     expect(modificationRepoMock.softRemove).toHaveBeenCalledTimes(1);
+    expect(cardServiceMock.archive).toHaveBeenCalledTimes(1);
   });
 
   it('should fail on delete if modification does not exist', async () => {

diff --git a/...rc/alcs/application-decision/application-modification/application-modification.service.ts b/...rc/alcs/application-decision/application-modification/application-modification.service.ts
@@ -195,6 +195,7 @@ export class ApplicationModificationService {
 
   async delete(uuid: string) {
     const modification = await this.getByUuidOrFail(uuid);
+    await this.cardService.archive(modification.cardUuid);
     return this.modificationRepository.softRemove([modification]);
   }
 

diff --git a/...lication-decision/application-reconsideration/application-reconsideration.service.spec.ts b/...lication-decision/application-reconsideration/application-reconsideration.service.spec.ts
@@ -294,14 +294,16 @@ describe('ReconsiderationService', () => {
     } as ApplicationReconsideration);
   });
 
-  it('should call softRemove on delete', async () => {
+  it('should archive the card and call softRemove on delete', async () => {
     const uuid = 'fake';
     reconsiderationRepositoryMock.softRemove.mockResolvedValue({} as any);
+    cardServiceMock.archive.mockResolvedValue();
 
     await service.delete(uuid);
 
     expect(reconsiderationRepositoryMock.findOne).toHaveBeenCalledTimes(1);
     expect(reconsiderationRepositoryMock.softRemove).toHaveBeenCalledTimes(1);
+    expect(cardServiceMock.archive).toHaveBeenCalledTimes(1);
   });
 
   it('should fail on delete if reconsideration does not exist', async () => {

diff --git a/...s/application-decision/application-reconsideration/application-reconsideration.service.ts b/...s/application-decision/application-reconsideration/application-reconsideration.service.ts
@@ -224,6 +224,7 @@ export class ApplicationReconsiderationService {
 
   async delete(uuid: string) {
     const reconToDelete = await this.fetchAndValidateReconsideration(uuid);
+    await this.cardService.archive(reconToDelete.cardUuid);
     return this.reconsiderationRepository.softRemove([reconToDelete]);
   }
 

diff --git a/...tent-decision/notice-of-intent-modification/notice-of-intent-modification.service.spec.ts b/...tent-decision/notice-of-intent-modification/notice-of-intent-modification.service.spec.ts
@@ -211,16 +211,18 @@ describe('NoticeOfIntentModificationService', () => {
     expect(modificationRepoMock.save).toHaveBeenCalledTimes(0);
   });
 
-  it('should call softRemove on delete', async () => {
+  it('should archive the card and call softRemove on delete', async () => {
     const uuid = 'fake';
     modificationRepoMock.softRemove.mockResolvedValue({} as any);
+    cardServiceMock.archive.mockResolvedValue();
 
     await service.delete(uuid);
 
     expect(modificationRepoMock.findOneBy).toBeCalledWith({
       uuid,
     });
     expect(modificationRepoMock.softRemove).toHaveBeenCalledTimes(1);
+    expect(cardServiceMock.archive).toHaveBeenCalledTimes(1);
   });
 
   it('should fail on delete if modification does not exist', async () => {

diff --git a/...of-intent-decision/notice-of-intent-modification/notice-of-intent-modification.service.ts b/...of-intent-decision/notice-of-intent-modification/notice-of-intent-modification.service.ts
@@ -165,6 +165,7 @@ export class NoticeOfIntentModificationService {
 
   async delete(uuid: string) {
     const modification = await this.getByUuidOrFail(uuid);
+    await this.cardService.archive(modification.cardUuid);
     return this.modificationRepository.softRemove([modification]);
   }