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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@social-mail/social-mail-web-server",
-  "version": "1.4.853",
+  "version": "1.4.855",
   "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, StoreUser } from "./entities/Store.js";
+import Store, { StoreConfig, StoreInsight, StoreItem, StoreItemFolder, 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";
@@ -153,6 +153,8 @@ export default class SocialMailContext extends EntityContext {
 
     public storeItemTaxes = this.model.register(StoreItemTax);
 
+    public storeTags = this.model.register(StoreTag);
+
     // public storeOrders = this.model.register(StoreBill);
 
     // public storeOrderItem = this.model.register(StoreBillLine);

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, StoreUser } from "./entities/Store.js";
+import Store, { StoreConfig, StoreInsight, StoreItem, StoreItemFolder, 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";
@@ -93,6 +93,7 @@ import IncomingSmsSource from "./entities/IncomingSmsSource.js";
 import IncomingSmsSourceEvents from "./events/IncomingSmsSourceEvents.js";
 import VerificationToken from "./entities/VerificationToken.js";
 import VerificationTokenEvents from "./events/VerificationTokenEvents.js";
+import StoreTagEvents from "./events/StoreTagEvents.js";
 
 @RegisterSingleton
 export default class SocialMailContextEvents extends ContextEvents {
@@ -143,6 +144,7 @@ export default class SocialMailContextEvents extends ContextEvents {
         this.register(StoreMediaFile, StoreMediaFileEvents);
         this.register(StoreConfig, StoreConfigEvents);
         this.register(StoreItemTax, StoreItemTaxEvents);
+        this.register(StoreTag, StoreTagEvents);
         // this.register(StorePriceAddOn, StorePriceAddOnEvents);
         // this.register(StoreBill, StoreOrderEvents);
         // this.register(StoreBillLine, StoreOrderItemEvents);

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

@@ -67,6 +67,32 @@ export default class Store {
     journals: StoreJournal[];
     itemFolders: StoreItemFolder[];
     configs: StoreConfig[];
+    tags: StoreTag[];
+}
+
+@Table("StoreTags")
+export class StoreTag {
+
+    @Column({ dataType: "BigInt", key: true})
+    @RelateTo(Store, {
+        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"})
+    public count: number;
+
+    public store: Store;
+
+    public tag: Tag;
 }
 
 @Table("StoreLedger")

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 } from "./Store.js";
+import type { StoreItemTag, StoreTag } from "./Store.js";
 
 /**
  * The reason tags table exists in form of string,bigint pair is, we need
@@ -76,4 +76,5 @@ export default class Tag {
     public contactTags: ContactTag[];
 
     public storeItemTags: StoreItemTag[];
+    storeTags: StoreTag[];
 }

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

@@ -7,6 +7,7 @@ import External from "@entity-access/server-pages/dist/decorators/External.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";
+import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
 
 export default class StoreItemEvents extends AuthenticatedEvents<StoreItem> {
 
@@ -58,11 +59,22 @@ export default class StoreItemEvents extends AuthenticatedEvents<StoreItem> {
     async beforeUpdate(entity: StoreItem, entry: ChangeEntry<StoreItem>) {
         this.sessionUser.ensureLoggedIn();
 
+        const db = ServiceProvider.resolve(this, SocialMailContext);
         if (entity.folderID) {
-            const db = ServiceProvider.resolve(this, SocialMailContext);
             await db.appFiles.where(entity, (p) => (x) => x.appFileID === p.folderID)
                 .update({ name: `${entity.name} (${entity.storeItemID})`}, (p) => (x) => ({ name: p.name }));
         }
+
+        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 ))))
+                }));
+        }
     }
 
 }

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

@@ -3,6 +3,9 @@ import AuthenticatedEvents from "./AuthenticatedEvents.js";
 import EntityAccessError from "@entity-access/entity-access/dist/common/EntityAccessError.js";
 import { StoreItemTag } from "../entities/Store.js";
 import ChangeEntry from "@entity-access/entity-access/dist/model/changes/ChangeEntry.js";
+import { ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
+import SocialMailContext from "../SocialMailContext.js";
+import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
 
 export default class StoreItemTagEvents extends AuthenticatedEvents<StoreItemTag> {
 
@@ -43,4 +46,37 @@ export default class StoreItemTagEvents extends AuthenticatedEvents<StoreItemTag
     beforeUpdate(entity: StoreItemTag, entry: ChangeEntry<StoreItemTag>) {
         this.sessionUser.ensureLoggedIn();
     }
+
+    async afterInsert(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;
+        const updated = await db.storeTags.where(storeItem, (p) => (x) => x.storeID === p.storeID)
+            .update({ diff }, (p) => (x) => ({
+                count: x.count + Sql.cast.asInteger(p.diff)
+            }));
+        if (!updated) {
+            // insert one...
+            const { storeID } = storeItem;
+            const { tagID } = entity;
+            const count = await db.storeItemTags.where({ storeID, tagID }, (p) => (x) => x.storeItem.active === true
+                && x.tagID === p.tagID
+                && x.storeItem.storeID === p.storeID)
+                .count();
+
+            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)
+            .update({ diff }, (p) => (x) => ({
+                count: x.count + Sql.cast.asInteger(p.diff)
+            }));
+    }
 }

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

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

package/src/server/services/payment-gateways/Gateway.ts

@@ -33,7 +33,7 @@ export abstract class PaymentGateway {
 
     async createPaymentLink({ itemID, host, testMode = false, currency = "USD"}) {
         const { price, taxes } = await this.configService.getPrice(itemID, currency);
-        const amount = price.amount + price.taxAmount;
+        const amount = Number(price.amount) + Number(price.taxAmount);
 
         return this.create({
             storeID: price.storeItem.storeID,

package/src/server/services/payment-gateways/PhonePeGateway.ts

@@ -36,7 +36,7 @@ export default class PhonePeGateway extends PaymentGateway {
             merchantId,
             merchantTransactionId,
             merchantUserId: userID ?? randomUUID().replaceAll("-", ""),
-            amount: amount * 100,
+            amount: Number(amount) * 100,
             callbackUrl: `https://${host}/callbacks/phonepe-callback/${merchantTransactionId}`,
             redirectUrl: `https://${host}/callbacks/phonepe-success/${merchantTransactionId}`,
             paymentInstrument: {