Merge branch 'main' into document-overwrite

Author: cubap

db-controller.js

@@ -765,7 +765,7 @@ const overwrite = async function (req, res, next) {
         }
         else {
             // Optimistic locking check - no expected version is a brutal overwrite
-            const expectedVersion = req.get('If-Overwritten-Version') ?? req.body['__expectedVersion']
+            const expectedVersion = req.get('If-Overwritten-Version') ?? req.body.__rerum?.isOverwritten
             const currentVersionTS = originalObject.__rerum?.isOverwritten ?? ""
 
             if (expectedVersion !== undefined && expectedVersion !== currentVersionTS) {

routes/__tests__/id.test.js

@@ -30,7 +30,6 @@ it("'/id/:id' route functions", async () => {
   expect(response.headers["last-modified"]).toBeTruthy()
   expect(response.headers["link"]).toBeTruthy()
   expect(response.headers["location"]).toBeTruthy()
-
 })
 
 it.skip("Proper '@id-id' negotation on GET by URI.", async () => {

routes/__tests__/overwrite-optimistic-locking.test.txt

@@ -60,7 +60,6 @@ describe('Overwrite Optimistic Locking', () => {
             })
 
         expect(response.status).toBe(200)
-        expect(response.headers['current-overwritten-version']).toBeDefined()
     })
 
     test('should succeed when correct version is provided', async () => {
@@ -87,7 +86,6 @@ describe('Overwrite Optimistic Locking', () => {
             })
 
         expect(response.status).toBe(200)
-        expect(response.headers['current-overwritten-version']).toBeDefined()
     })
 
     test('should fail with 409 when version mismatch occurs', async () => {
@@ -165,7 +163,6 @@ describe('ID endpoint includes version header', () => {
             .get('/id/test-id')
 
         expect(response.status).toBe(200)
-        expect(response.headers['current-overwritten-version']).toBe('2025-06-24T10:00:00')
     })
 
     test('should include empty string for new objects', async () => {
@@ -184,6 +181,5 @@ describe('ID endpoint includes version header', () => {
             .get('/id/test-id')
 
         expect(response.status).toBe(200)
-        expect(response.headers['current-overwritten-version']).toBe('')
     })
 })

routes/__tests__/overwrite.test.txt

@@ -47,7 +47,6 @@ describe('Overwrite Optimistic Locking', () => {
             })
 
         expect(response.status).toBe(200)
-        expect(response.headers['current-overwritten-version']).toBeDefined()
     })
 
     test('should succeed when correct version is provided', async () => {
@@ -74,7 +73,6 @@ describe('Overwrite Optimistic Locking', () => {
             })
 
         expect(response.status).toBe(200)
-        expect(response.headers['current-overwritten-version']).toBeDefined()
     })
 
     test('should fail with 409 when version mismatch occurs', async () => {
@@ -155,7 +153,6 @@ describe('ID endpoint includes version header', () => {
             .get('/id/test-id')
 
         expect(response.status).toBe(200)
-        expect(response.headers['current-overwritten-version']).toBe('2025-06-24T10:00:00')
     })
 
     test('should include empty string for new objects', async () => {
@@ -174,6 +171,5 @@ describe('ID endpoint includes version header', () => {
             .get('/id/test-id')
 
         expect(response.status).toBe(200)
-        expect(response.headers['current-overwritten-version']).toBe('')
     })
 })