From e33c4ad68592b598f41b29902d498eba7fa8438c Mon Sep 17 00:00:00 2001
From: Hongbo Wu <hongbo@omnivore.app>
Date: Mon, 4 Dec 2023 14:29:54 +0800
Subject: [PATCH 1/2] fix moveToFolder API error by skipping fetching content
 again

---
 packages/api/src/resolvers/article/index.ts | 34 ++++++++++-----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/packages/api/src/resolvers/article/index.ts b/packages/api/src/resolvers/article/index.ts
index 6f8ed91dd..759815f27 100644
--- a/packages/api/src/resolvers/article/index.ts
+++ b/packages/api/src/resolvers/article/index.ts
@@ -916,23 +916,23 @@ export const moveToFolderResolver = authorized<
 
   const savedAt = new Date()
 
-  // if the content is not fetched yet, create a page save request
-  if (!item.readableContent) {
-    const articleSavingRequest = await createPageSaveRequest({
-      userId: uid,
-      url: item.originalUrl,
-      articleSavingRequestId: id,
-      priority: 'high',
-      publishedAt: item.publishedAt || undefined,
-      savedAt,
-      pubsub,
-    })
+  // // if the content is not fetched yet, create a page save request
+  // if (!item.readableContent) {
+  //   const articleSavingRequest = await createPageSaveRequest({
+  //     userId: uid,
+  //     url: item.originalUrl,
+  //     articleSavingRequestId: id,
+  //     priority: 'high',
+  //     publishedAt: item.publishedAt || undefined,
+  //     savedAt,
+  //     pubsub,
+  //   })
 
-    return {
-      __typename: 'MoveToFolderSuccess',
-      articleSavingRequest,
-    }
-  }
+  //   return {
+  //     __typename: 'MoveToFolderSuccess',
+  //     articleSavingRequest,
+  //   }
+  // }
 
   const updatedItem = await updateLibraryItem(
     item.id,
@@ -947,7 +947,7 @@ export const moveToFolderResolver = authorized<
   return {
     __typename: 'MoveToFolderSuccess',
     articleSavingRequest: libraryItemToArticleSavingRequest(
-      updatedItem.user,
+      item.user,
       updatedItem
     ),
   }

From 767629b8c7765d5ae956e0a96708cb954c9f89f6 Mon Sep 17 00:00:00 2001
From: Hongbo Wu <hongbo@omnivore.app>
Date: Mon, 4 Dec 2023 15:54:14 +0800
Subject: [PATCH 2/2] replace articleSavingRequest with success (boolean value)
 as a response

---
 packages/api/src/generated/graphql.ts       | 4 ++--
 packages/api/src/generated/schema.graphql   | 2 +-
 packages/api/src/resolvers/article/index.ts | 7 ++-----
 packages/api/src/schema.ts                  | 2 +-
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/packages/api/src/generated/graphql.ts b/packages/api/src/generated/graphql.ts
index aa8695c6b..5b767e76e 100644
--- a/packages/api/src/generated/graphql.ts
+++ b/packages/api/src/generated/graphql.ts
@@ -1301,7 +1301,7 @@ export type MoveToFolderResult = MoveToFolderError | MoveToFolderSuccess;
 
 export type MoveToFolderSuccess = {
   __typename?: 'MoveToFolderSuccess';
-  articleSavingRequest: ArticleSavingRequest;
+  success: Scalars['Boolean'];
 };
 
 export type Mutation = {
@@ -5328,7 +5328,7 @@ export type MoveToFolderResultResolvers<ContextType = ResolverContext, ParentTyp
 };
 
 export type MoveToFolderSuccessResolvers<ContextType = ResolverContext, ParentType extends ResolversParentTypes['MoveToFolderSuccess'] = ResolversParentTypes['MoveToFolderSuccess']> = {
-  articleSavingRequest?: Resolver<ResolversTypes['ArticleSavingRequest'], ParentType, ContextType>;
+  success?: Resolver<ResolversTypes['Boolean'], ParentType, ContextType>;
   __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
diff --git a/packages/api/src/generated/schema.graphql b/packages/api/src/generated/schema.graphql
index 6303d22f9..cb75551cc 100644
--- a/packages/api/src/generated/schema.graphql
+++ b/packages/api/src/generated/schema.graphql
@@ -1165,7 +1165,7 @@ enum MoveToFolderErrorCode {
 union MoveToFolderResult = MoveToFolderError | MoveToFolderSuccess
 
 type MoveToFolderSuccess {
-  articleSavingRequest: ArticleSavingRequest!
+  success: Boolean!
 }
 
 type Mutation {
diff --git a/packages/api/src/resolvers/article/index.ts b/packages/api/src/resolvers/article/index.ts
index 759815f27..1cc84dcdc 100644
--- a/packages/api/src/resolvers/article/index.ts
+++ b/packages/api/src/resolvers/article/index.ts
@@ -934,7 +934,7 @@ export const moveToFolderResolver = authorized<
   //   }
   // }
 
-  const updatedItem = await updateLibraryItem(
+  await updateLibraryItem(
     item.id,
     {
       folder,
@@ -946,10 +946,7 @@ export const moveToFolderResolver = authorized<
 
   return {
     __typename: 'MoveToFolderSuccess',
-    articleSavingRequest: libraryItemToArticleSavingRequest(
-      item.user,
-      updatedItem
-    ),
+    success: true,
   }
 })
 
diff --git a/packages/api/src/schema.ts b/packages/api/src/schema.ts
index 71b839cb5..94a759f92 100755
--- a/packages/api/src/schema.ts
+++ b/packages/api/src/schema.ts
@@ -2665,7 +2665,7 @@ const schema = gql`
   union MoveToFolderResult = MoveToFolderSuccess | MoveToFolderError
 
   type MoveToFolderSuccess {
-    articleSavingRequest: ArticleSavingRequest!
+    success: Boolean!
   }
 
   type MoveToFolderError {