@social-mail/social-mail-web-server 1.4.855 → 1.4.857

package/package.json

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

package/src/server/model/SocialMailContext.ts

@@ -37,7 +37,7 @@ import EmailEngagement from "./entities/EmailEngagement.js";
 import MailboxContactTag from "./entities/MailboxContactTag.js";
 import ChannelConfig from "./entities/ChannelConfig.js";
 import UserPushSubscription from "./entities/UserSubscriptions.js";
-import Store, { StoreConfig, StoreInsight, StoreItem, StoreItemFolder, StoreItemPrice, StoreItemTag, StoreItemTax, StoreJournal, StoreJournalEntry, StoreJournalLineItem, StoreLedger, StoreMediaFile, StoreTag, StoreUser } from "./entities/Store.js";
+import Store, { StoreConfig, StoreInsight, StoreItem, StoreItemFolder, StoreItemFolderTag, StoreItemPrice, StoreItemTag, StoreItemTax, StoreJournal, StoreJournalEntry, StoreJournalLineItem, StoreLedger, StoreMediaFile, StoreTag, StoreUser } from "./entities/Store.js";
 import RateLimitToken from "./entities/RateLimitToken.js";
 import AccessToken from "./entities/AccessToken.js";
 import ServerActivity from "./entities/ServerActivity.js";
@@ -135,6 +135,8 @@ export default class SocialMailContext extends EntityContext {
 
     public storeItemFolders = this.model.register(StoreItemFolder);
 
+    public storeItemFolderTags = this.model.register(StoreItemFolderTag);
+
     public storeItemPrices = this.model.register(StoreItemPrice);
 
     // public storePriceAddOns = this.model.register(StorePriceAddOn);

package/src/server/model/SocialMailContextEvents.ts

@@ -68,7 +68,7 @@ import UserPushSubscription from "./entities/UserSubscriptions.js";
 import UserPushSubscriptionEvents from "./events/UserPushSubscriptionEvents.js";
 import EmailEngagement from "./entities/EmailEngagement.js";
 import EmailEngagementEvents from "./events/EmailEngagementEvents.js";
-import Store, { StoreConfig, StoreInsight, StoreItem, StoreItemFolder, StoreItemPrice, StoreItemTag, StoreItemTax, StoreJournal, StoreJournalEntry, StoreJournalLineItem, StoreLedger, StoreMediaFile, StoreTag, StoreUser } from "./entities/Store.js";
+import Store, { StoreConfig, StoreInsight, StoreItem, StoreItemFolder, StoreItemFolderTag, StoreItemPrice, StoreItemTag, StoreItemTax, StoreJournal, StoreJournalEntry, StoreJournalLineItem, StoreLedger, StoreMediaFile, StoreTag, StoreUser } from "./entities/Store.js";
 import StoreEvents from "./events/StoreEvents.js";
 import StoreItemEvents from "./events/StoreItemEvents.js";
 // import StoreOrderEvents from "./events/StoreOrderEvents.js";
@@ -94,6 +94,7 @@ import IncomingSmsSourceEvents from "./events/IncomingSmsSourceEvents.js";
 import VerificationToken from "./entities/VerificationToken.js";
 import VerificationTokenEvents from "./events/VerificationTokenEvents.js";
 import StoreTagEvents from "./events/StoreTagEvents.js";
+import StoreItemFolderTagEvents from "./events/StoreItemFolderTagEvents.js";
 
 @RegisterSingleton
 export default class SocialMailContextEvents extends ContextEvents {
@@ -141,6 +142,7 @@ export default class SocialMailContextEvents extends ContextEvents {
         this.register(StoreJournalEntry, StoreJournalEntryEvents);
         this.register(StoreJournalLineItem, StoreJournalLineItemEvents);
         this.register(StoreItemFolder, StoreItemFolderEvents);
+        this.register(StoreItemFolderTag, StoreItemFolderTagEvents);
         this.register(StoreMediaFile, StoreMediaFileEvents);
         this.register(StoreConfig, StoreConfigEvents);
         this.register(StoreItemTax, StoreItemTaxEvents);

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

@@ -87,7 +87,7 @@ export class StoreTag {
     })
     public tagID: number;
 
-    @Column({ dataType: "Int"})
+    @Column({ dataType: "Int", default: () => 0 })
     public count: number;
 
     public store: Store;
@@ -414,8 +414,33 @@ export class StoreItemFolder {
     parent: StoreItemFolder;
     children: StoreItemFolder[];
     items: StoreItem[];
+    tags: StoreItemFolderTag[];
 }
 
+@Table("StoreItemFolderTags")
+export class StoreItemFolderTag {
+
+    @Column({ dataType: "BigInt", key: true })
+    @RelateTo(StoreItemFolder, {
+        property: (x) => x.itemFolder,
+        inverseProperty: (x) => x.tags
+    })
+    itemFolderID: number;
+
+    @Column({ dataType: "BigInt", key: true })
+    @RelateTo(Tag, {
+        property: (x) => x.tag,
+        inverseProperty: (x) => x.storeItemFolderTags
+    })
+    tagID: number;
+
+    @Column({ dataType: "Int", default: () => 0 })
+    count: number;
+
+    itemFolder: StoreItemFolder;
+
+    tag: Tag;
+}
 
 @Table("StoreItems")
 export class StoreItem {

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

@@ -8,7 +8,7 @@ import type { ContactTag } from "./Contact.js";
 import { IgnoreJsonProperty, ReadOnlyJsonProperty } from "@entity-access/server-pages/dist/services/ModelService.js";
 import type MailboxContactTag from "./MailboxContactTag.js";
 import type EmailTag from "./EmailTag.js";
-import type { StoreItemTag, StoreTag } from "./Store.js";
+import type { StoreItemFolderTag, StoreItemTag, StoreTag } from "./Store.js";
 
 /**
  * The reason tags table exists in form of string,bigint pair is, we need
@@ -77,4 +77,5 @@ export default class Tag {
 
     public storeItemTags: StoreItemTag[];
     storeTags: StoreTag[];
+    storeItemFolderTags: StoreItemFolderTag[];
 }

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

@@ -5,9 +5,21 @@ import EntityAccessError from "@entity-access/entity-access/dist/common/EntityAc
 import ChangeEntry from "@entity-access/entity-access/dist/model/changes/ChangeEntry.js";
 import SocialMailContext from "../SocialMailContext.js";
 import { ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
+import External from "@entity-access/server-pages/dist/decorators/External.js";
+import Page from "@entity-access/server-pages/dist/Page.js";
 
 export default class StoreEvents extends AuthenticatedEvents<Store> {
 
+    @External
+    storeQuery() {
+        const page = ServiceProvider.resolve(this, Page as any) as Page;
+        const host = page.request.host;
+
+        const db = ServiceProvider.resolve(this, SocialMailContext);
+        const q = db.stores.where({ host }, (p) => (x) => x.storeWebsites.some((w) => w.website.hosts.some((h) => h.host === p.host)));
+        return q;
+    }
+
     filter(query: IEntityQuery<Store>) {
         if (!this.verify) {
             return query;

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

@@ -67,14 +67,25 @@ export default class StoreItemEvents extends AuthenticatedEvents<StoreItem> {
 
         if (entry.isModified("active")) {
             const diff = entity.active ? 1 : -1;
-            const { storeItemID } = entity;
-            await db.storeTags.where(entity, (p) => (x) => x.storeID === p.storeID)
-                .update({ diff, storeItemID }, (p) => (x) => ({
-                    count: x.count + Sql.coll.sum(x.store.storeItems
-                        .map((si) => Sql.coll.sum(si.storeItemTags
-                            .map((t) => Sql.cast.asBoolean(p.diff) ? 1 : -1 ))))
-                }));
+            await this.updateCounts(entity, diff);
         }
     }
 
+    async afterInsert(entity: StoreItem, entry: ChangeEntry<StoreItem>) {
+        if (entity.active) {
+            await this.updateCounts(entity, 1);
+        }
+    }
+
+
+    private async updateCounts(entity: StoreItem, diff: number) {
+        const db = ServiceProvider.resolve(this, SocialMailContext);
+        const { storeItemID } = entity;
+        await db.storeTags.where(entity, (p) => (x) => x.storeID === p.storeID)
+            .update({ diff, storeItemID }, (p) => (x) => ({
+                count: x.count + Sql.coll.sum(x.store.storeItems
+                    .map((si) => Sql.coll.sum(si.storeItemTags
+                        .map((t) => Sql.cast.asBoolean(p.diff) ? 1 : -1))))
+            }));
+    }
 }

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

@@ -0,0 +1,11 @@
+import { IEntityQuery } from "@entity-access/entity-access/dist/model/IFilterWithParameter.js";
+import { StoreItemFolderTag } from "../entities/Store.js";
+import AuthenticatedEvents from "./AuthenticatedEvents.js";
+
+export default class StoreItemFolderTagEvents extends AuthenticatedEvents<StoreItemFolderTag> {
+
+    filter(query: IEntityQuery<StoreItemFolderTag>): IEntityQuery<StoreItemFolderTag> {
+        return query;
+    }
+
+}

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

@@ -48,11 +48,21 @@ export default class StoreItemTagEvents extends AuthenticatedEvents<StoreItemTag
     }
 
     async afterInsert(entity: StoreItemTag, entry: ChangeEntry<StoreItemTag>) {
+        const diff = entity.storeItem.active ? 1 : 0;
+        await this.updateTagCounts(entry, entity, diff);
+    }
+
+    async afterDelete(entity: StoreItemTag, entry: ChangeEntry<StoreItemTag>) {
+        await entry.loadNavigationAsync((x) => x.storeItem);
+        const diff = entity.storeItem.active ? -1 : 0;
+        await this.updateTagCounts(entry, entity, diff);
+    }
+
+    private async updateTagCounts(entry: ChangeEntry<StoreItemTag>, entity: StoreItemTag, diff: number) {
         const db = ServiceProvider.resolve(this, SocialMailContext);
         await entry.loadNavigationAsync((x) => x.storeItem);
         const { storeItem } = entity;
-        const diff = entity.storeItem.active ? 1 : 0;
-        const updated = await db.storeTags.where(storeItem, (p) => (x) => x.storeID === p.storeID)
+        let updated = await db.storeTags.where(storeItem, (p) => (x) => x.storeID === p.storeID)
             .update({ diff }, (p) => (x) => ({
                 count: x.count + Sql.cast.asInteger(p.diff)
             }));
@@ -67,16 +77,25 @@ export default class StoreItemTagEvents extends AuthenticatedEvents<StoreItemTag
 
             await db.storeTags.statements.upsert({ storeID, tagID, count }, void 0, { storeID, tagID });
         }
-    }
 
-    async afterDelete(entity: StoreItemTag, entry: ChangeEntry<StoreItemTag>) {
-        const db = ServiceProvider.resolve(this, SocialMailContext);
-        await entry.loadNavigationAsync((x) => x.storeItem);
-        const { storeItem } = entity;
-        const diff = entity.storeItem.active ? -1 : 0;
-        await db.storeTags.where(storeItem, (p) => (x) => x.storeID === p.storeID)
+        if (!storeItem.itemFolderID) {
+            return;
+        }
+        updated = await db.storeItemFolderTags.where(storeItem, (p) => (x) => x.itemFolderID === p.itemFolderID)
             .update({ diff }, (p) => (x) => ({
                 count: x.count + Sql.cast.asInteger(p.diff)
             }));
+        if (!updated) {
+            // insert one...
+            const { itemFolderID } = storeItem;
+            const { tagID } = entity;
+            const count = await db.storeItemFolderTags.where({ itemFolderID, tagID }, (p) => (x) => x.itemFolder.items.some((si) => si.active === true)
+                && x.tagID === p.tagID
+                && x.itemFolderID === p.itemFolderID)
+                .count();
+
+            await db.storeItemFolderTags.statements.upsert({ itemFolderID, tagID, count }, void 0, { itemFolderID, tagID });
+        }
     }
+
 }

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

@@ -5,6 +5,7 @@ import ChangeEntry from "@entity-access/entity-access/dist/model/changes/ChangeE
 import Inject, { ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
 import SocialMailContext from "../SocialMailContext.js";
 import TagService from "../../services/tags/TagService.js";
+import { ForeignKeyFilter } from "@entity-access/entity-access/dist/model/events/EntityEvents.js";
 
 export default class TagEvents extends AuthenticatedEvents<Tag> {
 
@@ -29,6 +30,10 @@ export default class TagEvents extends AuthenticatedEvents<Tag> {
         );
     }
 
+    onForeignKeyFilter(filter: ForeignKeyFilter<Tag, any>): IEntityQuery<any> {
+        return filter.unfiltered();
+    }
+
     includeFilter(query: IEntityQuery<Tag>, type?: any, key?: string | undefined): IEntityQuery<Tag> {
         return query;
     }

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

@@ -3,7 +3,7 @@ import semver from "semver";
 
 export default async function seedUI(config: DBConfig) {
 
-    const version = "1.2.324";
+    const version = "1.2.329";
 
     const existing = await config.getValue(UIPackageConfig, false);
     if (existing) {