Merge pull request #577 from tekdi/sdbv_rbac_changes

QA DEPLOYMENT 19 DEC

Author: Shubham4026

package-lock.json

@@ -5,6 +5,18 @@
   "author": "",
   "private": true,
   "license": "UNLICENSED",
+  "engines": {
+    "node": ">=20.0.0",
+    "npm": "10.8.2"
+  },
+  "overrides": {
+    "glob": "^10.4.6",
+    "rimraf": "^5.0.10",
+    "superagent": "^10.2.2",
+    "@humanwhocodes/config-array": "npm:@eslint/config-array@^0.23.0",
+    "@humanwhocodes/object-schema": "npm:@eslint/object-schema@^3.0.0",
+    "jsdom": "^27.2.0"
+  },
   "scripts": {
     "prebuild": "rimraf dist",
     "build": "nest build",
@@ -21,74 +33,76 @@
     "test:e2e": "jest --config ./test/jest-e2e.json"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.688.0",
-    "@aws-sdk/s3-presigned-post": "^3.787.0",
-    "@nestjs/axios": "^0.0.7",
-    "@nestjs/common": "^8.4.2",
-    "@nestjs/config": "^2.3.4",
-    "@nestjs/core": "^8.0.0",
-    "@nestjs/jwt": "^8.0.1",
-    "@nestjs/passport": "^10.0.3",
-    "@nestjs/platform-express": "^8.4.7",
-    "@nestjs/schedule": "^1.1.0",
-    "@nestjs/swagger": "^5.2.1",
-    "@nestjs/typeorm": "^10.0.2",
-    "@types/multer": "^1.4.12",
-    "aws-sdk": "^2.1692.0",
-    "axios": "^0.26.1",
+    "@aws-sdk/client-s3": "^3.940.0",
+    "@aws-sdk/s3-presigned-post": "^3.940.0",
+    "@nestjs/axios": "^4.0.1",
+    "@nestjs/common": "^11.1.9",
+    "@nestjs/config": "^4.0.2",
+    "@nestjs/core": "^11.1.9",
+    "@nestjs/jwt": "^11.0.1",
+    "@nestjs/passport": "^11.0.5",
+    "@nestjs/platform-express": "^11.1.9",
+    "@nestjs/schedule": "^6.0.1",
+    "@nestjs/swagger": "^11.2.3",
+    "@nestjs/typeorm": "^11.0.0",
+    "@types/multer": "^2.0.0",
+    "axios": "^1.13.2",
     "class-transformer": "^0.5.1",
-    "class-validator": "^0.13.2",
-    "csv": "^6.3.10",
-    "csvtojson": "^2.0.10",
+    "class-validator": "^0.14.3",
+    "csv": "^6.4.1",
+    "csvtojson": "^2.0.14",
     "date-fns": "^3.6.0",
-    "dotenv": "^16.0.0",
-    "express": "^4.17.3",
-    "form-data": "^4.0.0",
+    "dotenv": "^16.4.7",
+    "express": "^4.21.2",
+    "form-data": "^4.0.5",
     "graphql-tag": "^2.12.6",
     "in-memory-faceted-search": "^1.0.1",
     "jwt-decode": "^3.1.2",
     "kafkajs": "^2.2.4",
     "moment": "^2.30.1",
-    "multer": "^1.4.4",
-    "node-cron": "^3.0.1",
-    "node-schedule": "^2.1.0",
+    "multer": "^2.0.2",
+    "node-cron": "^3.0.3",
+    "node-schedule": "^2.1.1",
     "object-resolve-path": "^1.1.1",
     "passport": "^0.7.0",
     "passport-jwt": "^4.0.1",
-    "pg": "^8.11.3",
-    "reflect-metadata": "^0.1.13",
-    "rimraf": "^3.0.2",
-    "rxjs": "^7.2.0",
-    "swagger-ui-express": "^4.3.0",
+    "pg": "^8.16.3",
+    "reflect-metadata": "^0.1.14",
+    "rimraf": "^5.0.10",
+    "rxjs": "^7.8.2",
+    "swagger-ui-express": "^4.6.3",
     "templates.js": "^0.3.11",
-    "typeorm": "^0.3.20",
+    "typeorm": "^0.3.27",
     "uuid": "^11.1.0",
-    "winston": "^3.11.0"
+    "winston": "^3.18.3"
   },
   "devDependencies": {
-    "@nestjs/cli": "^8.0.0",
-    "@nestjs/schematics": "^8.0.0",
-    "@nestjs/testing": "^8.0.0",
+    "@eslint/config-array": "^0.23.0",
+    "@eslint/object-schema": "^3.0.0",
+    "@nestjs/cli": "^11.0.14",
+    "@nestjs/schematics": "^10.1.4",
+    "@nestjs/testing": "^11.1.9",
     "@types/cron": "^1.7.3",
-    "@types/express": "^4.17.13",
+    "@types/express": "^4.17.25",
     "@types/jest": "27.4.1",
-    "@types/node": "^16.0.0",
-    "@types/supertest": "^2.0.11",
+    "@types/node": "^20.0.0",
+    "@types/prettier": "^2.7.3",
+    "@types/supertest": "^6.0.3",
     "@types/uuid": "^9.0.8",
-    "@typescript-eslint/eslint-plugin": "^5.0.0",
-    "@typescript-eslint/parser": "^5.0.0",
-    "eslint": "^8.0.1",
-    "eslint-config-prettier": "^8.3.0",
-    "eslint-plugin-prettier": "^4.0.0",
+    "@typescript-eslint/eslint-plugin": "^8.48.0",
+    "@typescript-eslint/parser": "^8.48.0",
+    "eslint": "^9.39.1",
+    "eslint-config-prettier": "^10.1.8",
+    "eslint-plugin-prettier": "^5.5.4",
     "jest": "^27.2.5",
-    "prettier": "^2.3.2",
+    "prettier": "^3.7.3",
     "source-map-support": "^0.5.20",
-    "supertest": "^6.1.3",
+    "supertest": "^7.1.4",
     "ts-jest": "^27.0.3",
     "ts-loader": "^9.2.3",
-    "ts-node": "^10.0.0",
+    "ts-node": "^10.9.2",
     "tsconfig-paths": "^3.10.1",
-    "typescript": "^4.3.5"
+    "typescript": "^4.9.5"
   },
   "jest": {
     "moduleFileExtensions": [

package.json

@@ -24,7 +24,7 @@ import {
 } from "@nestjs/swagger";
 import { Response } from "express";
 import { AcademicYearDto } from "./dto/academicyears-create.dto";
-import { AcademicYearAdapter } from "./academicyearsadaptor";
+import { AcademicYearService } from "./academicyears.service";
 import { AllExceptionsFilter } from "src/common/filters/exception.filter";
 import { APIID } from "@utils/api-id.config";
 import { API_RESPONSES } from "@utils/response.messages";
@@ -37,7 +37,7 @@ import { JwtAuthGuard } from "src/common/guards/keycloak.guard";
 @Controller("academicyears")
 @UseGuards(JwtAuthGuard)
 export class AcademicyearsController {
-  constructor(private readonly academicYearAdapter: AcademicYearAdapter) {}
+  constructor(private readonly academicYearService: AcademicYearService) {}
 
   @UseFilters(new AllExceptionsFilter(APIID.ACADEMICYEAR_CREATE))
   @Post("/create")
@@ -55,8 +55,7 @@ export class AcademicyearsController {
     if (!tenantId || !isUUID(tenantId)) {
       throw new BadRequestException(API_RESPONSES.TENANTID_VALIDATION);
     }
-    const result = await this.academicYearAdapter
-      .buildAcademicYears()
+    const result = await this.academicYearService
       .createAcademicYear(academicyearsService, tenantId, response);
     return response.status(result.statusCode).json(result);
   }
@@ -77,8 +76,7 @@ export class AcademicyearsController {
     if (!tenantId || !isUUID(tenantId)) {
       throw new BadRequestException(API_RESPONSES.TENANTID_VALIDATION);
     }
-    const result = await this.academicYearAdapter
-      .buildAcademicYears()
+    const result = await this.academicYearService
       .getAcademicYearList(academicYearSearchDto, tenantId, response);
     return response.status(result.statusCode).json(result);
   }
@@ -97,8 +95,7 @@ export class AcademicyearsController {
     @Param("id", new ParseUUIDPipe()) id: string,
     @Res() response: Response
   ) {
-    const result = await this.academicYearAdapter
-      .buildAcademicYears()
+    const result = await this.academicYearService
       .getAcademicYearById(id, response);
     return response.status(result.statusCode).json(result);
   }

src/academicyears/academicyears.controller.ts

@@ -2,13 +2,13 @@ import { Module } from "@nestjs/common";
 import { AcademicyearsController } from "./academicyears.controller";
 import { TypeOrmModule } from "@nestjs/typeorm";
 import { AcademicYear } from "./entities/academicyears-entity";
-import { AcademicYearAdapter } from "./academicyearsadaptor";
-import { PostgresAcademicYearService } from "src/adapters/postgres/academicyears-adapter";
+import { AcademicYearService } from "./academicyears.service";
 import { Tenants } from "src/userTenantMapping/entities/tenant.entity";
 
 @Module({
   imports: [TypeOrmModule.forFeature([AcademicYear, Tenants])],
-  providers: [AcademicYearAdapter, PostgresAcademicYearService],
+  providers: [AcademicYearService],
   controllers: [AcademicyearsController],
+  exports: [AcademicYearService],
 })
 export class AcademicyearsModule { }

src/academicyears/academicyears.module.ts

@@ -1,19 +1,17 @@
 import { HttpStatus, Injectable } from "@nestjs/common";
 import { Response } from "express";
-import { AcademicYearDto } from "src/academicyears/dto/academicyears-create.dto";
-import { IServicelocatorAcademicyear } from "../academicyearsservicelocater";
+import { AcademicYearDto } from "./dto/academicyears-create.dto";
 import { InjectRepository } from "@nestjs/typeorm";
-import { AcademicYear } from "src/academicyears/entities/academicyears-entity";
+import { AcademicYear } from "./entities/academicyears-entity";
 import { Repository } from "typeorm";
 import { API_RESPONSES } from "@utils/response.messages";
 import { APIID } from "@utils/api-id.config";
 import APIResponse from "src/common/responses/response";
-import { AcademicYearSearchDto } from "src/academicyears/dto/academicyears-search.dto";
+import { AcademicYearSearchDto } from "./dto/academicyears-search.dto";
 import { Tenants } from "src/userTenantMapping/entities/tenant.entity";
 
 @Injectable()
-export class PostgresAcademicYearService
-  implements IServicelocatorAcademicyear {
+export class AcademicYearService {
   constructor(
     @InjectRepository(AcademicYear)
     private readonly academicYearRespository: Repository<AcademicYear>,