fixed broken updates for pages (and probably pieces depending on the …

…situation)
apostrophecms · Sep 5, 2024 · ed8d8ff · ed8d8ff
1 parent 60459fb
commit ed8d8ff
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 18 deletions.
diff --git a/lib/methods/import-page.js b/lib/methods/import-page.js
@@ -56,6 +56,7 @@ const update = async ({
   req,
   duplicatedDocs
 }) => {
+
   const {
     _id,
     aposDocId,

diff --git a/lib/methods/import.js b/lib/methods/import.js
@@ -533,7 +533,10 @@ module.exports = self => {
         for (const docToUpdate of docsToUpdate) {
           const _req = req.clone({ mode: docToUpdate.aposMode });
 
-          await manager.convert(_req, doc, docToUpdate, { presentFieldsOnly: true });
+          await manager.convert(_req, doc, docToUpdate, {
+            presentFieldsOnly: true,
+            fetchRelationships: false
+          });
           self.isPage(manager)
             ? await importPage.update({
               manager: self.apos.page,
@@ -638,6 +641,7 @@ module.exports = self => {
 
         const type = doc.type;
         const docToInsert = doc;
+
         await manager.convert(_req, doc, docToInsert, {
           presentFieldsOnly: true,
           fetchRelationships: false
@@ -662,27 +666,26 @@ module.exports = self => {
 
       async function update() {
         const _req = req.clone({ mode: doc.aposMode });
-
-        if (doc.aposMode === 'draft') {
-          const existingDoc = await self.apos.doc.db.findOne({ _id: doc._id }, {
-            lastPublishedAt: 1
-          });
-          if (existingDoc) {
-            doc.lastPublishedAt = existingDoc.lastPublishedAt;
-          }
-        }
-
-        self.isPage(manager)
-          ? await importPage.update({
+        self.apos.schema.simulateRelationshipsFromStorage(req, doc, manager.schema);
+        // One of these must work else we would not be updating. The id match is preferable
+        // don't just use $or
+        const docToUpdate = await self.apos.doc.db.findOne({ _id: doc._id }) || await self.apos.doc.db.findOne({ aposLocale: doc.aposLocale, aposDocId: doc.aposDocId });
+        await manager.convert(_req, doc, docToUpdate, {
+          presentFieldsOnly: true,
+          fetchRelationships: false
+        });
+        if (self.isPage(manager)) {
+          await importPage.update({
             manager: self.apos.page,
-            doc,
+            doc: docToUpdate,
             req: _req,
             duplicatedDocs
-          })
-          : await manager.update(_req, doc);
-
+          });
+        } else {
+          await manager.update(_req, docToUpdate);
+        }
         if (doc.aposMode === 'draft') {
-          await self.setDocAsNotModified(doc);
+          await self.setDocAsNotModified(docToUpdate);
         }
       }
     },