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

reorganizde file path

Browse Source
This commit is contained in:
Peter Maquiran
2024-08-27 09:14:59 +01:00
parent 98975856c1
commit e80082f9e8
54 changed files with 236 additions and 454 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/module/chat/data/repository/attachment-local-repository.service.ts → src/app/module/chat/data/repository/attachment/attachment-local-repository.service.ts
+2 -2
View File
@@ -1,8 +1,8 @@
import { Injectable } from '@angular/core';
import { Subject } from 'rxjs';
import { DexieRepository } from 'src/app/infra/repository/dexie/dexie-repository.service';
import { chatDatabase } from '../../infra/database/dexie/service';
import { AttachmentTable, AttachmentTableSchema } from '../../infra/database/dexie/schema/attachment';
import { chatDatabase } from '../../../infra/database/dexie/service';
import { AttachmentTable, AttachmentTableSchema } from '../../../infra/database/dexie/schema/attachment';
@Injectable({
providedIn: 'root'
src/app/module/chat/data/repository/attachment-remote-repository.service.ts → src/app/module/chat/data/repository/attachment/attachment-remote-repository.service.ts
+2 -2
View File
@@ -1,8 +1,8 @@
import { Injectable, Input } from '@angular/core';
import { HttpService } from 'src/app/services/http.service';
import { DataSourceReturn } from 'src/app/services/Repositorys/type';
import { MessageOutPutDTO } from '../dto/message/messageOutputDTO';
import { MessageAttachmentByMessageIdInput } from '../../domain/use-case/message-attachment-by-message-id.service';
import { MessageOutPutDTO } from '../../dto/message/messageOutputDTO';
import { MessageAttachmentByMessageIdInput } from '../../../domain/use-case/message/message-attachment-by-message-id.service';
@Injectable({
providedIn: 'root'
src/app/module/chat/data/repository/member-list-local-repository.service.ts → src/app/module/chat/data/repository/member/member-list-local-repository.service.ts
+3 -3
View File
@@ -2,11 +2,11 @@ import { Injectable } from '@angular/core';
import { Dexie, EntityTable, liveQuery, Observable } from 'Dexie';
import { z } from 'zod';
import { DexieRepository } from 'src/app/infra/repository/dexie/dexie-repository.service';
import { chatDatabase } from '../../infra/database/dexie/service';
import { chatDatabase } from '../../../infra/database/dexie/service';
import { ok } from 'neverthrow';
import { err, Result } from 'neverthrow';
import { MemberListUPdateStatusInputDTO } from '../../domain/use-case/socket/member-list-update-status-use-case.service';
import { MemberTable, MemberTableSchema } from '../../infra/database/dexie/schema/members';
import { MemberListUPdateStatusInputDTO } from '../../../domain/use-case/socket/member-list-update-status-use-case.service';
import { MemberTable, MemberTableSchema } from '../../../infra/database/dexie/schema/members';
import { from } from 'rxjs';
@Injectable({
src/app/module/chat/data/repository/member-list-remote-repository.service.ts → src/app/module/chat/data/repository/member/member-list-remote-repository.service.ts
+2 -2
View File
@@ -3,8 +3,8 @@ import { Result } from 'neverthrow';
import { ValidateSchema } from 'src/app/services/decorators/validate-schema.decorator';
import { HttpService } from 'src/app/services/http.service';
import { DataSourceReturn } from 'src/app/services/Repositorys/type';
import { AddMemberToRoomInputDTOSchema, AddMemberToRoomInputDTO } from '../dto/room/addMemberToRoomInputDto';
import { UserRemoveListInputDTOSchema, UserRemoveListInputDTO } from '../dto/room/userRemoveListInputDTO';
import { AddMemberToRoomInputDTOSchema, AddMemberToRoomInputDTO } from '../../dto/room/addMemberToRoomInputDto';
import { UserRemoveListInputDTOSchema, UserRemoveListInputDTO } from '../../dto/room/userRemoveListInputDTO';
@Injectable({
providedIn: 'root'
src/app/module/chat/data/repository/message/message-live-signalr-data-source.service.ts
+6 -6
View File
@@ -5,10 +5,10 @@ import { SessionStore } from 'src/app/store/session.service';
import { MessageDeleteInputDTO } from '../../dto/message/messageDeleteInputDTO';
import { v4 as uuidv4 } from 'uuid'
import { InstanceId } from '../../../domain/chat-service.service';
import { MessageUpdateInput } from '../../../domain/use-case/message-update-by-id-use-case.service';
import { MessageUpdateInput } from '../../../domain/use-case/message/message-update-by-id-use-case.service';
import { MessageOutPutDataDTO } from '../../dto/message/messageOutputDTO';
import { MessageInputDTO } from '../../dto/message/messageInputDtO';
import { MessageReactionInput } from '../../../domain/use-case/message-reaction-by-id-use-case.service';
import { MessageReactionInput } from '../../../domain/use-case/message/message-reaction-by-id-use-case.service';
interface msgObj {
roomId: string;
@@ -56,8 +56,8 @@ export class MessageSocketRepositoryService {
async sendGroupMessage(data: MessageInputDTO) {
if(data['requestId']) {
data['requestId'] = InstanceId +'@'+ uuidv4();
if(!data.requestId) {
data.requestId = InstanceId +'@'+ uuidv4();
}
const result = await this.socket.sendData<MessageOutPutDataDTO>({
@@ -70,8 +70,8 @@ export class MessageSocketRepositoryService {
async sendDirectMessage(data: MessageInputDTO) {
if(data['requestId']) {
data['requestId'] = InstanceId +'@'+ uuidv4();
if(!data.requestId) {
data.requestId = InstanceId +'@'+ uuidv4();
}
const result = await this.socket.sendData<MessageOutPutDataDTO>({
method: 'SendDirectMessage',
src/app/module/chat/data/repository/message/message-local-data-source.service.ts
-150
View File
@@ -14,7 +14,6 @@ import { Observable as DexieObservable, PromiseExtended } from 'Dexie';
})
export class MessageLocalDataSourceService extends DexieRepository<MessageTable, MessageEntity> {
messageSubject = new Subject();
constructor() {
super(chatDatabase.message, MessageTableSchema)
@@ -33,128 +32,6 @@ export class MessageLocalDataSourceService extends DexieRepository<MessageTable,
}
}
async getLastMessageByRoomId(roomId: string): Promise<Result<undefined|MessageTable, any>> {
try {
console.log({roomId})
const lastMessage = await chatDatabase.message
.where('roomId')
.equals(roomId)
.reverse()
.sortBy('id');
return ok(lastMessage[0]); // Get the last message
} catch (error) {
return err(error);
}
}
async deleteByMessageId(id: string): Promise<Result<undefined|number, any>> {
try {
console.log(id)
const lastMessage = await chatDatabase.message
.where('id')
.equals(id).delete()
return ok(lastMessage[0]); // Get the last message
} catch (error) {
return err(error);
}
}
async sendMessage(data: MessageTable) {
const dataValidation = MessageTableSchema.safeParse(data)
if(dataValidation.success) {
const safeData = dataValidation.data
safeData.sending = true
try {
const result = await chatDatabase.message.add(safeData)
this.messageSubject.next({roomId: safeData.roomId});
return ok(result as number)
} catch (e) {
return err(false)
}
} else {
console.log(dataValidation)
return err(dataValidation)
}
}
// @ValidateSchema(tableSchema)
async createMessage(data: MessageTable) {
try {
const result = await chatDatabase.message.add(data)
this.messageSubject.next({roomId: data.roomId});
return ok(result)
} catch (e) {
return err(false)
}
}
async createManyMessage(data: MessageTable[]) {
try {
const result = await chatDatabase.message.bulkAdd(data)
this.messageSubject.next({roomId: data[0].roomId});
return ok(result)
} catch (e) {
return err(false)
}
}
async messageExist({id}) {
try {
console.log({id});
const existingMessage = await chatDatabase.message
.where('id')
.equals(id)
.first();
if (existingMessage) {
return ok(existingMessage)
} else {
return err(false)
}
} catch (error) {
return err(false);
}
}
// not used
async updateByMessageId(data: MessageTable ) {
try {
const result = await chatDatabase.message.update(data.id as any, data)
return ok(result)
} catch (e) {
return err(false)
}
}
async findOrUpdate(data: MessageTable) {
const findResult = await this.findMessageById(data.id)
if(findResult.isOk()) {
return this.update(findResult.value.$id, data)
} else {
return this.createMessage(data)
}
}
getItems(roomId: string): PromiseExtended<MessageEntity[]> {
return chatDatabase.message.where('roomId').equals(roomId).sortBy('$id') as any
}
@@ -163,33 +40,6 @@ export class MessageLocalDataSourceService extends DexieRepository<MessageTable,
return liveQuery(() => chatDatabase.message.where('roomId').equals(roomId).sortBy('$id') as any)
}
async findMessageById(id: string) {
try {
const a = await chatDatabase.message.where('id').equals(id).first()
if(a) {
return ok(a)
} else {
return err('not found')
}
} catch (e) {
return err('DB error')
}
}
subscribeToNewMessage(roomId: string): Observable<MessageTable> {
return this.messageSubject.pipe(
filter((message: MessageTable) =>
message.roomId === roomId
)
)
}
async getOfflineMessages () {
try {
const allMessages = await chatDatabase.message
src/app/module/chat/data/repository/message/message-remote-data-source.service.ts
+4 -4
View File
@@ -6,7 +6,7 @@ import { APIReturn } from 'src/app/services/decorators/api-validate-schema.decor
import { MessageOutPutDataDTOSchema, MessageOutPutDTO, MessageOutPutDTOSchema } from '../../dto/message/messageOutputDTO';
import { DataSourceReturn } from 'src/app/services/Repositorys/type';
import { SignalRService } from '../../../infra/socket/signal-r.service';
import { MessageUpdateInput } from '../../../domain/use-case/message-update-by-id-use-case.service';
import { MessageUpdateInput } from '../../../domain/use-case/message/message-update-by-id-use-case.service';
import { SessionStore } from 'src/app/store/session.service';
import { MessageDeleteInputDTO } from '../../dto/message/messageDeleteInputDTO';
import { InstanceId } from '../../../domain/chat-service.service';
@@ -30,9 +30,9 @@ export class MessageRemoteDataSourceService {
return await this.httpService.post<MessageOutPutDTO>(`${this.baseUrl}/Messages`, data);
}
async reactToMessage(id: string, reaction: any) {
return await this.httpService.post<any>(`${this.baseUrl}/Messages/${id}/React`, reaction);
}
// async reactToMessage(id: string, reaction: any) {
// return await this.httpService.post<any>(`${this.baseUrl}/Messages/${id}/React`, reaction);
// }
// @APIReturn(MessageOutPutDTOSchema, 'get/Messages')
src/app/module/chat/data/repository/room/room-local-repository.service.ts
-64
View File
@@ -18,69 +18,6 @@ export class RoomLocalRepository extends DexieRepository<RoomTable, RoomTable>
super(chatDatabase.room, RoomTableSchema)
}
async removeUserTyping() {}
@ValidateSchema(RoomTableSchema)
async createRoom(data: RoomTable) {
try {
const result = await chatDatabase.room.add(data)
return ok(result)
} catch (e) {
return err(false)
}
}
async deleteRoomById(id: string) {
try {
const result = await chatDatabase.room.delete(id)
return ok(result)
} catch (e) {
return err(false)
}
}
async leaveRoom(id: string) {
return this.deleteRoomById(id)
}
async updateRoom(data: RoomTable) {
try {
const result = await chatDatabase.room.update(data.id, data);
return ok(result)
} catch (e) {
return err(false)
}
}
async createOrUpdateRoom(data: RoomTable) {
const createResult = await this.createRoom(data)
if(createResult.isOk()) {
return createResult
} else {
return this.updateRoom(data)
}
}
async getRoomById(id: any) {
try {
const result = await chatDatabase.room.get(id)
return ok(result)
} catch (e) {
return err(false)
}
}
async getRoomList() {
return await this.findAll()
}
getItemsLive(){
return from (liveQuery(() => chatDatabase.room.toArray()));
}
@@ -89,6 +26,5 @@ export class RoomLocalRepository extends DexieRepository<RoomTable, RoomTable>
return liveQuery(() => chatDatabase.room.get(id));
}
}
src/app/module/chat/data/repository/room/room-remote-repository.service.ts
+1 -1
View File
@@ -14,7 +14,7 @@ import { RoomUpdateInputDTO, RoomUpdateInputDTOSchema } from '../../dto/room/roo
import { RoomUpdateOutputDTO } from '../../dto/room/roomUpdateOutputDTO';
import { DataSourceReturn } from 'src/app/services/Repositorys/type';
import { SessionStore } from 'src/app/store/session.service';
import { MemberSetAdminDTO } from '../../../domain/use-case/member-admin-use-case.service';
import { MemberSetAdminDTO } from '../../../domain/use-case/member/member-admin-use-case.service';
import { SignalRService } from '../../../infra/socket/signal-r.service';
import { v4 as uuidv4 } from 'uuid'