site move tests

Author: Al Manning

src/publish/confluence/api/index.ts

@@ -110,6 +110,7 @@ export class ConfluenceClient {
   }
 
   public deleteContent(content: ContentDelete): Promise<Content> {
+    trace("deleteContent", content);
     return this.delete<Content>(`content/${content.id}`);
   }
 

src/publish/confluence/confluence-helper.ts

@@ -313,12 +313,17 @@ export const buildSpaceChanges = (
         ? pathList.slice(0, pathList.length - 1).join("/")
         : parent?.parent;
 
-    const checkCreateParents = () => {
+    const checkCreateParents = (): SitePage | null => {
+      console.log("checkCreateParents");
+      console.log("pathList", pathList);
       if (pathList.length < 2) {
-        return;
+        return null;
       }
 
+      let existingSiteParent = null;
+
       const parentsList = pathList.slice(0, pathList.length - 1);
+      console.log("parentsList", parentsList);
 
       parentsList.forEach((parentFileName, index) => {
         const ancestorFilePath = parentsList.slice(0, index).join("/");
@@ -339,7 +344,19 @@ export const buildSpaceChanges = (
           }
         );
 
-        if (!existingParentCreateChange) {
+        existingSiteParent = existingSite.find((page: SitePage) => {
+          if (page?.metadata?.fileName) {
+            return page.metadata.fileName === fileName;
+          }
+          return false;
+        });
+
+        // TODO on create, replace nested parent ID
+        //  ancestors: [ { id: "authoring" } ]
+        console.log("existingSite", existingSite);
+        console.log("existingSiteParent", existingSiteParent);
+
+        if (!existingParentCreateChange && !existingSiteParent) {
           spaceChangeList = [
             ...spaceChangeList,
             buildContentCreate(
@@ -358,9 +375,11 @@ export const buildSpaceChanges = (
           ];
         }
       });
-    };
 
-    checkCreateParents();
+      return existingSiteParent;
+    };
+    const existingParent: SitePage | null = checkCreateParents();
+    console.log("existingSiteParent", existingParent);
 
     if (existingPage) {
       let useOriginalTitle = false;
@@ -376,7 +395,7 @@ export const buildSpaceChanges = (
           useOriginalTitle ? fileMetadata.originalTitle : fileMetadata.title,
           fileMetadata.contentBody,
           fileMetadata.fileName,
-          pageParent
+          existingParent ? existingParent.id : pageParent
         ),
       ];
     } else {
@@ -401,6 +420,8 @@ export const buildSpaceChanges = (
     existingSite
   );
 
+  console.log("pagesToDelete", pagesToDelete);
+
   // TODO prompt as a sanity check and limiter to prevent any major run-away deletes
   const deleteChanges: ContentDelete[] = pagesToDelete.map(
     (toDelete: SitePage) => {

src/publish/confluence/confluence.ts

@@ -81,6 +81,7 @@ import {
 import { DELETE_DISABLED } from "./constants.ts";
 import { logError, trace } from "./confluence-logger.ts";
 import { md5Hash } from "../../core/hash.ts";
+import { sleep } from "../../core/async.ts";
 
 export const CONFLUENCE_ID = "confluence";
 
@@ -246,10 +247,14 @@ async function publish(
   trace("publish", { parent, server, space });
 
   const uniquifyTitle = async (title: string) => {
+    console.log("uniquifyTitle", title);
     const titleAlreadyExistsInSpace: boolean = await client.isTitleInSpace(
       title,
       space
     );
+
+    console.log("titleAlreadyExistsInSpace", titleAlreadyExistsInSpace);
+
     const uuid = globalThis.crypto.randomUUID();
     const shortUUID = uuid.split("-")[0] ?? uuid;
     const createTitle = titleAlreadyExistsInSpace
@@ -262,7 +267,6 @@ async function publish(
     const descendants: any[] =
       (await client.getDescendants(parentId))?.results ?? [];
 
-    console.log("descendants", descendants);
     const contentProperties: ContentProperty[][] = await Promise.all(
       descendants.map((page: ContentSummary) =>
         client.getContentProperty(page.id ?? "")
@@ -464,8 +468,13 @@ async function publish(
     createParent: ConfluenceParent = parent,
     fileName: string = ""
   ): Promise<Content> => {
+    //TODO check why files are always being uniquified
+    console.log("create Content");
+    console.log("titleToCreate");
     const createTitle = await uniquifyTitle(titleToCreate);
 
+    console.log("createTitle", createTitle);
+
     const attachmentsToUpload: string[] = findAttachments(
       body.storage.value,
       publishFiles.files,
@@ -554,11 +563,12 @@ async function publish(
 
     trace("publishSite", {
       parentId,
-      existingSite,
       publishFiles,
       metadataByInput,
     });
 
+    trace("existingSite", existingSite);
+
     const filteredFiles: string[] = filterFilesForUpdate(publishFiles.files);
 
     trace("filteredFiles", filteredFiles);
@@ -573,7 +583,7 @@ async function publish(
       };
 
       const originalTitle = getTitle(fileName, metadataByInput);
-      const title = await uniquifyTitle(originalTitle);
+      const title = originalTitle;
 
       const matchingPages = await client.fetchMatchingTitlePages(
         originalTitle,
@@ -620,9 +630,11 @@ async function publish(
 
     const doChange = async (change: ConfluenceSpaceChange) => {
       if (isContentCreate(change)) {
+        console.log("DO CREATE");
         let ancestorId =
           (change?.ancestors && change?.ancestors[0]?.id) ?? null;
-
+        console.log("ancestorId", ancestorId);
+        console.log("pathsToId", pathsToId);
         if (ancestorId && pathsToId[ancestorId]) {
           ancestorId = pathsToId[ancestorId];
         }
@@ -652,6 +664,7 @@ async function publish(
 
         return result;
       } else if (isContentUpdate(change)) {
+        console.log("DO UPDATE");
         const update = change as ContentUpdate;
         return await updateContent(
           publishFiles,
@@ -660,11 +673,13 @@ async function publish(
           update.title ?? ""
         );
       } else if (isContentDelete(change)) {
+        console.log("DO DELETE", change);
         if (DELETE_DISABLED) {
           console.warn("DELETE DISABELD");
           return null;
         }
         const result = await client.deleteContent(change);
+        await sleep(2000); // Consider polling on delete to support uniqify rather than sleep
         return result;
       } else {
         console.error("Space Change not defined");