관리자 레이아웃과 네비게이션 정리

server/repositories/email-otp-repository.js

@@ -37,6 +37,38 @@ export const invalidatePendingOtpChallenges = async (sql, email, purpose) => {
   `
 }
 
+/**
+ * 특정 OTP를 제외한 동일 이메일·용도의 미소진 OTP를 무효화한다.
+ * @param {import('postgres').TransactionSql} sql - sql 또는 트랜잭션
+ * @param {string} email - 정규화된 이메일
+ * @param {string} purpose - signup | password_reset
+ * @param {string} keepId - 유지할 챌린지 ID
+ * @returns {Promise<void>}
+ */
+export const invalidatePendingOtpChallengesExcept = async (sql, email, purpose, keepId) => {
+  await sql`
+    UPDATE email_otp_challenges
+    SET consumed_at = now()
+    WHERE lower(email) = lower(${email})
+      AND purpose = ${purpose}
+      AND id <> ${keepId}
+      AND consumed_at IS NULL
+  `
+}
+
+/**
+ * 특정 OTP 챌린지를 삭제한다.
+ * @param {import('postgres').TransactionSql} sql - sql 또는 트랜잭션
+ * @param {string} id - 챌린지 ID
+ * @returns {Promise<void>}
+ */
+export const deleteOtpChallengeById = async (sql, id) => {
+  await sql`
+    DELETE FROM email_otp_challenges
+    WHERE id = ${id}
+  `
+}
+
 /**
  * 최근 짧은 시간 내 동일 이메일·용도 발송이 있는지 확인한다.
  * @param {import('postgres').Sql} sql - sql

server/repositories/member-repository.js

@@ -130,31 +130,35 @@ export const getUserByIdWithPassword = async (id) => {
 export const createUser = async (input) => {
   const sql = requireSql()
 
-  const rows = await sql`
-    INSERT INTO users (username, email, password_hash, avatar_url, is_admin, user_role)
-    VALUES (
-      ${input.username},
-      ${input.email},
-      ${input.passwordHash},
-      '',
-      NOT EXISTS (SELECT 1 FROM users),
-      CASE
-        WHEN NOT EXISTS (SELECT 1 FROM users) THEN ${MEMBER_ROLE.OWNER}
-        ELSE ${MEMBER_ROLE.MEMBER}
-      END
-    )
-    RETURNING
-      id,
-      username,
-      email,
-      avatar_url AS "avatarUrl",
-      is_admin AS "isAdmin",
-      user_role AS "role",
-      created_at AS "createdAt",
-      updated_at AS "updatedAt",
-      last_seen_at AS "lastSeenAt",
-      last_seen_ip AS "lastSeenIp"
-  `
+  const rows = await sql.begin(async (tx) => {
+    await tx`LOCK TABLE users IN SHARE ROW EXCLUSIVE MODE`
+
+    return tx`
+      INSERT INTO users (username, email, password_hash, avatar_url, is_admin, user_role)
+      VALUES (
+        ${input.username},
+        ${input.email},
+        ${input.passwordHash},
+        '',
+        NOT EXISTS (SELECT 1 FROM users),
+        CASE
+          WHEN NOT EXISTS (SELECT 1 FROM users) THEN ${MEMBER_ROLE.OWNER}
+          ELSE ${MEMBER_ROLE.MEMBER}
+        END
+      )
+      RETURNING
+        id,
+        username,
+        email,
+        avatar_url AS "avatarUrl",
+        is_admin AS "isAdmin",
+        user_role AS "role",
+        created_at AS "createdAt",
+        updated_at AS "updatedAt",
+        last_seen_at AS "lastSeenAt",
+        last_seen_ip AS "lastSeenIp"
+    `
+  })
 
   const created = rows?.[0]
   if (!created) {
@@ -262,6 +266,21 @@ export const deleteMember = async (userId) => {
   `
 }
 
+/**
+ * 소유자 권한 회원 수를 조회한다.
+ * @returns {Promise<number>} 소유자 회원 수
+ */
+export const countOwnerMembers = async () => {
+  const sql = requireSql()
+  const rows = await sql`
+    SELECT COUNT(*)::int AS "ownerCount"
+    FROM users
+    WHERE user_role = ${MEMBER_ROLE.OWNER}
+  `
+
+  return Number(rows?.[0]?.ownerCount || 0)
+}
+
 /**
  * 사용자명 중복 확인
  * @param {{ username: string, excludeUserId?: string }} input - 사용자명과 제외 사용자 ID
@@ -500,4 +519,3 @@ export const updateMemberRoleByAdmin = async (input) => {
     isAdmin: Boolean(updated.isAdmin)
   }
 }
-