Merge pull request #29 from ut42tech/develop

Add Google Drive folder creation and participant nickname search functionality

Author: ut42tech

.env.example

@@ -33,6 +33,14 @@ GOOGLE_SERVICE_ACCOUNT_KEY=
 # URLの `https://docs.google.com/spreadsheets/d/{ここの部分}/edit` を抜き出し
 GOOGLE_SHEETS_ID=
 
+# -----------------------------------------------------------------------------
+# Google Drive folder creation via Apps Script
+# -----------------------------------------------------------------------------
+# 事前登録アクティベート時に利用者別 Google Drive フォルダを作る GAS Web App。
+# 本番は Wrangler Secrets、ローカルは apps/api/.dev.vars に設定する。
+GAS_DRIVE_WEBHOOK_URL=
+GAS_DRIVE_WEBHOOK_SECRET=
+
 # -----------------------------------------------------------------------------
 # Better Auth (Google OAuth)
 # -----------------------------------------------------------------------------

apps/api/src/index.ts

@@ -8,13 +8,14 @@ import {
   createMentorRequestSchema,
   createPreRegistrationRequestSchema,
   historyBulkCheckOutRequestSchema,
+  participantSearchQuerySchema,
   participantsListQuerySchema,
   scanRequestSchema,
   updateMentorRequestSchema,
 } from '@tecnova/shared/schemas';
 import { and, count, eq } from 'drizzle-orm';
 import { drizzle } from 'drizzle-orm/d1';
-import { Hono } from 'hono';
+import { type Context, Hono } from 'hono';
 import { cors } from 'hono/cors';
 import type { MiddlewareHandler } from 'hono/types';
 import type { ContentfulStatusCode } from 'hono/utils/http-status';
@@ -39,7 +40,9 @@ import {
   recordBulkCheckOut,
   recordCheckIn,
   recordCheckOut,
+  searchActiveParticipantsByNickname,
 } from './lib/checkin';
+import { createParticipantDriveFolder } from './lib/drive-folder';
 import {
   createPreRegistration,
   deletePreRegistration,
@@ -52,6 +55,8 @@ type Bindings = {
   DB: D1Database;
   GOOGLE_SERVICE_ACCOUNT_KEY: string;
   GOOGLE_SHEETS_ID: string;
+  GAS_DRIVE_WEBHOOK_URL?: string;
+  GAS_DRIVE_WEBHOOK_SECRET?: string;
   GOOGLE_OAUTH_CLIENT_ID: string;
   GOOGLE_OAUTH_CLIENT_SECRET: string;
   BETTER_AUTH_SECRET: string;
@@ -362,6 +367,36 @@ const internalError = (e: unknown) => ({
   message: e instanceof Error ? e.message : String(e),
 });
 
+const queueDriveFolderCreation = (
+  c: Context<{ Bindings: Bindings; Variables: Variables }>,
+  participantId: string,
+  nickname: string,
+) => {
+  const url = c.env.GAS_DRIVE_WEBHOOK_URL?.trim();
+  const secret = c.env.GAS_DRIVE_WEBHOOK_SECRET?.trim();
+  if (!url && !secret) return;
+  if (!url || !secret) {
+    console.warn('GAS Drive webhook is partially configured; skipping folder creation');
+    return;
+  }
+
+  const promise = createParticipantDriveFolder({ url, secret, participantId, nickname })
+    .then((folder) => {
+      console.log(
+        `Drive folder ready for participant ${participantId}: ${folder.folderName} (${folder.folderId}) reused=${folder.reused}`,
+      );
+    })
+    .catch((e) => {
+      console.error(`Drive folder creation failed for participant ${participantId}:`, e);
+    });
+
+  try {
+    c.executionCtx.waitUntil(promise);
+  } catch {
+    void promise;
+  }
+};
+
 const serializeScanResult = (result: Awaited<ReturnType<typeof processScanValue>>) => {
   if (result.action === 'check_in') {
     return {
@@ -433,6 +468,7 @@ app.post('/checkin/activate', async (c) => {
       spreadsheetId: c.env.GOOGLE_SHEETS_ID,
       preRegistrationId: parsed.data.preRegistrationId,
     });
+    queueDriveFolderCreation(c, result.participantId, result.nickname);
     return c.json({
       participantId: result.participantId,
       nickname: result.nickname,
@@ -536,6 +572,23 @@ app.post('/checkin/history/check-out-bulk', async (c) => {
   }
 });
 
+// マニュアル入力画面のニックネーム検索。`:participantId` ルートより前に
+// 登録する必要があるので注意（Hono は登録順マッチ）。
+app.get('/checkin/participants/search', async (c) => {
+  const parsed = participantSearchQuerySchema.safeParse({ q: c.req.query('q') });
+  if (!parsed.success) {
+    return c.json(invalidQueryError, 400);
+  }
+
+  const db = createDb(c.env);
+  try {
+    const items = await searchActiveParticipantsByNickname(db, parsed.data.q);
+    return c.json({ participants: items });
+  } catch (e) {
+    return c.json(internalError(e), 500);
+  }
+});
+
 // 受付専用の参加者プロフィール。QR/手入力後はまずここを表示し、
 // 現在の状態に応じた操作だけをフロントに出す。
 app.get('/checkin/participants/:participantId', async (c) => {

apps/api/src/lib/checkin.ts

@@ -1,8 +1,8 @@
 import type * as schema from '@tecnova/db';
 import { events, participants, sessions } from '@tecnova/db';
 import { fetchSheetRows, updateSheetRow } from '@tecnova/shared/google-sheets';
-import type { TodaySessionsResponse } from '@tecnova/shared/schemas';
-import { and, desc, eq, inArray, isNull, like } from 'drizzle-orm';
+import type { ParticipantSearchItem, TodaySessionsResponse } from '@tecnova/shared/schemas';
+import { and, asc, desc, eq, inArray, isNull, like } from 'drizzle-orm';
 import type { DrizzleD1Database } from 'drizzle-orm/d1';
 
 type Db = DrizzleD1Database<typeof schema>;
@@ -424,6 +424,26 @@ export const fetchParticipantProfile = async (
   };
 };
 
+// マニュアル入力画面のニックネーム検索。QR が読めない場面で使うので
+// 件数は実用上の上限（同名複数 + タイポ救済）として 50 件に制限する。
+export const searchActiveParticipantsByNickname = async (
+  db: Db,
+  query: string,
+  limit = 50,
+): Promise<ParticipantSearchItem[]> => {
+  const rows = await db
+    .select({
+      id: participants.id,
+      nickname: participants.nickname,
+      grade: participants.grade,
+    })
+    .from(participants)
+    .where(and(eq(participants.active, true), like(participants.nickname, `%${query}%`)))
+    .orderBy(asc(participants.nickname), asc(participants.id))
+    .limit(limit);
+  return rows;
+};
+
 export const fetchReceptionHistoryToday = async (db: Db): Promise<TodaySessionsResponse> => {
   const [event] = await db
     .select({ id: events.id, date: events.date })

apps/api/src/lib/drive-folder.ts

@@ -0,0 +1,66 @@
+export interface DriveFolderWebhookConfig {
+  url: string;
+  secret: string;
+}
+
+export interface ParticipantDriveFolderResult {
+  folderId: string;
+  folderName: string;
+  reused: boolean;
+}
+
+interface CreateParticipantDriveFolderInput extends DriveFolderWebhookConfig {
+  participantId: string;
+  nickname: string;
+}
+
+const isRecord = (value: unknown): value is Record<string, unknown> =>
+  typeof value === 'object' && value !== null;
+
+const readJsonResponse = async (resp: Response): Promise<unknown> => {
+  const text = await resp.text();
+  if (!text) return null;
+
+  try {
+    return JSON.parse(text);
+  } catch {
+    throw new Error(`GAS Drive webhook returned non-JSON (${resp.status}): ${text.slice(0, 500)}`);
+  }
+};
+
+export const createParticipantDriveFolder = async ({
+  url,
+  secret,
+  participantId,
+  nickname,
+}: CreateParticipantDriveFolderInput): Promise<ParticipantDriveFolderResult> => {
+  const resp = await fetch(url, {
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json' },
+    body: JSON.stringify({ secret, participantId, nickname }),
+  });
+
+  const data = await readJsonResponse(resp);
+
+  if (!resp.ok) {
+    throw new Error(`GAS Drive webhook failed with HTTP ${resp.status}: ${JSON.stringify(data)}`);
+  }
+
+  if (!isRecord(data) || data.ok !== true) {
+    const message = isRecord(data)
+      ? (data.error ?? data.message ?? JSON.stringify(data))
+      : JSON.stringify(data);
+    throw new Error(`GAS Drive webhook rejected request: ${String(message)}`);
+  }
+
+  if (typeof data.folderId !== 'string') {
+    throw new Error(`GAS Drive webhook returned invalid payload: ${JSON.stringify(data)}`);
+  }
+
+  return {
+    folderId: data.folderId,
+    folderName:
+      typeof data.folderName === 'string' ? data.folderName : `${participantId}_${nickname}`,
+    reused: data.reused === true,
+  };
+};