[Spring Core] 한명수 미션 제출합니다.

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;
+
+@Component
+@Profile("product")
+public class DataLoader implements CommandLineRunner {
+
+	private final MemberRepository memberRepository;
+
+	public DataLoader(MemberRepository memberRepository) {
+		this.memberRepository = memberRepository;
+
+	}
+
+	@Override
+	public void run(String... args) {
+		Member admin = new Member("어드민", "[email protected]", "password", "ADMIN");
+		Member brown = new Member("브라운", "[email protected]", "password", "USER");
+		memberRepository.save(admin);
+		memberRepository.save(brown);
+	}
+}

src/main/java/roomescape/TestDataLoader.java

@@ -0,0 +1,66 @@
+package roomescape;
+
+import java.util.Arrays;
+import java.util.List;
+
+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;
+
+@Component
+@Profile("test")
+public class TestDataLoader implements CommandLineRunner {
+
+	private final MemberRepository memberRepository;
+	private final ThemeRepository themeRepository;
+	private final TimeRepository timeRepository;
+	private final 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) {
+		Member admin = new Member("어드민", "[email protected]", "password", "ADMIN");
+		Member brown = new Member("브라운", "[email protected]", "password", "USER");
+		memberRepository.saveAll(Arrays.asList(admin, brown));
+
+		Theme theme1 = new Theme("테마1", "테마1입니다.");
+		Theme theme2 = new Theme("테마2", "테마2입니다.");
+		Theme theme3 = new Theme("테마3", "테마3입니다.");
+		themeRepository.saveAll(Arrays.asList(theme1, theme2, theme3));
+
+		List<Time> times = Arrays.asList(
+			new Time("10:00"),
+			new Time("12:00"),
+			new Time("14:00"),
+			new Time("16:00"),
+			new Time("18:00"),
+			new Time("20:00")
+		);
+		timeRepository.saveAll(times);
+
+		Reservation reservation1 = new Reservation("admin", "2024-03-01", times.get(0), theme1);
+		Reservation reservation2 = new Reservation("admin", "2024-03-01", times.get(1), theme2);
+		Reservation reservation3 = new Reservation("admin", "2024-03-01", times.get(2), theme3);
+		Reservation reservation4 = new Reservation("brown", "2024-03-01", times.get(0), theme2);
+
+		reservationRepository.saveAll(Arrays.asList(reservation1, reservation2, reservation3, reservation4));
+	}
+}
+
+

src/main/java/roomescape/auth/AdminInterceptor.java

@@ -5,23 +5,24 @@
 
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
-import roomescape.jwt.JwtUtil;
 import roomescape.member.Member;
 import roomescape.member.MemberService;
 
 @Component
 public class AdminInterceptor implements HandlerInterceptor {
 
 	private MemberService memberService;
+	private final JwtUtils jwtUtils;
 
-	public AdminInterceptor(MemberService memberService) {
+	public AdminInterceptor(JwtUtils jwtUtils, MemberService memberService) {
+		this.jwtUtils = jwtUtils;
 		this.memberService = memberService;
 	}
 
 	@Override
 	public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws
 		Exception {
-		String token = JwtUtil.extractTokenFromCookie(request.getCookies());
+		String token = jwtUtils.extractTokenFromCookie(request.getCookies());
 		Member member = memberService.getMemberFromToken(token);
 		if (member == null || !member.getRole().equals("ADMIN")) {
 			response.setStatus(401);

src/main/java/roomescape/auth/JwtConfiguration.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;
+
+@Configuration
+public class JwtConfiguration {
+
+	@Value("${roomescape.auth.jwt.secret}")
+	private String secretKey;
+
+	@Bean
+	public JwtUtils jwtUtils() {
+		return new JwtUtils();
+	}
+}

src/main/java/roomescape/jwt/JwtUtil.java → src/main/java/roomescape/auth/JwtUtils.java

@@ -1,25 +1,33 @@
-package roomescape.jwt;
+package roomescape.auth;
 
 import java.util.Arrays;
 
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
 
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.security.Keys;
 import jakarta.servlet.http.Cookie;
+import roomescape.member.Member;
 
-@Component
-public class JwtUtil {
+public class JwtUtils {
 
-	private static String secretKey;
+	private String secretKey;
 
 	@Value("${roomescape.auth.jwt.secret}")
 	public void setSecretKey(String secretKey) {
-		JwtUtil.secretKey = secretKey;
+		this.secretKey = secretKey;
 	}
 
-	public static String extractTokenFromCookie(Cookie[] cookies) {
+	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();
+	}
+
+	public String extractTokenFromCookie(Cookie[] cookies) {
 		if (cookies == null) {
 			throw new IllegalArgumentException("Cookies array is null");
 		}
@@ -31,7 +39,7 @@ public static String extractTokenFromCookie(Cookie[] cookies) {
 			.orElseThrow(() -> new IllegalArgumentException("Token cookie not found"));
 	}
 
-	public static Long getIdFromToken(String token) {
+	public Long getIdFromToken(String token) {
 		return Long.valueOf(Jwts.parserBuilder()
 			.setSigningKey(Keys.hmacShaKeyFor(secretKey.getBytes()))
 			.build()

src/main/java/roomescape/auth/LoginMemberArgumentResolver.java

@@ -9,17 +9,18 @@
 
 import jakarta.servlet.http.Cookie;
 import jakarta.servlet.http.HttpServletRequest;
-import roomescape.jwt.JwtUtil;
 import roomescape.member.Member;
 import roomescape.member.MemberService;
 
 @Component
 public class LoginMemberArgumentResolver implements HandlerMethodArgumentResolver {
 
 	private final MemberService memberService;
+	private final JwtUtils jwtUtils;
 
-	public LoginMemberArgumentResolver(MemberService memberService) {
+	public LoginMemberArgumentResolver(MemberService memberService, JwtUtils jwtUtils) {
 		this.memberService = memberService;
+		this.jwtUtils = jwtUtils;
 	}
 
 	@Override
@@ -32,7 +33,7 @@ public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer m
 		NativeWebRequest webRequest, WebDataBinderFactory binderFactory) throws Exception {
 		HttpServletRequest request = webRequest.getNativeRequest(HttpServletRequest.class);
 		Cookie[] cookies = request.getCookies();
-		String token = JwtUtil.extractTokenFromCookie(cookies);
+		String token = jwtUtils.extractTokenFromCookie(cookies);
 		if (token == null) {
 			return null;
 		}

src/main/java/roomescape/member/MemberController.java

@@ -11,13 +11,16 @@
 import jakarta.servlet.http.Cookie;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
-import roomescape.jwt.JwtUtil;
+import roomescape.auth.JwtUtils;
 
 @RestController
 public class MemberController {
+
 	private MemberService memberService;
+	private final JwtUtils jwtUtils;
 
-	public MemberController(MemberService memberService) {
+	public MemberController(JwtUtils jwtUtils, MemberService memberService) {
+		this.jwtUtils = jwtUtils;
 		this.memberService = memberService;
 	}
 
@@ -39,7 +42,7 @@ public void login(@RequestBody MemberLoginRequest request, HttpServletResponse r
 	@GetMapping("/login/check")
 	public MemberCheckResponse checkLogin(HttpServletRequest request) {
 		Cookie[] cookies = request.getCookies();
-		String token = JwtUtil.extractTokenFromCookie(cookies);
+		String token = jwtUtils.extractTokenFromCookie(cookies);
 		return memberService.checkMember(token);
 	}
 

src/main/java/roomescape/member/MemberService.java

@@ -3,34 +3,33 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import roomescape.jwt.JwtProvider;
-import roomescape.jwt.JwtUtil;
+import roomescape.auth.JwtUtils;
 
 @Service
 public class MemberService {
 
 	private final MemberRepository memberRepository;
-	private final JwtProvider jwtProvider;
+	private final JwtUtils jwtUtils;
 
 	@Autowired
-	public MemberService(MemberRepository memberRepository, JwtProvider jwtProvider) {
+	public MemberService(MemberRepository memberRepository, JwtUtils jwtUtils) {
 		this.memberRepository = memberRepository;
-		this.jwtProvider = jwtProvider;
+		this.jwtUtils = jwtUtils;
 	}
 
 	public String login(MemberLoginRequest request) {
 		Member member = memberRepository.getByEmailAndPassword(request.email(), request.password());
-		return jwtProvider.createToken(member);
+		return jwtUtils.createToken(member);
 	}
 
 	public MemberCheckResponse checkMember(String token) {
-		Long memberId = JwtUtil.getIdFromToken(token);
+		Long memberId = jwtUtils.getIdFromToken(token);
 		Member member = memberRepository.getById(memberId);
 		return new MemberCheckResponse(member.getName());
 	}
 
 	public Member getMemberFromToken(String token) {
-		Long memberId = JwtUtil.getIdFromToken(token);
+		Long memberId = jwtUtils.getIdFromToken(token);
 		return memberRepository.findById(memberId).orElseThrow(() -> new IllegalArgumentException("Invalid member"));
 	}
 

src/main/resources/application.properties

@@ -7,3 +7,6 @@ spring.jpa.show-sql=true
 spring.jpa.properties.hibernate.format_sql=true
 spring.jpa.ddl-auto=create-drop
 spring.jpa.defer-datasource-initialization=true
+spring.profiles.active=product
+
+

src/test/java/roomescape/JpaTest.java

@@ -4,6 +4,7 @@
 
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
 import org.springframework.boot.test.autoconfigure.orm.jpa.TestEntityManager;
 
@@ -18,6 +19,9 @@ public class JpaTest {
 	@Autowired
 	private TimeRepository timeRepository;
 
+	@Value("${roomescape.auth.jwt.secret}")
+	private String secretKey;
+
 	@Test
 	void 사단계() {
 		Time time = new Time("10:00");
@@ -28,5 +32,10 @@ public class JpaTest {
 
 		assertThat(persistTime.getTime()).isEqualTo(time.getTime());
 	}
+
+	@Test
+	void 팔단계() {
+		assertThat(secretKey).isNotBlank();
+	}
 }