simple folder moves

Author: Al Manning

src/publish/confluence/confluence-helper.ts

@@ -308,7 +308,7 @@ export const buildSpaceChanges = (
 
     const pathList = fileMetadata.fileName.split("/");
 
-    const pageParent =
+    let pageParent =
       pathList.length > 1
         ? pathList.slice(0, pathList.length - 1).join("/")
         : parent?.parent;
@@ -378,8 +378,11 @@ export const buildSpaceChanges = (
 
       return existingSiteParent;
     };
+
     const existingParent: SitePage | null = checkCreateParents();
-    console.log("existingSiteParent", existingParent);
+    console.log("existingParent", existingParent);
+
+    pageParent = existingParent ? existingParent.id : pageParent;
 
     if (existingPage) {
       let useOriginalTitle = false;
@@ -395,7 +398,7 @@ export const buildSpaceChanges = (
           useOriginalTitle ? fileMetadata.originalTitle : fileMetadata.title,
           fileMetadata.contentBody,
           fileMetadata.fileName,
-          existingParent ? existingParent.id : pageParent
+          pageParent
         ),
       ];
     } else {

src/publish/confluence/confluence.ts

@@ -619,6 +619,9 @@ async function publish(
 
     trace("changelist", changeList);
 
+    console.log("existingSite", existingSite);
+    console.log("changeList", changeList);
+
     changeList = updateLinks(
       metadataByFilename,
       changeList,

tests/unit/confluence.test.ts

@@ -2281,7 +2281,7 @@ const runSpaceUpdatesWithNestedMoves = () => {
         contentChangeType: ContentChangeType.create,
         ancestors: [
           {
-            id: "fake-parent",
+            id: "fake-parent-id",
           },
         ],
         body: {
@@ -2310,6 +2310,79 @@ const runSpaceUpdatesWithNestedMoves = () => {
     assertEquals(expected, actual);
   });
 
+  unitTest(suiteLabel("from_root_to_existing_parent"), async () => {
+    const fileMetadataList: SiteFileMetadata[] = [
+      fakeNestedFile,
+      fakeNestedFile2,
+    ];
+    const existingSite = [
+      {
+        id: "fake-title-id",
+        title: "fake-title",
+        metadata: { fileName: "fake-file-name.xml" },
+        ancestors: [{ id: "fake-grand-parent-id" }],
+      },
+      {
+        id: "fake-title2-id",
+        title: "fake-title",
+        metadata: { fileName: "fake-parent/fake-file-name2.xml" },
+        ancestors: [{ id: "fake-grand-parent-id" }, { id: "fake-parent-id" }],
+      },
+      {
+        title: "Fake Parent",
+        id: "fake-parent-id",
+        metadata: { editor: "v2", fileName: "fake-parent" },
+        ancestors: [{ id: "fake-grand-parent-id" }],
+      },
+    ];
+
+    const expected: ConfluenceSpaceChange[] = [
+      { contentChangeType: ContentChangeType.delete, id: "fake-title-id" },
+      {
+        contentChangeType: ContentChangeType.create,
+        ancestors: [
+          {
+            id: "fake-parent-id",
+          },
+        ],
+        body: {
+          storage: {
+            representation: "storage",
+            value: "fake-value",
+          },
+        },
+        fileName: "fake-parent/fake-file-name.xml",
+        space: {
+          key: "fake-space-key",
+          id: "fake-space-id",
+          homepage: buildFakeContent(),
+        },
+        status: "current",
+        title: "fake-title",
+        type: "page",
+      },
+      {
+        contentChangeType: ContentChangeType.update,
+        id: "fake-title2-id",
+        version: null,
+        title: "fake-title2",
+        type: "page",
+        status: "current",
+        ancestors: [{ id: "fake-parent-id" }],
+        body: { storage: { value: "fake-value", representation: "storage" } },
+        fileName: "fake-parent/fake-file-name2.xml",
+      },
+    ];
+    const actual: ConfluenceSpaceChange[] = buildSpaceChanges(
+      fileMetadataList,
+      FAKE_PARENT,
+      fakeSpace,
+      existingSite
+    );
+    console.log("actual", actual);
+    assertEquals(expected, actual);
+  });
+
   // TODO Delete orphaned parents
   // unitTest(suiteLabel("parent_to_root_del_parent"), async () => {
   //   const fileMetadataList: SiteFileMetadata[] = [fakeRootFile];
@@ -2878,6 +2951,6 @@ if (runAllTests) {
   runUpdateImagePathsForContentBody();
 } else {
   // runSpaceCreatesWithNesting();
-  // runSpaceUpdatesWithNestedMoves();
-  runSpaceUpdatesWithNesting();
+  runSpaceUpdatesWithNestedMoves();
+  // runSpaceUpdatesWithNesting();
 }