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

fix duplicate message

Browse Source
This commit is contained in:
Peter Maquiran
2024-09-04 22:48:29 +01:00
parent 5315d185c2
commit 106267aee9
13 changed files with 160 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/infra/database/dexie/instance/chat/schema/attachment.ts
+1 -1
View File
@@ -5,7 +5,7 @@ import { MessageAttachmentFileType, MessageAttachmentSource } from "src/app/core
export const AttachmentTableSchema = z.object({
$id: z.number().optional(), // local id
$messageId: z.number(),
$messageId: z.string(),
attachmentId: z.string().optional(),
file: z.instanceof(Blob),
base64: zodDataUrlSchema.nullable().optional(),
src/app/infra/database/dexie/instance/chat/schema/message.ts
+3 -2
View File
@@ -3,7 +3,8 @@ import { MessageAttachmentFileType, MessageAttachmentSource } from 'src/app/core
import { z } from 'zod';
export const MessageTableSchema = z.object({
$id: z.number().optional(),
$id: z.string().optional(),
$createAt: z.number().optional(),
id: z.string().uuid().optional(),
roomId: z.string().uuid().optional(),
message: z.string().nullable().optional(),
@@ -48,5 +49,5 @@ export const MessageTableSchema = z.object({
export type MessageTable = z.infer<typeof MessageTableSchema>
export type DexieMessageTable = EntityTable<MessageTable, '$id'>;
export const messageTableColumn = '++$id, id, roomId, senderId, message, messageType, canEdit, oneShot, requireUnlock'
export const messageTableColumn = '$id, id, roomId, senderId, message, messageType, canEdit, oneShot, requireUnlock'
src/app/infra/database/dexie/service.ts
+1 -1
View File
@@ -13,7 +13,7 @@ import { BoldTableColumn, DexieBoldTable } from './instance/chat/schema/bold';
// Database declaration (move this to its own module also)
export const chatDatabase = new Dexie('chat-database-infra',{
export const chatDatabase = new Dexie('chat-database-v1',{
// indexedDB: new FDBFactory,
// IDBKeyRange: FDBKeyRange, // Mocking IDBKeyRange
}) as Dexie & {
src/app/infra/repository/adapter.ts
+3 -4
View File
@@ -3,13 +3,12 @@ import { ZodError} from 'zod';
import { IDBError } from './types';
// Define a type for the Result of repository operations
export type RepositoryResult<T, E> = Result<T, Error | ZodError<E>>;
export type RepositoryResultNew<T, E> = Result<T, IDBError<E>>;
export type RepositoryResult<T, E> = Result<T, IDBError<E>>;
export abstract class IDexieRepository<T, R> {
abstract insert(document: T): Promise<RepositoryResultNew<number, T>>
abstract insert(document: T): Promise<RepositoryResult<number, T>>
abstract insertMany(documents: T[]): Promise<RepositoryResult<number[], ZodError<T>>>
abstract insertMany(documents: T[]): Promise<RepositoryResult<number[], T[]>>
abstract update(id: any, updatedDocument: Partial<T>) : Promise<RepositoryResult<number, T>>
src/app/infra/repository/dexie/dexie-repository.service.ts
+97 -62
View File
@@ -2,15 +2,15 @@ import { Result, ok, err } from 'neverthrow';
import { EntityTable } from 'Dexie';
import { ZodError, ZodObject, ZodSchema } from 'zod';
import { Logger } from 'src/app/services/logger/main/service';
import { IDexieRepository, RepositoryResultNew } from '../adapter'
import { IDBError } from '../types';
import { IDexieRepository, RepositoryResult } from '../adapter'
import { IDBError, IDexieError } from '../types';
// Define a type for the Result of repository operations
class DBError<T> extends Error implements IDBError<T> {
zodError?: ZodError<T>;
parameters: T;
error?: any;
error?: IDexieError;
constructor(data: IDBError<T>) {
super(data.message);
@@ -18,6 +18,11 @@ class DBError<T> extends Error implements IDBError<T> {
this.parameters = data.parameters;
this.error = data.error;
Logger.error(data.message, {
zodError: this.zodError,
parameters: this.parameters
})
// // Manually capture the stack trace if needed
// if (Error.captureStackTrace) {
// Error.captureStackTrace(this, DBError);
@@ -25,9 +30,6 @@ class DBError<T> extends Error implements IDBError<T> {
}
}
type RepositoryResult<T, E> = Result<T, Error | ZodError<E>>;
export class DexieRepository<T, R> implements IDexieRepository<T, R> {
private table: EntityTable<any, any>;
private ZodSchema: ZodSchema<T>
@@ -39,7 +41,7 @@ export class DexieRepository<T, R> implements IDexieRepository<T, R> {
this.ZodPartialSchema = (ZodSchema as ZodObject<any>).partial() as any;
}
async insert(document: T): Promise<RepositoryResultNew<number, T>> {
async insert(document: T): Promise<RepositoryResult<any, T>> {
const dataValidation = this.ZodSchema.safeParse(document)
@@ -47,19 +49,15 @@ export class DexieRepository<T, R> implements IDexieRepository<T, R> {
try {
const id = await this.table.add(dataValidation.data);
return ok(id);
} catch (error) {
console.log(error)
} catch (_error) {
const error: IDexieError = _error
return err(new DBError({
message: `dexie.js failed to insert into ${this.table.name}`,
message: `dexie.js failed to insert into ${this.table.name}, ${error.message}`,
parameters: document,
error: error
}))
}
} else {
Logger.error(`dexie.js failed to insert into ${this.table.name}, invalid data`, {
data: document,
zodError: dataValidation.error.issues
});
return err(new DBError({
message: `dexie.js failed to insert into ${this.table.name}, invalid data`,
parameters: document,
@@ -68,27 +66,29 @@ export class DexieRepository<T, R> implements IDexieRepository<T, R> {
}
}
async insertMany(documents: T[]): Promise<RepositoryResult<number[], ZodError<T>>> {
async insertMany(documents: T[]): Promise<RepositoryResult<number[], T[]>> {
// Validate each document
const schema = this.ZodSchema.array()
const validationResult = schema.safeParse(documents)
if(!validationResult.success) {
Logger.error(`dexie.js failed to insert many into ${this.table.name}, invalid data`, {
data: document,
zodError: validationResult.error.issues
});
return err((validationResult as unknown as ZodError<T>))
return err(new DBError({
message: `dexie.js failed to insert many into ${this.table.name}, invalid data`,
parameters: documents,
zodError: validationResult.error
}))
}
try {
const ids = await this.table.bulkAdd(documents as any);
return ok(ids);
} catch (error) {
Logger.error(`dexie.js failed to insert many into ${this.table.name}`, {
data: document
});
return err(new Error('Failed to insert multiple documents: ' + error.message));
} catch (_error) {
const error: IDexieError = _error
return err(new DBError({
message: `dexie.js failed to insert into many ${this.table.name}, ${error.message}`,
parameters: documents,
error: error
}))
}
}
@@ -100,19 +100,26 @@ export class DexieRepository<T, R> implements IDexieRepository<T, R> {
try {
const updatedCount = await this.table.update(id, dataValidation.data);
return ok(updatedCount);
} catch (error) {
Logger.error(`dexie.js failed to update into ${this.table.name}, invalid data`, {
data: updatedDocument,
id,
});
return err(new Error('Failed to update document: ' + error.message));
} catch (_error) {
const error: IDexieError = _error
return err(new DBError({
message: `dexie.js Failed to update into ${this.table.name}, ${error.message} `,
parameters: {
...updatedDocument,
[this.table.schema.primKey.name]: id
} as unknown as T,
error: error
}))
}
} else {
Logger.error(`dexie.js failed to update into ${this.table.name}, invalid data`, {
data: document,
zodError: dataValidation.error.issues
});
return err((dataValidation as unknown as ZodError<T>))
return err(new DBError({
message: `dexie.js failed to update into ${this.table.name}, invalid data`,
parameters: {
...updatedDocument,
[this.table.schema.primKey.name]: id
} as unknown as T,
zodError: dataValidation.error
}))
}
}
@@ -125,15 +132,20 @@ export class DexieRepository<T, R> implements IDexieRepository<T, R> {
try {
const updatedCount = await this.table.bulkPut(dataValidation.data);
return ok(updatedCount);
} catch (error) {
return err(new Error('Failed to update document: ' + error.message));
} catch (_error) {
const error: IDexieError = _error
return err(new DBError({
message: `dexie.js Failed to update into ${this.table.name}, ${error.message} `,
parameters: document,
error: error
}))
}
} else {
Logger.error(`dexie.js failed to update many into ${this.table.name}, invalid data`, {
data: document,
zodError: dataValidation.error.issues
});
return err((dataValidation as unknown as ZodError<T>))
return err(new DBError({
message: `dexie.js failed to update many into ${this.table.name}, invalid data`,
parameters: updatedDocument ,
zodError: dataValidation.error
}))
}
}
@@ -142,8 +154,13 @@ export class DexieRepository<T, R> implements IDexieRepository<T, R> {
try {
await this.table.delete(id);
return ok(undefined);
} catch (error) {
return err(new Error('Failed to delete document: ' + error.message));
} catch (_error) {
const error: IDexieError = _error
return err(new DBError({
message: `dexie.js Failed to delete into ${this.table.name}, ${error.message} `,
parameters: id,
error: error
}))
}
}
@@ -151,8 +168,13 @@ export class DexieRepository<T, R> implements IDexieRepository<T, R> {
try {
const document = await this.table.get(id);
return ok(document);
} catch (error) {
return err(new Error('Failed to find document by ID: ' + error.message));
} catch (_error) {
const error: IDexieError = _error
return err(new DBError({
message: `dexie.js Failed to delete into ${this.table.name}, ${error.message} `,
parameters: id,
error: error
}))
}
}
@@ -160,11 +182,13 @@ export class DexieRepository<T, R> implements IDexieRepository<T, R> {
try {
const documents: any = await this.table.where(filter).toArray();
return ok(documents);
} catch (error) {
Logger.error(`dexie.js failed to find into ${this.table.name}`, {
data: filter,
});
return err(new Error('Failed to find documents: ' + error.message));
} catch (_error) {
const error: IDexieError = _error;
return err(new DBError({
message: `dexie.js Failed to find into ${this.table.name}, ${error.message} `,
parameters: filter as any,
error: error
}))
}
}
@@ -172,12 +196,13 @@ export class DexieRepository<T, R> implements IDexieRepository<T, R> {
try {
const document = await this.table.where(filter).first();
return ok(document);
} catch (error) {
Logger.error(`dexie.js failed to findOne into ${this.table.name}`, {
data: filter,
error
});
return err(new Error('Failed to find document: ' + error.message));
} catch (_error) {
const error: IDexieError = _error
return err(new DBError({
message: `dexie.js Failed to findOne into ${this.table.name}, ${error.message} `,
parameters: filter as any,
error: error
}))
}
}
@@ -185,8 +210,13 @@ export class DexieRepository<T, R> implements IDexieRepository<T, R> {
try {
const documents = await this.table.toArray()
return ok(documents);
} catch (error) {
return err(new Error('Failed to retrieve all documents: ' + error.message));
} catch (_error) {
const error: IDexieError = _error
return err(new DBError({
message: `dexie.js Failed to findAll into ${this.table.name}, ${error.message} `,
parameters: null,
error: error
}))
}
}
@@ -194,8 +224,13 @@ export class DexieRepository<T, R> implements IDexieRepository<T, R> {
try {
const count = filter ? await this.table.where(filter).count() : await this.table.count();
return ok(count);
} catch (error) {
return err(new Error('Failed to count documents: ' + error.message));
} catch (_error) {
const error: IDexieError = _error
return err(new DBError({
message: `dexie.js Failed to count into ${this.table.name}, ${error.message}`,
parameters: filter as any,
error: error
}))
}
}
}
src/app/infra/repository/types.ts
+12 -2
View File
@@ -37,10 +37,20 @@ import { ZodError } from "zod"
// command: DatabaseOperationEnum;
// };
export type IDBError<T> = {
message: string,
zodError?: ZodError<T>,
parameters?: T,
error?: any
error?: IDexieError
}
export interface IDexieError extends Error {
name: string; // The name of the error, e.g., 'NotFoundError', 'ConstraintError'
message: string; // The error message
stack?: string; // Optional stack trace
inner?: Error; // Some Dexie errors have an inner error
dbName?: string; // The name of the Dexie database where the error occurred
tableName?: string; // The name of the table where the error occurred
operation?: string; // The operation being performed (e.g., 'put', 'get', 'delete')
key?: any; // The key involved in the operation, if applicable
}