fix model.update(), change to ISO dates

Author: tysonrm

src/adapters/controllers/delete-model.js

@@ -12,7 +12,7 @@ export default function deleteModelFactory (removeModel) {
       return {
         headers: {
           'Content-Type': 'application/json',
-          'Last-Modified': new Date().toUTCString()
+          'Last-Modified': new Date().toISOString()
         },
         statusCode: 201,
         body: { modelId: model.id }

src/adapters/controllers/live-rollout.js

@@ -17,7 +17,7 @@ export default function makeLiveRollout (hotDeploy) {
       return {
         headers: {
           'Content-Type': 'application/json',
-          'Last-Modified': new Date().toUTCString()
+          'Last-Modified': new Date().toISOString()
         },
         statusCode: 200,
         body: { result }

src/adapters/controllers/live-update.js

@@ -16,7 +16,7 @@ export default function makeLiveUpdate (hotReload) {
       return {
         headers: {
           'Content-Type': 'application/json',
-          'Last-Modified': new Date().toUTCString()
+          'Last-Modified': new Date().toISOString()
         },
         statusCode: 200,
         body: { fn: liveUpdate.name, result }

src/adapters/controllers/patch-model.js

@@ -18,7 +18,7 @@ export default function patchModelFactory (editModel) {
       return {
         headers: {
           'Content-Type': 'application/json',
-          'Last-Modified': new Date().toUTCString()
+          'Last-Modified': new Date().toISOString()
         },
         statusCode: 201,
         body: { modelId: model.id }

src/adapters/controllers/post-invoke-port.js

@@ -19,7 +19,7 @@ export default function anyInvokePortFactory (invokePort) {
       return {
         headers: {
           'Content-Type': 'application/json',
-          'Last-Modified': new Date().toUTCString()
+          'Last-Modified': new Date().toISOString()
         },
         statusCode: 201,
         body: { ...result }
@@ -38,4 +38,4 @@ export default function anyInvokePortFactory (invokePort) {
       }
     }
   }
-}
+}

src/adapters/controllers/post-model.js

@@ -18,7 +18,7 @@ export default function postModelFactory (createModel) {
       return {
         headers: {
           'Content-Type': 'application/json',
-          'Last-Modified': new Date().toUTCString()
+          'Last-Modified': new Date().toISOString()
         },
         statusCode: 201,
         body: { modelId: model.id }

src/domain/make-ports.js

@@ -13,7 +13,7 @@ const TIMEOUTSECONDS = 10
 const MAXRETRY = 5
 
 function getTimerArgs (args = null) {
-  const timerArg = { calledByTimer: new Date().toUTCString() }
+  const timerArg = { calledByTimer: new Date().toISOString() }
   if (args) return [...args, timerArg]
   return [timerArg]
 }
@@ -155,7 +155,7 @@ async function updatePortFlow (model, port) {
   const updateModel = this.equals(model) ? model : this
   return updateModel.update(
     {
-      [updateModel.getKey('portFlow')]: [...updateModel.getPortFlow(), port]
+      [updateModel.getKey('portFlow')]: [...this.getPortFlow(), port]
     },
     false
   )
@@ -189,13 +189,10 @@ export default function makePorts (ports, adapters, broker, datasource) {
       const portConf = ports[port]
       const disabled = portConf.disabled || !adapters[port]
 
-      // Listen for event that will invoke this port
-      const rememberPort = addPortListener(
-        portName,
-        portConf,
-        broker,
-        datasource
-      )
+      // dont listen on a disabled port
+      const rememberPort = disabled
+        ? false
+        : addPortListener(portName, portConf, broker, datasource)
 
       /**
        *
@@ -264,7 +261,9 @@ export default function makePorts (ports, adapters, broker, datasource) {
           // check if the port defines breaker thresholds
           const thresholds = portConf.circuitBreaker
 
+          // call port without breaker (normal for inbound)
           if (!thresholds) return portFn.apply(this, args)
+
           /**
            * the circuit breaker instance
            * @type {import('./circuit-breaker').breaker}

src/domain/mixins.js

@@ -77,7 +77,7 @@ export const toSymbol = keyMap => o => {
  * @param {"utc"|"iso"} format
  */
 export const fromTimestamp = (timestamps, format = 'utc') => o => {
-  const formats = { utc: 'toUTCString', iso: 'toISOString' }
+  const formats = { utc: 'toISOString', iso: 'toISOString' }
   const fn = formats[format]
 
   if (!fn) {

src/domain/model.js

@@ -263,22 +263,20 @@ const Model = (() => {
 
       /**
        * Concurrency strategy is to merge changes with
-       * last saved copy; so {@link changes} should include
+       * zthe current instance; so {@link changes} should include
        * only the subset of properties that are changing.
        * Concomitant strategy is to use `Symbol`s to
-       * avoid conflict, which requires a custom
+       * avoid conflict, which may require a custom
        * {@link Serializer} for network and storage
-       * transmission. If conflict does occur , last
+       * handling. If conflict does occur, last
        * one in wins.
        *
        * @param {object} changes - object containing updated props
        * @param {boolean} validate - run validation by default
        * @returns {Promise<Model>}
        */
       async update (changes, validate = true) {
-        const lastsaved = datasource.findSync(this[ID]) || {}
-        const mergedata = { ...lastsaved, ...this }
-        const validated = validateUpdates(mergedata, changes, validate)
+        const validated = validateUpdates(this, changes, validate)
         const timestamp = { ...validated, [UPDATETIME]: Date.now() }
 
         await datasource.save(this[ID], timestamp)
@@ -291,18 +289,7 @@ const Model = (() => {
       /**
        * Synchronous version of {@link Model.update}.
        * Only updates cache. External storage is
-       * not updated and no event is sent.
-       *
-       * Useful for:
-       * - immediate cache update
-       * - controlling when/if event is sent
-       * - calling external storage with custom adapter
-       *
-       * Consider situations in which the point is not
-       * to persist data, but to share it with other
-       * application components, as is done in workflow
-       * or between local related model threads, which
-       * use shared memory.
+       * not updated
        *
        * @param {*} changes
        * @param {boolean} validate

src/domain/thread-pool.js

@@ -466,7 +466,7 @@ export class ThreadPool extends EventEmitter {
       errorRateTolerance: this.errorRateThreshold(),
       errors: this.errorCount(),
       deployments: this.deploymentCount(),
-      since: new Date(this.startTime).toUTCString()
+      since: new Date(this.startTime).toISOString()
     }
   }
 
@@ -751,12 +751,7 @@ const ThreadPoolFactory = (() => {
 
     const facade = {
       async runJob (jobName, jobData, modelName) {
-        return getPool(poolName, options).runJob(
-          jobName,
-          jobData,
-          modelName,
-            
-        )
+        return getPool(poolName, options).runJob(jobName, jobData, modelName)
       },
       status () {
         return getPool(poolName, options).status()