@cocreate/crud-server 1.13.7 → 1.14.0

package/CHANGELOG.md

@@ -1,3 +1,16 @@
+# [1.14.0](https://github.com/CoCreate-app/CoCreate-crud-server/compare/v1.13.7...v1.14.0) (2022-11-25)
+
+
+### Bug Fixes
+
+* querying an array of documents requires the _id to be wrapped in ObjectId ([d988da8](https://github.com/CoCreate-app/CoCreate-crud-server/commit/d988da872248cf68bbeaf4d47bec6d8875ddda23))
+* replaced @cocreate/filter with @cocreate/utils fo search, query and sort functions ([f91fb78](https://github.com/CoCreate-app/CoCreate-crud-server/commit/f91fb78dea770b4afc72dd5ad2842e4745d659f8))
+
+
+### Features
+
+* run dotNotationToObject on createDocument ([133cc30](https://github.com/CoCreate-app/CoCreate-crud-server/commit/133cc302771ef139642e47f31c0f308a69c07869))
+
 ## [1.13.7](https://github.com/CoCreate-app/CoCreate-crud-server/compare/v1.13.6...v1.13.7) (2022-11-24)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/crud-server",
-  "version": "1.13.7",
+  "version": "1.14.0",
   "description": "CoCreate-crud-server",
   "keywords": [
     "cocreate-crud",
@@ -40,7 +40,8 @@
   },
   "homepage": "https://cocreate.app/docs/CoCreate-crud-server",
   "dependencies": {
-    "@cocreate/docs": "^1.4.3",
+    "@cocreate/docs": "^1.4.4",
+    "@cocreate/utils": "^1.12.0",
     "csvtojson": "^2.0.10",
     "json-2-csv": "^3.10.3",
     "mongodb": "^4.4.0"

package/src/index.js

@@ -1,7 +1,6 @@
 'use strict';
 
-const {replaceArray} = require("./utils.crud.js")
-const {searchData, sortData} = require("@cocreate/filter")
+const {searchData, sortData} = require("@cocreate/utils");
 const mongodb = require('./mongodb/mongodb');
 
 class CoCreateCrudServer {

package/src/mongodb/mongodb.js

@@ -1,7 +1,5 @@
-// const {mongoClient} = require("./db")
 const {MongoClient, ObjectId} = require('mongodb');
-const {replaceArray} = require("../utils.crud.js")
-const {searchData, sortData} = require("@cocreate/filter")
+const {dotNotationToObject, searchData, sortData} = require('@cocreate/utils')
 
 function mongoClient(dbUrl) {
 	try {
@@ -318,6 +316,8 @@ function document(action, data){
 
 
 							if (action == 'createDocument') {
+								data[type][i] = dotNotationToObject(data[type][i])
+
 								if (!data[type][i]._id)
 									data[type][i]._id = ObjectId()
 								else 
@@ -326,7 +326,7 @@ function document(action, data){
 							}
 							if (action == 'readDocument') {
 								if (data[type][i]._id)
-									_ids.push(data[type][i]._id)
+									_ids.push(ObjectId(data[type][i]._id))
 							}
 							if (action =='updateDocument') {
 								if (data[type][i]._id)
@@ -340,7 +340,7 @@ function document(action, data){
 							}
 							if (action =='deleteDocument') {
 								if (data[type][i]._id) {
-									_ids.push(data[type][i]._id)
+									_ids.push(ObjectId(data[type][i]._id))
 									documents.push({_id: data[type][i]._id, db: 'mongodb', database, collection})
 								}
 							}
@@ -448,7 +448,7 @@ function document(action, data){
 									documents.push({_id: doc._id, db: 'mongodb', database, collection})
 								else
 									doc['modified'] = {on: data.timeStamp, by: data.user || data.clientId}
-	
+								
 								_ids.push(doc._id)
 							}
 							update_ids.push({updateType: 'filter'})
@@ -480,11 +480,10 @@ function document(action, data){
 								update['$set']['organization_id'] = data.organization_id
 								
 								collectionObj.updateMany(query, update, {
-									upsert: false,
+									upsert: data.upsert,
 									projection
 								}).then((result) => {	
-	
-										
+
 								}).catch((error) => {
 									errorLog.push(error)
 									console.log(action, 'error', error);
@@ -557,7 +556,7 @@ function document(action, data){
 function createUpdate(data, type) {
 	let update = {}, projection = {};
 	if  (data[type][0]) {
-		update['$set'] = valueTypes(data[type][0])
+		update['$set'] = data[type][0]
 		// update['$set']['organization_id'] = data['organization_id'];
 		if (update['$set']['_id'])
 			delete update['$set']['_id']
@@ -709,35 +708,6 @@ function createQuery(filters) {
 	return query;
 }
 
-function valueTypes(data) {
-	let object = {}
-	if ( typeof data === 'object' ) {
-		// update['$set'] = {}
-		for (const [key, value] of Object.entries(data)) {
-			let val;
-			let valueType = typeof value;
-			switch(valueType) {
-				case 'string':
-					val = value
-					break;
-				case 'number':
-					val = Number(value)
-					break;
-				case 'object':
-					if (Array.isArray(value))
-						val = new Array(...value)
-					else
-						val = new Object(value)
-					break;
-				default:
-					val = value
-			}
-			object[key] = val
-		}	
-		return object;
-	}
-}
-
 function errorHandler(data, error, database, collection){
 	if (typeof error == 'object')
 		error['db'] = 'mongodb'
@@ -754,7 +724,24 @@ function errorHandler(data, error, database, collection){
 		data.error = [error]
 }
 	
-
+function replaceArray(data) {
+	let keys = Object.keys(data);
+	let objectData = {};
+  
+	keys.forEach((k) => {
+		let nk = k
+		if (/\[([0-9]*)\]/g.test(k)) {
+			nk = nk.replace(/\[/g, '.');
+			if (nk.endsWith(']'))
+			nk = nk.slice(0, -1)
+			nk = nk.replace(/\]./g, '.');
+			nk = nk.replace(/\]/g, '.');
+		}
+	  	objectData[nk] = data[k];
+	});
+	
+	return objectData;
+}
 
 
 module.exports = {

package/src/utils.crud.js

@@ -1,22 +0,0 @@
-function replaceArray(data) {
-  let keys = Object.keys(data);
-  let objectData = {};
-
-  keys.forEach((k) => {
-    let nk = k
-    if (/\[([0-9]*)\]/g.test(k)) {
-      nk = nk.replace(/\[/g, '.');
-      if (nk.endsWith(']'))
-        nk = nk.slice(0, -1)
-      nk = nk.replace(/\]./g, '.');
-      nk = nk.replace(/\]/g, '.');
-    }
-    objectData[nk] = data[k];
-  });
-  
-  return objectData;
-}
-
-module.exports = {
-  replaceArray
-};