reorganize methods order

Author: facugon

core/service/job/index.js

@@ -35,7 +35,6 @@ module.exports = {
       next(null, jobs)
     })
   },
-
   async getJobsByTask (input) {
     const { task, customer } = input
 
@@ -304,6 +303,95 @@ module.exports = {
       )
     })
   },
+  /**
+   *
+   * @summary Finalize task execution. Save result and submit to elk
+   *
+   * @param {Object} input
+   * @property {Job} input.job
+   * @property {Object} input.result
+   * @param {Function} done
+   *
+   */
+  async finish (input, done) {
+    try {
+      const { job, user, customer, result = {} } = input
+
+      let state
+      let lifecycle
+      let eventName
+      let output
+
+      if (result.killed === true) {
+        lifecycle = LifecycleConstants.TERMINATED
+        state = StateConstants.TIMEOUT
+        eventName = StateConstants.TIMEOUT
+      } else {
+        lifecycle = LifecycleConstants.FINISHED
+        if (
+          input.state === StateConstants.SUCCESS ||
+          input.state === StateConstants.FAILURE
+        ) {
+          state = input.state
+        } else {
+          // assuming success for backward compatibility
+          state = (job.default_state_evaluation || StateConstants.SUCCESS)
+        }
+      }
+
+      job.lifecycle = lifecycle
+      job.state = state
+
+      const file = await this.storeJobOutput({ job, customer, result })
+      job.result_id = file._id
+
+      // data output, can be anything. stringify for security reason
+      if (result?.output) {
+        job.output = this.parseOutputParameters(result.output)
+      }
+
+      if (result.lastline) {
+        try {
+          const jsonLastline = JSON.parse(result.lastline)
+          // looking for state and output
+          if (isObject(jsonLastline)) {
+            if (jsonLastline.components) {
+              job.components = jsonLastline.components
+            }
+            if (jsonLastline.next) {
+              job.next = jsonLastline.next
+            }
+            if (jsonLastline.event_name) {
+              eventName = jsonLastline.event_name
+            }
+          }
+        } catch (err) {
+          //logger.log(err)
+        }
+      } else if (input.eventName) {
+        eventName = input.eventName
+      }
+
+      job.trigger_name = (eventName || state)
+
+      await job.save()
+
+      this.finishedPostprocessing({ job, user })
+
+      done(null, job)
+    } catch (err) {
+      logger.error(err)
+      done(err)
+    }
+  },
+  finishedPostprocessing ({ job, user }) {
+    process.nextTick(() => {
+      RegisterOperation.submit(Constants.UPDATE, TopicsConstants.job.crud, { job, user })
+      App.scheduler.cancelScheduledTimeoutVerificationJob(job) // async
+      dispatchFinishedJobExecutionEvent(job)
+      emitJobFinishedNotification({ job })
+    })
+  },
   /**
    * @return {Promise<Job>}
    */
@@ -464,108 +552,21 @@ module.exports = {
   },
   /**
    *
-   * @summary Finalize task execution. Save result and submit to elk
-   *
-   * @param {Object} input
-   * @property {Job} input.job
-   * @property {Object} input.result
-   * @param {Function} done
+   * @summary parse incomming job output -> input parameters.
+   * @return {[String]} array of strings (json encoded strings)
    *
    */
-  async finish (input, done) {
-    try {
-      const { job, user, customer, result = {} } = input
-
-      let state
-      let lifecycle
-      let eventName
-      let output
-
-      if (result.killed === true) {
-        lifecycle = LifecycleConstants.TERMINATED
-        state = StateConstants.TIMEOUT
-        eventName = StateConstants.TIMEOUT
+  parseOutputParameters (output) {
+    if (typeof output === 'string') {
+      return parseOutputStringAsJSON (output)
+    } else {
+      if (Array.isArray(output)) {
+        return filterOutputArray (output)
       } else {
-        lifecycle = LifecycleConstants.FINISHED
-        if (
-          input.state === StateConstants.SUCCESS ||
-          input.state === StateConstants.FAILURE
-        ) {
-          state = input.state
-        } else {
-          // assuming success for backward compatibility
-          state = (job.default_state_evaluation || StateConstants.SUCCESS)
-        }
-      }
-
-      job.lifecycle = lifecycle
-      job.state = state
-
-      const file = await this.storeJobOutput({ job, customer, result })
-      job.result_id = file._id
-
-      // data output, can be anything. stringify for security reason
-      if (result?.output) {
-        job.output = this.parseOutputParameters(result.output)
-      }
-
-      if (result.lastline) {
-        try {
-          const jsonLastline = JSON.parse(result.lastline)
-          // looking for state and output
-          if (isObject(jsonLastline)) {
-            if (jsonLastline.components) {
-              job.components = jsonLastline.components
-            }
-            if (jsonLastline.next) {
-              job.next = jsonLastline.next
-            }
-            if (jsonLastline.event_name) {
-              eventName = jsonLastline.event_name
-            }
-          }
-        } catch (err) {
-          //logger.log(err)
-        }
-      } else if (input.eventName) {
-        eventName = input.eventName
+        return [ JSON.stringify(output) ]
       }
-
-      job.trigger_name = (eventName || state)
-
-      await job.save()
-
-      this.finishedPostprocessing({ job, user })
-
-      done(null, job)
-    } catch (err) {
-      logger.error(err)
-      done(err)
     }
   },
-  async storeJobOutput ({ job, customer, result }) {
-    // parse result output
-    const data = JSON.stringify({ result }, null, 2)
-
-    const storeParams = {
-      customer,
-      data, // result string
-      filename: `${job.task_id}_result.json`,
-      mimetype: 'application/json',
-      extension: 'json',
-      size: data.length,
-      description: null,
-      md5: null,
-      tags: [],
-    }
-
-    const file = await App.file.create(storeParams, {
-      encoded_data: false,
-      pathname: 'outputs'
-    })
-
-    return file
-  },
   /**
    *
    * @summary Cancel Job execution.
@@ -602,31 +603,6 @@ module.exports = {
       next(err)
     }
   },
-  /**
-   *
-   * @summary parse incomming job output -> input parameters.
-   * @return {[String]} array of strings (json encoded strings)
-   *
-   */
-  parseOutputParameters (output) {
-    if (typeof output === 'string') {
-      return parseOutputStringAsJSON (output)
-    } else {
-      if (Array.isArray(output)) {
-        return filterOutputArray (output)
-      } else {
-        return [ JSON.stringify(output) ]
-      }
-    }
-  },
-  finishedPostprocessing ({ job, user }) {
-    process.nextTick(() => {
-      RegisterOperation.submit(Constants.UPDATE, TopicsConstants.job.crud, { job, user })
-      App.scheduler.cancelScheduledTimeoutVerificationJob(job) // async
-      dispatchFinishedJobExecutionEvent(job)
-      emitJobFinishedNotification({ job })
-    })
-  },
   jobMustHaveATask (job) {
     const result = (
       job._type === JobConstants.SCRAPER_TYPE ||
@@ -701,6 +677,29 @@ module.exports = {
       })
 
     return promise
+  },
+  async storeJobOutput ({ job, customer, result }) {
+    // parse result output
+    const data = JSON.stringify({ result }, null, 2)
+
+    const storeParams = {
+      customer,
+      data, // result string
+      filename: `${job.task_id}_result.json`,
+      mimetype: 'application/json',
+      extension: 'json',
+      size: data.length,
+      description: null,
+      md5: null,
+      tags: [],
+    }
+
+    const file = await App.file.create(storeParams, {
+      encoded_data: false,
+      pathname: 'outputs'
+    })
+
+    return file
   }
 }