@social-mail/social-mail-web-server 1.7.605 → 1.7.607

package/package.json

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

package/src/server/model/SocialMailContext.ts

@@ -49,7 +49,7 @@ import { StoreItemFolderTag } from "./entities/StoreItemFolderTag.js";
 import { StoreItemFolder } from "./entities/StoreItemFolder.js";
 import { StoreJournalEntry } from "./entities/StoreJournalEntry.js";
 import { StoreJournalLineItem } from "./entities/StoreJournalLineItem.js";
-import { StoreTag } from "./entities/StoreTag.js";
+import { WebSiteTag } from "./entities/WebSiteTag.js";
 import RateLimitToken from "./entities/RateLimitToken.js";
 import AccessToken from "./entities/AccessToken.js";
 import ServerActivity from "./entities/ServerActivity.js";
@@ -219,7 +219,7 @@ export default class SocialMailContext extends EntityContext {
 
     public storeItemTaxes = this.model.register(StoreItemTax);
 
-    public storeTags = this.model.register(StoreTag);
+    public storeTags = this.model.register(WebSiteTag);
 
     public storeItemTags = this.model.register(StoreItemTag);
 

package/src/server/model/SocialMailContextEvents.ts

@@ -80,7 +80,7 @@ import { StoreItemFolderTag } from "./entities/StoreItemFolderTag.js";
 import { StoreItemFolder } from "./entities/StoreItemFolder.js";
 import { StoreJournalEntry } from "./entities/StoreJournalEntry.js";
 import { StoreJournalLineItem } from "./entities/StoreJournalLineItem.js";
-import { StoreTag } from "./entities/StoreTag.js";
+import { WebSiteTag } from "./entities/WebSiteTag.js";
 import StoreItemEvents from "./events/StoreItemEvents.js";
 import StoreItemPriceEvents from "./events/StoreItemPriceEvents.js";
 import AccessToken from "./entities/AccessToken.js";
@@ -98,7 +98,7 @@ import IncomingSmsSource from "./entities/IncomingSmsSource.js";
 import IncomingSmsSourceEvents from "./events/IncomingSmsSourceEvents.js";
 import VerificationToken, { VerificationTokenAddress } from "./entities/VerificationToken.js";
 import VerificationTokenEvents from "./events/VerificationTokenEvents.js";
-import StoreTagEvents from "./events/StoreTagEvents.js";
+import WebSiteTagEvents from "./events/WebSiteTagEvents.js";
 import StoreItemFolderTagEvents from "./events/StoreItemFolderTagEvents.js";
 import HostedZone, { HostedZoneRecord, HostedZoneUser } from "./entities/HostedZone.js";
 import HostedZoneEvents, { HostedZoneRecordEvents, HostedZoneUserEvents } from "./events/HostedZoneEvents.js";
@@ -207,7 +207,7 @@ export default class SocialMailContextEvents extends ContextEvents {
         this.register(StoreItemFolderTag, StoreItemFolderTagEvents);
         this.register(StoreMediaFile, StoreMediaFileEvents);
         this.register(StoreItemTax, StoreItemTaxEvents);
-        this.register(StoreTag, StoreTagEvents);
+        this.register(WebSiteTag, WebSiteTagEvents);
         // this.register(StorePriceAddOn, StorePriceAddOnEvents);
         // this.register(StoreBill, StoreOrderEvents);
         // this.register(StoreBillLine, StoreOrderItemEvents);

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

@@ -10,7 +10,7 @@ import type MailboxContactTag from "./MailboxContactTag.js";
 import type EmailTag from "./EmailTag.js";
 import type { StoreItemTag } from "./StoreItemTag.js";
 import type { StoreItemFolderTag } from "./StoreItemFolderTag.js";
-import type { StoreTag } from "./StoreTag.js";
+import type { WebSiteTag } from "./WebSiteTag.js";
 import type MailboxFolder from "./MailboxFolder.js";
 import type MailboxTag from "./MailboxTag.js";
 
@@ -83,7 +83,7 @@ export default class Tag {
     public contactTags: ContactTag[];
 
     public storeItemTags: StoreItemTag[];
-    storeTags: StoreTag[];
+    storeTags: WebSiteTag[];
     storeItemFolderTags: StoreItemFolderTag[];
     mailboxFolders: MailboxFolder[];
     mailboxTags: MailboxTag[];

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

@@ -5,7 +5,7 @@ import AppFile, { AppFileVersion } from "./AppFile.js";
 import { JsonProperty, ReadOnlyJsonProperty } from "@entity-access/server-pages/dist/services/ModelService.js";
 import Index from "@entity-access/entity-access/dist/decorators/Index.js";
 import type ServerActivity from "./ServerActivity.js";
-import type { StoreTag } from "./StoreTag.js";
+import type { WebSiteTag } from "./WebSiteTag.js";
 import type { StoreAccount } from "./StoreAccount.js";
 import type { StoreInsight } from "./StoreInsight.js";
 import type { StoreItem } from "./StoreItem.js";
@@ -109,7 +109,7 @@ export default class WebSite {
     channels: WebSiteChannel[];
 
     activities: ServerActivity[];
-    tags: StoreTag[];
+    tags: WebSiteTag[];
     storeAccounts: StoreAccount[];
     insights: StoreInsight[];
     storeItems: StoreItem[];

package/src/server/model/entities/{StoreTag.ts → WebSiteTag.ts}

@@ -1,31 +1,39 @@
-import Column from "@entity-access/entity-access/dist/decorators/Column.js";
-import { RelateTo } from "@entity-access/entity-access/dist/decorators/Relate.js";
-import Table from "@entity-access/entity-access/dist/decorators/Table.js";
-import Tag from "./Tag.js";
-import WebSite from "./WebSite.js";
-
-
-@Table("StoreTags")
-export class StoreTag {
-
-    @Column({ dataType: "BigInt", key: true })
-    @RelateTo(WebSite, {
-        property: (x) => x.store,
-        inverseProperty: (x) => x.tags
-    })
-    public storeID: number;
-
-    @Column({ dataType: "BigInt", key: true })
-    @RelateTo(Tag, {
-        property: (x) => x.tag,
-        inverseProperty: (x) => x.storeTags
-    })
-    public tagID: number;
-
-    @Column({ dataType: "Int", default: () => 0 })
-    public count: number;
-
-    public store: WebSite;
-
-    public tag: Tag;
-}
+import Column from "@entity-access/entity-access/dist/decorators/Column.js";
+import { RelateTo } from "@entity-access/entity-access/dist/decorators/Relate.js";
+import Table from "@entity-access/entity-access/dist/decorators/Table.js";
+import Tag from "./Tag.js";
+import WebSite from "./WebSite.js";
+
+
+@Table("WebSiteTags")
+export class WebSiteTag {
+
+    @Column({ dataType: "BigInt", key: true })
+    @RelateTo(WebSite, {
+        property: (x) => x.store,
+        inverseProperty: (x) => x.tags,
+        foreignKeyConstraint: {
+            name: "FC_WebSiteTags_WebSiteID",
+            cascade: "delete"
+        }
+    })
+    public webSiteID: number;
+
+    @Column({ dataType: "BigInt", key: true })
+    @RelateTo(Tag, {
+        property: (x) => x.tag,
+        inverseProperty: (x) => x.storeTags,
+        foreignKeyConstraint: {
+            name: "FC_WebSiteTags_TagID",
+            cascade: "delete"
+        }
+    })
+    public tagID: number;
+
+    @Column({ dataType: "Int", default: () => 0 })
+    public count: number;
+
+    public store: WebSite;
+
+    public tag: Tag;
+}

package/src/server/model/events/{StoreTagEvents.ts → WebSiteTagEvents.ts}

@@ -1,27 +1,27 @@
-import { IEntityQuery } from "@entity-access/entity-access/dist/model/IFilterWithParameter.js";
-import { StoreTag } from "../entities/StoreTag.js";
-import AuthenticatedEvents from "./AuthenticatedEvents.js";
-import ExternalQuery from "@entity-access/server-pages/dist/decorators/ExternalQuery.js";
-import Page from "@entity-access/server-pages/dist/Page.js";
-import { ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
-import SocialMailContext from "../SocialMailContext.js";
-
-export default class StoreTagEvents extends AuthenticatedEvents<StoreTag> {
-
-    @ExternalQuery
-    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.storeTags.where({ host }, (p) => (x) => x.store.hosts
-                .some((h) => h.host === p.host));
-        return q;
-    }
-
-
-    filter(query: IEntityQuery<StoreTag>): IEntityQuery<StoreTag> {
-        return query;
-    }
-
+import { IEntityQuery } from "@entity-access/entity-access/dist/model/IFilterWithParameter.js";
+import { WebSiteTag } from "../entities/WebSiteTag.js";
+import AuthenticatedEvents from "./AuthenticatedEvents.js";
+import ExternalQuery from "@entity-access/server-pages/dist/decorators/ExternalQuery.js";
+import Page from "@entity-access/server-pages/dist/Page.js";
+import { ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
+import SocialMailContext from "../SocialMailContext.js";
+
+export default class WebSiteTagEvents extends AuthenticatedEvents<WebSiteTag> {
+
+    @ExternalQuery
+    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.storeTags.where({ host }, (p) => (x) => x.store.hosts
+                .some((h) => h.host === p.host));
+        return q;
+    }
+
+
+    filter(query: IEntityQuery<WebSiteTag>): IEntityQuery<WebSiteTag> {
+        return query;
+    }
+
 }

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

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

package/src/server/services/store/StoreTagCountService.ts

@@ -18,7 +18,7 @@ export default class StoreTagCountService {
             const ti = { tagID , storeID };
             const count = diff * (await db.storeItemTags.where(ti, (p) => (x) => x.tagID === p.tagID && x.storeItem.storeID === p.storeID)
                 .count());
-            await db.storeTags.statements.upsert({ tagID, storeID, count}, void 0, { tagID, storeID });
+            await db.storeTags.statements.upsert({ tagID, webSiteID: storeID, count}, void 0, { tagID, webSiteID: storeID });
         }
 
         // const updated = await db.storeTags.where(entity, (p) => (x) => x.storeID === p.storeID)

package/dist/server/model/entities/StoreTag.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"StoreTag.d.ts","sourceRoot":"","sources":["../../../../src/server/model/entities/StoreTag.ts"],"names":[],"mappings":"AAGA,OAAO,GAAG,MAAM,UAAU,CAAC;AAC3B,OAAO,OAAO,MAAM,cAAc,CAAC;AAGnC,qBACa,QAAQ;IAOV,OAAO,EAAE,MAAM,CAAC;IAOhB,KAAK,EAAE,MAAM,CAAC;IAGd,KAAK,EAAE,MAAM,CAAC;IAEd,KAAK,EAAE,OAAO,CAAC;IAEf,GAAG,EAAE,GAAG,CAAC;CACnB"}

package/dist/server/model/entities/StoreTag.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"StoreTag.js","sourceRoot":"","sources":["../../../../src/server/model/entities/StoreTag.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,MAAM,MAAM,wDAAwD,CAAC;AAC5E,OAAO,EAAE,QAAQ,EAAE,MAAM,wDAAwD,CAAC;AAClF,OAAO,KAAK,MAAM,uDAAuD,CAAC;AAC1E,OAAO,GAAG,MAAM,UAAU,CAAC;AAC3B,OAAO,OAAO,MAAM,cAAc,CAAC;AAI5B,IAAM,QAAQ,GAAd,MAAM,QAAQ;CAsBpB,CAAA;AAfU;IALN,MAAM,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC;IACzC,QAAQ,CAAC,OAAO,EAAE;QACf,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK;QACxB,eAAe,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI;KACjC,CAAC;;yCACqB;AAOhB;IALN,MAAM,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC;IACzC,QAAQ,CAAC,GAAG,EAAE;QACX,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG;QACtB,eAAe,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS;KACtC,CAAC;;uCACmB;AAGd;IADN,MAAM,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC;;uCACzB;AAjBZ,QAAQ;IADpB,KAAK,CAAC,WAAW,CAAC;GACN,QAAQ,CAsBpB"}

package/dist/server/model/events/StoreTagEvents.d.ts

@@ -1,8 +0,0 @@
-import { IEntityQuery } from "@entity-access/entity-access/dist/model/IFilterWithParameter.js";
-import { StoreTag } from "../entities/StoreTag.js";
-import AuthenticatedEvents from "./AuthenticatedEvents.js";
-export default class StoreTagEvents extends AuthenticatedEvents<StoreTag> {
-    storeQuery(): IEntityQuery<StoreTag>;
-    filter(query: IEntityQuery<StoreTag>): IEntityQuery<StoreTag>;
-}
-//# sourceMappingURL=StoreTagEvents.d.ts.map

package/dist/server/model/events/StoreTagEvents.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"StoreTagEvents.d.ts","sourceRoot":"","sources":["../../../../src/server/model/events/StoreTagEvents.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iEAAiE,CAAC;AAC/F,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACnD,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAM3D,MAAM,CAAC,OAAO,OAAO,cAAe,SAAQ,mBAAmB,CAAC,QAAQ,CAAC;IAGrE,UAAU;IAWV,MAAM,CAAC,KAAK,EAAE,YAAY,CAAC,QAAQ,CAAC,GAAG,YAAY,CAAC,QAAQ,CAAC;CAIhE"}

package/dist/server/model/events/StoreTagEvents.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"StoreTagEvents.js","sourceRoot":"","sources":["../../../../src/server/model/events/StoreTagEvents.ts"],"names":[],"mappings":";;;;;;;;;AAEA,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAC3D,OAAO,aAAa,MAAM,8DAA8D,CAAC;AACzF,OAAO,IAAI,MAAM,0CAA0C,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AAC7E,OAAO,iBAAiB,MAAM,yBAAyB,CAAC;AAExD,MAAM,CAAC,OAAO,OAAO,cAAe,SAAQ,mBAA6B;IAGrE,UAAU;QACN,MAAM,IAAI,GAAG,eAAe,CAAC,OAAO,CAAC,IAAI,EAAE,IAAW,CAAS,CAAC;QAChE,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC;QAE/B,MAAM,EAAE,GAAG,eAAe,CAAC,OAAO,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;QAC5D,MAAM,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK;aACzD,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;QACzC,OAAO,CAAC,CAAC;IACb,CAAC;IAGD,MAAM,CAAC,KAA6B;QAChC,OAAO,KAAK,CAAC;IACjB,CAAC;CAEJ;AAfG;IADC,aAAa;;;;gDASb"}