Merge branch 'dev' into aqi-test

libs/common/src/modules/device-status-log/entities/device-status-log.entity.ts

@@ -2,15 +2,15 @@ import { SourceType } from '@app/common/constants/source-type.enum';
 import { Entity, Column, PrimaryColumn, Unique } from 'typeorm';
 
 @Entity('device-status-log')
-@Unique('event_time_idx', ['eventTime'])
+@Unique('event_time_idx', ['eventTime', 'deviceId', 'code', 'value'])
 export class DeviceStatusLogEntity {
-  @Column({ type: 'int', generated: true, unsigned: true })
+  @PrimaryColumn({ type: 'int', generated: true, unsigned: true })
   id: number;
 
   @Column({ type: 'text' })
   eventId: string;
 
-  @PrimaryColumn({ type: 'timestamptz' })
+  @Column({ type: 'timestamptz' })
   eventTime: Date;
 
   @Column({

libs/common/src/modules/role-type/entities/role.type.entity.ts

@@ -12,6 +12,7 @@ export class RoleTypeEntity extends AbstractEntity<RoleTypeDto> {
     nullable: false,
     enum: Object.values(RoleType),
   })
+  // why is this ts-type string not enum?
   type: string;
   @OneToMany(() => UserEntity, (inviteUser) => inviteUser.roleType, {
     nullable: true,