@social-mail/social-mail-web-server 1.15.2 → 1.16.2

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

@@ -8,7 +8,6 @@ import { JsonProperty, ReadOnlyJsonProperty } from "@entity-access/server-pages/
 import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
 import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
 import { User } from "./User.js";
-import type { WebSiteHost } from "./WebSiteHost.js";
 
 const { labels, column: TypeColumn} = EnumColumn(["A", "AAAA", "CNAME", "MX", "TXT", "PTR", "SRV", "CAA", "NS", "SOA" ] as const, 15, { default: () => "A"});
 
@@ -55,7 +54,6 @@ export default class HostedZone {
 
     @JsonProperty({})
     zone: string;
-    webSiteHosts: WebSiteHost[];
 
 }
 

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

@@ -2,14 +2,8 @@ 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 WebSite from "./WebSite.js";
-import HostedZone from "./HostedZone.js";
 
 
-/**
- * The reason web site host has ZoneID is, we don't want to popuplate websites
- * with assuming that the zone has wildcard, that can cause confusion and investigation
- * can cause lot of issues. Wildcards also increase unncessary attack surface.
- */
 @Table("WebSiteHosts")
 export class WebSiteHost {
 
@@ -26,15 +20,6 @@ export class WebSiteHost {
     })
     public folderID: number;
 
-    @Column({ dataType: "BigInt", nullable: true})
-    @RelateTo(HostedZone, {
-        property: (x) => x.zone,
-        inverseProperty: (x) => x.webSiteHosts
-    })
-    public zoneID: number;
-
     public folder: WebSite;
 
-    public zone: HostedZone;
-
 }

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

@@ -3,9 +3,20 @@ import AccessToken from "../entities/AccessToken.js";
 import AuthenticatedEvents from "./AuthenticatedEvents.js";
 import { randomUUID } from "crypto";
 import { AppStringHelper } from "../../../common/AppStringHelper.js";
+import { IEntityQuery } from "@entity-access/entity-access/dist/model/IFilterWithParameter.js";
 
 export default class AccessTokenEvents extends AuthenticatedEvents<AccessToken> {
 
+    filter(query: IEntityQuery<AccessToken>): IEntityQuery<AccessToken> {
+        if (this.verify) {
+            this.sessionUser.ensureLoggedIn();
+        }
+        if(this.sessionUser.isAdmin) {
+            return query;
+        }
+        return query.where(this.sessionUser, (x, p) => x.userID === p.userID);
+    }
+
     beforeInsert(entity: AccessToken, entry: ChangeEntry<AccessToken>) {
 
         if (this.verify) {

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

@@ -12,24 +12,34 @@ const done = Promise.resolve();
  */
 export default class AuthenticatedEvents<T> extends BaseEvents<T> {
     filter(query: IEntityQuery<T>): IEntityQuery<T> {
+        if (this.sessionUser.isAdmin) {
+            return query;
+        }
         if (this.verify) {
             this.sessionUser.ensureLoggedIn(() => new EntityAccessError(`Login Required to get ${this.entityName}`));
         }
-        return query;
+        // implementor should create the correct filter..
+        return query.where((x) => false);
     }
 
     modify(query: IEntityQuery<T>): IEntityQuery<T> {
+        if (this.sessionUser.isAdmin) {
+            return query;
+        }
         if (this.verify) {
             this.sessionUser.ensureIsAdmin(() => new EntityAccessError(`Admin access required to modify ${this.entityName}`));
         }
-        return query;
+        return query.where((x) => false);
     }
 
     delete(query: IEntityQuery<T>): IEntityQuery<T> {
+        if (this.sessionUser.isAdmin) {
+            return query;
+        }
         if (this.verify) {
             this.sessionUser.ensureIsAdmin(() => new EntityAccessError(`Admin access required to delete ${this.entityName}`));
         }
-        return query;
+        return query.where((x) => false);
     }
 
     beforeInsert(entity: T, entry: ChangeEntry<T>): void | Promise<void> {

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

@@ -50,6 +50,13 @@ export default class HostedDomainEvents extends AuthenticatedEvents<HostedDomain
         return { domainID };
     }
 
+    filter(query: IEntityQuery<HostedDomain>): IEntityQuery<HostedDomain> {
+        if (this.verify) {
+            this.sessionUser.ensureLoggedIn();
+        }
+        return query;
+    }
+
     modify(query: IEntityQuery<HostedDomain>): IEntityQuery<HostedDomain> {
         if (this.verify) {
             this.sessionUser.ensureLoggedIn();

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

@@ -1,6 +1,13 @@
+import { IEntityQuery } from "@entity-access/entity-access/dist/model/IFilterWithParameter.js";
 import MailboxContactTag from "../entities/MailboxContactTag.js";
 import AuthenticatedEvents from "./AuthenticatedEvents.js";
 
 export default class MailboxContactTagEvents extends AuthenticatedEvents<MailboxContactTag> {
 
+    filter(query: IEntityQuery<MailboxContactTag>): IEntityQuery<MailboxContactTag> {
+        if (this.verify) {
+            this.sessionUser.ensureLoggedIn();
+        }
+        return query;
+    }
 }

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

@@ -6,6 +6,7 @@ import MailboxTag from "../entities/MailboxTag.js";
 import AuthenticatedEvents from "./AuthenticatedEvents.js";
 import Page from "@entity-access/server-pages/dist/Page.js";
 import SocialMailContext from "../SocialMailContext.js";
+import { IEntityQuery } from "@entity-access/entity-access/dist/model/IFilterWithParameter.js";
 
 export default class MailboxTagEvents extends AuthenticatedEvents<MailboxTag> {
 
@@ -28,4 +29,16 @@ export default class MailboxTagEvents extends AuthenticatedEvents<MailboxTag> {
         return q.limit(50);
     }
 
+    filter(query: IEntityQuery<MailboxTag>): IEntityQuery<MailboxTag> {
+        if (this.verify) {
+            this.sessionUser.ensureLoggedIn();
+        }
+        if (this.sessionUser.isAdmin) {
+            return query;
+        }
+        return query.where(this.sessionUser, (x, p) =>
+            x.mailbox.userMailboxes.some((um) => um.userID === p.userID)
+            || x.mailbox.domain.hostedDomain.domainUsers.some((d) => d.userID === p.userID));
+    }
+
 }

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

@@ -1,6 +1,17 @@
+import { IEntityQuery } from "@entity-access/entity-access/dist/model/IFilterWithParameter.js";
 import SubscriptionDomain from "../entities/SubscriptionDomain.js";
 import AuthenticatedEvents from "./AuthenticatedEvents.js";
 
 export default class SubscriptionDomainEvents extends AuthenticatedEvents<SubscriptionDomain> {
-
+    filter(query: IEntityQuery<SubscriptionDomain>): IEntityQuery<SubscriptionDomain> {
+        if(this.verify) {
+            this.sessionUser.ensureLoggedIn();
+        }
+        if (this.sessionUser.isAdmin) {
+            return query;
+        }
+        return query.where(this.sessionUser,(x, p) => x.subscription.buyer.userID === p.userID
+            || x.subscription.store.folderID in p.readWebSiteAccess
+        );
+    }
 }

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

@@ -1,6 +1,18 @@
+import { IEntityQuery } from "@entity-access/entity-access/dist/model/IFilterWithParameter.js";
 import SubscriptionWebSite from "../entities/SubscriptionWebSite.js";
 import AuthenticatedEvents from "./AuthenticatedEvents.js";
 
 export default class SubscriptionWebSiteEvents extends AuthenticatedEvents<SubscriptionWebSite> {
 
+    filter(query: IEntityQuery<SubscriptionWebSite>): IEntityQuery<SubscriptionWebSite> {
+        if(this.verify) {
+            this.sessionUser.ensureLoggedIn();
+        }
+        if (this.sessionUser.isAdmin) {
+            return query;
+        }
+        return query.where(this.sessionUser,(x, p) => x.subscription.buyer.userID === p.userID
+            || x.subscription.store.folderID in p.readWebSiteAccess
+        );
+    }
 }

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

@@ -2,9 +2,20 @@ import ChangeEntry from "@entity-access/entity-access/dist/model/changes/ChangeE
 import { VerificationTokenAddress } from "../entities/VerificationToken.js";
 import AuthenticatedEvents from "./AuthenticatedEvents.js";
 import { AppStringHelper } from "../../../common/AppStringHelper.js";
+import { IEntityQuery } from "@entity-access/entity-access/dist/model/IFilterWithParameter.js";
 
 export default class VerificationTokenAddressEvent extends AuthenticatedEvents<VerificationTokenAddress> {
 
+    filter(query: IEntityQuery<VerificationTokenAddress>): IEntityQuery<VerificationTokenAddress> {
+        if(this.verify) {
+            this.sessionUser.ensureLoggedIn();
+        }
+        if (this.sessionUser.isAdmin) {
+            return query;
+        }
+        return query.where(this.sessionUser,(x, p) => x.verificationToken.userID === p.userID);
+    }
+
     beforeInsert(entity: VerificationTokenAddress, entry: ChangeEntry<VerificationTokenAddress>) {
         // do nothing
     }

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

@@ -289,6 +289,16 @@ export default class VerificationTokenEvents extends AuthenticatedEvents<Verific
         return this.captchaService.getVideo(entity.code);
     }
 
+    filter(query: IEntityQuery<VerificationToken>): IEntityQuery<VerificationToken> {
+        if(this.verify) {
+            this.sessionUser.ensureLoggedIn();
+        }
+        if (this.sessionUser.isAdmin) {
+            return query;
+        }
+        return query.where(this.sessionUser,(x, p) => x.userID === p.userID);
+    }
+
     async beforeInsert(entity: VerificationToken, entry: ChangeEntry<VerificationToken>) {
 
         const { type } = entity;

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

@@ -1,4 +1,4 @@
-import Inject, { ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
+import { ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
 import ChangeEntry from "@entity-access/entity-access/dist/model/changes/ChangeEntry.js";
 import { IEntityQuery } from "@entity-access/entity-access/dist/model/IFilterWithParameter.js";
 import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
@@ -9,13 +9,9 @@ import { WebSiteHost } from "../entities/WebSiteHost.js";
 import AuthenticatedEvents from "./AuthenticatedEvents.js";
 import WebSiteVersionService from "../../services/files/WebSiteVersionService.js";
 import { AppWorkflowContext } from "../../workflows/AppWorkflowContext.js";
-import SocialMailContext from "../SocialMailContext.js";
 
 export class WebSiteHostEvents extends AuthenticatedEvents<WebSiteHost> {
 
-    @Inject
-    db: SocialMailContext;
-
     filter(query: IEntityQuery<WebSiteHost>) {
         if (this.sessionUser.isAdmin) {
             return query;
@@ -43,19 +39,6 @@ export class WebSiteHostEvents extends AuthenticatedEvents<WebSiteHost> {
 
     beforeInsert(entity: WebSiteHost, entry: ChangeEntry<WebSiteHost>) {
         // do nothing
-        entity.host = entity.host.trim().toLowerCase();
-    }
-
-    async beforeDelete(entity: WebSiteHost, entry: ChangeEntry<WebSiteHost>) {
-        const { zoneID, host } = entity;
-        if (!zoneID) {
-            return;
-        }
-        await this.db.hostedZoneRecords.withKeys({ zoneID, fqdn: host })
-            .delete();
-
-        const wc = ServiceProvider.resolve(this, AppWorkflowContext);
-        await SyncDnsZoneRecordsWorkflow.enqueue(wc, zoneID);
     }
 
     async afterInsert(entity: WebSiteHost, entry: ChangeEntry<WebSiteHost>) {

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

@@ -17,13 +17,13 @@ export default async function seedUI(config: DBConfig) {
     await config.saveVersion(UIPackageConfig, {
         package: "@social-mail/social-mail-client",
         view: "dist/web/AppIndex",
-        version: "1.10.95"
+        version: "1.11.7"
     });
 
     await config.saveVersion(WebComponentsPackageConfig, {
         package: "@social-mail/web-components",
         view: "dist/index.js",
-        version: "1.0.419"
+        version: "1.1.9"
     });
 
     await config.saveVersion(FAFreePackageConfig, {

package/src/server/services/DBConfig.ts

@@ -104,12 +104,12 @@ export default class DBConfig {
     public async save<T>(type: IClassOf<T>, values: Partial<T>, seed = false, name = type.name) {
         let config;
         if (seed) {
-            config = await this.context.configurations.statements.selectOrInsert({ name, configValue: JSON.stringify(values, void 0, 4)} as any, { name });
-        } else {
             config = await this.context.configurations.statements.upsert({
                 name,
                 configValue: JSON.stringify(values, void 0, 4)
             } as any, void 0, { name });
+        } else {
+            config = await this.context.configurations.statements.selectOrInsert({ name, configValue: JSON.stringify(values, void 0, 4)} as any, { name });
         }
         const ci = new ConfigItem(config, this, type);
         return ci;

package/src/server/workflows/dns/SyncDnsZoneRecordsWorkflow.ts

@@ -11,9 +11,6 @@ import { AppWorkflowContext } from "../AppWorkflowContext.js";
 const toUnixDateAndHour = (date: Date | DateTime, d = DateTime.from(date)) =>
     `${StringFormat.fixed(d.year, 4)}${StringFormat.fixed(d.month)}${StringFormat.fixed(d.day)}${StringFormat.fixed(d.hour)}`;
 
-const ttlHour = 60*60;
-const ttlDay = 24*ttlHour;
-
 export default class SyncDnsZoneRecordsWorkflow extends Workflow {
 
     static enqueue(context: AppWorkflowContext, zoneID) {
@@ -63,6 +60,7 @@ export default class SyncDnsZoneRecordsWorkflow extends Workflow {
 
         const { name: domain } = await db.domains.statements.select({}, { domainID: zoneID });
 
+        const ttl = 8600;
         const dateCreated = DateTime.now;
         const dateUpdated = dateCreated;
 
@@ -89,7 +87,7 @@ export default class SyncDnsZoneRecordsWorkflow extends Workflow {
                 zoneID,
                 dateCreated,
                 dateUpdated,
-                ttl: ttlDay,
+                ttl,
                 name: "@",
                 type: "NS",
                 value: ns,
@@ -103,7 +101,7 @@ export default class SyncDnsZoneRecordsWorkflow extends Workflow {
             zoneID,
             dateCreated,
             dateUpdated,
-            ttl: ttlDay,
+            ttl,
             name: "_acme-challenge",
             type: "CNAME",
             value: `${domain}.${globalEnv.dns.letsEncryptPrefix}`,
@@ -115,7 +113,7 @@ export default class SyncDnsZoneRecordsWorkflow extends Workflow {
             zoneID,
             dateCreated,
             dateUpdated,
-            ttl: ttlDay,
+            ttl,
             name: "_dmarc",
             type: "TXT",
             value: `v=DMARC1; p=reject;`,
@@ -127,7 +125,7 @@ export default class SyncDnsZoneRecordsWorkflow extends Workflow {
             zoneID,
             dateCreated,
             dateUpdated,
-            ttl: ttlDay,
+            ttl,
             type: "TXT",
             name: "@",
             value: `v=spf1 include:_spf.socialmail.in ~all`,
@@ -138,7 +136,7 @@ export default class SyncDnsZoneRecordsWorkflow extends Workflow {
             zoneID,
             dateCreated,
             dateUpdated,
-            ttl: ttlHour,
+            ttl,
             type: "A",
             name: "@",
             value: "$IP$",
@@ -151,7 +149,7 @@ export default class SyncDnsZoneRecordsWorkflow extends Workflow {
             zoneID,
             dateCreated,
             dateUpdated,
-            ttl: ttlDay,
+            ttl,
             type: "CNAME",
             name: "www",
             value: "$HOST$",
@@ -163,7 +161,7 @@ export default class SyncDnsZoneRecordsWorkflow extends Workflow {
             zoneID,
             dateCreated,
             dateUpdated,
-            ttl: ttlDay,
+            ttl,
             type: "CNAME",
             name: "mails",
             value: "$HOST$",
@@ -175,7 +173,7 @@ export default class SyncDnsZoneRecordsWorkflow extends Workflow {
             zoneID,
             dateCreated,
             dateUpdated,
-            ttl: ttlDay,
+            ttl,
             type: "CNAME",
             name: "www",
             value: "$HOST$",
@@ -183,6 +181,19 @@ export default class SyncDnsZoneRecordsWorkflow extends Workflow {
             readonly: true
         });
 
+        // await db.hostedZoneRecords.statements.insert({
+        //     zoneID,
+        //     dateCreated,
+        //     dateUpdated,
+        //     ttl,
+        //     type: "CNAME",
+        //     name: "*",
+        //     value: "$HOST$",
+        //     fqdn: `*.${domain}`,
+        //     hosted: true,
+        //     readonly: true
+        // });
+
     }
 
     @UniqueActivity
@@ -209,26 +220,21 @@ export default class SyncDnsZoneRecordsWorkflow extends Workflow {
 
         const dateCreated = DateTime.now;
         const dateUpdated = dateCreated;
-        const ttl = ttlDay;
+        const ttl = 8600;
 
         // sync...
-        await db.hostedZoneRecords
-            .withKeys({
-                zoneID,
-                name,
-                type
-            }).updateOrInsert({
-                zoneID,
-                name,
-                type,
-                value,
-                fqdn,
-                readonly: true,
-                dateCreated,
-                dateUpdated,
-                hosted: true,
-                ttl
-            });
+        await db.hostedZoneRecords.statements.upsert({
+            zoneID,
+            name,
+            type,
+            value,
+            fqdn,
+            readonly: true,
+            dateCreated,
+            dateUpdated,
+            hosted: true,
+            ttl
+        }, void 0, { zoneID, name, type });
     }
 
     @UniqueActivity
@@ -242,7 +248,7 @@ export default class SyncDnsZoneRecordsWorkflow extends Workflow {
 
         const dateCreated = DateTime.now;
         const dateUpdated = dateCreated;
-        const ttl = ttlDay;
+        const ttl = 8600;
 
         /** Sync all domain keys */
 
@@ -257,20 +263,18 @@ export default class SyncDnsZoneRecordsWorkflow extends Workflow {
             const fqdn = `${name}.${domain.name}`;
 
             // sync...
-            await db.hostedZoneRecords
-                .withKeys({ zoneID, name, type })
-                .updateOrInsert({
-                    zoneID,
-                    name,
-                    type,
-                    value,
-                    fqdn,
-                    readonly: true,
-                    dateCreated,
-                    dateUpdated,
-                    hosted: true,
-                    ttl,
-                });
+            await db.hostedZoneRecords.statements.upsert({
+                zoneID,
+                name,
+                type,
+                value,
+                fqdn,
+                readonly: true,
+                dateCreated,
+                dateUpdated,
+                hosted: true,
+                ttl,
+            }, void 0, { zoneID, name, type });
         }
     }
 
@@ -301,13 +305,10 @@ export default class SyncDnsZoneRecordsWorkflow extends Workflow {
 
         const dateCreated = DateTime.now;
         const dateUpdated = dateCreated;
-        const ttl = ttlDay;
+        const ttl = 8600;
 
         const hosts = await db.websiteFolderHosts
-            .where({ domainName, hostMatch }, (x, p) =>
-                (x.host === p.domainName || Sql.text.iLike(x.host, p.hostMatch))
-                && x.zoneID === null
-            )
+            .where({ domainName, hostMatch }, (x, p) => x.host === p.domainName || Sql.text.iLike(x.host, p.hostMatch) )
             .toArray();
 
         for (const host of hosts) {
@@ -323,27 +324,19 @@ export default class SyncDnsZoneRecordsWorkflow extends Workflow {
             const value = `$HOST$`;
             const fqdn = `${name}.${domainName}`;
 
-            await db.hostedZoneRecords
-                .withKeys({
-                    zoneID,
-                    name,
-                    type
-                }).updateOrInsert({
-                    zoneID,
-                    name,
-                    type,
-                    value,
-                    fqdn,
-                    readonly: true,
-                    dateCreated,
-                    dateUpdated,
-                    ttl,
-                    hosted: true,
-                });
-
-            await db.websiteFolderHosts
-                .withKeys({ host: host.host })
-                .update({ zoneID });
+            // sync...
+            await db.hostedZoneRecords.statements.upsert({
+                zoneID,
+                name,
+                type,
+                value,
+                fqdn,
+                readonly: true,
+                dateCreated,
+                dateUpdated,
+                ttl,
+                hosted: true,
+            }, void 0, { zoneID, name, type });
         }
     }
 

package/src/server/workflows/geo-entities/DownloadGeoEntitiesWorkflow.ts

@@ -12,6 +12,8 @@ import { globalEnv } from "../../../common/globalEnv.js";
 import QueryBuilder from "../../../common/QueryBuilder.js";
 import SecureFetchBuilder from "../../../common/fetch/SecureFetchBuilder.js";
 import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
+import { fileURLToPath } from "node:url";
+import { readFile } from "node:fs/promises";
 
 /**
  * For same phyical server, we should only download it once
@@ -30,7 +32,12 @@ export default class DownloadGeoEntitiesWorkflow extends Workflow {
 
     async run() {
 
-        if (!globalEnv.isRootHost || globalEnv.otpIn.host) {
+        if (globalEnv.isRootHost) {
+            await this.downloadFromGeoNames();
+            return;
+        }
+
+        if (globalEnv.otpIn.host) {
             // download from parent...
             await this.downloadFromHost("country");
             await this.downloadFromHost("state");
@@ -113,9 +120,13 @@ export default class DownloadGeoEntitiesWorkflow extends Workflow {
         let countryField;
         let currencyCodeField;
         let currencyNameField;
+        let phoneField;
 
         let total = 0;
 
+        const isdJson = JSON.parse(await readFile(fileURLToPath(import.meta.resolve("../../../../content/json/isd.json")), "utf-8"));
+        const isdCountries = isdJson.countries as { iso_code, mask, dial_code }[];
+
         for await(const line of file.lines()) {
             if(line.startsWith("#")) {
                 last = line;
@@ -137,6 +148,9 @@ export default class DownloadGeoEntitiesWorkflow extends Workflow {
                         case "fips":
                             fipsField = fieldID;
                             break;
+                        case "Phone":
+                            phoneField = fieldID;
+                            break;
                         case "Country":
                             countryField = fieldID;
                             break;
@@ -164,12 +178,18 @@ export default class DownloadGeoEntitiesWorkflow extends Workflow {
             const currencyCode = tokens[currencyCodeField];
             const currencyName = tokens[currencyNameField];
 
+            const isdItem = isdCountries.find((x) => x.iso_code === code);
+            const phoneFormat = isdItem?.mask;
+            const isdCode = isdItem?.dial_code ?? tokens[phoneField];
+
             const fields = {
                 fips,
                 name,
                 code,
                 currencyCode,
                 currencyName,
+                isdCode,
+                phoneFormat
             };
 
             await this.save(db, "country", externalID, fields);
@@ -187,11 +207,7 @@ export default class DownloadGeoEntitiesWorkflow extends Workflow {
         fields.fullName = fields.name;
         fields.name = fields.name.toLowerCase();
         fields.dateUpdated = this.currentTime;
-        const n = await db.geoEntities.statements.update(fields, keys);
-        if (n) {
-            return;
-        }
-        await db.geoEntities.statements.selectOrInsert(fields, keys);
+        await db.geoEntities.withKeys(keys).updateOrInsert(fields);
     }
 
     async downloadStates(tfs: TempFileService, db: SocialMailContext) {
@@ -330,7 +346,7 @@ export default class DownloadGeoEntitiesWorkflow extends Workflow {
     async exists(db: SocialMailContext) {
         // download only once a month
         const past = DateTime.now.addDays(-30);
-        const exists = await db.geoEntities.where({ past }, (x, p) => x.dateCreated > p.past)
+        const exists = await db.geoEntities.where({ past }, (x, p) => x.dateUpdated > p.past)
             .some();
         return exists;
     }