[#10] 나의 여행 등록 설정

build.gradle

@@ -27,6 +27,7 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
     implementation 'org.springframework.boot:spring-boot-starter-web'
     implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
+    implementation 'org.springframework.boot:spring-boot-starter-validation'
     compileOnly 'org.projectlombok:lombok'
     runtimeOnly 'org.postgresql:postgresql'
     annotationProcessor 'org.projectlombok:lombok'
@@ -41,6 +42,8 @@ dependencies {
     implementation 'io.jsonwebtoken:jjwt-api:0.11.5'
     runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.5'
     runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.11.5'
+
+    testImplementation("io.rest-assured:rest-assured:5.5.0")
 }
 
 tasks.named('test') {

src/main/java/com/hyun/udong/auth/application/service/AuthService.java

@@ -7,10 +7,10 @@
 import com.hyun.udong.auth.presentation.dto.KakaoTokenResponse;
 import com.hyun.udong.auth.presentation.dto.LoginResponse;
 import com.hyun.udong.auth.util.JwtTokenProvider;
+import com.hyun.udong.common.exception.NotFoundException;
 import com.hyun.udong.member.application.service.MemberService;
 import com.hyun.udong.member.domain.Member;
 import com.hyun.udong.member.domain.SocialType;
-import com.hyun.udong.member.exception.MemberNotFoundException;
 import com.hyun.udong.member.infrastructure.repository.MemberRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -80,8 +80,14 @@ private void validateIsTokenOwner(String refreshToken, Long memberId) {
 
     private Member updateRefreshToken(Long memberId, String refreshToken) {
         Member member = memberRepository.findById(memberId)
-                .orElseThrow(() -> MemberNotFoundException.EXCEPTION);
+                .orElseThrow(() -> new NotFoundException("해당하는 회원이 존재하지 않습니다."));
         member.updateRefreshToken(refreshToken);
         return member;
     }
+
+    public Member getMemberFromToken(String token) {
+        Long memberId = Long.parseLong(jwtTokenProvider.getSubjectFromToken(token));
+        return memberRepository.findById(memberId)
+                .orElseThrow(() -> InvalidTokenException.EXCEPTION);
+    }
 }

src/main/java/com/hyun/udong/auth/exception/UnAuthenticatedMemberException.java

@@ -0,0 +1,12 @@
+package com.hyun.udong.auth.exception;
+
+import com.hyun.udong.common.exception.ErrorCode;
+import com.hyun.udong.common.exception.UdongException;
+
+public class UnAuthenticatedMemberException extends UdongException {
+    public static final UdongException EXCEPTION = new UnAuthenticatedMemberException();
+
+    private UnAuthenticatedMemberException() {
+        super(ErrorCode.UNAUTHENTICATED_MEMBER);
+    }
+}

src/main/java/com/hyun/udong/auth/presentation/resolver/AuthenticationArgumentResolver.java

@@ -0,0 +1,50 @@
+package com.hyun.udong.auth.presentation.resolver;
+
+import com.hyun.udong.auth.application.service.AuthService;
+import com.hyun.udong.auth.exception.UnAuthenticatedMemberException;
+import com.hyun.udong.common.annotation.LoginMember;
+import com.hyun.udong.member.domain.Member;
+import jakarta.servlet.http.HttpServletRequest;
+import org.springframework.core.MethodParameter;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.support.WebDataBinderFactory;
+import org.springframework.web.context.request.NativeWebRequest;
+import org.springframework.web.method.support.HandlerMethodArgumentResolver;
+import org.springframework.web.method.support.ModelAndViewContainer;
+
+@Component
+public class AuthenticationArgumentResolver implements HandlerMethodArgumentResolver {
+
+    private static final String PREFIX = "Bearer ";
+
+    private final AuthService authService;
+
+    public AuthenticationArgumentResolver(AuthService authService) {
+        this.authService = authService;
+    }
+
+    @Override
+    public boolean supportsParameter(MethodParameter parameter) {
+        return parameter.hasParameterAnnotation(LoginMember.class)
+                && parameter.getParameterType().equals(Member.class);
+    }
+
+    @Override
+    public Object resolveArgument(MethodParameter parameter,
+                                  ModelAndViewContainer mavContainer,
+                                  NativeWebRequest webRequest,
+                                  WebDataBinderFactory binderFactory) {
+        HttpServletRequest request = (HttpServletRequest) webRequest.getNativeRequest();
+        String token = request.getHeader("Authorization");
+
+        isValidToken(token);
+
+        return authService.getMemberFromToken(token.substring(PREFIX.length()));
+    }
+
+    private void isValidToken(String token) {
+        if (token == null || !token.startsWith(PREFIX)) {
+            throw UnAuthenticatedMemberException.EXCEPTION;
+        }
+    }
+}

src/main/java/com/hyun/udong/auth/util/JwtTokenProvider.java

@@ -23,10 +23,10 @@
 @Slf4j
 public class JwtTokenProvider {
 
-    @Value("${ACCESS_TOKEN_EXPIRE_TIME}")
+    @Value("${jwt.access-token-expire-time}")
     private long accessTokenExpireTime;
 
-    @Value("${REFRESH_TOKEN_EXPIRE_TIME}")
+    @Value("${jwt.refresh-token-expire-time}")
     private long refreshTokenExpireTime;
 
     @Value("${jwt.secret}")

src/main/java/com/hyun/udong/common/annotation/DateFormat.java

@@ -0,0 +1,11 @@
+package com.hyun.udong.common.annotation;
+
+import com.fasterxml.jackson.annotation.JacksonAnnotationsInside;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
+@JacksonAnnotationsInside
+@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "Asia/Seoul")
+@DateTimeFormat(pattern = "yyyy-MM-dd")
+public @interface DateFormat {
+}

src/main/java/com/hyun/udong/common/annotation/LoginMember.java

@@ -0,0 +1,11 @@
+package com.hyun.udong.common.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ElementType.PARAMETER})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface LoginMember {
+}

src/main/java/com/hyun/udong/common/config/WebConfig.java

@@ -0,0 +1,21 @@
+package com.hyun.udong.common.config;
+
+import com.hyun.udong.auth.presentation.resolver.AuthenticationArgumentResolver;
+import lombok.RequiredArgsConstructor;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.method.support.HandlerMethodArgumentResolver;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+import java.util.List;
+
+@Configuration
+@RequiredArgsConstructor
+public class WebConfig implements WebMvcConfigurer {
+
+    private final AuthenticationArgumentResolver authenticationArgumentResolver;
+
+    @Override
+    public void addArgumentResolvers(List<HandlerMethodArgumentResolver> resolvers) {
+        resolvers.add(authenticationArgumentResolver);
+    }
+}

src/main/java/com/hyun/udong/common/entity/BaseTimeEntity.java

@@ -0,0 +1,23 @@
+package com.hyun.udong.common.entity;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.MappedSuperclass;
+import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.annotation.LastModifiedDate;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+
+import java.time.LocalDateTime;
+
+@MappedSuperclass
+@EntityListeners(AuditingEntityListener.class)
+public abstract class BaseTimeEntity {
+
+    @Column(updatable = false)
+    @CreatedDate
+    private LocalDateTime createdAt;
+
+    @Column
+    @LastModifiedDate
+    private LocalDateTime updatedAt;
+}

src/main/java/com/hyun/udong/common/exception/ErrorCode.java

@@ -10,11 +10,19 @@
 public enum ErrorCode {
     MEMBER_NOT_FOUND(BAD_REQUEST, "해당하는 회원이 없습니다."),
     INVALID_TOKEN(UNAUTHORIZED, "유효하지 않은 토큰입니다."),
-    TOKEN_EXPIRED(UNAUTHORIZED, "만료된 토큰입니다.");
+    TOKEN_EXPIRED(UNAUTHORIZED, "만료된 토큰입니다."),
+    UNAUTHENTICATED_MEMBER(UNAUTHORIZED, "인증되지 않은 회원입니다."),
+    CITY_NOT_FOUND(BAD_REQUEST, "해당하는 도시가 없습니다."),
+    MEMBER_TRAVEL_SCHEDULE_NOT_FOUND(BAD_REQUEST, "해당 회원의 여행 일정이 존재하지 않습니다."),
+    NOT_FOUND(BAD_REQUEST);
 
     private final HttpStatus status;
     private final String message;
 
+    ErrorCode(HttpStatus status) {
+        this(status, null);
+    }
+
     ErrorCode(HttpStatus status, String message) {
         this.status = status;
         this.message = message;

src/main/java/com/hyun/udong/common/exception/NotFoundException.java

@@ -0,0 +1,7 @@
+package com.hyun.udong.common.exception;
+
+public class NotFoundException extends UdongException {
+    public NotFoundException(String message) {
+        super(ErrorCode.MEMBER_TRAVEL_SCHEDULE_NOT_FOUND, message);
+    }
+}

src/main/java/com/hyun/udong/common/exception/UdongException.java

@@ -10,6 +10,11 @@ public UdongException(ErrorCode errorCode) {
         this.errorCode = errorCode;
     }
 
+    public UdongException(ErrorCode errorCode, String message) {
+        super(message);
+        this.errorCode = errorCode;
+    }
+
     public ErrorCode getErrorCode() {
         return errorCode;
     }

src/main/java/com/hyun/udong/member/application/service/MemberService.java

@@ -1,8 +1,8 @@
 package com.hyun.udong.member.application.service;
 
+import com.hyun.udong.common.exception.NotFoundException;
 import com.hyun.udong.member.domain.Member;
 import com.hyun.udong.member.domain.SocialType;
-import com.hyun.udong.member.exception.MemberNotFoundException;
 import com.hyun.udong.member.infrastructure.repository.MemberRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -28,7 +28,7 @@ public Optional<Member> findBySocialIdAndSocialType(Long socialId, SocialType so
 
     public Member findById(Long id) {
         return memberRepository.findById(id)
-                .orElseThrow(() -> MemberNotFoundException.EXCEPTION);
+                .orElseThrow(() -> new NotFoundException("해당 회원이 존재하지 않습니다."));
     }
 
 }

src/main/java/com/hyun/udong/member/domain/Member.java

@@ -1,5 +1,7 @@
 package com.hyun.udong.member.domain;
 
+import com.hyun.udong.common.entity.BaseTimeEntity;
+import com.hyun.udong.travelschedule.domain.TravelSchedule;
 import jakarta.persistence.*;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -9,10 +11,11 @@
 @Entity
 @Getter
 @NoArgsConstructor(access = PROTECTED)
-public class Member {
+public class Member extends BaseTimeEntity {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "member_id")
     private Long id;
 
     private Long socialId;
@@ -30,15 +33,10 @@ public class Member {
 
     private String refreshToken;
 
-    public Member(Long socialId, SocialType socialType, String nickname, String profileImageUrl) {
-        this.socialId = socialId;
-        this.socialType = socialType;
-        this.nickname = nickname;
-        this.profileImageUrl = profileImageUrl;
-    }
+    @OneToOne(cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.LAZY)
+    private TravelSchedule travelSchedule;
 
-    public Member(Long id, Long socialId, SocialType socialType, String nickname, String profileImageUrl) {
-        this.id = id;
+    public Member(Long socialId, SocialType socialType, String nickname, String profileImageUrl) {
         this.socialId = socialId;
         this.socialType = socialType;
         this.nickname = nickname;
@@ -48,4 +46,8 @@ public Member(Long id, Long socialId, SocialType socialType, String nickname, St
     public void updateRefreshToken(String refreshToken) {
         this.refreshToken = refreshToken;
     }
+
+    public void updateTravelSchedule(TravelSchedule travelSchedule) {
+        this.travelSchedule = travelSchedule;
+    }
 }

src/main/java/com/hyun/udong/travelschedule/application/service/TravelScheduleService.java

@@ -0,0 +1,62 @@
+package com.hyun.udong.travelschedule.application.service;
+
+import com.hyun.udong.common.exception.NotFoundException;
+import com.hyun.udong.member.domain.Member;
+import com.hyun.udong.member.infrastructure.repository.MemberRepository;
+import com.hyun.udong.travelschedule.domain.City;
+import com.hyun.udong.travelschedule.domain.TravelSchedule;
+import com.hyun.udong.travelschedule.domain.TravelScheduleCity;
+import com.hyun.udong.travelschedule.infrastructure.repository.CityRepository;
+import com.hyun.udong.travelschedule.infrastructure.repository.TravelScheduleRepository;
+import com.hyun.udong.travelschedule.presentation.dto.TravelScheduleRequest;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+@Service
+@Transactional(readOnly = true)
+@RequiredArgsConstructor
+public class TravelScheduleService {
+
+    private final MemberRepository memberRepository;
+    private final TravelScheduleRepository travelScheduleRepository;
+    private final CityRepository cityRepository;
+
+    @Transactional
+    public TravelSchedule updateTravelSchedule(Long memberId, TravelScheduleRequest request) {
+        Member member = memberRepository.findById(memberId)
+                .orElseThrow(() -> new NotFoundException("해당 회원이 존재하지 않습니다."));
+
+        TravelSchedule travelSchedule = TravelSchedule.builder()
+                .startDate(request.getStartDate())
+                .endDate(request.getEndDate())
+                .build();
+
+        List<City> cities = cityRepository.findAllById(request.getCityIds());
+        if (cities.size() != request.getCityIds().size()) {
+            throw new NotFoundException("해당 도시가 존재하지 않습니다.");
+        }
+        List<TravelScheduleCity> travelScheduleCities = cities.stream()
+                .map(city -> new TravelScheduleCity(travelSchedule, city))
+                .toList();
+        travelSchedule.addTravelScheduleCities(travelScheduleCities);
+        travelScheduleRepository.save(travelSchedule);
+
+        member.updateTravelSchedule(travelSchedule);
+
+        return travelSchedule;
+    }
+
+    public TravelSchedule findTravelSchedule(Long memberId) {
+        Member member = memberRepository.findById(memberId)
+                .orElseThrow(() -> new NotFoundException("해당 회원이 존재하지 않습니다."));
+
+        TravelSchedule travelSchedule = member.getTravelSchedule();
+        if (travelSchedule == null) {
+            throw new NotFoundException("여행 일정이 존재하지 않습니다.");
+        }
+        return travelSchedule;
+    }
+}