meadow-endpoints 2.0.20 → 2.0.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "meadow-endpoints",
-  "version": "2.0.20",
+  "version": "2.0.22",
   "description": "Automatic API endpoints for Meadow data.",
   "main": "source/Meadow-Endpoints.js",
   "scripts": {

package/source/crud/Meadow-Endpoint-Delete.js

@@ -43,7 +43,7 @@ var doAPIDeleteEndpoint = function(pRequest, pResponse, fNext)
 		tmpIDRecord = pRequest.body[pRequest.DAL.defaultIdentifier];
 	}
 	// Although the delete request does allow multiple deletes, we require an identifier.
-	if (tmpIDRecord < 1)
+	if (!parseInt(tmpIDRecord) || tmpIDRecord < 1)
 	{
 		return pRequest.CommonServices.sendError('Record delete failure - a valid record ID is required in the passed-in record.', pRequest, pResponse, fNext);
 	}

package/source/crud/Meadow-Endpoint-Update.js

@@ -41,7 +41,7 @@ var doAPIUpdateEndpoint = function(pRequest, pResponse, fNext)
 				{
 					return pRequest.CommonServices.sendError('Record update failure - a valid record is required.', pRequest, pResponse, fNext);
 				}
-				if (pRequest.body[pRequest.DAL.defaultIdentifier] < 1)
+				if (!parseInt(pRequest.body[pRequest.DAL.defaultIdentifier]) || pRequest.body[pRequest.DAL.defaultIdentifier] < 1)
 				{
 					return pRequest.CommonServices.sendError('Record update failure - a valid record ID is required in the passed-in record.', pRequest, pResponse, fNext);
 				}

package/source/crud/Meadow-Marshal-LiteList.js

@@ -30,7 +30,8 @@ var marshalLiteList = (pRecords, pRequest, pFieldList) =>
 		{
 			if (pField.indexOf('ID') === 0 ||
 				pField.indexOf('GUID') === 0 ||
-				pField == 'CreatingIDUser') //we should always include owner info
+				pField == 'CreatingIDUser' || // we should always include owner info
+				pField == 'Error') // we should propagate errors through (ex. bulk upsert)
 			{
 				tmpFieldList.push(pField);
 			}

package/source/crud/Meadow-Operation-Update.js

@@ -18,7 +18,7 @@ var doUpdate = function(pRecordToModify, pRequest, pResponse, fCallback, pOption
 	pRequest.MeadowOperation = (typeof(pRequest.MeadowOperation) === 'string') ? pRequest.MeadowOperation : 'Update';
 
 	// If there is not a default identifier or cached record, fail
-	if ((pRecordToModify[pRequest.DAL.defaultIdentifier] < 1) && (typeof(pOptionalCachedUpdatingRecord) === 'undefined'))
+	if ((!parseInt(pRecordToModify[pRequest.DAL.defaultIdentifier]) || pRecordToModify[pRequest.DAL.defaultIdentifier] < 1) && (typeof(pOptionalCachedUpdatingRecord) === 'undefined'))
 	{
 		return fCallback('Record update failure - a valid record ID is required in the passed-in record.');
 	}
@@ -111,7 +111,7 @@ var doUpdate = function(pRecordToModify, pRequest, pResponse, fCallback, pOption
 					{
 						if (!pRecord)
 						{
-							return fStageComplete('Error updating a record.');
+							return fStageComplete(pError || 'Error updating a record.');
 						}
 
 						pRequest.Record = pRecord;

package/test/MeadowEndpoints_basic_tests.js

@@ -961,6 +961,48 @@ suite
 					}
 				);
 				test
+				(
+					'update: update a record with a missing ID',
+					function(fDone)
+					{
+						// Update animal but don't provide ID
+						var tmpRecord = { Type:'Corgi' };
+						libSuperTest('http://localhost:9080/')
+						.del('1.0/FableTest')
+						.send(tmpRecord)
+						.end(
+							function(pError, pResponse)
+							{
+								// Expect response to be the count of deleted records.
+								var tmpResult = JSON.parse(pResponse.text);
+								Expect(tmpResult.Error).to.contain('a valid record ID is required');
+								fDone();
+							}
+						);
+					}
+				);
+				test
+				(
+					'update: update a record with a malformed ID',
+					function(fDone)
+					{
+						// Update animal but don't provide ID
+						var tmpRecord = { IDAnimal: { ID: 3 }, Type:'Corgi' };
+						libSuperTest('http://localhost:9080/')
+						.del('1.0/FableTest')
+						.send(tmpRecord)
+						.end(
+							function(pError, pResponse)
+							{
+								// Expect response to be the count of deleted records.
+								var tmpResult = JSON.parse(pResponse.text);
+								Expect(tmpResult.Error).to.contain('a valid record ID is required');
+								fDone();
+							}
+						);
+					}
+				);
+				test
 				(
 					'update: update a record',
 					function(fDone)
@@ -1006,7 +1048,28 @@ suite
 				);
 				test
 				(
-					'delete: delete a record with a bad parameter',
+					'delete: delete a record with a missing ID',
+					function(fDone)
+					{
+						// Delete animal but don't provide ID
+						var tmpRecord = { Type: 'Corgi' };
+						libSuperTest('http://localhost:9080/')
+						.del('1.0/FableTest')
+						.send(tmpRecord)
+						.end(
+							function(pError, pResponse)
+							{
+								// Expect response to be the count of deleted records.
+								var tmpResult = JSON.parse(pResponse.text);
+								Expect(tmpResult.Error).to.contain('a valid record ID is required');
+								fDone();
+							}
+						);
+					}
+				);
+				test
+				(
+					'delete: delete a record with a bad ID',
 					function(fDone)
 					{
 						// Delete animal 3 ("Red")
@@ -2433,6 +2496,35 @@ suite
 						);
 					}
 				);
+				test
+				(
+					'problematic bulk upserts',
+					function(fDone)
+					{
+						_MeadowEndpoints.behaviorModifications.setTemplate('SelectList', '<%= Record.Name %>|<%=Record.Type%>');
+						var tmpRecords = [
+							{GUIDAnimal:'0xHAXXXX', TypeOh:'Triceratops'},
+							{GUIDAnimal:'0xDavison', Nameology:'Davison', Type:'Dog'},
+							{GUIDAnimal:'0xMartino', Name:'Martin', Type:'Dog'}, // this one still works
+						];
+						_MockSessionValidUser.UserRoleIndex = 2;
+						libSuperTest('http://localhost:9080/')
+						.put('1.0/FableTest/Upserts')
+						.send(tmpRecords)
+						.end(
+							function(pError, pResponse)
+							{
+								// Expect response to be the record we just created.
+								var tmpResult = JSON.parse(pResponse.text);
+								console.log(JSON.stringify(tmpResult,null,4));
+								Expect(tmpResult[0].Error).to.be.a('string');
+								Expect(tmpResult[1].Error).to.be.a('string');
+								Expect(tmpResult[2].Error).to.not.exist;
+								fDone();
+							}
+						);
+					}
+				);
 			}
 		);
 	}