From b0f0dba53d2c32cbb562fd9972dd05c05ed6a22a Mon Sep 17 00:00:00 2001
From: Hongbo Wu <hongbo@omnivore.app>
Date: Thu, 12 Oct 2023 10:39:35 +0800
Subject: [PATCH] drop position trigger on labels table and sort labels by name
 returned by labels api

---
 packages/api/src/resolvers/labels/index.ts      |  2 +-
 .../0133.do.drop_position_trigger_ob_labels.sql | 10 ++++++++++
 ...133.undo.drop_position_trigger_ob_labels.sql | 17 +++++++++++++++++
 3 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100755 packages/db/migrations/0133.do.drop_position_trigger_ob_labels.sql
 create mode 100755 packages/db/migrations/0133.undo.drop_position_trigger_ob_labels.sql

diff --git a/packages/api/src/resolvers/labels/index.ts b/packages/api/src/resolvers/labels/index.ts
index ef0687c04..27cd0ab25 100644
--- a/packages/api/src/resolvers/labels/index.ts
+++ b/packages/api/src/resolvers/labels/index.ts
@@ -54,7 +54,7 @@ export const labelsResolver = authorized<LabelsSuccess, LabelsError>(
             user: { id: uid },
           },
           order: {
-            position: 'ASC',
+            name: 'ASC',
           },
         })
       })
diff --git a/packages/db/migrations/0133.do.drop_position_trigger_ob_labels.sql b/packages/db/migrations/0133.do.drop_position_trigger_ob_labels.sql
new file mode 100755
index 000000000..78d422202
--- /dev/null
+++ b/packages/db/migrations/0133.do.drop_position_trigger_ob_labels.sql
@@ -0,0 +1,10 @@
+-- Type: DO
+-- Name: drop_position_trigger_ob_labels
+-- Description: Drop increment_label_position and decrement_label_position trigger on omnivore.labels table
+
+BEGIN;
+
+DROP TRIGGER IF EXISTS increment_label_position ON omnivore.labels;
+DROP TRIGGER IF EXISTS decrement_label_position ON omnivore.labels;
+
+COMMIT;
diff --git a/packages/db/migrations/0133.undo.drop_position_trigger_ob_labels.sql b/packages/db/migrations/0133.undo.drop_position_trigger_ob_labels.sql
new file mode 100755
index 000000000..6224a7284
--- /dev/null
+++ b/packages/db/migrations/0133.undo.drop_position_trigger_ob_labels.sql
@@ -0,0 +1,17 @@
+-- Type: UNDO
+-- Name: drop_position_trigger_ob_labels
+-- Description: Drop increment_label_position and decrement_label_position trigger on omnivore.labels table
+
+BEGIN;
+
+CREATE TRIGGER decrement_label_position
+    AFTER DELETE ON omnivore.labels
+    FOR EACH ROW
+EXECUTE FUNCTION update_label_position();
+
+CREATE TRIGGER increment_label_position
+    BEFORE INSERT ON omnivore.labels
+    FOR EACH ROW
+    EXECUTE FUNCTION update_label_position();
+
+COMMIT;