From 85ecf8a07345ce4dcfcf97b35991a58470d89a09 Mon Sep 17 00:00:00 2001
From: BlueZeeKing <github@blueish.dev>
Date: Tue, 31 Oct 2023 18:23:43 -0400
Subject: [PATCH] Migrate to new TRPC backend

---
 .../app/modules/[id]/_components/add-task.tsx | 34 +++++++--------
 .../modules/[id]/_components/task-item.tsx    | 14 +++----
 .../app/modules/[id]/_components/tasks.tsx    |  8 ++--
 src/app/(dashboard)/app/modules/[id]/page.tsx | 10 ++---
 src/db/schema/module.ts                       |  2 +-
 src/server/api/routers/module.ts              |  6 +--
 src/server/api/routers/task.ts                | 42 ++++++++++++++++---
 7 files changed, 74 insertions(+), 42 deletions(-)

diff --git a/src/app/(dashboard)/app/modules/[id]/_components/add-task.tsx b/src/app/(dashboard)/app/modules/[id]/_components/add-task.tsx
index e3a4250d..5226bc9d 100644
--- a/src/app/(dashboard)/app/modules/[id]/_components/add-task.tsx
+++ b/src/app/(dashboard)/app/modules/[id]/_components/add-task.tsx
@@ -28,16 +28,16 @@ export default function AddTask(props: {
     reset,
   } = useZodForm({
     schema: z.object({
-      name: z.string(),
+      title: z.string(),
       note: z.string().optional(),
-      dueAt: z
+      dueDate: z
         .string()
         .refine((str) => !isNaN(Date.parse(str)), { message: "Invalid date" }),
-      priority: z.enum(["low", "high", "medium"]),
+      priority: z.enum(["LOW", "HIGH", "MEDIUM"]),
     }),
   });
 
-  const { mutateAsync, isLoading } = trpc.todos.create.new.useMutation();
+  const { mutateAsync, isLoading } = trpc.task.post.create.useMutation();
   const utils = trpc.useUtils();
 
   return (
@@ -50,12 +50,12 @@ export default function AddTask(props: {
               onSubmit={handleSubmit(async (data) => {
                 await mutateAsync({
                   moduleId: props.moduleId,
-                  name: data.name,
+                  title: data.title,
                   priority: data.priority,
-                  note: data.note,
-                  dueAt: new Date(Date.parse(data.dueAt)),
+                  notes: data.note ?? "",
+                  dueDate: new Date(Date.parse(data.dueDate)).toString(),
                 });
-                await utils.todos.invalidate();
+                await utils.task.invalidate();
 
                 onClose();
                 reset();
@@ -71,9 +71,9 @@ export default function AddTask(props: {
                   variant="bordered"
                   labelPlacement="outside"
                   isRequired
-                  isInvalid={!!errors.name}
-                  errorMessage={errors.name?.message}
-                  {...register("name")}
+                  isInvalid={!!errors.title}
+                  errorMessage={errors.title?.message}
+                  {...register("title")}
                 />
                 <Textarea
                   label="Note"
@@ -98,13 +98,13 @@ export default function AddTask(props: {
                   errorMessage={errors.priority?.message}
                   {...register("priority")}
                 >
-                  <SelectItem key="low" value="low">
+                  <SelectItem key="LOW" value="LOW">
                     Low
                   </SelectItem>
-                  <SelectItem key="medium" value="medium">
+                  <SelectItem key="MEDIUM" value="MEDIUM">
                     Medium
                   </SelectItem>
-                  <SelectItem key="high" value="high">
+                  <SelectItem key="HIGH" value="HIGH">
                     High
                   </SelectItem>
                 </Select>
@@ -117,9 +117,9 @@ export default function AddTask(props: {
                   variant="bordered"
                   labelPlacement="outside"
                   isRequired
-                  isInvalid={!!errors.dueAt}
-                  errorMessage={errors.dueAt?.message}
-                  {...register("dueAt")}
+                  isInvalid={!!errors.dueDate}
+                  errorMessage={errors.dueDate?.message}
+                  {...register("dueDate")}
                 />
               </ModalBody>
               <ModalFooter>
diff --git a/src/app/(dashboard)/app/modules/[id]/_components/task-item.tsx b/src/app/(dashboard)/app/modules/[id]/_components/task-item.tsx
index d220e8cb..143d4bc2 100644
--- a/src/app/(dashboard)/app/modules/[id]/_components/task-item.tsx
+++ b/src/app/(dashboard)/app/modules/[id]/_components/task-item.tsx
@@ -21,9 +21,9 @@ const Task = forwardRef<
     name: string;
     dueAt: Date;
   }
->(({ task, checked, name, dueAt }, ref) => {
-  const setChecked = trpc.todos.update.setChecked.useMutation();
-  const remove = trpc.todos.delete.byId.useMutation();
+>(function Task({ task, checked, name, dueAt }, ref) {
+  const setChecked = trpc.task.patch.switchDone.useMutation();
+  const remove = trpc.task.delete.byId.useMutation();
   const { onOpen, onOpenChange, isOpen } = useDisclosure();
 
   const utils = trpc.useUtils();
@@ -34,8 +34,8 @@ const Task = forwardRef<
         isSelected={checked}
         onChange={async (e) => {
           e.preventDefault();
-          await setChecked.mutateAsync({ checked: e.target.checked, id: task });
-          await utils.todos.invalidate();
+          await setChecked.mutateAsync({ done: e.target.checked, id: task });
+          await utils.task.invalidate();
         }}
       />
       <button>
@@ -79,8 +79,8 @@ const Task = forwardRef<
                   color="danger"
                   isLoading={remove.isLoading}
                   onClick={async () => {
-                    await remove.mutateAsync(task);
-                    await utils.todos.invalidate();
+                    await remove.mutateAsync({ id: task });
+                    await utils.task.invalidate();
                     onClose();
                   }}
                 >
diff --git a/src/app/(dashboard)/app/modules/[id]/_components/tasks.tsx b/src/app/(dashboard)/app/modules/[id]/_components/tasks.tsx
index d235d621..3e69c7bc 100644
--- a/src/app/(dashboard)/app/modules/[id]/_components/tasks.tsx
+++ b/src/app/(dashboard)/app/modules/[id]/_components/tasks.tsx
@@ -8,7 +8,7 @@ const MotionTask = motion(Task);
 
 export default function Tasks(props: { id: string }) {
   const id = Number(props.id);
-  const [todos] = trpc.todos.get.byModule.useSuspenseQuery({ moduleId: id });
+  const [todos] = trpc.task.get.byModule.useSuspenseQuery({ moduleId: id });
 
   return (
     <div className="m-1 mt-4 min-h-full w-1/4 rounded border border-gray-900">
@@ -19,10 +19,10 @@ export default function Tasks(props: { id: string }) {
             <MotionTask
               layout
               key={todo.id}
-              checked={todo.checked}
-              name={todo.name}
+              checked={todo.done ?? false}
+              name={todo.title}
               task={todo.id}
-              dueAt={new Date(todo.dueAt)}
+              dueAt={new Date(todo.dueDate)}
             />
           ))}
         </ol>
diff --git a/src/app/(dashboard)/app/modules/[id]/page.tsx b/src/app/(dashboard)/app/modules/[id]/page.tsx
index ae23dbf7..faaf6fa1 100644
--- a/src/app/(dashboard)/app/modules/[id]/page.tsx
+++ b/src/app/(dashboard)/app/modules/[id]/page.tsx
@@ -14,7 +14,7 @@ export default function Page({ params }: { params: { id: string } }) {
 
   const id = Number(params.id);
 
-  const [tasks] = trpc.todos.get.byModule.useSuspenseQuery({ moduleId: id });
+  const [tasks] = trpc.task.get.byModule.useSuspenseQuery({ moduleId: id });
 
   // FIXME: weird animation bug when moving
   return (
@@ -26,14 +26,14 @@ export default function Page({ params }: { params: { id: string } }) {
           </div>
         ) : (
           <ul className="p-4">
-            {tasks.map(({ name, id, checked, dueAt }) => (
+            {tasks.map(({ title, id, done, dueDate }) => (
               <MotionTask
                 layout
                 key={id}
                 task={id}
-                name={name}
-                checked={checked}
-                dueAt={new Date(dueAt)}
+                name={title}
+                checked={done ?? false}
+                dueAt={new Date(dueDate)}
               />
             ))}
           </ul>
diff --git a/src/db/schema/module.ts b/src/db/schema/module.ts
index 39fb9fd3..46c35137 100644
--- a/src/db/schema/module.ts
+++ b/src/db/schema/module.ts
@@ -27,7 +27,7 @@ export const moduleTable = sqliteTable("module", {
 
 export const moduleTableRelations = relations(moduleTable, ({ many }) => ({
   notebooks: many(notebooks),
-  tasks: many(taskTable)
+  tasks: many(taskTable),
 }));
 
 export const insertModuleSchema = createInsertSchema(moduleTable, {
diff --git a/src/server/api/routers/module.ts b/src/server/api/routers/module.ts
index 4e5e1fdf..f77bb009 100644
--- a/src/server/api/routers/module.ts
+++ b/src/server/api/routers/module.ts
@@ -8,9 +8,9 @@ export const moduleRouter = createTRPCRouter({
       try {
         const modules = await ctx.db.query.moduleTable.findMany({
           where: (table, { eq }) => eq(table.userId, ctx.auth.userId),
-          with:{
-            tasks: true
-          }
+          with: {
+            tasks: true,
+          },
         });
 
         return modules;
diff --git a/src/server/api/routers/task.ts b/src/server/api/routers/task.ts
index 2b36695f..40672259 100644
--- a/src/server/api/routers/task.ts
+++ b/src/server/api/routers/task.ts
@@ -143,7 +143,7 @@ export const taskRouter = createTRPCRouter({
   }),
   patch: createTRPCRouter({
     switchDone: protectedProcedure
-      .input(selectTaskSchema.pick({ id: true }))
+      .input(selectTaskSchema.pick({ id: true, done: true }))
       .mutation(async ({ ctx, input }) => {
         try {
           const [taskWithModule] = await ctx.db
@@ -165,13 +165,11 @@ export const taskRouter = createTRPCRouter({
             });
           }
 
-          const { task } = taskWithModule;
-
           const res = await ctx.db
             .update(taskTable)
             .set({
-              done: !task.done,
-              doneAt: !task.done ? new Date().toString() : null,
+              done: input.done,
+              doneAt: !input.done ? new Date().toString() : null,
             })
             .where(eq(taskTable.id, input.id))
             .returning();
@@ -187,4 +185,38 @@ export const taskRouter = createTRPCRouter({
         }
       }),
   }),
+  delete: createTRPCRouter({
+    byId: protectedProcedure
+      .input(selectTaskSchema.pick({ id: true }))
+      .mutation(async ({ ctx, input }) => {
+        try {
+          const [task] = await ctx.db
+            .select({ id: taskTable.id })
+            .from(taskTable)
+            .leftJoin(moduleTable, eq(moduleTable.id, taskTable.moduleId))
+            .where(
+              and(
+                eq(taskTable.id, input.id),
+                eq(moduleTable.userId, ctx.auth.userId),
+              ),
+            );
+
+          if (!task) {
+            throw new TRPCError({
+              code: "BAD_REQUEST",
+              message: "The task you are trying to delete doesn't exist",
+            });
+          }
+
+          await ctx.db.delete(taskTable).where(eq(taskTable.id, task.id));
+        } catch (err) {
+          console.error(err);
+          throw new TRPCError({
+            code: "INTERNAL_SERVER_ERROR",
+            message:
+              "An error occurred while switching the task's done status.",
+          });
+        }
+      }),
+  }),
 });