@social-mail/social-mail-web-server 1.7.364 → 1.7.366

package/package.json

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

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

@@ -20,6 +20,7 @@ import CopyTemplateWorkflow from "../../workflows/site/CopyTemplateWorkflow.js";
 import DeleteWebsiteWorkflow from "../../workflows/web-site/DeleteWebSiteWorkflow.js";
 import SnapshotService from "../../services/files/SnapshotService.js";
 import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
+import WebSiteVersionService from "../../services/files/WebSiteVersionService.js";
 
 export default class WebSiteEvents extends AuthenticatedEvents<WebSite> {
 
@@ -97,22 +98,8 @@ export default class WebSiteEvents extends AuthenticatedEvents<WebSite> {
     }
 
     async ensureSnapshot(entity: WebSite) {
-
-        const hasVersion = await this.db.websiteVersions.statements.select({}, { folderID: entity.folderID });
-        if (hasVersion) {
-            return;
-        }
-
-        const snapshotService = ServiceProvider.resolve(this, SnapshotService);
-        const snapshot = await snapshotService.createSnapshot(entity.folderID, this.sessionUser);
-        const version = this.db.websiteVersions.add({
-            folderID: entity.folderID
-        });
-        version.snapshotFolderID = snapshot.appFileID;
-        version.dateCreated = DateTime.now;
-        version.name = "1.0.0";
-
-        await this.db.saveChanges();
+        const vs = ServiceProvider.resolve(this, WebSiteVersionService);
+        await vs.ensureNewVersion(entity);
     }
 
     async copyTemplate(entity: WebSite) {

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

@@ -8,6 +8,8 @@ import EmailAddressService from "../../services/EmailAddressService.js";
 import SyncDnsZoneRecordsWorkflow from "../../workflows/dns/SyncDnsZoneRecordsWorkflow.js";
 import { WebSiteHost } from "../entities/WebSiteHost.js";
 import AuthenticatedEvents from "./AuthenticatedEvents.js";
+import SocialMailContext from "../SocialMailContext.js";
+import WebSiteVersionService from "../../services/files/WebSiteVersionService.js";
 
 export class WebSiteHostEvents extends AuthenticatedEvents<WebSiteHost> {
 
@@ -42,6 +44,9 @@ export class WebSiteHostEvents extends AuthenticatedEvents<WebSiteHost> {
         const zoneID = await eas.getOrCreateDomain(domain);
 
         await SyncDnsZoneRecordsWorkflow.enqueue(wc, zoneID);
+
+        const vs = ServiceProvider.resolve(this, WebSiteVersionService);
+        await vs.ensureNewVersionForRemote(entity.folderID);
     }
 
     includeFilter(query: IEntityQuery<WebSiteHost>, type?: any, key?: string) {

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

@@ -10,6 +10,7 @@ import * as semver from "semver";
 import { ForeignKeyFilter } from "@entity-access/entity-access/dist/model/events/EntityEvents.js";
 import FileDeleteService from "../../services/files/FileDeleteService.js";
 import SnapshotService from "../../services/files/SnapshotService.js";
+import WebSiteVersionService from "../../services/files/WebSiteVersionService.js";
 
 
 
@@ -78,16 +79,8 @@ export class WebSiteVersionEvents extends AuthenticatedEvents<WebSiteVersion> {
             entity.authorID = this.sessionUser.userID;
         }
         if (!entity.name) {
-            const previous = await this.db.websiteVersions.where(entity, (p) => (x) => x.folderID === p.folderID
-                && x.snapshotFolderID !== p.snapshotFolderID
-                )
-                .orderByDescending(void 0, (p) => (x) => x.dateCreated)
-                .first();
-            if (!previous) {
-                entity.name = "1.0.0";
-            } else {
-                entity.name = semver.inc(previous.name, entity.versionType || "patch");
-            }
+            const vs = ServiceProvider.resolve(this, WebSiteVersionService);
+            entity.name = await vs.getNewVersion(entity.folderID, entity.versionType || "patch");
         }
     }
 

package/src/server/services/files/WebSiteVersionService.ts

@@ -0,0 +1,85 @@
+import Inject, { RegisterScoped } from "@entity-access/entity-access/dist/di/di.js";
+import * as semver from "semver";
+import SocialMailContext from "../../model/SocialMailContext.js";
+import { WebSiteVersion } from "../../model/entities/WebSiteVersion.js";
+import { SessionUser } from "@entity-access/server-pages/dist/core/SessionUser.js";
+import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
+import WebSite from "../../model/entities/WebSite.js";
+
+@RegisterScoped
+export default class WebSiteVersionService {
+
+    @Inject db: SocialMailContext;
+
+    @Inject user: SessionUser;
+
+    async getNewVersion(folderID, versionType: semver.ReleaseType = "patch") {
+        const previous = await this.db.websiteVersions.where({ folderID }, (p) => (x) => x.folderID === p.folderID)
+            .orderByDescending(void 0, (p) => (x) => x.dateCreated)
+            .first();
+        if (!previous) {
+            return "1.0.0";
+        } else {
+            return semver.inc(previous.name, versionType);
+        }
+    }
+
+    async ensureNewVersionForRemote(folderID) {
+        const site = await this.db.websiteFolders.where({ folderID }, (p) => (x) =>
+                x.folderID === p.folderID
+                && x.remoteUrl !== null)
+            .include((x) => x.folder)
+            .first();
+        if (!site) {
+            return;
+        }
+        return this.ensureNewVersion(site);
+    }
+
+    async ensureNewVersion(site: WebSite) {
+
+        const dateCreated = DateTime.now;
+
+        const { folderID } = site;
+
+        const creatorID = this.user.userID;
+
+        const snapshotRoot = await this.db.appFiles.statements.insert({
+            ... site.folder,
+            contentType: "snapshot",
+            appFileID: void 0,
+            parentID: null,
+            creatorID,
+            path: null,
+            dateCreated,
+            dateUpdated: dateCreated,
+            fileSize: 0,
+        });
+
+        const path = `${snapshotRoot.appFileID}/`;
+        snapshotRoot.path = path;
+
+        await this.db.appFiles.statements.update({
+            path
+        }, {
+            appFileID: snapshotRoot.appFileID
+        });
+
+
+        const version = await this.db.websiteVersions.statements.insert({
+            authorID: creatorID,
+            dateCreated,
+            folderID,
+            snapshotFolderID: snapshotRoot.appFileID
+        });
+
+        // delete previous versions...
+        await this.db.appFiles
+            .asQuery()
+            .delete(version, (p) => (x) => x.websiteVersions.some((w) => w.folderID === p.folderID && w.snapshotFolderID !== p.snapshotFolderID));
+
+        await this.db.websiteVersions
+            .asQuery()
+            .delete(version, (p) => (x) => x.folderID === p.folderID && x.snapshotFolderID !== p.snapshotFolderID);
+    }
+}