From 82e47f23dd64fcbef910432ff31df5c017e68911 Mon Sep 17 00:00:00 2001 From: hexastack Date: Mon, 18 Nov 2024 15:32:34 +0100 Subject: [PATCH] fix: address review --- api/src/chat/repositories/block.repository.ts | 131 +++++++++--------- api/src/utils/generics/base-repository.ts | 16 +++ frontend/src/hooks/crud/useUpdateMany.tsx | 2 +- frontend/src/services/api.class.ts | 2 +- 4 files changed, 83 insertions(+), 68 deletions(-) diff --git a/api/src/chat/repositories/block.repository.ts b/api/src/chat/repositories/block.repository.ts index 804b7bdb..5eb3cd3b 100644 --- a/api/src/chat/repositories/block.repository.ts +++ b/api/src/chat/repositories/block.repository.ts @@ -90,27 +90,24 @@ export class BlockRepository extends BaseRepository< 'findOneAndUpdate' >, criteria: TFilterQuery, - _updates: + updates: | UpdateWithAggregationPipeline | UpdateQuery>, ): Promise { - const updates: BlockUpdateDto = _updates?.['$set']; - if (updates?.category) { + const update: BlockUpdateDto = updates?.['$set']; + if (update?.category && criteria._id) { const movedBlockId = criteria._id; // Find and update blocks that reference the moved block - await this.model.updateMany( - { nextBlocks: movedBlockId }, - { $pull: { nextBlocks: movedBlockId } }, - ); - await this.model.updateMany( { attachedBlock: movedBlockId }, - { $set: { attachedBlock: null } }, + { $set: { attachedBlock: null }, $pull: { nextBlocks: movedBlockId } }, ); + } else if (update?.category && !criteria._id) { + throw new Error('Criteria must include a valid id to update category.'); } - this.checkDeprecatedAttachmentUrl(updates); + this.checkDeprecatedAttachmentUrl(update); } /** @@ -129,68 +126,70 @@ export class BlockRepository extends BaseRepository< 'updateMany', Record >, - _criteria: TFilterQuery, - _updates: UpdateQuery>, + criteria: TFilterQuery, + updates: UpdateQuery>, ): Promise { - const ids: string[] = _criteria._id?.$in || []; - const objIds = ids.map((b) => { - return new mongoose.Types.ObjectId(b); - }); - const category: string = _updates.$set.category; - const objCategory = new mongoose.Types.ObjectId(category); - const otherBlocks = await this.model.find({ - _id: { $nin: objIds }, - category: { $ne: objCategory }, - $or: [ - { attachedBlock: { $in: objIds } }, - { nextBlocks: { $in: objIds } }, - ], - }); - - for (const id of ids) { - const oldState = await this.model.findOne({ - _id: new mongoose.Types.ObjectId(id), + if (criteria._id?.$in && updates?.$set?.category) { + const ids: string[] = criteria._id?.$in || []; + const objIds = ids.map((b) => { + return new mongoose.Types.ObjectId(b); + }); + const category: string = updates.$set.category; + const objCategory = new mongoose.Types.ObjectId(category); + const otherBlocks = await this.model.find({ + _id: { $nin: objIds }, + category: { $ne: objCategory }, + $or: [ + { attachedBlock: { $in: objIds } }, + { nextBlocks: { $in: objIds } }, + ], }); - if (oldState.category.toString() !== category) { - const updatedNextBlocks = oldState.nextBlocks.filter((nextBlock) => - ids.includes(nextBlock.toString()), - ); - const updatedAttachedBlock = ids.includes( - oldState.attachedBlock?.toString() || '', - ) - ? oldState.attachedBlock - : null; + for (const id of ids) { + const oldState = await this.model.findOne({ + _id: new mongoose.Types.ObjectId(id), + }); + if (oldState.category.toString() !== category) { + const updatedNextBlocks = oldState.nextBlocks.filter((nextBlock) => + ids.includes(nextBlock.toString()), + ); - await this.model.updateOne( - { _id: new mongoose.Types.ObjectId(id) }, - { - nextBlocks: updatedNextBlocks, - attachedBlock: updatedAttachedBlock, - }, - ); + const updatedAttachedBlock = ids.includes( + oldState.attachedBlock?.toString() || '', + ) + ? oldState.attachedBlock + : null; + + await this.model.updateOne( + { _id: new mongoose.Types.ObjectId(id) }, + { + nextBlocks: updatedNextBlocks, + attachedBlock: updatedAttachedBlock, + }, + ); + } } - } - for (const block of otherBlocks) { - if (ids.includes(block.attachedBlock?.toString())) { - await this.model.updateOne( - { _id: block.id }, - { - attachedBlock: null, - }, - ); - } - if (block.nextBlocks.some((item) => ids.includes(item.toString()))) { - const updatedNextBlocks = block.nextBlocks.filter( - (nextBlock) => !ids.includes(nextBlock.toString()), - ); - await this.model.updateOne( - { _id: block.id }, - { - nextBlocks: updatedNextBlocks, - }, - ); + for (const block of otherBlocks) { + if (ids.includes(block.attachedBlock?.toString())) { + await this.model.updateOne( + { _id: block.id }, + { + attachedBlock: null, + }, + ); + } + if (block.nextBlocks.some((item) => ids.includes(item.toString()))) { + const updatedNextBlocks = block.nextBlocks.filter( + (nextBlock) => !ids.includes(nextBlock.toString()), + ); + await this.model.updateOne( + { _id: block.id }, + { + nextBlocks: updatedNextBlocks, + }, + ); + } } } } diff --git a/api/src/utils/generics/base-repository.ts b/api/src/utils/generics/base-repository.ts index af2499ad..78750c13 100644 --- a/api/src/utils/generics/base-repository.ts +++ b/api/src/utils/generics/base-repository.ts @@ -172,6 +172,15 @@ export abstract class BaseRepository< ); }); + hooks?.updateMany.post.execute(async function (updated: any) { + const query = this as Query; + await repository.postUpdateMany(query, updated); + repository.emitter.emit( + repository.getEventName(EHook.postUpdateMany), + updated, + ); + }); + hooks?.findOneAndUpdate.post.execute(async function ( updated: HydratedDocument, ) { @@ -398,6 +407,13 @@ export abstract class BaseRepository< // Nothing ... } + async postUpdateMany( + _query: Query, + _updated: any, + ) { + // Nothing ... + } + async postUpdate( _query: Query, _updated: T, diff --git a/frontend/src/hooks/crud/useUpdateMany.tsx b/frontend/src/hooks/crud/useUpdateMany.tsx index d50a359f..4a283485 100644 --- a/frontend/src/hooks/crud/useUpdateMany.tsx +++ b/frontend/src/hooks/crud/useUpdateMany.tsx @@ -49,7 +49,7 @@ export const useUpdateMany = < ids: string[]; payload: Partial; }) => { - const result = await api.UpdateMany(ids, payload); + const result = await api.updateMany(ids, payload); queryClient.removeQueries({ predicate: ({ queryKey }) => { diff --git a/frontend/src/services/api.class.ts b/frontend/src/services/api.class.ts index 033f6e6b..a29e824e 100644 --- a/frontend/src/services/api.class.ts +++ b/frontend/src/services/api.class.ts @@ -345,7 +345,7 @@ export class EntityApiClient extends ApiClient { /** * Bulk Update entries. */ - async UpdateMany(ids: string[], payload: Partial) { + async updateMany(ids: string[], payload: Partial) { const { _csrf } = await this.getCsrf(); const { data } = await this.request.patch( `${ROUTES[this.type]}/bulk`,