Merge branch 'main' into feat/pentests

backend/dops/src/modules/common/entities/base.entity.ts

@@ -1,35 +1,40 @@
 import { AutoMap } from '@automapper/classes';
 import { ApiProperty } from '@nestjs/swagger';
-import {
-  Column,
-  CreateDateColumn,
-  UpdateDateColumn,
-  VersionColumn,
-} from 'typeorm';
+import { Column, CreateDateColumn, UpdateDateColumn } from 'typeorm';
 
 export class Base {
   @AutoMap()
-  @ApiProperty({ description: 'Concurrency Control Number' })
-  @VersionColumn({
-    name: 'CONCURRENCY_CONTROL_NUMBER',
+  @ApiProperty({ description: 'Created User Name' })
+  @Column({
+    length: 30,
+    name: 'APP_CREATE_USERID',
     nullable: true,
   })
-  concurrencyControlNumber: number;
+  createdUser: string;
 
   @AutoMap()
-  @ApiProperty({ description: 'Created User Name' })
+  @ApiProperty({ description: 'Created User Directory' })
   @Column({
     length: 30,
-    name: 'DB_CREATE_USERID',
+    name: 'APP_CREATE_USER_DIRECTORY',
     nullable: true,
   })
-  createdUser: string;
+  createdUserDirectory: string;
+
+  @AutoMap()
+  @ApiProperty({ description: 'Created User GUID' })
+  @Column({
+    length: 32,
+    name: 'APP_CREATE_USER_GUID',
+    nullable: true,
+  })
+  createdUserGuid: string;
 
   @AutoMap()
   @ApiProperty({ description: 'Resource Creation Date' })
   @CreateDateColumn({
-    default: () => 'NOW()',
-    name: 'DB_CREATE_TIMESTAMP',
+    default: () => 'GETUTCDATETIME()',
+    name: 'APP_CREATE_TIMESTAMP',
     nullable: true,
   })
   createdDateTime: Date;
@@ -38,16 +43,34 @@ export class Base {
   @ApiProperty({ description: 'Updated User Name' })
   @Column({
     length: 30,
-    name: 'DB_LAST_UPDATE_USERID',
+    name: 'APP_LAST_UPDATE_USERID',
     nullable: true,
   })
   updatedUser: string;
 
+  @AutoMap()
+  @ApiProperty({ description: 'Updated User Directory' })
+  @Column({
+    length: 30,
+    name: 'APP_LAST_UPDATE_USER_DIRECTORY',
+    nullable: true,
+  })
+  updatedUserDirectory: string;
+
+  @AutoMap()
+  @ApiProperty({ description: 'Updated User GUID' })
+  @Column({
+    length: 32,
+    name: 'APP_LAST_UPDATE_USER_GUID',
+    nullable: true,
+  })
+  updatedUserGuid: string;
+
   @AutoMap()
   @ApiProperty({ description: 'Resource Update Date' })
   @UpdateDateColumn({
-    default: () => 'NOW()',
-    name: 'DB_LAST_UPDATE_TIMESTAMP',
+    default: () => 'GETUTCDATETIME()',
+    name: 'APP_LAST_UPDATE_TIMESTAMP',
     nullable: true,
   })
   updatedDateTime: Date;

backend/dops/src/modules/dgen/dgen.service.ts

@@ -27,6 +27,7 @@ import { CreateGeneratedReportDto } from './dto/request/create-generated-report.
 import puppeteer, { Browser } from 'puppeteer';
 import { IFile } from '../../interface/file.interface';
 import { ReportTemplate } from '../../enum/report-template.enum';
+import { getDirectory } from 'src/helper/auth.helper';
 
 @Injectable()
 export class DgenService {
@@ -119,6 +120,7 @@ export class DgenService {
     const dmsObject = await this.dmsService.create(
       currentUser,
       generatedDocument,
+      getDirectory(currentUser),
       companyId,
     );
     res.setHeader('x-orbc-dms-id', dmsObject.documentId);
@@ -259,7 +261,7 @@ export class DgenService {
       });
       generatedDocument.size = generatedDocument.buffer.length;
     } catch (err) {
-      console.log("error on pup",err);
+      console.log('error on pup', err);
       throw new InternalServerErrorException(err);
     } finally {
       if (browser) {

backend/dops/src/modules/dms/dms.controller.ts

@@ -36,6 +36,7 @@ import { IUserJWT } from '../../interface/user-jwt.interface';
 import { IDP } from '../../enum/idp.enum';
 import { Roles } from '../../decorator/roles.decorator';
 import { Role } from '../../enum/roles.enum';
+import { getDirectory } from 'src/helper/auth.helper';
 
 @ApiTags('DMS')
 @ApiBadRequestResponse({
@@ -91,6 +92,7 @@ export class DmsController {
     file: Express.Multer.File,
   ): Promise<ReadFileDto> {
     const currentUser = request.user as IUserJWT;
+    const directory = getDirectory(currentUser);
     if (currentUser.identity_provider !== IDP.IDIR && !companyId) {
       throw new BadRequestException(
         'Company Id is manadatory for all IDP but IDIR',
@@ -100,7 +102,12 @@ export class DmsController {
       ? createFileDto.fileName
       : file.originalname;
 
-    return await this.dmsService.create(currentUser, file, companyId);
+    return await this.dmsService.create(
+      currentUser,
+      file,
+      directory,
+      companyId,
+    );
   }
 
   @ApiCreatedResponse({
@@ -136,6 +143,7 @@ export class DmsController {
     file: Express.Multer.File,
   ): Promise<ReadFileDto> {
     const currentUser = request.user as IUserJWT;
+    const directory = getDirectory(currentUser);
     if (currentUser.identity_provider !== IDP.IDIR && !companyId) {
       throw new BadRequestException(
         'Company Id is manadatory for all IDP but IDIR',
@@ -147,6 +155,7 @@ export class DmsController {
 
     return await this.dmsService.update(
       currentUser,
+      directory,
       documentId,
       file,
       companyId,

backend/dops/src/modules/dms/dms.service.ts

@@ -16,6 +16,7 @@ import { S3Service } from '../common/s3.service';
 import { Response } from 'express';
 import { v4 as uuidv4 } from 'uuid';
 import { IDP } from '../../enum/idp.enum';
+import { Directory } from 'src/enum/directory.enum';
 
 @Injectable()
 export class DmsService {
@@ -31,6 +32,7 @@ export class DmsService {
   async create(
     currentUser: IUserJWT,
     file: Express.Multer.File | IFile,
+    directory: Directory,
     companyId?: number,
   ): Promise<ReadFileDto> {
     // eslint-disable-next-line @typescript-eslint/no-unsafe-call
@@ -48,6 +50,14 @@ export class DmsService {
       fileName: file.filename ? file.filename : file.originalname,
       dmsVersionId: dmsVersionId,
       companyId: companyId,
+      createdDateTime: new Date(),
+      createdUser: currentUser.userName,
+      createdUserDirectory: directory,
+      createdUserGuid: currentUser.userGUID,
+      updatedUser: currentUser.userName,
+      updatedDateTime: new Date(),
+      updatedUserGuid: currentUser.userGUID,
+      updatedUserDirectory: directory,
     };
 
     return this.classMapper.mapAsync(
@@ -59,6 +69,7 @@ export class DmsService {
 
   async update(
     currentUser: IUserJWT,
+    directory: Directory,
     documentId: string,
     file: Express.Multer.File,
     companyId?: number,
@@ -86,6 +97,10 @@ export class DmsService {
       fileName: file.filename,
       dmsVersionId: dmsObject.dmsVersionId + 1,
       companyId: companyId,
+      updatedUser: currentUser.userName,
+      updatedDateTime: new Date(),
+      updatedUserGuid: currentUser.userGUID,
+      updatedUserDirectory: directory,
     };
 
     return this.classMapper.mapAsync(

backend/dops/src/modules/dms/dto/base.dto.ts

@@ -2,17 +2,24 @@ import { AutoMap } from '@automapper/classes';
 import { ApiProperty } from '@nestjs/swagger';
 
 export class BaseDto {
-  @AutoMap()
-  @ApiProperty({ example: '1', description: 'Concurrency Control Number' })
-  concurrencyControlNumber: number;
-
   @AutoMap()
   @ApiProperty({
     description: 'Created by',
     example: 'user1',
   })
   createdUser: string;
 
+  @AutoMap()
+  @ApiProperty({ description: 'Created User Directory', example: 'user1' })
+  createdUserDirectory: string;
+
+  @AutoMap()
+  @ApiProperty({
+    description: 'Created User GUID',
+    example: '06267945F2EB4E31B585932F78B76269',
+  })
+  createdUserGuid: string;
+
   @AutoMap()
   @ApiProperty({
     description: 'Created Date and Time',
@@ -26,6 +33,20 @@ export class BaseDto {
   })
   updatedUser: string;
 
+  @AutoMap()
+  @ApiProperty({
+    description: 'Updated User Directory',
+    example: 'user1',
+  })
+  updatedUserDirectory: string;
+
+  @AutoMap()
+  @ApiProperty({
+    description: 'Updated User GUID',
+    example: '06267945F2EB4E31B585932F78B76269',
+  })
+  updatedUserGuid: string;
+
   @AutoMap()
   @ApiProperty({
     description: 'Updated Date and Time',

backend/vehicles/src/common/helper/paginate.ts

@@ -34,7 +34,7 @@ export async function paginate<T, CustomMetaType = IPaginationMeta>(
 }
 
 function resolveOptions(
-  options: IPaginationOptions<any>,
+  options: IPaginationOptions<unknown>,
 ): [number, number, PaginationTypeEnum, boolean, TypeORMCacheType] {
   const page = resolveNumericOption(options, 'page', DEFAULT_PAGE);
   const limit = resolveNumericOption(options, 'limit', DEFAULT_LIMIT);
@@ -48,7 +48,7 @@ function resolveOptions(
 }
 
 function resolveNumericOption(
-  options: IPaginationOptions<any>,
+  options: IPaginationOptions<unknown>,
   key: 'page' | 'limit',
   defaultValue: number,
 ): number {

backend/vehicles/src/common/interface/pagination.interface.ts

@@ -46,7 +46,7 @@ export type TypeORMCacheType =
   | boolean
   | number
   | {
-      id: any;
+      id: unknown;
       milliseconds: number;
     };
 

backend/vehicles/src/modules/common/dto/base.dto.ts

@@ -2,17 +2,24 @@ import { AutoMap } from '@automapper/classes';
 import { ApiProperty } from '@nestjs/swagger';
 
 export class BaseDto {
-  @AutoMap()
-  @ApiProperty({ example: '1', description: 'Concurrency Control Number' })
-  concurrencyControlNumber: number;
-
   @AutoMap()
   @ApiProperty({
     description: 'Created by',
     example: 'user1',
   })
   createdUser: string;
 
+  @AutoMap()
+  @ApiProperty({ description: 'Created User Directory', example: 'user1' })
+  createdUserDirectory: string;
+
+  @AutoMap()
+  @ApiProperty({
+    description: 'Created User GUID',
+    example: '06267945F2EB4E31B585932F78B76269',
+  })
+  createdUserGuid: string;
+
   @AutoMap()
   @ApiProperty({
     description: 'Created Date and Time',
@@ -26,6 +33,20 @@ export class BaseDto {
   })
   updatedUser: string;
 
+  @AutoMap()
+  @ApiProperty({
+    description: 'Updated User Directory',
+    example: 'user1',
+  })
+  updatedUserDirectory: string;
+
+  @AutoMap()
+  @ApiProperty({
+    description: 'Updated User GUID',
+    example: '06267945F2EB4E31B585932F78B76269',
+  })
+  updatedUserGuid: string;
+
   @AutoMap()
   @ApiProperty({
     description: 'Updated Date and Time',

backend/vehicles/src/modules/common/dto/country.dto.ts

@@ -1,8 +1,7 @@
 import { AutoMap } from '@automapper/classes';
 import { ApiProperty } from '@nestjs/swagger';
-import { BaseDto } from './base.dto';
 
-export class CountryDto extends BaseDto {
+export class CountryDto {
   @AutoMap()
   @ApiProperty({
     example: 'CA',

backend/vehicles/src/modules/common/dto/province.dto.ts

@@ -1,9 +1,8 @@
 import { AutoMap } from '@automapper/classes';
 import { ApiProperty } from '@nestjs/swagger';
-import { BaseDto } from './base.dto';
 import { CountryDto } from './country.dto';
 
-export class ProvinceDto extends BaseDto {
+export class ProvinceDto {
   @AutoMap()
   @ApiProperty({ example: 'BC', description: 'Province Code' })
   provinceCode: string;