@live-change/session-service 0.1.5 → 0.1.10

package/definition.js

@@ -1,8 +1,11 @@
 const App = require("@live-change/framework")
 const app = App.app()
 
+const relationsPlugin = require('@live-change/relations-plugin')
+
 const definition = app.createServiceDefinition({
-  name: "session"
+  name: "session",
+  use: [ relationsPlugin ]
 })
 
 module.exports = definition

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/session-service",
-  "version": "0.1.5",
+  "version": "0.1.10",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -21,6 +21,7 @@
     "url": "https://www.viamage.com/"
   },
   "dependencies": {
-    "blue-tape": "^1.0.0"
+    "@live-change/framework": "^0.5.7",
+    "@live-change/relations-plugin": "^0.1.9"
   }
 }

package/sessionItem.js

@@ -12,7 +12,7 @@ definition.processor(function(service, app) {
       if (model.properties.session) throw new Error('session property already exists!!!')
       const originalModelProperties = {...model.properties}
       const modelProperties = Object.keys(model.properties)
-      const defaults = App.utils.generateDefault(modelProperties)
+      const defaults = App.utils.generateDefault(model.properties)
       const modelPropertyName = modelName.slice(0, 1).toLowerCase() + modelName.slice(1)
 
       function modelRuntime() {
@@ -22,25 +22,15 @@ definition.processor(function(service, app) {
       const config = model.sessionItem
       const writeableProperties = modelProperties || config.writableProperties
 
-      console.log("SESSIONM ITEM", model)
+      console.log("SESSION ITEM", model)
 
-      model.properties.session = new PropertyDefinition({
-        type: Session,
-        validation: ['nonEmpty']
-      })
-      if(!model.indexes) model.indexes = {}
-      model.indexes.bySession = new IndexDefinition({
-        property: 'session'
-      })
-      for(const sortField of config.sortBy) {
-        const sortFieldUc = sortField.slice(0, 1).toUpperCase() + sortField.slice(1)
-        model.indexes['bySession' + sortFieldUc] = new IndexDefinition({
-          property: ['session', sortField]
-        })
+      model.propertyOf = {
+        what: Session,
+        ...config
       }
 
-      if(config.readAccess) {
-        const viewName = 'session' + modelName + 's'
+      if(config.sessionReadAccess) {
+        const viewName = 'mySession' + modelName + 's'
         service.views[viewName] = new ViewDefinition({
           name: viewName,
           access: config.readAccess,
@@ -52,7 +42,7 @@ definition.processor(function(service, app) {
         })
         for(const sortField of config.sortBy) {
           const sortFieldUc = sortField.slice(0, 1).toUpperCase() + sortField.slice(1)
-          const viewName = 'session' + modelName + 'sBy' + sortFieldUc
+          const viewName = 'mySession' + modelName + 'sBy' + sortFieldUc
           service.views[viewName] = new ViewDefinition({
             name: viewName,
             access: config.readAccess,
@@ -63,42 +53,25 @@ definition.processor(function(service, app) {
           })
         }
       }
-      if(config.publicAccess) {
-        const viewName = 'publicSession' + modelName + 's'
-        service.views[viewName] = new ViewDefinition({
-          name: viewName,
-          access: config.publicAccess,
-          properties: App.rangeProperties,
-          daoPath(range, { client, context }) {
-            return modelRuntime().sortedIndexRangePath('bySession', [range.session], { ...range, session: undefined } )
-          }
-        })
-        for(const sorfField of config.sortBy) {
-          const sortFieldUc = sorfField.slice(0, 1).toUpperCase() + sortField.slice(1)
-          const viewName = 'publicSession' + modelName + 'sBy' + sortFieldUc
-          service.views[viewName] = new ViewDefinition({
-            name: viewName,
-            access: config.publicAccess,
-            properties: App.rangeProperties,
-            daoPath(range, { client, context }) {
-              return modelRuntime().sortedIndexRangePath('bySession' + sortFieldUc, [client.session], range )
-            }
-          })
-        }
-      }
 
-      if(config.createAccess || config.writeAccess) {
+      if(config.sessionCreateAccess || config.sessionWriteAccess) {
         const eventName = 'session' + modelName + 'Created'
         service.events[eventName] = new EventDefinition({
           name: eventName,
           execute(properties) {
-            const data = properties.data
             const session = properties.session
             const id = properties[modelPropertyName]
+            let newObject = {}
+            for(const propertyName of writeableProperties) {
+              if(properties.hasOwnProperty(propertyName)) {
+                newObject[propertyName] = properties[propertyName]
+              }
+            }
+            const data = utils.mergeDeep({}, defaults, newObject)
             return modelRuntime().create({ ...data, session, id })
           }
         })
-        const actionName = 'createSession' + modelName
+        const actionName = 'createMySession' + modelName
         service.actions[actionName] = new ActionDefinition({
           name: actionName,
           access: config.createAccess || config.writeAccess,
@@ -123,7 +96,7 @@ definition.processor(function(service, app) {
           }
         })
       }
-      if(config.updateAccess || config.writeAccess) {
+      if(config.sessionUpdateAccess || config.sessionWriteAccess) {
         const eventName = 'session' + modelName + 'Updated'
         service.events[eventName] = new EventDefinition({
           name: eventName,
@@ -134,7 +107,7 @@ definition.processor(function(service, app) {
             return modelRuntime().update(id, { ...data, id, session })
           }
         })
-        const actionName = 'updateSession' + modelName
+        const actionName = 'updateMySession' + modelName
         service.actions[actionName] = new ActionDefinition({
           name: actionName,
           access: config.updateAccess || config.writeAccess,
@@ -181,10 +154,10 @@ definition.processor(function(service, app) {
             return modelRuntime().delete(id)
           }
         })
-        const actionName = 'deleteSession' + modelName
+        const actionName = 'deleteMySession' + modelName
         service.actions[actionName] = new ActionDefinition({
           name: actionName,
-          access: config.createAccess || config.writeAccess,
+          access: config.deleteAccess || config.writeAccess,
           properties: {
             [modelPropertyName]: {
               type: model,

package/sessionProperty.js

@@ -7,13 +7,15 @@ definition.processor(function(service, app) {
 
   for(let modelName in service.models) {
     const model = service.models[modelName]
+    console.log("SP", modelName)
 
     if(model.sessionProperty) {
-      console.trace("PROCESS MODEL " + modelName)
+      console.log("MODEL " + modelName + " IS SESSION PROPERTY, CONFIG:", model.sessionProperty)
       if (model.properties.session) throw new Error('session property already exists!!!')
+
       const originalModelProperties = {...model.properties}
       const modelProperties = Object.keys(model.properties)
-      const defaults = App.utils.generateDefault(modelProperties)
+      const defaults = App.utils.generateDefault(model.properties)
       const modelPropertyName = modelName.slice(0, 1).toLowerCase() + modelName.slice(1)
 
       function modelRuntime() {
@@ -21,6 +23,13 @@ definition.processor(function(service, app) {
       }
 
       const config = model.sessionProperty
+      const writeableProperties = modelProperties || config.writableProperties
+
+      model.propertyOf = {
+        what: Session,
+        ...config
+      }
+
       model.properties.session = new PropertyDefinition({
         type: Session,
         validation: ['nonEmpty']
@@ -29,72 +38,61 @@ definition.processor(function(service, app) {
       model.indexes.bySession = new IndexDefinition({
         property: 'session'
       })
-      if(config.readAccess) {
-        const viewName = 'session' + modelName
-        service.views[viewName] = new ViewDefinition({
-          name: viewName,
-          access: config.readAccess,
-          daoPath(params, {client, context}) {
-            return modelRuntime().indexObjectPath('bySession', client.session)
-          }
-        })
-      }
-      if(config.publicAccess) {
-        const viewName = 'publicSession' + modelName
+      if(config.sessionReadAccess) {
+        const viewName = 'mySession' + modelName
         service.views[viewName] = new ViewDefinition({
           name: viewName,
-          access: config.publicAccess,
-          daoPath({session}, {client, context}) {
-            return modelRuntime().indexObjectPath('bySession', session)
+          access: config.sessionReadAccess,
+          daoPath(params, { client, context }) {
+            return modelRuntime().path(client.session)
+            //return modelRuntime().indexObjectPath('bySession', client.session)
           }
         })
       }
 
-      if(config.setAccess || config.writeAccess) {
-        const eventName = 'session' + modelName + 'Set'
-        service.events[eventName] = new EventDefinition({
-          name: eventName,
+      if(config.sessionSetAccess || config.sessionWriteAccess) {
+        const eventName = 'sessionOwned' + modelName + 'Set'
+        const actionName = 'setMySession' + modelName
+        service.actions[actionName] = new ActionDefinition({
+          name: actionName,
           properties: {
             ...originalModelProperties
           },
-          execute(properties) {
-            const data = properties.data
-            const session = properties.session
-            return modelRuntime().create({...data, session, id: session})
-          }
-        })
-        const actionName = 'setSession' + modelName
-        service.actions[actionName] = new ActionDefinition({
-          name: actionName,
-          access: config.createAccess || config.writeAccess,
+          access: config.sessionSetAccess || config.sessionWriteAccess,
+          skipValidation: true,
           queuedBy: (command) => command.client.session,
           waitForEvents: true,
           async execute(properties, {client, service}, emit) {
+            let newObject = {}
+            for(const propertyName of writeableProperties) {
+              if(properties.hasOwnProperty(propertyName)) {
+                newObject[propertyName] = properties[propertyName]
+              }
+            }
+            const data = App.utils.mergeDeep({}, defaults, newObject)
+            await App.validation.validate(data, validators, { source: action, action, service, app, client })
             emit({
               type: eventName,
-              session: client.session,
-              data: properties || {}
+              identifiers: {
+                session: client.session
+              },
+              data
             })
           }
         })
+        const action = service.actions[actionName]
+        const validators = App.validation.getValidators(action, service, action)
       }
-      if(config.updateAccess || config.writeAccess) {
-        const eventName = 'session' + modelName + 'Updated'
-        service.events[eventName] = new EventDefinition({
-          name: eventName,
-          execute(properties) {
-            const data = properties.data
-            const session = properties.session
-            return modelRuntime().update(session, { ...data, session, id: session })
-          }
-        })
-        const actionName = 'updateSession' + modelName
+
+      if(config.sessionUpdateAccess || config.sessionWriteAccess) {
+        const eventName = 'sessionOwned' + modelName + 'Updated'
+        const actionName = 'updateMySession' + modelName
         service.actions[actionName] = new ActionDefinition({
           name: actionName,
           properties: {
             ...originalModelProperties
           },
-          access: config.updateAccess || config.writeAccess,
+          access: config.sessionUpdateAccess || config.sessionWriteAccess,
           skipValidation: true,
           queuedBy: (command) => command.client.session,
           waitForEvents: true,
@@ -111,7 +109,9 @@ definition.processor(function(service, app) {
             await App.validation.validate(merged, validators, { source: action, action, service, app, client })
             emit({
               type: eventName,
-              session: client.session,
+              identifiers: {
+                session: client.session
+              },
               data: properties || {}
             })
           }
@@ -119,18 +119,13 @@ definition.processor(function(service, app) {
         const action = service.actions[actionName]
         const validators = App.validation.getValidators(action, service, action)
       }
-      if(config.resetAccess || config.writeAccess) {
-        const eventName = 'session' + modelName + 'Reset'
-        service.events[eventName] = new EventDefinition({
-          name: eventName,
-          execute({session}) {
-            return modelRuntime().delete(session)
-          }
-        })
-        const actionName = 'resetSession' + modelName
+
+      if(config.sessionResetAccess || config.sessionWriteAccess) {
+        const eventName = 'sessionOwned' + modelName + 'Reset'
+        const actionName = 'resetMySession' + modelName
         service.actions[actionName] = new ActionDefinition({
           name: actionName,
-          access: config.createAccess || config.writeAccess,
+          access: config.sessionResetAccess || config.sessionWriteAccess,
           queuedBy: (command) => command.client.session,
           waitForEvents: true,
           async execute(properties, {client, service}, emit) {
@@ -138,11 +133,14 @@ definition.processor(function(service, app) {
             if (!entity) throw new Error('not_found')
             emit({
               type: eventName,
-              session: client.session,
+              identifiers: {
+                session: client.session
+              }
             })
           }
         })
       }
+
     }
   }