🧹 refactor

src/interactions/modalSubmits/checkinModal.ts

@@ -28,17 +28,12 @@ const handler = async ({
   const profile = intentObj.data.components[0].components[0].value;
   const todo = intentObj.data.components[1].components[0].value;
 
-  const targetUsers = await usersRepository.findByDiscordUserId(
-    intentObj.member.user.id,
-  );
-
   const user =
-    targetUsers.length > 0
-      ? targetUsers[0]
-      : await usersRepository.create({
-          name: intentObj.member.user.username,
-          discordUserId: intentObj.member.user.id,
-        });
+    (await usersRepository.findUserByDiscordUserId(intentObj.member.user.id)) ??
+    (await usersRepository.create({
+      name: intentObj.member.user.username,
+      discordUserId: intentObj.member.user.id,
+    }));
   const checkin = await checkinsRepository.create({
     userId: user.id,
     profile,

src/repositories/usersRepository.ts

@@ -4,12 +4,10 @@ import { checkins, users } from "../schema";
 import { BaseRepository } from "./baseRepository";
 
 export class UsersRepository extends BaseRepository {
-  async findByDiscordUserId(discordUserId: string) {
-    const targetUsers = await this.db
-      .select()
-      .from(users)
-      .where(eq(users.discordUserId, discordUserId));
-    return targetUsers;
+  async findUserByDiscordUserId(discordUserId: string) {
+    return await this.db.query.users.findFirst({
+      where: eq(users.discordUserId, discordUserId),
+    });
   }
 
   async create({
@@ -45,6 +43,6 @@ export class UsersRepository extends BaseRepository {
       .where(eq(users.discordUserId, discordUserId))
       .orderBy(desc(checkins.createdAt))
       .limit(1);
-    return result.length > 0 ? result[0] : null;
+    return result.length > 0 ? result[0] : undefined;
   }
 }

src/schema.ts

@@ -60,6 +60,10 @@ export const events = sqliteTable("events", {
   createdAt: text("created_at").default(sql`CURRENT_TIMESTAMP`),
 });
 
+export const usersRelations = relations(users, ({ many }) => ({
+  checkins: many(checkins),
+}));
+
 export const eventsRelations = relations(events, ({ many }) => ({
   eventsToCheckins: many(eventsToCheckins),
 }));