From b306ca6e2e9fb3b73df909f30c8a625c1ef68022 Mon Sep 17 00:00:00 2001
From: Hongbo Wu <hongbo@omnivore.app>
Date: Fri, 13 May 2022 17:38:51 +0800
Subject: [PATCH] Fix UpdateLabelResult undefined

---
 .../api/src/resolvers/function_resolvers.ts   |  1 +
 packages/api/src/resolvers/labels/index.ts    | 22 +++++++++----------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/packages/api/src/resolvers/function_resolvers.ts b/packages/api/src/resolvers/function_resolvers.ts
index 740b5c9a6..6bd83fe61 100644
--- a/packages/api/src/resolvers/function_resolvers.ts
+++ b/packages/api/src/resolvers/function_resolvers.ts
@@ -553,4 +553,5 @@ export const functionResolvers = {
   ...resultResolveTypeResolver('Search'),
   ...resultResolveTypeResolver('Subscriptions'),
   ...resultResolveTypeResolver('Unsubscribe'),
+  ...resultResolveTypeResolver('UpdateLabel'),
 }
diff --git a/packages/api/src/resolvers/labels/index.ts b/packages/api/src/resolvers/labels/index.ts
index a61ba82c8..b95d46521 100644
--- a/packages/api/src/resolvers/labels/index.ts
+++ b/packages/api/src/resolvers/labels/index.ts
@@ -278,9 +278,9 @@ export const updateLabelResolver = authorized<
       }
     }
 
-    const label = await getRepository(Label).findOne({
-      where: { id: labelId },
-      relations: ['user'],
+    const label = await getRepository(Label).findOneBy({
+      id: labelId,
+      user: { id: uid },
     })
     if (!label) {
       return {
@@ -297,14 +297,12 @@ export const updateLabelResolver = authorized<
 
     const result = await AppDataSource.transaction(async (t) => {
       await setClaims(t, uid)
-      return t.getRepository(Label).update(
-        { id: labelId },
-        {
-          name: name,
-          description: description || undefined,
-          color: color,
-        }
-      )
+      label.name = name
+      label.color = color
+      label.description = description || undefined
+      label.createdAt = new Date()
+
+      return t.getRepository(Label).update({ id: labelId }, label)
     })
 
     if (!result.affected) {
@@ -314,7 +312,7 @@ export const updateLabelResolver = authorized<
       }
     }
 
-    return { label: label }
+    return { label }
   } catch (error) {
     log.error('error updating label', error)
     return {