@live-change/session-service 0.9.197 → 0.9.198

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/session-service",
-  "version": "0.9.197",
+  "version": "0.9.198",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -22,9 +22,9 @@
   },
   "type": "module",
   "dependencies": {
-    "@live-change/framework": "^0.9.197",
-    "@live-change/relations-plugin": "^0.9.197",
+    "@live-change/framework": "^0.9.198",
+    "@live-change/relations-plugin": "^0.9.198",
     "pluralize": "^8.0.0"
   },
-  "gitHead": "8231c2ed8bc3beed2c732aa5727174417f19082b"
+  "gitHead": "7e485dcbaa2af7fb17052a40238210dc8bdf0c09"
 }

package/sessionItem.js

@@ -62,6 +62,7 @@ definition.processor(function(service, app) {
         const actionName = 'createMySession' + modelName
         service.actions[actionName] = new ActionDefinition({
           name: actionName,
+          skipValidation: true,
           access: config.sessionCreateAccess || config.sessionWriteAccess,
           properties: {
             ...originalModelProperties,
@@ -76,17 +77,28 @@ definition.processor(function(service, app) {
             const id = properties[modelPropertyName] || app.generateUid()
             const entity = await modelRuntime().get(id)
             if(entity) throw app.logicError("exists")
+            let newObject = {}
+            for(const propertyName of writeableProperties) {
+              if(properties.hasOwnProperty(propertyName)) {
+                newObject[propertyName] = properties[propertyName]
+              }
+            }
+            const data = App.utils.mergeDeep({},
+              App.computeDefaults(model, properties, { client, service }), newObject)
+            await App.validation.validate(data, validators, validationContext)
             emit({
               type: eventName,
               [modelPropertyName]: id,
               identifiers: {
                 session: client.session,
               },
-              data: properties
+              data
             })
             return id
           }
         })
+        const action = service.actions[actionName]
+        const validators = App.validation.getValidators(action, service, action)
       }
       if(config.sessionUpdateAccess || config.sessionWriteAccess) {
         const eventName =  modelName + 'Updated'
@@ -114,7 +126,9 @@ definition.processor(function(service, app) {
                 updateObject[propertyName] = properties[propertyName]
               }
             }
-            const merged = App.utils.mergeDeep({}, entity, updateObject)
+            const computedUpdates = App.computeUpdates(model, { ...entity, ...properties }, { client, service })
+            const data = App.utils.mergeDeep({}, updateObject, computedUpdates)
+            const merged = App.utils.mergeDeep({}, entity, data)
             await App.validation.validate(merged, validators, validationContext)
             emit({
               type: eventName,
@@ -122,7 +136,7 @@ definition.processor(function(service, app) {
               identifiers: {
                 session: client.session,
               },
-              data: properties
+              data
             })
           }
         })

package/sessionProperty.js

@@ -110,14 +110,17 @@ definition.processor(function(service, app) {
                 updateObject[propertyName] = properties[propertyName]
               }
             }
-            const merged = App.utils.mergeDeep({}, entity, updateObject)
-            await App.validation.validate(merged, validators, validationContext)
+            const computedUpdates = App.computeUpdates(model, { ...entity, ...properties }, { client, service })
+            const data = App.utils.mergeDeep({}, updateObject, computedUpdates)
+            const merged = App.utils.mergeDeep({}, entity, data)
+            await App.validation.validate({ session: client.session, ...merged }, validators,
+              validationContext)
             emit({
               type: eventName,
               identifiers: {
                 session: client.session
               },
-              data: properties || {}
+              data
             })
           }
         })