update

src/room/actions/actions.service.ts

@@ -127,7 +127,7 @@ export class ActionsService {
     if (data) {
       const roomId = socket.data.user.RoomId || '';
       const userId = data.userId;
-      await this.roomService.handleKickAction(roomId, userId);
+      await this.roomService.handleSetRoomAssitant(socket, roomId, userId);
     }
   }
 }

src/room/room.service.ts

@@ -41,6 +41,7 @@ export class RoomService {
       JoinTime: Date.now(),
       InTime: Date.now(),
       IsOnline: true,
+      IsAssistant: false,
     };
     return data;
   }
@@ -357,11 +358,12 @@ export class RoomService {
     socket: Socket,
     roomId: string,
     userId: string,
-    status: boolean,
   ): Promise<boolean> {
     const assistant = await this.userService.getUsersBy(roomId, userId);
-    assistant.IsOnline = status;
-    const updated = await this.userService.updateUsers(assistant);
+    assistant.IsAssistant = !assistant.IsAssistant;
+    const data = assistant;
+    console.log('update-assistant', data);
+    const updated = await this.userService.updateUsers(data);
     if (updated) {
       this.handleRoomStatusAction(socket);
     }

src/room/user.d.ts

@@ -12,6 +12,7 @@ interface UserInfoType {
   InTime?: Timestamp;
   Order?: number;
   IsOnline?: boolean;
+  IsAssistant: boolean;
 }
 
 interface UserInfoParams {

src/room/users/users.service.ts

@@ -10,7 +10,7 @@ export class UsersService {
     @InjectRedis() private readonly redis: Redis,
     @Inject(forwardRef(() => RoomService))
     private roomService: RoomService,
-  ) {}
+  ) { }
 
   async isUserInRooms(RoomId: string, UserId: string): Promise<boolean> {
     const res = await this.redis.hexists(
@@ -61,13 +61,18 @@ export class UsersService {
       useInfo.UserId,
     );
     const userObj = JSON.parse(user) as any as UserInfoType;
+
     if (userObj.Role === useInfo.Role) {
       const updateInfo: UserInfoType = Object.assign({}, userObj, {
         JoinTime: useInfo.JoinTime,
         InTime: useInfo.InTime,
         Avatar: useInfo.Avatar,
         Nickname: useInfo.Nickname,
+        IsAssistant: useInfo.IsAssistant,
       });
+      if (useInfo.IsAssistant) {
+        updateInfo.Order = 1;
+      }
       await this.redis.hset(
         `kankan:socket:rooms:${useInfo.RoomId}`,
         useInfo.UserId,