Feature/Read model adapters config (#873)

Implement invert read model adapter passing for application with default adapter for local/cloud development
reimagined · Nov 21, 2018 · a54b03c · a54b03c
1 parent 12eac8b
commit a54b03c
Show file tree

Hide file tree

Showing 36 changed files with 238 additions and 172 deletions.
diff --git a/examples/hacker-news/config.app.js b/examples/hacker-news/config.app.js
@@ -26,7 +26,8 @@ const appConfig = {
     {
       name: 'HackerNews',
       projection: 'common/read-models/hacker-news.projection.js',
-      resolvers: 'common/read-models/hacker-news.resolvers.js'
+      resolvers: 'common/read-models/hacker-news.resolvers.js',
+      adapterName: 'default'
     }
   ]
 }

diff --git a/examples/hacker-news/config.dev.js b/examples/hacker-news/config.dev.js
@@ -2,12 +2,13 @@ const devConfig = {
   port: 3000,
   polyfills: ['@babel/polyfill'],
   mode: 'development',
-  readModelAdapters: {
-    HackerNews: {
+  readModelAdapters: [
+    {
+      name: 'default',
       module: 'resolve-readmodel-memory',
       options: {}
     }
-  },
+  ],
   jwtCookie: {
     name: 'jwt',
     maxAge: 31536000000

diff --git a/examples/hacker-news/config.prod.js b/examples/hacker-news/config.prod.js
@@ -2,12 +2,13 @@ const prodConfig = {
   port: 3000,
   polyfills: ['@babel/polyfill'],
   mode: 'production',
-  readModelAdapters: {
-    HackerNews: {
+  readModelAdapters: [
+    {
+      name: 'default',
       module: 'resolve-readmodel-memory',
       options: {}
     }
-  },
+  ],
   jwtCookie: {
     name: 'jwt',
     maxAge: 31536000000

diff --git a/examples/hacker-news/config.test-functional.js b/examples/hacker-news/config.test-functional.js
@@ -2,12 +2,13 @@ const testFunctionalConfig = {
   port: 3000,
   polyfills: ['@babel/polyfill'],
   mode: 'development',
-  readModelAdapters: {
-    HackerNews: {
+  readModelAdapters: [
+    {
+      name: 'default',
       module: 'resolve-readmodel-memory',
       options: {}
     }
-  },
+  ],
   jwtCookie: {
     name: 'jwt',
     maxAge: 31536000000

diff --git a/examples/hello-world/config.app.js b/examples/hello-world/config.app.js
@@ -11,7 +11,8 @@ const appConfig = {
     {
       name: 'read-model-name',
       projection: 'common/read-models/read-model-name.projection.js',
-      resolvers: 'common/read-models/read-model-name.resolvers.js'
+      resolvers: 'common/read-models/read-model-name.resolvers.js',
+      adapterName: 'default'
     }
   ],
   viewModels: [

diff --git a/examples/hello-world/config.dev.js b/examples/hello-world/config.dev.js
@@ -7,12 +7,13 @@ const devConfig = {
   staticDir: 'static',
   distDir: 'dist',
 
-  readModelAdapters: {
-    'read-model-name': {
+  readModelAdapters: [
+    {
+      name: 'default',
       module: 'resolve-readmodel-memory',
       options: {}
     }
-  },
+  ],
   storageAdapter: {
     module: 'resolve-storage-lite',
     options: {

diff --git a/examples/hello-world/config.prod.js b/examples/hello-world/config.prod.js
@@ -7,12 +7,13 @@ const prodConfig = {
   staticDir: 'static',
   distDir: 'dist',
 
-  readModelAdapters: {
-    'read-model-name': {
+  readModelAdapters: [
+    {
+      name: 'default',
       module: 'resolve-readmodel-memory',
       options: {}
     }
-  },
+  ],
   storageAdapter: {
     module: 'resolve-storage-lite',
     options: {

diff --git a/examples/hello-world/config.test_functional.js b/examples/hello-world/config.test_functional.js
@@ -7,12 +7,13 @@ const testFunctionalConfig = {
   staticDir: 'static',
   distDir: 'dist',
 
-  readModelAdapters: {
-    'read-model-name': {
+  readModelAdapters: [
+    {
+      name: 'default',
       module: 'resolve-readmodel-memory',
       options: {}
     }
-  },
+  ],
   storageAdapter: {
     module: 'resolve-storage-lite',
     options: {

diff --git a/examples/shopping-list-advanced/config.app.js b/examples/shopping-list-advanced/config.app.js
@@ -36,7 +36,8 @@ const appConfig = {
     {
       name: 'ShoppingLists',
       projection: 'domain/read-models/shopping_lists.projection.js',
-      resolvers: 'domain/read-models/shopping_lists.resolvers.js'
+      resolvers: 'domain/read-models/shopping_lists.resolvers.js',
+      adapterName: 'default'
     }
   ],
   jwtCookie: {

diff --git a/examples/shopping-list-advanced/config.dev.js b/examples/shopping-list-advanced/config.dev.js
@@ -2,12 +2,13 @@ const devConfig = {
   port: 3000,
   polyfills: ['@babel/polyfill'],
   mode: 'development',
-  readModelAdapters: {
-    ShoppingLists: {
+  readModelAdapters: [
+    {
+      name: 'default',
       module: 'resolve-readmodel-memory',
       options: {}
     }
-  }
+  ]
 }
 
 export default devConfig
diff --git a/examples/shopping-list-advanced/config.prod.js b/examples/shopping-list-advanced/config.prod.js
@@ -2,12 +2,13 @@ const prodConfig = {
   port: 3000,
   polyfills: ['@babel/polyfill'],
   mode: 'production',
-  readModelAdapters: {
-    ShoppingLists: {
+  readModelAdapters: [
+    {
+      name: 'default',
       module: 'resolve-readmodel-memory',
       options: {}
     }
-  }
+  ]
 }
 
 export default prodConfig
diff --git a/examples/shopping-list-advanced/config.test_functional.js b/examples/shopping-list-advanced/config.test_functional.js
@@ -3,12 +3,13 @@ const testFunctionalConfig = {
   polyfills: ['@babel/polyfill'],
   mode: 'development',
 
-  readModelAdapters: {
-    ShoppingLists: {
+  readModelAdapters: [
+    {
+      name: 'default',
       module: 'resolve-readmodel-memory',
       options: {}
     }
-  },
+  ],
   storageAdapter: {
     module: 'resolve-storage-lite',
     options: {}

diff --git a/examples/shopping-list/config.app.js b/examples/shopping-list/config.app.js
@@ -26,7 +26,8 @@ const appConfig = {
     {
       name: 'ShoppingLists',
       projection: 'common/read-models/shopping_lists.projection.js',
-      resolvers: 'common/read-models/shopping_lists.resolvers.js'
+      resolvers: 'common/read-models/shopping_lists.resolvers.js',
+      adapterName: 'default'
     }
   ],
   apiHandlers: [

diff --git a/examples/shopping-list/config.dev.js b/examples/shopping-list/config.dev.js
@@ -2,12 +2,13 @@ const devConfig = {
   port: 3000,
   polyfills: ['@babel/polyfill'],
   mode: 'development',
-  readModelAdapters: {
-    ShoppingLists: {
+  readModelAdapters: [
+    {
+      name: 'default',
       module: 'resolve-readmodel-memory',
       options: {}
     }
-  }
+  ]
 }
 
 export default devConfig
diff --git a/examples/shopping-list/config.prod.js b/examples/shopping-list/config.prod.js
@@ -2,12 +2,13 @@ const prodConfig = {
   port: 3000,
   polyfills: ['@babel/polyfill'],
   mode: 'production',
-  readModelAdapters: {
-    ShoppingLists: {
+  readModelAdapters: [
+    {
+      name: 'default',
       module: 'resolve-readmodel-memory',
       options: {}
     }
-  }
+  ]
 }
 
 export default prodConfig
diff --git a/examples/shopping-list/config.test_functional.js b/examples/shopping-list/config.test_functional.js
@@ -3,12 +3,13 @@ const testFunctionalConfig = {
   polyfills: ['@babel/polyfill'],
   mode: 'development',
 
-  readModelAdapters: {
-    ShoppingLists: {
+  readModelAdapters: [
+    {
+      name: 'default',
       module: 'resolve-readmodel-memory',
       options: {}
     }
-  },
+  ],
   storageAdapter: {
     module: 'resolve-storage-lite',
     options: {}

diff --git a/examples/with-saga/config.app.js b/examples/with-saga/config.app.js
@@ -4,7 +4,8 @@ const appConfig = {
     {
       name: 'default',
       projection: 'common/read-models/default.projection.js',
-      resolvers: 'common/read-models/default.resolvers.js'
+      resolvers: 'common/read-models/default.resolvers.js',
+      adapterName: 'default'
     }
   ],
   viewModels: [

diff --git a/examples/with-saga/config.dev.js b/examples/with-saga/config.dev.js
@@ -2,12 +2,13 @@ const devConfig = {
   port: 3000,
   polyfills: ['@babel/polyfill'],
   mode: 'development',
-  readModelAdapters: {
-    default: {
+  readModelAdapters: [
+    {
+      name: 'default',
       module: 'resolve-readmodel-memory',
       options: {}
     }
-  }
+  ]
 }
 
 export default devConfig
diff --git a/examples/with-saga/config.prod.js b/examples/with-saga/config.prod.js
@@ -2,12 +2,13 @@ const prodConfig = {
   port: 3000,
   polyfills: ['@babel/polyfill'],
   mode: 'production',
-  readModelAdapters: {
-    default: {
+  readModelAdapters: [
+    {
+      name: 'default',
       module: 'resolve-readmodel-memory',
       options: {}
     }
-  }
+  ]
 }
 
 export default prodConfig
diff --git a/examples/with-saga/config.test_functional.js b/examples/with-saga/config.test_functional.js
@@ -2,12 +2,13 @@ const testFunctionalConfig = {
   port: 3000,
   polyfills: ['@babel/polyfill'],
   mode: 'development',
-  readModelAdapters: {
-    default: {
+  readModelAdapters: [
+    {
+      name: 'default',
       module: 'resolve-readmodel-memory',
       options: {}
     }
-  },
+  ],
   storageAdapter: {
     module: 'resolve-storage-lite',
     options: {}

diff --git a/packages/core/resolve-query/src/constants.js b/packages/core/resolve-query/src/constants.js
@@ -6,5 +6,6 @@ export const modelTypes = {
 export const errors = {
   duplicateName: 'A read/view name is not unique',
   modelNotFound: 'A read/view model is not defined',
+  missingAdapter: 'Read model adapter not found',
   disposed: 'A query is disposed'
 }
diff --git a/packages/core/resolve-query/src/query/create-query.js b/packages/core/resolve-query/src/query/create-query.js
@@ -13,7 +13,13 @@ const createQuery = (
   getDeserializer,
   dispose,
   getExecutors,
-  { eventStore, viewModels, readModels, snapshotAdapter }
+  {
+    eventStore,
+    viewModels,
+    readModels,
+    snapshotAdapter,
+    readModelAdaptersCreators
+  }
 ) => {
   const repository = {
     executors: new Map(),
@@ -26,7 +32,12 @@ const createQuery = (
     getExecutor
   }
 
-  initReadModels({ ...repository, eventStore, readModels, snapshotAdapter })
+  initReadModels({
+    ...repository,
+    eventStore,
+    readModels,
+    readModelAdaptersCreators
+  })
   initViewModels({ ...repository, eventStore, viewModels, snapshotAdapter })
   checkInitErrors(repository)
 

diff --git a/packages/core/resolve-query/src/query/init-read-models.js b/packages/core/resolve-query/src/query/init-read-models.js
@@ -6,17 +6,31 @@ const initReadModels = ({
   executorTypes,
   errorMessages,
   eventStore,
+  readModelAdaptersCreators,
   readModels
 }) => {
   for (const readModel of readModels) {
     if (executors.has(readModel.name)) {
       errorMessages.push(`${errors.duplicateName} ${readModel}`)
     }
 
+    const adapterCreator = readModelAdaptersCreators.find(
+      ({ name }) => name === readModel.adapterName
+    )
+    if (adapterCreator == null) {
+      throw new Error(
+        `${errors.missingAdapter} ${readModel.name}: ${readModel.adapterName}`
+      )
+    }
+
+    const adapter = adapterCreator.factory({
+      metaName: `__ResolveMeta__${readModel.name}`
+    })
+
     const executor = createReadModel({
       projection: readModel.projection,
       resolvers: readModel.resolvers,
-      adapter: readModel.adapter(),
+      adapter,
       eventStore
     })
 

diff --git a/packages/core/resolve-runtime/src/cloud_entry.js b/packages/core/resolve-runtime/src/cloud_entry.js
@@ -15,14 +15,14 @@ import mainHandler from './handlers/main_handler'
 const initResolve = async (
   {
     snapshotAdapter: createSnapshotAdapter,
-    storageAdapter: createStorageAdapter
+    storageAdapter: createStorageAdapter,
+    readModelAdapters: readModelAdaptersCreators
   },
   resolve
 ) => {
   const storageAdapter = createStorageAdapter()
   const eventStore = createEventStore({ storage: storageAdapter })
   const { aggregates, readModels, viewModels } = resolve
-
   const snapshotAdapter = createSnapshotAdapter()
 
   const executeCommand = createCommandExecutor({
@@ -35,6 +35,7 @@ const initResolve = async (
     eventStore,
     viewModels,
     readModels,
+    readModelAdaptersCreators,
     snapshotAdapter
   })