Skip to content

Commit 7de6231

Browse files
committed
아직도 reservation 안된다 지금 created_by 등등은 제거하였음
1 parent 70fafa7 commit 7de6231

7 files changed

Lines changed: 20 additions & 27 deletions

File tree

app/controllers/reservations_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,6 @@ def destroy
3838
private
3939

4040
def reservation_params
41-
params.permit(:room_id, :user_id, :start_time, :end_time)
41+
params.permit(:room_id, :user_id, :group_id, :link_id, :start_time, :end_time, :purpose, :priority)
4242
end
4343
end

app/grpc/reservation/reservation_pb.rb

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/models/reservation.rb

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ class Reservation < ApplicationRecord
1717
validates :group_id, presence: true
1818
validates :purpose, presence: true
1919
validates :priority, presence: true
20-
validates :created_by, presence: true
2120
validates :start_time, presence: true
2221
validates :end_time, presence: true
2322
validate :start_time_before_end_time
@@ -30,8 +29,8 @@ class Reservation < ApplicationRecord
3029
# ========================================
3130
# Soft delete method
3231
# ========================================
33-
def soft_delete(deleted_by: nil)
34-
update(deleted_at: Time.current, deleted_by: deleted_by)
32+
def soft_delete
33+
update(deleted_at: Time.current)
3534
end
3635

3736
def self.with_deleted
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
class RemoveAuditColumnsFromReservations < ActiveRecord::Migration[8.0]
2+
def change
3+
remove_column :reservations, :created_by, :bigint
4+
remove_column :reservations, :updated_by, :bigint
5+
remove_column :reservations, :deleted_by, :bigint
6+
end
7+
end

db/schema.rb

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

grpc_service/service/reservation_service.rb

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -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

proto_export/studyroom/reservation/reservation.proto

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,6 @@ message Reservation {
4242
google.protobuf.Timestamp created_at = 11;
4343
google.protobuf.Timestamp updated_at = 12;
4444
google.protobuf.Timestamp deleted_at = 13;
45-
46-
// ✅ 추적용 (user-service 연동 대비)
47-
string created_by = 14;
48-
string updated_by = 15;
49-
string deleted_by = 16;
5045
}
5146

5247
// ===============================================

0 commit comments

Comments
 (0)