nodester 0.7.15 → 0.7.17

package/lib/models/define.js

@@ -2,7 +2,7 @@
  * nodester
  * MIT Licensed
  */
- 
+
 'use strict';
 
 // CRUD mixins.
@@ -97,32 +97,38 @@ function defineModel(
  *
  * @alias getIncludesTree
  */
-function _getIncludesTree(data=null) {
+function _getIncludesTree(data = null) {
 	const result = [];
 
+	if (!data || typeof data !== 'object') {
+		return result;
+	}
+
 	const associations = this.associations;
 	const associationEntries = Object.entries(associations);
-
-	for (const [ associationName, associationDefinition ] of associationEntries) {
-		const formatted = { association: associationName };
-
-		if (!!data && typeof data === 'object') {
-			// If data (for example during create)
-			// is set, go deeper:
-			const keys = Object.keys( data );
-			if (keys.indexOf(associationName) > 0) {
-				const associationModel = associationDefinition.target;
-
-				if (Object.entries(associationModel.associations).length > 0) {
-					const deepData = data[ associationName ];
-					formatted.include = associationModel.getIncludesTree(
-												Array.isArray(deepData) ? deepData[0] : deepData
-											);
+	const keys = Object.keys(data);
+
+	for (const [associationName, associationDefinition] of associationEntries) {
+		// Only include if present in data:
+		if (keys.indexOf(associationName) > -1) {
+			const formatted = { association: associationName };
+			const associationModel = associationDefinition.target;
+
+			if (Object.entries(associationModel.associations).length > 0) {
+				const deepData = data[associationName];
+				const subData = Array.isArray(deepData) ? deepData[0] : deepData;
+
+				// Only recurse if subData is an object (not just an ID or null):
+				if (!!subData && typeof subData === 'object' && Object.keys(subData).length > 0) {
+					const subInclude = associationModel.getIncludesTree(subData);
+					if (subInclude.length > 0) {
+						formatted.include = subInclude;
+					}
 				}
 			}
-		}
 
-		result.push( formatted );
+			result.push(formatted);
+		}
 	}
 
 	return result;

package/lib/models/mixins.js

@@ -218,7 +218,13 @@ async function _updateOne(
 ) {
 	try {
 		const include = opts.include ?? [];
-		let instance = await this.findOne({ where, include });
+		const hasValidWhere = where && Object.keys(where).length > 0 && Object.values(where).every(val => val !== undefined);
+		let instance = null;
+
+		if (hasValidWhere) {
+			instance = await this.findOne({ where, include });
+		}
+
 		let isNewRecord = false;
 
 		if (!instance) {
@@ -285,7 +291,10 @@ async function _updateOne(
 						}
 						return associatedModel.updateOne(
 							where,
-							singleData,
+							{
+								...singleData,
+								[foreignKey]: instance.id
+							},
 							associationUpdateOpts
 						)
 					});
@@ -305,12 +314,18 @@ async function _updateOne(
 					}
 					else {
 						// Note: for now we are only able to work with a model with single PrimaryKey:
-						const where = {
-							[pkField]: includeData[pkField]
+						const where = {}
+						if (includeData[pkField] !== undefined && includeData[pkField] !== null) {
+							where[pkField] = includeData[pkField];
+						} else {
+							where[foreignKey] = instance.id;
 						}
 						fullInstanceData[association] = await associatedModel.updateOne(
 							where,
-							includeData,
+							{
+								...includeData,
+								[foreignKey]: instance.id
+							},
 							associationUpdateOpts
 						);
 					}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodester",
-  "version": "0.7.15",
+  "version": "0.7.17",
   "description": "A versatile REST framework for Node.js",
   "directories": {
     "docs": "docs",