UniqAI/hexabot
1
0
Fork 0
mirror of https://github.com/hexastack/hexabot synced 2025-04-03 12:52:06 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

fix: address review

Browse Source
This commit is contained in:
hexastack 2024-11-18 15:32:34 +01:00
parent e0a7a783f9
commit 82e47f23dd
4 changed files with 83 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

131
api/src/chat/repositories/block.repository.ts
View File

@ -90,27 +90,24 @@ export class BlockRepository extends BaseRepository<
'findOneAndUpdate'
>,
criteria: TFilterQuery<Block>,
_updates:
updates:
| UpdateWithAggregationPipeline
| UpdateQuery<Document<Block, any, any>>,
): Promise<void> {
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<string, never>
>,
_criteria: TFilterQuery<Block>,
_updates: UpdateQuery<Document<Block, any, any>>,
criteria: TFilterQuery<Block>,
updates: UpdateQuery<Document<Block, any, any>>,
): Promise<void> {
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,
},
);
}
}
}
}

16
api/src/utils/generics/base-repository.ts
View File

@ -172,6 +172,15 @@ export abstract class BaseRepository<
);
});
hooks?.updateMany.post.execute(async function (updated: any) {
const query = this as Query<D, D, unknown, T, 'updateMany'>;
await repository.postUpdateMany(query, updated);
repository.emitter.emit(
repository.getEventName(EHook.postUpdateMany),
updated,
);
});
hooks?.findOneAndUpdate.post.execute(async function (
updated: HydratedDocument<T>,
) {
@ -398,6 +407,13 @@ export abstract class BaseRepository<
// Nothing ...
}
async postUpdateMany(
_query: Query<D, D, unknown, T, 'updateMany'>,
_updated: any,
) {
// Nothing ...
}
async postUpdate(
_query: Query<D, D, unknown, T, 'findOneAndUpdate'>,
_updated: T,

2
frontend/src/hooks/crud/useUpdateMany.tsx
View File

@ -49,7 +49,7 @@ export const useUpdateMany = <
ids: string[];
payload: Partial<TAttr>;
}) => {
const result = await api.UpdateMany(ids, payload);
const result = await api.updateMany(ids, payload);
queryClient.removeQueries({
predicate: ({ queryKey }) => {

2
frontend/src/services/api.class.ts
View File

@ -345,7 +345,7 @@ export class EntityApiClient<TAttr, TBasic, TFull> extends ApiClient {
/**
* Bulk Update entries.
*/
async UpdateMany(ids: string[], payload: Partial<TAttr>) {
async updateMany(ids: string[], payload: Partial<TAttr>) {
const { _csrf } = await this.getCsrf();
const { data } = await this.request.patch<string>(
`${ROUTES[this.type]}/bulk`,