From f4ef1217dcda04647c87ad897c0dbd3ca5492eb1 Mon Sep 17 00:00:00 2001
From: Henry <30578846+hjball@users.noreply.github.com>
Date: Mon, 7 Jul 2025 22:33:01 +0100
Subject: [PATCH] feat: enhance label router with consistent output (#104)

---
 packages/api/src/routers/label.ts        | 36 ++++++++++++++++++++----
 packages/db/src/repository/label.repo.ts |  8 +++++-
 2 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/packages/api/src/routers/label.ts b/packages/api/src/routers/label.ts
index 6b2bc6e8..ea5506d0 100644
--- a/packages/api/src/routers/label.ts
+++ b/packages/api/src/routers/label.ts
@@ -8,6 +8,12 @@ import * as labelRepo from "@kan/db/repository/label.repo";
 import { createTRPCRouter, protectedProcedure } from "../trpc";
 import { assertUserInWorkspace } from "../utils/auth";
 
+const labelSchema = z.object({
+  publicId: z.string(),
+  name: z.string(),
+  colourCode: z.string().nullable(),
+});
+
 export const labelRouter = createTRPCRouter({
   byPublicId: protectedProcedure
     .meta({
@@ -21,7 +27,7 @@ export const labelRouter = createTRPCRouter({
       },
     })
     .input(z.object({ labelPublicId: z.string().min(12) }))
-    .output(z.custom<Awaited<ReturnType<typeof labelRepo.getByPublicId>>>())
+    .output(labelSchema)
     .query(async ({ ctx, input }) => {
       const userId = ctx.user?.id;
 
@@ -52,7 +58,11 @@ export const labelRouter = createTRPCRouter({
           code: "NOT_FOUND",
         });
 
-      return result;
+      return {
+        publicId: result.publicId,
+        name: result.name,
+        colourCode: result.colourCode,
+      };
     }),
   create: protectedProcedure
     .meta({
@@ -72,7 +82,7 @@ export const labelRouter = createTRPCRouter({
         colourCode: z.string().length(7),
       }),
     )
-    .output(z.custom<Awaited<ReturnType<typeof labelRepo.create>>>())
+    .output(labelSchema)
     .mutation(async ({ ctx, input }) => {
       const userId = ctx.user?.id;
 
@@ -108,7 +118,11 @@ export const labelRouter = createTRPCRouter({
           code: "INTERNAL_SERVER_ERROR",
         });
 
-      return result;
+      return {
+        publicId: result.publicId,
+        name: result.name,
+        colourCode: result.colourCode,
+      };
     }),
   update: protectedProcedure
     .meta({
@@ -128,7 +142,7 @@ export const labelRouter = createTRPCRouter({
         colourCode: z.string().length(7),
       }),
     )
-    .output(z.custom<Awaited<ReturnType<typeof labelRepo.update>>>())
+    .output(labelSchema)
     .mutation(async ({ ctx, input }) => {
       const userId = ctx.user?.id;
 
@@ -153,7 +167,17 @@ export const labelRouter = createTRPCRouter({
 
       const result = await labelRepo.update(ctx.db, input);
 
-      return result;
+      if (!result)
+        throw new TRPCError({
+          message: `Failed to update label`,
+          code: "INTERNAL_SERVER_ERROR",
+        });
+
+      return {
+        publicId: result.publicId,
+        name: result.name,
+        colourCode: result.colourCode,
+      };
     }),
   delete: protectedProcedure
     .meta({
diff --git a/packages/db/src/repository/label.repo.ts b/packages/db/src/repository/label.repo.ts
index 884c3416..08793dd0 100644
--- a/packages/db/src/repository/label.repo.ts
+++ b/packages/db/src/repository/label.repo.ts
@@ -23,7 +23,12 @@ export const create = async (
       createdBy: labelInput.createdBy,
       boardId: labelInput.boardId,
     })
-    .returning({ id: labels.id });
+    .returning({
+      id: labels.id,
+      publicId: labels.publicId,
+      name: labels.name,
+      colourCode: labels.colourCode,
+    });
 
   if (labelInput.cardId && result) {
     await db.insert(cardsToLabels).values({
@@ -91,6 +96,7 @@ export const update = async (
     .where(eq(labels.publicId, labelInput.labelPublicId))
     .returning({
       id: labels.id,
+      publicId: labels.publicId,
       name: labels.name,
       colourCode: labels.colourCode,
     });