Skip to content
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

Jump to bottom

feat: MongoDB Node - added new option to specify fields to parse as ObjectID #4520

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

feat: MongoDB Node - added new option to specify fields to parse as ObjectID #4520

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
93986a2
feat: MongoDB Node - added new option to specify fields to parse as O…
dejecj Nov 4, 2022
b1b6d71
Merge branch 'master' into mongodb-oid-option
dejecj Mar 7, 2023
022448b
Merge branch 'master' into mongodb-oid-option
dejecj Mar 25, 2023
7529ca4
Merge branch 'master' into mongodb-oid-option
dejecj Jul 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 9 additions & 2 deletions packages/nodes-base/nodes/MongoDb/GenericFunctions.ts
View file
Open in desktop
Expand Up @@ -14,6 +14,7 @@ import type {

import get from 'lodash/get';
import set from 'lodash/set';
import { ObjectId } from 'mongodb';

/**
* Standard way of building the MongoDB connection string, unless overridden with a provided string
Expand Down Expand Up @@ -84,6 +85,7 @@ export function prepareItems(
updateKey = '',
useDotNotation = false,
dateFields: string[] = [],
oidFields: string[] = [],
) {
let data = items;

Expand All @@ -106,8 +108,13 @@ export function prepareItems(
fieldData = json[field] !== undefined ? json[field] : null;
}

if (fieldData && dateFields.includes(field)) {
fieldData = new Date(fieldData as string);
if (fieldData){
if(dateFields.includes(field)) {
fieldData = new Date(fieldData as string);
}
if(oidFields.includes(field)) {
fieldData = new ObjectId(fieldData as string);
}
}

if (useDotNotation) {
Expand Down
20 changes: 16 additions & 4 deletions packages/nodes-base/nodes/MongoDb/MongoDb.node.ts
View file
Open in desktop
Expand Up @@ -183,14 +183,17 @@ export class MongoDb implements INodeType {
const dateFields = prepareFields(
this.getNodeParameter('options.dateFields', 0, '') as string,
);
const oidFields = prepareFields(
this.getNodeParameter('options.oidFields', 0, '') as string,
);

const updateKey = ((this.getNodeParameter('updateKey', 0) as string) || '').trim();

const updateOptions = (this.getNodeParameter('upsert', 0) as boolean)
? { upsert: true }
: undefined;

const updateItems = prepareItems(items, fields, updateKey, useDotNotation, dateFields);
const updateItems = prepareItems(items, fields, updateKey, useDotNotation, dateFields, oidFields);

for (const item of updateItems) {
try {
Expand Down Expand Up @@ -223,14 +226,17 @@ export class MongoDb implements INodeType {
const dateFields = prepareFields(
this.getNodeParameter('options.dateFields', 0, '') as string,
);
const oidFields = prepareFields(
this.getNodeParameter('options.oidFields', 0, '') as string,
);

const updateKey = ((this.getNodeParameter('updateKey', 0) as string) || '').trim();

const updateOptions = (this.getNodeParameter('upsert', 0) as boolean)
? { upsert: true }
: undefined;

const updateItems = prepareItems(items, fields, updateKey, useDotNotation, dateFields);
const updateItems = prepareItems(items, fields, updateKey, useDotNotation, dateFields, oidFields);

for (const item of updateItems) {
try {
Expand Down Expand Up @@ -264,8 +270,11 @@ export class MongoDb implements INodeType {
const dateFields = prepareFields(
this.getNodeParameter('options.dateFields', 0, '') as string,
);
const oidFields = prepareFields(
this.getNodeParameter('options.oidFields', 0, '') as string,
);

const insertItems = prepareItems(items, fields, '', useDotNotation, dateFields);
const insertItems = prepareItems(items, fields, '', useDotNotation, dateFields, oidFields);

const { insertedIds } = await mdb
.collection(this.getNodeParameter('collection', 0) as string)
Expand Down Expand Up @@ -295,14 +304,17 @@ export class MongoDb implements INodeType {
const dateFields = prepareFields(
this.getNodeParameter('options.dateFields', 0, '') as string,
);
const oidFields = prepareFields(
this.getNodeParameter('options.oidFields', 0, '') as string,
);

const updateKey = ((this.getNodeParameter('updateKey', 0) as string) || '').trim();

const updateOptions = (this.getNodeParameter('upsert', 0) as boolean)
? { upsert: true }
: undefined;

const updateItems = prepareItems(items, fields, updateKey, useDotNotation, dateFields);
const updateItems = prepareItems(items, fields, updateKey, useDotNotation, dateFields, oidFields);

for (const item of updateItems) {
try {
Expand Down
7 changes: 7 additions & 0 deletions packages/nodes-base/nodes/MongoDb/MongoDbDescription.ts
View file
Open in desktop
Expand Up @@ -280,6 +280,13 @@ export const nodeDescription: INodeTypeDescription = {
default: false,
description: 'Whether to use dot notation to access date fields',
},
{
displayName: 'ObjectID Fields',
name: 'oidFields',
type: 'string',
default: '',
description: 'Comma separeted list of fields that will be parsed as Mongo ObjectID type',
}
],
},
],
Expand Down