[Spring Core]주병주 미션 제출합니다.

src/main/java/auth/AuthConfig.java

@@ -0,0 +1,14 @@
+package auth;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class AuthConfig {
+
+    @Bean
+    public JwtUtils jwtUtils(@Value("${roomescape.auth.jwt.secret}") String secretKey) {
+        return new JwtUtils(secretKey);
+    }
+}

src/main/java/roomescape/jwt/JwtTokenMember.java → src/main/java/auth/JwtTokenMember.java

@@ -1,4 +1,4 @@
-package roomescape.jwt;
+package auth;
 
 public record JwtTokenMember(
         String name,

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

@@ -1,17 +1,17 @@
-package roomescape.jwt;
+package auth;
 
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.security.Keys;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
 import roomescape.member.Member;
 
-@Component
-public class JwtController {
+public class JwtUtils {
 
-    @Value("${roomescape.auth.jwt.secret}")
-    private String secretKey;
+    private final String secretKey;
+
+    public JwtUtils(String secretKey) {
+        this.secretKey = secretKey;
+    }
 
     public String createToken(Member member){
         return Jwts.builder()

src/main/java/roomescape/Login/LoginService.java

@@ -2,8 +2,7 @@
 
 import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
-import roomescape.jwt.JwtController;
-import roomescape.jwt.JwtTokenMember;
+import auth.JwtUtils;
 import roomescape.member.Member;
 import roomescape.member.MemberRepository;
 import roomescape.member.MemberResponse;
@@ -13,24 +12,24 @@
 @Service
 public class LoginService {
     private final MemberRepository memberRepository;
-    private final JwtController jwtController;
+    private final JwtUtils jwtUtils;
 
-    public LoginService(MemberRepository memberRepository, JwtController jwtController) {
+    public LoginService(MemberRepository memberRepository, JwtUtils jwtUtils) {
         this.memberRepository = memberRepository;
-        this.jwtController = jwtController;
+        this.jwtUtils = jwtUtils;
     }
 
     public String login(LoginRequest loginRequest) {
         try {
             Optional<Member> member = memberRepository.findByEmailAndPassword(loginRequest.email(), loginRequest.password());
-            return jwtController.createToken(member.get());
+            return jwtUtils.createToken(member.get());
         } catch (DataAccessException e){
             throw new IllegalArgumentException("로그인 정보가 일치하지 않습니다.");
         }
     }
 
     public MemberResponse checkLogin(String token) {
-        Long userId = jwtController.decodeToken(token);
+        Long userId = jwtUtils.decodeToken(token);
         try {
             Optional<Member> member = memberRepository.findById(userId);
             return new MemberResponse(member.get().getId(), member.get().getName(), member.get().getEmail());

src/main/java/roomescape/RoomescapeApplication.java

@@ -1,9 +1,12 @@
 package roomescape;
 
+import auth.AuthConfig;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Import;
 
 @SpringBootApplication
+@Import(AuthConfig.class)
 public class RoomescapeApplication {
     public static void main(String[] args) {
         SpringApplication.run(RoomescapeApplication.class, args);

src/main/java/roomescape/data/DataLoader.java

@@ -0,0 +1,24 @@
+package roomescape.data;
+
+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 final MemberRepository memberRepository;
+
+    public DataLoader(final MemberRepository memberRepository) {
+        this.memberRepository = memberRepository;
+    }
+
+    @Override
+    public void run(final String... args) throws Exception {
+        final Member member1 = memberRepository.save(new Member("어드민", "[email protected]", "password", "ADMIN"));
+        final Member member2 = memberRepository.save(new Member("브라운", "[email protected]", "password", "USER"));
+    }
+}

src/main/java/roomescape/data/TestDataLoader.java

@@ -0,0 +1,59 @@
+package roomescape.data;
+
+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 final MemberRepository memberRepository;
+
+    private final ThemeRepository themeRepository;
+
+    private final TimeRepository timeRepository;
+
+    private final ReservationRepository reservationRepository;
+
+    public TestDataLoader(final MemberRepository memberRepository,
+                          final ThemeRepository themeRepository,
+                          final TimeRepository timeRepository,
+                          final ReservationRepository reservationRepository) {
+        this.memberRepository = memberRepository;
+        this.themeRepository = themeRepository;
+        this.timeRepository = timeRepository;
+        this.reservationRepository = reservationRepository;
+    }
+
+    @Override
+    public void run(final String... args) throws Exception {
+        final Member member1 = memberRepository.save(new Member("어드민", "[email protected]", "password", "ADMIN"));
+        final Member member2 = memberRepository.save(new Member("브라운", "[email protected]", "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", member1, time1, theme1));
+        reservationRepository.save(new Reservation("어드민", "2024-03-01", member1, time2, theme2));
+        reservationRepository.save(new Reservation("어드민", "2024-03-01", member1, time3, theme3));
+
+        reservationRepository.save(new Reservation("브라운", "2024-03-01", member2, time4, theme1));
+    }
+}

src/main/java/roomescape/interceptor/AuthInterceptor.java

@@ -14,7 +14,7 @@
 @Component
 public class AuthInterceptor implements HandlerInterceptor {
 
-    private LoginService loginService;
+    private final LoginService loginService;
 
     public AuthInterceptor(LoginService loginService) {
         this.loginService = loginService;

src/main/java/roomescape/member/MemberRepository.java

@@ -8,4 +8,5 @@
 public interface MemberRepository extends JpaRepository<Member, Long> {
     Optional<Member> findByEmailAndPassword(String email, String password);
     List<Member> findByName(String name);
-}
+}
+

src/main/java/roomescape/reservation/ReservationController.java

@@ -1,12 +1,9 @@
 package roomescape.reservation;
 
-import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import roomescape.Login.LoginMember;
-import roomescape.jwt.JwtController;
-import roomescape.jwt.JwtTokenMember;
-import roomescape.member.MemberResponse;
+import auth.JwtUtils;
 
 import java.net.URI;
 import java.util.List;
@@ -15,11 +12,11 @@
 public class ReservationController {
 
     private final ReservationService reservationService;
-    private final JwtController jwtController;
+    private final JwtUtils jwtUtils;
 
-    public ReservationController(ReservationService reservationService,JwtController jwtController) {
+    public ReservationController(ReservationService reservationService, JwtUtils jwtUtils) {
         this.reservationService = reservationService;
-        this.jwtController = jwtController;
+        this.jwtUtils = jwtUtils;
     }
 
     @GetMapping("/reservations")

src/test/java/roomescape/JpaTest.java

@@ -2,6 +2,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;
 import roomescape.time.Time;
@@ -16,6 +17,9 @@ public class JpaTest {
     @Autowired
     private TimeRepository timeRepository;
 
+    @Value("${roomescape.auth.jwt.secret}")
+    private String secretKey;
+
     @Test
     void 사단계() {
         Time time = new Time("10:00");
@@ -25,5 +29,10 @@ public class JpaTest {
 
         assertThat(persistTime.getValue()).isEqualTo(time.getValue());
     }
+
+    @Test
+    void 팔단계() {
+        assertThat(secretKey).isNotBlank();
+    }
 }
 

src/test/java/roomescape/MissionStepTest.java

@@ -1,11 +1,13 @@
 package roomescape;
 
+import auth.JwtUtils;
 import io.restassured.RestAssured;
 import io.restassured.http.ContentType;
 import io.restassured.response.ExtractableResponse;
 import io.restassured.response.Response;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.stereotype.Component;
 import org.springframework.test.annotation.DirtiesContext;
 import roomescape.reservation.MyReservationResponse;
 import roomescape.reservation.ReservationResponse;
@@ -157,6 +159,12 @@ public class MissionStepTest {
         assertThat(status).isEqualTo("1번째 예약대기");
     }
 
+    @Test
+    void 칠단계() {
+        Component componentAnnotation = JwtUtils.class.getAnnotation(Component.class);
+        assertThat(componentAnnotation).isNull();
+    }
+
     private String createToken(String email, String password) {
         Map<String, String> params = new HashMap<>();
         params.put("email", email);