Remove optimisticConcurrencyValue

boostercloud · Jun 23, 2023 · bd7b7dd · bd7b7dd
1 parent 2f159c2
commit bd7b7dd
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 25 deletions.
diff --git a/packages/framework-provider-local/src/services/read-model-registry.ts b/packages/framework-provider-local/src/services/read-model-registry.ts
@@ -1,4 +1,4 @@
-import { ReadModelEnvelope, ReadModelInterface, SortFor, UUID } from '@boostercloud/framework-types'
+import { ReadModelEnvelope, SortFor, UUID } from '@boostercloud/framework-types'
 import * as DataStore from 'nedb'
 import { readModelsDatabase } from '../paths'
 
@@ -37,24 +37,19 @@ export class ReadModelRegistry {
     const queryPromise = new Promise((resolve, reject) =>
       cursor.exec((err, docs) => {
         if (err) reject(err)
-        else {
-          docs.map((doc: ReadModelEnvelope) => {
-            doc.value.boosterMetadata!.optimisticConcurrencyValue = this.generateOptimisticConcurrencyValue(doc.value)
-          })
-          resolve(docs)
-        }
+        else resolve(docs)
       })
     )
     return queryPromise as Promise<Array<ReadModelEnvelope>>
   }
 
   public async store(readModel: ReadModelEnvelope, expectedCurrentVersion: number): Promise<void> {
-    const readModelOptimistic: ReadModelEnvelope & { uniqueKey?: string } = readModel
-    readModelOptimistic.uniqueKey = `${readModel.typeName}_${readModel.value.id}_${readModel.value.boosterMetadata?.version}`
-    if (readModelOptimistic.value.boosterMetadata?.version === 1) {
+    const uniqueReadModel: ReadModelEnvelope & { uniqueKey?: string } = readModel
+    uniqueReadModel.uniqueKey = `${readModel.typeName}_${readModel.value.id}_${readModel.value.boosterMetadata?.version}`
+    if (uniqueReadModel.value.boosterMetadata?.version === 1) {
       return this.insert(readModel)
     }
-    return this.update(readModelOptimistic, expectedCurrentVersion)
+    return this.update(uniqueReadModel, expectedCurrentVersion)
   }
 
   private insert(readModel: ReadModelEnvelope): Promise<void> {
@@ -71,10 +66,7 @@ export class ReadModelRegistry {
         {
           typeName: readModel.typeName,
           'value.id': readModel.value.id,
-          $or: [
-            { 'value.boosterMetadata.optimisticConcurrencyValue': { $exists: false } },
-            { 'value.boosterMetadata.optimisticConcurrencyValue': expectedCurrentVersion },
-          ],
+          'value.boosterMetadata.version': expectedCurrentVersion,
         },
         readModel,
         { upsert: false, returnUpdatedDocs: true },
@@ -94,10 +86,6 @@ export class ReadModelRegistry {
     })
   }
 
-  private generateOptimisticConcurrencyValue(value: ReadModelInterface): number {
-    return (value.boosterMetadata?.version ?? 0) + 1 // the next version number that we are going to persist
-  }
-
   public async deleteById(id: UUID, typeName: string): Promise<number> {
     const deletePromise = new Promise((resolve, reject) =>
       this.readModels.remove({ typeName: typeName, 'value.id': id }, { multi: false }, (err, numRemoved: number) => {

diff --git a/packages/framework-provider-local/test/helpers/read-model-helper.ts b/packages/framework-provider-local/test/helpers/read-model-helper.ts
@@ -12,7 +12,6 @@ export function createMockReadModelEnvelope(): ReadModelEnvelope {
       boosterMetadata: {
         version: 1,
         schemaVersion: 1,
-        optimisticConcurrencyValue: 2,
       },
     },
     typeName: random.word(),

diff --git a/packages/framework-provider-local/test/services/read-model-registry.test.ts b/packages/framework-provider-local/test/services/read-model-registry.test.ts
@@ -203,14 +203,10 @@ describe('the read model registry', () => {
     it('should upsert read models into the read models database', async () => {
       const readModel: ReadModelEnvelope = createMockReadModelEnvelope()
       readModel.value.boosterMetadata!.version = 2
-      readModel.value.boosterMetadata!.optimisticConcurrencyValue = 2
       const expectedQuery = {
         typeName: readModel.typeName,
         'value.id': readModel.value.id,
-        $or: [
-          { 'value.boosterMetadata.optimisticConcurrencyValue': { $exists: false } },
-          { 'value.boosterMetadata.optimisticConcurrencyValue': 2 },
-        ],
+        'value.boosterMetadata.version': 2,
       }
 
       readModelRegistry.readModels.update = stub().yields(null, readModel)