Skip to content

Commit

Permalink
🎨 refactor: SessionUser -> Session 클래스명 변경
Browse files Browse the repository at this point in the history
  • Loading branch information
woosung1223 committed Aug 18, 2024
1 parent 1dedb75 commit 63079d8
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 27 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,24 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import slvtwn.khu.toyouserver.common.ErrorType;
import slvtwn.khu.toyouserver.domain.SessionUser;
import slvtwn.khu.toyouserver.domain.Session;
import slvtwn.khu.toyouserver.domain.User;
import slvtwn.khu.toyouserver.exception.ToyouException;
import slvtwn.khu.toyouserver.persistance.SessionUserRepository;
import slvtwn.khu.toyouserver.persistance.SessionRepository;

@Service
@Transactional(readOnly = true)
public class SessionUserService {
public class SessionService {

private final SessionUserRepository sessionUserRepository;
private final SessionRepository sessionRepository;

public SessionUserService(SessionUserRepository sessionUserRepository) {
this.sessionUserRepository = sessionUserRepository;
public SessionService(SessionRepository sessionRepository) {
this.sessionRepository = sessionRepository;
}

public User findById(Long sessionId) {
SessionUser sessionUser = sessionUserRepository.findById(sessionId)
Session session = sessionRepository.findById(sessionId)
.orElseThrow(() -> new ToyouException(ErrorType.UNAUTHORIZED_USER_ACCESS));
return sessionUser.getUser();
return session.getUser();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
import org.springframework.web.context.request.NativeWebRequest;
import org.springframework.web.method.support.HandlerMethodArgumentResolver;
import org.springframework.web.method.support.ModelAndViewContainer;
import slvtwn.khu.toyouserver.application.SessionUserService;
import slvtwn.khu.toyouserver.application.SessionService;

public class CookieAuthArgumentResolver implements HandlerMethodArgumentResolver {
private final HttpSession httpSession;
private final SessionUserService sessionUserService;
private final SessionService sessionService;

public CookieAuthArgumentResolver(HttpSession httpSession, SessionUserService sessionUserService) {
public CookieAuthArgumentResolver(HttpSession httpSession, SessionService sessionService) {
this.httpSession = httpSession;
this.sessionUserService = sessionUserService;
this.sessionService = sessionService;
}

@Override
Expand All @@ -26,6 +26,6 @@ public boolean supportsParameter(MethodParameter parameter) {
public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer,
NativeWebRequest webRequest, WebDataBinderFactory binderFactory) throws Exception {
Long sessionId = Long.parseLong((String) httpSession.getAttribute("sessionId"));
return sessionUserService.findById(sessionId);
return sessionService.findById(sessionId);
}
}
6 changes: 3 additions & 3 deletions src/main/java/slvtwn/khu/toyouserver/common/WebConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@
import java.util.List;
import org.springframework.web.method.support.HandlerMethodArgumentResolver;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
import slvtwn.khu.toyouserver.application.SessionUserService;
import slvtwn.khu.toyouserver.application.SessionService;

public class WebConfig implements WebMvcConfigurer {

private HttpSession httpSession;

private SessionUserService sessionUserService;
private SessionService sessionService;

@Override
public void addArgumentResolvers(List<HandlerMethodArgumentResolver> resolvers) {
resolvers.add(new CookieAuthArgumentResolver(httpSession, sessionUserService));
resolvers.add(new CookieAuthArgumentResolver(httpSession, sessionService));
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package slvtwn.khu.toyouserver.domain;

import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.FetchType;
import jakarta.persistence.GeneratedValue;
Expand All @@ -15,10 +14,9 @@
import slvtwn.khu.toyouserver.common.BaseTimeEntity;

@Entity
@Table(name = "session_users")
@NoArgsConstructor(access = AccessLevel.PROTECTED)
@Getter
public class SessionUser extends BaseTimeEntity {
public class Session extends BaseTimeEntity {

@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
Expand All @@ -30,7 +28,7 @@ public class SessionUser extends BaseTimeEntity {

// TODO ; 카드

public SessionUser(Long id, User user) {
public Session(Long id, User user) {
this.id = id;
this.user = user;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package slvtwn.khu.toyouserver.persistance;

import org.springframework.data.jpa.repository.JpaRepository;
import slvtwn.khu.toyouserver.domain.Session;

public interface SessionRepository extends JpaRepository<Session, Long> {
}

This file was deleted.

0 comments on commit 63079d8

Please sign in to comment.