fix tasks

Author: eveffer

deno.json

@@ -1,6 +1,6 @@
 {
   "name": "@inspatial/cloud",
-  "version": "0.7.6",
+  "version": "0.7.7",
   "license": "Apache-2.0",
   "exports": {
     ".": "./mod.ts",

src/in-queue/entry-types/in-task/in-task.ts

@@ -6,6 +6,7 @@ import dateUtils from "../../../utils/date-utils.ts";
 import type { InSpatialORM } from "../../../orm/inspatial-orm.ts";
 import { convertString } from "~/utils/mod.ts";
 import type { EntryName, SettingsName } from "#types/models.ts";
+import type { GenericEntry } from "../../../orm/entry/entry-base.ts";
 
 const config = {
   titleField: "title",
@@ -21,26 +22,26 @@ const config = {
   hooks: {
     beforeCreate: [{
       name: "setTitle",
-      handler({ entry }: { entry: any }) {
-        let title = `${convertString(entry.taskType, "title")}: `;
-        if (entry.typeKey) {
-          title += `${convertString(entry.typeKey, "title")}`;
+      handler({ entry }: { entry: GenericEntry }) {
+        let title = `${convertString(entry.$taskType, "title")}: `;
+        if (entry.$typeKey) {
+          title += `${convertString(entry.$typeKey, "title")}`;
         }
-        title += ` - ${entry.actionName}`;
-        entry.title = title;
+        title += ` - ${entry.$actionName}`;
+        entry.$title = title;
       },
     }],
   },
   actions: [{
     key: "runTask",
     params: [],
     async action({ entry, inCloud, orm }: {
-      entry: any;
+      entry: GenericEntry;
       inCloud: any;
       orm: InSpatialORM;
     }) {
       let results;
-      switch (entry.status) {
+      switch (entry.$status) {
         case "queued":
         case "failed":
           break;
@@ -50,25 +51,25 @@ const config = {
       // const orm = inCloud.orm.withAccount(
       //   inCloud.orm.systemGobalUser.accountId,
       // );
-      entry.status = "running";
-      entry.startTime = dateUtils.nowTimestamp();
+      entry.$status = "running";
+      entry.$startTime = dateUtils.nowTimestamp();
       await entry.save();
       try {
-        switch (entry.taskType) {
+        switch (entry.$taskType) {
           case "entry":
             results = await runEntryTask({
-              actionName: entry.actionName,
-              entryType: entry.typeKey!,
-              id: entry.entryId!,
-              taskData: entry.taskData,
+              actionName: entry.$actionName,
+              entryType: entry.$typeKey!,
+              id: entry.$entryId!,
+              taskData: entry.$taskData,
               orm,
             });
             break;
           case "settings":
             results = await runSettingsTask({
-              actionName: entry.actionName,
-              settings: entry.typeKey!,
-              taskData: entry.taskData,
+              actionName: entry.$actionName,
+              settings: entry.$typeKey!,
+              taskData: entry.$taskData,
               orm,
             });
             break;
@@ -77,19 +78,19 @@ const config = {
             //   break;
         }
 
-        entry.resultData = {
+        entry.$resultData = {
           result: results,
         };
-        entry.status = "completed";
+        entry.$status = "completed";
       } catch (e) {
-        entry.errorInfo = Deno.inspect(e);
+        entry.$errorInfo = Deno.inspect(e);
         inCloud.inLog.error(e, {
-          subject: `${entry.typeKey} ${entry.entryId} - ${entry.actionName}`,
+          subject: `${entry.$typeKey} ${entry.$entryId} - ${entry.$actionName}`,
           stackTrace: e instanceof Error ? e.stack : undefined,
         });
-        entry.status = "failed";
+        entry.$status = "failed";
       }
-      entry.endTime = dateUtils.nowTimestamp();
+      entry.$endTime = dateUtils.nowTimestamp();
       await entry.save();
     },
   }],