Merge pull request #930 from bcgov/main

Backports

.github/workflows/schemaspy.yml

@@ -34,14 +34,18 @@ jobs:
           npm install
           npm run alcs:migration:run
         working-directory: services
+      - name: Import OATS
+        run: |
+          export PGPASSWORD='postgres';
+          psql -h 127.0.0.1 -p 5432 -U postgres -f ora2pg/data/oats_prod_schema_ddl_18_2.sql
       - name: Create Output Folder
         run: |
           mkdir output
           chmod a+rwx -R output
       - name: Run Schemaspy
-        run: docker run --network host -v "$PWD/output:/output" schemaspy/schemaspy:snapshot -t pgsql -db postgres -host 127.0.0.1 -port 5432 -u postgres -p postgres -schemas alcs
+        run: docker run --network host -v "$PWD/output:/output" schemaspy/schemaspy:snapshot -t pgsql -db postgres -host 127.0.0.1 -port 5432 -u postgres -p postgres -schemas alcs,oats
       - name: Deploy to Pages
         uses: JamesIves/github-pages-deploy-action@v4
         with:
           folder: output
-          target-folder: schemaspy
+          target-folder: schemaspy

README.md

@@ -14,12 +14,12 @@ This project contains the frontend and backend for the ALCS used for tracking va
 
 To report bugs/issues/features requests, please file an [issue](https://github.com/bcgov/alcs/issues).
 
-## Links 
+## Links
 
 - [ALCS Frontend Readme](./alcs-frontend/README.md)
 - [Portal Frontend Readme](./portal-frontend/README.md)
 - [Services Readme](./services/README.md)
 - [Architecture](./docs/architecture.md)
 - [SchemaSpy - ALCS](https://bcgov.github.io/alcs/schemaspy/alcs/index.html)
-- [SchemaSpy - Portal](https://bcgov.github.io/alcs/schemaspy/portal/index.html)
+- [SchemaSpy - OATS](https://bcgov.github.io/alcs/schemaspy/oats/index.html)
 - [One time Jobs](./docs/jobs.md)

docs/architecture.md

@@ -4,6 +4,9 @@
 # Deployments
 ![Deployments](imgs/architecture-Deployments.drawio.png)
 
+# Connections
+![Deployments](imgs/architecture-Connections.drawio.png)
+
 # ETL Process
 ![ETL Process](imgs/architecture-ETL.drawio.png)
 

services/apps/alcs/src/alcs/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 () => {

services/apps/alcs/src/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]);
   }
 

services/apps/alcs/src/alcs/application-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 () => {

services/apps/alcs/src/alcs/application-decision/application-reconsideration/application-reconsideration.service.ts

@@ -233,6 +233,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]);
   }
 

services/apps/alcs/src/alcs/notice-of-intent-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 () => {

services/apps/alcs/src/alcs/notice-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]);
   }