feat: 식당 110+ / 메뉴 1100+ 등록 + 지도·메뉴 UI 개편 + 관리자 강화

.github/workflows/ci.yml

@@ -19,7 +19,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  PNPM_VERSION: 10
+  # pnpm 버전은 package.json 의 packageManager 필드 참고 (action-setup 이 읽음)
   NODE_VERSION: 20
 
 jobs:
@@ -36,9 +36,8 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      # pnpm 버전은 package.json 의 packageManager 필드에서 자동 추출
       - uses: pnpm/action-setup@v4
-        with:
-          version: ${{ env.PNPM_VERSION }}
 
       - uses: actions/setup-node@v4
         with:
@@ -68,9 +67,8 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      # pnpm 버전은 package.json 의 packageManager 필드에서 자동 추출
       - uses: pnpm/action-setup@v4
-        with:
-          version: ${{ env.PNPM_VERSION }}
 
       - uses: actions/setup-node@v4
         with:

.gitignore

@@ -55,3 +55,12 @@ apps/web/playwright/.cache/
 .cache/
 tmp/
 temp/
+
+# 메뉴판 OCR 원본 (대용량 로컬 참조 자료)
+docs/메뉴판 사진/
+docs/메뉴판 사진 정문/
+docs/기술과 경영_메뉴판 정리.xlsx
+
+# Python bytecode
+__pycache__/
+*.pyc

apps/api/prisma/migrations/20260511000000_add_free_major_college/migration.sql

@@ -0,0 +1,2 @@
+-- AlterEnum
+ALTER TYPE "College" ADD VALUE 'FREE_MAJOR';

apps/api/prisma/migrations/20260511112007_add_restaurant_cover_image/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "Restaurant" ADD COLUMN     "coverImageUrl" TEXT;

apps/api/prisma/migrations/20260512020741_add_menu_category_and_price_options/migration.sql

@@ -0,0 +1,6 @@
+-- AlterTable
+ALTER TABLE "Menu" ADD COLUMN     "category" TEXT,
+ADD COLUMN     "priceOptions" JSONB;
+
+-- CreateIndex
+CREATE INDEX "Menu_restaurantId_category_idx" ON "Menu"("restaurantId", "category");

apps/api/prisma/migrations/20260512023542_add_external_menu_url/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "Restaurant" ADD COLUMN     "externalMenuUrl" TEXT;

apps/api/prisma/schema.prisma

@@ -41,6 +41,7 @@ enum College {
   ELECTRONICS_INFO
   HUMANITIES_SOCIAL
   POLICY_LAW
+  FREE_MAJOR
 }
 
 enum NoticeCategory {
@@ -59,6 +60,8 @@ model Restaurant {
   phone                String?
   businessHours        Json
   isPartner            Boolean                 @default(false)
+  coverImageUrl        String?
+  externalMenuUrl      String?
   createdAt            DateTime                @default(now())
   updatedAt            DateTime                @updatedAt
   menus                Menu[]
@@ -85,20 +88,25 @@ model RestaurantPartnership {
   @@index([college])
 }
 
+/// 사이즈/옵션별 가격 표현 시 Menu.priceOptions 에 [{"label":"소","price":30000},...] 저장.
+/// Menu.category 는 메뉴 카테고리 라벨 (예: "커피", "찌개류"). 없으면 "기타" 그룹으로 처리.
 model Menu {
-  id           String      @id @default(cuid())
-  restaurantId String
-  name         String
-  price        Int
-  imageUrl     String?
-  isSignature  Boolean     @default(false)
-  createdAt    DateTime    @default(now())
-  updatedAt    DateTime    @updatedAt
-  restaurant   Restaurant  @relation(fields: [restaurantId], references: [id], onDelete: Cascade)
-  reports      Report[]
+  id            String      @id @default(cuid())
+  restaurantId  String
+  name          String
+  price         Int
+  priceOptions  Json?
+  category      String?
+  imageUrl      String?
+  isSignature   Boolean     @default(false)
+  createdAt     DateTime    @default(now())
+  updatedAt     DateTime    @updatedAt
+  restaurant    Restaurant  @relation(fields: [restaurantId], references: [id], onDelete: Cascade)
+  reports       Report[]
 
   @@index([restaurantId])
   @@index([restaurantId, isSignature])
+  @@index([restaurantId, category])
 }
 
 model Category {

apps/api/src/common/utils/business-hours.util.ts

@@ -4,26 +4,115 @@ interface DayHours {
   open?: string;
   close?: string;
   closed?: boolean;
+  breakStart?: string;
+  breakEnd?: string;
 }
 
 type BusinessHoursMap = Partial<Record<DayKey, DayHours>>;
 
 const DAY_KEYS: DayKey[] = ['sun', 'mon', 'tue', 'wed', 'thu', 'fri', 'sat'];
 
+function kstNow(): Date {
+  // UTC 메서드 호출 시 KST 값이 나오도록 +9h 시프트
+  return new Date(Date.now() + 9 * 60 * 60 * 1000);
+}
+
+function timeStr(d: Date): string {
+  const hh = String(d.getUTCHours()).padStart(2, '0');
+  const mm = String(d.getUTCMinutes()).padStart(2, '0');
+  return `${hh}:${mm}`;
+}
+
+/**
+ * 영업 중 여부 판정.
+ *
+ * 지원하는 형태:
+ * - 일반: open ≤ now ≤ close
+ * - 자정 넘김: close < open (예: 14:30 ~ 02:30) — 자정 이후 시간은 0X 시로 표기
+ *   · 어제의 close 가 오늘 새벽이면 그 구간도 영업중으로 인정
+ * - 브레이크: breakStart ≤ now < breakEnd 구간은 영업 중에 있어도 false
+ */
 export function isRestaurantOpen(businessHours: unknown): boolean {
   if (!businessHours || typeof businessHours !== 'object') return false;
-
   const hours = businessHours as BusinessHoursMap;
 
-  // KST = UTC+9
-  const now = new Date(Date.now() + 9 * 60 * 60 * 1000);
-  const dayKey = DAY_KEYS[now.getUTCDay()];
-  const hh = String(now.getUTCHours()).padStart(2, '0');
-  const mm = String(now.getUTCMinutes()).padStart(2, '0');
-  const currentTime = `${hh}:${mm}`;
+  const now = kstNow();
+  const todayIdx = now.getUTCDay();
+  const yesterdayIdx = (todayIdx + 6) % 7;
+  const t = timeStr(now);
+
+  // 어제 영업이 자정 넘어 오늘 새벽까지 이어진 경우
+  const yesterday = hours[DAY_KEYS[yesterdayIdx]];
+  if (
+    yesterday &&
+    !yesterday.closed &&
+    yesterday.open &&
+    yesterday.close &&
+    yesterday.close < yesterday.open && // 자정 넘김
+    t <= yesterday.close
+  ) {
+    return true;
+  }
 
-  const today = hours[dayKey];
+  // 오늘 영업
+  const today = hours[DAY_KEYS[todayIdx]];
   if (!today || today.closed || !today.open || !today.close) return false;
 
-  return currentTime >= today.open && currentTime <= today.close;
+  // 오늘 영업 시간 내인지 (일반 vs 자정 넘김 분기)
+  const inHours =
+    today.close < today.open
+      ? t >= today.open // 오늘 open ~ 23:59 까지 영업중 (자정 이후는 위 yesterday 분기로 처리)
+      : t >= today.open && t <= today.close;
+
+  if (!inHours) return false;
+
+  // 브레이크 중이면 영업 중이 아님
+  if (today.breakStart && today.breakEnd) {
+    if (t >= today.breakStart && t < today.breakEnd) return false;
+  }
+
+  return true;
+}
+
+/**
+ * 다음 영업 시작 시각을 ISO datetime (UTC) 으로 반환.
+ * 마감 상태 / 휴무일 / 브레이크 중일 때의 "다음 열림 시각" 을 계산.
+ * 7일 안에 영업 시작이 없으면 null.
+ */
+export function getNextOpenAt(businessHours: unknown): string | null {
+  if (!businessHours || typeof businessHours !== 'object') return null;
+  const hours = businessHours as BusinessHoursMap;
+
+  const nowKst = kstNow();
+  const nowT = timeStr(nowKst);
+
+  for (let dayOffset = 0; dayOffset < 7; dayOffset++) {
+    const candidate = new Date(nowKst);
+    candidate.setUTCDate(candidate.getUTCDate() + dayOffset);
+
+    const dayKey = DAY_KEYS[candidate.getUTCDay()];
+    const day = hours[dayKey];
+    if (!day || day.closed || !day.open) continue;
+
+    // 후보 시각 목록: open 시작 / 브레이크 종료
+    const candidateTimes: string[] = [day.open];
+    if (day.breakStart && day.breakEnd) candidateTimes.push(day.breakEnd);
+
+    for (const targetT of candidateTimes.sort()) {
+      // 오늘이면 미래 시각만 허용
+      if (dayOffset === 0 && targetT <= nowT) continue;
+
+      const [hh, mm] = targetT.split(':').map(Number);
+      if (Number.isNaN(hh) || Number.isNaN(mm)) continue;
+
+      const next = new Date(candidate);
+      next.setUTCHours(hh, mm, 0, 0);
+
+      // KST 표현을 실제 UTC 로 변환 (-9h)
+      const actualUtc = new Date(next.getTime() - 9 * 60 * 60 * 1000);
+      return actualUtc.toISOString();
+    }
+  }
+
+  return null;
 }

apps/api/src/main.ts

@@ -8,8 +8,12 @@ import { HttpExceptionFilter } from './common/filters/http-exception.filter';
 async function bootstrap() {
   const app = await NestFactory.create(AppModule);
 
+  // CORS_ORIGIN 은 콤마로 여러 origin 지원 (예: "http://localhost:3000,http://192.168.0.10:3000")
   app.enableCors({
-    origin: process.env.CORS_ORIGIN || 'http://localhost:3000',
+    origin: (process.env.CORS_ORIGIN ?? 'http://localhost:3000')
+      .split(',')
+      .map((s) => s.trim())
+      .filter(Boolean),
     credentials: true,
   });
 

apps/api/src/restaurants/dto/create-restaurant.dto.ts

@@ -70,6 +70,24 @@ export class CreateRestaurantDto {
   @IsBoolean()
   isPartner?: boolean;
 
+  @ApiPropertyOptional({
+    example: 'https://cdn.example.com/cover/abc.jpg',
+    description: '식당 대표 사진 URL (S3 업로드 결과)',
+  })
+  @IsOptional()
+  @IsString()
+  @MaxLength(500)
+  coverImageUrl?: string;
+
+  @ApiPropertyOptional({
+    example: 'https://bondosirak.com/menu',
+    description: '체인점 등 공식 메뉴 페이지 URL',
+  })
+  @IsOptional()
+  @IsString()
+  @MaxLength(500)
+  externalMenuUrl?: string;
+
   @ApiPropertyOptional({
     type: [PartnershipInputDto],
     description: '제휴 단과대학 + Instagram URL 목록 (식당당 단과대학별 1개)',