Merge pull request #218 from SyncrowIOT/SP-1101-investigate-mismatch-between-log-and-column-values

Sp 1101 investigate mismatch between log and column values

libs/common/src/firebase/devices-status/services/devices-status.service.ts

@@ -187,19 +187,19 @@ export class DeviceStatusFirebaseService {
       code,
       value,
     }));
-    const newLog = this.deviceStatusLogRepository.create({
-      deviceId: addDeviceStatusDto.deviceUuid,
-      deviceTuyaId: addDeviceStatusDto.deviceTuyaUuid,
-      productId: addDeviceStatusDto.log.productId,
-      log: addDeviceStatusDto.log,
-      code: existingData.status[0].code,
-      value: existingData.status[0].value,
-      eventId: addDeviceStatusDto.log.dataId,
-      eventTime: new Date(
-        addDeviceStatusDto.log.properties[0].time,
-      ).toISOString(),
+    const newLogs = addDeviceStatusDto.log.properties.map((property) => {
+      return this.deviceStatusLogRepository.create({
+        deviceId: addDeviceStatusDto.deviceUuid,
+        deviceTuyaId: addDeviceStatusDto.deviceTuyaUuid,
+        productId: addDeviceStatusDto.log.productId,
+        log: addDeviceStatusDto.log,
+        code: property.code,
+        value: property.value,
+        eventId: addDeviceStatusDto.log.dataId,
+        eventTime: new Date(property.time).toISOString(),
+      });
     });
-    await this.deviceStatusLogRepository.save(newLog);
+    await this.deviceStatusLogRepository.save(newLogs);
     // Save the updated data to Firebase
     await set(dataRef, existingData);
 

src/invite-user/services/invite-user.service.ts

@@ -9,7 +9,7 @@ import { BaseResponseDto } from '@app/common/dto/base.response.dto';
 import { UserStatusEnum } from '@app/common/constants/user-status.enum';
 import { SuccessResponseDto } from '@app/common/dto/success.response.dto';
 import { generateRandomString } from '@app/common/helper/randomString';
-import { In, IsNull, Not, QueryRunner } from 'typeorm';
+import { EntityManager, In, IsNull, Not, QueryRunner } from 'typeorm';
 import { DataSource } from 'typeorm';
 import { UserEntity } from '@app/common/modules/user/entities';
 import { RoleType } from '@app/common/constants/role.type.enum';
@@ -69,20 +69,27 @@ export class InviteUserService {
       const userRepo = queryRunner.manager.getRepository(UserEntity);
       await this.checkEmailAndProject({ email });
 
-      const user = await userRepo.findOne({
+      const existingUser = await userRepo.findOne({
         where: {
           email,
           project: Not(IsNull()),
         },
       });
 
-      if (user) {
+      if (existingUser) {
         throw new HttpException(
           'User already has a project',
           HttpStatus.BAD_REQUEST,
         );
       }
 
+      // Validate spaces
+      const validSpaces = await this.validateSpaces(
+        spaceUuids,
+        queryRunner.manager,
+      );
+
+      // Create invitation
       const inviteUser = this.inviteUserRepository.create({
         firstName,
         lastName,
@@ -97,30 +104,25 @@ export class InviteUserService {
       });
 
       const invitedUser = await queryRunner.manager.save(inviteUser);
-      const spaceRepo = queryRunner.manager.getRepository(SpaceEntity);
-      const spaces = await spaceRepo.find({
-        where: {
-          uuid: In(spaceUuids),
-        },
-      });
 
-      const spaceNames = spaces.map((space) => space.spaceName);
-
-      const spaceNamesString = spaceNames.join(', ');
-      const spacePromises = spaceUuids.map(async (spaceUuid) => {
+      // Link user to spaces
+      const spacePromises = validSpaces.map(async (space) => {
         const inviteUserSpace = this.inviteUserSpaceRepository.create({
           inviteUser: { uuid: invitedUser.uuid },
-          space: { uuid: spaceUuid },
+          space: { uuid: space.uuid },
         });
         return queryRunner.manager.save(inviteUserSpace);
       });
 
       await Promise.all(spacePromises);
+
+      // Send invitation email
+      const spaceNames = validSpaces.map((space) => space.spaceName).join(', ');
       await this.emailService.sendEmailWithInvitationTemplate(email, {
         name: firstName,
         invitationCode,
         role: roleType,
-        spacesList: spaceNamesString,
+        spacesList: spaceNames,
       });
 
       await queryRunner.commitTransaction();
@@ -147,6 +149,30 @@ export class InviteUserService {
       await queryRunner.release();
     }
   }
+  private async validateSpaces(
+    spaceUuids: string[],
+    entityManager: EntityManager,
+  ): Promise<SpaceEntity[]> {
+    const spaceRepo = entityManager.getRepository(SpaceEntity);
+
+    const validSpaces = await spaceRepo.find({
+      where: { uuid: In(spaceUuids) },
+    });
+
+    if (validSpaces.length !== spaceUuids.length) {
+      const validSpaceUuids = validSpaces.map((space) => space.uuid);
+      const invalidSpaceUuids = spaceUuids.filter(
+        (uuid) => !validSpaceUuids.includes(uuid),
+      );
+      throw new HttpException(
+        `Invalid space UUIDs: ${invalidSpaceUuids.join(', ')}`,
+        HttpStatus.BAD_REQUEST,
+      );
+    }
+
+    return validSpaces;
+  }
+
   async checkEmailAndProject(dto: CheckEmailDto): Promise<BaseResponseDto> {
     const { email } = dto;