mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-19 04:57:52 +00:00
add message status
This commit is contained in:
@@ -0,0 +1,34 @@
|
||||
import { TableRoom } from "../../../data-source/room/rooom-local-data-source.service";
|
||||
import { RoomListItemOutPutDTO, RoomListOutPutDTO } from "../../../dto/room/roomListOutputDTO";
|
||||
|
||||
export function messageListDetermineChanges(serverList: any[], localList: any[]) {
|
||||
// Convert lists to dictionaries for easier comparison
|
||||
const localDict = localList.reduce((acc, item) => {
|
||||
acc[item.id] = item;
|
||||
return acc;
|
||||
}, {});
|
||||
|
||||
const serverDict = serverList.reduce((acc, item) => {
|
||||
acc[item.id] = item;
|
||||
return acc;
|
||||
}, {});
|
||||
|
||||
// Identify added and deleted items
|
||||
const addedItems = serverList.filter(item => !localDict[item.id]);
|
||||
const deletedItems = localList.filter(item => !serverDict[item.id]);
|
||||
|
||||
// Identify changed items
|
||||
const changedItems = serverList.filter(item => {
|
||||
const localItem = localDict[item.id];
|
||||
return localItem && (item.editedAt !== localItem.editedAt || item.reactions.some((r, index) => {
|
||||
const localReaction = localItem.reactions[index];
|
||||
return !localReaction || r.reactedAt !== localReaction.reactedAt;
|
||||
}));
|
||||
});
|
||||
|
||||
return {
|
||||
addedItems,
|
||||
deletedItems,
|
||||
changedItems
|
||||
}
|
||||
}
|
||||
@@ -2,7 +2,7 @@ import { Injectable } from '@angular/core';
|
||||
import { Dexie, EntityTable, liveQuery } from 'Dexie';
|
||||
import { err, ok, Result } from 'neverthrow';
|
||||
import { z } from 'zod';
|
||||
import { Observable, Subject } from 'rxjs';
|
||||
import { from, Observable, Subject } from 'rxjs';
|
||||
import { filter } from 'rxjs/operators';
|
||||
import { MessageInputDTO } from '../../dto/message/messageInputDtO';
|
||||
import { MessageEntity } from '../../../domain/entity/message';
|
||||
@@ -24,7 +24,13 @@ const tableSchema = z.object({
|
||||
wxeMail: z.string(),
|
||||
userPhoto: z.string(),
|
||||
}),
|
||||
sending: z.boolean().optional()
|
||||
sending: z.boolean().optional(),
|
||||
reaction: z.object({
|
||||
id: z.string(),
|
||||
reactedAt: z.string(),
|
||||
reaction: z.string(),
|
||||
sender: z.object({}),
|
||||
}).array()
|
||||
})
|
||||
|
||||
export const IncomingMessageSchema = z.object({
|
||||
@@ -67,11 +73,11 @@ export class MessageLocalDataSourceService {
|
||||
|
||||
constructor() {
|
||||
|
||||
messageDataSource.message.hook('creating', (primKey, obj, trans) => {
|
||||
// const newMessage = await trans.table('message').get(primKey);
|
||||
this.messageSubject.next(obj);
|
||||
// return newMessage
|
||||
})
|
||||
// messageDataSource.message.hook('creating', (primKey, obj, trans) => {
|
||||
// // const newMessage = await trans.table('message').get(primKey);
|
||||
// this.messageSubject.next(obj);
|
||||
// // return newMessage
|
||||
// })
|
||||
}
|
||||
|
||||
|
||||
@@ -110,6 +116,7 @@ export class MessageLocalDataSourceService {
|
||||
|
||||
try {
|
||||
const result = await messageDataSource.message.add(data)
|
||||
this.messageSubject.next({roomId: data.roomId});
|
||||
return ok(result as string)
|
||||
} catch (e) {
|
||||
return err(false)
|
||||
@@ -128,6 +135,7 @@ export class MessageLocalDataSourceService {
|
||||
|
||||
try {
|
||||
const result = await messageDataSource.message.add(data)
|
||||
this.messageSubject.next({roomId: data.roomId});
|
||||
return ok(result as string)
|
||||
} catch (e) {
|
||||
return err(false)
|
||||
@@ -161,6 +169,7 @@ export class MessageLocalDataSourceService {
|
||||
async update(data: TableMessage ) {
|
||||
|
||||
try {
|
||||
console.log('update images 22222')
|
||||
const result = await messageDataSource.message.update(data.$id, data)
|
||||
return ok(result)
|
||||
} catch (e) {
|
||||
@@ -173,6 +182,7 @@ export class MessageLocalDataSourceService {
|
||||
async updateByMessageId(data: TableMessage ) {
|
||||
|
||||
try {
|
||||
console.log('update sdfsdfsd')
|
||||
const result = await messageDataSource.message.update(data.id, data)
|
||||
return ok(result)
|
||||
} catch (e) {
|
||||
@@ -192,10 +202,12 @@ export class MessageLocalDataSourceService {
|
||||
}
|
||||
}
|
||||
|
||||
getItems(roomId: string) {
|
||||
return messageDataSource.message.where('roomId').equals(roomId).toArray()
|
||||
}
|
||||
|
||||
getItemsLive(roomId: string) {
|
||||
return liveQuery(() =>
|
||||
messageDataSource.message.where('roomId').equals(roomId).sortBy('$id')
|
||||
)
|
||||
return liveQuery(() => messageDataSource.message.where('roomId').equals(roomId).sortBy('$id'))
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -9,6 +9,7 @@ import { v4 as uuidv4 } from 'uuid'
|
||||
import { err, ok } from 'neverthrow';
|
||||
import { MessageDeleteInputDTO } from '../../domain/use-case/message-delete-live-use-case.service';
|
||||
import { MessageUpdateInput } from '../../domain/use-case/message-update-use-case.service';
|
||||
import { messageListDetermineChanges } from '../async/list/rooms/messageListChangedetector';
|
||||
|
||||
export const InstanceId = uuidv4();
|
||||
|
||||
@@ -64,8 +65,8 @@ export class MessageRepositoryService {
|
||||
}
|
||||
|
||||
// console.log({clone})
|
||||
console.log('update message')
|
||||
return this.messageLocalDataSourceService.update({...clone, sending: false})
|
||||
console.log('update message 11111')
|
||||
return this.messageLocalDataSourceService.update({...clone, sending: false, roomId: data.roomId})
|
||||
return ok(true)
|
||||
} else {
|
||||
console.log('no message to upload')
|
||||
@@ -112,14 +113,23 @@ export class MessageRepositoryService {
|
||||
|
||||
async listAllMessagesByRoomId(id: string) {
|
||||
const result = await this.messageRemoteDataSourceService.getMessagesFromRoom(id)
|
||||
const localResult = await this.messageLocalDataSourceService.getItems(id)
|
||||
|
||||
if(result.isOk()) {
|
||||
|
||||
for(const message of result.value.data) {
|
||||
const { addedItems, changedItems } = messageListDetermineChanges(result.value.data, localResult)
|
||||
|
||||
for(const message of changedItems) {
|
||||
let clone: TableMessage = message
|
||||
clone.roomId = id
|
||||
await this.messageLocalDataSourceService.findOrUpdate(clone)
|
||||
}
|
||||
|
||||
for(const message of addedItems) {
|
||||
let clone: TableMessage = message
|
||||
clone.roomId = id
|
||||
await this.messageLocalDataSourceService.createMessage(clone)
|
||||
}
|
||||
}
|
||||
return result
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user