fix: fix filter by autogenerated _id for mongodb #188
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| import dayjs from 'dayjs'; | ||
| import { MongoClient } from 'mongodb'; | ||
| import { Decimal128, ObjectId } from 'bson'; | ||
| import { IAdminForthDataSourceConnector, IAdminForthSingleFilter, IAdminForthAndOrFilter, AdminForthResource } from '../types/Back.js'; | ||
| import AdminForthBaseConnector from './baseConnector.js'; | ||
|
|
||
|
|
@@ -64,14 +64,6 @@ class MongoConnector extends AdminForthBaseConnector implements IAdminForthDataS | |
| }, {}); | ||
| } | ||
|
|
||
| getFieldValue(field, value) { | ||
| if (field.type == AdminForthDataTypes.DATETIME) { | ||
| if (!value) { | ||
|
|
@@ -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) { | ||
| // if "_id" was created by mongo it will be ObjectId | ||
| return value?.toString(); | ||
|
There was a problem hiding this comment. @Astaldos I am a little bit afraid of case if user returns bson object from fillOnCreate. Maybe it is better to check it like |
||
| } | ||
|
|
||
| return value; | ||
|
|
@@ -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); | ||
|
There was a problem hiding this comment. 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; | ||
| } | ||
|
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
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.