10/30 postman 테스트중 reservation 만 남았음 이후 proto 전체적으로 수정할 예정

Author: max312444

grpc_service/service/reservation_service.rb

@@ -1,11 +1,9 @@
-# grpc_service/service/reservation_service.rb
 # frozen_string_literal: true
 
 require 'reservation/reservation_pb'
 require 'reservation/service_pb'
 require 'reservation/service_services_pb'
 
-# gRPC 실행 환경에서는 Rails autoload가 적용되지 않으므로 직접 경로 지정
 require_relative '../../app/models/concerns/current'
 require_relative '../../app/models/concerns/simulated_user_roles'
 
@@ -15,17 +13,11 @@ module Reservation
       module V1
         class ReservationServiceHandler < Bannote::Studyroomservice::Reservation::V1::ReservationService::Service
 
-          # 예약 생성
+          # =========================================
+          # 1. 예약 생성
+          # =========================================
           def create_reservation(request, _call)
-            unless SimulatedUserRoles.has_authority?(
-              Current.user_id,
-              SimulatedUserRoles::AUTHORITY_LEVELS["student"]
-            )
-              _call.abort(
-                GRPC::Core::StatusCodes::PERMISSION_DENIED,
-                details: "Permission denied: Requires Student authority or higher to create a reservation."
-              )
-            end
+            authorize!("student")
 
             reservation = ::Reservation.new(
               room_id: request.room_id,
@@ -35,53 +27,36 @@ def create_reservation(request, _call)
               end_time: request.end_time.to_time,
               purpose: request.purpose,
               priority: request.priority,
-              created_by: Current.user_id # 임시값, 인증 시스템 연동 필요
+              created_by: Current.user_id
             )
 
-            if reservation.save
-              Bannote::Studyroomservice::Reservation::V1::CreateReservationResponse.new(
-                reservation: reservation_to_proto(reservation)
-              )
-            else
-              _call.abort(
-                GRPC::Core::StatusCodes::INVALID_ARGUMENT,
-                details: reservation.errors.full_messages.join(", ")
-              )
-            end
+            reservation.save!
+            Bannote::Studyroomservice::Reservation::V1::CreateReservationResponse.new(
+              reservation: reservation_to_proto(reservation)
+            )
+          rescue ActiveRecord::RecordInvalid => e
+            raise GRPC::BadStatus.new(GRPC::Core::StatusCodes::INVALID_ARGUMENT, e.message)
           end
 
-          # 예약 조회
+          # =========================================
+          # 2. 예약 조회
+          # =========================================
           def get_reservation(request, _call)
-            unless SimulatedUserRoles.has_authority?(
-              Current.user_id,
-              SimulatedUserRoles::AUTHORITY_LEVELS["student"]
-            )
-              _call.abort(
-                GRPC::Core::StatusCodes::PERMISSION_DENIED,
-                details: "Permission denied: Requires Student authority or higher to view a reservation."
-              )
-            end
+            authorize!("student")
 
             reservation = ::Reservation.find_by!(code: request.code)
-
             Bannote::Studyroomservice::Reservation::V1::GetReservationResponse.new(
               reservation: reservation_to_proto(reservation)
             )
           rescue ActiveRecord::RecordNotFound
-            _call.abort(GRPC::Core::StatusCodes::NOT_FOUND, details: "Reservation not found")
+            raise GRPC::BadStatus.new(GRPC::Core::StatusCodes::NOT_FOUND, "Reservation not found")
           end
 
-          # 예약 목록 조회
+          # =========================================
+          # 3. 예약 목록 조회
+          # =========================================
           def list_reservations(request, _call)
-            unless SimulatedUserRoles.has_authority?(
-              Current.user_id,
-              SimulatedUserRoles::AUTHORITY_LEVELS["student"]
-            )
-              _call.abort(
-                GRPC::Core::StatusCodes::PERMISSION_DENIED,
-                details: "Permission denied: Requires Student authority or higher to list reservations."
-              )
-            end
+            authorize!("student")
 
             reservations = ::Reservation.all
             reservations = reservations.where(room_id: request.room_id) if request.room_id.present?
@@ -94,20 +69,17 @@ def list_reservations(request, _call)
             )
           end
 
-          # 예약 수정
+          # =========================================
+          # 4. 예약 수정
+          # =========================================
           def update_reservation(request, _call)
             reservation = ::Reservation.find_by!(code: request.code)
             user_authority_level = SimulatedUserRoles.get_authority_level(Current.user_id)
 
-            if user_authority_level >= SimulatedUserRoles::AUTHORITY_LEVELS["assistant"]
-              # Assistant or higher can update any reservation
-            elsif user_authority_level >= SimulatedUserRoles::AUTHORITY_LEVELS["student"] &&
-                  reservation.created_by == Current.user_id
-              # Student 이상이면 자신이 만든 예약 수정 가능
-            else
-              _call.abort(
+            unless can_modify?(reservation, user_authority_level)
+              raise GRPC::BadStatus.new(
                 GRPC::Core::StatusCodes::PERMISSION_DENIED,
-                details: "Permission denied: Insufficient authority to update this reservation."
+                "Permission denied: Insufficient authority to update this reservation."
               )
             end
 
@@ -119,46 +91,66 @@ def update_reservation(request, _call)
               end_time: request.end_time.to_time,
               purpose: request.purpose,
               priority: request.priority,
-              updated_by: Current.user_id # 임시값, 인증 시스템 연동 필요
+              updated_by: Current.user_id
             )
 
             Bannote::Studyroomservice::Reservation::V1::UpdateReservationResponse.new(
               reservation: reservation_to_proto(reservation)
             )
-
           rescue ActiveRecord::RecordNotFound
-            _call.abort(GRPC::Core::StatusCodes::NOT_FOUND, details: "Reservation not found")
+            raise GRPC::BadStatus.new(GRPC::Core::StatusCodes::NOT_FOUND, "Reservation not found")
           rescue ActiveRecord::RecordInvalid => e
-            _call.abort(GRPC::Core::StatusCodes::INVALID_ARGUMENT, details: e.message)
+            raise GRPC::BadStatus.new(GRPC::Core::StatusCodes::INVALID_ARGUMENT, e.message)
           end
 
-          # 예약 삭제
+          # =========================================
+          # 5. 예약 삭제
+          # =========================================
           def delete_reservation(request, _call)
             reservation = ::Reservation.find_by!(code: request.code)
             user_authority_level = SimulatedUserRoles.get_authority_level(Current.user_id)
 
-            if user_authority_level >= SimulatedUserRoles::AUTHORITY_LEVELS["assistant"]
-              # Assistant 이상이면 모두 삭제 가능
-            elsif user_authority_level >= SimulatedUserRoles::AUTHORITY_LEVELS["student"] &&
-                  reservation.created_by == Current.user_id
-              # Student 이상이면 자신이 만든 예약 삭제 가능
-            else
-              _call.abort(
+            unless can_modify?(reservation, user_authority_level)
+              raise GRPC::BadStatus.new(
                 GRPC::Core::StatusCodes::PERMISSION_DENIED,
-                details: "Permission denied: Insufficient authority to delete this reservation."
+                "Permission denied: Insufficient authority to delete this reservation."
               )
             end
 
-            reservation.soft_delete(deleted_by: Current.user_id)
+            reservation.update!(deleted_at: Time.now, deleted_by: Current.user_id)
 
             Bannote::Studyroomservice::Reservation::V1::DeleteReservationResponse.new(success: true)
-
           rescue ActiveRecord::RecordNotFound
-            _call.abort(GRPC::Core::StatusCodes::NOT_FOUND, details: "Reservation not found")
+            raise GRPC::BadStatus.new(GRPC::Core::StatusCodes::NOT_FOUND, "Reservation not found")
           end
 
+          # =========================================
+          # 공통 메서드
+          # =========================================
           private
 
+          # 권한 검증 단축 메서드
+          def authorize!(min_role)
+            unless SimulatedUserRoles.has_authority?(
+              Current.user_id,
+              SimulatedUserRoles::AUTHORITY_LEVELS[min_role]
+            )
+              raise GRPC::BadStatus.new(
+                GRPC::Core::StatusCodes::PERMISSION_DENIED,
+                "Permission denied: Requires #{min_role.capitalize} authority or higher."
+              )
+            end
+          end
+
+          # 수정 / 삭제 가능 여부 판정
+          def can_modify?(reservation, user_level)
+            return true if user_level >= SimulatedUserRoles::AUTHORITY_LEVELS["assistant"]
+            return true if user_level >= SimulatedUserRoles::AUTHORITY_LEVELS["student"] &&
+                           reservation.created_by == Current.user_id
+            false
+          end
+
+          # Reservation → Proto 변환
           def reservation_to_proto(reservation)
             Bannote::Studyroomservice::Reservation::V1::Reservation.new(
               id: reservation.id,
@@ -172,7 +164,8 @@ def reservation_to_proto(reservation)
               priority: reservation.priority,
               created_at: Google::Protobuf::Timestamp.new(seconds: reservation.created_at.to_i),
               updated_at: Google::Protobuf::Timestamp.new(seconds: reservation.updated_at.to_i),
-              deleted_at: reservation.deleted_at ? Google::Protobuf::Timestamp.new(seconds: reservation.deleted_at.to_i) : nil
+              deleted_at: reservation.deleted_at ? Google::Protobuf::Timestamp.new(seconds: reservation.deleted_at.to_i) : nil,
+              created_by: reservation.created_by
             )
           end
         end