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

separate database from source data

Browse Source
This commit is contained in:
Peter Maquiran
2024-08-07 19:30:20 +01:00
parent 75a8822e57
commit 159eb8d350
17 changed files with 189 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/module/chat/data/data-source/message/message-local-data-source.service.ts
+24 -89
View File
@@ -1,91 +1,30 @@
import { Injectable } from '@angular/core';
import { Dexie, EntityTable, liveQuery } from 'Dexie';
import { err, ok, Result } from 'neverthrow';
import { z } from 'zod';
import { from, Observable, Subject } from 'rxjs';
import { filter } from 'rxjs/operators';
import { MessageInputDTO } from '../../dto/message/messageInputDtO';
import { MessageEntity } from '../../../domain/entity/message';
import { DexieRepository } from 'src/app/infra/repository/dexie/dexie-repository.service';
const tableSchema = z.object({
$id: z.number().optional(),
id: z.string().optional(),
roomId: z.string().uuid(),
message: z.string(),
messageType: z.number(),
canEdit: z.boolean(),
oneShot: z.boolean(),
sentAt: z.string().optional(),
requireUnlock: z.boolean(),
sender: z.object({
wxUserId: z.number(),
wxFullName: z.string(),
wxeMail: z.string(),
userPhoto: z.string(),
}),
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({
messageId: z.string().optional(),
roomId: z.string().uuid(),
message: z.string(),
messageType: z.number(),
canEdit: z.boolean(),
oneShot: z.boolean(),
sentAt: z.string().optional(),
requireUnlock: z.boolean(),
sender: z.object({
wxUserId: z.number(),
wxFullName: z.string(),
wxeMail: z.string(),
userPhoto: z.string(),
}),
sending: z.boolean().optional()
})
export type TableMessage = z.infer<typeof tableSchema>
// Database declaration (move this to its own module also)
export const messageDataSource = new Dexie('chat-message') as Dexie & {
message: EntityTable<TableMessage, '$id'>;
};
messageDataSource.version(1).stores({
message: '++$id, id, roomId, message, messageType, canEdit, oneShot, requireUnlock, messageId, info'
});
messageDataSource.message.mapToClass(MessageEntity);
import { MessageTable } from 'src/app/module/chat/infra/database/dexie/schema/message';
import { chatDatabase } from '../../../infra/database/dexie/service';
@Injectable({
providedIn: 'root'
})
export class MessageLocalDataSourceService extends DexieRepository<TableMessage> {
export class MessageLocalDataSourceService extends DexieRepository<MessageTable> {
messageSubject = new Subject();
constructor() {
super(messageDataSource.message)
// messageDataSource.message.hook('creating', (primKey, obj, trans) => {
// // const newMessage = await trans.table('message').get(primKey);
// this.messageSubject.next(obj);
// // return newMessage
// })
super(chatDatabase.message)
}
async setAllSenderToFalse() {
try {
await messageDataSource.transaction('rw', messageDataSource.message, async () => {
await chatDatabase.transaction('rw', chatDatabase.message, async () => {
// Perform the update operation within the transaction
await messageDataSource.message.toCollection().modify({ sending: false });
await chatDatabase.message.toCollection().modify({ sending: false });
});
console.log('All messages updated successfully.');
} catch (error) {
@@ -93,10 +32,10 @@ export class MessageLocalDataSourceService extends DexieRepository<TableMessage>
}
}
async getLastMessageByRoomId(roomId: string): Promise<Result<undefined|TableMessage, any>> {
async getLastMessageByRoomId(roomId: string): Promise<Result<undefined|MessageTable, any>> {
try {
console.log({roomId})
const lastMessage = await messageDataSource.message
const lastMessage = await chatDatabase.message
.where('roomId')
.equals(roomId)
.reverse()
@@ -108,10 +47,10 @@ export class MessageLocalDataSourceService extends DexieRepository<TableMessage>
}
}
async deleteByMessageId(id: string): Promise<Result<undefined|TableMessage, any>> {
async deleteByMessageId(id: string): Promise<Result<undefined|MessageTable, any>> {
try {
console.log(id)
const lastMessage = await messageDataSource.message
const lastMessage = await chatDatabase.message
.where('id')
.equals(id).delete()
@@ -124,10 +63,10 @@ export class MessageLocalDataSourceService extends DexieRepository<TableMessage>
async sendMessage(data: MessageInputDTO) {
(data as TableMessage).sending = true
(data as MessageTable).sending = true
try {
const result = await messageDataSource.message.add(data)
const result = await chatDatabase.message.add(data)
this.messageSubject.next({roomId: data.roomId});
return ok(result as number)
} catch (e) {
@@ -137,16 +76,12 @@ export class MessageLocalDataSourceService extends DexieRepository<TableMessage>
}
incomingSocketMessage() {
}
// @ValidateSchema(tableSchema)
async createMessage(data: MessageInputDTO) {
try {
const result = await messageDataSource.message.add(data)
const result = await chatDatabase.message.add(data)
this.messageSubject.next({roomId: data.roomId});
return ok(result)
} catch (e) {
@@ -158,7 +93,7 @@ export class MessageLocalDataSourceService extends DexieRepository<TableMessage>
async createManyMessage(data: MessageInputDTO[]) {
try {
const result = await messageDataSource.message.bulkAdd(data)
const result = await chatDatabase.message.bulkAdd(data)
this.messageSubject.next({roomId: data[0].roomId});
return ok(result)
} catch (e) {
@@ -172,7 +107,7 @@ export class MessageLocalDataSourceService extends DexieRepository<TableMessage>
console.log({id});
const existingMessage = await messageDataSource.message
const existingMessage = await chatDatabase.message
.where('id')
.equals(id)
.first();
@@ -190,10 +125,10 @@ export class MessageLocalDataSourceService extends DexieRepository<TableMessage>
}
// not used
async updateByMessageId(data: TableMessage ) {
async updateByMessageId(data: MessageTable ) {
try {
const result = await messageDataSource.message.update(data.id as any, data)
const result = await chatDatabase.message.update(data.id as any, data)
return ok(result)
} catch (e) {
return err(false)
@@ -202,7 +137,7 @@ export class MessageLocalDataSourceService extends DexieRepository<TableMessage>
}
async findOrUpdate(data: TableMessage) {
async findOrUpdate(data: MessageTable) {
const findResult = await this.findMessageById(data.id)
if(findResult.isOk()) {
@@ -213,17 +148,17 @@ export class MessageLocalDataSourceService extends DexieRepository<TableMessage>
}
getItems(roomId: string) {
return messageDataSource.message.where('roomId').equals(roomId).toArray()
return chatDatabase.message.where('roomId').equals(roomId).toArray()
}
getItemsLive(roomId: string) {
return liveQuery(() => messageDataSource.message.where('roomId').equals(roomId).sortBy('$id'))
return liveQuery(() => chatDatabase.message.where('roomId').equals(roomId).sortBy('$id'))
}
async findMessageById(id: string) {
try {
const a = await messageDataSource.message.where('id').equals(id).first()
const a = await chatDatabase.message.where('id').equals(id).first()
if(a) {
return ok(a)
@@ -238,9 +173,9 @@ export class MessageLocalDataSourceService extends DexieRepository<TableMessage>
}
subscribeToNewMessage(roomId: string): Observable<TableMessage> {
subscribeToNewMessage(roomId: string): Observable<MessageTable> {
return this.messageSubject.pipe(
filter((message: TableMessage) =>
filter((message: MessageTable) =>
message.roomId === roomId
)
)
@@ -249,7 +184,7 @@ export class MessageLocalDataSourceService extends DexieRepository<TableMessage>
async getOfflineMessages () {
try {
const allMessages = await messageDataSource.message
const allMessages = await chatDatabase.message
.filter(msg => typeof msg.id !== 'string' && msg.sending == false)
.toArray();