Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[2-1단계 - 테마 관리 기능 추가] #103

Open
wants to merge 32 commits into
base: heoseungjun
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
fe7a701
fix: theme 추가로 인한 링크 추가 및 기존 링크 수정
boorownie Jun 6, 2024
97663d9
feat: theme 추가로 인한 html 및 js 파일 생성
boorownie Jun 6, 2024
0423809
FEAT : PageController 생성 - home과 reservation 페이지로 이동 가능
dev-domo Jun 21, 2024
ee2eb72
FEAT : ReservationController 생성 - 예약 추가, 조회, 삭제 API 작성
dev-domo Jun 21, 2024
48d66bb
FEAT : Reservation 생성 - id, 예약자명, 날짜, 시간을 갖는 예약 객체
dev-domo Jun 21, 2024
8d9a22b
CHORE : 1-2단계 수행을 위한 sql 파일 생성
dev-domo Jun 21, 2024
1446d29
FEAT : ReservationRepository 생성
dev-domo Jun 22, 2024
bc7677c
FEAT : ReservationService 생성
dev-domo Jun 22, 2024
c078c96
CHORE : Repository 및 Service 생성에 따른 수정
dev-domo Jun 22, 2024
788b9d2
REFACOR : 데이터베이스 추가 설정
dev-domo Jun 22, 2024
2acf662
FEAT : ReservationTimeController 생성
dev-domo Jun 25, 2024
9ce9565
FEAT : ReservationTime 생성 - id와 startAt을 멤버로 가짐
dev-domo Jun 25, 2024
a74051b
FEAT : ReservationTimeRepository 생성 - 예약시간 조회, 생성, 삭제 구현
dev-domo Jun 25, 2024
0d477e9
FEAT : ReservationTimeService 생성
dev-domo Jun 25, 2024
f05616c
CHORE : 오탈자 수정
dev-domo Jun 25, 2024
37cd26b
REFACTOR : time_id로 수정
dev-domo Jun 25, 2024
d3dac35
REFACTOR : SimpleJdbcInsert를 활용한 예약 생성 수정
dev-domo Jun 25, 2024
100cd1d
REFACTOR : addReservation 리턴 타입을 Long으로 수정
dev-domo Jun 25, 2024
bca58b1
REFACTOR : reservation_time 스키마 추가
dev-domo Jun 25, 2024
7d2c84d
CHORE : 필요없는 import문 정리
dev-domo Jun 26, 2024
d834d7f
FEAT : Theme 생성
dev-domo Jun 26, 2024
ccc3c0c
FEAT : ThemeRepository 생성
dev-domo Jun 26, 2024
3066179
FEAT : ThemeService 생성
dev-domo Jun 26, 2024
61a6f66
REFACTOR : 테마 페이지 매핑
dev-domo Jun 26, 2024
26fb9c2
CHORE : 필요없는 import문 삭제
dev-domo Jun 26, 2024
f82434c
REFACOTR : 멤버 변수 수정중
dev-domo Jun 26, 2024
ff82e42
CHORE : 필요없는 import문 삭제
dev-domo Jun 26, 2024
9422829
REFACTOR : RowMapper 수정중
dev-domo Jun 26, 2024
6cd069f
REFACTOR : 중복 메소드명 변경
dev-domo Jun 26, 2024
2858597
REFACTOR : addReservationTime 파라미터를 ReservationTime으로 변경
dev-domo Jun 26, 2024
18640aa
REFACTOR : Theme 테이블 추가로 인한 스키마 변경
dev-domo Jun 26, 2024
ed5cc1c
REFACTOR : 예약 변경을 시간 변경으로 문구 수정
dev-domo Jun 26, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
REFACTOR : time_id로 수정
dev-domo committed Jun 25, 2024
commit 37cd26b125ce197fa703fbb48ac4eddff5de5778
30 changes: 5 additions & 25 deletions src/main/java/roomescape/model/Reservation.java
Original file line number Diff line number Diff line change
@@ -6,48 +6,28 @@ public class Reservation {
private Long id;
private String name;
private String date;
private String time;
private Long timeId;

public Reservation(Long id, String name, String date, String time) {
public Reservation(Long id, String name, String date, Long timeId) {
this.id = id;
this.name = name;
this.date = date;
this.time = time;
}

public static Reservation toEntity(Reservation reservation, AtomicLong id) {
return new Reservation(Long.valueOf(String.valueOf(id)), reservation.getName(), reservation.getDate(), reservation.getTime());
this.timeId = timeId;
}

public Long getId() {
return id;
}

public void setId(Long id) {
this.id = id;
}

public String getName() {
return name;
}

public void setName(String name) {
this.name = name;
}

public String getDate() {
return date;
}

public void setDate(String date) {
this.date = date;
}

public String getTime() {
return time;
}

public void setTime(String time) {
this.time = time;
public Long getTimeId() {
return timeId;
}
}