code refactor

This commit is contained in:
Peter Maquiran
2024-08-18 15:40:43 +01:00
parent ef12ff439d
commit 29d0a9b55e
39 changed files with 191 additions and 464 deletions
@@ -21,10 +21,8 @@ import { ViewMediaPage } from 'src/app/modals/view-media/view-media.page';
//======
import { Observable as DexieObservable } from 'Dexie';
import { Subscription } from 'rxjs';
import { MessageRepositoryService } from 'src/app/module/chat/data/repository/message-respository.service'
import { MessageTable } from 'src/app/module/chat/infra/database/dexie/schema/message';
import { RoomListItemOutPutDTO } from 'src/app/module/chat/data/dto/room/roomListOutputDTO';
import { UserTypingServiceRepository } from 'src/app/module/chat/data/repository/user-typing-repository.service';
import { ChatServiceService } from 'src/app/module/chat/domain/chat-service.service';
import { EditMessagePage } from 'src/app/modals/edit-message/edit-message.page';
import { MessageEntity } from 'src/app/module/chat/domain/entity/message';
@@ -44,6 +42,11 @@ import { allowedDocExtension } from 'src/app/utils/allowedDocExtension';
import { JSFileToDataUrl } from 'src/app/utils/ToBase64';
import { RoomLocalRepository } from 'src/app/module/chat/data/repository/room-local-repository.service'
import { MemberListLocalRepository } from 'src/app/module/chat/data/repository/member-list-local-repository.service'
import { UserTypingLocalRepository } from 'src/app/module/chat/data/repository/user-typing-local-data-source.service';
import { UserTypingRemoteRepositoryService } from 'src/app/module/chat/data/repository/user-typing-live-data-source.service';
import { MessageLocalDataSourceService } from 'src/app/module/chat/data/repository/message-local-data-source.service';
const IMAGE_DIR = 'stored-images';
@Component({
@@ -138,8 +141,6 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
private platform: Platform,
private storage: Storage,
private sanitiser: DomSanitizer,
private messageRepositoryService: MessageRepositoryService,
private userTypingServiceRepository: UserTypingServiceRepository,
private chatServiceService: ChatServiceService,
private FilePickerService: FilePickerService,
private CameraService: CameraService,
@@ -147,6 +148,9 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
private FilePickerWebService: FilePickerWebService,
private RoomLocalRepository: RoomLocalRepository,
private MemberListLocalRepository: MemberListLocalRepository,
private userTypingLocalRepository: UserTypingLocalRepository,
private UserTypingRemoteRepositoryService: UserTypingRemoteRepositoryService,
private messageLocalDataSourceService: MessageLocalDataSourceService,
) {
@@ -167,7 +171,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
this.roomStatus$ = this.MemberListLocalRepository.allMemberOnline(this.roomId)
// this.roomRepositoryService.getRoomById(this.roomId)
this.userTypingServiceRepository.getUserTypingLive().subscribe((e) => {
this.userTypingLocalRepository.getUserTypingLive().subscribe((e) => {
const arrayNames = e.map(e => e.userName)
this.userTyping$ = e as any
@@ -182,7 +186,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
// dont remove this line
this.messages1[this.roomId] = []
let messages = await this.messageRepositoryService.getItems(this.roomId)
let messages = await this.messageLocalDataSourceService.getItems(this.roomId)
this.messages1[this.roomId] = []
this.messages1[this.roomId] = messages
@@ -1217,6 +1221,6 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
}
sendTyping() {
this.userTypingServiceRepository.addUserTyping(this.roomId)
this.UserTypingRemoteRepositoryService.sendTyping(this.roomId)
}
}