From d2a2115f33bb4c8d794fc3871ed9149121eb9d4f Mon Sep 17 00:00:00 2001
From: leejh <leejh@biztechpartners.co.kr>
Date: Tue, 22 Oct 2019 09:30:23 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B8=B0=EB=8A=A5=EC=B6=94=EA=B0=80=20::=20?=
 =?UTF-8?q?=EB=8C=80=ED=99=94=EB=B0=A9=20>=20=EB=8C=80=ED=99=94=EB=B0=A9?=
 =?UTF-8?q?=EB=AA=85=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20=EB=A7=A4=ED=95=91.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/messages.component.html        |  6 +--
 .../components/messages.component.ts          | 52 ++++++++++++++-----
 2 files changed, 42 insertions(+), 16 deletions(-)

diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.html
index 2e0d0091..4b6e3ed3 100644
--- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.html
+++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.html
@@ -2,7 +2,7 @@
 <div class="container" fxFlex fxLayout="column">
   <!-- CHAT TOOLBAR -->
   <mat-toolbar class="chat-toolbar">
-    <div fxFlex fxLayout="row" class="chat-header" >
+    <div fxFlex fxLayout="row" class="chat-header">
       <div fxLayout="row" fxLayoutAlign="start center" class="profile-img">
         <!-- RESPONSIVE CHATS BUTTON-->
         <button
@@ -16,7 +16,7 @@
         <!-- / RESPONSIVE CHATS BUTTON-->
       </div>
       <div class="room-name">
-        대화방명대화방명대화방명대화방명대화방명대화방명대화방명대화방명대화방명대화방명대화방명대화방명대화방명대화방명대화방명대화방명대화방명대화방명대화방명대화방명
+        {{ getRoomName() }}
       </div>
       <div class="room-option">
         <button
@@ -72,7 +72,7 @@
     <!-- CHAT MESSAGES -->
     <ucap-chat-messages
       [messages]="eventList$ | async"
-      [userInfos]="userInfoList$ | async"
+      [userInfos]="userInfoList"
       [loginRes]="loginRes"
       [sessionVerInfo]="sessionVerInfo"
       (massDetail)="onMassDetail($event)"
diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.ts
index 84e0b718..5e419a00 100644
--- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.ts
+++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.ts
@@ -29,13 +29,8 @@ import * as ChatStore from '@app/store/messenger/chat';
 import * as RoomStore from '@app/store/messenger/room';
 import { LoginResponse } from '@ucap-webmessenger/protocol-authentication';
 import { SessionStorageService } from '@ucap-webmessenger/web-storage';
-import {
-  LoginInfo,
-  KEY_LOGIN_INFO,
-  EnvironmentsInfo,
-  KEY_ENVIRONMENTS_INFO
-} from '@app/types';
-import { RoomInfo, UserInfo } from '@ucap-webmessenger/protocol-room';
+import { EnvironmentsInfo, KEY_ENVIRONMENTS_INFO } from '@app/types';
+import { RoomInfo, UserInfo, RoomType } from '@ucap-webmessenger/protocol-room';
 import { tap, take } from 'rxjs/operators';
 import { FileInfo } from '@ucap-webmessenger/ui-chat';
 import { KEY_VER_INFO } from '@app/types/ver-info.type';
@@ -80,7 +75,8 @@ export class MessagesComponent implements OnInit, OnDestroy, AfterViewChecked {
   eventList$: Observable<Info[]>;
   roomInfo: RoomInfo;
   roomInfoSubscription: Subscription;
-  userInfoList$: Observable<UserInfo[]>;
+  userInfoList: UserInfo[];
+  userInfoListSubscription: Subscription;
   eventListProcessing$: Observable<boolean>;
   sessionVerInfo: VersionInfo2Response;
 
@@ -110,8 +106,6 @@ export class MessagesComponent implements OnInit, OnDestroy, AfterViewChecked {
   }
 
   ngOnInit() {
-    const loginInfo = this.sessionStorageService.get<LoginInfo>(KEY_LOGIN_INFO);
-
     this.loginResSubscription = this.store
       .pipe(
         select(AppStore.AccountSelector.AuthenticationSelector.loginRes),
@@ -130,9 +124,14 @@ export class MessagesComponent implements OnInit, OnDestroy, AfterViewChecked {
       )
       .subscribe();
 
-    this.userInfoList$ = this.store.pipe(
-      select(AppStore.MessengerSelector.RoomSelector.userInfoList)
-    );
+    this.userInfoListSubscription = this.store
+      .pipe(
+        select(AppStore.MessengerSelector.RoomSelector.userInfoList),
+        tap(userInfoList => {
+          this.userInfoList = userInfoList;
+        })
+      )
+      .subscribe();
 
     this.eventListProcessing$ = this.store.pipe(
       select(AppStore.MessengerSelector.EventSelector.infoListProcessing)
@@ -152,12 +151,39 @@ export class MessagesComponent implements OnInit, OnDestroy, AfterViewChecked {
     if (!!this.roomInfoSubscription) {
       this.roomInfoSubscription.unsubscribe();
     }
+    if (!!this.userInfoListSubscription) {
+      this.userInfoListSubscription.unsubscribe();
+    }
   }
 
   ngAfterViewChecked(): void {
     this.scrollToBottomForMessageBoxContainer();
   }
 
+  getRoomName() {
+    if (!this.roomInfo || !this.userInfoList) {
+      return '대화방명을 가져오고 있습니다..';
+    }
+
+    if (!!this.roomInfo.roomName && '' !== this.roomInfo.roomName.trim()) {
+      return this.roomInfo.roomName;
+    } else if (this.roomInfo.roomType === RoomType.Mytalk) {
+      return 'MyTalk';
+    } else {
+      return this.userInfoList
+        .filter(user => {
+          if (this.roomInfo.roomType === RoomType.Single) {
+            return user.seq !== this.loginRes.userSeq;
+          } else {
+            return true;
+          }
+        })
+        .sort((a, b) => (a.name < b.name ? -1 : a.name > b.name ? 1 : 0))
+        .map(user => user.name)
+        .join(',');
+    }
+  }
+
   selectContact() {}
 
   onSendMessage(message: string) {