@live-change/user-service 0.3.31 → 0.3.33

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/user-service",
-  "version": "0.3.31",
+  "version": "0.3.33",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -21,9 +21,9 @@
     "url": "https://www.viamage.com/"
   },
   "dependencies": {
-    "@live-change/framework": "0.7.33",
-    "@live-change/relations-plugin": "0.7.33",
+    "@live-change/framework": "0.7.34",
+    "@live-change/relations-plugin": "0.7.34",
     "pluralize": "^8.0.0"
   },
-  "gitHead": "b45ed0b2217963bb2525da610366322d9b404d9c"
+  "gitHead": "1e4c745cd39f0be282de95b0c936d49d4dc6363a"
 }

package/sessionOrUserProperty.js

@@ -154,13 +154,14 @@ definition.processor(function(service, app) {
         }
       })
 
+      const extendedIdentifiersProperties = createIdentifiersProperties(extendedWith)
+
       if(config.ownerReadAccess) { // single item view
         const viewName = 'my' + modelName
-        const identifiers = createIdentifiersProperties(extendedWith)
         service.views[viewName] = new ViewDefinition({
           name: viewName,
           properties: {
-            ...identifiers
+            ...extendedIdentifiersProperties
           },
           access(params, context) {
             return config.ownerReadAccess ? config.ownerReadAccess(params, context) : true
@@ -186,7 +187,7 @@ definition.processor(function(service, app) {
           service.views[viewName] = new ViewDefinition({
             name: viewName,
             properties: {
-              ...identifiers,
+              ...extendedIdentifiersProperties,
               ...App.rangeProperties,
             },
             access(params, context) {
@@ -232,13 +233,19 @@ definition.processor(function(service, app) {
         service.actions[actionName] = new ActionDefinition({
           name: actionName,
           properties: {
-            ...originalModelProperties
+            ...originalModelProperties,
+            ...extendedIdentifiersProperties,
           },
           access: config.ownerSetAccess || config.ownerWriteAccess,
           skipValidation: true,
           queuedBy: (command) => command.client.user ? 'u:'+command.client.user : 's:'+command.client.session,
           waitForEvents: true,
           async execute(properties, {client, service}, emit) {
+            const owner = client.user ? ['user_User', client.user] : ['session_Session', client.session]
+            for(const extension of extendedWith) owner.push(properties[extension+'Type'], properties[extension])
+            const id = owner.map(p => JSON.stringify(p)).join(':')
+            const entity = await modelRuntime().get(id)
+            if(entity) throw 'alerady_exists'
             let newObject = {}
             for(const propertyName of writeableProperties) {
               if(properties.hasOwnProperty(propertyName)) {
@@ -254,6 +261,10 @@ definition.processor(function(service, app) {
               sessionOrUserType: 'session_Session',
               sessionOrUser: client.session,
             }
+            for(const key of extendedWith) {
+              identifiers[key+'Type'] = properties[key+'Type']
+              identifiers[key]=properties[key]
+            }
             emit({
               type: eventName,
               identifiers,
@@ -271,7 +282,8 @@ definition.processor(function(service, app) {
         service.actions[actionName] = new ActionDefinition({
           name: actionName,
           properties: {
-            ...originalModelProperties
+            ...originalModelProperties,
+            ...extendedIdentifiersProperties,
           },
           access: config.ownerUpdateAccess || config.ownerWriteAccess,
           skipValidation: true,
@@ -279,6 +291,7 @@ definition.processor(function(service, app) {
           waitForEvents: true,
           async execute(properties, { client, service }, emit) {
             const owner = client.user ? ['user_User', client.user] : ['session_Session', client.session]
+            for(const extension of extendedWith) owner.push(properties[extension+'Type'], properties[extension])
             const id = owner.map(p => JSON.stringify(p)).join(':')
             const entity = await modelRuntime().get(id)
             if(!entity) throw 'not_found'
@@ -297,6 +310,10 @@ definition.processor(function(service, app) {
               sessionOrUserType: 'session_Session',
               sessionOrUser: client.session,
             }
+            for(const key of extendedWith) {
+              identifiers[key+'Type'] = properties[key+'Type']
+              identifiers[key]=properties[key]
+            }
             emit({
               type: eventName,
               identifiers,
@@ -308,6 +325,69 @@ definition.processor(function(service, app) {
         const validators = App.validation.getValidators(action, service, action)
       }
 
+      if((config.ownerUpdateAccess && config.ownerSetAccess) || config.ownerWriteAccess) {
+        const setEventName = eventPrefix + modelName + 'Set'
+        const updatedEventName = eventPrefix + modelName + 'Updated'
+        const actionName = 'setOrUpdateMy' + modelName
+        service.actions[actionName] = new ActionDefinition({
+          name: actionName,
+          properties: {
+            ...originalModelProperties,
+            ...extendedIdentifiersProperties,
+          },
+          access: config.ownerSetAccess || config.ownerWriteAccess,
+          skipValidation: true,
+          queuedBy: (command) => command.client.user ? 'u:'+command.client.user : 's:'+command.client.session,
+          waitForEvents: true,
+          async execute(properties, { client, service }, emit) {
+            const owner = client.user ? ['user_User', client.user] : ['session_Session', client.session]
+            for(const extension of extendedWith) owner.push(properties[extension+'Type'], properties[extension])
+            const id = owner.map(p => JSON.stringify(p)).join(':')
+            const entity = await modelRuntime().get(id)
+            let updateObject = {}
+            for(const propertyName of writeableProperties) {
+              if(properties.hasOwnProperty(propertyName)) {
+                updateObject[propertyName] = properties[propertyName]
+              }
+            }
+            const identifiers = client.user ? {
+              sessionOrUserType: 'user_User',
+              sessionOrUser: client.user,
+            } : {
+              sessionOrUserType: 'session_Session',
+              sessionOrUser: client.session,
+            }
+            for(const key of extendedWith) {
+              identifiers[key+'Type'] = properties[key+'Type']
+              identifiers[key]=properties[key]
+            }
+            if(!entity) {
+              const data = App.utils.mergeDeep({}, defaults, updateObject)
+              //console.log('V', { ...identifiers, ...data}, validators)
+              await App.validation.validate({ ...identifiers, ...data}, validators,
+                  { source: action, action, service, app, client })
+              emit({
+                type: setEventName,
+                identifiers,
+                data
+              })
+            } else {
+              const merged = App.utils.mergeDeep({}, entity, updateObject)
+              //console.log('V', { ...identifiers, ...merged}, validators)
+              await App.validation.validate({ ...identifiers, ...merged}, validators,
+                  { source: action, action, service, app, client })
+              emit({
+                type: updatedEventName,
+                identifiers,
+                data: updateObject || {}
+              })
+            }
+          }
+        })
+        const action = service.actions[actionName]
+        const validators = App.validation.getValidators(action, service, action)
+      }
+
       if(config.ownerResetAccess || config.ownerWriteAccess) {
         const eventName = eventPrefix + modelName + 'Reset'
         const actionName = 'resetMy' + modelName
@@ -316,8 +396,12 @@ definition.processor(function(service, app) {
           access: config.ownerResetAccess || config.ownerWriteAccess,
           queuedBy: (command) => command.client.user ? 'u:'+command.client.user : 's:'+command.client.session,
           waitForEvents: true,
+          properties: {
+            ...extendedIdentifiersProperties,
+          },
           async execute(properties, {client, service}, emit) {
             const owner = client.user ? ['user_User', client.user] : ['session_Session', client.session]
+            for(const extension of extendedWith) owner.push(properties[extension+'Type'], properties[extension])
             const id = owner.map(p => JSON.stringify(p)).join(':')
             const entity = await modelRuntime().get(id)
             if (!entity) throw 'not_found'
@@ -328,6 +412,10 @@ definition.processor(function(service, app) {
               sessionOrUserType: 'session_Session',
               sessionOrUser: client.session,
             }
+            for(const key of extendedWith) {
+              identifiers[key+'Type'] = properties[key+'Type']
+              identifiers[key]=properties[key]
+            }
             emit({
               type: eventName,
               identifiers