generated from pricelees/issue-pr-template
style: code reformat & remove unused imports
This commit is contained in:
parent
bf3111723b
commit
fd9f0e0cea
@ -1,12 +1,12 @@
|
|||||||
package roomescape.auth.service
|
package roomescape.auth.service
|
||||||
|
|
||||||
import org.springframework.stereotype.Service
|
import org.springframework.stereotype.Service
|
||||||
import roomescape.member.business.MemberService
|
|
||||||
import roomescape.member.infrastructure.persistence.Member
|
|
||||||
import roomescape.auth.infrastructure.jwt.JwtHandler
|
import roomescape.auth.infrastructure.jwt.JwtHandler
|
||||||
import roomescape.auth.web.LoginCheckResponse
|
import roomescape.auth.web.LoginCheckResponse
|
||||||
import roomescape.auth.web.LoginRequest
|
import roomescape.auth.web.LoginRequest
|
||||||
import roomescape.auth.web.TokenResponse
|
import roomescape.auth.web.TokenResponse
|
||||||
|
import roomescape.member.business.MemberService
|
||||||
|
import roomescape.member.infrastructure.persistence.Member
|
||||||
|
|
||||||
@Service
|
@Service
|
||||||
class AuthService(
|
class AuthService(
|
||||||
|
|||||||
@ -6,11 +6,11 @@ import org.springframework.http.HttpStatus
|
|||||||
import org.springframework.stereotype.Component
|
import org.springframework.stereotype.Component
|
||||||
import org.springframework.web.method.HandlerMethod
|
import org.springframework.web.method.HandlerMethod
|
||||||
import org.springframework.web.servlet.HandlerInterceptor
|
import org.springframework.web.servlet.HandlerInterceptor
|
||||||
import roomescape.member.business.MemberService
|
|
||||||
import roomescape.member.infrastructure.persistence.Member
|
|
||||||
import roomescape.auth.infrastructure.jwt.JwtHandler
|
import roomescape.auth.infrastructure.jwt.JwtHandler
|
||||||
import roomescape.common.exception.ErrorType
|
import roomescape.common.exception.ErrorType
|
||||||
import roomescape.common.exception.RoomescapeException
|
import roomescape.common.exception.RoomescapeException
|
||||||
|
import roomescape.member.business.MemberService
|
||||||
|
import roomescape.member.infrastructure.persistence.Member
|
||||||
|
|
||||||
private fun Any.isIrrelevantWith(annotationType: Class<out Annotation>): Boolean {
|
private fun Any.isIrrelevantWith(annotationType: Class<out Annotation>): Boolean {
|
||||||
if (this !is HandlerMethod) {
|
if (this !is HandlerMethod) {
|
||||||
@ -40,7 +40,7 @@ class LoginInterceptor(
|
|||||||
val memberId: Long = jwtHandler.getMemberIdFromToken(token)
|
val memberId: Long = jwtHandler.getMemberIdFromToken(token)
|
||||||
|
|
||||||
return memberService.existsById(memberId)
|
return memberService.existsById(memberId)
|
||||||
} catch (e: RoomescapeException) {
|
} catch (_: RoomescapeException) {
|
||||||
response.sendRedirect("/login")
|
response.sendRedirect("/login")
|
||||||
throw RoomescapeException(ErrorType.LOGIN_REQUIRED, HttpStatus.FORBIDDEN)
|
throw RoomescapeException(ErrorType.LOGIN_REQUIRED, HttpStatus.FORBIDDEN)
|
||||||
}
|
}
|
||||||
|
|||||||
@ -4,12 +4,12 @@ import org.springframework.data.repository.findByIdOrNull
|
|||||||
import org.springframework.http.HttpStatus
|
import org.springframework.http.HttpStatus
|
||||||
import org.springframework.stereotype.Service
|
import org.springframework.stereotype.Service
|
||||||
import org.springframework.transaction.annotation.Transactional
|
import org.springframework.transaction.annotation.Transactional
|
||||||
|
import roomescape.common.exception.ErrorType
|
||||||
|
import roomescape.common.exception.RoomescapeException
|
||||||
import roomescape.member.infrastructure.persistence.Member
|
import roomescape.member.infrastructure.persistence.Member
|
||||||
import roomescape.member.infrastructure.persistence.MemberRepository
|
import roomescape.member.infrastructure.persistence.MemberRepository
|
||||||
import roomescape.member.web.MembersResponse
|
import roomescape.member.web.MembersResponse
|
||||||
import roomescape.member.web.toResponse
|
import roomescape.member.web.toResponse
|
||||||
import roomescape.common.exception.ErrorType
|
|
||||||
import roomescape.common.exception.RoomescapeException
|
|
||||||
|
|
||||||
@Service
|
@Service
|
||||||
@Transactional(readOnly = true)
|
@Transactional(readOnly = true)
|
||||||
|
|||||||
@ -14,13 +14,13 @@ import org.springframework.web.client.RestClient;
|
|||||||
|
|
||||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||||
|
|
||||||
|
import roomescape.common.exception.ErrorType;
|
||||||
|
import roomescape.common.exception.RoomescapeException;
|
||||||
import roomescape.payment.dto.request.PaymentCancelRequest;
|
import roomescape.payment.dto.request.PaymentCancelRequest;
|
||||||
import roomescape.payment.dto.request.PaymentRequest;
|
import roomescape.payment.dto.request.PaymentRequest;
|
||||||
import roomescape.payment.dto.response.PaymentCancelResponse;
|
import roomescape.payment.dto.response.PaymentCancelResponse;
|
||||||
import roomescape.payment.dto.response.PaymentResponse;
|
import roomescape.payment.dto.response.PaymentResponse;
|
||||||
import roomescape.payment.dto.response.TossPaymentErrorResponse;
|
import roomescape.payment.dto.response.TossPaymentErrorResponse;
|
||||||
import roomescape.common.exception.ErrorType;
|
|
||||||
import roomescape.common.exception.RoomescapeException;
|
|
||||||
|
|
||||||
@Component
|
@Component
|
||||||
public class TossPaymentClient {
|
public class TossPaymentClient {
|
||||||
|
|||||||
@ -12,9 +12,9 @@ import jakarta.persistence.GenerationType;
|
|||||||
import jakarta.persistence.Id;
|
import jakarta.persistence.Id;
|
||||||
import jakarta.persistence.JoinColumn;
|
import jakarta.persistence.JoinColumn;
|
||||||
import jakarta.persistence.OneToOne;
|
import jakarta.persistence.OneToOne;
|
||||||
import roomescape.reservation.domain.Reservation;
|
|
||||||
import roomescape.common.exception.ErrorType;
|
import roomescape.common.exception.ErrorType;
|
||||||
import roomescape.common.exception.RoomescapeException;
|
import roomescape.common.exception.RoomescapeException;
|
||||||
|
import roomescape.reservation.domain.Reservation;
|
||||||
|
|
||||||
@Entity
|
@Entity
|
||||||
public class Payment {
|
public class Payment {
|
||||||
|
|||||||
@ -7,6 +7,8 @@ import org.springframework.http.HttpStatus;
|
|||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
|
||||||
|
import roomescape.common.exception.ErrorType;
|
||||||
|
import roomescape.common.exception.RoomescapeException;
|
||||||
import roomescape.payment.domain.CanceledPayment;
|
import roomescape.payment.domain.CanceledPayment;
|
||||||
import roomescape.payment.domain.Payment;
|
import roomescape.payment.domain.Payment;
|
||||||
import roomescape.payment.domain.repository.CanceledPaymentRepository;
|
import roomescape.payment.domain.repository.CanceledPaymentRepository;
|
||||||
@ -16,8 +18,6 @@ import roomescape.payment.dto.response.PaymentCancelResponse;
|
|||||||
import roomescape.payment.dto.response.PaymentResponse;
|
import roomescape.payment.dto.response.PaymentResponse;
|
||||||
import roomescape.payment.dto.response.ReservationPaymentResponse;
|
import roomescape.payment.dto.response.ReservationPaymentResponse;
|
||||||
import roomescape.reservation.domain.Reservation;
|
import roomescape.reservation.domain.Reservation;
|
||||||
import roomescape.common.exception.ErrorType;
|
|
||||||
import roomescape.common.exception.RoomescapeException;
|
|
||||||
|
|
||||||
@Service
|
@Service
|
||||||
@Transactional
|
@Transactional
|
||||||
|
|||||||
@ -24,6 +24,12 @@ import io.swagger.v3.oas.annotations.tags.Tag;
|
|||||||
import jakarta.servlet.http.HttpServletResponse;
|
import jakarta.servlet.http.HttpServletResponse;
|
||||||
import jakarta.validation.Valid;
|
import jakarta.validation.Valid;
|
||||||
import jakarta.validation.constraints.NotNull;
|
import jakarta.validation.constraints.NotNull;
|
||||||
|
import roomescape.auth.web.support.Admin;
|
||||||
|
import roomescape.auth.web.support.LoginRequired;
|
||||||
|
import roomescape.auth.web.support.MemberId;
|
||||||
|
import roomescape.common.dto.response.RoomescapeApiResponse;
|
||||||
|
import roomescape.common.dto.response.RoomescapeErrorResponse;
|
||||||
|
import roomescape.common.exception.RoomescapeException;
|
||||||
import roomescape.payment.client.TossPaymentClient;
|
import roomescape.payment.client.TossPaymentClient;
|
||||||
import roomescape.payment.dto.request.PaymentCancelRequest;
|
import roomescape.payment.dto.request.PaymentCancelRequest;
|
||||||
import roomescape.payment.dto.request.PaymentRequest;
|
import roomescape.payment.dto.request.PaymentRequest;
|
||||||
@ -37,12 +43,6 @@ import roomescape.reservation.dto.response.ReservationResponse;
|
|||||||
import roomescape.reservation.dto.response.ReservationsResponse;
|
import roomescape.reservation.dto.response.ReservationsResponse;
|
||||||
import roomescape.reservation.service.ReservationService;
|
import roomescape.reservation.service.ReservationService;
|
||||||
import roomescape.reservation.service.ReservationWithPaymentService;
|
import roomescape.reservation.service.ReservationWithPaymentService;
|
||||||
import roomescape.auth.web.support.Admin;
|
|
||||||
import roomescape.auth.web.support.LoginRequired;
|
|
||||||
import roomescape.auth.web.support.MemberId;
|
|
||||||
import roomescape.common.dto.response.RoomescapeErrorResponse;
|
|
||||||
import roomescape.common.dto.response.RoomescapeApiResponse;
|
|
||||||
import roomescape.common.exception.RoomescapeException;
|
|
||||||
|
|
||||||
@RestController
|
@RestController
|
||||||
@Tag(name = "3. 예약 API", description = "예약 및 대기 정보를 추가 / 조회 / 삭제할 때 사용합니다.")
|
@Tag(name = "3. 예약 API", description = "예약 및 대기 정보를 추가 / 조회 / 삭제할 때 사용합니다.")
|
||||||
|
|||||||
@ -23,15 +23,15 @@ import io.swagger.v3.oas.annotations.tags.Tag;
|
|||||||
import jakarta.servlet.http.HttpServletResponse;
|
import jakarta.servlet.http.HttpServletResponse;
|
||||||
import jakarta.validation.Valid;
|
import jakarta.validation.Valid;
|
||||||
import jakarta.validation.constraints.NotNull;
|
import jakarta.validation.constraints.NotNull;
|
||||||
|
import roomescape.auth.web.support.Admin;
|
||||||
|
import roomescape.auth.web.support.LoginRequired;
|
||||||
|
import roomescape.common.dto.response.RoomescapeApiResponse;
|
||||||
|
import roomescape.common.dto.response.RoomescapeErrorResponse;
|
||||||
import roomescape.reservation.dto.request.ReservationTimeRequest;
|
import roomescape.reservation.dto.request.ReservationTimeRequest;
|
||||||
import roomescape.reservation.dto.response.ReservationTimeInfosResponse;
|
import roomescape.reservation.dto.response.ReservationTimeInfosResponse;
|
||||||
import roomescape.reservation.dto.response.ReservationTimeResponse;
|
import roomescape.reservation.dto.response.ReservationTimeResponse;
|
||||||
import roomescape.reservation.dto.response.ReservationTimesResponse;
|
import roomescape.reservation.dto.response.ReservationTimesResponse;
|
||||||
import roomescape.reservation.service.ReservationTimeService;
|
import roomescape.reservation.service.ReservationTimeService;
|
||||||
import roomescape.auth.web.support.Admin;
|
|
||||||
import roomescape.auth.web.support.LoginRequired;
|
|
||||||
import roomescape.common.dto.response.RoomescapeErrorResponse;
|
|
||||||
import roomescape.common.dto.response.RoomescapeApiResponse;
|
|
||||||
|
|
||||||
@RestController
|
@RestController
|
||||||
@Tag(name = "4. 예약 시간 API", description = "예약 시간을 조회 / 추가 / 삭제할 때 사용합니다.")
|
@Tag(name = "4. 예약 시간 API", description = "예약 시간을 조회 / 추가 / 삭제할 때 사용합니다.")
|
||||||
|
|||||||
@ -15,9 +15,9 @@ import jakarta.persistence.GenerationType;
|
|||||||
import jakarta.persistence.Id;
|
import jakarta.persistence.Id;
|
||||||
import jakarta.persistence.JoinColumn;
|
import jakarta.persistence.JoinColumn;
|
||||||
import jakarta.persistence.ManyToOne;
|
import jakarta.persistence.ManyToOne;
|
||||||
import roomescape.member.infrastructure.persistence.Member;
|
|
||||||
import roomescape.common.exception.ErrorType;
|
import roomescape.common.exception.ErrorType;
|
||||||
import roomescape.common.exception.RoomescapeException;
|
import roomescape.common.exception.RoomescapeException;
|
||||||
|
import roomescape.member.infrastructure.persistence.Member;
|
||||||
import roomescape.theme.domain.Theme;
|
import roomescape.theme.domain.Theme;
|
||||||
|
|
||||||
@Entity
|
@Entity
|
||||||
|
|||||||
@ -7,9 +7,9 @@ import org.springframework.http.HttpStatus;
|
|||||||
import io.micrometer.common.util.StringUtils;
|
import io.micrometer.common.util.StringUtils;
|
||||||
import io.swagger.v3.oas.annotations.media.Schema;
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
import jakarta.validation.constraints.NotNull;
|
import jakarta.validation.constraints.NotNull;
|
||||||
import roomescape.reservation.domain.ReservationTime;
|
|
||||||
import roomescape.common.exception.ErrorType;
|
import roomescape.common.exception.ErrorType;
|
||||||
import roomescape.common.exception.RoomescapeException;
|
import roomescape.common.exception.RoomescapeException;
|
||||||
|
import roomescape.reservation.domain.ReservationTime;
|
||||||
|
|
||||||
@Schema(name = "예약 시간 저장 요청", description = "예약 시간 저장 요청시 사용됩니다.")
|
@Schema(name = "예약 시간 저장 요청", description = "예약 시간 저장 요청시 사용됩니다.")
|
||||||
public record ReservationTimeRequest(
|
public record ReservationTimeRequest(
|
||||||
|
|||||||
@ -9,6 +9,8 @@ import org.springframework.http.HttpStatus;
|
|||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
|
||||||
|
import roomescape.common.exception.ErrorType;
|
||||||
|
import roomescape.common.exception.RoomescapeException;
|
||||||
import roomescape.member.business.MemberService;
|
import roomescape.member.business.MemberService;
|
||||||
import roomescape.member.infrastructure.persistence.Member;
|
import roomescape.member.infrastructure.persistence.Member;
|
||||||
import roomescape.reservation.domain.Reservation;
|
import roomescape.reservation.domain.Reservation;
|
||||||
@ -22,8 +24,6 @@ import roomescape.reservation.dto.request.WaitingRequest;
|
|||||||
import roomescape.reservation.dto.response.MyReservationsResponse;
|
import roomescape.reservation.dto.response.MyReservationsResponse;
|
||||||
import roomescape.reservation.dto.response.ReservationResponse;
|
import roomescape.reservation.dto.response.ReservationResponse;
|
||||||
import roomescape.reservation.dto.response.ReservationsResponse;
|
import roomescape.reservation.dto.response.ReservationsResponse;
|
||||||
import roomescape.common.exception.ErrorType;
|
|
||||||
import roomescape.common.exception.RoomescapeException;
|
|
||||||
import roomescape.theme.domain.Theme;
|
import roomescape.theme.domain.Theme;
|
||||||
import roomescape.theme.service.ThemeService;
|
import roomescape.theme.service.ThemeService;
|
||||||
|
|
||||||
|
|||||||
@ -7,6 +7,8 @@ import org.springframework.http.HttpStatus;
|
|||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
|
||||||
|
import roomescape.common.exception.ErrorType;
|
||||||
|
import roomescape.common.exception.RoomescapeException;
|
||||||
import roomescape.reservation.domain.Reservation;
|
import roomescape.reservation.domain.Reservation;
|
||||||
import roomescape.reservation.domain.ReservationTime;
|
import roomescape.reservation.domain.ReservationTime;
|
||||||
import roomescape.reservation.domain.repository.ReservationRepository;
|
import roomescape.reservation.domain.repository.ReservationRepository;
|
||||||
@ -16,8 +18,6 @@ import roomescape.reservation.dto.response.ReservationTimeInfoResponse;
|
|||||||
import roomescape.reservation.dto.response.ReservationTimeInfosResponse;
|
import roomescape.reservation.dto.response.ReservationTimeInfosResponse;
|
||||||
import roomescape.reservation.dto.response.ReservationTimeResponse;
|
import roomescape.reservation.dto.response.ReservationTimeResponse;
|
||||||
import roomescape.reservation.dto.response.ReservationTimesResponse;
|
import roomescape.reservation.dto.response.ReservationTimesResponse;
|
||||||
import roomescape.common.exception.ErrorType;
|
|
||||||
import roomescape.common.exception.RoomescapeException;
|
|
||||||
|
|
||||||
@Service
|
@Service
|
||||||
@Transactional
|
@Transactional
|
||||||
|
|||||||
@ -23,8 +23,8 @@ import jakarta.validation.Valid;
|
|||||||
import jakarta.validation.constraints.NotNull;
|
import jakarta.validation.constraints.NotNull;
|
||||||
import roomescape.auth.web.support.Admin;
|
import roomescape.auth.web.support.Admin;
|
||||||
import roomescape.auth.web.support.LoginRequired;
|
import roomescape.auth.web.support.LoginRequired;
|
||||||
import roomescape.common.dto.response.RoomescapeErrorResponse;
|
|
||||||
import roomescape.common.dto.response.RoomescapeApiResponse;
|
import roomescape.common.dto.response.RoomescapeApiResponse;
|
||||||
|
import roomescape.common.dto.response.RoomescapeErrorResponse;
|
||||||
import roomescape.theme.dto.ThemeRequest;
|
import roomescape.theme.dto.ThemeRequest;
|
||||||
import roomescape.theme.dto.ThemeResponse;
|
import roomescape.theme.dto.ThemeResponse;
|
||||||
import roomescape.theme.dto.ThemesResponse;
|
import roomescape.theme.dto.ThemesResponse;
|
||||||
|
|||||||
@ -7,9 +7,9 @@ import org.springframework.http.HttpStatus;
|
|||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
|
||||||
import roomescape.reservation.domain.repository.ReservationRepository;
|
|
||||||
import roomescape.common.exception.ErrorType;
|
import roomescape.common.exception.ErrorType;
|
||||||
import roomescape.common.exception.RoomescapeException;
|
import roomescape.common.exception.RoomescapeException;
|
||||||
|
import roomescape.reservation.domain.repository.ReservationRepository;
|
||||||
import roomescape.theme.domain.Theme;
|
import roomescape.theme.domain.Theme;
|
||||||
import roomescape.theme.domain.repository.ThemeRepository;
|
import roomescape.theme.domain.repository.ThemeRepository;
|
||||||
import roomescape.theme.dto.ThemeRequest;
|
import roomescape.theme.dto.ThemeRequest;
|
||||||
@ -21,11 +21,9 @@ import roomescape.theme.dto.ThemesResponse;
|
|||||||
public class ThemeService {
|
public class ThemeService {
|
||||||
|
|
||||||
private final ThemeRepository themeRepository;
|
private final ThemeRepository themeRepository;
|
||||||
private final ReservationRepository reservationRepository;
|
|
||||||
|
|
||||||
public ThemeService(ThemeRepository themeRepository, ReservationRepository reservationRepository) {
|
public ThemeService(ThemeRepository themeRepository) {
|
||||||
this.themeRepository = themeRepository;
|
this.themeRepository = themeRepository;
|
||||||
this.reservationRepository = reservationRepository;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Transactional(readOnly = true)
|
@Transactional(readOnly = true)
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user