# 이슈처리

184 1:1대화방 상대방이 방 나가기 시대화 상대 없음 으로 표시됨 185 회의중, 상태메시지 입력 후 X버튼 후 편집버튼 선택 시 오류 186 그룹대화방 생성 후 메시지 발신 시 여기까지 읽음 기능 표시됨 187 그룹 대화방 읽음 표시 카운트 오류
2020-01-28 13:26:32 +09:00 · 2020-01-28 13:26:32 +09:00 · 77bc91aa39
commit 77bc91aa39
parent 1d94b4d1eb
11 changed files with 207 additions and 59 deletions
--- 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
@ -467,6 +467,11 @@ export class MessagesComponent implements OnInit, OnDestroy, AfterViewInit {
  }

  get _roomUserInfos() {
+    if (this.roomInfoSubject.value.roomType === RoomType.Single) {
+      return this.userInfoListSubject.value.filter(roomUserInfo => {
+        return this.loginResSubject.value.userSeq !== roomUserInfo.seq;
+      });
+    } else {
    return this.userInfoListSubject.value
      .filter(roomUserInfo => {
        return (
@ -475,6 +480,7 @@ export class MessagesComponent implements OnInit, OnDestroy, AfterViewInit {
        );
      })
      .sort((a, b) => (a.name < b.name ? -1 : a.name > b.name ? 1 : 0));
+    }
  }

  getRoomNameByRoomUser(roomUserInfos: (UserInfo | UserInfoShort)[]) {
--- a/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.html
+++ b/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.html
@ -361,7 +361,10 @@
            onApplyStatusMessage(1, statusMessage1.value)
          "
          (edit)="$event.stopPropagation()"
-          (cancel)="$event.stopPropagation()"
+          (cancel)="
+            $event.stopPropagation();
+            statusMessage1.value = loginRes?.statusMessage1
+          "
          class="form-eidt"
        >
          <span ucapInlineEditInput="view">{{ loginRes?.statusMessage1 }}</span>
@ -386,7 +389,10 @@
            onApplyStatusMessage(2, statusMessage2.value)
          "
          (edit)="$event.stopPropagation()"
-          (cancel)="$event.stopPropagation()"
+          (cancel)="
+            $event.stopPropagation();
+            statusMessage2.value = loginRes?.statusMessage2
+          "
          class="form-eidt"
        >
          <span ucapInlineEditInput="view">{{ loginRes?.statusMessage2 }}</span>
@ -411,7 +417,10 @@
            onApplyStatusMessage(3, statusMessage3.value)
          "
          (edit)="$event.stopPropagation()"
-          (cancel)="$event.stopPropagation()"
+          (cancel)="
+            $event.stopPropagation();
+            statusMessage3.value = loginRes?.statusMessage3
+          "
          class="form-eidt"
        >
          <span ucapInlineEditInput="view">{{ loginRes?.statusMessage3 }}</span>
--- a/projects/ucap-webmessenger-app/src/app/services/notification.service.ts
+++ b/projects/ucap-webmessenger-app/src/app/services/notification.service.ts
@ -11,7 +11,8 @@ import {
  AuthenticationProtocolService,
  LogoutResponse,
  LogoutRemoteNotification,
-  LogoutNotification
+  LogoutNotification,
+  LoginResponse
 } from '@ucap-webmessenger/protocol-authentication';

 import { NGXLogger } from 'ngx-logger';
@ -446,7 +447,15 @@ export class AppNotificationService {
      .subscribe();
    this.roomProtocolService.notification$
      .pipe(
-        tap(notiOrRes => {
+        withLatestFrom(
+          this.store.pipe(
+            select(
+              (state: any) =>
+                state.account.authentication.loginRes as LoginResponse
+            )
+          )
+        ),
+        tap(([notiOrRes, loginResInfo]) => {
          switch (notiOrRes.SSVC_TYPE) {
            case SSVC_TYPE_ROOM_INVITE_RES:
              {
@ -506,11 +515,29 @@ export class AppNotificationService {
                  'Notification::roomProtocolService::ExitNotification',
                  noti
                );
-                this.store.dispatch(
-                  RoomStore.exitNotification({
-                    noti
-                  })
-                );
+
+                if (noti.SENDER_SEQ === loginResInfo.userSeq) {
+                  this.store.dispatch(
+                    RoomStore.exitNotification({
+                      noti
+                    })
+                  );
+                } else {
+                  this.store.dispatch(
+                    RoomStore.exitNotificationOthers({
+                      noti
+                    })
+                  );
+
+                  if (!!noti && !!noti.SENDER_SEQ) {
+                    this.store.dispatch(
+                      SyncStore.clearRoomUsers({
+                        roomSeq: noti.roomSeq,
+                        userSeqs: [noti.SENDER_SEQ]
+                      })
+                    );
+                  }
+                }
              }
              break;
            case SSVC_TYPE_ROOM_EXIT_FORCING_RES:
--- a/projects/ucap-webmessenger-app/src/app/store/messenger/room/actions.ts
+++ b/projects/ucap-webmessenger-app/src/app/store/messenger/room/actions.ts
@ -42,6 +42,11 @@ export const infoFailure = createAction(
  props<{ error: any }>()
 );

+export const clearRoomUser = createAction(
+  '[Messenger::Room] clear room users',
+  props<{ userSeqs: number[] }>()
+);
+
 export const inviteNotification = createAction(
  '[Messenger::Room] Invite Notification',
  props<{ noti: InviteNotification }>()
@ -51,6 +56,10 @@ export const exitNotification = createAction(
  '[Messenger::Room] Exit Notification',
  props<{ noti: ExitNotification }>()
 );
+export const exitNotificationOthers = createAction(
+  '[Messenger::Room] Exit Notification By Others',
+  props<{ noti: ExitNotification }>()
+);

 export const exitForcing = createAction(
  '[Messenger::Room] Exit Forcing',
--- a/projects/ucap-webmessenger-app/src/app/store/messenger/room/effects.ts
+++ b/projects/ucap-webmessenger-app/src/app/store/messenger/room/effects.ts
@ -67,7 +67,9 @@ import {
  updateTimeRoomIntervalFailure,
  exitForcing,
  exitForcingFailure,
-  exitForcingSuccess
+  exitForcingSuccess,
+  exitNotificationOthers,
+  clearRoomUser
 } from './actions';
 import { SessionStorageService } from '@ucap-webmessenger/web-storage';
 import { LoginInfo, KEY_LOGIN_INFO } from '@app/types';
@ -340,6 +342,31 @@ export class Effects {
    },
    { dispatch: false }
  );
+  exitNotificationOthers$ = createEffect(
+    () => {
+      return this.actions$.pipe(
+        ofType(exitNotificationOthers),
+        withLatestFrom(
+          this.store.pipe(
+            select((state: any) => state.messenger.room.roomInfo as RoomInfo)
+          )
+        ),
+        tap(([action, roomInfo]) => {
+          if (
+            !!roomInfo &&
+            roomInfo.roomSeq === action.noti.roomSeq &&
+            !!action.noti &&
+            !!action.noti.SENDER_SEQ
+          ) {
+            this.store.dispatch(
+              clearRoomUser({ userSeqs: [action.noti.SENDER_SEQ] })
+            );
+          }
+        })
+      );
+    },
+    { dispatch: false }
+  );

  updateFontNotification$ = createEffect(
    () => {
--- a/projects/ucap-webmessenger-app/src/app/store/messenger/room/reducers.ts
+++ b/projects/ucap-webmessenger-app/src/app/store/messenger/room/reducers.ts
@ -4,7 +4,8 @@ import {
  infoSuccess,
  updateSuccess,
  updateRoomUserLastReadSeq,
-  updateTimeRoomIntervalSuccess
+  updateTimeRoomIntervalSuccess,
+  clearRoomUser
 } from './actions';

 import * as AuthenticationStore from '@app/store/account/authentication';
@ -26,6 +27,18 @@ export const reducer = createReducer(
    };
  }),

+  on(clearRoomUser, (state, action) => {
+    return {
+      ...state,
+      userInfoList: adapterUserInfo.removeMany(action.userSeqs, {
+        ...state.userInfoList
+      }),
+      userInfoShortList: adapterUserInfoShort.removeMany(action.userSeqs, {
+        ...state.userInfoShortList
+      })
+    };
+  }),
+
  on(updateSuccess, (state, action) => {
    return {
      ...state,
--- a/projects/ucap-webmessenger-app/src/app/store/messenger/sync/actions.ts
+++ b/projects/ucap-webmessenger-app/src/app/store/messenger/sync/actions.ts
@ -263,3 +263,9 @@ export const delGroupFailure = createAction(
  '[Messenger::Sync] Group Del Failure',
  props<{ error: any }>()
 );
+
+/** 방 인원 클리어 */
+export const clearRoomUsers = createAction(
+  '[Messenger::Sync] Clear room users.',
+  props<{ roomSeq: string; userSeqs: number[] }>()
+);
--- a/projects/ucap-webmessenger-app/src/app/store/messenger/sync/reducers.ts
+++ b/projects/ucap-webmessenger-app/src/app/store/messenger/sync/reducers.ts
@ -17,7 +17,8 @@ import {
  createGroupSuccess,
  delBuddySuccess,
  delGroupSuccess,
-  updateBuddySuccess
+  updateBuddySuccess,
+  clearRoomUsers
 } from './actions';
 import {
  RoomUserDetailData,
@ -101,6 +102,52 @@ export const reducer = createReducer(
    };
  }),

+  on(clearRoomUsers, (state, action) => {
+    let roomUserList: RoomUserDetailData = {
+      ...state.roomUser.entities[action.roomSeq]
+    };
+    if (
+      !!roomUserList &&
+      !!roomUserList.userInfos &&
+      roomUserList.userInfos.length > 0
+    ) {
+      const userInfos = roomUserList.userInfos.filter(
+        userInfo => action.userSeqs.indexOf(userInfo.seq) < 0
+      );
+      roomUserList = {
+        ...roomUserList,
+        userInfos
+      };
+    }
+
+    let roomUserShortList: RoomUserData = {
+      ...state.roomUserShort.entities[action.roomSeq]
+    };
+    if (
+      !!roomUserShortList &&
+      !!roomUserShortList.userInfos &&
+      roomUserShortList.userInfos.length > 0
+    ) {
+      const userInfos = roomUserShortList.userInfos.filter(
+        userInfo => action.userSeqs.indexOf(userInfo.seq) < 0
+      );
+      roomUserShortList = {
+        ...roomUserShortList,
+        userInfos
+      };
+    }
+
+    return {
+      ...state,
+      roomUser: adapterRoomUser.upsertOne(roomUserList, {
+        ...state.roomUser
+      }),
+      roomUserShort: adapterRoomUserShort.upsertOne(roomUserShortList, {
+        ...state.roomUserShort
+      })
+    };
+  }),
+
  on(updateRoomForNewEventMessage, (state, action) => {
    const finalEventMessage:
      | string
--- a/projects/ucap-webmessenger-ui-chat/src/lib/components/messages.component.ts
+++ b/projects/ucap-webmessenger-ui-chat/src/lib/components/messages.component.ts
@ -141,6 +141,7 @@ export class MessagesComponent implements OnInit, OnDestroy {
  moment = moment;

  readToHereEvent: Info<EventJson>;
+  existReadToHereEvent = true;
  swapped = false;
  hidden = false;

@ -168,27 +169,37 @@ export class MessagesComponent implements OnInit, OnDestroy {

      this.initEventMore();
      this.roomInfo = roomInfo;
+
+      /** [S] initializing by changed room */
+      // reset :: roomLastEventSeq
+      if (!!roomInfo && !!roomInfo.finalEventSeq) {
+        this.initRoomLastEventSeq = roomInfo.finalEventSeq;
+      }
+      // clear :: readToHearEvent object
+      this.readToHereEvent = undefined;
+      this.existReadToHereEvent = true;
+      /** [E] initializing by changed room */
    });
    this.eventListSubscription = this.eventList$.subscribe(eventList => {
-      if (!!eventList && eventList.length > 0 && this.baseEventSeq === 0) {
-        this.initRoomLastEventSeq = eventList[eventList.length - 1].seq;
-      }
-
-      if (
-        !!eventList &&
-        eventList.length > 0 &&
-        this.baseEventSeq > 0 &&
-        !!this.roomInfo &&
-        !!this.roomInfo.lastReadEventSeq &&
-        this.baseEventSeq <= this.roomInfo.lastReadEventSeq
-      ) {
-        // 기존 대화 내용이 있는 상태에서 추가로 조회된 내용중에 read here 가 있을 경우.
-        this.firstCheckReadHere = false;
-      }
-
      this.eventList = eventList;

-      this.readToHereEvent = this.getReadHere();
+      if (!!eventList && eventList.length > 0) {
+        if (!this.readToHereEvent && this.existReadToHereEvent) {
+          this.readToHereEvent = this.getReadHere();
+        }
+
+        if (
+          this.baseEventSeq > 0 &&
+          !!this.roomInfo &&
+          !!this.roomInfo.lastReadEventSeq &&
+          this.baseEventSeq <= this.roomInfo.lastReadEventSeq
+        ) {
+          // 기존 대화 내용이 있는 상태에서 추가로 조회된 내용중에 read here 가 있을 경우.
+          this.firstCheckReadHere = false;
+        }
+      } else {
+        this.readToHereEvent = undefined;
+      }

      this.changeDetectorRef.detectChanges();

@ -298,13 +309,9 @@ export class MessagesComponent implements OnInit, OnDestroy {
    // if (!this.userInfos || 0 === this.userInfos.length) {
    //   return '';
    // }
-    const unreadCnt = this.userInfos.filter(user => {
-      if (message.senderSeq === user.seq) {
-        // 본인 글은 unreadCount 에 포함하지 않는다.
-        return false;
-      }
-      return user.lastReadEventSeq < message.seq;
-    }).length;
+    const unreadCnt = this.userInfos
+      .filter(user => user.isJoinRoom && user.seq !== message.senderSeq)
+      .filter(user => user.lastReadEventSeq < message.seq).length;
    return unreadCnt === 0 ? '' : unreadCnt;
  }

@ -363,6 +370,8 @@ export class MessagesComponent implements OnInit, OnDestroy {
          );
        }
      }
+    } else {
+      this.existReadToHereEvent = false;
    }
    return undefined;
  }
--- a/projects/ucap-webmessenger-ui-profile/src/lib/components/profile.component.html
+++ b/projects/ucap-webmessenger-ui-profile/src/lib/components/profile.component.html
@ -73,7 +73,9 @@
            $event.stopPropagation(); onApplyIntroMessage(introMessage.value)
          "
          (edit)="$event.stopPropagation()"
-          (cancel)="$event.stopPropagation()"
+          (cancel)="
+            $event.stopPropagation(); introMessage.value = userInfo.intro
+          "
          class="form-eidt"
        >
          <span ucapInlineEditInput="view">{{ userInfo.intro }}</span>
@ -167,20 +169,6 @@

  <mat-card-content>
    <ul class="userInfo-list">
-      <!--기존 삭제해주세요
-      <li>
-        <dt class="division">사업장</dt>
-        <dd>{{ userInfo.workplace }}</dd>
-      </li>
-      <li>
-        <dt class="division">담당업무/근무지</dt>
-        <dd>{{ userInfo.responsibilities }}</dd>
-      </li>
-      <li>
-        <dt class="division">사원직무/거래처</dt>
-        <dd>가나다라마바사아자차카타파하</dd>
-      </li>
-    -->
      <li class="company">
        <dt class="division">{{ 'profile.fieldCompany' | translate }}</dt>
        <dd>{{ userInfo.companyName | ucapStringEmptycheck }}</dd>
--- a/projects/ucap-webmessenger-ui-room/src/lib/components/list-item.component.ts
+++ b/projects/ucap-webmessenger-ui-room/src/lib/components/list-item.component.ts
@ -94,13 +94,20 @@ export class ListItemComponent implements OnInit {
  }

  get _roomUserInfos() {
-    return this.roomUserInfo
-      .filter(roomUserInfo => {
-        return (
-          this.loginRes.userSeq !== roomUserInfo.seq && roomUserInfo.isJoinRoom
-        );
-      })
-      .sort((a, b) => (a.name < b.name ? -1 : a.name > b.name ? 1 : 0));
+    if (this.roomInfo.roomType === RoomType.Single) {
+      return this.roomUserInfo.filter(roomUserInfo => {
+        return this.loginRes.userSeq !== roomUserInfo.seq;
+      });
+    } else {
+      return this.roomUserInfo
+        .filter(roomUserInfo => {
+          return (
+            this.loginRes.userSeq !== roomUserInfo.seq &&
+            roomUserInfo.isJoinRoom
+          );
+        })
+        .sort((a, b) => (a.name < b.name ? -1 : a.name > b.name ? 1 : 0));
+    }
  }

  getRoomNameByRoomUser(roomUserInfos: (RoomUserInfo | UserInfoShort)[]) {