Merge branch 'develop' into feat/partners

.eslintrc.js

@@ -5,10 +5,11 @@ module.exports = {
     tsconfigRootDir: __dirname,
     sourceType: 'module',
   },
-  plugins: ['@typescript-eslint/eslint-plugin'],
+  plugins: ['@typescript-eslint/eslint-plugin', 'jest'],
   extends: [
     'plugin:@typescript-eslint/recommended',
     'plugin:prettier/recommended',
+    'plugin:jest/recommended'
   ],
   root: true,
   env: {
@@ -21,10 +22,16 @@ module.exports = {
     '@typescript-eslint/explicit-function-return-type': 'off',
     '@typescript-eslint/explicit-module-boundary-types': 'off',
     '@typescript-eslint/no-explicit-any': 'off',
-    "prettier/prettier": [
-      "error",
+    'jest/expect-expect': [
+      'warn',
       {
-        "endOfLine": "auto"
+        'assertFunctionNames': ['expect', 'request.**.expect'],
+      }
+    ],
+    'prettier/prettier': [
+      'error',
+      {
+        'endOfLine': 'auto'
       }
     ]
   },

.github/workflows/ci.yml

@@ -1,9 +1,15 @@
 name: CI
 
 on:
+  workflow_dispatch:
+  push:
+    branches:
+      - main
+    tags:
+      - "*"
   pull_request:
     branches:
-      - master
+      - main
       - develop
 
 jobs:
@@ -29,4 +35,7 @@ jobs:
         run: npm run lint:ci
       # Build App
       - name: Build App
-        run: npm run build 
+        run: npm run build
+
+      - name: Test
+        run: npm test

jest.config.ts

@@ -0,0 +1,20 @@
+import type { Config } from 'jest';
+
+const config: Config = {
+  moduleFileExtensions: ['js', 'json', 'ts'],
+  rootDir: 'src',
+  testRegex: '.*\\.spec\\.ts$',
+  transform: {
+    '^.+\\.(t|j)s$': 'ts-jest',
+  },
+  collectCoverageFrom: ['**/*.(t|j)s'],
+  coverageDirectory: '../coverage',
+  moduleNameMapper: {
+    '^src/(.*)$': '<rootDir>/$1',
+    '^@/(.*)$': '<rootDir>/$1',
+    '^test/(.*)$': '<rootDir>/../$1',
+  },
+  testEnvironment: 'node',
+};
+
+export default config;

package.json

@@ -18,7 +18,7 @@
     "test:watch": "jest --watch",
     "test:cov": "jest --coverage",
     "test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand",
-    "test:e2e": "jest --config ./test/jest-e2e.json",
+    "test:e2e": "jest --config ./test/jest.e2e.config.ts",
     "migrations:run": "npx prisma migrate deploy",
     "migrations:dev": "npx prisma migrate dev",
     "docker:compose": "docker-compose -f docker-compose.dev.yml up"
@@ -53,6 +53,7 @@
     "@typescript-eslint/parser": "^6.0.0",
     "eslint": "^8.42.0",
     "eslint-config-prettier": "^9.0.0",
+    "eslint-plugin-jest": "^28.5.0",
     "eslint-plugin-prettier": "^5.0.0",
     "jest": "^29.5.0",
     "prettier": "^3.0.0",
@@ -64,22 +65,5 @@
     "ts-node": "^10.9.1",
     "tsconfig-paths": "^4.2.0",
     "typescript": "^5.1.3"
-  },
-  "jest": {
-    "moduleFileExtensions": [
-      "js",
-      "json",
-      "ts"
-    ],
-    "rootDir": "src",
-    "testRegex": ".*\\.spec\\.ts$",
-    "transform": {
-      "^.+\\.(t|j)s$": "ts-jest"
-    },
-    "collectCoverageFrom": [
-      "**/*.(t|j)s"
-    ],
-    "coverageDirectory": "../coverage",
-    "testEnvironment": "node"
   }
 }

src/sessions/sessions.controller.spec.ts

@@ -1,13 +1,23 @@
 import { Test, TestingModule } from '@nestjs/testing';
 import { SessionsController } from './sessions.controller';
+import { SessionsService } from './sessions.service';
+import { PrismaService } from 'src/prisma/prisma.service';
+import { JwtService } from '@nestjs/jwt';
 
 describe('SessionsController', () => {
   let controller: SessionsController;
 
   beforeEach(async () => {
     const module: TestingModule = await Test.createTestingModule({
       controllers: [SessionsController],
-    }).compile();
+      providers: [SessionsService, JwtService],
+    })
+      .useMocker((token) => {
+        if (token === PrismaService) {
+          return {};
+        }
+      })
+      .compile();
 
     controller = module.get<SessionsController>(SessionsController);
   });

src/sessions/sessions.service.spec.ts

@@ -1,13 +1,21 @@
 import { Test, TestingModule } from '@nestjs/testing';
 import { SessionsService } from './sessions.service';
+import { JwtService } from '@nestjs/jwt';
+import { PrismaService } from 'src/prisma/prisma.service';
 
 describe('SessionsService', () => {
   let service: SessionsService;
 
   beforeEach(async () => {
     const module: TestingModule = await Test.createTestingModule({
-      providers: [SessionsService],
-    }).compile();
+      providers: [SessionsService, JwtService],
+    })
+      .useMocker((token) => {
+        if (token === PrismaService) {
+          return {};
+        }
+      })
+      .compile();
 
     service = module.get<SessionsService>(SessionsService);
   });

src/shelter-managers/shelter-managers.controller.spec.ts

@@ -1,13 +1,22 @@
 import { Test, TestingModule } from '@nestjs/testing';
 import { ShelterManagersController } from './shelter-managers.controller';
+import { PrismaService } from 'src/prisma/prisma.service';
+import { ShelterManagersService } from './shelter-managers.service';
 
 describe('ShelterManagersController', () => {
   let controller: ShelterManagersController;
 
   beforeEach(async () => {
     const module: TestingModule = await Test.createTestingModule({
       controllers: [ShelterManagersController],
-    }).compile();
+      providers: [ShelterManagersService],
+    })
+      .useMocker((token) => {
+        if (token === PrismaService) {
+          return {};
+        }
+      })
+      .compile();
 
     controller = module.get<ShelterManagersController>(
       ShelterManagersController,

src/shelter-managers/shelter-managers.service.spec.ts

@@ -1,13 +1,20 @@
 import { Test, TestingModule } from '@nestjs/testing';
 import { ShelterManagersService } from './shelter-managers.service';
+import { PrismaService } from 'src/prisma/prisma.service';
 
 describe('ShelterManagersService', () => {
   let service: ShelterManagersService;
 
   beforeEach(async () => {
     const module: TestingModule = await Test.createTestingModule({
       providers: [ShelterManagersService],
-    }).compile();
+    })
+      .useMocker((token) => {
+        if (token === PrismaService) {
+          return {};
+        }
+      })
+      .compile();
 
     service = module.get<ShelterManagersService>(ShelterManagersService);
   });

src/shelter-supply/shelter-supply.controller.spec.ts

@@ -1,13 +1,22 @@
 import { Test, TestingModule } from '@nestjs/testing';
 import { ShelterSupplyController } from './shelter-supply.controller';
+import { PrismaService } from 'src/prisma/prisma.service';
+import { ShelterSupplyService } from './shelter-supply.service';
 
 describe('ShelterSupplyController', () => {
   let controller: ShelterSupplyController;
 
   beforeEach(async () => {
     const module: TestingModule = await Test.createTestingModule({
       controllers: [ShelterSupplyController],
-    }).compile();
+      providers: [ShelterSupplyService],
+    })
+      .useMocker((token) => {
+        if (token === PrismaService) {
+          return {};
+        }
+      })
+      .compile();
 
     controller = module.get<ShelterSupplyController>(ShelterSupplyController);
   });

src/shelter-supply/shelter-supply.service.spec.ts

@@ -1,13 +1,20 @@
 import { Test, TestingModule } from '@nestjs/testing';
 import { ShelterSupplyService } from './shelter-supply.service';
+import { PrismaService } from 'src/prisma/prisma.service';
 
 describe('ShelterSupplyService', () => {
   let service: ShelterSupplyService;
 
   beforeEach(async () => {
     const module: TestingModule = await Test.createTestingModule({
       providers: [ShelterSupplyService],
-    }).compile();
+    })
+      .useMocker((token) => {
+        if (token === PrismaService) {
+          return {};
+        }
+      })
+      .compile();
 
     service = module.get<ShelterSupplyService>(ShelterSupplyService);
   });

src/shelter/shelter.controller.spec.ts

@@ -1,13 +1,24 @@
 import { Test, TestingModule } from '@nestjs/testing';
+import { PrismaService } from 'src/prisma/prisma.service';
 import { ShelterController } from './shelter.controller';
+import { ShelterService } from './shelter.service';
 
 describe('ShelterController', () => {
   let controller: ShelterController;
 
   beforeEach(async () => {
     const module: TestingModule = await Test.createTestingModule({
       controllers: [ShelterController],
-    }).compile();
+      providers: [ShelterService],
+    })
+      .useMocker((token) => {
+        if (token === PrismaService) {
+          return {
+            supplyCategory: { findMany: jest.fn().mockResolvedValue(0) },
+          };
+        }
+      })
+      .compile();
 
     controller = module.get<ShelterController>(ShelterController);
   });

src/shelter/shelter.service.spec.ts

@@ -1,13 +1,24 @@
 import { Test, TestingModule } from '@nestjs/testing';
 import { ShelterService } from './shelter.service';
+import { PrismaService } from 'src/prisma/prisma.service';
 
 describe('ShelterService', () => {
   let service: ShelterService;
 
   beforeEach(async () => {
     const module: TestingModule = await Test.createTestingModule({
       providers: [ShelterService],
-    }).compile();
+    })
+      .useMocker((token) => {
+        if (token === PrismaService) {
+          return {
+            supplyCategory: {
+              findMany: jest.fn().mockResolvedValue([]),
+            },
+          };
+        }
+      })
+      .compile();
 
     service = module.get<ShelterService>(ShelterService);
   });

src/shelter/shelter.service.ts

@@ -1,4 +1,4 @@
-import { Injectable } from '@nestjs/common';
+import { Injectable, OnModuleInit } from '@nestjs/common';
 import { Prisma } from '@prisma/client';
 import { DefaultArgs } from '@prisma/client/runtime/library';
 import { subDays } from 'date-fns';
@@ -17,10 +17,12 @@ import {
 } from './types/types';
 
 @Injectable()
-export class ShelterService {
+export class ShelterService implements OnModuleInit {
   private voluntaryIds: string[] = [];
 
-  constructor(private readonly prismaService: PrismaService) {
+  constructor(private readonly prismaService: PrismaService) {}
+
+  onModuleInit() {
     this.loadVoluntaryIds();
   }
 

src/supply-categories/supply-categories.controller.spec.ts

@@ -1,13 +1,22 @@
 import { Test, TestingModule } from '@nestjs/testing';
 import { SupplyCategoriesController } from './supply-categories.controller';
+import { PrismaService } from 'src/prisma/prisma.service';
+import { SupplyCategoriesService } from './supply-categories.service';
 
 describe('SupplyCategoriesController', () => {
   let controller: SupplyCategoriesController;
 
   beforeEach(async () => {
     const module: TestingModule = await Test.createTestingModule({
       controllers: [SupplyCategoriesController],
-    }).compile();
+      providers: [SupplyCategoriesService],
+    })
+      .useMocker((token) => {
+        if (token === PrismaService) {
+          return {};
+        }
+      })
+      .compile();
 
     controller = module.get<SupplyCategoriesController>(
       SupplyCategoriesController,