meadow-endpoints 4.0.14 → 4.0.16

package/source/controller/utility/Meadow-Endpoints-Filter-Parser.js

@@ -11,24 +11,24 @@ const { parse } = require('meadow-filter');
 
 class MeadowEndpointsFilterParser
 {
-    /**
-     * @param {import('../Meadow-Endpoints-Controller-Base.js')} pController - The controller instance to which this parser belongs.
-     */
-    constructor(pController)
+	/**
+	 * @param {import('../Meadow-Endpoints-Controller-Base.js')} pController - The controller instance to which this parser belongs.
+	 */
+	constructor(pController)
 	{
-        this._Controller = pController;
-    }
+		this._Controller = pController;
+	}
 
-    /**
-     * @param {string} pFilterString - The filter string to parse.
-     * @param {any} pQuery - The foxhound query object to populate.
-     *
-     * @return {boolean} - True if the filter was parsed successfully, false otherwise.
-     */
-    parseFilter(pFilterString, pQuery)
-    {
-        return parse(pFilterString, pQuery);
-    }
+	/**
+	 * @param {string} pFilterString - The filter string to parse.
+	 * @param {any} pQuery - The foxhound query object to populate.
+	 *
+	 * @return {boolean} - True if the filter was parsed successfully, false otherwise.
+	 */
+	parseFilter(pFilterString, pQuery)
+	{
+		return parse(pFilterString, pQuery);
+	}
 }
 
 module.exports = MeadowEndpointsFilterParser;

package/source/controller/utility/Meadow-Endpoints-Session-Marshaler.js

@@ -1,52 +1,52 @@
 class MeadowEndpointsSessionMarshaler
 {
-    /**
-     * @param {import('../Meadow-Endpoints-Controller-Base.js')} pController
-     */
-    constructor(pController)
+	/**
+	 * @param {import('../Meadow-Endpoints-Controller-Base.js')} pController
+	 */
+	constructor(pController)
 	{
-        this._Controller = pController;
-    }
+		this._Controller = pController;
+	}
 
-    getSessionData(pRequest)
-    {
-        let tmpSession = Object.assign({}, this._Controller.settings.MeadowEndpointsDefaultSessionObject);
-        let tmpHeaderSessionString;
+	getSessionData(pRequest)
+	{
+		let tmpSession = Object.assign({}, this._Controller.settings.MeadowEndpointsDefaultSessionObject);
+		let tmpHeaderSessionString;
 
-        switch (this._Controller.settings.MeadowEndpointsSessionDataSource || 'Request')
-        {
-            default:
-                this._Controller.log.warn(`Unknown session source configured: ${this._Controller.settings.MeadowEndpointsSessionDataSource} - defaulting to Request for backward compatibility`);
-            case 'Request':
-                // noop - already set by orator-session
-                tmpSession = this._Controller.extend(tmpSession, pRequest.UserSession);
-                break;
-            case 'None':
-                break;
-            case 'Header':
-                try
-                {
-                    tmpHeaderSessionString = pRequest.headers['x-trusted-session'];
-                    if (!tmpHeaderSessionString)
-                    {
-                        break;
-                    }
-                    const tmpHeaderSession = JSON.parse(tmpHeaderSessionString);
-                    tmpSession = this._Controller.extend(tmpSession, tmpHeaderSession);
-                }
-                catch (pError)
-                {
-                    this._Controller.log.error(`Meadow Endpoints attempted to process a Header Session String with value [${tmpHeaderSessionString}] and failed -- likely culprit is bad JSON.`)
-                }
-                break;
-        }
+		switch (this._Controller.settings.MeadowEndpointsSessionDataSource || 'Request')
+		{
+			default:
+				this._Controller.log.warn(`Unknown session source configured: ${this._Controller.settings.MeadowEndpointsSessionDataSource} - defaulting to Request for backward compatibility`);
+			case 'Request':
+				// noop - already set by orator-session
+				tmpSession = this._Controller.extend(tmpSession, pRequest.UserSession);
+				break;
+			case 'None':
+				break;
+			case 'Header':
+				try
+				{
+					tmpHeaderSessionString = pRequest.headers['x-trusted-session'];
+					if (!tmpHeaderSessionString)
+					{
+						break;
+					}
+					const tmpHeaderSession = JSON.parse(tmpHeaderSessionString);
+					tmpSession = this._Controller.extend(tmpSession, tmpHeaderSession);
+				}
+				catch (pError)
+				{
+					this._Controller.log.error(`Meadow Endpoints attempted to process a Header Session String with value [${tmpHeaderSessionString}] and failed -- likely culprit is bad JSON.`)
+				}
+				break;
+		}
 
-        // Do we keep this here for backwards compatibility?
-        // Yes this makes sense here.
-        pRequest.UserSession = tmpSession;
+		// Do we keep this here for backwards compatibility?
+		// Yes this makes sense here.
+		pRequest.UserSession = tmpSession;
 
-        return tmpSession;
-    }
+		return tmpSession;
+	}
 }
 
 module.exports = MeadowEndpointsSessionMarshaler;

package/source/controller/utility/Meadow-Endpoints-Stream-RecordArray.js

@@ -6,13 +6,13 @@ const JSONStream = require('JSONStream');
 
 class MeadowEndpointsStreamRecordArray
 {
-    /**
-     * @param {import('../Meadow-Endpoints-Controller-Base.js')} pController
-     */
-    constructor(pController)
+	/**
+	 * @param {import('../Meadow-Endpoints-Controller-Base.js')} pController
+	 */
+	constructor(pController)
 	{
-        this._Controller = pController;
-    }
+		this._Controller = pController;
+	}
 
 	chunk(pInput, pChunkSize, pChunkCache)
 	{

package/source/endpoints/create/Meadow-Operation-Create.js

@@ -19,7 +19,7 @@ const doCreate = function(pRecord, pRequest, pRequestState, pResponse, fCallback
 			tmpRequestState.RecordToCreate = pRecord;
 
 			//Make sure record gets created with a customerID
-			if (!tmpRequestState.RecordToCreate.hasOwnProperty('IDCustomer') && this.DAL.jsonSchema.properties.hasOwnProperty('IDCustomer'))
+			if (!tmpRequestState.RecordToCreate.hasOwnProperty('IDCustomer') && this.DAL.jsonSchema && this.DAL.jsonSchema.properties && this.DAL.jsonSchema.properties.hasOwnProperty('IDCustomer'))
 			{
 				tmpRequestState.RecordToCreate.IDCustomer = tmpRequestState.SessionData.CustomerID || 0;
 			}

package/source/endpoints/schema/Meadow-Endpoint-Validate.js

@@ -27,7 +27,7 @@ const doAPIEndpointValidate = function(pRequest, pResponse, fNext)
 			(fStageComplete) =>
 			{
 				pResponse.send(tmpRequestState.RecordValidation);
-				this.log.requestCompletedSuccessfully(pRequest, tmpRequestState, `Validated Record for ${this.DAL.scope} - ${tmpRequestState.RecordValidation}`);
+				this.log.requestCompletedSuccessfully(pRequest, tmpRequestState, `Validated Record for ${this.DAL.scope} - ${JSON.stringify(tmpRequestState.RecordValidation)}`);
 				return fStageComplete();
 			}
 		],

package/source/endpoints/update/Meadow-Endpoint-BulkUpdate.js

@@ -23,6 +23,7 @@ const doAPIEndpointUpdate = function(pRequest, pResponse, fNext)
 
 				return fStageComplete();
 			},
+			fBehaviorInjector(`UpdateBulk-PreOperation`),
 			(fStageComplete) =>
 			{
 				this.eachLimit(tmpRequestState.BulkRecords, 1,
@@ -31,6 +32,7 @@ const doAPIEndpointUpdate = function(pRequest, pResponse, fNext)
 						doUpdate.call(this, pRecord, pRequest, tmpRequestState, pResponse, fCallback);
 					}, fStageComplete);
 			},
+			fBehaviorInjector(`UpdateBulk-PostOperation`),
 			(fStageComplete) =>
 			{
 				return this.doStreamRecordArray(pResponse, tmpRequestState.UpdatedRecords, fStageComplete);

package/source/endpoints/update/Meadow-Operation-Update.js

@@ -58,6 +58,7 @@ const doUpdate = function(pRecordToModify, pRequest, pRequestState, pResponse, f
 			tmpRequestState.Query = this.DAL.query;
 			return fStageComplete();
 		},
+		fBehaviorInjector(`Update-PreOperation`),
 		(fStageComplete) =>
 		{
 			tmpRequestState.Query.setIDUser(tmpRequestState.SessionData.UserID);
@@ -65,6 +66,7 @@ const doUpdate = function(pRecordToModify, pRequest, pRequestState, pResponse, f
 
 			return fStageComplete();
 		},
+		fBehaviorInjector(`Update-QueryConfiguration`),
 		(fStageComplete) =>
 		{
 			this.DAL.doUpdate(tmpRequestState.Query,

package/source/endpoints/upsert/Meadow-Endpoint-BulkUpsert.js

@@ -28,6 +28,7 @@ const doAPIEndpointUpserts = function(pRequest, pResponse, fNext)
 
 				return fStageComplete();
 			},
+			fBehaviorInjector(`UpsertBulk-PreOperation`),
 			(fStageComplete) =>
 			{
 				this.eachLimit(tmpRequestState.BulkRecords, 1,
@@ -36,13 +37,14 @@ const doAPIEndpointUpserts = function(pRequest, pResponse, fNext)
 						doUpsert.call(this, pRecord, pRequest, tmpRequestState, pResponse, fCallback);
 					}, fStageComplete);
 			},
+			fBehaviorInjector(`UpsertBulk-PostOperation`),
 			(fStageComplete) =>
 			{
 				return this.doStreamRecordArray(pResponse, marshalLiteList.call(this, tmpRequestState.UpsertedRecords, pRequest), fStageComplete);
 			},
 			(fStageComplete) =>
 			{
-				this.log.requestCompletedSuccessfully(pRequest, tmpRequestState, `Bulk upsert complete -- ${tmpRequestState.UpsertedRecords} records processed`);
+				this.log.requestCompletedSuccessfully(pRequest, tmpRequestState, `Bulk upsert complete -- ${tmpRequestState.UpsertedRecords.length} records processed`);
 				return fStageComplete();
 			}
 		], (pError) =>

package/source/endpoints/upsert/Meadow-Operation-Upsert.js

@@ -66,8 +66,10 @@ const doUpsert = function(pRecordToUpsert, pRequest, pRequestState, pResponse, f
 							}
 							else
 							{
-								// Set the default ID in the passed-in record if it doesn't exist..
-								if (!tmpRequestState.Record.hasOwnProperty(this.DAL.defaultIdentifier))
+								// Set the default ID in the passed-in record if it doesn't exist
+								// or is zero (which is never a valid ID).
+								if (!tmpRequestState.Record.hasOwnProperty(this.DAL.defaultIdentifier)
+									|| !tmpRequestState.Record[this.DAL.defaultIdentifier])
 								{
 									tmpRequestState.Record[this.DAL.defaultIdentifier] = pRecord[this.DAL.defaultIdentifier];
 								}
@@ -129,4 +131,4 @@ const doUpsert = function(pRecordToUpsert, pRequest, pRequestState, pResponse, f
 		});
 };
 
-module.exports = doUpsert;
+module.exports = doUpsert;