diff --git a/src/app/services/chat/chat-methods.service.ts b/src/app/services/chat/chat-methods.service.ts deleted file mode 100644 index e22f6ddc0..000000000 --- a/src/app/services/chat/chat-methods.service.ts +++ /dev/null @@ -1,31 +0,0 @@ -import { Injectable } from '@angular/core'; -import { ChatService } from '../chat.service'; - -@Injectable({ - providedIn: 'root' -}) -export class ChatMethodsService { - - constructor(private chatService: ChatService) { - } - - sendMessage(roomId:string, data:any) { - - let body = { - "message": - { - "rid": roomId, - "msg":"", - "file":{ - "type": "application/meeting", - "subject": data.subject, - "start_date": data.start, - "end_date": data.end, - "venue": data.venue, - "id": data.id, - } - } - } - this.chatService.sendMessage(body).subscribe(res=> {}); - } -} diff --git a/src/app/services/chat/chat-methods.service.spec.ts b/src/app/services/chat/chat-user.service.spec.ts similarity index 51% rename from src/app/services/chat/chat-methods.service.spec.ts rename to src/app/services/chat/chat-user.service.spec.ts index 3e474e69d..089b979cf 100644 --- a/src/app/services/chat/chat-methods.service.spec.ts +++ b/src/app/services/chat/chat-user.service.spec.ts @@ -1,13 +1,13 @@ import { TestBed } from '@angular/core/testing'; -import { ChatMethodsService } from './chat-methods.service'; +import { ChatUserService } from './chat-user.service'; -describe('ChatMethodsService', () => { - let service: ChatMethodsService; +describe('ChatUserService', () => { + let service: ChatUserService; beforeEach(() => { TestBed.configureTestingModule({}); - service = TestBed.inject(ChatMethodsService); + service = TestBed.inject(ChatUserService); }); it('should be created', () => { diff --git a/src/app/services/chat/chat-user.service.ts b/src/app/services/chat/chat-user.service.ts new file mode 100644 index 000000000..7a8fd0a8d --- /dev/null +++ b/src/app/services/chat/chat-user.service.ts @@ -0,0 +1,9 @@ +import { Injectable } from '@angular/core'; + +@Injectable({ + providedIn: 'root' +}) +export class ChatUserService { + + constructor() { } +} diff --git a/src/app/services/chat/chat.service.ts b/src/app/services/chat/chat.service.ts index 0d00005d1..f5a29fc46 100644 --- a/src/app/services/chat/chat.service.ts +++ b/src/app/services/chat/chat.service.ts @@ -1,9 +1,29 @@ import { Injectable } from '@angular/core'; +import { RoomService } from './room.service'; +import { RocketChatClientService } from 'src/app/services/socket/rocket-chat-client.service'; +import { MessageService } from 'src/app/services/chat/message.service' @Injectable({ providedIn: 'root' }) export class ChatService { - constructor() { } + rooms: RoomService[] = [] + group = [] + + constructor( + private RocketChatClientService: RocketChatClientService + ) { + this.getAllRoomAndSubscribe() + } + + getAllRoomAndSubscribe() { + this.RocketChatClientService.getRooms().then((rooms: any) => { + rooms.result.update.forEach((roomData:any) => { + const room = new RoomService(new RocketChatClientService(), new MessageService()) + room.setData({id: roomData.lastMessage.rid}) + }); + }); + } + } diff --git a/src/app/services/chat/methods.service.spec.ts b/src/app/services/chat/message.service.spec.ts similarity index 54% rename from src/app/services/chat/methods.service.spec.ts rename to src/app/services/chat/message.service.spec.ts index f8337c418..1db761b5e 100644 --- a/src/app/services/chat/methods.service.spec.ts +++ b/src/app/services/chat/message.service.spec.ts @@ -1,13 +1,13 @@ import { TestBed } from '@angular/core/testing'; -import { MethodsService } from './methods.service'; +import { MessageService } from './message.service'; -describe('MethodsService', () => { - let service: MethodsService; +describe('MessageService', () => { + let service: MessageService; beforeEach(() => { TestBed.configureTestingModule({}); - service = TestBed.inject(MethodsService); + service = TestBed.inject(MessageService); }); it('should be created', () => { diff --git a/src/app/services/chat/message.service.ts b/src/app/services/chat/message.service.ts new file mode 100644 index 000000000..b22bacf6c --- /dev/null +++ b/src/app/services/chat/message.service.ts @@ -0,0 +1,9 @@ +import { Injectable } from '@angular/core'; + +@Injectable({ + providedIn: 'root' +}) +export class MessageService { + + constructor() { } +} diff --git a/src/app/services/chat/methods.service.ts b/src/app/services/chat/methods.service.ts deleted file mode 100644 index d46b19283..000000000 --- a/src/app/services/chat/methods.service.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { Injectable } from '@angular/core'; -import { ChatService } from '../chat.service'; - -@Injectable({ - providedIn: 'root' -}) -export class MethodsService { - - constructor(private chatService: ChatService) { - } -} diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts index 7bfb8d36e..c921a754c 100644 --- a/src/app/services/chat/room.service.ts +++ b/src/app/services/chat/room.service.ts @@ -1,9 +1,28 @@ -import { Injectable } from '@angular/core'; - +import { Injectable } from '@angular/core' +import { RocketChatClientService } from 'src/app/services/socket/rocket-chat-client.service'; +import { MessageService } from 'src/app/services/chat/message.service' +import { ChatUserService } from 'src/app/services/chat/chat-user.service' @Injectable({ providedIn: 'root' }) export class RoomService { - constructor() { } + massages: MessageService[] = [] + chatUser: ChatUserService[] = [] + id = [] + + constructor( + private RocketChatClientService: RocketChatClientService, + private MessageService: MessageService + ) {} + + setData({id}){ + this.id= id + } + + create() {} + sendMessage() {} + deleteMessage() {} + ReactToMessage() {} + }