Merge branch 'fix/room-exception-update' into dev

Author: max312444

Dockerfile

@@ -1,7 +1,7 @@
 FROM ruby:3.2
 
-WORKDIR /rails
-COPY . /rails
+WORKDIR /studyroom_service
+COPY . /studyroom_service
 
 RUN apt-get update -qq && apt-get install -y build-essential libpq-dev nodejs default-mysql-client wget
 RUN gem install bundler rails

Gemfile

@@ -5,6 +5,7 @@ source "https://rubygems.org"
 # ======================================
 gem "rails", "~> 8.0.3"
 gem "bootsnap", require: false
+gem "puma", "~> 6.4"
 
 # ======================================
 # [Database]
@@ -21,8 +22,8 @@ gem "grpc-tools", require: false
 # ======================================
 # [Utility]
 # ======================================
-gem "tzinfo-data"                    # (윈도우 개발 시만 필요)
-gem "dotenv-rails"                   # 환경변수 관리용
+gem "tzinfo-data"
+gem "dotenv-rails"
 
 # ======================================
 # [Development & Test]

Gemfile.lock

@@ -147,6 +147,8 @@ GEM
     psych (5.2.6)
       date
       stringio
+    puma (6.6.1)
+      nio4r (~> 2.0)
     racc (1.8.1)
     rack (3.2.2)
     rack-session (2.1.1)
@@ -222,6 +224,7 @@ DEPENDENCIES
   grpc (~> 1.57)
   grpc-tools
   mysql2 (~> 0.5)
+  puma (~> 6.4)
   rails (~> 8.0.3)
   tzinfo-data
 

app/grpc/room/room_pb.rb

@@ -12,9 +12,6 @@ class AuthInterceptor < GRPC::ServerInterceptor
     "Unauthenticated: x-user-code metadata is missing"
   )
 
-  # ------------------------------------------------------------
-  # gRPC 요청 처리 (interceptor entry point)
-  # ------------------------------------------------------------
   def request_response(request:, call:, method:)
     # ============================================================
     # 1. HealthCheck 계열 요청은 인증 예외 처리
@@ -25,10 +22,10 @@ def request_response(request:, call:, method:)
     end
 
     # ============================================================
-    # 2. 일반 요청은 메타데이터 기반 인증 수행
+    # 2. 인증 수행
     # ============================================================
     user_code = call.metadata['x-user-code']
-    user_role = call.metadata['x-user-role']
+    user_role = call.metadata['x-user-role'] || "student"  # 기본 student
 
     if user_code.nil? || user_code.empty?
       raise UNAUTHENTICATED
@@ -40,8 +37,9 @@ def request_response(request:, call:, method:)
 
     puts "[AuthInterceptor] user_code=#{user_code}, user_role=#{user_role}"
 
-    # 실제 gRPC 서비스 로직 실행
+    # 실제 서비스 로직 실행
     yield
+
   ensure
     # ============================================================
     # 3. 요청 완료 후 Context 정리

app/interceptors/auth_interceptor.rb

@@ -1,12 +1,11 @@
-# frozen_string_literal: true 
-# 유저 서비스 측으로 MetaData 수정 완료
+# frozen_string_literal: true
 
 module Current
   thread_mattr_accessor :user_code
   thread_mattr_accessor :user_role
 
   def self.reset
     self.user_code = nil
-    self.user_role = nil
+    self.user_role = "student" # 기본 권한
   end
 end

app/models/concerns/current.rb

@@ -0,0 +1,3 @@
+class Department < ApplicationRecord
+  has_many :rooms
+end

app/models/department.rb

@@ -18,6 +18,7 @@ class Reservation < ApplicationRecord
   validates :priority, presence: true
   validates :start_time, presence: true
   validates :end_time, presence: true
+
   validate  :start_time_before_end_time
 
   # ========================================
@@ -29,7 +30,10 @@ class Reservation < ApplicationRecord
   # Soft delete method
   # ========================================
   def soft_delete(deleted_by: nil)
-    update(deleted_at: Time.current)
+    update(
+      deleted_at: Time.current,
+      deleted_by: deleted_by
+    )
   end
 
   def self.with_deleted
@@ -49,7 +53,8 @@ def set_defaults
   # Auto-generate code BEFORE validation
   # ========================================
   def generate_code
-    self.code ||= SecureRandom.uuid[0..7]
+    # UUID 앞 12자리 사용 (충돌 위험 감소)
+    self.code ||= SecureRandom.uuid.delete('-')[0..11]
   end
 
   # ========================================

app/models/reservation.rb

@@ -1,47 +1,50 @@
 class Room < ApplicationRecord
-  # 연관 관계
+  # --------------------------------------
+  # 연관 관계 (department_id 제거)
+  # --------------------------------------
+  # belongs_to :department  ← 삭제해야 함 (이제 department 테이블이 없기 때문)
+  # 현재 구조에서는 department_id 컬럼 자체가 없으므로 belongs_to 제거
+  # 필요하면 department_code 로 UserService 연동만 사용
+
   has_many :room_operating_hours, dependent: :destroy
   has_many :room_exceptions, dependent: :destroy
   has_many :reservations
 
-  # -------------------------------
+  # --------------------------------------
   # 필수값 검증
-  # -------------------------------
+  # --------------------------------------
   validates :name, presence: true, length: { maximum: 100 }
-  validates :maximum_member, presence: true,
-                             numericality: { only_integer: true, greater_than_or_equal_to: 1 }
 
-  # room_type이 enum이라면 자동 처리 
-  # enum room_type: { study_room: 0, lecture_room: 1, lab: 2 }, _prefix: :type
-  #
-  # enum 타입이라면 다음 validation은 안 넣어도 되는데
-  # enum이 아니라면 아래처럼 강제해야 함:
-  # validates :room_type, inclusion: { in: ["study", "lecture", "lab"] }
+  validates :maximum_member,
+            presence: true,
+            numericality: { only_integer: true, greater_than_or_equal_to: 1 }
 
-  # -------------------------------
-  # 이름 중복 검증
-  # 1) department_id가 같은 방끼리는 같은 name 금지
-  # 2) department_id가 nil(공용 방)일 경우, 전체에서 name 중복 금지
-  # -------------------------------
-  validate :unique_name_within_department
+  # --------------------------------------
+  # 이름 중복 검증 (department_code 기반)
+  # --------------------------------------
+  validate :unique_name_within_department_code
 
-  def unique_name_within_department
-    if department_id.present?
-      # 같은 학과 내 중복 name 금지
-      if Room.where(department_id: department_id, name: name).where.not(id: id).exists?
+  def unique_name_within_department_code
+    if department_code.present?
+      # 같은 학과(department_code) 내 동일 이름 금지
+      if Room.where(department_code: department_code, name: name)
+             .where.not(id: id)
+             .exists?
         errors.add(:name, "해당 학과에 동일한 이름의 방이 이미 존재합니다.")
       end
     else
-      # 공용 방은 전체에서 name 중복 금지
-      if Room.where(department_id: nil, name: name).where.not(id: id).exists?
+      # 공용방(nil) → 전체에서 중복 금지
+      if Room.where(department_code: nil, name: name)
+             .where.not(id: id)
+             .exists?
         errors.add(:name, "공용 방 이름은 전체에서 중복될 수 없습니다.")
       end
     end
   end
 
-  # -------------------------------
-  # 삭제된 방 수정 금지
-  # -------------------------------
+  # --------------------------------------
+  # 삭제된 방이면 수정 금지
+  # --------------------------------------
   before_update :prevent_update_if_deleted
 
   def prevent_update_if_deleted

app/models/room.rb

@@ -1,8 +1,6 @@
 class RoomException < ApplicationRecord
-  # Room 모델과 다대일 관계를 가집니다.
   belongs_to :room
 
-  # Callbacks
   after_save :cancel_conflicting_reservations
 
   # 기본 유효성 검사
@@ -15,7 +13,7 @@ class RoomException < ApplicationRecord
   validate :validate_time_order
   validate :validate_duplicate_date
 
-  # 소프트 삭제 (Soft Delete)
+  # Soft Delete
   default_scope { where(deleted_at: nil) }
 
   def soft_delete
@@ -32,68 +30,75 @@ def self.with_deleted
   # 1) 전체 휴일 vs 부분 휴일 규칙
   # ----------------------------------------
   def validate_time_rule
-    # 전체 휴일 (both nil) → OK
     return if opening_time.nil? && closing_time.nil?
 
-    # 부분 휴일 → 둘 다 있어야 함
     if opening_time.present? ^ closing_time.present?
       errors.add(:base, "Both opening_time and closing_time must be present for partial holiday")
     end
   end
 
   # ----------------------------------------
-  # 2) 시간 순서 검증
+  # 2) 시간 순서 검증 (Time.parse 적용)
   # ----------------------------------------
   def validate_time_order
     return if opening_time.blank? || closing_time.blank?
 
-    if opening_time >= closing_time
-      errors.add(:opening_time, "must be earlier than closing_time")
+    begin
+      ot = Time.parse(opening_time)
+      ct = Time.parse(closing_time)
+
+      errors.add(:opening_time, "must be earlier than closing_time") if ot >= ct
+    rescue ArgumentError
+      errors.add(:base, "Invalid time format (expected HH:MM)")
     end
   end
 
   # ----------------------------------------
-  # 3) 동일 날짜 중복 방지 (soft-delete 제외)
+  # 3) 동일 날짜 중복 방지
   # ----------------------------------------
   def validate_duplicate_date
     return if room_id.blank? || holiday_date.blank?
 
-    duplicate = RoomException.with_deleted
-                             .where(room_id: room_id, holiday_date: holiday_date, deleted_at: nil)
-                             .where.not(id: id)
-                             .exists?
+    duplicate = RoomException
+                  .where(room_id: room_id, holiday_date: holiday_date, deleted_at: nil)
+                  .where.not(id: id)
+                  .exists?
 
     if duplicate
       errors.add(:holiday_date, "exception already exists for this date")
     end
   end
 
   # ----------------------------------------
-  # 기존 예약 자동 취소 로직 (그대로 유지)
+  # 기존 예약 자동 취소 로직 (시간 비교 개선)
   # ----------------------------------------
   def cancel_conflicting_reservations
     reservations_on_date = Reservation.where(
       room_id: room_id,
       start_time: holiday_date.all_day
     )
 
-    # Case 1: 완전 휴무일
+    # Case 1: 완전 휴무일 → 모두 삭제
     if opening_time.nil? && closing_time.nil?
       reservations_on_date.find_each { |reservation| reservation.soft_delete(deleted_by: 0) }
       return
     end
 
-    # Case 2: 부분 휴무
+    # Case 2: 부분 휴무일
     if opening_time.present? && closing_time.present?
-      exception_opening_time_str = opening_time.strftime('%H:%M')
-      exception_closing_time_str = closing_time.strftime('%H:%M')
+      begin
+        ex_start = Time.parse(opening_time)
+        ex_end   = Time.parse(closing_time)
+      rescue ArgumentError
+        return
+      end
 
       reservations_on_date.find_each do |reservation|
-        start_time_str = reservation.start_time.strftime('%H:%M')
-        end_time_str = reservation.end_time.strftime('%H:%M')
+        r_start = reservation.start_time
+        r_end   = reservation.end_time
 
-        unless start_time_str >= exception_opening_time_str &&
-               end_time_str <= exception_closing_time_str
+        # 예외 시간 외에 걸치면 삭제
+        unless (r_start >= ex_start && r_end <= ex_end)
           reservation.soft_delete(deleted_by: 0)
         end
       end