diff --git a/build.gradle b/build.gradle index 8d52aebc..050c7c39 100644 --- a/build.gradle +++ b/build.gradle @@ -15,7 +15,8 @@ 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-jdbc' + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' implementation 'dev.akkinoc.spring.boot:logback-access-spring-boot-starter:4.0.0' diff --git a/src/main/java/roomescape/DataLoader.java b/src/main/java/roomescape/DataLoader.java new file mode 100644 index 00000000..fe1d9add --- /dev/null +++ b/src/main/java/roomescape/DataLoader.java @@ -0,0 +1,28 @@ +package roomescape; + +import org.springframework.boot.CommandLineRunner; +import org.springframework.context.annotation.Profile; +import org.springframework.stereotype.Component; +import roomescape.member.Member; +import roomescape.member.MemberRepository; + +@Profile("default") +@Component +public class DataLoader implements CommandLineRunner { + + private MemberRepository memberRepository; + + public DataLoader(MemberRepository memberRepository) { + this.memberRepository = memberRepository; + } + + @Override + public void run(String... args) throws Exception { + final Member member1 = memberRepository.save( new Member( + "어드민", "admin@email.com", "password", "ADMIN" + )); + final Member member2 = memberRepository.save( new Member( + "브라운", "brown@email.com", "password", "USER" + )); + } +} diff --git a/src/main/java/roomescape/RoomescapeApplication.java b/src/main/java/roomescape/RoomescapeApplication.java index 2ca0f743..81eb33f1 100644 --- a/src/main/java/roomescape/RoomescapeApplication.java +++ b/src/main/java/roomescape/RoomescapeApplication.java @@ -2,6 +2,7 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.domain.EntityScan; @SpringBootApplication public class RoomescapeApplication { diff --git a/src/main/java/roomescape/TestDataLoader.java b/src/main/java/roomescape/TestDataLoader.java new file mode 100644 index 00000000..6d9b40ea --- /dev/null +++ b/src/main/java/roomescape/TestDataLoader.java @@ -0,0 +1,51 @@ +package roomescape; + +import org.springframework.boot.CommandLineRunner; +import org.springframework.context.annotation.Profile; +import org.springframework.stereotype.Component; +import roomescape.member.Member; +import roomescape.member.MemberRepository; +import roomescape.reservation.Reservation; +import roomescape.reservation.ReservationRepository; +import roomescape.theme.Theme; +import roomescape.theme.ThemeRepository; +import roomescape.time.Time; +import roomescape.time.TimeRepository; + +@Profile("test") +@Component +public class TestDataLoader implements CommandLineRunner { + private MemberRepository memberRepository; + private ThemeRepository themeRepository; + private TimeRepository timeRepository; + private ReservationRepository reservationRepository; + + public TestDataLoader(MemberRepository memberRepository, ThemeRepository themeRepository, TimeRepository timeRepository, ReservationRepository reservationRepository) { + this.memberRepository = memberRepository; + this.themeRepository = themeRepository; + this.timeRepository = timeRepository; + this.reservationRepository = reservationRepository; + } + + @Override + public void run(String... args) throws Exception { + final Member member1 = memberRepository.save(new Member("어드민", "admin@email.com", "password", "ADMIN")); + final Member member2 = memberRepository.save(new Member("브라운", "brown@email.com", "password", "USER")); + + final Theme theme1 = themeRepository.save(new Theme("테마1", "테마1입니다.")); + final Theme theme2 = themeRepository.save(new Theme("테마2", "테마2입니다.")); + final Theme theme3 = themeRepository.save(new Theme("테마3", "테마3입니다.")); + + final Time time1 = timeRepository.save(new Time("10:00")); + final Time time2 = timeRepository.save(new Time("12:00")); + final Time time3 = timeRepository.save(new Time("14:00")); + final Time time4 = timeRepository.save(new Time("16:00")); + final Time time5 = timeRepository.save(new Time("18:00")); + final Time time6 = timeRepository.save(new Time("20:00")); + + reservationRepository.save(new Reservation("어드민", "2024-03-01", time1, theme1, member1)); + reservationRepository.save(new Reservation("어드민", "2024-03-01", time2, theme2, member1)); + reservationRepository.save(new Reservation("어드민", "2024-03-01", time3, theme3, member1)); + reservationRepository.save(new Reservation("브라운", "2024-03-01", time4, theme1, member2)); + } +} diff --git a/src/main/java/roomescape/api/JwtDecoder.java b/src/main/java/roomescape/api/JwtDecoder.java new file mode 100644 index 00000000..885471bc --- /dev/null +++ b/src/main/java/roomescape/api/JwtDecoder.java @@ -0,0 +1,15 @@ +package roomescape.api; + +import io.jsonwebtoken.Jwts; +import io.jsonwebtoken.security.Keys; + +public class JwtDecoder { + public static Long decodeJwtToken(String token) { + Long memberId = Long.valueOf(Jwts.parserBuilder() + .setSigningKey(Keys.hmacShaKeyFor("Yn2kjibddFAWtnPJ2AFlL8WXmohJMCvigQggaEypa5E=".getBytes())) + .build() + .parseClaimsJws(token) + .getBody().getSubject()); + return memberId; + } +} diff --git a/src/main/java/roomescape/api/JwtUtils.java b/src/main/java/roomescape/api/JwtUtils.java new file mode 100644 index 00000000..0000a9aa --- /dev/null +++ b/src/main/java/roomescape/api/JwtUtils.java @@ -0,0 +1,27 @@ +package roomescape.api; + +import io.jsonwebtoken.Jwts; +import io.jsonwebtoken.security.Keys; +import roomescape.member.Member; + +public class JwtUtils { + + private String secretKey; + + public JwtUtils() { + + } + + public JwtUtils(String secretKey) { + this.secretKey = secretKey; + } + + public String createToken(Member member){ + return Jwts.builder() + .setSubject(member.getId().toString()) + .claim("name", member.getName()) + .claim("role", member.getRole()) + .signWith(Keys.hmacShaKeyFor(secretKey.getBytes())) + .compact(); + } +} diff --git a/src/main/java/roomescape/auth/AdminInterceptor.java b/src/main/java/roomescape/auth/AdminInterceptor.java new file mode 100644 index 00000000..57996f49 --- /dev/null +++ b/src/main/java/roomescape/auth/AdminInterceptor.java @@ -0,0 +1,46 @@ +package roomescape.auth; + +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import org.springframework.stereotype.Component; +import org.springframework.web.servlet.HandlerInterceptor; +import roomescape.api.JwtDecoder; +import roomescape.exception.NotFoundException; +import roomescape.exception.UnauthorizedException; +import roomescape.member.Member; +import roomescape.member.MemberService; +import roomescape.util.CookieUtil; + +@Component +public class AdminInterceptor implements HandlerInterceptor { + private MemberService memberService; + + public AdminInterceptor(MemberService memberService) { + this.memberService = memberService; + } + + @Override + public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { + try { + String token = CookieUtil.extractTokenFromCookie(request.getCookies()); + Long id = JwtDecoder.decodeJwtToken(token); + Member member = memberService.findById(id); + + if (member == null) { + throw new NotFoundException("유저를 찾을 수 없습니다."); + } else if (!member.getRole().equals("ADMIN")) { + throw new UnauthorizedException("관리자 회원이 아닙니다."); + } + + return true; + } catch (NotFoundException | UnauthorizedException e) { + response.setStatus(HttpServletResponse.SC_UNAUTHORIZED); + response.getWriter().write(e.getMessage()); + return false; + } catch(Exception e) { + response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); + response.getWriter().write("예상치 못한 오류가 발생했습니다."); + return false; + } + } +} diff --git a/src/main/java/roomescape/auth/AuthConfig.java b/src/main/java/roomescape/auth/AuthConfig.java new file mode 100644 index 00000000..d3254f5c --- /dev/null +++ b/src/main/java/roomescape/auth/AuthConfig.java @@ -0,0 +1,17 @@ +package roomescape.auth; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import roomescape.api.JwtUtils; + +@Configuration +public class AuthConfig { + @Bean + public JwtUtils jwtProvider( + @Value("${roomescape.auth.jwt.secret}") + String secretKey + ) { + return new JwtUtils(secretKey); + } +} diff --git a/src/main/java/roomescape/auth/AuthService.java b/src/main/java/roomescape/auth/AuthService.java new file mode 100644 index 00000000..5d908b5e --- /dev/null +++ b/src/main/java/roomescape/auth/AuthService.java @@ -0,0 +1,22 @@ +package roomescape.auth; + +import org.springframework.stereotype.Service; +import roomescape.api.JwtDecoder; +import roomescape.member.dto.LoginMember; +import roomescape.member.Member; +import roomescape.member.MemberService; + +@Service +public class AuthService { + private MemberService memberService; + + public AuthService(MemberService memberService) { + this.memberService = memberService; + } + + public LoginMember getLoginMemberWithToken(String token) { + Long id = JwtDecoder.decodeJwtToken(token); + Member member = memberService.findById(id); + return new LoginMember(member.getId(), member.getName(), member.getEmail(), member.getPassword()); + } +} diff --git a/src/main/java/roomescape/config/InterceptorConfig.java b/src/main/java/roomescape/config/InterceptorConfig.java new file mode 100644 index 00000000..b2f5596d --- /dev/null +++ b/src/main/java/roomescape/config/InterceptorConfig.java @@ -0,0 +1,22 @@ +package roomescape.config; + +import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.config.annotation.InterceptorRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; +import roomescape.auth.AdminInterceptor; + +@Configuration +public class InterceptorConfig implements WebMvcConfigurer { + private AdminInterceptor adminInterceptor; + + + public InterceptorConfig(AdminInterceptor adminInterceptor) { + this.adminInterceptor = adminInterceptor; + } + + @Override + public void addInterceptors(InterceptorRegistry registry) { + registry.addInterceptor(adminInterceptor) + .addPathPatterns("/admin"); + } +} diff --git a/src/main/java/roomescape/config/LoginMemberArgumentResolver.java b/src/main/java/roomescape/config/LoginMemberArgumentResolver.java new file mode 100644 index 00000000..335366e2 --- /dev/null +++ b/src/main/java/roomescape/config/LoginMemberArgumentResolver.java @@ -0,0 +1,39 @@ +package roomescape.config; + +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletRequest; +import org.springframework.core.MethodParameter; +import org.springframework.stereotype.Component; +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.api.JwtDecoder; +import roomescape.auth.AuthService; +import roomescape.member.Member; +import roomescape.util.CookieUtil; + +@Component +public class LoginMemberArgumentResolver implements HandlerMethodArgumentResolver { + private AuthService authService; + + public LoginMemberArgumentResolver(AuthService authService) { + this.authService = authService; + } + + @Override + public boolean supportsParameter(MethodParameter parameter) { + return Member.class.isAssignableFrom(parameter.getParameterType()); + } + + @Override + public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer, NativeWebRequest webRequest, WebDataBinderFactory binderFactory) throws Exception { + HttpServletRequest request = webRequest.getNativeRequest(HttpServletRequest.class); + Cookie[] cookies = request.getCookies(); + String token = CookieUtil.extractTokenFromCookie(cookies); + if(token == null){ + return null; + } + return authService.getLoginMemberWithToken(token); + } +} diff --git a/src/main/java/roomescape/config/WebConfig.java b/src/main/java/roomescape/config/WebConfig.java new file mode 100644 index 00000000..d1e784cd --- /dev/null +++ b/src/main/java/roomescape/config/WebConfig.java @@ -0,0 +1,21 @@ +package roomescape.config; + +import org.springframework.context.annotation.Configuration; +import org.springframework.web.method.support.HandlerMethodArgumentResolver; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +import java.util.List; + +@Configuration +public class WebConfig implements WebMvcConfigurer { + private final LoginMemberArgumentResolver loginMemberArgumentResolver; + + public WebConfig(LoginMemberArgumentResolver loginMemberArgumentResolver) { + this.loginMemberArgumentResolver = loginMemberArgumentResolver; + } + + @Override + public void addArgumentResolvers(List resolvers) { + resolvers.add(loginMemberArgumentResolver); + } +} diff --git a/src/main/java/roomescape/exception/NotFoundException.java b/src/main/java/roomescape/exception/NotFoundException.java new file mode 100644 index 00000000..58eda6af --- /dev/null +++ b/src/main/java/roomescape/exception/NotFoundException.java @@ -0,0 +1,7 @@ +package roomescape.exception; + +public class NotFoundException extends RuntimeException { + public NotFoundException(String message) { + super(message); + } +} diff --git a/src/main/java/roomescape/exception/UnauthorizedException.java b/src/main/java/roomescape/exception/UnauthorizedException.java new file mode 100644 index 00000000..0aad343f --- /dev/null +++ b/src/main/java/roomescape/exception/UnauthorizedException.java @@ -0,0 +1,7 @@ +package roomescape.exception; + +public class UnauthorizedException extends RuntimeException { + public UnauthorizedException(String message) { + super(message); + } +} diff --git a/src/main/java/roomescape/member/Member.java b/src/main/java/roomescape/member/Member.java index 903aaa9b..a04dac05 100644 --- a/src/main/java/roomescape/member/Member.java +++ b/src/main/java/roomescape/member/Member.java @@ -1,6 +1,14 @@ package roomescape.member; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; + +@Entity public class Member { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; private String name; private String email; @@ -21,6 +29,18 @@ public Member(String name, String email, String password, String role) { this.role = role; } + public Member(Long id, String name, String email, String password, String role) { + this.id = id; + this.name = name; + this.email = email; + this.password = password; + this.role = role; + } + + public Member() { + + } + public Long getId() { return id; } diff --git a/src/main/java/roomescape/member/MemberController.java b/src/main/java/roomescape/member/MemberController.java index 881ae5e0..46547fa5 100644 --- a/src/main/java/roomescape/member/MemberController.java +++ b/src/main/java/roomescape/member/MemberController.java @@ -8,6 +8,9 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; +import roomescape.member.dto.MemberRequest; +import roomescape.member.dto.MemberResponse; +import roomescape.util.CookieUtil; import java.net.URI; @@ -20,11 +23,29 @@ public MemberController(MemberService memberService) { } @PostMapping("/members") - public ResponseEntity createMember(@RequestBody MemberRequest memberRequest) { - MemberResponse member = memberService.createMember(memberRequest); + public ResponseEntity createMember(@RequestBody MemberRequest.Create memberRequest) { + MemberResponse.Create member = memberService.createMember(memberRequest); return ResponseEntity.created(URI.create("/members/" + member.getId())).body(member); } + @PostMapping("/login") + public ResponseEntity login(@RequestBody MemberRequest.Login request, HttpServletResponse response) { + String token = memberService.loginMember(request); + Cookie cookie = new Cookie("token", token); + cookie.setHttpOnly(true); + cookie.setPath("/"); + response.addCookie(cookie); + return ResponseEntity.ok().build(); + } + + @GetMapping("/login/check") + public ResponseEntity checkLogin(HttpServletRequest request) { + Cookie[] cookies = request.getCookies(); + String token = CookieUtil.extractTokenFromCookie(cookies); + MemberResponse.Check response = memberService.checkMember(token); + return ResponseEntity.ok(response); + } + @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 81f77f4c..00000000 --- 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 00000000..8998370f --- /dev/null +++ b/src/main/java/roomescape/member/MemberRepository.java @@ -0,0 +1,10 @@ +package roomescape.member; + +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface MemberRepository extends JpaRepository { + + Member findByEmailAndPassword(String email, String password); +} diff --git a/src/main/java/roomescape/member/MemberRequest.java b/src/main/java/roomescape/member/MemberRequest.java deleted file mode 100644 index cafb79f1..00000000 --- a/src/main/java/roomescape/member/MemberRequest.java +++ /dev/null @@ -1,19 +0,0 @@ -package roomescape.member; - -public class MemberRequest { - private String name; - private String email; - private String password; - - public String getName() { - return name; - } - - public String getEmail() { - return email; - } - - public String getPassword() { - return password; - } -} diff --git a/src/main/java/roomescape/member/MemberResponse.java b/src/main/java/roomescape/member/MemberResponse.java deleted file mode 100644 index b9fa3b97..00000000 --- a/src/main/java/roomescape/member/MemberResponse.java +++ /dev/null @@ -1,25 +0,0 @@ -package roomescape.member; - -public class MemberResponse { - private Long id; - private String name; - private String email; - - public MemberResponse(Long id, String name, String email) { - this.id = id; - 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/MemberService.java b/src/main/java/roomescape/member/MemberService.java index ccaa8cba..2a5ec3f0 100644 --- a/src/main/java/roomescape/member/MemberService.java +++ b/src/main/java/roomescape/member/MemberService.java @@ -1,17 +1,53 @@ package roomescape.member; import org.springframework.stereotype.Service; +import roomescape.api.JwtDecoder; +import roomescape.api.JwtUtils; +import roomescape.exception.NotFoundException; +import roomescape.member.dto.MemberRequest; +import roomescape.member.dto.MemberResponse; @Service public class MemberService { - private MemberDao memberDao; + private MemberRepository memberRepository; + private JwtUtils jwtUtils; - public MemberService(MemberDao memberDao) { - this.memberDao = memberDao; + public MemberService(MemberRepository memberRepository, JwtUtils jwtUtils) { + this.memberRepository = memberRepository; + this.jwtUtils = jwtUtils; } - 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()); + public MemberResponse.Create createMember(MemberRequest.Create memberRequest) { + Member member = memberRepository.save(new Member(memberRequest.getName(), memberRequest.getEmail(), memberRequest.getPassword(), "USER")); + return new MemberResponse.Create(member.getId(), member.getName(), member.getEmail()); + } + + public String loginMember(MemberRequest.Login request) { + Member member = memberRepository.findByEmailAndPassword(request.getEmail(), request.getPassword()); + if(member == null){ + throw new NotFoundException("유저를 찾을 수 없습니다."); + } + return jwtUtils.createToken(member); + } + + public MemberResponse.Check checkMember(String token) { + Long memberId = JwtDecoder.decodeJwtToken(token); + Member member = memberRepository.findById(memberId) + .orElseThrow(() -> new NotFoundException("유저가 없습니다.")); + + return MemberResponse.Check.from(member); + } + + public Member findById(Long id) { + return memberRepository.findById(id) + .orElseThrow(() -> new NotFoundException("유저가 없습니다.")); + } + + public Member findByEmailAndPassword(String email, String password) { + Member member = memberRepository.findByEmailAndPassword(email, password); + if(member == null ){ + throw new NotFoundException("유저를 찾을 수 없습니다."); + } + return member; } } diff --git a/src/main/java/roomescape/member/dto/LoginMember.java b/src/main/java/roomescape/member/dto/LoginMember.java new file mode 100644 index 00000000..76eaa091 --- /dev/null +++ b/src/main/java/roomescape/member/dto/LoginMember.java @@ -0,0 +1,9 @@ +package roomescape.member.dto; + +import roomescape.member.Member; + +public class LoginMember extends Member { + public LoginMember(Long id, String name, String email, String password) { + super(id, name, email, password); + } +} diff --git a/src/main/java/roomescape/member/dto/MemberRequest.java b/src/main/java/roomescape/member/dto/MemberRequest.java new file mode 100644 index 00000000..a2197ede --- /dev/null +++ b/src/main/java/roomescape/member/dto/MemberRequest.java @@ -0,0 +1,39 @@ +package roomescape.member.dto; + +public class MemberRequest { + public static class Create { + private String name; + private String email; + private String password; + + public String getName() { + return name; + } + + public String getEmail() { + return email; + } + + public String getPassword() { + return password; + } + } + + public static class Login { + private String email; + private String password; + + public Login(String email, String password) { + this.email = email; + this.password = password; + } + + public String getEmail() { + return email; + } + + public String getPassword() { + return password; + } + } +} diff --git a/src/main/java/roomescape/member/dto/MemberResponse.java b/src/main/java/roomescape/member/dto/MemberResponse.java new file mode 100644 index 00000000..feb75251 --- /dev/null +++ b/src/main/java/roomescape/member/dto/MemberResponse.java @@ -0,0 +1,47 @@ +package roomescape.member.dto; + +import roomescape.member.Member; + +public class MemberResponse { + + public static class Create { + private Long id; + private String name; + private String email; + + public Create(Long id, String name, String email) { + this.id = id; + this.name = name; + this.email = email; + } + + public Long getId() { + return id; + } + + public String getName() { + return name; + } + + public String getEmail() { + return email; + } + } + + public static class Check { + private String name; + + public Check(String name) { + this.name = name; + } + + public String getName() { + return name; + } + + public static Check from(Member member) { + return new Check(member.getName()); + } + } + +} diff --git a/src/main/java/roomescape/reservation/Reservation.java b/src/main/java/roomescape/reservation/Reservation.java index 83a7edf1..986ceac6 100644 --- a/src/main/java/roomescape/reservation/Reservation.java +++ b/src/main/java/roomescape/reservation/Reservation.java @@ -1,26 +1,45 @@ package roomescape.reservation; +import jakarta.persistence.*; +import roomescape.member.Member; import roomescape.theme.Theme; import roomescape.time.Time; +import javax.annotation.processing.Generated; + +@Entity public class Reservation { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; private String name; private String date; + + @ManyToOne + @JoinColumn(name = "member_id") + private Member member; + + @ManyToOne + @JoinColumn(name = "time_id") private Time time; + + @ManyToOne + @JoinColumn(name = "theme_id") private Theme theme; - public Reservation(Long id, String name, String date, Time time, Theme theme) { + public Reservation(Long id, String name, String date, Member member, Time time, Theme theme) { this.id = id; this.name = name; this.date = date; + this.member = member; this.time = time; this.theme = theme; } - public Reservation(String name, String date, Time time, Theme theme) { + public Reservation(String name, String date, Time time, Theme theme, Member member) { this.name = name; this.date = date; + this.member = member; this.time = time; this.theme = theme; } @@ -41,6 +60,10 @@ public String getDate() { return date; } + public Member getMember() { + return member; + } + public Time getTime() { return time; } diff --git a/src/main/java/roomescape/reservation/ReservationController.java b/src/main/java/roomescape/reservation/ReservationController.java index b3bef399..c2a8fd77 100644 --- a/src/main/java/roomescape/reservation/ReservationController.java +++ b/src/main/java/roomescape/reservation/ReservationController.java @@ -7,6 +7,10 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; +import roomescape.member.dto.LoginMember; +import roomescape.reservation.dto.MyReservationResponse; +import roomescape.reservation.dto.ReservationRequest; +import roomescape.reservation.dto.ReservationResponse; import java.net.URI; import java.util.List; @@ -26,16 +30,24 @@ public List list() { } @PostMapping("/reservations") - public ResponseEntity create(@RequestBody ReservationRequest reservationRequest) { - if (reservationRequest.getName() == null - || reservationRequest.getDate() == null + public ResponseEntity create(@RequestBody ReservationRequest reservationRequest, LoginMember member) { + + if(reservationRequest.getDate() == null || reservationRequest.getTheme() == null || reservationRequest.getTime() == null) { return ResponseEntity.badRequest().build(); } + + if(reservationRequest.getName() == null){ + reservationRequest.setName(member.getName()); + } + if(reservationRequest.getMember() == null) { + reservationRequest.setMember(member.getId()); + } + ReservationResponse reservation = reservationService.save(reservationRequest); - return ResponseEntity.created(URI.create("/reservations/" + reservation.getId())).body(reservation); + return ResponseEntity.created(URI.create("/reservations/" + reservation.getName())).body(reservation); } @DeleteMapping("/reservations/{id}") @@ -43,4 +55,9 @@ public ResponseEntity delete(@PathVariable Long id) { reservationService.deleteById(id); return ResponseEntity.noContent().build(); } + + @GetMapping("/reservations-mine") + public List findMyReservations(LoginMember loginMember) { + return reservationService.findAllByMember(loginMember); + } } diff --git a/src/main/java/roomescape/reservation/ReservationDao.java b/src/main/java/roomescape/reservation/ReservationDao.java deleted file mode 100644 index a4972430..00000000 --- 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 00000000..4d867fd2 --- /dev/null +++ b/src/main/java/roomescape/reservation/ReservationRepository.java @@ -0,0 +1,12 @@ +package roomescape.reservation; + +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +import java.util.List; + +@Repository +public interface ReservationRepository extends JpaRepository { + List findByDateAndThemeId(String date, Long themeId); + List findByMemberId(Long memberId); +} diff --git a/src/main/java/roomescape/reservation/ReservationRequest.java b/src/main/java/roomescape/reservation/ReservationRequest.java deleted file mode 100644 index 19f44124..00000000 --- a/src/main/java/roomescape/reservation/ReservationRequest.java +++ /dev/null @@ -1,24 +0,0 @@ -package roomescape.reservation; - -public class ReservationRequest { - private String name; - private String date; - private Long theme; - private Long time; - - public String getName() { - return name; - } - - public String getDate() { - return date; - } - - public Long getTheme() { - return theme; - } - - public Long getTime() { - return time; - } -} diff --git a/src/main/java/roomescape/reservation/ReservationService.java b/src/main/java/roomescape/reservation/ReservationService.java index bd331332..abb127bc 100644 --- a/src/main/java/roomescape/reservation/ReservationService.java +++ b/src/main/java/roomescape/reservation/ReservationService.java @@ -1,30 +1,99 @@ package roomescape.reservation; import org.springframework.stereotype.Service; +import roomescape.exception.NotFoundException; +import roomescape.member.dto.LoginMember; +import roomescape.member.Member; +import roomescape.member.MemberRepository; +import roomescape.reservation.dto.MyReservationResponse; +import roomescape.reservation.dto.ReservationRequest; +import roomescape.reservation.dto.ReservationResponse; +import roomescape.theme.Theme; +import roomescape.theme.ThemeRepository; +import roomescape.time.Time; +import roomescape.time.TimeRepository; +import roomescape.waiting.WaitingRepository; +import roomescape.waiting.dto.WaitingWithRank; +import java.util.Comparator; import java.util.List; +import java.util.Optional; +import java.util.stream.Stream; @Service public class ReservationService { - private ReservationDao reservationDao; + private ReservationRepository reservationRepository; + private TimeRepository timeRepository; + private ThemeRepository themeRepository; + private MemberRepository memberRepository; + private WaitingRepository waitingRepository; - public ReservationService(ReservationDao reservationDao) { - this.reservationDao = reservationDao; + public ReservationService(ReservationRepository reservationRepository, TimeRepository timeRepository, ThemeRepository themeRepository, MemberRepository memberRepository, WaitingRepository waitingRepository) { + this.reservationRepository = reservationRepository; + this.timeRepository = timeRepository; + this.themeRepository = themeRepository; + this.memberRepository = memberRepository; + this.waitingRepository = waitingRepository; } public ReservationResponse save(ReservationRequest reservationRequest) { - Reservation reservation = reservationDao.save(reservationRequest); + + Time time = timeRepository.findById(reservationRequest.getTime()).orElseThrow(RuntimeException::new); + Theme theme = themeRepository.findById(reservationRequest.getTheme()).orElseThrow(RuntimeException::new); + Member member = memberRepository.findById(reservationRequest.getMember()).orElseThrow(RuntimeException::new); + + Reservation reservation = reservationRepository.save(new Reservation( + reservationRequest.getName(), + reservationRequest.getDate(), + time, + theme, + member + )); return new ReservationResponse(reservation.getId(), reservationRequest.getName(), reservation.getTheme().getName(), reservation.getDate(), reservation.getTime().getValue()); } public void deleteById(Long id) { - reservationDao.deleteById(id); + reservationRepository.deleteById(id); } public List findAll() { - return reservationDao.findAll().stream() + return reservationRepository.findAll().stream() .map(it -> new ReservationResponse(it.getId(), it.getName(), it.getTheme().getName(), it.getDate(), it.getTime().getValue())) .toList(); } + + public List findAllByMember(LoginMember loginMember) { + List responseList = + reservationRepository.findByMemberId(loginMember.getId()) + .stream() + .map(reservation -> new MyReservationResponse( + reservation.getId(), + reservation.getTheme().getName(), + reservation.getTime().getValue(), + reservation.getDate(), + "예약")) + .toList(); + + List waitingList = + waitingRepository.findWaitingsWithRankByMemberId(loginMember.getId()).stream() + .map(this::covertWaitingWithRankToMyReservationResponse) + .toList(); + + return Stream.concat(responseList.stream(), waitingList.stream()) + .sorted(Comparator.comparing(MyReservationResponse::getDate)) + .toList(); + } + + private MyReservationResponse covertWaitingWithRankToMyReservationResponse( + WaitingWithRank waitingWithRank + ) { + return new MyReservationResponse( + waitingWithRank.getWaiting().getId(), + waitingWithRank.getWaiting().getTheme().getName(), + waitingWithRank.getWaiting().getTime().getValue(), + waitingWithRank.getWaiting().getDate(), + (waitingWithRank.getRank() + 1) + "번째 예약대기" + ); + } } diff --git a/src/main/java/roomescape/reservation/dto/MyReservationResponse.java b/src/main/java/roomescape/reservation/dto/MyReservationResponse.java new file mode 100644 index 00000000..8c18f2f6 --- /dev/null +++ b/src/main/java/roomescape/reservation/dto/MyReservationResponse.java @@ -0,0 +1,40 @@ +package roomescape.reservation.dto; + +public class MyReservationResponse { + private Long reservationId; + private String theme; + private String time; + private String date; + private String status; + + public MyReservationResponse() { + } + + public MyReservationResponse(Long reservationId, String theme, String time, String date, String status) { + this.reservationId = reservationId; + this.theme = theme; + this.time = time; + this.date = date; + this.status = status; + } + + public Long getReservationId() { + return reservationId; + } + + public String getTheme() { + return theme; + } + + public String getTime() { + return time; + } + + public String getDate() { + return date; + } + + public String getStatus() { + return status; + } +} diff --git a/src/main/java/roomescape/reservation/dto/ReservationRequest.java b/src/main/java/roomescape/reservation/dto/ReservationRequest.java new file mode 100644 index 00000000..5fc3094f --- /dev/null +++ b/src/main/java/roomescape/reservation/dto/ReservationRequest.java @@ -0,0 +1,44 @@ +package roomescape.reservation.dto; + +import roomescape.theme.Theme; +import roomescape.time.Time; + +public class ReservationRequest { + private Long member; + private String name; + private String date; + private Long theme; + private Long time; + + public ReservationRequest() { + + } + + public void setName(String name) { + this.name = name; + } + + public void setMember(Long member) { + this.member = member; + } + + public Long getMember() { + return member; + } + + public String getName() { + return name; + } + + public String getDate() { + return date; + } + + public Long getTheme() { + return theme; + } + + public Long getTime() { + return time; + } +} diff --git a/src/main/java/roomescape/reservation/ReservationResponse.java b/src/main/java/roomescape/reservation/dto/ReservationResponse.java similarity index 94% rename from src/main/java/roomescape/reservation/ReservationResponse.java rename to src/main/java/roomescape/reservation/dto/ReservationResponse.java index 41360a36..2c219d01 100644 --- a/src/main/java/roomescape/reservation/ReservationResponse.java +++ b/src/main/java/roomescape/reservation/dto/ReservationResponse.java @@ -1,4 +1,4 @@ -package roomescape.reservation; +package roomescape.reservation.dto; public class ReservationResponse { private Long id; diff --git a/src/main/java/roomescape/theme/Theme.java b/src/main/java/roomescape/theme/Theme.java index 430a6239..1063c86d 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.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; + +@Entity public class Theme { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; private String name; private String description; diff --git a/src/main/java/roomescape/theme/ThemeController.java b/src/main/java/roomescape/theme/ThemeController.java index 03bca41a..f336ffe8 100644 --- a/src/main/java/roomescape/theme/ThemeController.java +++ b/src/main/java/roomescape/theme/ThemeController.java @@ -13,26 +13,26 @@ @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); } @GetMapping("/themes") public ResponseEntity> list() { - return ResponseEntity.ok(themeDao.findAll()); + return ResponseEntity.ok(themeRepository.findAll()); } @DeleteMapping("/themes/{id}") public ResponseEntity deleteTheme(@PathVariable Long id) { - themeDao.deleteById(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 945341d8..00000000 --- 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 00000000..f6f9979b --- /dev/null +++ b/src/main/java/roomescape/theme/ThemeRepository.java @@ -0,0 +1,9 @@ +package roomescape.theme; + +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface ThemeRepository extends JpaRepository { + +} diff --git a/src/main/java/roomescape/time/Time.java b/src/main/java/roomescape/time/Time.java index 008ed93c..f63fb90f 100644 --- a/src/main/java/roomescape/time/Time.java +++ b/src/main/java/roomescape/time/Time.java @@ -1,7 +1,13 @@ package roomescape.time; +import jakarta.persistence.*; + +@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) { diff --git a/src/main/java/roomescape/time/TimeDao.java b/src/main/java/roomescape/time/TimeDao.java deleted file mode 100644 index f39a9a32..00000000 --- a/src/main/java/roomescape/time/TimeDao.java +++ /dev/null @@ -1,41 +0,0 @@ -package roomescape.time; - -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.sql.PreparedStatement; -import java.util.List; - -@Repository -public class TimeDao { - private final JdbcTemplate jdbcTemplate; - - public TimeDao(JdbcTemplate jdbcTemplate) { - this.jdbcTemplate = jdbcTemplate; - } - - public List