Skip to content

fix: fix filter by autogenerated _id for mongodb #188

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: next
Choose a base branch
from
Open

fix: fix filter by autogenerated _id for mongodb #188

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4118cce
fix: fix filter by autogenerated _id for mongodb
Astaldos Apr 9, 2025
5286814
change mongo _id transformation to fix filtering
Astaldos Apr 11, 2025
08154a9
add filter normalization to connector requests
Astaldos Apr 11, 2025
5ba0c0e
fix mongo delete record filter
Astaldos Apr 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 7 additions & 9 deletions adminforth/dataConnectors/mongo.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import dayjs from 'dayjs';
import { MongoClient } from 'mongodb';
import { Decimal128 } from 'bson';
import { Decimal128, ObjectId } from 'bson';
import { IAdminForthDataSourceConnector, IAdminForthSingleFilter, IAdminForthAndOrFilter, AdminForthResource } from '../types/Back.js';
import AdminForthBaseConnector from './baseConnector.js';

Expand Down Expand Up @@ -64,14 +64,6 @@ class MongoConnector extends AdminForthBaseConnector implements IAdminForthDataS
}, {});
}

getPrimaryKey(resource) {
for (const col of resource.dataSourceColumns) {
if (col.primaryKey) {
return col.name;
}
}
}

getFieldValue(field, value) {
if (field.type == AdminForthDataTypes.DATETIME) {
if (!value) {
Expand All @@ -89,6 +81,9 @@ class MongoConnector extends AdminForthBaseConnector implements IAdminForthDataS
return !!value;
} else if (field.type == AdminForthDataTypes.DECIMAL) {
return value?.toString();
} else if (field.name === '_id' && !field.fillOnCreate) {
Copy link
Contributor

@ivictbor ivictbor Apr 11, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Astaldos will it brake something if we will remove && !field.fillOnCreate? I mean for the case if user returns object id in fillOnCreate.

// if "_id" was created by mongo it will be ObjectId
return value?.toString();
Copy link
Contributor

@ivictbor ivictbor Apr 9, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Astaldos I am a little bit afraid of case if user returns bson object from fillOnCreate.

Maybe it is better to check it like if type of value is object then do .toString(), is it safe or you see any potential issues with it?

}

return value;
Expand All @@ -111,6 +106,9 @@ class MongoConnector extends AdminForthBaseConnector implements IAdminForthDataS
return value ? true : false;
} else if (field.type == AdminForthDataTypes.DECIMAL) {
return Decimal128.fromString(value?.toString());
} else if (field.name === '_id' && !field.fillOnCreate) {
// if "_id" was created by mongo it supposed to be saved as ObjectId
return ObjectId.createFromHexString(value);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same here, we can check if value is type of string or number or null or undefined, then wrap it in bson Object id, otherwise pass "as is"

}
return value;
}
Expand Down