refactor: 기존 오류 및 로직 리팩토링

developowl · developowl · commit abdef60501e3 · 2025-01-17T17:56:26.000+09:00
diff --git a/src/main/java/auth/JwtAuthManager.java b/src/main/java/auth/JwtAuthManager.java
@@ -22,18 +22,15 @@ public JwtAuthManager(MemberRepository memberRepository) {
         this.memberRepository = memberRepository;
     }
 
-    public String createToken(String email) {
-        Member member = memberRepository.findByEmail(email)
+    public String createToken(String email, String password) {
+        Member member = memberRepository.findByEmailAndPassword(email, password)
                 .orElseThrow(() -> new AuthorizationException("유효한 이메일이 아닙니다."));
 
-        String role = member.getRole();
-        String name = member.getName();
         Long memberId = member.getId();
+        String role = member.getRole();
 
-        Claims claims = Jwts.claims().setSubject(email);
+        Claims claims = Jwts.claims().setSubject(String.valueOf(memberId));
         claims.put("role", role);
-        claims.put("name", name);
-        claims.put("memberId", memberId);
 
         Date now = new Date();
         Date validity = new Date(now.getTime() + validityInMilliseconds);
@@ -47,48 +44,27 @@ public String createToken(String email) {
     }
 
     public Long getId(String token) {
-        Object memberId = Jwts.parser()
+        JwtParser parser = Jwts.parserBuilder()
                 .setSigningKey(secretKey)
-                .parseClaimsJws(token)
-                .getBody()
-                .get("memberId");
-
-        if (memberId instanceof Double) {
-            return ((Double) memberId).longValue();
-        } else if (memberId instanceof Long) {
-            return (Long) memberId;
-        } else {
-            throw new IllegalArgumentException("유효한 memberId 형식이 아닙니다.");
-        }
-    }
+                .build();
 
-    public String getName(String token) {
-        return (String) Jwts.parser()
-                .setSigningKey(secretKey)
-                .parseClaimsJws(token)
-                .getBody()
-                .get("name");
-    }
-
-    public String getEmail(String token) {
-        return (String) Jwts.parser()
-                .setSigningKey(secretKey)
-                .parseClaimsJws(token)
-                .getBody()
-                .get("email");
+        Claims claims = parser.parseClaimsJws(token).getBody();
+        return Long.parseLong(claims.getSubject());
     }
 
     public String getRole(String token) {
-        return (String) Jwts.parser()
+        JwtParser parser = Jwts.parserBuilder()
                 .setSigningKey(secretKey)
-                .parseClaimsJws(token)
-                .getBody()
-                .get("role");
+                .build();
+
+        Claims claims = parser.parseClaimsJws(token).getBody();
+        return claims.get("role", String.class);
     }
 
     public void validateToken(String token) {
         try {
             Jws<Claims> claims = Jwts.parser().setSigningKey(secretKey).parseClaimsJws(token);
+
             if (claims.getBody().getExpiration().before(new Date())) {
 
                 throw new IllegalArgumentException("토큰이 만료되었습니다.");
@@ -97,4 +73,22 @@ public void validateToken(String token) {
             throw new IllegalArgumentException("유효하지 않은 토큰입니다.", e);
         }
     }
+
+//    public String getName(String token) {
+//        JwtParser parser = Jwts.parserBuilder()
+//                .setSigningKey(secretKey)
+//                .build();
+//
+//        Claims claims = parser.parseClaimsJws(token).getBody();
+//        return claims.get("name", String.class);
+//    }
+//
+//    public String getEmail(String token) {
+//        JwtParser parser = Jwts.parserBuilder()
+//                .setSigningKey(secretKey)
+//                .build();
+//
+//        Claims claims = parser.parseClaimsJws(token).getBody();
+//        return claims.get("email", String.class);
+//    }
 }
diff --git a/src/main/java/auth/LoginMemberArgumentResolver.java b/src/main/java/auth/LoginMemberArgumentResolver.java
@@ -7,16 +7,19 @@
 import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.method.support.HandlerMethodArgumentResolver;
 import org.springframework.web.method.support.ModelAndViewContainer;
+import roomescape.domain.member.MemberRepository;
 import roomescape.exception.AuthorizationException;
 import roomescape.domain.member.Member;
 
 import java.util.Arrays;
 
 public class LoginMemberArgumentResolver implements HandlerMethodArgumentResolver {
     private final JwtAuthManager jwtAuthManager;
+    private final MemberRepository memberRepository;
 
-    public LoginMemberArgumentResolver(JwtAuthManager jwtAuthManager) {
+    public LoginMemberArgumentResolver(JwtAuthManager jwtAuthManager, MemberRepository memberRepository) {
         this.jwtAuthManager = jwtAuthManager;
+        this.memberRepository = memberRepository;
     }
 
     @Override
@@ -35,11 +38,19 @@ public Object resolveArgument(MethodParameter parameter,
         jwtAuthManager.validateToken(token);
 
         Long id = jwtAuthManager.getId(token);
-        String name = jwtAuthManager.getName(token);
-        String email = jwtAuthManager.getEmail(token);
+
+        Member member = memberRepository.findById(id)
+                .orElseThrow(() -> new AuthorizationException("Member not found"));
+
+        String name = member.getName();
+
+        String email = member.getEmail();
+
+        String password = member.getPassword();
+
         String role = jwtAuthManager.getRole(token);
 
-        return new Member(id, name, email, role);
+        return new Member(id, name, email, password, role);
     }
 
     private String extractTokenFromCookies(Cookie[] cookies) {
diff --git a/src/main/java/roomescape/DataLoader.java b/src/main/java/roomescape/DataLoader.java
@@ -8,7 +8,7 @@
 
 @Profile("default") // 배포 환경 -> "prod", 로컬 환경 -> "default"
 @Component
-public abstract class DataLoader implements CommandLineRunner {
+public class DataLoader implements CommandLineRunner {
     private final MemberRepository memberRepository;
 
     public DataLoader(MemberRepository memberRepository) {
diff --git a/src/main/java/roomescape/TestDataLoader.java b/src/main/java/roomescape/TestDataLoader.java
@@ -15,7 +15,7 @@
 
 @Profile("test")
 @Component
-public abstract class TestDataLoader implements CommandLineRunner {
+public class TestDataLoader implements CommandLineRunner {
     private final MemberRepository memberRepository;
     private final ThemeRepository themeRepository;
     private final TimeRepository timeRepository;
diff --git a/src/main/java/roomescape/config/WebMvcConfig.java b/src/main/java/roomescape/config/WebMvcConfig.java
@@ -8,27 +8,29 @@
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 import auth.AdminAccessInterceptor;
 import auth.LoginMemberArgumentResolver;
+import roomescape.domain.member.MemberRepository;
 
 import java.util.List;
 
 @Configuration
 @ComponentScan(basePackages = {"roomescape", "auth"})
 public class WebMvcConfig implements WebMvcConfigurer {
     private final JwtAuthManager jwtAuthManager;
+    private final MemberRepository memberRepository;
 
-    public WebMvcConfig(JwtAuthManager jwtAuthManager) {
+    public WebMvcConfig(JwtAuthManager jwtAuthManager, MemberRepository memberRepository) {
         this.jwtAuthManager = jwtAuthManager;
+        this.memberRepository = memberRepository;
     }
 
     @Override
     public void addArgumentResolvers(List<HandlerMethodArgumentResolver> resolvers) {
-        resolvers.add(new LoginMemberArgumentResolver(jwtAuthManager));
+        resolvers.add(new LoginMemberArgumentResolver(jwtAuthManager, memberRepository));
     }
 
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
         registry.addInterceptor(new AdminAccessInterceptor(jwtAuthManager))
-                .addPathPatterns("/admin/**")
-                .excludePathPatterns("/login");
+                .addPathPatterns("/admin/**");
     }
 }
diff --git a/src/main/java/roomescape/controller/LoginController.java b/src/main/java/roomescape/controller/LoginController.java
@@ -22,16 +22,16 @@ public LoginController(JwtAuthManager jwtAuthManager) {
     }
 
     @PostMapping("/login")
-    public ResponseEntity<LoginResponse> login(@RequestBody LoginRequest LoginRequest, HttpServletResponse response) {
-        String token = jwtAuthManager.createToken(LoginRequest.getEmail());
+    public ResponseEntity<Void> login(@RequestBody LoginRequest loginRequest, HttpServletResponse response) {
+        String token = jwtAuthManager.createToken(loginRequest.getEmail(), loginRequest.getPassword());
 
         Cookie cookie = new Cookie("token", token);
         cookie.setHttpOnly(true);
         cookie.setPath("/");
         response.addCookie(cookie);
 
-        LoginResponse loginResponse = new LoginResponse(token);
-        return ResponseEntity.ok().body(loginResponse);
+//        LoginResponse loginResponse = new LoginResponse(token);
+        return ResponseEntity.ok().build();
     }
 
     @GetMapping("/login/check")
diff --git a/src/main/java/roomescape/controller/ThemeController.java b/src/main/java/roomescape/controller/ThemeController.java
@@ -21,17 +21,17 @@ public ThemeController(ThemeRepository themeRepository) {
         this.themeRepository = themeRepository;
     }
 
+    @GetMapping("/themes")
+    public ResponseEntity<List<Theme>> list() {
+        return ResponseEntity.ok(themeRepository.findAll());
+    }
+
     @PostMapping("/themes")
     public ResponseEntity<Theme> createTheme(@RequestBody Theme theme) {
         Theme newTheme = themeRepository.save(theme);
         return ResponseEntity.created(URI.create("/themes/" + newTheme.getId())).body(newTheme);
     }
 
-    @GetMapping("/themes")
-    public ResponseEntity<List<Theme>> list() {
-        return ResponseEntity.ok(themeRepository.findAll());
-    }
-
     @DeleteMapping("/themes/{id}")
     public ResponseEntity<Void> deleteTheme(@PathVariable Long id) {
         themeRepository.deleteById(id);
diff --git a/src/main/java/roomescape/controller/TimeController.java b/src/main/java/roomescape/controller/TimeController.java
@@ -1,4 +1,4 @@
-package roomescape.domain.time;
+package roomescape.controller;
 
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -8,6 +8,9 @@
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
+import roomescape.domain.time.AvailableTime;
+import roomescape.domain.time.Time;
+import roomescape.domain.time.TimeService;
 
 import java.net.URI;
 import java.util.List;
@@ -27,7 +30,7 @@ public List<Time> list() {
 
     @PostMapping("/times")
     public ResponseEntity<Time> create(@RequestBody Time time) {
-        if (time.getTime() == null || time.getTime().isEmpty()) {
+        if (time.getValue() == null || time.getValue().isEmpty()) {
             throw new RuntimeException();
         }
 
diff --git a/src/main/java/roomescape/domain/login/LoginRequest.java b/src/main/java/roomescape/domain/login/LoginRequest.java
@@ -12,4 +12,8 @@ public LoginRequest(String email, String password) {
     public String getEmail() {
         return email;
     }
+
+    public String getPassword() {
+        return password;
+    }
 }
diff --git a/src/main/java/roomescape/domain/member/Member.java b/src/main/java/roomescape/domain/member/Member.java
@@ -16,18 +16,16 @@ public class Member {
     private String password;
     private String role;
 
-    public Member(Long id, String name, String email, String 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(String name, String email, String password, String role) {
-        this.name = name;
-        this.email = email;
-        this.password = password;
-        this.role = role;
+        this(null, name, email, password, role);
     }
 
     public Member() {
diff --git a/src/main/java/roomescape/domain/member/MemberRepository.java b/src/main/java/roomescape/domain/member/MemberRepository.java
@@ -8,6 +8,4 @@ public interface MemberRepository extends JpaRepository<Member, Long> {
     Optional<Member> findByEmailAndPassword(String email, String password);
 
     Optional<Member> findByName(String name);
-
-    Optional<Member> findByEmail(String email);
 }
diff --git a/src/main/java/roomescape/domain/reservation/ReservationService.java b/src/main/java/roomescape/domain/reservation/ReservationService.java
@@ -29,7 +29,7 @@ public ReservationService(ReservationRepository reservationRepository, TimeRepos
 
     public List<ReservationResponse> findAll() {
         return reservationRepository.findAll().stream()
-                .map(it -> new ReservationResponse(it.getId(), it.getName(), it.getTheme().getName(), it.getDate(), it.getTime().getTime()))
+                .map(it -> new ReservationResponse(it.getId(), it.getName(), it.getTheme().getName(), it.getDate(), it.getTime().getValue()))
                 .toList();
     }
 
@@ -40,7 +40,7 @@ public List<MyReservationResponse> findMyReservationsAll(Member loginMember) {
                         it.getId(),
                         it.getTheme().getName(),
                         it.getDate(),
-                        it.getTime().getTime(),
+                        it.getTime().getValue(),
                         "예약"))
                 .toList();
 
@@ -51,7 +51,7 @@ public List<MyReservationResponse> findMyReservationsAll(Member loginMember) {
                         it.getWaiting().getId(),
                         it.getWaiting().getTheme().getName(),
                         it.getWaiting().getDate(),
-                        it.getWaiting().getTime().getTime(),
+                        it.getWaiting().getTime().getValue(),
                         it.getRank() + 1 + "번째 예약대기"
                 )))
                 .toList();
@@ -80,7 +80,7 @@ public ReservationResponse save(ReservationRequest reservationRequest) {
                 reservation.getName(),
                 reservation.getTheme().getName(),
                 reservation.getDate(),
-                reservation.getTime().getTime());
+                reservation.getTime().getValue());
     }
 
     public void checkReservationRequest(ReservationRequest reservationRequest) {
diff --git a/src/main/java/roomescape/domain/time/Time.java b/src/main/java/roomescape/domain/time/Time.java
@@ -10,18 +10,18 @@ public class Time {
     private Long id;
 
     @Column(name = "time_value")
-    private String time;
+    private String value;
 
     @Column(name = "deleted")
     private Boolean deleted;
 
-    public Time(Long id, String time) {
+    public Time(Long id, String value) {
         this.id = id;
-        this.time = time;
+        this.value = value;
     }
 
-    public Time(String time) {
-        this.time = time;
+    public Time(String value) {
+        this.value = value;
     }
 
     public Time() {
@@ -31,7 +31,7 @@ public Long getId() {
         return id;
     }
 
-    public String getTime() {
-        return time;
+    public String getValue() {
+        return value;
     }
 }
diff --git a/src/main/java/roomescape/domain/time/TimeService.java b/src/main/java/roomescape/domain/time/TimeService.java
@@ -23,7 +23,7 @@ public List<AvailableTime> getAvailableTime(String date, Long themeId) {
         return times.stream()
                 .map(time -> new AvailableTime(
                         time.getId(),
-                        time.getTime(),
+                        time.getValue(),
                         reservations.stream()
                                 .anyMatch(reservation -> reservation.getTime().getId().equals(time.getId()))
                 ))
diff --git a/src/main/java/roomescape/exception/AuthorizationException.java b/src/main/java/roomescape/exception/AuthorizationException.java
@@ -5,9 +5,6 @@
 
 @ResponseStatus(HttpStatus.UNAUTHORIZED)
 public class AuthorizationException extends RuntimeException {
-    public AuthorizationException() {
-    }
-
     public AuthorizationException(String message) {
         super(message);
     }
diff --git a/src/main/java/roomescape/exception/GlobalExceptionHandler.java b/src/main/java/roomescape/exception/GlobalExceptionHandler.java
diff --git a/src/test/java/roomescape/JpaTest.java b/src/test/java/roomescape/JpaTest.java

Original file line number	Diff line number	Diff line change
`@@ -12,4 +12,8 @@ public LoginRequest(String email, String password) {`
`12`	`12`	`public String getEmail() {`
`13`	`13`	`return email;`
`14`	`14`	`}`
	`15`	`+`
	`16`	`+ public String getPassword() {`
	`17`	`+ return password;`
	`18`	`+ }`
`15`	`19`	`}`