Merge branch 'main' into qa/bcgov#1421-InstitutionManageDesignation

.gitignore

@@ -11,6 +11,7 @@ dist/
 
 #cypress
 screenshots/
+testing/**/report/
 videos/
-report/
 cypress.env.json
+

devops/Makefile

@@ -36,7 +36,7 @@ define QA_DB_NAME
 endef
 
 define BUILD_TAG
-"$(BUILD_REF)-$(BUILD_ID)"
+"$(subst /,-,$(BUILD_REF))-$(BUILD_ID)"
 endef
 
 define BUILD_TEMPLATE_PATH
@@ -304,7 +304,7 @@ build-api:
 	test -n "$(BUILD_REF)"
 	test -n "$(BUILD_NAMESPACE)"
 	@echo "+\n++ BUILDING API with tag: $(BUILD_TAG)\n+"
-	@oc -n $(BUILD_NAMESPACE) process -f $(BUILD_TEMPLATE_PATH) -p TAG=$(BUILD_TAG) -p SOURCE_REPOSITORY_REF=$(BUILD_REF) -p BASE_IMAGE_NAME="nodejs-16" -p BASE_IMAGE_TAG="1" -p BASE_IMAGE_REPO="artifacts.developer.gov.bc.ca/redhat-docker-remote/ubi8/" -p SOURCE_CONTEXT_DIR=sources/packages/api -p NAME=$(API) | oc -n $(BUILD_NAMESPACE) apply -f -
+	@oc -n $(BUILD_NAMESPACE) process -f $(BUILD_TEMPLATE_PATH) -p TAG=$(BUILD_TAG) -p SOURCE_REPOSITORY_REF=$(BUILD_REF) -p BASE_IMAGE_NAME="nodejs-16" -p BASE_IMAGE_TAG="1" -p BASE_IMAGE_REPO="artifacts.developer.gov.bc.ca/redhat-docker-remote/ubi8/" -p SOURCE_CONTEXT_DIR=sources/packages/backend -p DOCKER_FILE_PATH=apps/api/Dockerfile -p NAME=$(API) | oc -n $(BUILD_NAMESPACE) apply -f -
 	@oc -n $(BUILD_NAMESPACE) start-build bc/$(API) --wait
 
 build-web:

devops/openshift/docker-build.yml

@@ -59,6 +59,7 @@ objects:
         type: Git
       strategy:
         dockerStrategy:
+          dockerfilePath: "${DOCKER_FILE_PATH}"
           pullSecret:
             name: artifactory-secret-credential
           from:
@@ -85,6 +86,9 @@ parameters:
     value: https://github.com/bcgov/SIMS.git
   - name: SOURCE_REPOSITORY_REF
     required: true
+  - name: DOCKER_FILE_PATH
+    required: true
+    value: Dockerfile
   - name: TAG
     value: "latest"
   - name: BASE_IMAGE_REPO

sources/docker-compose.yml

@@ -7,8 +7,8 @@ services:
     image: api-${PROJECT_NAME}:${BUILD_REF}-${BUILD_ID}
     container_name: api-${PROJECT_NAME}-${BUILD_REF}-${BUILD_ID}
     build:
-      context: ./packages/api
-      dockerfile: Dockerfile.dev
+      context: ./packages/backend
+      dockerfile: ./apps/api/Dockerfile.dev
     environment:
       - NODE_ENV=docker
       - PORT=${API_PORT}
@@ -76,7 +76,7 @@ services:
     ports:
       - ${API_PORT}:${API_PORT}
     volumes:
-      - ./packages/api/src:/app/src
+      - ./packages/backend/apps/api/src:/app/src
     networks:
       - local-network
     restart: always

sources/packages/api/Dockerfile → sources/packages/backend/apps/api/Dockerfile

@@ -18,10 +18,10 @@ RUN npm ci
 COPY . .
 
 # Building app
-RUN npm run build
+RUN npm run build api
 
 # Exposing application port
 EXPOSE ${PORT}
 
 # Entry point
-CMD [ "npm", "run", "start:prod" ]
+CMD [ "npm", "run", "start:prod:api" ]

sources/packages/api/Dockerfile.dev → sources/packages/backend/apps/api/Dockerfile.dev

@@ -9,7 +9,6 @@ ENV PATH $PATH:/app/node_modules/.bin
 # Application Port
 ENV PORT 3000
 
-# Setting app as work dir
 WORKDIR /app
 
 # Copying package.json and package-lock.json
@@ -22,18 +21,10 @@ RUN npm ci
 COPY . .
 
 # Building app
-RUN npm run build
+RUN npm run build api
 
 # Exposing application port
 EXPOSE ${PORT}
 
 # Entry point
-CMD [ "npm", "run", "docker:start" ]
-
-# Sample line to run the unit tests tests for now.
-# Unit tests will be enabled on CI/CD on upcoming tasks.
-# CMD [ "npm", "run", "test:local" ]
-
-# Sample line to run the E2E tests for now.
-# E2E tests will be enabled on CI/CD on upcoming tasks.
-# CMD [ "npm", "run", "test:e2e" ]
+CMD [ "npm", "run", "docker:start:api" ]

sources/packages/backend/apps/api/src-sql/test.sql

@@ -0,0 +1 @@
+-- ## This is an empty test sql file.

sources/packages/api/src/app.aest.module.ts → sources/packages/backend/apps/api/src/app.aest.module.ts

@@ -1,5 +1,5 @@
 import { Module } from "@nestjs/common";
-import { DatabaseModule } from "./database/database.module";
+import { DatabaseModule } from "@sims/sims-db";
 import {
   ApplicationService,
   ConfigService,

sources/packages/api/src/app.controller.spec.ts → sources/packages/backend/apps/api/src/app.controller.spec.ts

@@ -1,8 +1,8 @@
-require("../env_setup");
+require("../../../env_setup");
 import { Test, TestingModule } from "@nestjs/testing";
 import { AppController } from "./app.controller";
 import { AppService } from "./app.service";
-import { DatabaseModule } from "./database/database.module";
+import { DatabaseModule } from "@sims/sims-db";
 
 describe("AppController", () => {
   let appController: AppController;

sources/packages/api/src/app.institutions.module.ts → sources/packages/backend/apps/api/src/app.institutions.module.ts

@@ -1,5 +1,5 @@
 import { Module } from "@nestjs/common";
-import { DatabaseModule } from "./database/database.module";
+import { DatabaseModule } from "@sims/sims-db";
 import {
   ConfigService,
   DesignationAgreementService,

sources/packages/api/src/app.module.ts → sources/packages/backend/apps/api/src/app.module.ts

@@ -1,7 +1,7 @@
 import { Module } from "@nestjs/common";
 import { AppController } from "./app.controller";
 import { AppService } from "./app.service";
-import { DatabaseModule } from "./database/database.module";
+import { DatabaseModule } from "@sims/sims-db";
 import { RouterModule } from "@nestjs/core";
 import {
   UserService,