@social-mail/social-mail-web-server 1.8.12 → 1.8.13

package/package.json

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

package/src/reports/model/entities/ReportSite.ts

@@ -3,13 +3,25 @@ import Table from "@entity-access/entity-access/dist/decorators/Table.js";
 import type Visitor from "./Visitor.js";
 import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
 import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
+import Index from "@entity-access/entity-access/dist/decorators/Index.js";
+import type VisitSegment from "./VisitSegment.js";
 
 @Table("ReportSites")
+@Index({
+    name: "IX_ReportSites_Path",
+    columns: [
+        { name: (x) => x.path, descending: false }
+    ],
+    filter: (x) => x.path !== null
+})
 export default class ReportSite {
 
     @Column({ dataType: "BigInt", key: true })
     siteID: number;
 
+    @Column({ dataType: "Char", length: 400, nullable: true})
+    path: string;
+
     @Column({ dataType: "DateTime", default: () => Sql.date.now()})
     dateCreated: DateTime;
 
@@ -17,5 +29,6 @@ export default class ReportSite {
     timeZoneSeconds: number;
 
     visitors: Visitor[];
+    visitSegments: VisitSegment[];
 
 }

package/src/reports/model/entities/VisitSegment.ts

@@ -1,8 +1,10 @@
 import CheckConstraint from "@entity-access/entity-access/dist/decorators/CheckConstraint.js";
 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 Sql from "@entity-access/entity-access/dist/sql/Sql.js";
 import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
+import ReportSite from "./ReportSite.js";
 
 const durations = [ "hourly", "daily", "monthly", "yearly", "real-time"] as const;
 export type durationType = typeof durations[number];
@@ -17,6 +19,10 @@ export type durationType = typeof durations[number];
 export default class VisitSegment {
 
     @Column({ dataType: "BigInt", key: true })
+    @RelateTo(ReportSite, {
+        property: (x) => x.site,
+        inverseProperty: (x) => x.visitSegments
+    })
     siteID: number;
 
     @Column({ dataType: "Char", length: 20, key: true, enum: durations })
@@ -44,4 +50,6 @@ export default class VisitSegment {
     @Column({ dataType: "Int", default: () => 0})
     newVisitors: number;
 
+    site: ReportSite;
+
 }

package/src/reports/model/events/ReportSiteEvents.ts

@@ -1,6 +1,12 @@
+import { IEntityQuery } from "@entity-access/entity-access/dist/model/IFilterWithParameter.js";
 import AuthenticatedEvents from "../../../server/model/events/AuthenticatedEvents.js";
 import ReportSite from "../entities/ReportSite.js";
+import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
 
 export default class ReportSiteEvents extends AuthenticatedEvents<ReportSite> {
 
+    filter(query: IEntityQuery<ReportSite>): IEntityQuery<ReportSite> {
+        return query.where(this.sessionUser, (p) => (x) => Sql.text.likeAny(x.path, p.readFileAccess));
+    }
+
 }

package/src/reports/model/events/VisitActivityEvents.ts

@@ -1,7 +1,16 @@
+import { IEntityQuery } from "@entity-access/entity-access/dist/model/IFilterWithParameter.js";
 import AuthenticatedEvents from "../../../server/model/events/AuthenticatedEvents.js";
 import Visit from "../entities/Visit.js";
 import VisitActivity from "../entities/VisitActivity.js";
+import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
 
 export default class VisitActivityEvents extends AuthenticatedEvents<VisitActivity> {
-    
+
+    filter(query: IEntityQuery<VisitActivity>): IEntityQuery<VisitActivity> {
+        return query.where(this.sessionUser, (p) => (x) => Sql.text.likeAny(x.visit.visitor.site.path, p.readFileAccess));
+    }
+
+    includeFilter(query: IEntityQuery<VisitActivity>, type?: any, key?: string): IEntityQuery<VisitActivity> {
+        return query;
+    }
 }

package/src/reports/model/events/VisitEvents.ts

@@ -1,6 +1,15 @@
+import { IEntityQuery } from "@entity-access/entity-access/dist/model/IFilterWithParameter.js";
 import AuthenticatedEvents from "../../../server/model/events/AuthenticatedEvents.js";
 import Visit from "../entities/Visit.js";
+import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
 
 export default class VisitEvents extends AuthenticatedEvents<Visit> {
-    
+
+    filter(query: IEntityQuery<Visit>): IEntityQuery<Visit> {
+        return query.where(this.sessionUser, (p) => (x) => Sql.text.likeAny(x.visitor.site.path, p.readFileAccess));
+    }
+
+    includeFilter(query: IEntityQuery<Visit>, type?: any, key?: string): IEntityQuery<Visit> {
+        return query;
+    }
 }

package/src/reports/model/events/VisitSegmentEvents.ts

@@ -0,0 +1,12 @@
+import { IEntityQuery } from "@entity-access/entity-access/dist/model/IFilterWithParameter.js";
+import AuthenticatedEvents from "../../../server/model/events/AuthenticatedEvents.js";
+import VisitSegment from "../entities/VisitSegment.js";
+import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
+
+export default class VisitSegmentEvents extends AuthenticatedEvents<VisitSegment> {
+
+    filter(query: IEntityQuery<VisitSegment>): IEntityQuery<VisitSegment> {
+        return query.where(this.sessionUser, (p) => (x) => Sql.text.likeAny(x.site.path, p.readFileAccess));
+    }
+
+}

package/src/reports/model/events/VisitorEvents.ts

@@ -1,6 +1,15 @@
+import { IEntityQuery } from "@entity-access/entity-access/dist/model/IFilterWithParameter.js";
 import AuthenticatedEvents from "../../../server/model/events/AuthenticatedEvents.js";
 import Visitor from "../entities/Visitor.js";
+import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
 
 export default class VisitorEvents extends AuthenticatedEvents<Visitor> {
 
+    filter(query: IEntityQuery<Visitor>): IEntityQuery<Visitor> {
+        return query.where(this.sessionUser, (p) => (x) => Sql.text.likeAny(x.site.path, p.readFileAccess));
+    }
+
+    includeFilter(query: IEntityQuery<Visitor>, type?: any, key?: string): IEntityQuery<Visitor> {
+        return query;
+    }
 }

package/src/reports/services/ReportingCache.ts

@@ -5,6 +5,7 @@ import WebSiteContentService from "../../server/services/files/WebSiteContentSer
 import BaseDiskCache from "../../common/BaseDiskCache.js";
 import { join } from "path";
 import { globalEnv } from "../../common/globalEnv.js";
+import SocialMailContext from "../../server/model/SocialMailContext.js";
 
 @RegisterSingleton
 class ReportingCacheStore {
@@ -31,6 +32,9 @@ export default class ReportingCache {
     @Inject
     private wcs: WebSiteContentService;
 
+    @Inject
+    private appDb: SocialMailContext;
+
 
     async generateSiteDb(host: string) {
         return this.cacheStore.diskCache.getOrCreateJsonAsync(`generateSiteDb-${host}`, async() => {
@@ -38,10 +42,16 @@ export default class ReportingCache {
 
             const { folderID } = ss;
 
-            const { siteID, timeZoneSeconds } = await this.db.reportSites.statements.selectOrInsert({
+            const folder = await this.appDb.appFiles.statements.select({ }, { appFileID: folderID });
+
+            const { siteID, timeZoneSeconds, path } = await this.db.reportSites.statements.selectOrInsert({
                 siteID: folderID
             });
 
+            if (folder.path !== path) {
+                await this.db.reportSites.statements.update({ path: folder.path}, { siteID });
+            }
+
             return { siteID, timeZoneSeconds };
         });
     }