fix db type issue

Author: ErikaKK

src/app/dashboard/admin/@tools/export.tsx

@@ -25,21 +25,35 @@ export default function ExportButton({ data, label }: ExportButtonProps) {
       return
     }
 
-    const headers = Object.keys(data[0] as Record<string, unknown>).join(",")
-    const escapeCSV = (value: unknown) => {
+    const headers = Object.keys(data[0] as Record<string, unknown>)
+    const escapeCSV = (value: unknown): string => {
       if (value == null) return ""
-      if (value instanceof Date) return value.toISOString()
-      if (typeof value === "string" && !isNaN(Date.parse(value))) {
-        return new Date(value).toISOString()
+
+      let str: string
+      if (typeof value === "object") {
+        if (value instanceof Date) {
+          str = value.toISOString()
+        } else {
+          // Stringify JSON objects/arrays
+          str = JSON.stringify(value)
+        }
+      } else {
+        str = String(value)
       }
-      const str = String(value)
-      if (/[",\n]/.test(str)) {
+
+      // Escape CSV: wrap in quotes if contains comma, quote, or newline
+      // and escape internal quotes by doubling them
+      if (/[",\n\r]/.test(str)) {
         return `"${str.replace(/"/g, '""')}"`
       }
       return str
     }
-    const rows = data.map((row) => Object.values(row).map(escapeCSV).join(",")).join("\n")
-    const csv = headers + "\n" + rows
+
+    const rows = data
+      .map((row) => headers.map((key) => escapeCSV((row as Record<string, unknown>)[key])).join(","))
+      .join("\n")
+
+    const csv = headers.join(",") + "\n" + rows
     const blob = new Blob([csv], { type: "text/csv" })
     const url = window.URL.createObjectURL(blob)
 

src/app/dashboard/admin/@tools/page.tsx

@@ -12,9 +12,6 @@ export default async function AdminUserTable() {
       <div className="flex h-[50px] items-center p-1">
         <h2 className="text-2xl font-semibold">Tools</h2>
       </div>
-      <div className="grid grid-cols-1 md:grid-cols-5 gap-4">
-        <UpdateEmail />
-      </div>
       <div className=" flex flex-col space-y-4 my-4">
         <ExportButton data={projects} label="projects" />
         <ExportButton data={payments} label="payments" />

src/app/dashboard/admin/@tools/update-email.tsx

@@ -27,9 +27,11 @@ const defaultValues: FormSchema = {
   newEmail: "",
 }
 
+// deprecated, only for admin to update user email
+// users should use the updateEmail procedure in users router to update their own email
 const UpdateEmail = () => {
   return (
-    <ToolCard title="Update Email">
+    <ToolCard title="Update user email">
       <UpdateEmailForm />
     </ToolCard>
   )

src/server/api/routers/admin/users/update-email.ts

@@ -1,30 +1,37 @@
 import { clerkClient } from "@clerk/nextjs/server"
 import { TRPCError } from "@trpc/server"
-import { eq } from "drizzle-orm"
+import { eq, sql } from "drizzle-orm"
 import { z } from "zod"
 
 import { adminProcedure } from "~/server/api/trpc"
-import { User } from "~/server/db/schema"
+import { Project, User } from "~/server/db/schema"
 
+// deprecated, only for admin to update user email
+// users should use the updateEmail procedure in users router to update their own email
 export const updateEmail = adminProcedure
   .input(z.object({ userId: z.string(), oldEmail: z.string().email(), newEmail: z.string().email() }))
   .mutation(async ({ ctx, input }) => {
     const clerk = await clerkClient()
     const user_data = await ctx.db.query.User.findFirst({
       where: eq(User.email, input.oldEmail),
     })
+
     if (!user_data) {
       throw new TRPCError({ code: "NOT_FOUND", message: `User with email: ${input.oldEmail} does not exist` })
     }
+
     const user_email_data = await ctx.db.query.User.findFirst({
       where: eq(User.email, input.newEmail),
     })
+
     if (user_email_data) {
       throw new TRPCError({ code: "FORBIDDEN", message: `User with email: ${input.newEmail} already exist` })
     }
+
     const user = await ctx.db.query.User.findFirst({
       where: eq(User.id, input.userId),
     })
+
     if (!user) {
       throw new TRPCError({ code: "NOT_FOUND", message: `User with id: ${input.userId} does not exist` })
     }
@@ -46,6 +53,12 @@ export const updateEmail = adminProcedure
       console.error(err)
       throw new TRPCError({ code: "INTERNAL_SERVER_ERROR", message: "Failed to update email" })
     }
+    await ctx.db
+      .update(Project)
+      .set({
+        members: sql`array_replace(${Project.members}, ${input.oldEmail}, ${input.newEmail})`,
+      })
+      .where(sql`${input.oldEmail} = ANY(${Project.members})`)
 
     return user
   })

src/server/api/routers/projects/get-projects.ts

@@ -41,15 +41,14 @@ export const getProjectByName = publicRatedProcedure(Ratelimit.fixedWindow(60, "
 export const getProjectByUser = protectedRatedProcedure(Ratelimit.fixedWindow(60, "30s"))
   .input(z.object({ user: z.string(), isPublic: z.boolean().optional() }))
   .query(async ({ input, ctx }) => {
-    let whereClause = sql`TRUE`
+    const conditions = []
 
     if (input.user) {
-      const searchPattern = `%${input.user}%`
-      whereClause = sql`${whereClause} AND ${Project.members} ILIKE ${searchPattern}`
+      conditions.push(arrayContains(Project.members, [input.user]))
     }
 
     if (typeof input.isPublic === "boolean") {
-      whereClause = sql`${whereClause} AND ${Project.is_public} = ${input.isPublic}`
+      conditions.push(eq(Project.is_public, input.isPublic))
     }
 
     const projectData = await ctx.db.query.Project.findMany({
@@ -71,7 +70,7 @@ export const getProjectByUser = protectedRatedProcedure(Ratelimit.fixedWindow(60
         application_url: true,
         is_public: true,
       },
-      where: whereClause,
+      where: conditions.length > 0 ? and(...conditions) : undefined,
     })
 
     return projectData

src/server/api/routers/users/update-email.ts

@@ -20,18 +20,23 @@ export const updateEmail = protectedRatedProcedure(Ratelimit.fixedWindow(4, "30s
     const user_data = await ctx.db.query.User.findFirst({
       where: eq(User.email, input.oldEmail),
     })
+
     if (!user_data) {
       throw new TRPCError({ code: "NOT_FOUND", message: `User with email: ${input.oldEmail} does not exist` })
     }
+
     const user_email_data = await ctx.db.query.User.findFirst({
       where: eq(User.email, input.newEmail),
     })
+
     if (user_email_data) {
       throw new TRPCError({ code: "FORBIDDEN", message: `User with email: ${input.newEmail} already exist` })
     }
+
     const user = await ctx.db.query.User.findFirst({
       where: eq(User.id, input.userId),
     })
+
     if (!user) {
       throw new TRPCError({ code: "NOT_FOUND", message: `User with id: ${input.userId} does not exist` })
     }