meadow-endpoints 4.0.14 → 4.0.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "meadow-endpoints",
-  "version": "4.0.14",
+  "version": "4.0.15",
   "description": "Automatic API endpoints for Meadow data.",
   "main": "source/Meadow-Endpoints.js",
   "scripts": {
@@ -49,24 +49,24 @@
   "homepage": "https://github.com/stevenvelozo/meadow-endpoints",
   "devDependencies": {
     "alasql": "^4.17.0",
-    "better-sqlite3": "^12.6.2",
+    "better-sqlite3": "^12.8.0",
     "chance": "^1.1.13",
     "gulp-util": "^3.0.8",
     "meadow-connection-sqlite": "^1.0.18",
-    "mysql2": "^3.18.2",
-    "orator-serviceserver-restify": "^2.0.9",
+    "mysql2": "^3.20.0",
+    "orator-serviceserver-restify": "^2.0.10",
     "papaparse": "^5.5.3",
-    "quackage": "^1.0.63",
+    "quackage": "^1.0.65",
     "supertest": "^7.2.2",
     "typescript": "^5.9.3",
     "why-is-node-running": "^3.2.2"
   },
   "dependencies": {
     "async": "3.2.6",
-    "fable": "^3.1.63",
+    "fable": "^3.1.67",
     "fable-serviceproviderbase": "^3.0.19",
     "JSONStream": "^1.3.5",
-    "meadow": "^2.0.29",
+    "meadow": "^2.0.33",
     "meadow-filter": "^1.0.10",
     "orator": "^6.0.4",
     "underscore": "^1.13.8"

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;

package/test/MeadowEndpoints_basic_tests.js

@@ -819,6 +819,45 @@ suite
 							);
 					}
 				);
+				test
+				(
+					'upsert: update by GUID when passed ID is zero',
+					function (fDone)
+					{
+						// First create a record so we have a known GUID
+						_SuperTest
+							.post('1.0/Book')
+							.send({ Title: 'Zero ID Upsert Test', Genre: 'Test' })
+							.end(
+								(pError, pResponse) =>
+								{
+									let tmpCreated = JSON.parse(pResponse.text);
+									let tmpRecord = Array.isArray(tmpCreated) ? tmpCreated[0] : tmpCreated;
+									let tmpGUID = tmpRecord.GUIDBook;
+									let tmpID = tmpRecord.IDBook;
+									Expect(tmpID).to.be.above(0);
+									Expect(tmpGUID).to.be.a('string');
+
+									// Now upsert with ID=0 but the same GUID — should
+									// find the record by GUID and update it, not fail
+									// with "Record IDs do not match".
+									_SuperTest
+										.put('1.0/Book/Upsert')
+										.send({ IDBook: 0, GUIDBook: tmpGUID, Title: 'Zero ID Upsert Updated' })
+										.end(
+											(pUpsertError, pUpsertResponse) =>
+											{
+												Expect(pUpsertResponse.status).to.equal(200);
+												let tmpResult = JSON.parse(pUpsertResponse.text);
+												Expect(tmpResult.IDBook).to.equal(tmpID);
+												Expect(tmpResult.Title).to.equal('Zero ID Upsert Updated');
+												fDone();
+											}
+										);
+								}
+							);
+					}
+				);
 			}
 		);