Skip to content

Commit

Permalink
Merge pull request #257 from urinaner/feature/233
Browse files Browse the repository at this point in the history
fix : 예약 로직 변경
  • Loading branch information
urinaner authored Jan 12, 2025
2 parents cb1aeb6 + b3aea57 commit aafb48c
Showing 1 changed file with 13 additions and 13 deletions.
26 changes: 13 additions & 13 deletions backend/src/main/resources/data.sql
Original file line number Diff line number Diff line change
Expand Up @@ -304,18 +304,18 @@ VALUES ('22010321', '정석민', '바이오융합공학과', '010-4523-7819', 'U
('22010330', '문준호', '바이오융합공학과', '010-4512-6708', 'USER');


INSERT INTO reservation (start_time, end_time, purpose, etc, room_id, user_id, created_at,
updated_at)
VALUES ('2024-12-01 09:00:00', '2024-12-01 11:00:00', 'MEETING', '홍성무교수님 랩미팅', 1, 1, NOW(), NOW()),
('2024-12-01 13:00:00', '2024-12-01 15:00:00', 'MEETING', '김은희교수님 랩미팅', 1, 2, NOW(), NOW()),
('2024-12-02 10:00:00', '2024-12-02 12:00:00', 'MEETING', '김민수교수님 랩미팅', 1, 1, NOW(), NOW()),
('2024-12-03 14:00:00', '2024-12-03 16:00:00', 'MEETING', '전종훈교수님 랩미팅', 1, 3, NOW(), NOW()),
('2024-12-04 09:30:00', '2024-12-04 11:30:00', 'MEETING', '서민석교수님 랩미팅', 1, 2, NOW(), NOW()),
('2024-12-05 15:00:00', '2024-12-05 17:00:00', 'MEETING', '홍성무교수님 랩미팅', 1, 3, NOW(), NOW()),
('2024-12-06 10:30:00', '2024-12-06 12:30:00', 'MEETING', '김은희교수님 랩미팅', 1, 1, NOW(), NOW()),
('2024-12-07 13:30:00', '2024-12-07 15:30:00', 'MEETING', '김민수교수님 랩미팅', 1, 2, NOW(), NOW()),
('2024-12-08 11:00:00', '2024-12-08 13:00:00', 'MEETING', '전종훈교수님 랩미팅', 1, 1, NOW(), NOW()),
('2024-12-09 16:00:00', '2024-12-09 18:00:00', 'MEETING', '서민석교수님 랩미팅', 1, 4, NOW(), NOW());
INSERT INTO reservation (start_time, end_time, purpose, etc, room_id, user_name, password, created_at, updated_at)
VALUES
('2024-12-01 09:00:00', '2024-12-01 11:00:00', 'MEETING', '홍성무교수님 랩미팅', 1, 'hongsm', 'password123', NOW(), NOW()),
('2024-12-01 13:00:00', '2024-12-01 15:00:00', 'MEETING', '김은희교수님 랩미팅', 1, 'kimeh', 'password123', NOW(), NOW()),
('2024-12-02 10:00:00', '2024-12-02 12:00:00', 'MEETING', '김민수교수님 랩미팅', 1, 'kimms', 'password123', NOW(), NOW()),
('2024-12-03 14:00:00', '2024-12-03 16:00:00', 'MEETING', '전종훈교수님 랩미팅', 1, 'jeonjh', 'password123', NOW(), NOW()),
('2024-12-04 09:30:00', '2024-12-04 11:30:00', 'MEETING', '서민석교수님 랩미팅', 1, 'seoms', 'password123', NOW(), NOW()),
('2024-12-05 15:00:00', '2024-12-05 17:00:00', 'MEETING', '홍성무교수님 랩미팅', 1, 'hongsm', 'password123', NOW(), NOW()),
('2024-12-06 10:30:00', '2024-12-06 12:30:00', 'MEETING', '김은희교수님 랩미팅', 1, 'kimeh', 'password123', NOW(), NOW()),
('2024-12-07 13:30:00', '2024-12-07 15:30:00', 'MEETING', '김민수교수님 랩미팅', 1, 'kimms', 'password123', NOW(), NOW()),
('2024-12-08 11:00:00', '2024-12-08 13:00:00', 'MEETING', '전종훈교수님 랩미팅', 1, 'jeonjh', 'password123', NOW(), NOW()),
('2024-12-09 16:00:00', '2024-12-09 18:00:00', 'MEETING', '서민석교수님 랩미팅', 1, 'seoms', 'password123', NOW(), NOW());

INSERT INTO news (name, content, view, link, image, created_at)
VALUES
Expand Down Expand Up @@ -387,4 +387,4 @@ VALUES
210,
'https://example.com/news10',
'https://dibb-bucket.s3.ap-northeast-2.amazonaws.com/news/image10.jpg',
NOW());
NOW());

0 comments on commit aafb48c

Please sign in to comment.