diff --git a/.gitignore b/.gitignore index c2065bc26..6f0ca134f 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,6 @@ out/ ### VS Code ### .vscode/ + + +application-local.properties diff --git a/build.gradle b/build.gradle index 8d52aebc6..e71d85bd6 100644 --- a/build.gradle +++ b/build.gradle @@ -13,9 +13,15 @@ repositories { } dependencies { + + implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter-thymeleaf' - implementation 'org.springframework.boot:spring-boot-starter-jdbc' + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + implementation 'org.springframework.boot:spring-boot-starter-validation' + + compileOnly 'org.projectlombok:lombok:1.18.30' + annotationProcessor 'org.projectlombok:lombok:1.18.30' implementation 'dev.akkinoc.spring.boot:logback-access-spring-boot-starter:4.0.0' diff --git a/src/main/java/roomescape/WebConfig.java b/src/main/java/roomescape/WebConfig.java new file mode 100644 index 000000000..00e16aca6 --- /dev/null +++ b/src/main/java/roomescape/WebConfig.java @@ -0,0 +1,30 @@ +package roomescape; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.method.support.HandlerMethodArgumentResolver; +import org.springframework.web.servlet.config.annotation.InterceptorRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; +import roomescape.auth.AdminAuthInterceptor; +import roomescape.auth.LoginMemberArgumentResolver; + +import java.util.List; + +@Configuration +public class WebConfig implements WebMvcConfigurer { + @Value("${roomescape.auth.jwt.secret}") + private String secretKey; + + @Override + public void addArgumentResolvers(List resolvers) { + resolvers.add(new LoginMemberArgumentResolver(secretKey)); + } + + @Override + public void addInterceptors(InterceptorRegistry registry) { + registry.addInterceptor(new AdminAuthInterceptor(secretKey)) + .addPathPatterns("/admin", "/admin/**"); + } +} + + diff --git a/src/main/java/roomescape/auth/AdminAuthInterceptor.java b/src/main/java/roomescape/auth/AdminAuthInterceptor.java new file mode 100644 index 000000000..c1fec5a77 --- /dev/null +++ b/src/main/java/roomescape/auth/AdminAuthInterceptor.java @@ -0,0 +1,53 @@ +package roomescape.auth; + +import io.jsonwebtoken.Claims; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import org.springframework.web.servlet.HandlerInterceptor; +import roomescape.common.ApiError; +import roomescape.util.JwtUtil; + +import java.io.IOException; + +public class AdminAuthInterceptor implements HandlerInterceptor { + + private final String secretKey; + + public AdminAuthInterceptor(String secretKey) { + this.secretKey = secretKey; + } + + @Override + public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) { + String token = JwtUtil.extractTokenFromCookies(request.getCookies()); + if (token.isEmpty()) { + writeError(response, ApiError.UNAUTHORIZED_MISSING_TOKEN); + return false; + } + + try { + Claims claims = JwtUtil.parseClaims(token, secretKey); + String role = claims.get("role", String.class); + if (!"ADMIN".equals(role)) { + writeError(response, ApiError.FORBIDDEN_ADMIN_ONLY); + return false; + } + return true; + } catch (Exception e) { + writeError(response, ApiError.UNAUTHORIZED_INVALID_TOKEN); + return false; + } + } + + private void writeError(HttpServletResponse response, ApiError apiError) { + response.setStatus(apiError.getHttpStatus().value()); + response.setContentType("application/json;charset=UTF-8"); + try { + String payload = "{\"code\":" + apiError.getCode() + ",\"message\":\"" + apiError.getMessage() + "\"}"; + response.getWriter().write(payload); + } catch (IOException ignored) { + } + } +} + + diff --git a/src/main/java/roomescape/auth/LoginMemberArgumentResolver.java b/src/main/java/roomescape/auth/LoginMemberArgumentResolver.java new file mode 100644 index 000000000..c4c27b98b --- /dev/null +++ b/src/main/java/roomescape/auth/LoginMemberArgumentResolver.java @@ -0,0 +1,43 @@ +package roomescape.auth; + +import io.jsonwebtoken.Claims; +import jakarta.servlet.http.HttpServletRequest; +import org.springframework.core.MethodParameter; +import org.springframework.web.bind.support.WebDataBinderFactory; +import org.springframework.web.context.request.NativeWebRequest; +import org.springframework.web.method.support.HandlerMethodArgumentResolver; +import org.springframework.web.method.support.ModelAndViewContainer; +import roomescape.member.LoginMemberDto; +import roomescape.util.JwtUtil; + +public class LoginMemberArgumentResolver implements HandlerMethodArgumentResolver { + + private final String secretKey; + + public LoginMemberArgumentResolver(String secretKey) { + this.secretKey = secretKey; + } + + @Override + public boolean supportsParameter(MethodParameter parameter) { + return parameter.getParameterType().equals(LoginMemberDto.class); + } + + @Override + public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer, NativeWebRequest webRequest, WebDataBinderFactory binderFactory) { + HttpServletRequest request = (HttpServletRequest) webRequest.getNativeRequest(); + String token = JwtUtil.extractTokenFromCookies(request.getCookies()); + + if (token.isEmpty()) { + return null; + } + + Claims claims = JwtUtil.parseClaims(token, secretKey); + + Long id = Long.valueOf(claims.getSubject()); + String name = claims.get("name", String.class); + String role = claims.get("role", String.class); + + return new LoginMemberDto(id, name, null, role); + } +} \ No newline at end of file diff --git a/src/main/java/roomescape/common/ApiError.java b/src/main/java/roomescape/common/ApiError.java new file mode 100644 index 000000000..09b530a6c --- /dev/null +++ b/src/main/java/roomescape/common/ApiError.java @@ -0,0 +1,24 @@ +package roomescape.common; + +import lombok.Getter; +import org.springframework.http.HttpStatus; + +@Getter +public enum ApiError { + UNAUTHORIZED_MISSING_TOKEN(HttpStatus.UNAUTHORIZED, 40101, "토큰이 없습니다."), + UNAUTHORIZED_INVALID_TOKEN(HttpStatus.UNAUTHORIZED, 40102, "토큰이 유효하지 않습니다."), + FORBIDDEN_ADMIN_ONLY(HttpStatus.FORBIDDEN, 40301, "관리자 권한이 필요합니다."); + + private final HttpStatus httpStatus; + private final int code; + private final String message; + + ApiError(HttpStatus httpStatus, int code, String message) { + this.httpStatus = httpStatus; + this.code = code; + this.message = message; + } +} + + + diff --git a/src/main/java/roomescape/member/LoginMemberDto.java b/src/main/java/roomescape/member/LoginMemberDto.java new file mode 100644 index 000000000..24ed5a6b1 --- /dev/null +++ b/src/main/java/roomescape/member/LoginMemberDto.java @@ -0,0 +1,6 @@ +package roomescape.member; + +public record LoginMemberDto(Long id, String name, String email, String role) {} + + + diff --git a/src/main/java/roomescape/member/Member.java b/src/main/java/roomescape/member/Member.java index 903aaa9b0..8f017d3d6 100644 --- a/src/main/java/roomescape/member/Member.java +++ b/src/main/java/roomescape/member/Member.java @@ -1,12 +1,21 @@ package roomescape.member; +import jakarta.persistence.*; + +@Entity public class Member { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; private String name; + @Column(unique = true) private String email; private String password; private String role; + public Member() { + } + public Member(Long id, String name, String email, String role) { this.id = id; this.name = name; diff --git a/src/main/java/roomescape/member/MemberController.java b/src/main/java/roomescape/member/MemberController.java index 881ae5e0d..11c734b58 100644 --- a/src/main/java/roomescape/member/MemberController.java +++ b/src/main/java/roomescape/member/MemberController.java @@ -3,28 +3,67 @@ import jakarta.servlet.http.Cookie; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; +import org.springframework.beans.factory.annotation.Value; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; +import roomescape.util.JwtUtil; import java.net.URI; @RestController public class MemberController { private MemberService memberService; + @Value("${roomescape.auth.jwt.secret}") + private String secretKey; public MemberController(MemberService memberService) { this.memberService = memberService; } @PostMapping("/members") - public ResponseEntity createMember(@RequestBody MemberRequest memberRequest) { - MemberResponse member = memberService.createMember(memberRequest); - return ResponseEntity.created(URI.create("/members/" + member.getId())).body(member); + public ResponseEntity createMember(@RequestBody MemberRequestDto memberRequest) { + MemberResponseDto member = memberService.createMember(memberRequest); + return ResponseEntity.created(URI.create("/members/" + member.getId())).body(member); } + @PostMapping("/login") + public ResponseEntity login(@RequestBody MemberRequestDto memberRequest, HttpServletResponse response) { + Member member = memberService.login(memberRequest.email(), memberRequest.password()); + + String accessToken = createToken(member); + + Cookie cookie = new Cookie("token", accessToken); + cookie.setHttpOnly(true); + cookie.setPath("/"); + response.addCookie(cookie); + + return ResponseEntity.ok().build(); + } + + @GetMapping("/login/check") + public ResponseEntity checkLogin(HttpServletRequest request) { + String token = JwtUtil.extractTokenFromCookies(request.getCookies()); + + String name = JwtUtil.parseClaims(token, secretKey).get("name", String.class); + + MemberResponseDto body = new MemberResponseDto(null, name, null); + return ResponseEntity.ok(body); + } + + public String createToken(Member member) { + return JwtUtil.createToken(member.getId().toString(), member.getName(), member.getRole(), secretKey); + } + + + public String createTokenFromEmailAndPassword(String email, String password) { + Member member = memberService.login(email, password); + return JwtUtil.createToken(member.getId().toString(), member.getName(), member.getRole(), secretKey); + } + + @PostMapping("/logout") public ResponseEntity logout(HttpServletResponse response) { Cookie cookie = new Cookie("token", ""); diff --git a/src/main/java/roomescape/member/MemberDao.java b/src/main/java/roomescape/member/MemberDao.java deleted file mode 100644 index 81f77f4cd..000000000 --- a/src/main/java/roomescape/member/MemberDao.java +++ /dev/null @@ -1,55 +0,0 @@ -package roomescape.member; - -import org.springframework.jdbc.core.JdbcTemplate; -import org.springframework.jdbc.support.GeneratedKeyHolder; -import org.springframework.jdbc.support.KeyHolder; -import org.springframework.stereotype.Repository; - -@Repository -public class MemberDao { - private JdbcTemplate jdbcTemplate; - - public MemberDao(JdbcTemplate jdbcTemplate) { - this.jdbcTemplate = jdbcTemplate; - } - - public Member save(Member member) { - KeyHolder keyHolder = new GeneratedKeyHolder(); - jdbcTemplate.update(connection -> { - var ps = connection.prepareStatement("INSERT INTO member(name, email, password, role) VALUES (?, ?, ?, ?)", new String[]{"id"}); - ps.setString(1, member.getName()); - ps.setString(2, member.getEmail()); - ps.setString(3, member.getPassword()); - ps.setString(4, member.getRole()); - return ps; - }, keyHolder); - - return new Member(keyHolder.getKey().longValue(), member.getName(), member.getEmail(), "USER"); - } - - public Member findByEmailAndPassword(String email, String password) { - return jdbcTemplate.queryForObject( - "SELECT id, name, email, role FROM member WHERE email = ? AND password = ?", - (rs, rowNum) -> new Member( - rs.getLong("id"), - rs.getString("name"), - rs.getString("email"), - rs.getString("role") - ), - email, password - ); - } - - public Member findByName(String name) { - return jdbcTemplate.queryForObject( - "SELECT id, name, email, role FROM member WHERE name = ?", - (rs, rowNum) -> new Member( - rs.getLong("id"), - rs.getString("name"), - rs.getString("email"), - rs.getString("role") - ), - name - ); - } -} diff --git a/src/main/java/roomescape/member/MemberRepository.java b/src/main/java/roomescape/member/MemberRepository.java new file mode 100644 index 000000000..fe7f83305 --- /dev/null +++ b/src/main/java/roomescape/member/MemberRepository.java @@ -0,0 +1,11 @@ +package roomescape.member; + +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.Optional; + +public interface MemberRepository extends JpaRepository { + Optional findByEmailAndPassword(String email, String password); +} + + diff --git a/src/main/java/roomescape/member/MemberRequestDto.java b/src/main/java/roomescape/member/MemberRequestDto.java new file mode 100644 index 000000000..8677a8773 --- /dev/null +++ b/src/main/java/roomescape/member/MemberRequestDto.java @@ -0,0 +1,5 @@ +package roomescape.member; + +public record MemberRequestDto(String name, String email, String password) {} + + diff --git a/src/main/java/roomescape/member/MemberResponse.java b/src/main/java/roomescape/member/MemberResponse.java index b9fa3b97a..55bf4b958 100644 --- a/src/main/java/roomescape/member/MemberResponse.java +++ b/src/main/java/roomescape/member/MemberResponse.java @@ -1,5 +1,8 @@ package roomescape.member; +import lombok.Getter; + +@Getter public class MemberResponse { private Long id; private String name; @@ -10,16 +13,4 @@ public MemberResponse(Long id, String name, String email) { this.name = name; this.email = email; } - - public Long getId() { - return id; - } - - public String getName() { - return name; - } - - public String getEmail() { - return email; - } } diff --git a/src/main/java/roomescape/member/MemberResponseDto.java b/src/main/java/roomescape/member/MemberResponseDto.java new file mode 100644 index 000000000..4a5efac83 --- /dev/null +++ b/src/main/java/roomescape/member/MemberResponseDto.java @@ -0,0 +1,5 @@ +package roomescape.member; + +public record MemberResponseDto(Long id, String name, String email) {} + + diff --git a/src/main/java/roomescape/member/MemberService.java b/src/main/java/roomescape/member/MemberService.java index ccaa8cba5..d279ee155 100644 --- a/src/main/java/roomescape/member/MemberService.java +++ b/src/main/java/roomescape/member/MemberService.java @@ -1,17 +1,24 @@ package roomescape.member; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; @Service +@Transactional(readOnly = true) public class MemberService { - private MemberDao memberDao; + private final MemberRepository memberRepository; - public MemberService(MemberDao memberDao) { - this.memberDao = memberDao; + public MemberService(MemberRepository memberRepository) { + this.memberRepository = memberRepository; } - public MemberResponse createMember(MemberRequest memberRequest) { - Member member = memberDao.save(new Member(memberRequest.getName(), memberRequest.getEmail(), memberRequest.getPassword(), "USER")); - return new MemberResponse(member.getId(), member.getName(), member.getEmail()); + @Transactional + public MemberResponseDto createMember(MemberRequestDto memberRequest) { + Member member = memberRepository.save(new Member(memberRequest.name(), memberRequest.email(), memberRequest.password(), "USER")); + return new MemberResponseDto(member.getId(), member.getName(), member.getEmail()); + } + + public Member login(String email, String password) { + return memberRepository.findByEmailAndPassword(email, password).orElseThrow(); } } diff --git a/src/main/java/roomescape/reservation/MyReservationResponse.java b/src/main/java/roomescape/reservation/MyReservationResponse.java new file mode 100644 index 000000000..a02945219 --- /dev/null +++ b/src/main/java/roomescape/reservation/MyReservationResponse.java @@ -0,0 +1,38 @@ +package roomescape.reservation; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import lombok.Getter; + +@Getter +public class MyReservationResponse { + private Long reservationId; + private String theme; + private String date; + private String time; + private String status; + + public MyReservationResponse(Long reservationId, String theme, String date, String time, String status) { + this.reservationId = reservationId; + this.theme = theme; + this.date = date; + this.time = time; + this.status = status; + } + + public static MyReservationResponse from(Reservation reservation) { + return new MyReservationResponse( + reservation.getId(), + reservation.getTheme().getName(), + reservation.getDate(), + reservation.getTime().getValue(), + "예약" + ); + } + + @JsonIgnore + public Long getId() { + return reservationId; + } +} + + diff --git a/src/main/java/roomescape/reservation/MyReservationResponseDto.java b/src/main/java/roomescape/reservation/MyReservationResponseDto.java new file mode 100644 index 000000000..e95ac50cb --- /dev/null +++ b/src/main/java/roomescape/reservation/MyReservationResponseDto.java @@ -0,0 +1,23 @@ +package roomescape.reservation; + +import com.fasterxml.jackson.annotation.JsonIgnore; + +public record MyReservationResponseDto(Long reservationId, String theme, String date, String time, String status) { + + public static MyReservationResponseDto from(Reservation reservation) { + return new MyReservationResponseDto( + reservation.getId(), + reservation.getTheme().getName(), + reservation.getDate(), + reservation.getTime().getValue(), + "예약" + ); + } + + @JsonIgnore + public Long getId() { + return reservationId; + } +} + + diff --git a/src/main/java/roomescape/reservation/MyReservationService.java b/src/main/java/roomescape/reservation/MyReservationService.java new file mode 100644 index 000000000..30ca56c24 --- /dev/null +++ b/src/main/java/roomescape/reservation/MyReservationService.java @@ -0,0 +1,44 @@ +package roomescape.reservation; + +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import roomescape.waiting.WaitingService; +import roomescape.waiting.WaitingWithRankDto; + +import java.util.ArrayList; +import java.util.List; + +@Service +@Transactional(readOnly = true) +public class MyReservationService { + private final ReservationRepository reservationRepository; + private final WaitingService waitingService; + + public MyReservationService(ReservationRepository reservationRepository, WaitingService waitingService) { + this.reservationRepository = reservationRepository; + this.waitingService = waitingService; + } + + public List findMine(Long memberId) { + List result = new ArrayList<>(); + result.addAll( + reservationRepository.findByMember_Id(memberId).stream() + .map(MyReservationResponseDto::from) + .toList() + ); + List waitings = waitingService.findMineWithRank(memberId); + for (WaitingWithRankDto w : waitings) { + long rankOneBased = (w.rank() == null ? 0 : w.rank()) + 1; + result.add(new MyReservationResponseDto( + w.waiting().getId(), + w.waiting().getTheme().getName(), + w.waiting().getDate(), + w.waiting().getTime().getValue(), + rankOneBased + "번째 예약대기" + )); + } + return result; + } +} + + diff --git a/src/main/java/roomescape/reservation/Reservation.java b/src/main/java/roomescape/reservation/Reservation.java index 83a7edf1b..f4bd65f25 100644 --- a/src/main/java/roomescape/reservation/Reservation.java +++ b/src/main/java/roomescape/reservation/Reservation.java @@ -1,15 +1,29 @@ package roomescape.reservation; +import jakarta.persistence.*; import roomescape.theme.Theme; import roomescape.time.Time; +import roomescape.member.Member; +@Entity public class Reservation { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; private String name; private String date; + + + @ManyToOne(fetch = FetchType.LAZY) private Time time; + + @ManyToOne(fetch = FetchType.LAZY) private Theme theme; + @ManyToOne(fetch = FetchType.LAZY) + private Member member; + public Reservation(Long id, String name, String date, Time time, Theme theme) { this.id = id; this.name = name; @@ -48,4 +62,12 @@ public Time getTime() { public Theme getTheme() { return theme; } + + public Member getMember() { + return member; + } + + public void setMember(Member member) { + this.member = member; + } } diff --git a/src/main/java/roomescape/reservation/ReservationController.java b/src/main/java/roomescape/reservation/ReservationController.java index b3bef3990..b8fc9d864 100644 --- a/src/main/java/roomescape/reservation/ReservationController.java +++ b/src/main/java/roomescape/reservation/ReservationController.java @@ -1,12 +1,14 @@ package roomescape.reservation; import org.springframework.http.ResponseEntity; +import jakarta.validation.Valid; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; +import roomescape.member.LoginMemberDto; import java.net.URI; import java.util.List; @@ -15,32 +17,67 @@ public class ReservationController { private final ReservationService reservationService; + private final MyReservationService myReservationService; - public ReservationController(ReservationService reservationService) { + public ReservationController(ReservationService reservationService, MyReservationService myReservationService) { this.reservationService = reservationService; + this.myReservationService = myReservationService; } - @GetMapping("/reservations") - public List list() { + @GetMapping("/reservations") + public List list() { + return reservationService.findAll(); + } + + @GetMapping("/admin/reservations") + public List adminList() { return reservationService.findAll(); } @PostMapping("/reservations") - public ResponseEntity create(@RequestBody ReservationRequest reservationRequest) { - if (reservationRequest.getName() == null - || reservationRequest.getDate() == null - || reservationRequest.getTheme() == null - || reservationRequest.getTime() == null) { + public ResponseEntity create(@RequestBody @Valid ReservationRequestDto reservationRequest, LoginMemberDto member) { + + String effectiveName = reservationRequest.name() != null && !reservationRequest.name().isBlank() + ? reservationRequest.name() + : (member != null ? member.getName() : null); + if (effectiveName == null || effectiveName.isBlank()) { return ResponseEntity.badRequest().build(); } - ReservationResponse reservation = reservationService.save(reservationRequest); + ReservationRequestDto requestWithName = new ReservationRequestDto( + effectiveName, + reservationRequest.date(), + reservationRequest.theme(), + reservationRequest.time() + ); + + ReservationResponseDto reservation = reservationService.save(requestWithName, member != null ? member.getId() : null); return ResponseEntity.created(URI.create("/reservations/" + reservation.getId())).body(reservation); } + @PostMapping("/admin/reservations") + public ResponseEntity adminCreate(@RequestBody @Valid ReservationRequestDto reservationRequest) { + if (reservationRequest.name() == null || reservationRequest.name().isBlank()) { + return ResponseEntity.badRequest().build(); + } + ReservationResponseDto reservation = reservationService.save(reservationRequest, null); + return ResponseEntity.created(URI.create("/admin/reservations/" + reservation.getId())).body(reservation); + } + @DeleteMapping("/reservations/{id}") public ResponseEntity delete(@PathVariable Long id) { reservationService.deleteById(id); return ResponseEntity.noContent().build(); } + + @DeleteMapping("/admin/reservations/{id}") + public ResponseEntity adminDelete(@PathVariable Long id) { + reservationService.deleteById(id); + return ResponseEntity.noContent().build(); + } + + @GetMapping("/reservations-mine") + public ResponseEntity> mine(LoginMemberDto member) { + return ResponseEntity.ok(myReservationService.findMine(member.getId())); + } } diff --git a/src/main/java/roomescape/reservation/ReservationDao.java b/src/main/java/roomescape/reservation/ReservationDao.java deleted file mode 100644 index a4972430c..000000000 --- a/src/main/java/roomescape/reservation/ReservationDao.java +++ /dev/null @@ -1,127 +0,0 @@ -package roomescape.reservation; - -import org.springframework.jdbc.core.JdbcTemplate; -import org.springframework.jdbc.support.GeneratedKeyHolder; -import org.springframework.jdbc.support.KeyHolder; -import org.springframework.stereotype.Repository; -import roomescape.theme.Theme; -import roomescape.time.Time; - -import java.sql.PreparedStatement; -import java.util.List; - -@Repository -public class ReservationDao { - - private final JdbcTemplate jdbcTemplate; - - public ReservationDao(JdbcTemplate jdbcTemplate) { - this.jdbcTemplate = jdbcTemplate; - } - - public List findAll() { - return jdbcTemplate.query( - "SELECT r.id AS reservation_id, r.name as reservation_name, r.date as reservation_date, " + - "t.id AS theme_id, t.name AS theme_name, t.description AS theme_description, " + - "ti.id AS time_id, ti.time_value AS time_value " + - "FROM reservation r " + - "JOIN theme t ON r.theme_id = t.id " + - "JOIN time ti ON r.time_id = ti.id", - - (rs, rowNum) -> new Reservation( - rs.getLong("reservation_id"), - rs.getString("reservation_name"), - rs.getString("reservation_date"), - new Time( - rs.getLong("time_id"), - rs.getString("time_value") - ), - new Theme( - rs.getLong("theme_id"), - rs.getString("theme_name"), - rs.getString("theme_description") - ))); - } - - public Reservation save(ReservationRequest reservationRequest) { - KeyHolder keyHolder = new GeneratedKeyHolder(); - jdbcTemplate.update(connection -> { - PreparedStatement ps = connection.prepareStatement("INSERT INTO reservation(date, name, theme_id, time_id) VALUES (?, ?, ?, ?)", new String[]{"id"}); - ps.setString(1, reservationRequest.getDate()); - ps.setString(2, reservationRequest.getName()); - ps.setLong(3, reservationRequest.getTheme()); - ps.setLong(4, reservationRequest.getTime()); - return ps; - }, keyHolder); - - Time time = jdbcTemplate.queryForObject("SELECT * FROM time WHERE id = ?", - (rs, rowNum) -> new Time(rs.getLong("id"), rs.getString("time_value")), - reservationRequest.getTime()); - - Theme theme = jdbcTemplate.queryForObject("SELECT * FROM theme WHERE id = ?", - (rs, rowNum) -> new Theme(rs.getLong("id"), rs.getString("name"), rs.getString("description")), - reservationRequest.getTheme()); - - return new Reservation( - keyHolder.getKey().longValue(), - reservationRequest.getName(), - reservationRequest.getDate(), - time, - theme - ); - } - - public void deleteById(Long id) { - jdbcTemplate.update("DELETE FROM reservation WHERE id = ?", id); - } - - public List findReservationsByDateAndTheme(String date, Long themeId) { - return jdbcTemplate.query( - "SELECT r.id AS reservation_id, r.name as reservation_name, r.date as reservation_date, " + - "t.id AS theme_id, t.name AS theme_name, t.description AS theme_description, " + - "ti.id AS time_id, ti.time_value AS time_value " + - "FROM reservation r " + - "JOIN theme t ON r.theme_id = t.id " + - "JOIN time ti ON r.time_id = ti.id" + - "WHERE r.date = ? AND r.theme_id = ?", - new Object[]{date, themeId}, - (rs, rowNum) -> new Reservation( - rs.getLong("reservation_id"), - rs.getString("reservation_name"), - rs.getString("reservation_date"), - new Time( - rs.getLong("time_id"), - rs.getString("time_value") - ), - new Theme( - rs.getLong("theme_id"), - rs.getString("theme_name"), - rs.getString("theme_description") - ))); - } - - public List findByDateAndThemeId(String date, Long themeId) { - return jdbcTemplate.query( - "SELECT r.id AS reservation_id, r.name as reservation_name, r.date as reservation_date, " + - "t.id AS theme_id, t.name AS theme_name, t.description AS theme_description, " + - "ti.id AS time_id, ti.time_value AS time_value " + - "FROM reservation r " + - "JOIN theme t ON r.theme_id = t.id " + - "JOIN time ti ON r.time_id = ti.id " + - "WHERE r.date = ? AND r.theme_id = ?", - new Object[]{date, themeId}, - (rs, rowNum) -> new Reservation( - rs.getLong("reservation_id"), - rs.getString("reservation_name"), - rs.getString("reservation_date"), - new Time( - rs.getLong("time_id"), - rs.getString("time_value") - ), - new Theme( - rs.getLong("theme_id"), - rs.getString("theme_name"), - rs.getString("theme_description") - ))); - } -} diff --git a/src/main/java/roomescape/reservation/ReservationRepository.java b/src/main/java/roomescape/reservation/ReservationRepository.java new file mode 100644 index 000000000..38722990f --- /dev/null +++ b/src/main/java/roomescape/reservation/ReservationRepository.java @@ -0,0 +1,22 @@ +package roomescape.reservation; + +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.List; + +public interface ReservationRepository extends JpaRepository { + + List findAll(); + + List findByMember_Id(Long memberId); + + List findByDateAndTheme_Id(String date, Long themeId); + + boolean existsByMember_IdAndDateAndTime_IdAndTheme_Id(Long memberId, String date, Long timeId, Long themeId); + + default boolean existsForMemberOnSlot(Long memberId, String date, Long timeId, Long themeId) { + return existsByMember_IdAndDateAndTime_IdAndTheme_Id(memberId, date, timeId, themeId); + } +} + + diff --git a/src/main/java/roomescape/reservation/ReservationRequest.java b/src/main/java/roomescape/reservation/ReservationRequest.java index 19f441246..150a2d708 100644 --- a/src/main/java/roomescape/reservation/ReservationRequest.java +++ b/src/main/java/roomescape/reservation/ReservationRequest.java @@ -1,11 +1,26 @@ package roomescape.reservation; +import jakarta.validation.constraints.NotNull; + public class ReservationRequest { private String name; + @NotNull private String date; + @NotNull private Long theme; + @NotNull private Long time; + public ReservationRequest() { + } + + public ReservationRequest(String name, String date, Long theme, Long time) { + this.name = name; + this.date = date; + this.theme = theme; + this.time = time; + } + public String getName() { return name; } diff --git a/src/main/java/roomescape/reservation/ReservationRequestDto.java b/src/main/java/roomescape/reservation/ReservationRequestDto.java new file mode 100644 index 000000000..871599ab8 --- /dev/null +++ b/src/main/java/roomescape/reservation/ReservationRequestDto.java @@ -0,0 +1,7 @@ +package roomescape.reservation; + +import jakarta.validation.constraints.NotNull; + + public record ReservationRequestDto(String name, @NotNull String date, @NotNull Long theme, @NotNull Long time) {} + + diff --git a/src/main/java/roomescape/reservation/ReservationResponse.java b/src/main/java/roomescape/reservation/ReservationResponse.java index 41360a363..a825b34a3 100644 --- a/src/main/java/roomescape/reservation/ReservationResponse.java +++ b/src/main/java/roomescape/reservation/ReservationResponse.java @@ -1,5 +1,8 @@ package roomescape.reservation; +import lombok.Getter; + +@Getter public class ReservationResponse { private Long id; private String name; @@ -14,24 +17,4 @@ public ReservationResponse(Long id, String name, String theme, String date, Stri this.date = date; this.time = time; } - - public Long getId() { - return id; - } - - public String getName() { - return name; - } - - public String getTheme() { - return theme; - } - - public String getDate() { - return date; - } - - public String getTime() { - return time; - } } diff --git a/src/main/java/roomescape/reservation/ReservationResponseDto.java b/src/main/java/roomescape/reservation/ReservationResponseDto.java new file mode 100644 index 000000000..a0947063d --- /dev/null +++ b/src/main/java/roomescape/reservation/ReservationResponseDto.java @@ -0,0 +1,4 @@ +package roomescape.reservation; + +public record ReservationResponseDto(Long id, String name, String theme, String date, String time) {} + diff --git a/src/main/java/roomescape/reservation/ReservationService.java b/src/main/java/roomescape/reservation/ReservationService.java index bd3313328..6ff698d6c 100644 --- a/src/main/java/roomescape/reservation/ReservationService.java +++ b/src/main/java/roomescape/reservation/ReservationService.java @@ -1,30 +1,56 @@ package roomescape.reservation; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import roomescape.theme.Theme; +import roomescape.theme.ThemeRepository; +import roomescape.time.Time; +import roomescape.time.TimeRepository; +import roomescape.member.MemberRepository; +import roomescape.member.Member; + import java.util.List; @Service +@Transactional(readOnly = true) public class ReservationService { - private ReservationDao reservationDao; - - public ReservationService(ReservationDao reservationDao) { - this.reservationDao = reservationDao; + private final ReservationRepository reservationRepository; + private final TimeRepository timeRepository; + private final ThemeRepository themeRepository; + private final MemberRepository memberRepository; + + public ReservationService(ReservationRepository reservationRepository, TimeRepository timeRepository, ThemeRepository themeRepository, MemberRepository memberRepository) { + this.reservationRepository = reservationRepository; + this.timeRepository = timeRepository; + this.themeRepository = themeRepository; + this.memberRepository = memberRepository; } - public ReservationResponse save(ReservationRequest reservationRequest) { - Reservation reservation = reservationDao.save(reservationRequest); - - return new ReservationResponse(reservation.getId(), reservationRequest.getName(), reservation.getTheme().getName(), reservation.getDate(), reservation.getTime().getValue()); + @Transactional + public ReservationResponseDto save(ReservationRequestDto reservationRequest, Long loginMemberId) { + Time time = timeRepository.findById(reservationRequest.time()).orElseThrow(); + Theme theme = themeRepository.findById(reservationRequest.theme()).orElseThrow(); + Reservation reservation = new Reservation(reservationRequest.name(), reservationRequest.date(), time, theme); + if (loginMemberId != null) { + Member memberRef = memberRepository.getReferenceById(loginMemberId); + reservation.setMember(memberRef); + } + reservation = reservationRepository.save(reservation); + + return new ReservationResponseDto(reservation.getId(), reservation.getName(), reservation.getTheme().getName(), reservation.getDate(), reservation.getTime().getValue()); } + @Transactional public void deleteById(Long id) { - reservationDao.deleteById(id); + reservationRepository.deleteById(id); } - public List findAll() { - return reservationDao.findAll().stream() - .map(it -> new ReservationResponse(it.getId(), it.getName(), it.getTheme().getName(), it.getDate(), it.getTime().getValue())) + public List findAll() { + return reservationRepository.findAll().stream() + .map(it -> new ReservationResponseDto(it.getId(), it.getName(), it.getTheme().getName(), it.getDate(), it.getTime().getValue())) .toList(); } + + } diff --git a/src/main/java/roomescape/theme/Theme.java b/src/main/java/roomescape/theme/Theme.java index 430a6239c..5dcd1dd7f 100644 --- a/src/main/java/roomescape/theme/Theme.java +++ b/src/main/java/roomescape/theme/Theme.java @@ -1,6 +1,14 @@ package roomescape.theme; +import jakarta.persistence.*; +import roomescape.reservation.Reservation; +import java.util.List; + +@Entity public class Theme { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; private String name; private String description; @@ -8,6 +16,9 @@ public class Theme { public Theme() { } + @OneToMany(mappedBy = "theme") + private List reservations; + public Theme(Long id, String name, String description) { this.id = id; this.name = name; diff --git a/src/main/java/roomescape/theme/ThemeController.java b/src/main/java/roomescape/theme/ThemeController.java index 03bca41a6..d609d3215 100644 --- a/src/main/java/roomescape/theme/ThemeController.java +++ b/src/main/java/roomescape/theme/ThemeController.java @@ -13,26 +13,43 @@ @RestController public class ThemeController { - private ThemeDao themeDao; + private ThemeRepository themeRepository; - public ThemeController(ThemeDao themeDao) { - this.themeDao = themeDao; + public ThemeController(ThemeRepository themeRepository) { + this.themeRepository = themeRepository; } @PostMapping("/themes") public ResponseEntity createTheme(@RequestBody Theme theme) { - Theme newTheme = themeDao.save(theme); + Theme newTheme = themeRepository.save(theme); return ResponseEntity.created(URI.create("/themes/" + newTheme.getId())).body(newTheme); } + @PostMapping("/admin/themes") + public ResponseEntity adminCreateTheme(@RequestBody Theme theme) { + Theme newTheme = themeRepository.save(theme); + return ResponseEntity.created(URI.create("/admin/themes/" + newTheme.getId())).body(newTheme); + } + @GetMapping("/themes") public ResponseEntity> list() { - return ResponseEntity.ok(themeDao.findAll()); + return ResponseEntity.ok(themeRepository.findAll()); + } + + @GetMapping("/admin/themes") + public ResponseEntity> adminList() { + return ResponseEntity.ok(themeRepository.findAll()); } @DeleteMapping("/themes/{id}") public ResponseEntity deleteTheme(@PathVariable Long id) { - themeDao.deleteById(id); + themeRepository.deleteById(id); + return ResponseEntity.noContent().build(); + } + + @DeleteMapping("/admin/themes/{id}") + public ResponseEntity adminDeleteTheme(@PathVariable Long id) { + themeRepository.deleteById(id); return ResponseEntity.noContent().build(); } } diff --git a/src/main/java/roomescape/theme/ThemeDao.java b/src/main/java/roomescape/theme/ThemeDao.java deleted file mode 100644 index 945341d8d..000000000 --- a/src/main/java/roomescape/theme/ThemeDao.java +++ /dev/null @@ -1,41 +0,0 @@ -package roomescape.theme; - -import org.springframework.jdbc.core.JdbcTemplate; -import org.springframework.jdbc.support.GeneratedKeyHolder; -import org.springframework.jdbc.support.KeyHolder; -import org.springframework.stereotype.Repository; - -import java.util.List; - -@Repository -public class ThemeDao { - private JdbcTemplate jdbcTemplate; - - public ThemeDao(JdbcTemplate jdbcTemplate) { - this.jdbcTemplate = jdbcTemplate; - } - - public List findAll() { - return jdbcTemplate.query("SELECT * FROM theme where deleted = false", (rs, rowNum) -> new Theme( - rs.getLong("id"), - rs.getString("name"), - rs.getString("description") - )); - } - - public Theme save(Theme theme) { - KeyHolder keyHolder = new GeneratedKeyHolder(); - jdbcTemplate.update(connection -> { - var ps = connection.prepareStatement("INSERT INTO theme(name, description) VALUES (?, ?)", new String[]{"id"}); - ps.setString(1, theme.getName()); - ps.setString(2, theme.getDescription()); - return ps; - }, keyHolder); - - return new Theme(keyHolder.getKey().longValue(), theme.getName(), theme.getDescription()); - } - - public void deleteById(Long id) { - jdbcTemplate.update("UPDATE theme SET deleted = true WHERE id = ?", id); - } -} diff --git a/src/main/java/roomescape/theme/ThemeRepository.java b/src/main/java/roomescape/theme/ThemeRepository.java new file mode 100644 index 000000000..ff68970b5 --- /dev/null +++ b/src/main/java/roomescape/theme/ThemeRepository.java @@ -0,0 +1,8 @@ +package roomescape.theme; + +import org.springframework.data.jpa.repository.JpaRepository; + +public interface ThemeRepository extends JpaRepository { +} + + diff --git a/src/main/java/roomescape/time/AvailableTimeDto.java b/src/main/java/roomescape/time/AvailableTimeDto.java new file mode 100644 index 000000000..26d65fab2 --- /dev/null +++ b/src/main/java/roomescape/time/AvailableTimeDto.java @@ -0,0 +1,5 @@ +package roomescape.time; + +public record AvailableTimeDto(Long timeId, String time, boolean booked) {} + + diff --git a/src/main/java/roomescape/time/Time.java b/src/main/java/roomescape/time/Time.java index 008ed93cf..13cb1570d 100644 --- a/src/main/java/roomescape/time/Time.java +++ b/src/main/java/roomescape/time/Time.java @@ -1,7 +1,15 @@ package roomescape.time; +import jakarta.persistence.*; +import roomescape.reservation.Reservation; +import java.util.List; +@Entity public class Time { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; + @Column(name = "time_value") private String value; public Time(Long id, String value) { @@ -9,6 +17,9 @@ public Time(Long id, String value) { this.value = value; } + @OneToMany(mappedBy = "time") + private List reservations; + public Time(String value) { this.value = value; } @@ -24,4 +35,5 @@ public Long getId() { public String getValue() { return value; } + } diff --git a/src/main/java/roomescape/time/TimeController.java b/src/main/java/roomescape/time/TimeController.java index 2343114d1..b215e19c4 100644 --- a/src/main/java/roomescape/time/TimeController.java +++ b/src/main/java/roomescape/time/TimeController.java @@ -25,6 +25,11 @@ public List