@live-change/user-service 0.2.26 → 0.2.29

package/LICENSE.md

@@ -1,4 +1,4 @@
-Copyright 2019-2020 Michał Łaszczewski
+Copyright 2019-2022 Michał Łaszczewski
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 

package/contactOrUserProperty.js

@@ -2,6 +2,10 @@ const definition = require("./definition.js")
 const App = require("@live-change/framework")
 const { PropertyDefinition, ViewDefinition, IndexDefinition, ActionDefinition, EventDefinition } = App
 const { User } = require("./model.js")
+const { allCombinations } = require("./combinations.js")
+const { createIdentifiersProperties } = require('./utils.js')
+
+const pluralize = require('pluralize')
 
 definition.processor(function(service, app) {
 
@@ -10,7 +14,7 @@ definition.processor(function(service, app) {
 
     if(model.contactOrUserProperty) {
       console.log("MODEL " + modelName + " IS SESSION OR USER PROPERTY, CONFIG:", model.userProperty)
-      if (model.properties.owner) throw new Error('owner property already exists!!!')
+      if (model.properties.contactOrUser) throw new Error('owner property already exists!!!')
 
       const originalModelProperties = { ...model.properties }
       const modelProperties = Object.keys(model.properties)
@@ -23,11 +27,21 @@ definition.processor(function(service, app) {
       const config = model.contactOrUserProperty
       const writeableProperties = modelProperties || config.writableProperties
 
+      if(model.propertyOf) throw new Error("model " + modelName + " already have owner")
       if(model.propertyOfAny) throw new Error("model " + modelName + " already have owner")
+
+      const extendedWith = config.extendedWith
+          ? (Array.isArray(config.extendedWith) ? config.extendedWith : [config.extendedWith])
+          : []
+
       model.propertyOfAny = {
-        ...config
+        ...config,
+        to: ['contactOrUser', ...extendedWith]
       }
 
+      const transferEventName = ['contactOrUser', ...(extendedWith.map(e => e[0].toUpperCase() + e.slice(1)))]
+          .join('And') + 'Owned' + modelName + 'Transferred'
+
       service.trigger({
         name: 'contactConnected',
         properties: {
@@ -47,8 +61,14 @@ definition.processor(function(service, app) {
         async execute({ contactType, contact, user }, { service }, emit) {
           const contactPath = [contactType, contact]
           const contactPropertyId = contactPath.map(p => JSON.stringify(p)).join(':')
-          const contactProperty = await modelRuntime().get(contactPropertyId)
-          if(contactProperty) {
+          const range = {
+            gte: contactPropertyId + '', // '' because it can be not-extended
+            lte: contactPropertyId + ':\xFF'
+          }
+          const contactProperties = await modelRuntime().rangeGet(range)
+          /// TODO: list based merge method
+          for(const contactProperty of contactProperties) {
+            console.log("CONTACT PROPERTY FOUND!", contactProperty, "MERGE =", config.merge)
             const userPath = ['user_User', user]
             const userPropertyId = userPath.map(p => JSON.stringify(p)).join(':')
             const userProperty = await modelRuntime().get(userPropertyId)
@@ -56,41 +76,48 @@ definition.processor(function(service, app) {
               const mergeResult = await config.merge(contactProperty, userProperty)
               if(mergeResult && userProperty) {
                 emit({
-                  type: 'ownerOwned' + modelName + 'Updated',
+                  type: 'contactOrUserOwned' + modelName + 'Updated',
                   identifiers: {
-                    ownerType: 'user_User',
-                    owner: user
+                    contactOrUserType: 'user_User',
+                    contactOrUser: user
                   },
                   data: mergeResult
                 })
               } else {
                 emit({
-                  type: 'ownerOwned' + modelName + 'Set',
+                  type: 'contactOrUserOwned' + modelName + 'Set',
                   identifiers: {
-                    ownerType: 'user_User',
-                    owner: user
+                    contactOrUserType: 'user_User',
+                    contactOrUser: user
                   },
                   data: mergeResult
                 })
               }
               emit({
-                type: 'ownerOwned' + modelName + 'Reset',
+                type: 'contactOrUserOwned' + modelName + 'Reset',
                 identifiers: {
-                  ownerType: contactType,
-                  owner: contact
+                  contactOrUserType: contactType,
+                  contactOrUser: contact
                 }
               })
             } else {
               if(!userProperty) {
+                const extendedIdentifiers = {}
+                for(const key of extendedWith) {
+                  extendedIdentifiers[key+'Type'] = contactProperty[key+'Type']
+                  extendedIdentifiers[key] = contactProperty[key]
+                }
                 emit({
-                  type: 'ownerOwned' + modelName + 'Transferred',
+                  type: transferEventName,
                   from: {
-                    ownerType: contactType,
-                    owner: contact
+                    contactOrUserType: contactType,
+                    contactOrUser: contact,
+                    ...extendedIdentifiers
                   },
                   to: {
-                    ownerType: 'user_User',
-                    owner: user
+                    contactOrUserType: 'user_User',
+                    contactOrUser: user,
+                    ...extendedIdentifiers
                   }
                 })
               }
@@ -99,21 +126,55 @@ definition.processor(function(service, app) {
         }
       })
 
-      if(config.ownerReadAccess) {
+      if(config.ownerReadAccess) { // single item view
         const viewName = 'my' + modelName
+        const identifiers = createIdentifiersProperties(extendedWith)
         service.views[viewName] = new ViewDefinition({
           name: viewName,
+          properties: {
+            ...identifiers
+          },
           access(params, context) {
             return context.client.user && (config.ownerReadAccess ? config.ownerReadAccess(params, context) : true)
           },
           daoPath(params, { client, context }) {
             const owner = ['user_User', client.user]
+            for(const key of extendedWith) {
+              owner.push(params[key+'Type'], params[key])
+            }
             const id = owner.map(p => JSON.stringify(p)).join(':')
             return modelRuntime().path(id)
           }
         })
       }
 
+      if(config.ownerReadAccess && config.extendedWith) {
+        const extendedCombinations = [[]].concat(allCombinations(extendedWith).slice(0, -1))
+        for(const combination of extendedCombinations) {
+          const propsUpperCase = combination.map(prop => prop[0].toUpperCase() + prop.slice(1))
+          const indexName = 'by' + (combination).map(prop => prop[0].toUpperCase() + prop.slice(1))
+          const viewName = 'my' + propsUpperCase.join('And') + pluralize(modelName)
+          const identifiers = createIdentifiersProperties(combination)
+          service.views[viewName] = new ViewDefinition({
+            name: viewName,
+            properties: {
+              ...identifiers,
+              ...App.rangeProperties,
+            },
+            access(params, context) {
+              return context.client.user && (config.ownerReadAccess ? config.ownerReadAccess(params, context) : true)
+            },
+            daoPath(params, { client, context }) {
+              const owner = ['user_User', client.user]
+              for (const key of combination) {
+                owner.push(params[key + 'Type'], params[key])
+              }
+              return modelRuntime().indexRangePath(indexName, owner, App.extractRange(params) )
+            }
+          })
+        }
+      }
+
       if(config.ownerViews) {
         for(const view of config.userViews) {
           const viewName = view.name || ('my' + (view.prefix || '') + modelName + (view.suffix || ''))
@@ -133,8 +194,12 @@ definition.processor(function(service, app) {
         }
       }
 
+      const eventPrefix = ['contactOrUser',
+        ...(extendedWith.map(p => p[0].toUpperCase()+p.slice(1)))
+      ].join('And') +'Owned'
+
       if(config.ownerSetAccess || config.ownerWriteAccess) {
-        const eventName = 'ownerOwned' + modelName + 'Set'
+        const eventName = eventPrefix + modelName + 'Set'
         const actionName = 'setMy' + modelName
         service.actions[actionName] = new ActionDefinition({
           name: actionName,
@@ -171,7 +236,7 @@ definition.processor(function(service, app) {
       }
 
       if(config.ownerUpdateAccess || config.ownerWriteAccess) {
-        const eventName = 'ownerOwned' + modelName + 'Updated'
+        const eventName = eventPrefix + modelName + 'Updated'
         const actionName = 'updateMy' + modelName
         service.actions[actionName] = new ActionDefinition({
           name: actionName,
@@ -212,7 +277,7 @@ definition.processor(function(service, app) {
       }
 
       if(config.ownerResetAccess || config.ownerWriteAccess) {
-        const eventName = 'ownerOwned' + modelName + 'Reset'
+        const eventName = eventPrefix + modelName + 'Reset'
         const actionName = 'resetMy' + modelName
         service.actions[actionName] = new ActionDefinition({
           name: actionName,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/user-service",
-  "version": "0.2.26",
+  "version": "0.2.29",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -21,9 +21,9 @@
     "url": "https://www.viamage.com/"
   },
   "dependencies": {
-    "@live-change/framework": "0.6.0",
-    "@live-change/relations-plugin": "0.6.0",
+    "@live-change/framework": "0.6.3",
+    "@live-change/relations-plugin": "0.6.3",
     "pluralize": "8.0.0"
   },
-  "gitHead": "f3d7b9b6c689b9d87df3cb7f64cd75fc72339b7a"
+  "gitHead": "37d229ac05adf5e045ae3dcc826c6945d5dc3670"
 }

package/sessionOrUserProperty.js

@@ -3,23 +3,10 @@ const App = require("@live-change/framework")
 const { PropertyDefinition, ViewDefinition, IndexDefinition, ActionDefinition, EventDefinition } = App
 const { User } = require("./model.js")
 const { allCombinations } = require("./combinations.js")
+const { createIdentifiersProperties } = require('./utils.js')
 
 const pluralize = require('pluralize')
 
-function createIdentifiersProperties(keys) {
-  const identifiers = {}
-  if(keys) for(const key of keys) {
-    identifiers[key] = {
-      type: String,
-      validation: ['nonEmpty']
-    }
-    identifiers[key + 'Type'] = {
-      type: String,
-      validation: ['nonEmpty']
-    }
-  }
-  return identifiers
-}
 
 definition.processor(function(service, app) {
 
@@ -94,7 +81,7 @@ definition.processor(function(service, app) {
             access(params, context) {
               return config.ownerReadAccess ? config.ownerReadAccess(params, context) : true
             },
-            daoPath(params, {client, context}) {
+            daoPath(params, { client, context }) {
               const owner = client.user ? ['user_User', client.user] : ['session_Session', client.session]
               for (const key of combination) {
                 owner.push(params[key + 'Type'], params[key])
@@ -124,8 +111,12 @@ definition.processor(function(service, app) {
         }
       }
 
+      const eventPrefix = ['sessionOrUser',
+         ...(extendedWith.map(p => p[0].toUpperCase()+p.slice(1)))
+      ].join('And') +'Owned'
+
       if(config.ownerSetAccess || config.ownerWriteAccess) {
-        const eventName = 'ownerOwned' + modelName + 'Set'
+        const eventName = eventPrefix + modelName + 'Set'
         const actionName = 'setMy' + modelName
         service.actions[actionName] = new ActionDefinition({
           name: actionName,
@@ -164,7 +155,7 @@ definition.processor(function(service, app) {
       }
 
       if(config.ownerUpdateAccess || config.ownerWriteAccess) {
-        const eventName = 'ownerOwned' + modelName + 'Updated'
+        const eventName = eventPrefix + modelName + 'Updated'
         const actionName = 'updateMy' + modelName
         service.actions[actionName] = new ActionDefinition({
           name: actionName,
@@ -207,7 +198,7 @@ definition.processor(function(service, app) {
       }
 
       if(config.ownerResetAccess || config.ownerWriteAccess) {
-        const eventName = 'ownerOwned' + modelName + 'Reset'
+        const eventName = eventPrefix + modelName + 'Reset'
         const actionName = 'resetMy' + modelName
         service.actions[actionName] = new ActionDefinition({
           name: actionName,

package/utils.js

@@ -0,0 +1,16 @@
+function createIdentifiersProperties(keys) {
+  const identifiers = {}
+  if(keys) for(const key of keys) {
+    identifiers[key] = {
+      type: String,
+      validation: ['nonEmpty']
+    }
+    identifiers[key + 'Type'] = {
+      type: String,
+      validation: ['nonEmpty']
+    }
+  }
+  return identifiers
+}
+
+module.exports = { createIdentifiersProperties }

package/README.md

@@ -1 +0,0 @@
-# user-service