fix(sync-utils): fix relationship syncing

good-idea · May 30, 2020 · 7d90789 · 7d90789
1 parent c53700f
commit 7d90789
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/packages/sync-utils/src/sanity/syncRelationships.ts b/packages/sync-utils/src/sanity/syncRelationships.ts
@@ -74,11 +74,15 @@ export const createSyncRelationships = (
   )
 
   if (newLinks.length) {
-    const aToBRelationships = toDocs.map((toDoc) => ({
-      _type: 'reference',
-      _ref: toDoc._id,
-      _key: `${toDoc._rev}-${toDoc._id}`,
-    }))
+    const aToBRelationships = toDocs
+      .map((toDoc) => ({
+        _type: 'reference',
+        _ref: toDoc._id,
+        _key: `${toDoc._rev}-${toDoc._id}`,
+      }))
+      .filter(
+        (toDoc) => !existingRelationships.some((er) => er._id === toDoc._ref)
+      )
 
     await client
       .patch(from._id)
@@ -88,7 +92,7 @@ export const createSyncRelationships = (
   }
 
   const archivedRelationships = existingRelationships.filter(
-    (er) => er.archived === true
+    (er) => er.archived === true || er.shopifyId === null
   )
 
   if (archivedRelationships.length) {

diff --git a/packages/sync-utils/src/sanity/syncSanityDocument.ts b/packages/sync-utils/src/sanity/syncSanityDocument.ts
@@ -91,7 +91,7 @@ export const createSyncSanityDocument = (
 
     const doc = await client.fetch<SanityShopifyDocument>(
       `
-      *[shopifyId == $shopifyId && defined(archived) && archived != true]{
+      *[shopifyId == $shopifyId]{
         products[]->,
         collections[]->,
         "collectionKeys": collections[]{

diff --git a/packages/sync-utils/src/syncingClient.ts b/packages/sync-utils/src/syncingClient.ts
@@ -45,8 +45,6 @@ export const syncUtils = (
    */
   const {
     fetchItemById,
-    fetchShopifyProduct,
-    fetchShopifyCollection,
     fetchAllShopifyProducts,
     fetchAllShopifyCollections,
     testSecrets,
@@ -58,7 +56,6 @@ export const syncUtils = (
     syncRelationships,
     fetchRelatedDocs,
     documentByShopifyId,
-    documentByHandle,
     fetchSecrets,
     archiveSanityDocument,
     saveSecrets: saveSecretsToSanity,