Merge pull request #378 from andrechristikan/development

Development

Author: andrechristikan

package.json

@@ -52,20 +52,20 @@
     "rollback": "yarn rollback:setting && yarn rollback:apikey && yarn rollback:user && yarn rollback:role && yarn rollback:permission"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.262.0",
+    "@aws-sdk/client-s3": "^3.264.0",
     "@faker-js/faker": "^7.6.0",
     "@joi/date": "^2.1.0",
-    "@nestjs/axios": "^1.0.1",
+    "@nestjs/axios": "^2.0.0",
     "@nestjs/common": "^9.2.1",
-    "@nestjs/config": "^2.2.0",
+    "@nestjs/config": "^2.3.0",
     "@nestjs/core": "^9.2.1",
     "@nestjs/jwt": "^10.0.1",
     "@nestjs/mongoose": "^9.2.1",
-    "@nestjs/passport": "^9.0.0",
+    "@nestjs/passport": "^9.0.1",
     "@nestjs/platform-express": "^9.2.1",
-    "@nestjs/schedule": "^2.1.0",
+    "@nestjs/schedule": "^2.2.0",
     "@nestjs/swagger": "^6.1.4",
-    "@nestjs/terminus": "^9.1.4",
+    "@nestjs/terminus": "^9.2.0",
     "@types/response-time": "^2.3.5",
     "bcryptjs": "^2.4.3",
     "class-transformer": "^0.5.1",
@@ -97,7 +97,7 @@
     "yarn": "^1.22.19"
   },
   "devDependencies": {
-    "@nestjs/cli": "^9.1.9",
+    "@nestjs/cli": "^9.2.0",
     "@nestjs/schematics": "^9.0.4",
     "@nestjs/testing": "^9.2.1",
     "@types/bcryptjs": "^2.4.2",
@@ -119,7 +119,7 @@
     "@types/uuid": "^9.0.0",
     "@typescript-eslint/eslint-plugin": "^5.50.0",
     "@typescript-eslint/parser": "^5.50.0",
-    "cspell": "^6.19.2",
+    "cspell": "^6.21.0",
     "eslint": "^8.33.0",
     "eslint-config-prettier": "^8.6.0",
     "eslint-plugin-import": "^2.27.5",

src/common/auth/interfaces/auth.interface.ts

@@ -3,6 +3,7 @@ export interface IAuthPassword {
     salt: string;
     passwordHash: string;
     passwordExpired: Date;
+    passwordCreated: Date;
 }
 
 export interface IAuthPayloadOptions {

src/common/auth/services/auth.service.ts

@@ -315,10 +315,12 @@ export class AuthService implements IAuthService {
         const passwordExpired: Date = this.helperDateService.forwardInSeconds(
             this.passwordExpiredIn
         );
+        const passwordCreated: Date = this.helperDateService.create();
         const passwordHash = this.helperHashService.bcrypt(password, salt);
         return {
             passwordHash,
             passwordExpired,
+            passwordCreated,
             salt,
         };
     }

src/common/dashboard/dashboard.module.ts

@@ -0,0 +1,10 @@
+import { Module } from '@nestjs/common';
+import { DashboardService } from 'src/common/dashboard/services/dashboard.service';
+
+@Module({
+    controllers: [],
+    providers: [DashboardService],
+    exports: [DashboardService],
+    imports: [],
+})
+export class DashboardModule {}

src/common/dashboard/dtos/dashboard.ts

@@ -0,0 +1,18 @@
+import { Type } from 'class-transformer';
+import { IsDate, IsOptional, ValidateIf } from 'class-validator';
+import { MinGreaterThan } from 'src/common/request/validations/request.min-greater-than.validation';
+
+export class DashboardDto {
+    @IsDate()
+    @IsOptional()
+    @Type(() => Date)
+    @ValidateIf((e) => e.startDate !== '' || e.endDate !== '')
+    startDate?: Date;
+
+    @IsDate()
+    @IsOptional()
+    @MinGreaterThan('startDate')
+    @Type(() => Date)
+    @ValidateIf((e) => e.startDate !== '' || e.endDate !== '')
+    endDate?: Date;
+}

src/common/dashboard/interfaces/dashboard.interface.ts

@@ -0,0 +1,18 @@
+export interface IDashboardStartAndEndDate {
+    startDate: Date;
+    endDate: Date;
+}
+
+export interface IDashboardStartAndEndYear {
+    startYear: number;
+    endYear: number;
+}
+
+export interface IDashboardStartAndEnd {
+    month: number;
+    year: number;
+}
+
+export interface IDashboardMonthAndYear extends Partial<IDashboardStartAndEnd> {
+    total: number;
+}

src/common/dashboard/interfaces/dashboard.service.interface.ts

@@ -0,0 +1,22 @@
+import { DashboardDto } from 'src/common/dashboard/dtos/dashboard';
+import {
+    IDashboardStartAndEnd,
+    IDashboardStartAndEndDate,
+    IDashboardStartAndEndYear,
+} from 'src/common/dashboard/interfaces/dashboard.interface';
+
+export interface IDashboardService {
+    getStartAndEndDate(date: DashboardDto): Promise<IDashboardStartAndEndDate>;
+
+    getMonths(): Promise<number[]>;
+
+    getStartAndEndYear({
+        startDate,
+        endDate,
+    }: IDashboardStartAndEndDate): Promise<IDashboardStartAndEndYear>;
+
+    getStartAndEndMonth({
+        month,
+        year,
+    }: IDashboardStartAndEnd): Promise<IDashboardStartAndEndDate>;
+}

src/common/dashboard/services/dashboard.service.ts

@@ -0,0 +1,73 @@
+import { DashboardDto } from 'src/common/dashboard/dtos/dashboard';
+import {
+    IDashboardStartAndEnd,
+    IDashboardStartAndEndDate,
+    IDashboardStartAndEndYear,
+} from 'src/common/dashboard/interfaces/dashboard.interface';
+import { IDashboardService } from 'src/common/dashboard/interfaces/dashboard.service.interface';
+import { HelperDateService } from 'src/common/helper/services/helper.date.service';
+
+export class DashboardService implements IDashboardService {
+    constructor(private readonly helperDateService: HelperDateService) {}
+
+    async getStartAndEndDate(
+        date: DashboardDto
+    ): Promise<IDashboardStartAndEndDate> {
+        const today = this.helperDateService.create();
+        let { startDate, endDate } = date;
+
+        if (!startDate && !endDate) {
+            startDate = this.helperDateService.startOfYear(today);
+            endDate = this.helperDateService.endOfYear(today);
+        } else {
+            if (!startDate) {
+                startDate = this.helperDateService.startOfDay();
+            } else {
+                startDate = this.helperDateService.startOfDay(startDate);
+            }
+
+            if (!endDate) {
+                endDate = this.helperDateService.endOfDay();
+            } else {
+                endDate = this.helperDateService.endOfDay(endDate);
+            }
+        }
+
+        return {
+            startDate,
+            endDate,
+        };
+    }
+
+    async getMonths(): Promise<number[]> {
+        return [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12];
+    }
+
+    async getStartAndEndYear({
+        startDate,
+        endDate,
+    }: IDashboardStartAndEndDate): Promise<IDashboardStartAndEndYear> {
+        return {
+            startYear: startDate.getFullYear(),
+            endYear: endDate.getFullYear(),
+        };
+    }
+
+    async getStartAndEndMonth({
+        month,
+        year,
+    }: IDashboardStartAndEnd): Promise<IDashboardStartAndEndDate> {
+        const monthString = `${month}`.padStart(2, '0');
+        const date: Date = this.helperDateService.create(
+            `${year}-${monthString}-01`
+        );
+
+        const startDate = this.helperDateService.startOfMonth(date);
+        const endDate = this.helperDateService.endOfMonth(date);
+
+        return {
+            startDate,
+            endDate,
+        };
+    }
+}

src/common/file/constants/file.constant.ts

@@ -1,2 +1,2 @@
-export const FILE_CUSTOM_SIZE_META_KEY = 'FileCustomSizeMetaKey';
+export const FILE_CUSTOM_MAX_SIZE_META_KEY = 'FileCustomMaxSizeMetaKey';
 export const FILE_CUSTOM_MAX_FILES_META_KEY = 'FileCustomMaxFilesMetaKey';

src/common/file/decorators/file.decorator.ts

@@ -8,10 +8,10 @@ import {
 import { FileInterceptor, FilesInterceptor } from '@nestjs/platform-express';
 import {
     FILE_CUSTOM_MAX_FILES_META_KEY,
-    FILE_CUSTOM_SIZE_META_KEY,
+    FILE_CUSTOM_MAX_SIZE_META_KEY,
 } from 'src/common/file/constants/file.constant';
 import { FileCustomMaxFilesInterceptor } from 'src/common/file/interceptors/file.custom-max-files.interceptor';
-import { FileCustomSizeInterceptor } from 'src/common/file/interceptors/file.custom-size.interceptor';
+import { FileCustomMaxSizeInterceptor } from 'src/common/file/interceptors/file.custom-max-size.interceptor';
 import { IRequestApp } from 'src/common/request/interfaces/request.interface';
 
 export function UploadFileSingle(field: string): MethodDecorator {
@@ -29,10 +29,10 @@ export function FileCustomMaxFile(customMaxFiles: number): MethodDecorator {
     );
 }
 
-export function FileCustomSize(customSize: string): MethodDecorator {
+export function FileCustomMaxSize(customMaxSize: string): MethodDecorator {
     return applyDecorators(
-        UseInterceptors(FileCustomSizeInterceptor),
-        SetMetadata(FILE_CUSTOM_SIZE_META_KEY, customSize)
+        UseInterceptors(FileCustomMaxSizeInterceptor),
+        SetMetadata(FILE_CUSTOM_MAX_SIZE_META_KEY, customMaxSize)
     );
 }