diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-side.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-side.component.scss index b18d9127..11d2743e 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-side.component.scss +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-side.component.scss @@ -2,3 +2,16 @@ ::ng-deep .mat-tab-label-active { min-width: 0 !important; } + +::ng-deep .mat-tab-body-wrapper, +::ng-deep .mat-tab-body { + height: 100%; +} + +.container { + height: 100%; + + mat-tab-group { + height: 100%; + } +} diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.html index b38e440d..a9a0e988 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.html +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.html @@ -1,3 +1,9 @@ - +
+
+ +
+
dddd
+
diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.scss index e69de29b..4928b943 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.scss +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.scss @@ -0,0 +1,7 @@ +.oraganization-tab { + height: 100%; + + .oraganization-tab-tree { + overflow: scroll; + } +} diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.ts index 52b82887..ca13e3db 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.ts +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.ts @@ -1,11 +1,18 @@ import { Component, OnInit } from '@angular/core'; import { ucapAnimations } from '@ucap-webmessenger/ui'; import { Observable } from 'rxjs'; -import { DeptInfo } from '@ucap-webmessenger/protocol-query'; +import { + DeptInfo, + QueryProtocolService, + DeptSearchType +} from '@ucap-webmessenger/protocol-query'; import { Store, select } from '@ngrx/store'; import { NGXLogger } from 'ngx-logger'; import * as AppStore from '@app/store'; +import { SessionStorageService } from '@ucap-webmessenger/web-storage'; +import { LoginInfo, KEY_LOGIN_INFO } from '@app/types'; +import { take, map } from 'rxjs/operators'; @Component({ selector: 'app-layout-chat-left-sidenav-organization', @@ -16,11 +23,40 @@ import * as AppStore from '@app/store'; export class OrganizationComponent implements OnInit { departmentInfoList$: Observable; - constructor(private store: Store, private logger: NGXLogger) {} + constructor( + private store: Store, + private queryProtocolService: QueryProtocolService, + private sessionStorageService: SessionStorageService, + private logger: NGXLogger + ) {} ngOnInit() { this.departmentInfoList$ = this.store.pipe( select(AppStore.MessengerSelector.QuerySelector.departmentInfoList) ); } + + onSelectedOrganization(deptInfo: DeptInfo) { + const loginInfo = this.sessionStorageService.get(KEY_LOGIN_INFO); + + // this.store + // .pipe( + // take(1), + // select(AppStore.AccountSelector.AuthenticationSelector.loginRes), + // map(loginRes => { + + // this.queryProtocolService.deptUser({ + // divCd: 'ORG', + // companyCode: loginInfo.companyCode, + // seq: deptInfo.seq, + // search: '', + // searchRange: DeptSearchType.All, + // senderCompanyCode: loginInfo.companyCode, + // senderEmployeeType: loginRes. + // }); + + // }) + // ) + // .subscribe(); + } } diff --git a/projects/ucap-webmessenger-protocol-authentication/src/lib/models/fmc.ts b/projects/ucap-webmessenger-protocol-authentication/src/lib/protocols/fmc.ts similarity index 100% rename from projects/ucap-webmessenger-protocol-authentication/src/lib/models/fmc.ts rename to projects/ucap-webmessenger-protocol-authentication/src/lib/protocols/fmc.ts diff --git a/projects/ucap-webmessenger-protocol-authentication/src/lib/models/login.ts b/projects/ucap-webmessenger-protocol-authentication/src/lib/protocols/login.ts similarity index 100% rename from projects/ucap-webmessenger-protocol-authentication/src/lib/models/login.ts rename to projects/ucap-webmessenger-protocol-authentication/src/lib/protocols/login.ts diff --git a/projects/ucap-webmessenger-protocol-authentication/src/lib/models/logout-remote.ts b/projects/ucap-webmessenger-protocol-authentication/src/lib/protocols/logout-remote.ts similarity index 100% rename from projects/ucap-webmessenger-protocol-authentication/src/lib/models/logout-remote.ts rename to projects/ucap-webmessenger-protocol-authentication/src/lib/protocols/logout-remote.ts diff --git a/projects/ucap-webmessenger-protocol-authentication/src/lib/models/logout.ts b/projects/ucap-webmessenger-protocol-authentication/src/lib/protocols/logout.ts similarity index 100% rename from projects/ucap-webmessenger-protocol-authentication/src/lib/models/logout.ts rename to projects/ucap-webmessenger-protocol-authentication/src/lib/protocols/logout.ts diff --git a/projects/ucap-webmessenger-protocol-authentication/src/lib/services/authentication-protocol.service.ts b/projects/ucap-webmessenger-protocol-authentication/src/lib/services/authentication-protocol.service.ts index 57810761..1be94a84 100644 --- a/projects/ucap-webmessenger-protocol-authentication/src/lib/services/authentication-protocol.service.ts +++ b/projects/ucap-webmessenger-protocol-authentication/src/lib/services/authentication-protocol.service.ts @@ -9,7 +9,7 @@ import { LoginResponse, encodeLogin, decodeLogin -} from '../models/login'; +} from '../protocols/login'; import { SVC_TYPE_LOGIN, SSVC_TYPE_LOGIN_REQ, @@ -22,13 +22,13 @@ import { LogoutResponse, encodeLogout, decodeLogout -} from '../models/logout'; +} from '../protocols/logout'; import { encodeLogoutRemote, decodeLogoutRemote, LogoutRemoteRequest, LogoutRemoteResponse -} from '../models/logout-remote'; +} from '../protocols/logout-remote'; @Injectable({ providedIn: 'root' diff --git a/projects/ucap-webmessenger-protocol-authentication/src/public-api.ts b/projects/ucap-webmessenger-protocol-authentication/src/public-api.ts index ea35d110..5c86ea82 100644 --- a/projects/ucap-webmessenger-protocol-authentication/src/public-api.ts +++ b/projects/ucap-webmessenger-protocol-authentication/src/public-api.ts @@ -2,10 +2,10 @@ * Public API Surface of ucap-webmessenger-protocol-authentication */ -export * from './lib/models/fmc'; -export * from './lib/models/login'; -export * from './lib/models/logout'; -export * from './lib/models/logout-remote'; +export * from './lib/protocols/fmc'; +export * from './lib/protocols/login'; +export * from './lib/protocols/logout'; +export * from './lib/protocols/logout-remote'; export * from './lib/services/authentication-protocol.service'; diff --git a/projects/ucap-webmessenger-protocol-buddy/src/lib/models/add.ts b/projects/ucap-webmessenger-protocol-buddy/src/lib/protocols/add.ts similarity index 100% rename from projects/ucap-webmessenger-protocol-buddy/src/lib/models/add.ts rename to projects/ucap-webmessenger-protocol-buddy/src/lib/protocols/add.ts diff --git a/projects/ucap-webmessenger-protocol-buddy/src/lib/models/del.ts b/projects/ucap-webmessenger-protocol-buddy/src/lib/protocols/del.ts similarity index 100% rename from projects/ucap-webmessenger-protocol-buddy/src/lib/models/del.ts rename to projects/ucap-webmessenger-protocol-buddy/src/lib/protocols/del.ts diff --git a/projects/ucap-webmessenger-protocol-buddy/src/lib/models/update.ts b/projects/ucap-webmessenger-protocol-buddy/src/lib/protocols/update.ts similarity index 100% rename from projects/ucap-webmessenger-protocol-buddy/src/lib/models/update.ts rename to projects/ucap-webmessenger-protocol-buddy/src/lib/protocols/update.ts diff --git a/projects/ucap-webmessenger-protocol-buddy/src/lib/services/buddy-protocol.service.ts b/projects/ucap-webmessenger-protocol-buddy/src/lib/services/buddy-protocol.service.ts index 90fe5d0e..dc303f13 100644 --- a/projects/ucap-webmessenger-protocol-buddy/src/lib/services/buddy-protocol.service.ts +++ b/projects/ucap-webmessenger-protocol-buddy/src/lib/services/buddy-protocol.service.ts @@ -12,14 +12,24 @@ import { SSVC_TYPE_BUDDY_UPD_REQ } from '../types/service'; -import { AddRequest, encodeAdd, decodeAdd, AddResponse } from '../models/add'; -import { DelRequest, encodeDel, decodeDel, DelResponse } from '../models/del'; +import { + AddRequest, + encodeAdd, + decodeAdd, + AddResponse +} from '../protocols/add'; +import { + DelRequest, + encodeDel, + decodeDel, + DelResponse +} from '../protocols/del'; import { UpdateRequest, decodeUpdate, encodeUpdate, UpdateResponse -} from '../models/update'; +} from '../protocols/update'; @Injectable({ providedIn: 'root' diff --git a/projects/ucap-webmessenger-protocol-buddy/src/public-api.ts b/projects/ucap-webmessenger-protocol-buddy/src/public-api.ts index 826985ea..bbf93a45 100644 --- a/projects/ucap-webmessenger-protocol-buddy/src/public-api.ts +++ b/projects/ucap-webmessenger-protocol-buddy/src/public-api.ts @@ -1,9 +1,9 @@ /* * Public API Surface of ucap-webmessenger-protocol-buddy */ -export * from './lib/models/add'; -export * from './lib/models/del'; -export * from './lib/models/update'; +export * from './lib/protocols/add'; +export * from './lib/protocols/del'; +export * from './lib/protocols/update'; export * from './lib/services/buddy-protocol.service'; diff --git a/projects/ucap-webmessenger-protocol-event/src/lib/models/info.ts b/projects/ucap-webmessenger-protocol-event/src/lib/models/info.ts index 6e26e8c7..df8727f4 100644 --- a/projects/ucap-webmessenger-protocol-event/src/lib/models/info.ts +++ b/projects/ucap-webmessenger-protocol-event/src/lib/models/info.ts @@ -1,24 +1,5 @@ -import { - ProtocolRequest, - ProtocolResponse, - ProtocolEncoder, - PacketBody, - ProtocolDecoder, - ProtocolMessage, - ProtocolStream, - PacketBodyValue -} from '@ucap-webmessenger/protocol'; import { EventType } from '../types/event.type'; -export interface InfoRequest extends ProtocolRequest { - // 대화방SEQ(s) - roomSeq: string; - // 기준이벤트SEQ(n) - baseSeq: number; - // 요청이벤트개수(n) - requestCount: number; -} - export interface Info { // 이벤트SEQ seq: number; @@ -33,64 +14,3 @@ export interface Info { // 수신자수 receiverCount: number; } - -export interface InfoData extends ProtocolStream { - // 대화방SEQ(s) - roomSeq: string; - infoList: Info[]; -} - -export interface InfoResponse extends ProtocolResponse { - // 대화방SEQ(s) - roomSeq: string; - // 기준이벤트SEQ(n) - baseSeq: number; - // 유효한파일기준이벤트SEQ(n) - validFileBaseSeq: number; - // 이벤트정보 개수(n) - count: number; -} - -export const encodeInfo: ProtocolEncoder = (req: InfoRequest) => { - const bodyList: PacketBody[] = []; - - bodyList.push( - { type: PacketBodyValue.String, value: req.roomSeq }, - { type: PacketBodyValue.Integer, value: req.baseSeq }, - { type: PacketBodyValue.Integer, value: req.requestCount } - ); - - return bodyList; -}; - -export const decodeInfoData: ProtocolDecoder = ( - message: ProtocolMessage -) => { - const infoList: Info[] = []; - for (let i = 1; i < message.bodyList.length; ) { - infoList.push({ - seq: message.bodyList[0], - type: message.bodyList[1], - senderSeq: message.bodyList[2], - sendDate: message.bodyList[3], - sentMessage: message.bodyList[4], - receiverCount: message.bodyList[5] - }); - } - - return { - roomSeq: message.bodyList[0], - infoList - } as InfoData; -}; - -export const decodeInfo: ProtocolDecoder = ( - message: ProtocolMessage -) => { - return { - roomSeq: message.bodyList[0], - baseSeq: message.bodyList[1], - validFileBaseSeq: message.bodyList[2], - count: message.bodyList[3] - } as InfoResponse; -}; diff --git a/projects/ucap-webmessenger-protocol-event/src/lib/models/cancel.ts b/projects/ucap-webmessenger-protocol-event/src/lib/protocols/cancel.ts similarity index 100% rename from projects/ucap-webmessenger-protocol-event/src/lib/models/cancel.ts rename to projects/ucap-webmessenger-protocol-event/src/lib/protocols/cancel.ts diff --git a/projects/ucap-webmessenger-protocol-event/src/lib/models/del.ts b/projects/ucap-webmessenger-protocol-event/src/lib/protocols/del.ts similarity index 100% rename from projects/ucap-webmessenger-protocol-event/src/lib/models/del.ts rename to projects/ucap-webmessenger-protocol-event/src/lib/protocols/del.ts diff --git a/projects/ucap-webmessenger-protocol-event/src/lib/protocols/info.ts b/projects/ucap-webmessenger-protocol-event/src/lib/protocols/info.ts new file mode 100644 index 00000000..ee829745 --- /dev/null +++ b/projects/ucap-webmessenger-protocol-event/src/lib/protocols/info.ts @@ -0,0 +1,82 @@ +import { + ProtocolRequest, + ProtocolResponse, + ProtocolEncoder, + PacketBody, + ProtocolDecoder, + ProtocolMessage, + ProtocolStream, + PacketBodyValue +} from '@ucap-webmessenger/protocol'; +import { EventType } from '../types/event.type'; +import { Info } from '../models/info'; + +export interface InfoRequest extends ProtocolRequest { + // 대화방SEQ(s) + roomSeq: string; + // 기준이벤트SEQ(n) + baseSeq: number; + // 요청이벤트개수(n) + requestCount: number; +} + +export interface InfoData extends ProtocolStream { + // 대화방SEQ(s) + roomSeq: string; + infoList: Info[]; +} + +export interface InfoResponse extends ProtocolResponse { + // 대화방SEQ(s) + roomSeq: string; + // 기준이벤트SEQ(n) + baseSeq: number; + // 유효한파일기준이벤트SEQ(n) + validFileBaseSeq: number; + // 이벤트정보 개수(n) + count: number; +} + +export const encodeInfo: ProtocolEncoder = (req: InfoRequest) => { + const bodyList: PacketBody[] = []; + + bodyList.push( + { type: PacketBodyValue.String, value: req.roomSeq }, + { type: PacketBodyValue.Integer, value: req.baseSeq }, + { type: PacketBodyValue.Integer, value: req.requestCount } + ); + + return bodyList; +}; + +export const decodeInfoData: ProtocolDecoder = ( + message: ProtocolMessage +) => { + const infoList: Info[] = []; + for (let i = 1; i < message.bodyList.length; ) { + infoList.push({ + seq: message.bodyList[0], + type: message.bodyList[1], + senderSeq: message.bodyList[2], + sendDate: message.bodyList[3], + sentMessage: message.bodyList[4], + receiverCount: message.bodyList[5] + }); + } + + return { + roomSeq: message.bodyList[0], + infoList + } as InfoData; +}; + +export const decodeInfo: ProtocolDecoder = ( + message: ProtocolMessage +) => { + return { + roomSeq: message.bodyList[0], + baseSeq: message.bodyList[1], + validFileBaseSeq: message.bodyList[2], + count: message.bodyList[3] + } as InfoResponse; +}; diff --git a/projects/ucap-webmessenger-protocol-event/src/lib/models/push.ts b/projects/ucap-webmessenger-protocol-event/src/lib/protocols/push.ts similarity index 100% rename from projects/ucap-webmessenger-protocol-event/src/lib/models/push.ts rename to projects/ucap-webmessenger-protocol-event/src/lib/protocols/push.ts diff --git a/projects/ucap-webmessenger-protocol-event/src/lib/models/read.ts b/projects/ucap-webmessenger-protocol-event/src/lib/protocols/read.ts similarity index 100% rename from projects/ucap-webmessenger-protocol-event/src/lib/models/read.ts rename to projects/ucap-webmessenger-protocol-event/src/lib/protocols/read.ts diff --git a/projects/ucap-webmessenger-protocol-event/src/lib/models/send.ts b/projects/ucap-webmessenger-protocol-event/src/lib/protocols/send.ts similarity index 100% rename from projects/ucap-webmessenger-protocol-event/src/lib/models/send.ts rename to projects/ucap-webmessenger-protocol-event/src/lib/protocols/send.ts diff --git a/projects/ucap-webmessenger-protocol-event/src/lib/services/event-protocol.service.ts b/projects/ucap-webmessenger-protocol-event/src/lib/services/event-protocol.service.ts index a16c5f19..6eded15c 100644 --- a/projects/ucap-webmessenger-protocol-event/src/lib/services/event-protocol.service.ts +++ b/projects/ucap-webmessenger-protocol-event/src/lib/services/event-protocol.service.ts @@ -12,7 +12,7 @@ import { decodeInfo, decodeInfoData, InfoData -} from '../models/info'; +} from '../protocols/info'; import { SVC_TYPE_EVENT, SSVC_TYPE_EVENT_INFO_REQ, @@ -29,14 +29,14 @@ import { SendResponse, decodeSend, encodeSend -} from '../models/send'; -import { PushRequest, encodePush } from '../models/push'; +} from '../protocols/send'; +import { PushRequest, encodePush } from '../protocols/push'; import { ReadResponse, ReadRequest, encodeRead, decodeRead -} from '../models/read'; +} from '../protocols/read'; import { DelRequest, DelResponse, @@ -48,7 +48,7 @@ import { CancelResponse, encodeCancel, decodeCancel -} from '../models/cancel'; +} from '../protocols/cancel'; @Injectable({ providedIn: 'root' diff --git a/projects/ucap-webmessenger-protocol-event/src/public-api.ts b/projects/ucap-webmessenger-protocol-event/src/public-api.ts index edb73779..ff743256 100644 --- a/projects/ucap-webmessenger-protocol-event/src/public-api.ts +++ b/projects/ucap-webmessenger-protocol-event/src/public-api.ts @@ -3,7 +3,9 @@ */ export * from './lib/models/info'; -export * from './lib/models/send'; + +export * from './lib/protocols/info'; +export * from './lib/protocols/send'; export * from './lib/services/event-protocol.service'; diff --git a/projects/ucap-webmessenger-protocol-file/src/lib/models/file-download-info.ts b/projects/ucap-webmessenger-protocol-file/src/lib/models/file-download-info.ts new file mode 100644 index 00000000..b59e1bd5 --- /dev/null +++ b/projects/ucap-webmessenger-protocol-file/src/lib/models/file-download-info.ts @@ -0,0 +1,14 @@ +export interface FileDownloadInfo { + // 대화방SEQ + roomSeq: string; + // 파일SEQ + seq: number; + // 사용자SEQ + userSeq: number; + // 사용자명 + userName: string; + // 다운로드일시 + downloadDate: string; + // DownYN + isDownload: boolean; +} diff --git a/projects/ucap-webmessenger-protocol-file/src/lib/models/file-info.ts b/projects/ucap-webmessenger-protocol-file/src/lib/models/file-info.ts new file mode 100644 index 00000000..94daf82b --- /dev/null +++ b/projects/ucap-webmessenger-protocol-file/src/lib/models/file-info.ts @@ -0,0 +1,26 @@ +import { FileType } from '../types/file.type'; + +export interface FileInfo { + // 대화방SEQ + roomSeq: string; + // 이벤트SEQ + eventSeq: number; + // 파일SEQ + seq: number; + // 송신자SEQ + senderSeq: number; + // 파일타입 + type: FileType; + // 파일이름 + name: string; + // 파일URL + url: string; + // 파일크기(byte) + size: number; + // 전송일시 + sendDate: string; + // 수신완료자수 + receivedUserCount: number; + // 수신자수 + receiverCount: number; +} diff --git a/projects/ucap-webmessenger-protocol-file/src/lib/models/down-check.ts b/projects/ucap-webmessenger-protocol-file/src/lib/protocols/down-check.ts similarity index 100% rename from projects/ucap-webmessenger-protocol-file/src/lib/models/down-check.ts rename to projects/ucap-webmessenger-protocol-file/src/lib/protocols/down-check.ts diff --git a/projects/ucap-webmessenger-protocol-file/src/lib/models/info.ts b/projects/ucap-webmessenger-protocol-file/src/lib/protocols/info.ts similarity index 78% rename from projects/ucap-webmessenger-protocol-file/src/lib/models/info.ts rename to projects/ucap-webmessenger-protocol-file/src/lib/protocols/info.ts index c2da7dfa..9bf26e9a 100644 --- a/projects/ucap-webmessenger-protocol-file/src/lib/models/info.ts +++ b/projects/ucap-webmessenger-protocol-file/src/lib/protocols/info.ts @@ -10,6 +10,8 @@ import { ProtocolStream } from '@ucap-webmessenger/protocol'; import { FileType } from '../types/file.type'; +import { FileInfo } from '../models/file-info'; +import { FileDownloadInfo } from '../models/file-download-info'; export interface InfoRequest extends ProtocolRequest { // 대화방SEQ(s) @@ -18,51 +20,11 @@ export interface InfoRequest extends ProtocolRequest { type: FileType; } -export interface FileInfo { - // 대화방SEQ - roomSeq: string; - // 이벤트SEQ - eventSeq: number; - // 파일SEQ - seq: number; - // 송신자SEQ - senderSeq: number; - // 파일타입 - type: FileType; - // 파일이름 - name: string; - // 파일URL - url: string; - // 파일크기(byte) - size: number; - // 전송일시 - sendDate: string; - // 수신완료자수 - receivedUserCount: number; - // 수신자수 - receiverCount: number; -} - export interface InfoData extends ProtocolStream { // { 대화방파일정보 }... fileInfos: FileInfo[]; } -export interface FileDownloadInfo { - // 대화방SEQ - roomSeq: string; - // 파일SEQ - seq: number; - // 사용자SEQ - userSeq: number; - // 사용자명 - userName: string; - // 다운로드일시 - downloadDate: string; - // DownYN - isDownload: boolean; -} - export interface InfoCheckData extends ProtocolStream { // { 파일다운로드정보 }... fileDownloadInfos: FileDownloadInfo[]; diff --git a/projects/ucap-webmessenger-protocol-file/src/lib/services/file-protocol.service.ts b/projects/ucap-webmessenger-protocol-file/src/lib/services/file-protocol.service.ts index a0c277eb..feadd330 100644 --- a/projects/ucap-webmessenger-protocol-file/src/lib/services/file-protocol.service.ts +++ b/projects/ucap-webmessenger-protocol-file/src/lib/services/file-protocol.service.ts @@ -21,13 +21,13 @@ import { InfoCheckData, decodeInfoData, decodeInfoCheckData -} from '../models/info'; +} from '../protocols/info'; import { DownCheckRequest, DownCheckResponse, encodeDownCheck, decodeDownCheck -} from '../models/down-check'; +} from '../protocols/down-check'; @Injectable({ providedIn: 'root' }) diff --git a/projects/ucap-webmessenger-protocol-file/src/public-api.ts b/projects/ucap-webmessenger-protocol-file/src/public-api.ts index b8b41e1b..ac882923 100644 --- a/projects/ucap-webmessenger-protocol-file/src/public-api.ts +++ b/projects/ucap-webmessenger-protocol-file/src/public-api.ts @@ -2,8 +2,11 @@ * Public API Surface of ucap-webmessenger-protocol-file */ -export * from './lib/models/down-check'; -export * from './lib/models/info'; +export * from './lib/models/file-download-info'; +export * from './lib/models/file-info'; + +export * from './lib/protocols/down-check'; +export * from './lib/protocols/info'; export * from './lib/services/file-protocol.service'; diff --git a/projects/ucap-webmessenger-protocol-group/src/lib/models/add.ts b/projects/ucap-webmessenger-protocol-group/src/lib/protocols/add.ts similarity index 100% rename from projects/ucap-webmessenger-protocol-group/src/lib/models/add.ts rename to projects/ucap-webmessenger-protocol-group/src/lib/protocols/add.ts diff --git a/projects/ucap-webmessenger-protocol-group/src/lib/models/del.ts b/projects/ucap-webmessenger-protocol-group/src/lib/protocols/del.ts similarity index 100% rename from projects/ucap-webmessenger-protocol-group/src/lib/models/del.ts rename to projects/ucap-webmessenger-protocol-group/src/lib/protocols/del.ts diff --git a/projects/ucap-webmessenger-protocol-group/src/lib/models/update.ts b/projects/ucap-webmessenger-protocol-group/src/lib/protocols/update.ts similarity index 100% rename from projects/ucap-webmessenger-protocol-group/src/lib/models/update.ts rename to projects/ucap-webmessenger-protocol-group/src/lib/protocols/update.ts diff --git a/projects/ucap-webmessenger-protocol-group/src/lib/services/group-protocol.service.ts b/projects/ucap-webmessenger-protocol-group/src/lib/services/group-protocol.service.ts index b95dea2f..4fa1d324 100644 --- a/projects/ucap-webmessenger-protocol-group/src/lib/services/group-protocol.service.ts +++ b/projects/ucap-webmessenger-protocol-group/src/lib/services/group-protocol.service.ts @@ -11,8 +11,18 @@ import { SSVC_TYPE_GROUP_UPD_REQ, SSVC_TYPE_GROUP_UPD_REQ2 } from '../types/service'; -import { AddRequest, encodeAdd, decodeAdd, AddResponse } from '../models/add'; -import { DelRequest, encodeDel, decodeDel, DelResponse } from '../models/del'; +import { + AddRequest, + encodeAdd, + decodeAdd, + AddResponse +} from '../protocols/add'; +import { + DelRequest, + encodeDel, + decodeDel, + DelResponse +} from '../protocols/del'; import { UpdateRequest, encodeUpdate, @@ -20,7 +30,7 @@ import { encodeUpdate2, decodeUpdate2, UpdateResponse -} from '../models/update'; +} from '../protocols/update'; @Injectable({ providedIn: 'root' }) diff --git a/projects/ucap-webmessenger-protocol-group/src/public-api.ts b/projects/ucap-webmessenger-protocol-group/src/public-api.ts index 517ea747..b80b8f24 100644 --- a/projects/ucap-webmessenger-protocol-group/src/public-api.ts +++ b/projects/ucap-webmessenger-protocol-group/src/public-api.ts @@ -1,9 +1,9 @@ /* * Public API Surface of ucap-webmessenger-protocol-group */ -export * from './lib/models/add'; -export * from './lib/models/del'; -export * from './lib/models/update'; +export * from './lib/protocols/add'; +export * from './lib/protocols/del'; +export * from './lib/protocols/update'; export * from './lib/services/group-protocol.service'; diff --git a/projects/ucap-webmessenger-protocol-info/src/lib/models/status.ts b/projects/ucap-webmessenger-protocol-info/src/lib/protocols/status.ts similarity index 100% rename from projects/ucap-webmessenger-protocol-info/src/lib/models/status.ts rename to projects/ucap-webmessenger-protocol-info/src/lib/protocols/status.ts diff --git a/projects/ucap-webmessenger-protocol-info/src/lib/models/user-option.ts b/projects/ucap-webmessenger-protocol-info/src/lib/protocols/user-option.ts similarity index 100% rename from projects/ucap-webmessenger-protocol-info/src/lib/models/user-option.ts rename to projects/ucap-webmessenger-protocol-info/src/lib/protocols/user-option.ts diff --git a/projects/ucap-webmessenger-protocol-info/src/lib/models/user.ts b/projects/ucap-webmessenger-protocol-info/src/lib/protocols/user.ts similarity index 100% rename from projects/ucap-webmessenger-protocol-info/src/lib/models/user.ts rename to projects/ucap-webmessenger-protocol-info/src/lib/protocols/user.ts diff --git a/projects/ucap-webmessenger-protocol-info/src/lib/services/info-protocol.service.ts b/projects/ucap-webmessenger-protocol-info/src/lib/services/info-protocol.service.ts index 11ef17d9..35bc132b 100644 --- a/projects/ucap-webmessenger-protocol-info/src/lib/services/info-protocol.service.ts +++ b/projects/ucap-webmessenger-protocol-info/src/lib/services/info-protocol.service.ts @@ -16,13 +16,13 @@ import { encodeUser, UserResponse, decodeUser -} from '../models/user'; +} from '../protocols/user'; import { StatusRequest, StatusResponse, encodeStatus, decodeStatus -} from '../models/status'; +} from '../protocols/status'; import { UserOptionResponse, decodeUserOption, @@ -30,7 +30,7 @@ import { encodeUserOptionUpdate, UserOptionUpdateResponse, decodeUserOptionUpdate -} from '../models/user-option'; +} from '../protocols/user-option'; @Injectable({ providedIn: 'root' diff --git a/projects/ucap-webmessenger-protocol-info/src/public-api.ts b/projects/ucap-webmessenger-protocol-info/src/public-api.ts index 07f45e4c..5d005532 100644 --- a/projects/ucap-webmessenger-protocol-info/src/public-api.ts +++ b/projects/ucap-webmessenger-protocol-info/src/public-api.ts @@ -2,9 +2,9 @@ * Public API Surface of ucap-webmessenger-protocol-info */ -export * from './lib/models/status'; -export * from './lib/models/user-option'; -export * from './lib/models/user'; +export * from './lib/protocols/status'; +export * from './lib/protocols/user-option'; +export * from './lib/protocols/user'; export * from './lib/services/info-protocol.service'; diff --git a/projects/ucap-webmessenger-protocol-inner/src/lib/models/conn.ts b/projects/ucap-webmessenger-protocol-inner/src/lib/protocols/conn.ts similarity index 100% rename from projects/ucap-webmessenger-protocol-inner/src/lib/models/conn.ts rename to projects/ucap-webmessenger-protocol-inner/src/lib/protocols/conn.ts diff --git a/projects/ucap-webmessenger-protocol-inner/src/lib/services/inner-protocol.service.ts b/projects/ucap-webmessenger-protocol-inner/src/lib/services/inner-protocol.service.ts index fee603f5..990b6f3d 100644 --- a/projects/ucap-webmessenger-protocol-inner/src/lib/services/inner-protocol.service.ts +++ b/projects/ucap-webmessenger-protocol-inner/src/lib/services/inner-protocol.service.ts @@ -10,7 +10,7 @@ import { ConnRequest, encodeConn, decodeConn -} from '../models/conn'; +} from '../protocols/conn'; import { SVC_TYPE_INNER, SSVC_TYPE_CONN_REQ } from '../types/service'; @Injectable({ diff --git a/projects/ucap-webmessenger-protocol-inner/src/public-api.ts b/projects/ucap-webmessenger-protocol-inner/src/public-api.ts index 1fdd7fef..f1a39c07 100644 --- a/projects/ucap-webmessenger-protocol-inner/src/public-api.ts +++ b/projects/ucap-webmessenger-protocol-inner/src/public-api.ts @@ -2,6 +2,8 @@ * Public API Surface of ucap-webmessenger-protocol-inner */ +export * from './lib/protocols/conn'; + export * from './lib/services/inner-protocol.service'; export * from './lib/ucap-inner-protocol.module'; diff --git a/projects/ucap-webmessenger-protocol-option/src/lib/models/call-update.ts b/projects/ucap-webmessenger-protocol-option/src/lib/protocols/call-update.ts similarity index 100% rename from projects/ucap-webmessenger-protocol-option/src/lib/models/call-update.ts rename to projects/ucap-webmessenger-protocol-option/src/lib/protocols/call-update.ts diff --git a/projects/ucap-webmessenger-protocol-option/src/lib/models/call-view.ts b/projects/ucap-webmessenger-protocol-option/src/lib/protocols/call-view.ts similarity index 100% rename from projects/ucap-webmessenger-protocol-option/src/lib/models/call-view.ts rename to projects/ucap-webmessenger-protocol-option/src/lib/protocols/call-view.ts diff --git a/projects/ucap-webmessenger-protocol-option/src/lib/models/reg-update.ts b/projects/ucap-webmessenger-protocol-option/src/lib/protocols/reg-update.ts similarity index 100% rename from projects/ucap-webmessenger-protocol-option/src/lib/models/reg-update.ts rename to projects/ucap-webmessenger-protocol-option/src/lib/protocols/reg-update.ts diff --git a/projects/ucap-webmessenger-protocol-option/src/lib/models/reg-view.ts b/projects/ucap-webmessenger-protocol-option/src/lib/protocols/reg-view.ts similarity index 100% rename from projects/ucap-webmessenger-protocol-option/src/lib/models/reg-view.ts rename to projects/ucap-webmessenger-protocol-option/src/lib/protocols/reg-view.ts diff --git a/projects/ucap-webmessenger-protocol-option/src/lib/models/update.ts b/projects/ucap-webmessenger-protocol-option/src/lib/protocols/update.ts similarity index 100% rename from projects/ucap-webmessenger-protocol-option/src/lib/models/update.ts rename to projects/ucap-webmessenger-protocol-option/src/lib/protocols/update.ts diff --git a/projects/ucap-webmessenger-protocol-option/src/lib/models/view.ts b/projects/ucap-webmessenger-protocol-option/src/lib/protocols/view.ts similarity index 100% rename from projects/ucap-webmessenger-protocol-option/src/lib/models/view.ts rename to projects/ucap-webmessenger-protocol-option/src/lib/protocols/view.ts diff --git a/projects/ucap-webmessenger-protocol-option/src/lib/services/option-protocol.service.ts b/projects/ucap-webmessenger-protocol-option/src/lib/services/option-protocol.service.ts index 99d10f05..bcba489d 100644 --- a/projects/ucap-webmessenger-protocol-option/src/lib/services/option-protocol.service.ts +++ b/projects/ucap-webmessenger-protocol-option/src/lib/services/option-protocol.service.ts @@ -18,37 +18,37 @@ import { decodeView, ViewRequest, ViewResponse -} from '../models/view'; +} from '../protocols/view'; import { UpdateRequest, UpdateResponse, encodeUpdate, decodeUpdate -} from '../models/update'; +} from '../protocols/update'; import { RegViewRequest, RegViewResponse, encodeRegView, decodeRegView -} from '../models/reg-view'; +} from '../protocols/reg-view'; import { RegUpdateRequest, RegUpdateResponse, encodeRegUpdate, decodeRegUpdate -} from '../models/reg-update'; +} from '../protocols/reg-update'; import { CallViewRequest, CallViewResponse, encodeCallView, decodeCallView -} from '../models/call-view'; +} from '../protocols/call-view'; import { CallUpdateRequest, CallUpdateResponse, encodeCallUpdate, decodeCallUpdate -} from '../models/call-update'; +} from '../protocols/call-update'; @Injectable({ providedIn: 'root' diff --git a/projects/ucap-webmessenger-protocol-option/src/public-api.ts b/projects/ucap-webmessenger-protocol-option/src/public-api.ts index 59c5c147..2cc02cc4 100644 --- a/projects/ucap-webmessenger-protocol-option/src/public-api.ts +++ b/projects/ucap-webmessenger-protocol-option/src/public-api.ts @@ -2,12 +2,12 @@ * Public API Surface of ucap-webmessenger-protocol-option */ -export * from './lib/models/call-update'; -export * from './lib/models/call-view'; -export * from './lib/models/reg-update'; -export * from './lib/models/reg-view'; -export * from './lib/models/update'; -export * from './lib/models/view'; +export * from './lib/protocols/call-update'; +export * from './lib/protocols/call-view'; +export * from './lib/protocols/reg-update'; +export * from './lib/protocols/reg-view'; +export * from './lib/protocols/update'; +export * from './lib/protocols/view'; export * from './lib/services/option-protocol.service'; diff --git a/projects/ucap-webmessenger-protocol-query/src/lib/models/dept-info.ts b/projects/ucap-webmessenger-protocol-query/src/lib/models/dept-info.ts new file mode 100644 index 00000000..4d3ea6a2 --- /dev/null +++ b/projects/ucap-webmessenger-protocol-query/src/lib/models/dept-info.ts @@ -0,0 +1,26 @@ +import { DeptType } from '../types/dept.type'; + +export interface DeptInfo { + // 부서SEQ + seq: number; + // 부서명 + name: string; + // 기관코드 + companyCode: string; + // 부서타입 + type: DeptType; + // 본부SEQ + rootSeq: number; + // 상위부서SEQ + parentSeq: number; + // 조회순서 + order: string; + // 조회레벨 + depth: number; + // ActiveYN + isActive: boolean; + // 부서명(영어) + nameEn: string; + // 부서명(중국어) + nameCn: string; +} diff --git a/projects/ucap-webmessenger-protocol-query/src/lib/models/user-info-dn.ts b/projects/ucap-webmessenger-protocol-query/src/lib/models/user-info-dn.ts new file mode 100644 index 00000000..2375e75b --- /dev/null +++ b/projects/ucap-webmessenger-protocol-query/src/lib/models/user-info-dn.ts @@ -0,0 +1,52 @@ +import { RoleCode } from '@ucap-webmessenger/protocol-authentication'; + +export interface UserInfoDN { + /** 사용자SEQ */ + seq: number; + /** 사용자명 */ + name: string; + /** 사진파일 */ + profileImageFile: string; + /** 직급 */ + grade: string; + /** 업무소개 */ + intro: string; + // 기관코드 + companyCode: string; + // 핸드폰번호 + hpNumber: string; + // 내선번호 + lineNumber: string; + // 이메일 + email: string; + // 모바일YN + isMobile: boolean; + // 조회순서 + order: string; + // ActiveYN + isActive: boolean; + // 역할코드 + roleCd: RoleCode; + // 사번 + employeeNum: string; + // 부서명 + deptName: string; + // MADN + madn: string; + // HARDPHONE_SADN + hardSadn: string; + // FMC_SADN + fmcSadn: string; + // 사용자명(영어) + nameEn: string; + // 사용자명(중국어) + nameCn: string; + // 직급(영어) + gradeEn: string; + // 직급(중국어) + gradeCn: string; + // 부서명(영어) + deptNameEn: string; + // 부서명(중국어) + deptNameCn: string; +} diff --git a/projects/ucap-webmessenger-protocol-query/src/lib/models/user-info-f.ts b/projects/ucap-webmessenger-protocol-query/src/lib/models/user-info-f.ts new file mode 100644 index 00000000..6f8536f8 --- /dev/null +++ b/projects/ucap-webmessenger-protocol-query/src/lib/models/user-info-f.ts @@ -0,0 +1,63 @@ +import { EmployeeType } from '@ucap-webmessenger/protocol-room'; +import { RoleCode } from '@ucap-webmessenger/protocol-authentication'; + +export interface UserInfoF { + // 사용자SEQ + seq: number; + // 사용자명 + name: string; + // 사진파일 + profileImageFile: string; + // 직급 + grade: string; + // 업무소개 + intro: string; + // 기관코드 + companyCode: string; + // 핸드폰번호 + hpNumber: string; + // 내선번호 + lineNumber: string; + // 이메일 + email: string; + // 모바일YN + isMobile: boolean; + // 부서명 + deptName: string; + // 즐.찾 여부 + isFavorit: boolean; + // 친구여부 + isBuddy: boolean; + // ActiveYN + isActive: boolean; + // 역할코드 + roleCd: RoleCode; + // 사번 + employeeNum: string; + // MADN + madn: string; + // HARDPHONE_SADN + hardSadn: string; + // FMC_SADN + fmcSadn: string; + // 사용자명(영어) + nameEn: string; + // 사용자명(중국어) + nameCn: string; + // 직급(영어) + gradeEn: string; + // 직급(중국어) + gradeCn: string; + // 부서명(영어) + deptNameEn: string; + // 부서명(중국어) + deptNameCn: string; + // 이용약관동의여부YN + isPrivacyAgree: boolean; + // 유효접속여부YN + isValidLogin: boolean; + // 임직원유형(s) + employeeType: EmployeeType; + // 별명 + nickName: string; +} diff --git a/projects/ucap-webmessenger-protocol-query/src/lib/models/user-info-ss.ts b/projects/ucap-webmessenger-protocol-query/src/lib/models/user-info-ss.ts new file mode 100644 index 00000000..6883118a --- /dev/null +++ b/projects/ucap-webmessenger-protocol-query/src/lib/models/user-info-ss.ts @@ -0,0 +1,64 @@ +import { RoleCode } from '@ucap-webmessenger/protocol-authentication'; +import { CallMode } from '@ucap-webmessenger/core'; +import { EmployeeType } from '@ucap-webmessenger/protocol-room'; + +export interface UserInfoSS { + /** 사용자SEQ */ + seq: number; + /** 사용자명 */ + name: string; + /** 사진파일 */ + profileImageFile: string; + /** 직급 */ + grade: string; + /** 업무소개 */ + intro: string; + /** 기관코드 */ + companyCode: string; + /** 핸드폰번호 */ + hpNumber: string; + /** 내선번호 */ + lineNumber: string; + /** 이메일 */ + email: string; + /** 모바일YN */ + isMobile: boolean; + /** 부서명 */ + deptName: string; + /** 조회순서 */ + order: string; + /** ActiveYN */ + isActive: boolean; + /** 역할코드 */ + roleCd: RoleCode; + /** 사번 */ + employeeNum: string; + /** MADN */ + madn: string; + /** HARDPHONE_SADN */ + hardSadn: string; + /** FMC_SADN */ + fmcSadn: string; + /** CALL_MODE */ + callMode: CallMode; + /** 사용자명(영어) */ + nameEn: string; + /** 사용자명(중국어) */ + nameCn: string; + /** 직급(영어) */ + gradeEn: string; + /** 직급(중국어) */ + gradeCn: string; + /** 부서명(영어) */ + deptNameEn: string; + /** 부서명(중국어) */ + deptNameCn: string; + /** 부서SEQ */ + deptSeq: number; + /** 이용약관동의여부YN */ + isPrivacyAgree: boolean; + /** 유효접속여부YN */ + isValidLogin: boolean; + /** 임직원유형(s) */ + employeeType: EmployeeType; +} diff --git a/projects/ucap-webmessenger-protocol-query/src/lib/models/user-seq-info.ts b/projects/ucap-webmessenger-protocol-query/src/lib/models/user-seq-info.ts new file mode 100644 index 00000000..75550f46 --- /dev/null +++ b/projects/ucap-webmessenger-protocol-query/src/lib/models/user-seq-info.ts @@ -0,0 +1,10 @@ +export interface UserSeqInfo { + // 로그인ID + id: string; + // 사용자SEQ + seq: number; + // 모바일YN + isMobile: boolean; + // 회사코드 + companyCode: string; +} diff --git a/projects/ucap-webmessenger-protocol-query/src/lib/models/auth.ts b/projects/ucap-webmessenger-protocol-query/src/lib/protocols/auth.ts similarity index 100% rename from projects/ucap-webmessenger-protocol-query/src/lib/models/auth.ts rename to projects/ucap-webmessenger-protocol-query/src/lib/protocols/auth.ts diff --git a/projects/ucap-webmessenger-protocol-query/src/lib/models/data-user-ext.ts b/projects/ucap-webmessenger-protocol-query/src/lib/protocols/data-user-ext.ts similarity index 100% rename from projects/ucap-webmessenger-protocol-query/src/lib/models/data-user-ext.ts rename to projects/ucap-webmessenger-protocol-query/src/lib/protocols/data-user-ext.ts diff --git a/projects/ucap-webmessenger-protocol-query/src/lib/models/data-user.ts b/projects/ucap-webmessenger-protocol-query/src/lib/protocols/data-user.ts similarity index 97% rename from projects/ucap-webmessenger-protocol-query/src/lib/models/data-user.ts rename to projects/ucap-webmessenger-protocol-query/src/lib/protocols/data-user.ts index 595aed4d..af406bc0 100644 --- a/projects/ucap-webmessenger-protocol-query/src/lib/models/data-user.ts +++ b/projects/ucap-webmessenger-protocol-query/src/lib/protocols/data-user.ts @@ -10,7 +10,7 @@ import { } from '@ucap-webmessenger/protocol'; import { EmployeeType } from '@ucap-webmessenger/protocol-room'; import { RoleCode } from '@ucap-webmessenger/protocol-authentication'; -import { UserInfoSS } from './dept-user'; +import { UserInfoSS } from '../models/user-info-ss'; export interface DataUserRequest extends ProtocolRequest { // DivCD(s) diff --git a/projects/ucap-webmessenger-protocol-query/src/lib/models/dept-user.ts b/projects/ucap-webmessenger-protocol-query/src/lib/protocols/dept-user.ts similarity index 68% rename from projects/ucap-webmessenger-protocol-query/src/lib/models/dept-user.ts rename to projects/ucap-webmessenger-protocol-query/src/lib/protocols/dept-user.ts index d487db6f..3bc97615 100644 --- a/projects/ucap-webmessenger-protocol-query/src/lib/models/dept-user.ts +++ b/projects/ucap-webmessenger-protocol-query/src/lib/protocols/dept-user.ts @@ -13,102 +13,43 @@ import { EmployeeType } from '@ucap-webmessenger/protocol-room'; import { RoleCode } from '@ucap-webmessenger/protocol-authentication'; import { DeptSearchType } from '../types/dept-search.type'; import { CallMode } from '@ucap-webmessenger/core'; +import { UserInfoSS } from '../models/user-info-ss'; export interface DeptUserRequest extends ProtocolRequest { - // DivCD(s) + /** DivCD(s) */ divCd: string; - // 기관코드(s) + /** 기관코드(s) */ companyCode: string; - // 부서SEQ(n) + /** 부서SEQ(n) */ seq?: number; - // 검색string(s) + /** 검색string(s) */ search?: string; - // 검색범위(s) + /** 검색범위(s) */ searchRange: DeptSearchType; - // 요청리스트(n) 사용안하면 0 최대 200 + /** 요청리스트(n) 사용안하면 0 최대 200 */ pageListCount?: number; - // 요청페이지(n) 사용안하면 0 처음은 1 + /** 요청페이지(n) 사용안하면 0 처음은 1 */ pageCurrent?: number; - // 발신자회사코드(s) + /** 발신자회사코드(s) */ senderCompanyCode: string; - // 발신자임직원유형(s) + /** 발신자임직원유형(s) */ senderEmployeeType: EmployeeType; } -export interface UserInfoSS { - // 사용자SEQ - seq: number; - // 사용자명 - name: string; - // 사진파일 - profileImageFile: string; - // 직급 - grade: string; - // 업무소개 - intro: string; - // 기관코드 - companyCode: string; - // 핸드폰번호 - hpNumber: string; - // 내선번호 - lineNumber: string; - // 이메일 - email: string; - // 모바일YN - isMobile: boolean; - // 부서명 - deptName: string; - // 조회순서 - order: string; - // ActiveYN - isActive: boolean; - // 역할코드 - roleCd: RoleCode; - // 사번 - employeeNum: string; - // MADN - madn: string; - // HARDPHONE_SADN - hardSadn: string; - // FMC_SADN - fmcSadn: string; - // CALL_MODE - callMode: CallMode; - // 사용자명(영어) - nameEn: string; - // 사용자명(중국어) - nameCn: string; - // 직급(영어) - gradeEn: string; - // 직급(중국어) - gradeCn: string; - // 부서명(영어) - deptNameEn: string; - // 부서명(중국어) - deptNameCn: string; - // 부서SEQ - deptSeq: number; - // 이용약관동의여부YN - isPrivacyAgree: boolean; - // 유효접속여부YN - isValidLogin: boolean; - // 임직원유형(s) - employeeType: EmployeeType; -} export interface DeptUserData extends ProtocolStream { - // DivCD(s) + /** DivCD(s) */ divCd: string; - // {부서정보-S}... + /** {부서정보-S}... */ userInfos: UserInfoSS[]; } export interface DeptUserResponse extends ProtocolResponse { - // DivCD(s) + /** DivCD(s) */ divCd: string; - // 전체갯수(n) + /** 전체갯수(n) */ pageTotalCount: number; - // 요청리스트(n) + /** 요청리스트(n) */ pageListCount?: number; - // 페이지(n) + /** 페이지(n) */ pageCurrent?: number; } diff --git a/projects/ucap-webmessenger-protocol-query/src/lib/models/dept.ts b/projects/ucap-webmessenger-protocol-query/src/lib/protocols/dept.ts similarity index 80% rename from projects/ucap-webmessenger-protocol-query/src/lib/models/dept.ts rename to projects/ucap-webmessenger-protocol-query/src/lib/protocols/dept.ts index 3026a45a..7b1149db 100644 --- a/projects/ucap-webmessenger-protocol-query/src/lib/models/dept.ts +++ b/projects/ucap-webmessenger-protocol-query/src/lib/protocols/dept.ts @@ -10,6 +10,7 @@ import { ProtocolStream } from '@ucap-webmessenger/protocol'; import { DeptType } from '../types/dept.type'; +import { DeptInfo } from '../models/dept-info'; export interface DeptRequest extends ProtocolRequest { // DivCD(s) @@ -18,30 +19,6 @@ export interface DeptRequest extends ProtocolRequest { companyCode: string; } -export interface DeptInfo { - // 부서SEQ - seq: number; - // 부서명 - name: string; - // 기관코드 - companyCode: string; - // 부서타입 - type: DeptType; - // 본부SEQ - rootSeq: number; - // 상위부서SEQ - parentSeq: number; - // 조회순서 - order: string; - // 조회레벨 - depth: number; - // ActiveYN - isActive: boolean; - // 부서명(영어) - nameEn: string; - // 부서명(중국어) - nameCn: string; -} export interface DeptData extends ProtocolStream { // DivCD(s) divCd: string; diff --git a/projects/ucap-webmessenger-protocol-query/src/lib/models/user-dn.ts b/projects/ucap-webmessenger-protocol-query/src/lib/protocols/user-dn.ts similarity index 78% rename from projects/ucap-webmessenger-protocol-query/src/lib/models/user-dn.ts rename to projects/ucap-webmessenger-protocol-query/src/lib/protocols/user-dn.ts index cf299d3a..02c3f606 100644 --- a/projects/ucap-webmessenger-protocol-query/src/lib/models/user-dn.ts +++ b/projects/ucap-webmessenger-protocol-query/src/lib/protocols/user-dn.ts @@ -12,6 +12,7 @@ import { import { EmployeeType } from '@ucap-webmessenger/protocol-room'; import { RoleCode } from '@ucap-webmessenger/protocol-authentication'; import { UserDnSearchType } from '../types/user-dn-search.type'; +import { UserInfoDN } from '../models/user-info-dn'; export interface UserDnRequest extends ProtocolRequest { // DivCD(s) @@ -34,56 +35,6 @@ export interface UserDnRequest extends ProtocolRequest { senderEmployeeType: EmployeeType; } -export interface UserInfoDN { - // 사용자SEQ - seq: number; - // 사용자명 - name: string; - // 사진파일 - profileImageFile: string; - // 직급 - grade: string; - // 업무소개 - intro: string; - // 기관코드 - companyCode: string; - // 핸드폰번호 - hpNumber: string; - // 내선번호 - lineNumber: string; - // 이메일 - email: string; - // 모바일YN - isMobile: boolean; - // 조회순서 - order: string; - // ActiveYN - isActive: boolean; - // 역할코드 - roleCd: RoleCode; - // 사번 - employeeNum: string; - // 부서명 - deptName: string; - // MADN - madn: string; - // HARDPHONE_SADN - hardSadn: string; - // FMC_SADN - fmcSadn: string; - // 사용자명(영어) - nameEn: string; - // 사용자명(중국어) - nameCn: string; - // 직급(영어) - gradeEn: string; - // 직급(중국어) - gradeCn: string; - // 부서명(영어) - deptNameEn: string; - // 부서명(중국어) - deptNameCn: string; -} export interface UserDnData extends ProtocolStream { // DivCD(s) divCd: string; diff --git a/projects/ucap-webmessenger-protocol-query/src/lib/models/user-id.ts b/projects/ucap-webmessenger-protocol-query/src/lib/protocols/user-id.ts similarity index 91% rename from projects/ucap-webmessenger-protocol-query/src/lib/models/user-id.ts rename to projects/ucap-webmessenger-protocol-query/src/lib/protocols/user-id.ts index 5dc94f41..1eb71a16 100644 --- a/projects/ucap-webmessenger-protocol-query/src/lib/models/user-id.ts +++ b/projects/ucap-webmessenger-protocol-query/src/lib/protocols/user-id.ts @@ -10,6 +10,7 @@ import { ProtocolStream } from '@ucap-webmessenger/protocol'; import { EmployeeType } from '@ucap-webmessenger/protocol-room'; +import { UserSeqInfo } from '../models/user-seq-info'; export interface UserIdRequest extends ProtocolRequest { // DivCD(s) @@ -21,22 +22,14 @@ export interface UserIdRequest extends ProtocolRequest { // 발신자임직원유형(s) senderEmployeeType: EmployeeType; } -export interface UserSeqInfo { - // 로그인ID - id: string; - // 사용자SEQ - seq: number; - // 모바일YN - isMobile: boolean; - // 회사코드 - companyCode: string; -} + export interface UserIdData extends ProtocolStream { // DivCD(s) divCd: string; // {SEQ정보}1... userSeqInfos: UserSeqInfo[]; } + export interface UserIdResponse extends ProtocolResponse { // DivCD(s) divCd: string; diff --git a/projects/ucap-webmessenger-protocol-query/src/lib/models/user-seq.ts b/projects/ucap-webmessenger-protocol-query/src/lib/protocols/user-seq.ts similarity index 78% rename from projects/ucap-webmessenger-protocol-query/src/lib/models/user-seq.ts rename to projects/ucap-webmessenger-protocol-query/src/lib/protocols/user-seq.ts index 989103eb..341662f2 100644 --- a/projects/ucap-webmessenger-protocol-query/src/lib/models/user-seq.ts +++ b/projects/ucap-webmessenger-protocol-query/src/lib/protocols/user-seq.ts @@ -10,7 +10,8 @@ import { } from '@ucap-webmessenger/protocol'; import { EmployeeType } from '@ucap-webmessenger/protocol-room'; import { RoleCode } from '@ucap-webmessenger/protocol-authentication'; -import { UserInfoSS } from './dept-user'; +import { UserInfoF } from '../models/user-info-f'; +import { UserInfoSS } from '../models/user-info-ss'; export interface UserSeqRequest extends ProtocolRequest { // DivCD(s) @@ -26,66 +27,7 @@ export interface UserSeqRequest extends ProtocolRequest { // 발신자임직원유형(s) senderEmployeeType: EmployeeType; } -export interface UserInfoF { - // 사용자SEQ - seq: number; - // 사용자명 - name: string; - // 사진파일 - profileImageFile: string; - // 직급 - grade: string; - // 업무소개 - intro: string; - // 기관코드 - companyCode: string; - // 핸드폰번호 - hpNumber: string; - // 내선번호 - lineNumber: string; - // 이메일 - email: string; - // 모바일YN - isMobile: boolean; - // 부서명 - deptName: string; - // 즐.찾 여부 - isFavorit: boolean; - // 친구여부 - isBuddy: boolean; - // ActiveYN - isActive: boolean; - // 역할코드 - roleCd: RoleCode; - // 사번 - employeeNum: string; - // MADN - madn: string; - // HARDPHONE_SADN - hardSadn: string; - // FMC_SADN - fmcSadn: string; - // 사용자명(영어) - nameEn: string; - // 사용자명(중국어) - nameCn: string; - // 직급(영어) - gradeEn: string; - // 직급(중국어) - gradeCn: string; - // 부서명(영어) - deptNameEn: string; - // 부서명(중국어) - deptNameCn: string; - // 이용약관동의여부YN - isPrivacyAgree: boolean; - // 유효접속여부YN - isValidLogin: boolean; - // 임직원유형(s) - employeeType: EmployeeType; - // 별명 - nickName: string; -} + export interface UserSeqData extends ProtocolStream { // DivCD(s) divCd: string; diff --git a/projects/ucap-webmessenger-protocol-query/src/lib/services/query-protocol.service.ts b/projects/ucap-webmessenger-protocol-query/src/lib/services/query-protocol.service.ts index 26abcd33..f4d875d4 100644 --- a/projects/ucap-webmessenger-protocol-query/src/lib/services/query-protocol.service.ts +++ b/projects/ucap-webmessenger-protocol-query/src/lib/services/query-protocol.service.ts @@ -7,7 +7,7 @@ import { AuthResponse, encodeAuth, decodeAuth -} from '../models/auth'; +} from '../protocols/auth'; import { SVC_TYPE_QUERY_DATA, SSVC_TYPE_QUERY_AUTH_REQ, @@ -40,7 +40,7 @@ import { decodeDept, decodeDeptData, DeptData -} from '../models/dept'; +} from '../protocols/dept'; import { encodeDeptUser, decodeDeptUser, @@ -48,7 +48,7 @@ import { DeptUserRequest, DeptUserData, DeptUserResponse -} from '../models/dept-user'; +} from '../protocols/dept-user'; import { UserSeqData, UserSeqData2, @@ -56,7 +56,7 @@ import { decodeUserSeqData, decodeUserSeqData2, UserSeqRequest -} from '../models/user-seq'; +} from '../protocols/user-seq'; import { UserIdRequest, UserIdResponse, @@ -64,7 +64,7 @@ import { encodeUserId, decodeUserId, decodeUserIdData -} from '../models/user-id'; +} from '../protocols/user-id'; import { UserDnRequest, UserDnResponse, @@ -72,19 +72,19 @@ import { encodeUserDn, decodeUserDnData, decodeUserDn -} from '../models/user-dn'; +} from '../protocols/user-dn'; import { DataUserRequest, DataUserResponse, encodeDataUser, decodeDataUser -} from '../models/data-user'; +} from '../protocols/data-user'; import { DataUserExtRequest, DataUserExtResponse, encodeDataUserExt, decodeDataUserExt -} from '../models/data-user-ext'; +} from '../protocols/data-user-ext'; @Injectable({ providedIn: 'root' diff --git a/projects/ucap-webmessenger-protocol-query/src/public-api.ts b/projects/ucap-webmessenger-protocol-query/src/public-api.ts index 0b072b39..185d4895 100644 --- a/projects/ucap-webmessenger-protocol-query/src/public-api.ts +++ b/projects/ucap-webmessenger-protocol-query/src/public-api.ts @@ -2,14 +2,20 @@ * Public API Surface of ucap-webmessenger-protocol-query */ -export * from './lib/models/auth'; -export * from './lib/models/data-user-ext'; -export * from './lib/models/data-user'; -export * from './lib/models/dept-user'; -export * from './lib/models/dept'; -export * from './lib/models/user-dn'; -export * from './lib/models/user-id'; -export * from './lib/models/user-seq'; +export * from './lib/models/dept-info'; +export * from './lib/models/user-info-dn'; +export * from './lib/models/user-info-f'; +export * from './lib/models/user-info-ss'; +export * from './lib/models/user-seq-info'; + +export * from './lib/protocols/auth'; +export * from './lib/protocols/data-user-ext'; +export * from './lib/protocols/data-user'; +export * from './lib/protocols/dept-user'; +export * from './lib/protocols/dept'; +export * from './lib/protocols/user-dn'; +export * from './lib/protocols/user-id'; +export * from './lib/protocols/user-seq'; export * from './lib/services/query-protocol.service'; diff --git a/projects/ucap-webmessenger-protocol-room/src/lib/models/room-info.ts b/projects/ucap-webmessenger-protocol-room/src/lib/models/room-info.ts new file mode 100644 index 00000000..412b89af --- /dev/null +++ b/projects/ucap-webmessenger-protocol-room/src/lib/models/room-info.ts @@ -0,0 +1,31 @@ +import { RoomType } from '../types/room.type'; +import { EventType } from '@ucap-webmessenger/protocol-event'; + +export interface RoomInfo { + // 0. 대화방SEQ + roomSeq: string; + // 1. 대화방종류 + roomType: RoomType; + // 2. 대화방명 + roomName: string; + // 3. 최종타입 + finalEventType: EventType; + // 4. 최종대화 + finalEventMessage: string; + // 5. 최종시간 + finalEventDate: string; + // 6. 참여인원수 + joinUserCount: number; + // 7. 안읽은수 + noReadCnt: number; + // 8. 알람여부 + isAlarm: boolean; + // 9. 참여여부 + isJoinRoom: boolean; + // 10. 유효한파일 이벤트 기준 SEQ + expiredFileStdSeq: number; + // 11. 타이머대화방여부YN + isTimeRoom: boolean; + // 12. 타이머시간(n) + timeRoomInterval: number; +} diff --git a/projects/ucap-webmessenger-protocol-room/src/lib/models/user-info-short.ts b/projects/ucap-webmessenger-protocol-room/src/lib/models/user-info-short.ts new file mode 100644 index 00000000..5be97c66 --- /dev/null +++ b/projects/ucap-webmessenger-protocol-room/src/lib/models/user-info-short.ts @@ -0,0 +1,32 @@ +import { EmployeeType } from '../types/employee.type'; + +export interface UserInfoShort { + // 0. 사용자SEQ + seq: number; + // 1. 사용자명 + name: string; + // 2. 사진파일 + profileImageFile: string; + // 3. 참여여부 + isJoinRoom: boolean; + // 4. 최종확인SEQ + lastReadEventSeq: number; + // 5. MADN + madn: string; + // 6. HARDPHONE_SADN + hardSadn: string; + // 7. FMC_SADN + fmcSadn: string; + // 8. 사용자명(영어) + nameEn: string; + // 9. 사용자명(중국어) + nameCn: string; + // 10. 이용약관동의여부YN + isPrivacyAgree: boolean; + // 11. 유효접속여부YN + isValidLogin: boolean; + // 12. 임직원유형(s) + employeeType: EmployeeType; + // 13. 폰트색(s) + fontColor: string; +} diff --git a/projects/ucap-webmessenger-protocol-room/src/lib/models/user-info.ts b/projects/ucap-webmessenger-protocol-room/src/lib/models/user-info.ts new file mode 100644 index 00000000..23adae01 --- /dev/null +++ b/projects/ucap-webmessenger-protocol-room/src/lib/models/user-info.ts @@ -0,0 +1,65 @@ +import { RoleCode } from '@ucap-webmessenger/protocol-authentication'; +import { EmployeeType } from '../types/employee.type'; + +export interface UserInfo { + // 0. 사용자SEQ + seq: number; + // 1. 사용자명 + name: string; + // 2. 사진파일 + profileImageFile: string; + // 3. 직급 + grade: string; + // 4. 업무소개 + intro: string; + // 5. 기관코드 + companyCode: string; + // 6. 핸드폰번호 + hpNumber: string; + // 7. 내선번호 + lineNumber: string; + // 8. 이메일 + email: string; + // 9. 모바일YN + isMobile: boolean; + // 10. 부서명 + deptName: string; + // 11. 참여 여부 <<<< + isJoinRoom: boolean; + // 12. 최종확인SEQ <<<< + lastReadEventSeq: number; + // 13. ActiveYN + isActive: boolean; + // 14. 역할코드 + roleCd: RoleCode; + // 15. 사번 + employeeNum: string; + // 16. MADN + madn: string; + // 17. HARDPHONE_SADN + hardSadn: string; + // 18. FMC_SADN + fmcSadn: string; + // 19. 사용자명(영어) + nameEn: string; + // 20. 사용자명(중국어) + nameCn: string; + // 21. 직급(영어) + gradeEn: string; + // 22. 직급(중국어) + gradeCn: string; + // 23. 부서명(영어) + deptNameEn: string; + // 24. 부서명(중국어) + deptNameCn: string; + // 25. CALL_MODE <<< + callMode: string; + // 26. 이용약관동의여부YN + isPrivacyAgree: boolean; + // 27. 유효접속여부YN + isValidLogin: boolean; + // 28. 임직원유형(s) + employeeType: EmployeeType; + // 29. 사용자아이디(s) <<< + id: string; +} diff --git a/projects/ucap-webmessenger-protocol-room/src/lib/models/exit.ts b/projects/ucap-webmessenger-protocol-room/src/lib/protocols/exit.ts similarity index 100% rename from projects/ucap-webmessenger-protocol-room/src/lib/models/exit.ts rename to projects/ucap-webmessenger-protocol-room/src/lib/protocols/exit.ts diff --git a/projects/ucap-webmessenger-protocol-room/src/lib/models/info.ts b/projects/ucap-webmessenger-protocol-room/src/lib/protocols/info.ts similarity index 67% rename from projects/ucap-webmessenger-protocol-room/src/lib/models/info.ts rename to projects/ucap-webmessenger-protocol-room/src/lib/protocols/info.ts index 53b9b9c4..b80d4a15 100644 --- a/projects/ucap-webmessenger-protocol-room/src/lib/models/info.ts +++ b/projects/ucap-webmessenger-protocol-room/src/lib/protocols/info.ts @@ -14,129 +14,9 @@ import { RoomType } from '../types/room.type'; import { EventType } from '@ucap-webmessenger/protocol-event'; import { EmployeeType } from '../types/employee.type'; import { RoleCode } from '@ucap-webmessenger/protocol-authentication'; - -export interface RoomInfo { - // 0. 대화방SEQ - roomSeq: string; - // 1. 대화방종류 - roomType: RoomType; - // 2. 대화방명 - roomName: string; - // 3. 최종타입 - finalEventType: EventType; - // 4. 최종대화 - finalEventMessage: string; - // 5. 최종시간 - finalEventDate: string; - // 6. 참여인원수 - joinUserCount: number; - // 7. 안읽은수 - noReadCnt: number; - // 8. 알람여부 - isAlarm: boolean; - // 9. 참여여부 - isJoinRoom: boolean; - // 10. 유효한파일 이벤트 기준 SEQ - expiredFileStdSeq: number; - // 11. 타이머대화방여부YN - isTimeRoom: boolean; - // 12. 타이머시간(n) - timeRoomInterval: number; -} - -export interface UserInfoShort { - // 0. 사용자SEQ - seq: number; - // 1. 사용자명 - name: string; - // 2. 사진파일 - profileImageFile: string; - // 3. 참여여부 - isJoinRoom: boolean; - // 4. 최종확인SEQ - lastReadEventSeq: number; - // 5. MADN - madn: string; - // 6. HARDPHONE_SADN - hardSadn: string; - // 7. FMC_SADN - fmcSadn: string; - // 8. 사용자명(영어) - nameEn: string; - // 9. 사용자명(중국어) - nameCn: string; - // 10. 이용약관동의여부YN - isPrivacyAgree: boolean; - // 11. 유효접속여부YN - isValidLogin: boolean; - // 12. 임직원유형(s) - employeeType: EmployeeType; - // 13. 폰트색(s) - fontColor: string; -} - -export interface UserInfo { - // 0. 사용자SEQ - seq: number; - // 1. 사용자명 - name: string; - // 2. 사진파일 - profileImageFile: string; - // 3. 직급 - grade: string; - // 4. 업무소개 - intro: string; - // 5. 기관코드 - companyCode: string; - // 6. 핸드폰번호 - hpNumber: string; - // 7. 내선번호 - lineNumber: string; - // 8. 이메일 - email: string; - // 9. 모바일YN - isMobile: boolean; - // 10. 부서명 - deptName: string; - // 11. 참여 여부 <<<< - isJoinRoom: boolean; - // 12. 최종확인SEQ <<<< - lastReadEventSeq: number; - // 13. ActiveYN - isActive: boolean; - // 14. 역할코드 - roleCd: RoleCode; - // 15. 사번 - employeeNum: string; - // 16. MADN - madn: string; - // 17. HARDPHONE_SADN - hardSadn: string; - // 18. FMC_SADN - fmcSadn: string; - // 19. 사용자명(영어) - nameEn: string; - // 20. 사용자명(중국어) - nameCn: string; - // 21. 직급(영어) - gradeEn: string; - // 22. 직급(중국어) - gradeCn: string; - // 23. 부서명(영어) - deptNameEn: string; - // 24. 부서명(중국어) - deptNameCn: string; - // 25. CALL_MODE <<< - callMode: string; - // 26. 이용약관동의여부YN - isPrivacyAgree: boolean; - // 27. 유효접속여부YN - isValidLogin: boolean; - // 28. 임직원유형(s) - employeeType: EmployeeType; - // 29. 사용자아이디(s) <<< - id: string; -} +import { RoomInfo } from '../models/room-info'; +import { UserInfoShort } from '../models/user-info-short'; +import { UserInfo } from '../models/user-info'; export interface InfoRequest extends ProtocolRequest { // 0. 대화방SEQ(s) diff --git a/projects/ucap-webmessenger-protocol-room/src/lib/models/invite.ts b/projects/ucap-webmessenger-protocol-room/src/lib/protocols/invite.ts similarity index 100% rename from projects/ucap-webmessenger-protocol-room/src/lib/models/invite.ts rename to projects/ucap-webmessenger-protocol-room/src/lib/protocols/invite.ts diff --git a/projects/ucap-webmessenger-protocol-room/src/lib/models/open.ts b/projects/ucap-webmessenger-protocol-room/src/lib/protocols/open.ts similarity index 100% rename from projects/ucap-webmessenger-protocol-room/src/lib/models/open.ts rename to projects/ucap-webmessenger-protocol-room/src/lib/protocols/open.ts diff --git a/projects/ucap-webmessenger-protocol-room/src/lib/models/update.ts b/projects/ucap-webmessenger-protocol-room/src/lib/protocols/update.ts similarity index 100% rename from projects/ucap-webmessenger-protocol-room/src/lib/models/update.ts rename to projects/ucap-webmessenger-protocol-room/src/lib/protocols/update.ts diff --git a/projects/ucap-webmessenger-protocol-room/src/lib/services/room-protocol.service.ts b/projects/ucap-webmessenger-protocol-room/src/lib/services/room-protocol.service.ts index 579c3b3f..a0109103 100644 --- a/projects/ucap-webmessenger-protocol-room/src/lib/services/room-protocol.service.ts +++ b/projects/ucap-webmessenger-protocol-room/src/lib/services/room-protocol.service.ts @@ -41,13 +41,13 @@ import { Open4Response, encodeOpen4, decodeOpen4 -} from '../models/open'; +} from '../protocols/open'; import { InviteRequest, InviteResponse, encodeInvite, decodeInvite -} from '../models/invite'; +} from '../protocols/invite'; import { InfoRequest, InfoResponse, @@ -63,7 +63,7 @@ import { UserStatusOfflineResponse, encodeUserStatusOffline, decodeUserStatusOffline -} from '../models/info'; +} from '../protocols/info'; import { ExitRequest, ExitResponse, @@ -77,7 +77,7 @@ import { decodeExitForcing, decodeAllExit, ExitAllResponse -} from '../models/exit'; +} from '../protocols/exit'; import { UpdateRequest, UpdateResponse, @@ -91,7 +91,7 @@ import { UpdateFontResponse, encodeUpdateFont, decodeUpdateFont -} from '../models/update'; +} from '../protocols/update'; @Injectable({ providedIn: 'root' diff --git a/projects/ucap-webmessenger-protocol-room/src/public-api.ts b/projects/ucap-webmessenger-protocol-room/src/public-api.ts index f70bf8f3..b1b0e2ea 100644 --- a/projects/ucap-webmessenger-protocol-room/src/public-api.ts +++ b/projects/ucap-webmessenger-protocol-room/src/public-api.ts @@ -2,9 +2,13 @@ * Public API Surface of ucap-webmessenger-protocol-room */ -export * from './lib/models/info'; -export * from './lib/models/invite'; -export * from './lib/models/open'; +export * from './lib/models/room-info'; +export * from './lib/models/user-info'; +export * from './lib/models/user-info-short'; + +export * from './lib/protocols/info'; +export * from './lib/protocols/invite'; +export * from './lib/protocols/open'; export * from './lib/services/room-protocol.service'; export * from './lib/types/employee.type'; diff --git a/projects/ucap-webmessenger-protocol-service/src/lib/models/password-set.ts b/projects/ucap-webmessenger-protocol-service/src/lib/protocols/password-set.ts similarity index 100% rename from projects/ucap-webmessenger-protocol-service/src/lib/models/password-set.ts rename to projects/ucap-webmessenger-protocol-service/src/lib/protocols/password-set.ts diff --git a/projects/ucap-webmessenger-protocol-service/src/lib/services/service-protocol.service.ts b/projects/ucap-webmessenger-protocol-service/src/lib/services/service-protocol.service.ts index 08c646a2..53aa9672 100644 --- a/projects/ucap-webmessenger-protocol-service/src/lib/services/service-protocol.service.ts +++ b/projects/ucap-webmessenger-protocol-service/src/lib/services/service-protocol.service.ts @@ -7,7 +7,7 @@ import { UserPasswordSetResponse, encodeUserPasswordSet, decodeUserPasswordSet -} from '../models/password-set'; +} from '../protocols/password-set'; import { ProtocolService } from '@ucap-webmessenger/protocol'; import { SVC_TYPE_SERVICE, SSVC_TYPE_USER_PW_SET_REQ } from '../types/service'; diff --git a/projects/ucap-webmessenger-protocol-service/src/public-api.ts b/projects/ucap-webmessenger-protocol-service/src/public-api.ts index 45a1791d..7be91d40 100644 --- a/projects/ucap-webmessenger-protocol-service/src/public-api.ts +++ b/projects/ucap-webmessenger-protocol-service/src/public-api.ts @@ -2,7 +2,7 @@ * Public API Surface of ucap-webmessenger-protocol-service */ -export * from './lib/models/password-set'; +export * from './lib/protocols/password-set'; export * from './lib/services/service-protocol.service'; diff --git a/projects/ucap-webmessenger-protocol-status/src/lib/models/status-bulk-info.ts b/projects/ucap-webmessenger-protocol-status/src/lib/models/status-bulk-info.ts new file mode 100644 index 00000000..51b1cb14 --- /dev/null +++ b/projects/ucap-webmessenger-protocol-status/src/lib/models/status-bulk-info.ts @@ -0,0 +1,21 @@ +import { StatusInfo } from './status-info'; +import { + TerminalStatusInfo, + TerminalStatusNumber +} from '../types/terminal-status.type'; + +export interface StatusBulkInfo extends StatusInfo { + // 사용자SEQ + // 상태코드(PC) + // 상태코드(통화) + // 상태코드(모바일) + // 상태코드(PC화상) + // 상태메시지 + // 상태코드(Mobile화상) + // 상태코드(iMessenger) + + /** 단말상태정보(s) */ + terminalStatus: TerminalStatusInfo; + /** 단말상태번호(n) */ + terminalStatusNumber: TerminalStatusNumber; +} diff --git a/projects/ucap-webmessenger-protocol-status/src/lib/models/status-info.ts b/projects/ucap-webmessenger-protocol-status/src/lib/models/status-info.ts new file mode 100644 index 00000000..27dc2aef --- /dev/null +++ b/projects/ucap-webmessenger-protocol-status/src/lib/models/status-info.ts @@ -0,0 +1,20 @@ +import { StatusCode } from '@ucap-webmessenger/core'; + +export interface StatusInfo { + // 사용자SEQ + userSeq: number; + // 상태코드(PC) + pcStatus: StatusCode; + // 상태코드(통화) + phoneStatus: StatusCode; + // 상태코드(모바일) + mobileStatus: StatusCode; + // 상태코드(PC화상) + conferenceStatus: StatusCode; + // 상태메시지 + statusMessage: string; + // 상태코드(Mobile화상) + mobileConferenceStatus: StatusCode; + // 상태코드(iMessenger) + imessengerStatus: StatusCode; +} diff --git a/projects/ucap-webmessenger-protocol-status/src/lib/models/buddy.ts b/projects/ucap-webmessenger-protocol-status/src/lib/protocols/buddy.ts similarity index 94% rename from projects/ucap-webmessenger-protocol-status/src/lib/models/buddy.ts rename to projects/ucap-webmessenger-protocol-status/src/lib/protocols/buddy.ts index dc928574..a6d9e3b6 100644 --- a/projects/ucap-webmessenger-protocol-status/src/lib/models/buddy.ts +++ b/projects/ucap-webmessenger-protocol-status/src/lib/protocols/buddy.ts @@ -5,7 +5,7 @@ import { BodyStringDivider } from '@ucap-webmessenger/protocol'; import { StatusCode } from '@ucap-webmessenger/core'; -import { StatusInfo } from './status'; +import { StatusInfo } from '../models/status-info'; export interface BuddyResponse extends ProtocolResponse { // {상태정보}... diff --git a/projects/ucap-webmessenger-protocol-status/src/lib/models/bulk-info.ts b/projects/ucap-webmessenger-protocol-status/src/lib/protocols/bulk-info.ts similarity index 80% rename from projects/ucap-webmessenger-protocol-status/src/lib/models/bulk-info.ts rename to projects/ucap-webmessenger-protocol-status/src/lib/protocols/bulk-info.ts index 0a9d9bc1..7d644339 100644 --- a/projects/ucap-webmessenger-protocol-status/src/lib/models/bulk-info.ts +++ b/projects/ucap-webmessenger-protocol-status/src/lib/protocols/bulk-info.ts @@ -9,12 +9,13 @@ import { BodyStringDivider, ProtocolStream } from '@ucap-webmessenger/protocol'; -import { StatusType, StatusCode } from '@ucap-webmessenger/core'; -import { StatusInfo } from './status'; +import { StatusCode } from '@ucap-webmessenger/core'; import { TerminalStatusInfo, TerminalStatusNumber } from '../types/terminal-status.type'; +import { StatusInfo } from '../models/status-info'; +import { StatusBulkInfo } from '../models/status-bulk-info'; export interface BulkInfoRequest extends ProtocolRequest { /** DivCD(s) */ @@ -22,21 +23,7 @@ export interface BulkInfoRequest extends ProtocolRequest { /** 사용자SEQ(n)[] */ userSeqs: number[]; } -export interface StatusBulkInfo extends StatusInfo { - // 사용자SEQ - // 상태코드(PC) - // 상태코드(통화) - // 상태코드(모바일) - // 상태코드(PC화상) - // 상태메시지 - // 상태코드(Mobile화상) - // 상태코드(iMessenger) - /** 단말상태정보(s) */ - terminalStatus: TerminalStatusInfo; - /** 단말상태번호(n) */ - terminalStatusNumber: TerminalStatusNumber; -} export interface BulkInfoData extends ProtocolStream { /** DivCD(s) */ divCd: string; diff --git a/projects/ucap-webmessenger-protocol-status/src/lib/models/message-update.ts b/projects/ucap-webmessenger-protocol-status/src/lib/protocols/message-update.ts similarity index 100% rename from projects/ucap-webmessenger-protocol-status/src/lib/models/message-update.ts rename to projects/ucap-webmessenger-protocol-status/src/lib/protocols/message-update.ts diff --git a/projects/ucap-webmessenger-protocol-status/src/lib/models/status.ts b/projects/ucap-webmessenger-protocol-status/src/lib/protocols/status.ts similarity index 82% rename from projects/ucap-webmessenger-protocol-status/src/lib/models/status.ts rename to projects/ucap-webmessenger-protocol-status/src/lib/protocols/status.ts index 7bae2ace..a1e1e47a 100644 --- a/projects/ucap-webmessenger-protocol-status/src/lib/models/status.ts +++ b/projects/ucap-webmessenger-protocol-status/src/lib/protocols/status.ts @@ -10,6 +10,7 @@ import { ProtocolNotification } from '@ucap-webmessenger/protocol'; import { StatusType, StatusCode } from '@ucap-webmessenger/core'; +import { StatusInfo } from '../models/status-info'; export interface StatusRequest extends ProtocolRequest { // 상태타입(s) @@ -29,24 +30,6 @@ export interface StatusResponse extends ProtocolResponse { statusMessage: string; } -export interface StatusInfo { - // 사용자SEQ - userSeq: number; - // 상태코드(PC) - pcStatus: StatusCode; - // 상태코드(통화) - phoneStatus: StatusCode; - // 상태코드(모바일) - mobileStatus: StatusCode; - // 상태코드(PC화상) - conferenceStatus: StatusCode; - // 상태메시지 - statusMessage: string; - // 상태코드(Mobile화상) - mobileConferenceStatus: StatusCode; - // 상태코드(iMessenger) - imessengerStatus: StatusCode; -} export interface StatusNotification extends StatusInfo, ProtocolNotification {} export const encodeStatus: ProtocolEncoder = ( diff --git a/projects/ucap-webmessenger-protocol-status/src/lib/models/subscribe.ts b/projects/ucap-webmessenger-protocol-status/src/lib/protocols/subscribe.ts similarity index 97% rename from projects/ucap-webmessenger-protocol-status/src/lib/models/subscribe.ts rename to projects/ucap-webmessenger-protocol-status/src/lib/protocols/subscribe.ts index a6a18555..54f202b2 100644 --- a/projects/ucap-webmessenger-protocol-status/src/lib/models/subscribe.ts +++ b/projects/ucap-webmessenger-protocol-status/src/lib/protocols/subscribe.ts @@ -10,7 +10,7 @@ import { ProtocolStream } from '@ucap-webmessenger/protocol'; import { StatusCode } from '@ucap-webmessenger/core'; -import { StatusInfo } from './status'; +import { StatusInfo } from '../models/status-info'; export interface SubscribeRequest extends ProtocolRequest { // 사용자SEQ(n)... diff --git a/projects/ucap-webmessenger-protocol-status/src/lib/models/unsubscribe.ts b/projects/ucap-webmessenger-protocol-status/src/lib/protocols/unsubscribe.ts similarity index 92% rename from projects/ucap-webmessenger-protocol-status/src/lib/models/unsubscribe.ts rename to projects/ucap-webmessenger-protocol-status/src/lib/protocols/unsubscribe.ts index d4bc92cb..41f71711 100644 --- a/projects/ucap-webmessenger-protocol-status/src/lib/models/unsubscribe.ts +++ b/projects/ucap-webmessenger-protocol-status/src/lib/protocols/unsubscribe.ts @@ -5,7 +5,7 @@ import { PacketBody, PacketBodyValue } from '@ucap-webmessenger/protocol'; -import { StatusInfo } from './status'; +import { StatusInfo } from '../models/status-info'; export interface UnSubscribeRequest extends ProtocolRequest { // 사용자SEQ(n)... diff --git a/projects/ucap-webmessenger-protocol-status/src/lib/services/status-protocol.service.ts b/projects/ucap-webmessenger-protocol-status/src/lib/services/status-protocol.service.ts index 02c8469e..adaefd64 100644 --- a/projects/ucap-webmessenger-protocol-status/src/lib/services/status-protocol.service.ts +++ b/projects/ucap-webmessenger-protocol-status/src/lib/services/status-protocol.service.ts @@ -9,7 +9,7 @@ import { encodeStatus, decodeStatus, StatusResponse -} from '../models/status'; +} from '../protocols/status'; import { SVC_TYPE_STATUS, SSVC_TYPE_STATUS_REQ, @@ -28,21 +28,24 @@ import { encodeBulkInfo, decodeBulkInfo, decodeBulkInfoData -} from '../models/bulk-info'; -import { BuddyResponse, decodeBuddy } from '../models/buddy'; +} from '../protocols/bulk-info'; +import { BuddyResponse, decodeBuddy } from '../protocols/buddy'; import { MessageUpdateRequest, MessageUpdateResponse, encodeMessageUpdate, decodeMessageUpdate -} from '../models/message-update'; +} from '../protocols/message-update'; import { SubscribeRequest, SubscribeResponse, decodeSubscribe, encodeSubscribe -} from '../models/subscribe'; -import { UnSubscribeRequest, encodeUnSubscribe } from '../models/unsubscribe'; +} from '../protocols/subscribe'; +import { + UnSubscribeRequest, + encodeUnSubscribe +} from '../protocols/unsubscribe'; @Injectable({ providedIn: 'root' diff --git a/projects/ucap-webmessenger-protocol-status/src/public-api.ts b/projects/ucap-webmessenger-protocol-status/src/public-api.ts index 0734d407..23f2868c 100644 --- a/projects/ucap-webmessenger-protocol-status/src/public-api.ts +++ b/projects/ucap-webmessenger-protocol-status/src/public-api.ts @@ -1,13 +1,15 @@ /* * Public API Surface of ucap-webmessenger-protocol-status */ +export * from './lib/models/status-bulk-info'; +export * from './lib/models/status-info'; -export * from './lib/models/buddy'; -export * from './lib/models/bulk-info'; -export * from './lib/models/message-update'; -export * from './lib/models/status'; -export * from './lib/models/subscribe'; -export * from './lib/models/unsubscribe'; +export * from './lib/protocols/buddy'; +export * from './lib/protocols/bulk-info'; +export * from './lib/protocols/message-update'; +export * from './lib/protocols/status'; +export * from './lib/protocols/subscribe'; +export * from './lib/protocols/unsubscribe'; export * from './lib/services/status-protocol.service'; diff --git a/projects/ucap-webmessenger-protocol-sync/src/lib/models/buddy-info.ts b/projects/ucap-webmessenger-protocol-sync/src/lib/models/buddy-info.ts new file mode 100644 index 00000000..0576860c --- /dev/null +++ b/projects/ucap-webmessenger-protocol-sync/src/lib/models/buddy-info.ts @@ -0,0 +1,8 @@ +export interface BuddyInfo { + // 사용자SEQ + seq: number; + // 즐.찾 여부 + isFavorit: boolean; + // 친구여부 + isBuddy: boolean; +} diff --git a/projects/ucap-webmessenger-protocol-sync/src/lib/models/group-info.ts b/projects/ucap-webmessenger-protocol-sync/src/lib/models/group-info.ts new file mode 100644 index 00000000..ac1b4d06 --- /dev/null +++ b/projects/ucap-webmessenger-protocol-sync/src/lib/models/group-info.ts @@ -0,0 +1,10 @@ +export interface GroupInfo { + // 그룹SEQ(n) + seq: number; + // 그룹이름(s) + name: string; + // ActiveYN(s) + isActive: boolean; + // 사용자SEQ(s) + userSeqStr: string; +} diff --git a/projects/ucap-webmessenger-protocol-sync/src/lib/models/buddy.ts b/projects/ucap-webmessenger-protocol-sync/src/lib/protocols/buddy.ts similarity index 95% rename from projects/ucap-webmessenger-protocol-sync/src/lib/models/buddy.ts rename to projects/ucap-webmessenger-protocol-sync/src/lib/protocols/buddy.ts index 789fb05a..cdfd8e64 100644 --- a/projects/ucap-webmessenger-protocol-sync/src/lib/models/buddy.ts +++ b/projects/ucap-webmessenger-protocol-sync/src/lib/protocols/buddy.ts @@ -11,15 +11,7 @@ import { } from '@ucap-webmessenger/protocol'; import { UserInfo } from '../types/userInfo'; import { EmployeeType } from '@ucap-webmessenger/protocol-room'; - -export interface BuddyInfo { - // 사용자SEQ - seq: number; - // 즐.찾 여부 - isFavorit: boolean; - // 친구여부 - isBuddy: boolean; -} +import { BuddyInfo } from '../models/buddy-info'; export interface BuddyRequest extends ProtocolRequest { // 0. 동료 씽크일시(s) cf)2019-09-24 16:51:42 diff --git a/projects/ucap-webmessenger-protocol-sync/src/lib/models/group.ts b/projects/ucap-webmessenger-protocol-sync/src/lib/protocols/group.ts similarity index 92% rename from projects/ucap-webmessenger-protocol-sync/src/lib/models/group.ts rename to projects/ucap-webmessenger-protocol-sync/src/lib/protocols/group.ts index 95e9b49f..f8f47177 100644 --- a/projects/ucap-webmessenger-protocol-sync/src/lib/models/group.ts +++ b/projects/ucap-webmessenger-protocol-sync/src/lib/protocols/group.ts @@ -9,17 +9,8 @@ import { BodyStringDivider, ProtocolStream } from '@ucap-webmessenger/protocol'; +import { GroupInfo } from '../models/group-info'; -export interface GroupInfo { - // 그룹SEQ(n) - seq: number; - // 그룹이름(s) - name: string; - // ActiveYN(s) - isActive: boolean; - // 사용자SEQ(s) - userSeqStr: string; -} export interface GroupRequest extends ProtocolRequest { // 0. 동료 씽크일시(s) cf)2019-09-24 16:51:42 syncDate: string; diff --git a/projects/ucap-webmessenger-protocol-sync/src/lib/models/room.ts b/projects/ucap-webmessenger-protocol-sync/src/lib/protocols/room.ts similarity index 100% rename from projects/ucap-webmessenger-protocol-sync/src/lib/models/room.ts rename to projects/ucap-webmessenger-protocol-sync/src/lib/protocols/room.ts diff --git a/projects/ucap-webmessenger-protocol-sync/src/lib/services/sync-protocol.service.ts b/projects/ucap-webmessenger-protocol-sync/src/lib/services/sync-protocol.service.ts index 3233574a..f9304bb3 100644 --- a/projects/ucap-webmessenger-protocol-sync/src/lib/services/sync-protocol.service.ts +++ b/projects/ucap-webmessenger-protocol-sync/src/lib/services/sync-protocol.service.ts @@ -13,7 +13,7 @@ import { decodeBuddy, decodeBuddyDetailData, BuddyDetailData -} from '../models/buddy'; +} from '../protocols/buddy'; import { SVC_TYPE_SYNC_BUDDY, SSVC_TYPE_SYNC_BUDDY_REQ, @@ -50,7 +50,7 @@ import { decodeGroup, decodeGroupData, GroupDetailData -} from '../models/group'; +} from '../protocols/group'; import { RoomRequest, RoomResponse, @@ -62,7 +62,7 @@ import { decodeRoomData, decodeRoomUserData, decodeRoomUserDataDetail -} from '../models/room'; +} from '../protocols/room'; @Injectable({ providedIn: 'root' diff --git a/projects/ucap-webmessenger-protocol-sync/src/public-api.ts b/projects/ucap-webmessenger-protocol-sync/src/public-api.ts index b8e35a3f..7ec5d221 100644 --- a/projects/ucap-webmessenger-protocol-sync/src/public-api.ts +++ b/projects/ucap-webmessenger-protocol-sync/src/public-api.ts @@ -1,9 +1,13 @@ /* * Public API Surface of ucap-webmessenger-protocol-sync */ -export * from './lib/models/buddy'; -export * from './lib/models/group'; -export * from './lib/models/room'; + +export * from './lib/models/buddy-info'; +export * from './lib/models/group-info'; + +export * from './lib/protocols/buddy'; +export * from './lib/protocols/group'; +export * from './lib/protocols/room'; export * from './lib/services/sync-protocol.service'; diff --git a/projects/ucap-webmessenger-protocol/src/lib/models/packet.ts b/projects/ucap-webmessenger-protocol/src/lib/protocols/packet.ts similarity index 100% rename from projects/ucap-webmessenger-protocol/src/lib/models/packet.ts rename to projects/ucap-webmessenger-protocol/src/lib/protocols/packet.ts diff --git a/projects/ucap-webmessenger-protocol/src/lib/models/protocol.ts b/projects/ucap-webmessenger-protocol/src/lib/protocols/protocol.ts similarity index 100% rename from projects/ucap-webmessenger-protocol/src/lib/models/protocol.ts rename to projects/ucap-webmessenger-protocol/src/lib/protocols/protocol.ts diff --git a/projects/ucap-webmessenger-protocol/src/lib/services/protocol.service.ts b/projects/ucap-webmessenger-protocol/src/lib/services/protocol.service.ts index 6776e647..df698334 100644 --- a/projects/ucap-webmessenger-protocol/src/lib/services/protocol.service.ts +++ b/projects/ucap-webmessenger-protocol/src/lib/services/protocol.service.ts @@ -13,14 +13,14 @@ import { import { _MODULE_CONFIG } from '../types/token'; import { ModuleConfig } from '../types/module-config'; -import { PacketBody } from '../models/packet'; +import { PacketBody } from '../protocols/packet'; import { PacketBodyValueDivider, PacketBodyDivider } from '../types/packet-body-divider'; import { PacketBodyValue } from '../types/packet-body-value.type'; import { SSVC_TYPE_ERROR_RES, ServerErrorCode } from '../types/service'; -import { ProtocolMessage } from '../models/protocol'; +import { ProtocolMessage } from '../protocols/protocol'; import { NGXLogger } from 'ngx-logger'; diff --git a/projects/ucap-webmessenger-protocol/src/public-api.ts b/projects/ucap-webmessenger-protocol/src/public-api.ts index df9dea2f..c0cd2637 100644 --- a/projects/ucap-webmessenger-protocol/src/public-api.ts +++ b/projects/ucap-webmessenger-protocol/src/public-api.ts @@ -2,8 +2,8 @@ * Public API Surface of ucap-webmessenger-protocol */ -export * from './lib/models/packet'; -export * from './lib/models/protocol'; +export * from './lib/protocols/packet'; +export * from './lib/protocols/protocol'; export * from './lib/services/protocol.service'; diff --git a/projects/ucap-webmessenger-ui-organization/src/lib/components/tree.component.html b/projects/ucap-webmessenger-ui-organization/src/lib/components/tree.component.html index 6d4f7b5b..5a64567b 100644 --- a/projects/ucap-webmessenger-ui-organization/src/lib/components/tree.component.html +++ b/projects/ucap-webmessenger-ui-organization/src/lib/components/tree.component.html @@ -6,12 +6,14 @@ >
  • -
    {{ node.title }}
    +
    + {{ node.title }} +
  • -
    +