@entity-access/entity-access 1.0.165 → 1.0.167

package/src/tests/model/ShoppingContext.ts

@@ -32,6 +32,8 @@ export class ShoppingContext extends EntityContext {
     public profilePhotos = this.model.register(ProfilePhoto);
 
     public userFiles = this.model.register(UserFile);
+
+    public emailAddresses = this.model.register(EmailAddress);
 }
 
 @Table("Users")
@@ -72,6 +74,22 @@ export class User {
     public photo: UserFile;
 }
 
+@Table("EmailAddresses")
+@Index({
+    name: "IX_Unique_EmailAddress",
+    columns: [{ name: (x) => x.address , descending: false }],
+    unique: true
+})
+export class EmailAddress {
+
+    @Column({ key: true, generated: "identity"})
+    public id: number;
+
+    @Column({ dataType: "Char", length: 200 })
+    public address: string;
+
+}
+
 @Table("Categories")
 export class Category {
 
@@ -297,7 +315,10 @@ export class OrderItem {
     @RelateTo({
         type: () => Order,
         property: (orderItem) => orderItem.order,
-        inverseProperty: (order) => order.orderItems
+        inverseProperty: (order) => order.orderItems,
+        foreignKeyConstraint: {
+            cascade: "delete"
+        }
     })
     public orderID: number;
 

package/src/workflows/WorkflowStorage.ts

@@ -10,6 +10,8 @@ import DateTime from "../types/DateTime.js";
 import WorkflowClock from "./WorkflowClock.js";
 import RawQuery from "../compiler/RawQuery.js";
 
+const loadedFromDb = Symbol("loadedFromDB");
+
 @Table("Workflows")
 @Index({
     name: "IX_Workflows_Group",
@@ -126,6 +128,7 @@ export default class WorkflowStorage {
                 error: r.error,
                 lastID: r.lastID,
                 taskGroup: r.taskGroup,
+                [loadedFromDb]: true,
             };
         }
         return null;
@@ -148,7 +151,7 @@ export default class WorkflowStorage {
                 output: r.output,
                 error: r.error,
                 lastID: r.lastID,
-                taskGroup: r.taskGroup
+                [loadedFromDb]: true
             };
         }
         return null;
@@ -187,22 +190,30 @@ export default class WorkflowStorage {
         const db = new WorkflowContext(this.driver);
         const connection = db.connection;
         await connection.runInTransaction(async () => {
-            let w = await db.workflows.where(state, (p) => (x) => x.id === p.id).first();
-            if (!w) {
-                w = db.workflows.add(state);
-                w.taskGroup ||= "default";
-            }
-
-            for (const key in state) {
-                if (Object.prototype.hasOwnProperty.call(state, key)) {
-                    const element = state[key];
-                    w[key] = element;
-                }
+            // let w = await db.workflows.where(state, (p) => (x) => x.id === p.id).first();
+            // if (!w) {
+            //     w = db.workflows.add(state);
+            //     w.taskGroup ||= "default";
+            // }
+
+            // for (const key in state) {
+            //     if (Object.prototype.hasOwnProperty.call(state, key)) {
+            //         const element = state[key];
+            //         w[key] = element;
+            //     }
+            // }
+
+            // w.state ||= "queued";
+            // w.updated ??= DateTime.utcNow;
+            state.state ||= "queued";
+            state.updated ??= DateTime.utcNow;
+            state.taskGroup ||= "default";
+            // await db.saveChanges();
+            if(state[loadedFromDb]) {
+                await db.workflows.saveDirect(state, "update");
+            } else {
+                await db.workflows.saveDirect(state, "upsert");
             }
-
-            w.state ||= "queued";
-            w.updated ??= DateTime.utcNow;
-            await db.saveChanges();
         });
     }
 

package/tsconfig.json

@@ -13,7 +13,7 @@
         "emitDecoratorMetadata": true,
         "lib": [
             "ES2018",
-            "esnext.disposable"
+            "ESNext.Disposable"
         ]
     },
     "include": [