room_exception의 update 부분도 마찬가지로 범위 검색 으로 변경

Author: max312444

grpc_service/service/room_exception_service.rb

@@ -25,18 +25,27 @@ class RoomExceptionServiceHandler < RoomExceptionService::Service
           def get_room_exceptions(request, _call)
             authorize!("student")
 
-            # 기준 날짜 파싱
-            from_date = 
-              if request.from_date.present?
-                Date.parse(request.from_date)
-              else
-                Date.today # 기본 검색 기준은 현 시점으로 
-              end
+            scope = RoomException.where(room_id: request.room_id, deleted_at: nil)
+
+            # from_date, to_date 둘 다 있을 경우
+            if request.from_date.present? && request.to_date.present?
+              start_date = Date.parse(request.from_date)
+              end_date = Date.parse(request.to_date)
+              scope = scope.where(holiday_date: start_date..end_date)
+              
+            # from_date 만 있는 경우
+            elsif request.from_date.present?
+              start_date = Date.parse(request.from_date)
+              scope = scope.where("holiday_date >= ?", start_date)
+
+            # to_date 만 있는 경우
+            elsif request.to_date.present?
+              end_date = Date.parse(request.to_date)
+              scope = scope.where("holiday_date <= ?", end_date)
+            end
 
-            exceptions = ::RoomException
-                           .where(room_id: request.room_id, deleted_at: nil)
-                           .where("holiday_date >= ?", from_date)
-                           .order(:holiday_date)
+
+            exceptions = scope.order(:holiday_date)
 
             response_items = exceptions.map { |ex| room_exception_to_proto(ex) }
 
@@ -45,7 +54,6 @@ def get_room_exceptions(request, _call)
             )
           end
 
-
           # =========================================
           # 2) 리스트 기반 업데이트
           # =========================================

proto_export/studyroom/room_exception/room_exception.proto

@@ -2,6 +2,7 @@ syntax = "proto3";
 
 package bannote.studyroomservice.roomexception.v1;
 
+import "google/protobuf/empty.proto";
 import "google/protobuf/timestamp.proto";
 
 message RoomException {
@@ -27,14 +28,20 @@ message GetRoomExceptionsResponse {
 }
 
 message RoomExceptionUpdateItem {
-  int64 id = 1;
-  string holiday_date = 2;
-  string reason = 3;
-  string opening_time = 4;
-  string closing_time = 5;
+  string holiday_date = 1;
+  string reason = 2;
+  string opening_time = 3;
+  string closing_time = 4;
 }
 
 message UpdateRoomExceptionsRequest {
   int64 room_id = 1;
-  repeated RoomExceptionUpdateItem exceptions = 2;
+  string from_date = 2;
+  string to_date = 3;
+  repeated RoomExceptionUpdateItem exceptions = 4;
+}
+
+message UpdateRoomExceptionsResponse {
+  string from_date = 1;
+  string to_date = 2;
 }