peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-19 04:57:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

code refactoring

Browse Source
This commit is contained in:
Peter Maquiran
2024-08-18 13:27:57 +01:00
parent 650c772084
commit ef12ff439d
50 changed files with 729 additions and 735 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/ui/chat/component/edit-group/edit-group.page.ts
+4 -3
View File
@@ -7,7 +7,8 @@ import { HttpResponse } from '@microsoft/signalr';
import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
import { ToastService } from 'src/app/services/toast.service';
import { ZodError } from 'zod';
import { RoomRepositoryService } from 'src/app/module/chat/data/repository/room-repository.service'
import { ChatServiceService } from 'src/app/module/chat/domain/chat-service.service';
@Component({
@@ -33,9 +34,9 @@ export class EditGroupPage implements OnInit {
private modalController: ModalController,
private pickerController: PickerController,
public ThemeService: ThemeService,
private RoomRepositoryService: RoomRepositoryService,
private httpErrorHandle: HttpErrorHandle,
private toastService: ToastService,
private chatServiceService: ChatServiceService,
) {
this.loggedUser = SessionStore.user.ChatData['data'];
}
@@ -67,7 +68,7 @@ export class EditGroupPage implements OnInit {
async changeGroupName() {
this.showLoader = true
const result = await this.RoomRepositoryService.updateRoomBy({
const result = await this.chatServiceService.updateRoomById({
roomId: this.roomId,
roomName: this.groupName,
roomType: 0
src/app/ui/chat/component/group-messages/group-contacts/group-contacts.page.ts
+9 -8
View File
@@ -2,14 +2,14 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
import { ThemeService } from 'src/app/services/theme.service'
import { ContactRepositoryService } from 'src/app/services/Repositorys/contacts/repository/contacts-repository.service';
import { UserContacts } from 'src/app/services/Repositorys/contacts/data-source/contacts-data-source.service';
import { RoomRepositoryService } from 'src/app/module/chat/data/repository/room-repository.service'
import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
import { SessionStore } from 'src/app/store/session.service';
import { HttpRequest } from '@angular/common/http';
import { ZodError } from 'zod';
import { HttpResponse } from '@microsoft/signalr';
import { ToastService } from 'src/app/services/toast.service';
import { ChatServiceService } from 'src/app/module/chat/domain/chat-service.service';
import { MemberListLocalRepository } from 'src/app/module/chat/data/repository/member-list-local-repository.service'
@Component({
selector: 'app-group-contacts',
@@ -35,9 +35,10 @@ export class GroupContactsPage implements OnInit {
constructor(
public ThemeService: ThemeService,
private contactsRepositoryService: ContactRepositoryService,
private RoomRepositoryService: RoomRepositoryService,
private httpErrorHandle: HttpErrorHandle,
private toastService: ToastService,
private chatServiceService: ChatServiceService,
private MemberListLocalRepository: MemberListLocalRepository,
){}
ngOnInit(): void {
@@ -52,7 +53,7 @@ export class GroupContactsPage implements OnInit {
if(this.hasMemberToUpload) {
this.showLoader = true;
const addMembers = await this.RoomRepositoryService.addMemberToRoom({
const addMembers = await this.chatServiceService.addMemberToRoom({
id: this.roomId,
members: this.selectedUsers
})
@@ -62,7 +63,7 @@ export class GroupContactsPage implements OnInit {
console.log('addMembers', addMembers)
// this.addContacts(this.roomId);
this.openGroupMessage.emit(this.roomId);
this.RoomRepositoryService.getRoomById(this.roomId);
this.chatServiceService.getRoomById(this.roomId);
} else if(addMembers.error instanceof HttpRequest) {
this.httpErrorHandle.httpStatusHandle(addMembers.error)
}
@@ -80,7 +81,7 @@ export class GroupContactsPage implements OnInit {
async loadUsers() {
const getallChatUsers = await this.contactsRepositoryService.getUsers()
const getRoomById = await this.RoomRepositoryService.getRoomById(this.roomId)
const getRoomById = await this.chatServiceService.getRoomById(this.roomId)
console.log({getallChatUsers, getRoomById})
@@ -96,7 +97,7 @@ export class GroupContactsPage implements OnInit {
return 0;
});
const currentMemberToMap = await this.RoomRepositoryService.getRoomMemberById(this.roomId)
const currentMemberToMap = await this.MemberListLocalRepository.getRoomMemberById(this.roomId)
console.log({currentMemberToMap})
@@ -195,7 +196,7 @@ export class GroupContactsPage implements OnInit {
async deleteMember(user: UserContacts) {
this.showLoader = true;
const result = await this.RoomRepositoryService.removeMemberToRoom({
const result = await this.chatServiceService.removeMemberToRoom({
id: this.roomId,
members: [ user.wxUserId]
})
src/app/ui/chat/component/messages/contacts/contacts.page.ts
+5 -3
View File
@@ -7,10 +7,12 @@ import { ThemeService } from 'src/app/services/theme.service'
import { SessionStore } from 'src/app/store/session.service';
import { ContactRepositoryService } from 'src/app/services/Repositorys/contacts/repository/contacts-repository.service';
import { UserContacts } from 'src/app/services/Repositorys/contacts/data-source/contacts-data-source.service';
import { RoomRepositoryService } from 'src/app/module/chat/data/repository/room-repository.service'
import { HttpErrorResponse } from '@angular/common/http';
import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
import { ToastService } from 'src/app/services/toast.service';
import { ChatServiceService } from 'src/app/module/chat/domain/chat-service.service'
class UserToSelect {
@@ -48,9 +50,9 @@ export class ContactsPage implements OnInit {
public ThemeService: ThemeService,
// public ChatSystemService: ChatSystemService,
private contactsRepositoryService: ContactRepositoryService,
private roomRepositoryService: RoomRepositoryService,
private httpErrorHandle: HttpErrorHandle,
private toastService: ToastService,
private ChatServiceService: ChatServiceService
) {
this.loggedUser = SessionStore.user.ChatData['data'];
this.textSearch = "";
@@ -152,7 +154,7 @@ export class ContactsPage implements OnInit {
}
async createRoom(username: string, wxUserId: number) {
const result = await this.roomRepositoryService.create({
const result = await this.ChatServiceService.createRoom({
roomName: username,
createdBy: SessionStore.user.UserId,
roomType: 0,
src/app/ui/chat/component/messages/messages.page.ts
+12 -10
View File
@@ -23,7 +23,8 @@ import { PermissionService } from 'src/app/services/permission.service';
import { Observable as DexieObservable } from 'Dexie';
import { Subscription } from 'rxjs';
import { MessageRepositoryService } from 'src/app/module/chat/data/repository/message-respository.service'
import { RoomRepositoryService } from 'src/app/module/chat/data/repository/room-repository.service'
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 { 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';
@@ -148,7 +149,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
private platform: Platform,
private fileOpener: FileOpener,
public p: PermissionService,
private roomRepositoryService: RoomRepositoryService,
private MemberListLocalRepository: MemberListLocalRepository,
private messageRepositoryService: MessageRepositoryService,
private userTypingServiceRepository: UserTypingServiceRepository,
private chatServiceService: ChatServiceService,
@@ -156,6 +157,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
private FilePickerWebService: FilePickerWebService,
private FilePickerService: FilePickerService,
private SpeakerService: SpeakerService,
private RoomLocalRepository: RoomLocalRepository
) {
// update
this.checkAudioPermission()
@@ -164,7 +166,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
ngOnChanges(changes: SimpleChanges): void {
this.roomData$ = this.roomRepositoryService.getItemByIdLive(this.roomId)
this.roomData$ = this.RoomLocalRepository.getRoomByIdLive(this.roomId)
this.getMessages();
this.listenToIncomingMessage();
this.listenToDeleteMessage();
@@ -172,9 +174,9 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
this.listenToSendMessage()
// this.roomMessage$ = this.messageRepositoryService.getItemsLive(this.roomId)
this.roomMembers$ = this.roomRepositoryService.getRoomMemberByIdLive(this.roomId) as any
this.roomStatus$ = this.roomRepositoryService.getRoomStatus(this.roomId)
this.roomRepositoryService.getRoomById(this.roomId)
this.roomMembers$ = this.MemberListLocalRepository.getRoomMemberByIdLive(this.roomId) as any
this.roomStatus$ = this.MemberListLocalRepository.allMemberOnline(this.roomId)
this.chatServiceService.getRoomById(this.roomId)
this.userTypingServiceRepository.getUserTypingLive().subscribe((e) => {
const arrayNames = e.map(e => e.userName)
@@ -194,7 +196,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
this.messages1[this.roomId] = []
this.messages1[this.roomId] = messages
this.messages1[this.roomId].push(LastMessage)
this.loadAttachment()
@@ -212,8 +214,8 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
message.attachments[0].safeFile = result.value
}
})
}
}
}
}
}
@@ -229,7 +231,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
this.messages1[this.roomId].splice(index, 1);
}
}
async onImageError() {}
src/app/ui/chat/component/new-group/new-group.page.ts
+4 -3
View File
@@ -7,8 +7,9 @@ import { SessionStore } from 'src/app/store/session.service';
import { ThemeService } from 'src/app/services/theme.service';
import { RouteService } from 'src/app/services/route.service';
import { HttpErrorResponse } from '@angular/common/http';
import { RoomRepositoryService } from 'src/app/module/chat/data/repository/room-repository.service'
import { HttpErrorHandle } from 'src/app/services/http-error-handle.service'
import { ChatServiceService } from 'src/app/module/chat/domain/chat-service.service'
@Component({
selector: 'app-new-group',
@@ -50,8 +51,8 @@ export class NewGroupPage implements OnInit{
public ThemeService: ThemeService,
private RouteService: RouteService,
private viewContainerRef: ViewContainerRef,
private roomRepositoryService: RoomRepositoryService,
private httpErrorHandle: HttpErrorHandle,
private ChatServiceService: ChatServiceService
)
{
this.loggedUserChat = SessionStore.user.ChatData['data'];
@@ -119,7 +120,7 @@ export class NewGroupPage implements OnInit{
}
async createGroup1() {
const result = await this.roomRepositoryService.create({
const result = await this.ChatServiceService.createRoom({
roomName: this.groupName,
createdBy: SessionStore.user.UserId,
roomType: 0,