@@ -21,15 +21,17 @@ def create_reservation(request, _call)
2121
2222 authorize! ( "student" )
2323
24+ start_time = request . start_time &.seconds ? Time . at ( request . start_time . seconds ) : nil
25+ end_time = request . end_time &.seconds ? Time . at ( request . end_time . seconds ) : nil
26+
2427 reservation = ::Reservation . new (
2528 room_id : request . room_id ,
2629 group_id : request . group_id ,
2730 link_id : request . link_id ,
28- start_time : request . start_time ? Time . at ( request . start_time . seconds ) : nil ,
29- end_time : request . end_time ? Time . at ( request . end_time . seconds ) : nil ,
31+ start_time : start_time ,
32+ end_time : end_time ,
3033 purpose : request . purpose ,
31- priority : request . priority ,
32- created_by : Current . user_id || "user_admin"
34+ priority : request . priority
3335 )
3436
3537 reservation . save!
@@ -92,8 +94,7 @@ def update_reservation(request, _call)
9294 start_time : request . start_time ? Time . at ( request . start_time . seconds ) : nil ,
9395 end_time : request . end_time ? Time . at ( request . end_time . seconds ) : nil ,
9496 purpose : request . purpose ,
95- priority : request . priority ,
96- updated_by : Current . user_id
97+ priority : request . priority
9798 )
9899
99100 Bannote ::Studyroomservice ::Reservation ::V1 ::UpdateReservationResponse . new (
@@ -119,7 +120,7 @@ def delete_reservation(request, _call)
119120 )
120121 end
121122
122- reservation . update! ( deleted_at : Time . now , deleted_by : Current . user_id )
123+ reservation . update! ( deleted_at : Time . now )
123124
124125 Bannote ::Studyroomservice ::Reservation ::V1 ::DeleteReservationResponse . new ( success : true )
125126 rescue ActiveRecord ::RecordNotFound
@@ -131,7 +132,6 @@ def delete_reservation(request, _call)
131132 # =========================================
132133 private
133134
134- # 권한 검증 단축 메서드
135135 def authorize! ( min_role )
136136 unless SimulatedUserRoles . has_authority? (
137137 Current . user_id ,
@@ -144,15 +144,11 @@ def authorize!(min_role)
144144 end
145145 end
146146
147- # 수정 / 삭제 가능 여부 판정
148147 def can_modify? ( reservation , user_level )
149148 return true if user_level >= SimulatedUserRoles ::AUTHORITY_LEVELS [ "assistant" ]
150- return true if user_level >= SimulatedUserRoles ::AUTHORITY_LEVELS [ "student" ] &&
151- reservation . created_by == Current . user_id
152149 false
153150 end
154151
155- # Reservation → Proto 변환
156152 def reservation_to_proto ( reservation )
157153 Bannote ::Studyroomservice ::Reservation ::V1 ::Reservation . new (
158154 id : reservation . id ,
@@ -166,8 +162,7 @@ def reservation_to_proto(reservation)
166162 priority : reservation . priority ,
167163 created_at : Google ::Protobuf ::Timestamp . new ( seconds : reservation . created_at . to_i ) ,
168164 updated_at : Google ::Protobuf ::Timestamp . new ( seconds : reservation . updated_at . to_i ) ,
169- deleted_at : reservation . deleted_at ? Google ::Protobuf ::Timestamp . new ( seconds : reservation . deleted_at . to_i ) : nil ,
170- created_by : reservation . created_by
165+ deleted_at : reservation . deleted_at ? Google ::Protobuf ::Timestamp . new ( seconds : reservation . deleted_at . to_i ) : nil
171166 )
172167 end
173168 end
0 commit comments