nodester 0.6.4 → 0.6.5

package/lib/models/mixins.js

@@ -212,10 +212,8 @@ async function _updateOne(
 
 		// Will contain data from parent instance and associations.
 		const fullInstanceData = instance.toJSON();
+		const parentData = { ...data };
 
-		const parentData = {
-			...data
-		}
 		for (let includeConfig of include) {
 			const { association } = includeConfig;
 
@@ -223,6 +221,7 @@ async function _updateOne(
 				continue;
 			}
 
+			// Remove association from parentData (handled separately)
 			delete parentData[association];
 
 			const associationDefinition = this.associations[association];
@@ -246,6 +245,15 @@ async function _updateOne(
 			// If association type is HasMany or HasOne (We don't work with any other):
 			switch(associationType) {
 				case 'HasMany': {
+					// Handle empty array (remove all old associations):
+					if (Array.isArray(includeData) && includeData.length === 0) {
+						const where = {
+							[foreignKey]: instance.id 
+						}
+						await associatedModel.destroy({ where });
+						fullInstanceData[association] = [];
+					}
+
 					const promises = includeData.map(singleData => {
 						// Note: for now we are only able to work with a model with single PrimaryKey:
 						const where = {
@@ -263,16 +271,25 @@ async function _updateOne(
 				}
 
 				case 'HasOne': {
-					// Note: for now we are only able to work with a model with single PrimaryKey:
-					const where = {
-						[pkField]: includeData[pkField]
+					// Handle null case (remove old association)
+					if (includeData === null) {
+						const where = {
+							[foreignKey]: instance.id
+						}
+						await associatedModel.destroy({ where });
+						fullInstanceData[association] = null;
+					}
+					else {
+						// Note: for now we are only able to work with a model with single PrimaryKey:
+						const where = {
+							[pkField]: includeData[pkField]
+						}
+						fullInstanceData[association] = await associatedModel.updateOne(
+																							where,
+																							includeData,
+																							associationUpdateOpts
+																						);
 					}
-					fullInstanceData[association] = await associatedModel.updateOne(
-																						where,
-																						includeData,
-																						associationUpdateOpts
-																					);
-
 					continue;
 				}
 

package/package.json

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