From 008fe0a515ac44c751e45c9411c2e177b12e5877 Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 27 Oct 2024 11:37:25 +0300 Subject: [PATCH 1/2] changed date string to iso --- .../entities/device-status-log.entity.ts | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/libs/common/src/modules/device-status-log/entities/device-status-log.entity.ts b/libs/common/src/modules/device-status-log/entities/device-status-log.entity.ts index 82307e8..4696baf 100644 --- a/libs/common/src/modules/device-status-log/entities/device-status-log.entity.ts +++ b/libs/common/src/modules/device-status-log/entities/device-status-log.entity.ts @@ -2,13 +2,9 @@ import { SourceType } from '@app/common/constants/source-type.enum'; import { Entity, Column, PrimaryColumn, Index } from 'typeorm'; @Entity('device-status-log') -@Index('logTime_idx', ['eventTime']) +@Index('event_time_idx', ['eventTime']) export class DeviceStatusLogEntity { - @PrimaryColumn({ - type: 'int', - generated: true, - unsigned: true, - }) + @Column({ type: 'int', generated: true, unsigned: true }) id: number; @Column({ type: 'text' }) From ccf3e34fbfab3cac2271ae2756a63b4b7199eddf Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 27 Oct 2024 15:47:39 +0300 Subject: [PATCH 2/2] changed date string to iso --- .../device-status-log/entities/device-status-log.entity.ts | 4 ++-- src/auth/services/user-auth.service.ts | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/libs/common/src/modules/device-status-log/entities/device-status-log.entity.ts b/libs/common/src/modules/device-status-log/entities/device-status-log.entity.ts index 4696baf..a7a998a 100644 --- a/libs/common/src/modules/device-status-log/entities/device-status-log.entity.ts +++ b/libs/common/src/modules/device-status-log/entities/device-status-log.entity.ts @@ -1,8 +1,8 @@ import { SourceType } from '@app/common/constants/source-type.enum'; -import { Entity, Column, PrimaryColumn, Index } from 'typeorm'; +import { Entity, Column, PrimaryColumn, Unique } from 'typeorm'; @Entity('device-status-log') -@Index('event_time_idx', ['eventTime']) +@Unique('event_time_idx', ['eventTime']) export class DeviceStatusLogEntity { @Column({ type: 'int', generated: true, unsigned: true }) id: number; diff --git a/src/auth/services/user-auth.service.ts b/src/auth/services/user-auth.service.ts index 9f9d82d..0c95297 100644 --- a/src/auth/services/user-auth.service.ts +++ b/src/auth/services/user-auth.service.ts @@ -256,11 +256,13 @@ export class UserAuthService { throw new BadRequestException('You entered wrong otp'); } - if (otp.expiryTime < new Date() || fromNewPassword) { + if (otp.expiryTime < new Date()) { await this.otpRepository.delete(otp.uuid); throw new BadRequestException('OTP expired'); } - + if (fromNewPassword) { + await this.otpRepository.delete(otp.uuid); + } if (data.type == OtpType.VERIFICATION) { await this.userRepository.update( { email: data.email },