nodester 0.7.13 → 0.7.15

package/lib/body/extract.js

@@ -22,9 +22,7 @@ module.exports = extract;
  * @access public
  * @return {Object} filteredBody
  */
-function extract(body, filter=null, model) {
-
-	const sequelize = model.sequelize;
+function extract(body, filter = null, model) {
 	const modelAttributes = Object.keys(model.tableAttributes);
 	const availableIncludes = Object.keys(model.associations);
 
@@ -87,6 +85,20 @@ function extract(body, filter=null, model) {
 			const association = model.associations[key];
 
 			// Mutliple includes:
+			if (association.associationType === 'BelongsToMany') {
+				const targetPkField = association.target.primaryKeyField;
+
+				if (Array.isArray(value)) {
+					filteredBody[key] = value.map(item => ({ [targetPkField]: item[targetPkField] }));
+				}
+				else {
+					filteredBody[key] = { [targetPkField]: value[targetPkField] };
+				}
+
+				continue;
+			}
+
+			// HasMany / HasOne — recursive extraction:
 			if (Array.isArray(value)) {
 				filteredBody[key] = [];
 
@@ -111,7 +123,7 @@ function extract(body, filter=null, model) {
 
 	// Set all static attributes:
 	const staticAttributeEntries = Object.entries(staticAttributes);
-	for (const [ key, value ] of staticAttributeEntries) {
+	for (const [key, value] of staticAttributeEntries) {
 		filteredBody[key] = staticAttributes[key];
 	}
 

package/lib/models/mixins.js

@@ -2,13 +2,13 @@
  * nodester
  * MIT Licensed
  */
- 
+
 'use strict';
 
 /**
  *	CRUD mixins for any model:
  */
- 
+
 // Utils:
 const {
 	modelHasAssociations,
@@ -59,7 +59,7 @@ function _implementsCRUD(modelDefinition) {
 
 /** Main mixinis: */
 async function _createWithIncludes(
-	data={}
+	data = {}
 ) {
 	try {
 		const instance = await this.create(data);
@@ -77,7 +77,7 @@ async function _createWithIncludes(
 		if (modelHasAssociations(this)) {
 			const allModelAssociations = Object.entries(this.associations);
 
-			for (const [ associationName, associationDefinition ] of allModelAssociations) {
+			for (const [associationName, associationDefinition] of allModelAssociations) {
 
 				// If data of this association is present:
 				if (!!data[associationName]) {
@@ -85,10 +85,11 @@ async function _createWithIncludes(
 					const {
 						associatedModel,
 						foreignKey,
-						associationType
+						associationType,
+						accessors
 					} = getModelAssociationProps(associationDefinition);
 
-					// If association type is HasMany or HasOne (We don't work with any other):
+					// If association type is HasMany or HasOne:
 					if (associationType === 'HasMany' || associationType === 'HasOne') {
 
 						// Process current instance.
@@ -99,11 +100,35 @@ async function _createWithIncludes(
 							parentForeignKey: foreignKey,
 						});
 
-						fullInstanceData[associationName] =_unwrapUpdateOrCreateOrDeleteOperationsResults(
+						fullInstanceData[associationName] = _unwrapUpdateOrCreateOrDeleteOperationsResults(
 							operationsResults,
 							associationType
 						);
 					}
+					// BelongsToMany: link existing records via junction table.
+					else if (associationType === 'BelongsToMany') {
+						const associationData = Array.isArray(data[associationName])
+							? data[associationName]
+							: [data[associationName]];
+
+						const pkField = associatedModel.primaryKeyField;
+						const ids = [];
+
+						for (const item of associationData) {
+							const exists = await associatedModel.findByPk(item[pkField]);
+							if (!exists) {
+								const err = new Error(
+									`Before you can associate ${associationName} with ${this.name}, ${associationName} must be created separately.`
+								);
+								err.status = 406;
+								throw err;
+							}
+							ids.push(item[pkField]);
+						}
+
+						await instance[accessors.set](ids);
+						fullInstanceData[associationName] = associationData;
+					}
 
 					fullInstanceData[associationName] = fullInstanceData[associationName] ?? data[associationName];
 				}
@@ -114,16 +139,16 @@ async function _createWithIncludes(
 		// Variable, that is used by _updateById,
 		// but we will also put it here to make API consistent.
 		const isNewRecord = true;
-		return Promise.resolve([ isNewRecord, fullInstanceData ]);
+		return Promise.resolve([isNewRecord, fullInstanceData]);
 	}
-	catch(error) {
+	catch (error) {
 		return Promise.reject(error);
 	}
 }
 
 function _findById(
-	id=null,
-	opts={}
+	id = null,
+	opts = {}
 ) {
 	const { query } = opts;
 
@@ -154,7 +179,7 @@ function _findById(
 	return this.findOne(_query);
 }
 
-function _findMany(opts={}) {
+function _findMany(opts = {}) {
 	const { query } = opts;
 
 	let _query = {};
@@ -189,7 +214,7 @@ function _findMany(opts={}) {
 async function _updateOne(
 	where,
 	data,
-	opts={}
+	opts = {}
 ) {
 	try {
 		const include = opts.include ?? [];
@@ -226,11 +251,11 @@ async function _updateOne(
 
 			const associationDefinition = this.associations[association];
 			const includeData = data[association];
-			
+
 			const {
 				associatedModel,
 				associationType,
-				
+
 				foreignKey,
 				sourceKey
 			} = getModelAssociationProps(associationDefinition);
@@ -242,13 +267,12 @@ async function _updateOne(
 
 			const pkField = associatedModel.primaryKeyField;
 
-			// If association type is HasMany or HasOne (We don't work with any other):
-			switch(associationType) {
+			switch (associationType) {
 				case 'HasMany': {
 					// Handle empty array (remove all old associations):
 					if (Array.isArray(includeData) && includeData.length === 0) {
 						const where = {
-							[foreignKey]: instance.id 
+							[foreignKey]: instance.id
 						}
 						await associatedModel.destroy({ where });
 						fullInstanceData[association] = [];
@@ -260,10 +284,10 @@ async function _updateOne(
 							[pkField]: singleData[pkField]
 						}
 						return associatedModel.updateOne(
-										where,
-										singleData,
-										associationUpdateOpts
-									)
+							where,
+							singleData,
+							associationUpdateOpts
+						)
 					});
 					fullInstanceData[association] = await Promise.all(promises);
 
@@ -285,14 +309,39 @@ async function _updateOne(
 							[pkField]: includeData[pkField]
 						}
 						fullInstanceData[association] = await associatedModel.updateOne(
-																							where,
-																							includeData,
-																							associationUpdateOpts
-																						);
+							where,
+							includeData,
+							associationUpdateOpts
+						);
 					}
 					continue;
 				}
 
+				case 'BelongsToMany': {
+					const associationItems = Array.isArray(includeData) ? includeData : [includeData];
+					const ids = [];
+
+					for (const item of associationItems) {
+						const exists = await associatedModel.findByPk(item[pkField]);
+						if (!exists) {
+							const err = new Error(
+								`Before you can associate ${association} with ${this.name}, ${association} must be created separately.`
+							);
+							err.status = 406;
+							throw err;
+						}
+						ids.push(item[pkField]);
+					}
+
+					// Replaces the full set of associations via the junction table.
+					// Sending an empty array removes all associations.
+					const { accessors: btmAccessors } = getModelAssociationProps(associationDefinition);
+					await instance[btmAccessors.set](ids);
+					fullInstanceData[association] = associationItems;
+
+					continue;
+				}
+
 				default:
 					continue;
 			}
@@ -309,15 +358,15 @@ async function _updateOne(
 			...fullInstanceData
 		});
 	}
-	catch(error) {
+	catch (error) {
 		return Promise.reject(error);
 	}
 }
 
 async function _updateById(
-	id=null,
-	data={},
-	opts={}
+	id = null,
+	data = {},
+	opts = {}
 ) {
 	const where = { id };
 	return this.updateOne(
@@ -328,7 +377,7 @@ async function _updateById(
 }
 
 
-function _deleteOne(query={}) {
+function _deleteOne(query = {}) {
 	const _query = {
 		...query,
 		limit: 1
@@ -337,7 +386,7 @@ function _deleteOne(query={}) {
 }
 
 function _deleteById(
-	id=null
+	id = null
 ) {
 	const query = {
 		where: { id }
@@ -378,7 +427,7 @@ async function _updateOrCreateOrDelete(
 			operation,
 		});
 	}
-	catch(error) {
+	catch (error) {
 		return Promise.reject(error);
 	}
 }
@@ -398,7 +447,7 @@ async function _updateOrCreateOrDeleteBasedOnAssociationData({
 		// If single instance of associated model:
 		if (isSingleInstance) {
 			const operationResult = await _updateOrCreateOrDelete(
-				associatedModel, 
+				associatedModel,
 				compileModelAssociationData({
 					dataOfAssociation,
 					parentForeignKey,
@@ -406,14 +455,14 @@ async function _updateOrCreateOrDeleteBasedOnAssociationData({
 				})
 			);
 
-			result = [ operationResult ];
+			result = [operationResult];
 		}
 		// If multiple instances of associated model:
 		else {
 			// Update or create each:
 			const promises = dataOfAssociation.map(
 				(data) => _updateOrCreateOrDelete(
-					associatedModel, 
+					associatedModel,
 					compileModelAssociationData({
 						dataOfAssociation: data,
 						parentForeignKey: parentForeignKey,
@@ -428,7 +477,7 @@ async function _updateOrCreateOrDeleteBasedOnAssociationData({
 
 		return Promise.resolve(result);
 	}
-	catch(error) {
+	catch (error) {
 		return Promise.reject(error);
 	}
 }
@@ -439,7 +488,7 @@ function _unwrapUpdateOrCreateOrDeleteOperationsResults(
 ) {
 	// If instance was not deleted, add it to final array.
 	const result = operationsResults.filter(({ operation }) => operation !== 'deleted')
-																	.map(({ newInstance }) => newInstance[1]);
+		.map(({ newInstance }) => newInstance[1]);
 
 	// If this association referenced only certain record,
 	// unwrap "result" array and send first element:

package/package.json

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