@things-factory/integration-base 8.0.41 → 8.0.54

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/integration-base",
-  "version": "8.0.41",
+  "version": "8.0.54",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -27,13 +27,13 @@
   "dependencies": {
     "@apollo/client": "^3.6.9",
     "@operato/moment-timezone-es": "^8.0.0",
-    "@things-factory/api": "^8.0.41",
-    "@things-factory/auth-base": "^8.0.41",
-    "@things-factory/cache-service": "^8.0.41",
+    "@things-factory/api": "^8.0.54",
+    "@things-factory/auth-base": "^8.0.54",
+    "@things-factory/cache-service": "^8.0.54",
     "@things-factory/env": "^8.0.37",
-    "@things-factory/oauth2-client": "^8.0.41",
-    "@things-factory/scheduler-client": "^8.0.41",
-    "@things-factory/shell": "^8.0.38",
+    "@things-factory/oauth2-client": "^8.0.54",
+    "@things-factory/scheduler-client": "^8.0.54",
+    "@things-factory/shell": "^8.0.54",
     "@things-factory/utils": "^8.0.37",
     "async-mqtt": "^2.5.0",
     "chance": "^1.1.11",
@@ -44,5 +44,5 @@
     "readline": "^1.3.0",
     "ses": "^1.5.0"
   },
-  "gitHead": "68ed47dc717d534edbee63adf16d2a84df73f501"
+  "gitHead": "b222492ba1cb28c9095a66ce2207c8954bcb4b37"
 }

package/server/engine/task/state-read.ts

@@ -1,9 +1,10 @@
-import gql from 'graphql-tag'
 import { TaskRegistry } from '../task-registry'
 import { InputStep } from '../../service/step/step-type'
 import { Context } from '../types'
+import { getRepository } from '@things-factory/shell'
+import { StateRegister } from '../../service/state-register/state-register'
 
-async function StateRead(step: InputStep, { logger, publish, data, domain, user, client }: Context) {
+async function StateRead(step: InputStep, { logger, publish, data, domain, user }: Context) {
   var {
     params: { name }
   } = step
@@ -12,34 +13,11 @@ async function StateRead(step: InputStep, { logger, publish, data, domain, user,
     throw Error(`name should be defined: name - '${name}'`)
   }
 
-  var { data: queryResult, errors } = await client.query({
-    query: gql`
-      query ($name: String!) {
-        stateRegisterByName(name: $name) {
-          state
-        }
-      }
-    `,
-    variables: {
-      name
-    },
-    context: {
-      state: {
-        domain,
-        user
-      }
-    }
+  const result = await getRepository(StateRegister).findOne({
+    where: { domain: { id: domain.id }, name }
   })
 
-  if (errors) {
-    errors.forEach(error => {
-      logger.error('GraphQL Error: %s', error)
-    })
-  }
-
-  return {
-    data: queryResult?.stateRegisterByName?.state
-  }
+  return { data: result?.state }
 }
 
 StateRead.parameterSpec = [

package/server/engine/task/state-write.ts

@@ -1,10 +1,11 @@
-import gql from 'graphql-tag'
 import { access } from '@things-factory/utils'
 import { TaskRegistry } from '../task-registry'
 import { InputStep } from '../../service/step/step-type'
 import { Context } from '../types'
+import { getRepository } from '@things-factory/shell'
+import { StateRegister } from '../../service/state-register/state-register'
 
-async function StateWrite(step: InputStep, { logger, publish, data, domain, user, client }: Context) {
+async function StateWrite(step: InputStep, { logger, publish, data, domain, user }: Context) {
   var {
     params: { name, accessor }
   } = step
@@ -15,34 +16,20 @@ async function StateWrite(step: InputStep, { logger, publish, data, domain, user
 
   var state = access(accessor, data)
 
-  var { data: mutateResult, errors } = await client.mutate({
-    mutation: gql`
-      mutation ($state: Object!, $name: String!) {
-        updateStateRegisterByName(state: $state, name: $name) {
-          state
-        }
-      }
-    `,
-    variables: {
-      name,
-      state
-    },
-    context: {
-      state: {
-        domain,
-        user
-      }
-    }
+  const repository = getRepository(StateRegister)
+  const stateRegister = await repository.findOne({
+    where: { domain: { id: domain?.id }, name }
   })
 
-  if (errors) {
-    errors.forEach(error => {
-      logger.error('GraphQL Error: %s', error)
-    })
-  }
+  const result = await repository.save({
+    ...stateRegister,
+    state,
+    writer: user,
+    wroteAt: new Date()
+  })
 
   return {
-    data: mutateResult?.updateStateRegisterByName?.state
+    data: result?.state
   }
 }