Merge pull request #91 from SyncrowIOT/SP-431-be-add-authorizer-and-authorizer-date-columns

Sp 431 be add authorizer and authorizer date columns

libs/common/src/database/database.module.ts

@@ -18,6 +18,7 @@ import { UserNotificationEntity } from '../modules/user/entities';
 import { DeviceNotificationEntity } from '../modules/device/entities';
 import { RegionEntity } from '../modules/region/entities';
 import { TimeZoneEntity } from '../modules/timezone/entities';
+import { VisitorPasswordEntity } from '../modules/visitor-password/entities';
 
 @Module({
   imports: [
@@ -50,6 +51,7 @@ import { TimeZoneEntity } from '../modules/timezone/entities';
           DeviceNotificationEntity,
           RegionEntity,
           TimeZoneEntity,
+          VisitorPasswordEntity,
         ],
         namingStrategy: new SnakeNamingStrategy(),
         synchronize: Boolean(JSON.parse(configService.get('DB_SYNC'))),

libs/common/src/modules/user/entities/user.entity.ts

@@ -25,6 +25,7 @@ import { TimeZoneEntity } from '../../timezone/entities';
 import { OtpType } from '../../../../src/constants/otp-type.enum';
 import { RoleTypeEntity } from '../../role-type/entities';
 import { SpaceEntity } from '../../space/entities';
+import { VisitorPasswordEntity } from '../../visitor-password/entities';
 
 @Entity({ name: 'user' })
 export class UserEntity extends AbstractEntity<UserDto> {
@@ -109,6 +110,11 @@ export class UserEntity extends AbstractEntity<UserDto> {
     nullable: true,
   })
   timezone: TimeZoneEntity;
+  @OneToMany(
+    () => VisitorPasswordEntity,
+    (visitorPassword) => visitorPassword.user,
+  )
+  public visitorPasswords: VisitorPasswordEntity[];
   constructor(partial: Partial<UserEntity>) {
     super();
     Object.assign(this, partial);

libs/common/src/modules/visitor-password/dtos/index.ts

@@ -0,0 +1 @@
+export * from './visitor-password.dto';

libs/common/src/modules/visitor-password/dtos/visitor-password.dto.ts

@@ -0,0 +1,15 @@
+import { IsNotEmpty, IsString } from 'class-validator';
+
+export class VisitorPasswordDto {
+  @IsString()
+  @IsNotEmpty()
+  public uuid: string;
+
+  @IsString()
+  @IsNotEmpty()
+  public authorizerUuid: string;
+
+  @IsString()
+  @IsNotEmpty()
+  public passwordTuyaUuid: string;
+}

libs/common/src/modules/visitor-password/entities/index.ts

@@ -0,0 +1 @@
+export * from './visitor-password.entity';

libs/common/src/modules/visitor-password/entities/visitor-password.entity.ts

@@ -0,0 +1,25 @@
+import { Column, Entity, ManyToOne, JoinColumn, Index } from 'typeorm';
+import { VisitorPasswordDto } from '../dtos';
+import { AbstractEntity } from '../../abstract/entities/abstract.entity';
+import { UserEntity } from '../../user/entities/user.entity';
+
+@Entity({ name: 'visitor-password' })
+@Index('IDX_PASSWORD_TUYA_UUID', ['passwordTuyaUuid'])
+export class VisitorPasswordEntity extends AbstractEntity<VisitorPasswordDto> {
+  @Column({
+    nullable: false,
+    unique: true,
+  })
+  public passwordTuyaUuid: string;
+
+  @ManyToOne(() => UserEntity, (user) => user.visitorPasswords, {
+    nullable: false,
+  })
+  @JoinColumn({ name: 'authorizer_uuid' })
+  public user: UserEntity;
+
+  constructor(partial: Partial<VisitorPasswordEntity>) {
+    super();
+    Object.assign(this, partial);
+  }
+}

libs/common/src/modules/visitor-password/repositories/index.ts

@@ -0,0 +1 @@
+export * from './visitor-password.repository';

libs/common/src/modules/visitor-password/repositories/visitor-password.repository.ts

@@ -0,0 +1,10 @@
+import { DataSource, Repository } from 'typeorm';
+import { Injectable } from '@nestjs/common';
+import { VisitorPasswordEntity } from '../entities/visitor-password.entity';
+
+@Injectable()
+export class VisitorPasswordRepository extends Repository<VisitorPasswordEntity> {
+  constructor(private dataSource: DataSource) {
+    super(VisitorPasswordEntity, dataSource.createEntityManager());
+  }
+}

libs/common/src/modules/visitor-password/visitor-password.repository.module.ts

@@ -0,0 +1,11 @@
+import { Module } from '@nestjs/common';
+import { TypeOrmModule } from '@nestjs/typeorm';
+import { VisitorPasswordEntity } from './entities/visitor-password.entity';
+
+@Module({
+  providers: [],
+  exports: [],
+  controllers: [],
+  imports: [TypeOrmModule.forFeature([VisitorPasswordEntity])],
+})
+export class VisitorPasswordRepositoryModule {}

src/door-lock/door.lock.module.ts

@@ -5,10 +5,24 @@ import { ConfigModule } from '@nestjs/config';
 import { DeviceRepositoryModule } from '@app/common/modules/device';
 import { DeviceRepository } from '@app/common/modules/device/repositories';
 import { PasswordEncryptionService } from './services/encryption.services';
+import { VisitorPasswordRepository } from '@app/common/modules/visitor-password/repositories';
+import { DeviceService } from 'src/device/services';
+import { ProductRepository } from '@app/common/modules/product/repositories';
+import { DeviceStatusFirebaseService } from '@app/common/firebase/devices-status/services/devices-status.service';
+import { SpaceRepository } from '@app/common/modules/space/repositories';
 @Module({
   imports: [ConfigModule, DeviceRepositoryModule],
   controllers: [DoorLockController],
-  providers: [DoorLockService, PasswordEncryptionService, DeviceRepository],
+  providers: [
+    DoorLockService,
+    PasswordEncryptionService,
+    DeviceRepository,
+    VisitorPasswordRepository,
+    DeviceService,
+    ProductRepository,
+    DeviceStatusFirebaseService,
+    SpaceRepository,
+  ],
   exports: [DoorLockService],
 })
 export class DoorLockModule {}

src/door-lock/services/door.lock.service.ts

@@ -22,6 +22,8 @@ import { AddDoorLockOfflineTempMultipleTimeDto } from '../dtos/add.offline-temp.
 import { convertKeysToCamelCase } from '@app/common/helper/camelCaseConverter';
 import { UpdateDoorLockOfflineTempDto } from '../dtos/update.offline-temp.dto';
 import { defaultDoorLockPass } from '@app/common/constants/default.door-lock-pass';
+import { VisitorPasswordRepository } from '@app/common/modules/visitor-password/repositories';
+import { DeviceService } from 'src/device/services';
 
 @Injectable()
 export class DoorLockService {
@@ -29,7 +31,9 @@ export class DoorLockService {
   constructor(
     private readonly configService: ConfigService,
     private readonly deviceRepository: DeviceRepository,
+    private readonly deviceService: DeviceService,
     private readonly passwordEncryptionService: PasswordEncryptionService,
+    private readonly visitorPasswordRepository: VisitorPasswordRepository,
   ) {
     const accessKey = this.configService.get<string>('auth-config.ACCESS_KEY');
     const secretKey = this.configService.get<string>('auth-config.SECRET_KEY');
@@ -105,6 +109,10 @@ export class DoorLockService {
           HttpStatus.BAD_REQUEST,
         );
       }
+      const deviceTuyaDetails =
+        await this.deviceService.getDeviceDetailsByDeviceIdTuya(
+          deviceDetails.deviceTuyaUuid,
+        );
       const passwords = await this.getTemporaryOfflinePasswordsTuya(
         deviceDetails.deviceTuyaUuid,
         'multiple',
@@ -115,7 +123,12 @@ export class DoorLockService {
       }
       if (passwords.result.records.length > 0) {
         return fromVisitor
-          ? convertKeysToCamelCase(passwords.result.records).map((password) => {
+          ? Promise.all(
+              convertKeysToCamelCase(passwords.result.records).map(
+                async (password) => {
+                  const passwordFromDB = await this.getVisitorPasswordFromDB(
+                    password.pwdId,
+                  );
                   const timestampInSeconds = Math.floor(Date.now() / 1000);
                   return {
                     passwordId: `${password.pwdId}`,
@@ -125,13 +138,22 @@ export class DoorLockService {
                     createdTime: password.pwdName,
                     passwordType: 'OFFLINE_MULTIPLE',
                     deviceUuid: doorLockUuid,
+                    deviceName: deviceTuyaDetails.name,
                     passwordStatus: isExpired
                       ? 'EXPIRED'
                       : timestampInSeconds > password.effectiveTime
                         ? 'EFFECTIVE'
                         : 'TO_BE_EFFECTIVE',
+                    authorizerEmail: passwordFromDB
+                      ? passwordFromDB.user.email
+                      : 'OTHER',
+                    authorizerDate: passwordFromDB
+                      ? `${Math.floor(new Date(passwordFromDB.createdAt).getTime() / 1000)}`
+                      : '',
                   };
-            })
+                },
+              ),
+            )
           : convertKeysToCamelCase(passwords.result.records);
       }
       return passwords;
@@ -158,6 +180,10 @@ export class DoorLockService {
           HttpStatus.BAD_REQUEST,
         );
       }
+      const deviceTuyaDetails =
+        await this.deviceService.getDeviceDetailsByDeviceIdTuya(
+          deviceDetails.deviceTuyaUuid,
+        );
       const passwords = await this.getTemporaryOfflinePasswordsTuya(
         deviceDetails.deviceTuyaUuid,
         'once',
@@ -168,7 +194,13 @@ export class DoorLockService {
       }
       if (passwords.result.records.length > 0) {
         return fromVisitor
-          ? convertKeysToCamelCase(passwords.result.records).map((password) => {
+          ? Promise.all(
+              convertKeysToCamelCase(passwords.result.records).map(
+                async (password) => {
+                  const passwordFromDB = await this.getVisitorPasswordFromDB(
+                    password.pwdId,
+                  );
+
                   const timestampInSeconds = Math.floor(Date.now() / 1000);
                   return {
                     passwordId: `${password.pwdId}`,
@@ -178,13 +210,22 @@ export class DoorLockService {
                     passwordName: password.pwdName,
                     passwordType: 'OFFLINE_ONETIME',
                     deviceUuid: doorLockUuid,
+                    deviceName: deviceTuyaDetails.name,
                     passwordStatus: isExpired
                       ? 'EXPIRED'
                       : timestampInSeconds > password.gmtStart
                         ? 'EFFECTIVE'
                         : 'TO_BE_EFFECTIVE',
+                    authorizerEmail: passwordFromDB
+                      ? passwordFromDB.user.email
+                      : 'OTHER',
+                    authorizerDate: passwordFromDB
+                      ? `${Math.floor(new Date(passwordFromDB.createdAt).getTime() / 1000)}`
+                      : '',
                   };
-            })
+                },
+              ),
+            )
           : convertKeysToCamelCase(passwords.result.records);
       }
 
@@ -212,6 +253,10 @@ export class DoorLockService {
           HttpStatus.BAD_REQUEST,
         );
       }
+      const deviceTuyaDetails =
+        await this.deviceService.getDeviceDetailsByDeviceIdTuya(
+          deviceDetails.deviceTuyaUuid,
+        );
       const passwords = await this.getOnlineTemporaryPasswordsMultipleTuya(
         deviceDetails.deviceTuyaUuid,
         isExpired,
@@ -240,7 +285,11 @@ export class DoorLockService {
           });
 
         return fromVisitor
-          ? convertKeysToCamelCase(passwordFiltered).map((password) => {
+          ? Promise.all(
+              convertKeysToCamelCase(passwordFiltered).map(async (password) => {
+                const passwordFromDB = await this.getVisitorPasswordFromDB(
+                  password.id,
+                );
                 const timestampInSeconds = Math.floor(Date.now() / 1000);
                 return {
                   passwordId: `${password.id}`,
@@ -251,13 +300,21 @@ export class DoorLockService {
                   passwordName: password.name,
                   passwordType: 'ONLINE_MULTIPLE',
                   deviceUuid: doorLockUuid,
+                  deviceName: deviceTuyaDetails.name,
                   passwordStatus: isExpired
                     ? 'EXPIRED'
                     : timestampInSeconds > password.effectiveTime
                       ? 'EFFECTIVE'
                       : 'TO_BE_EFFECTIVE',
+                  authorizerEmail: passwordFromDB
+                    ? passwordFromDB.user.email
+                    : 'OTHER',
+                  authorizerDate: passwordFromDB
+                    ? `${Math.floor(new Date(passwordFromDB.createdAt).getTime() / 1000)}`
+                    : '',
                 };
-            })
+              }),
+            )
           : convertKeysToCamelCase(passwordFiltered);
       }
       if (fromVisitor) {
@@ -271,12 +328,34 @@ export class DoorLockService {
       );
     }
   }
+  async getVisitorPasswordFromDB(passwordId: string) {
+    try {
+      return await this.visitorPasswordRepository.findOne({
+        where: {
+          passwordTuyaUuid: passwordId,
+        },
+        relations: ['user'],
+        select: {
+          user: {
+            email: true,
+          },
+        },
+      });
+    } catch (error) {
+      throw new HttpException(
+        error.message || 'Error retrieving visitor password from database',
+        error.status || HttpStatus.INTERNAL_SERVER_ERROR,
+      );
+    }
+  }
+
   async getOnlineTemporaryPasswordsOneTime(
     doorLockUuid: string,
     fromVisitor?: boolean,
     isExpired?: boolean,
   ) {
     try {
+      // Retrieve device details
       const deviceDetails = await this.getDeviceByDeviceUuid(doorLockUuid);
 
       if (!deviceDetails || !deviceDetails.deviceTuyaUuid) {
@@ -287,11 +366,17 @@ export class DoorLockService {
           HttpStatus.BAD_REQUEST,
         );
       }
+      const deviceTuyaDetails =
+        await this.deviceService.getDeviceDetailsByDeviceIdTuya(
+          deviceDetails.deviceTuyaUuid,
+        );
+      // Get online temporary passwords
       const passwords = await this.getOnlineTemporaryPasswordsMultipleTuya(
         deviceDetails.deviceTuyaUuid,
         isExpired,
       );
       if (passwords.result?.length > 0) {
+        // Filter and map the passwords
         const passwordFiltered = passwords.result
           .filter((item) => item.type === 1)
           .map((password: any) => {
@@ -314,8 +399,13 @@ export class DoorLockService {
             return password;
           });
 
+        // Process passwords with optimized query handling
         return fromVisitor
-          ? convertKeysToCamelCase(passwordFiltered).map((password) => {
+          ? Promise.all(
+              convertKeysToCamelCase(passwordFiltered).map(async (password) => {
+                const passwordFromDB = await this.getVisitorPasswordFromDB(
+                  password.id,
+                );
                 const timestampInSeconds = Math.floor(Date.now() / 1000);
                 return {
                   passwordId: `${password.id}`,
@@ -325,13 +415,21 @@ export class DoorLockService {
                   passwordName: password.name,
                   passwordType: 'ONLINE_ONETIME',
                   deviceUuid: doorLockUuid,
+                  deviceName: deviceTuyaDetails.name,
                   passwordStatus: isExpired
                     ? 'EXPIRED'
                     : timestampInSeconds > password.effectiveTime
                       ? 'EFFECTIVE'
                       : 'TO_BE_EFFECTIVE',
+                  authorizerEmail: passwordFromDB
+                    ? passwordFromDB.user.email
+                    : 'OTHER',
+                  authorizerDate: passwordFromDB
+                    ? `${Math.floor(new Date(passwordFromDB.createdAt).getTime() / 1000)}`
+                    : '',
                 };
-            })
+              }),
+            )
           : convertKeysToCamelCase(passwordFiltered);
       }
       if (fromVisitor) {

src/vistor-password/controllers/visitor-password.controller.ts

@@ -7,6 +7,7 @@ import {
   HttpStatus,
   UseGuards,
   Get,
+  Req,
 } from '@nestjs/common';
 import { ApiTags, ApiBearerAuth } from '@nestjs/swagger';
 import {
@@ -31,11 +32,14 @@ export class VisitorPasswordController {
   @Post('temporary-password/online/multiple-time')
   async addOnlineTemporaryPasswordMultipleTime(
     @Body() addDoorLockOnlineMultipleDto: AddDoorLockOnlineMultipleDto,
+    @Req() req: any,
   ) {
     try {
+      const userUuid = req.user.uuid;
       const temporaryPasswords =
         await this.visitorPasswordService.addOnlineTemporaryPasswordMultipleTime(
           addDoorLockOnlineMultipleDto,
+          userUuid,
         );
 
       return {
@@ -54,11 +58,14 @@ export class VisitorPasswordController {
   @Post('temporary-password/online/one-time')
   async addOnlineTemporaryPassword(
     @Body() addDoorLockOnlineOneTimeDto: AddDoorLockOnlineOneTimeDto,
+    @Req() req: any,
   ) {
     try {
+      const userUuid = req.user.uuid;
       const temporaryPasswords =
         await this.visitorPasswordService.addOnlineTemporaryPasswordOneTime(
           addDoorLockOnlineOneTimeDto,
+          userUuid,
         );
 
       return {
@@ -77,11 +84,14 @@ export class VisitorPasswordController {
   @Post('temporary-password/offline/one-time')
   async addOfflineOneTimeTemporaryPassword(
     @Body() addDoorLockOfflineOneTimeDto: AddDoorLockOfflineOneTimeDto,
+    @Req() req: any,
   ) {
     try {
+      const userUuid = req.user.uuid;
       const temporaryPassword =
         await this.visitorPasswordService.addOfflineOneTimeTemporaryPassword(
           addDoorLockOfflineOneTimeDto,
+          userUuid,
         );
 
       return {
@@ -101,11 +111,14 @@ export class VisitorPasswordController {
   async addOfflineMultipleTimeTemporaryPassword(
     @Body()
     addDoorLockOfflineMultipleDto: AddDoorLockOfflineMultipleDto,
+    @Req() req: any,
   ) {
     try {
+      const userUuid = req.user.uuid;
       const temporaryPassword =
         await this.visitorPasswordService.addOfflineMultipleTimeTemporaryPassword(
           addDoorLockOfflineMultipleDto,
+          userUuid,
         );
 
       return {

src/vistor-password/services/visitor-password.service.ts

@@ -1,3 +1,4 @@
+import { VisitorPasswordRepository } from './../../../libs/common/src/modules/visitor-password/repositories/visitor-password.repository';
 import { Injectable, HttpException, HttpStatus } from '@nestjs/common';
 import { TuyaContext } from '@tuya/tuya-connector-nodejs';
 import { ConfigService } from '@nestjs/config';
@@ -26,6 +27,7 @@ export class VisitorPasswordService {
   constructor(
     private readonly configService: ConfigService,
     private readonly deviceRepository: DeviceRepository,
+    private readonly visitorPasswordRepository: VisitorPasswordRepository,
     private readonly emailService: EmailService,
     private readonly doorLockService: DoorLockService,
     private readonly deviceService: DeviceService,
@@ -43,6 +45,7 @@ export class VisitorPasswordService {
 
   async addOfflineMultipleTimeTemporaryPassword(
     addDoorLockOfflineMultipleDto: AddDoorLockOfflineMultipleDto,
+    userUuid: string,
   ) {
     try {
       const deviceResults = await Promise.allSettled(
@@ -87,7 +90,14 @@ export class VisitorPasswordService {
                 emailBody,
               );
             }
-
+            if (createMultipleOfflinePass.result.offline_temp_password_id) {
+              await this.visitorPasswordRepository.save({
+                passwordTuyaUuid: `${createMultipleOfflinePass.result.offline_temp_password_id}`,
+                user: {
+                  uuid: userUuid,
+                },
+              });
+            }
             return {
               success: true,
               result: createMultipleOfflinePass.result,
@@ -156,6 +166,7 @@ export class VisitorPasswordService {
 
   async addOfflineOneTimeTemporaryPassword(
     addDoorLockOfflineOneTimeDto: AddDoorLockOfflineOneTimeDto,
+    userUuid: string,
   ) {
     try {
       const deviceResults = await Promise.allSettled(
@@ -200,7 +211,14 @@ export class VisitorPasswordService {
                 emailBody,
               );
             }
-
+            if (createOnceOfflinePass.result.offline_temp_password_id) {
+              await this.visitorPasswordRepository.save({
+                passwordTuyaUuid: `${createOnceOfflinePass.result.offline_temp_password_id}`,
+                user: {
+                  uuid: userUuid,
+                },
+              });
+            }
             return {
               success: true,
               result: createOnceOfflinePass.result,
@@ -299,6 +317,7 @@ export class VisitorPasswordService {
   }
   async addOnlineTemporaryPasswordMultipleTime(
     addDoorLockOnlineMultipleDto: AddDoorLockOnlineMultipleDto,
+    userUuid: string,
   ) {
     try {
       const deviceResults = await Promise.allSettled(
@@ -343,7 +362,14 @@ export class VisitorPasswordService {
                 emailBody,
               );
             }
-
+            if (createPass.result.id) {
+              await this.visitorPasswordRepository.save({
+                passwordTuyaUuid: `${createPass.result.id}`,
+                user: {
+                  uuid: userUuid,
+                },
+              });
+            }
             return {
               success: true,
               id: createPass.result.id,
@@ -431,18 +457,18 @@ export class VisitorPasswordService {
         this.doorLockService
           .getOnlineTemporaryPasswordsMultiple(deviceId.uuid, true, true)
           .catch(() => {}),
-        this.doorLockService
-          .getOfflineOneTimeTemporaryPasswords(deviceId.uuid, true, true)
-          .catch(() => {}),
         this.doorLockService
           .getOfflineOneTimeTemporaryPasswords(deviceId.uuid, true, false)
           .catch(() => {}),
         this.doorLockService
-          .getOfflineMultipleTimeTemporaryPasswords(deviceId.uuid, true, true)
+          .getOfflineOneTimeTemporaryPasswords(deviceId.uuid, true, true)
           .catch(() => {}),
         this.doorLockService
           .getOfflineMultipleTimeTemporaryPasswords(deviceId.uuid, true, false)
           .catch(() => {}),
+        this.doorLockService
+          .getOfflineMultipleTimeTemporaryPasswords(deviceId.uuid, true, true)
+          .catch(() => {}),
       );
     });
     return (await Promise.all(data)).flat().filter((datum) => {
@@ -476,6 +502,7 @@ export class VisitorPasswordService {
 
   async addOnlineTemporaryPasswordOneTime(
     addDoorLockOnlineOneTimeDto: AddDoorLockOnlineOneTimeDto,
+    userUuid: string,
   ) {
     try {
       const deviceResults = await Promise.allSettled(
@@ -519,7 +546,14 @@ export class VisitorPasswordService {
                 emailBody,
               );
             }
-
+            if (createPass.result.id) {
+              await this.visitorPasswordRepository.save({
+                passwordTuyaUuid: `${createPass.result.id}`,
+                user: {
+                  uuid: userUuid,
+                },
+              });
+            }
             return {
               success: true,
               id: createPass.result.id,

src/vistor-password/visitor-password.module.ts

@@ -11,6 +11,7 @@ import { DeviceService } from 'src/device/services';
 import { ProductRepository } from '@app/common/modules/product/repositories';
 import { DeviceStatusFirebaseService } from '@app/common/firebase/devices-status/services/devices-status.service';
 import { SpaceRepository } from '@app/common/modules/space/repositories';
+import { VisitorPasswordRepository } from '@app/common/modules/visitor-password/repositories';
 @Module({
   imports: [ConfigModule, DeviceRepositoryModule, DoorLockModule],
   controllers: [VisitorPasswordController],
@@ -23,6 +24,7 @@ import { SpaceRepository } from '@app/common/modules/space/repositories';
     DeviceStatusFirebaseService,
     SpaceRepository,
     DeviceRepository,
+    VisitorPasswordRepository,
   ],
   exports: [VisitorPasswordService],
 })