@social-mail/social-mail-web-server 1.8.321 → 1.8.323

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@social-mail/social-mail-web-server",
-  "version": "1.8.321",
+  "version": "1.8.323",
   "description": "## Phase 1",
   "main": "index.js",
   "type": "module",

package/src/server/model/entities/StoreAccount.ts

@@ -55,15 +55,7 @@ import type StorePaymentGateway from "./StorePaymentGateway.js";
 })
 export class StoreAccount {
 
-    @Column({ dataType: "BigInt", key: true})
-    @RelateToOne(User, {
-        property: (x) => x.user,
-        inverseProperty: (x) => x.storeAccount,
-        foreignKeyConstraint: {
-            name: "FC_StoreAccounts_Customer_UserID",
-            onDelete: "restrict"
-        }
-    })
+    @Column({ dataType: "BigInt", key: true, generated: "identity"})
     public accountID: number;
 
     @Column({ dataType: "Char", length: 400, nullable: true })
@@ -80,6 +72,17 @@ export class StoreAccount {
     })
     public storeID: number;
 
+    @Column({ dataType: "BigInt", nullable: true })
+    @RelateTo(User, {
+        property: (x) => x.user,
+        inverseProperty: (x) => x.storeAccounts,
+        foreignKeyConstraint: {
+            name: "FC_StoreAccounts_Customer_UserID",
+            onDelete: "restrict"
+        }
+    })
+    public userID: number;
+
     @Column({ dataType: "BigInt", nullable: true })
     @RelateTo(StoreAccount, {
         property: (x) => x.parent,

package/src/server/model/entities/User.ts

@@ -190,7 +190,7 @@ export class User {
     // storeOrders: StoreBill[];
     closedEmails: Email[];
     hostedZones: HostedZoneUser[];
-    storeAccount: StoreAccount;
+    storeAccounts: StoreAccount[];
     groups: UserGroupMember[];
     groupMembers: UserGroupMember[];
     appPasswords: AppPassword[];

package/src/server/model/events/VerificationTokenEvents.ts

@@ -159,11 +159,9 @@ export default class VerificationTokenEvents extends AuthenticatedEvents<Verific
                         const { email } = entity;
                         webSiteFolderID = w.folderID;
                         const user = await db.users.where({ webSiteFolderID, email }, (p) => (x) =>
-                                x.storeAccount.storeID === p.webSiteFolderID
-                                    && x.storeAccount.emails.some((e) =>
-                                        e.emailAddress.emailAddress === p.email
-                                    )
-                                )
+                                x.contactEmail === p.email
+                                && x.storeAccounts.some((s) => s.storeID === p.webSiteFolderID)
+                            )
                             .first();
                         if (user) {
                             entity.userID = user.userID;
@@ -219,10 +217,8 @@ export default class VerificationTokenEvents extends AuthenticatedEvents<Verific
         }
 
         const { userID } = await db.users.where({ storeID, addresses }, (p) => (x) =>
-            x.storeAccount.storeID === p.storeID
-            && x.storeAccount.emails.some((e) => Sql.in(e.emailAddress.emailAddress, p.addresses))
-                || x.storeAccount.phones.some((e) => Sql.in(e.phoneNumberE64, p.addresses))
-            )
+            Sql.in(x.contactEmail, p.addresses)
+            && x.storeAccounts.some((s) => s.storeID === p.storeID))
             .firstOrFail();
 
         await db.verificationTokens.statements.update({ verified: true }, { verificationID: entity.verificationID });

package/src/server/seed/ui/seed-ui.ts

@@ -17,7 +17,7 @@ export default async function seedUI(config: DBConfig) {
     await config.saveVersion(UIPackageConfig, {
         package: "@social-mail/social-mail-client",
         view: "dist/web/AppIndex",
-        version: "1.9.23"
+        version: "1.9.24"
     });
 
     await config.saveVersion(WebComponentsPackageConfig, {

package/src/server/services/accounts/JournalService.ts

@@ -16,7 +16,18 @@ export default class JournalService {
 
     async syncEntries(entry: ChangeEntry<StoreJournal>, entity: StoreJournal) {
 
-        const { total } = entity;
+        const { total, storeID } = entity;
+
+        // create an anonymous customer
+        // if buyerID is null
+        if (!entity.buyerID) {
+            const account = await this.chartOfAccounts.ensureAccount({
+                storeID,
+                name: "Customer",
+                head: "Customers"
+            });
+            entity.buyerID = account.accountID;
+        }
 
         await this.addEntry({
             entity,
@@ -33,7 +44,7 @@ export default class JournalService {
             await ce.loadNavigationAsync((x) => x.item);
             await ce.loadNavigationAsync((x) => x.itemPrice);
 
-            if(!lineItem.source) {
+            if(!lineItem.source && !lineItem.taxFor) {
                 await this.addEntry({
                     account: AccountNames.Sales,
                     lineItem,

package/src/server/services/accounts/chart-of-accounts/ChartOfAccounts.ts

@@ -1,5 +1,9 @@
 import Inject, { RegisterTransient } from "@entity-access/entity-access/dist/di/di.js";
 import SocialMailContext from "../../../model/SocialMailContext.js";
+import EntityAccessError from "@entity-access/entity-access/dist/common/EntityAccessError.js";
+import { randomUUID } from "node:crypto";
+import CryptoService from "../../CryptoService.js";
+import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
 
 @RegisterTransient
 export default class ChartOfAccounts {
@@ -7,19 +11,26 @@ export default class ChartOfAccounts {
     @Inject
     db: SocialMailContext;
 
-    async ensureAccount({storeID , name , parentID = null, parentName = null, customerID = null, head = null}) {
+    @Inject
+    cryptoService: CryptoService;
+
+    async ensureAccount({storeID , name , parentID = null, parentName = null, userID = null, head = null}) {
+
+        let path = name;
 
         if (parentName) {
             const parent = await this.ensureAccount({ storeID, name: parentName, head });
             parentID = parent.accountID;
             head = parent.head;
+            path = `${parentName}/${name}`;
         }
 
         return await this.db.storeAccounts.statements.selectOrInsert({
             parentID,
             storeID,
             name,
-            accountID: customerID,
+            path,
+            accountID: userID,
             head,
         });
     }