Merge pull request #54 from AlongTheBlue/develop

[Feat] 여행따라 코스 등록 API user 추가
AlongTheBlue · Oct 14, 2024 · a0aed38 · a0aed38
2 parents 8be5be4 + 0d38966
commit a0aed38
Show file tree

Hide file tree

Showing 8 changed files with 112 additions and 7 deletions.
diff --git a/...g/alongtheblue/alongtheblue_server/global/data/tourcommunity/TourCommunityController.java b/...g/alongtheblue/alongtheblue_server/global/data/tourcommunity/TourCommunityController.java
@@ -4,7 +4,7 @@
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.alongtheblue.alongtheblue_server.global.common.response.ApiResponse;
-import org.alongtheblue.alongtheblue_server.global.data.tourcommunity.dto.request.UserTourCourseRequestDto;
+import org.alongtheblue.alongtheblue_server.global.data.tourcommunity.dto.request.CreateUserTourCourseRequestDto;
 import org.alongtheblue.alongtheblue_server.global.data.tourcommunity.dto.response.UserTourCourseDetailDto;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -22,7 +22,8 @@ public class TourCommunityController {
     @Operation(summary = "여행따라 게시물 등록 API")
     @PostMapping
     public UserTourCourse createTourCourse(
-            @RequestPart(value = "request", required = false) UserTourCourseRequestDto dto,
+            @RequestHeader("Authorization") String uid,
+            @RequestPart(value = "request", required = false) CreateUserTourCourseRequestDto dto,
             @RequestPart(value = "file", required = false) List<MultipartFile> images
 //            @RequestPart("title") String title,
 //            @RequestPart("writing") String writing,
@@ -32,7 +33,7 @@ public UserTourCourse createTourCourse(
 //            ,
 //            @RequestPart List<List<Integer>> imgIndexArr
     ) {
-        return tourCommunityService.createPost(dto, images);
+        return tourCommunityService.createPost(uid, dto.toServiceRequest(), images);
 //        UserTourCourse userTourCourse= new UserTourCourse();
 //        userTourCourse.setTitle(title);
 //        userTourCourse.setTourPostItems(tourItems);

diff --git a/.../org/alongtheblue/alongtheblue_server/global/data/tourcommunity/TourCommunityService.java b/.../org/alongtheblue/alongtheblue_server/global/data/tourcommunity/TourCommunityService.java
@@ -1,9 +1,11 @@
 package org.alongtheblue.alongtheblue_server.global.data.tourcommunity;
 
 import lombok.RequiredArgsConstructor;
+import org.alongtheblue.alongtheblue_server.domain.userInfo.application.UserInfoService;
+import org.alongtheblue.alongtheblue_server.domain.userInfo.domain.UserInfo;
 import org.alongtheblue.alongtheblue_server.global.adapter.S3Adapter;
 import org.alongtheblue.alongtheblue_server.global.common.response.ApiResponse;
-import org.alongtheblue.alongtheblue_server.global.data.tourcommunity.dto.request.UserTourCourseRequestDto;
+import org.alongtheblue.alongtheblue_server.global.data.tourcommunity.dto.request.CreateUserTourCourseServiceRequestDto;
 import org.alongtheblue.alongtheblue_server.global.data.tourcommunity.dto.request.TourPostItemRequestDto;
 import org.alongtheblue.alongtheblue_server.global.data.tourcommunity.dto.response.TourImageResponseDto;
 import org.alongtheblue.alongtheblue_server.global.data.tourcommunity.dto.response.TourPostItemResponseDto;
@@ -25,18 +27,23 @@ public class TourCommunityService {
     private final TourImageRepository tourImageRepository;
     private final S3Adapter s3Adapter;
     private final ConversionService conversionService;
+    private final UserInfoService userInfoService;
 
 //    private final TourPostHashTagRepository tourPostHashTagRepository;
 
     // 여행따라 저장
-    public UserTourCourse createPost(UserTourCourseRequestDto dto, List<MultipartFile> images) {
+    public UserTourCourse createPost(String uid, CreateUserTourCourseServiceRequestDto dto, List<MultipartFile> images) {
+
+        UserInfo userInfo = userInfoService.retrieveUserInfo(uid).getData();
+
 //        먼저 userTourCourse 저장
         UserTourCourse userCourse = new UserTourCourse();
         userCourse.setTitle(dto.title());
         userCourse.setWriting(dto.content());
         TimeZone.setDefault(TimeZone.getTimeZone("Asia/Seoul"));
         userCourse.setCreatedate(new Date());
         userCourse.setWriting(dto.content());
+        userCourse.setUserInfo(userInfo);
         userCourse = userTourCourseRepository.save(userCourse);
 
         System.out.println(dto);

diff --git a/src/main/java/org/alongtheblue/alongtheblue_server/global/data/tourcommunity/TourImage.java b/src/main/java/org/alongtheblue/alongtheblue_server/global/data/tourcommunity/TourImage.java
@@ -2,7 +2,10 @@
 
 import com.fasterxml.jackson.annotation.JsonBackReference;
 import jakarta.persistence.*;
+import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.RequiredArgsConstructor;
 import org.alongtheblue.alongtheblue_server.global.data.tourData.TourData;
 
 @Entity
@@ -12,11 +15,21 @@ public class TourImage {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
+    private String fileName;
     private String url;
 
     @ManyToOne
     @JoinColumn(name = "tourPostItem")
     @JsonBackReference
     private TourPostItem tourPostItem;
 
+    @Builder
+    public TourImage(String fileName, String url) {
+        this.fileName = fileName;
+        this.url = url;
+    }
+
+    public TourImage() {
+
+    }
 }
diff --git a/...ain/java/org/alongtheblue/alongtheblue_server/global/data/tourcommunity/TourPostItem.java b/...ain/java/org/alongtheblue/alongtheblue_server/global/data/tourcommunity/TourPostItem.java
@@ -3,7 +3,10 @@
 import com.fasterxml.jackson.annotation.JsonBackReference;
 import com.fasterxml.jackson.annotation.JsonManagedReference;
 import jakarta.persistence.*;
+import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.RequiredArgsConstructor;
 
 import java.util.List;
 
@@ -32,4 +35,21 @@ public class TourPostItem {
     @JsonManagedReference
     private List<TourImage> tourImage;
 
+    @Builder
+    public TourPostItem(String name, String category, String address, String comment, String xMap, String yMap,
+                        String contentId, UserTourCourse userTourCourse, List<TourImage> tourImage) {
+        this.name = name;
+        this.category = category;
+        this.address = address;
+        this.comment = comment;
+        this.xMap = xMap;
+        this.yMap = yMap;
+        this.contentId = contentId;
+        this.userTourCourse = userTourCourse;
+        this.tourImage = tourImage;
+    }
+
+    public TourPostItem() {
+
+    }
 }
diff --git a/...n/java/org/alongtheblue/alongtheblue_server/global/data/tourcommunity/UserTourCourse.java b/...n/java/org/alongtheblue/alongtheblue_server/global/data/tourcommunity/UserTourCourse.java
@@ -3,7 +3,10 @@
 import com.fasterxml.jackson.annotation.JsonBackReference;
 import com.fasterxml.jackson.annotation.JsonManagedReference;
 import jakarta.persistence.*;
+import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.RequiredArgsConstructor;
 import org.alongtheblue.alongtheblue_server.domain.userInfo.domain.UserInfo;
 
 import java.util.Date;
@@ -34,5 +37,16 @@ public class UserTourCourse {
 //    @JsonManagedReference
 //    private List<TourPostHashTag> tourPostHashTags;
 
-    private String contentId; // 필요 없음
+    @Builder
+    public UserTourCourse(Date createdate, String title, String writing, List<TourPostItem> tourPostItems, UserInfo userInfo) {
+        this.createdate = createdate;
+        this.title = title;
+        this.writing = writing;
+        this.tourPostItems = tourPostItems;
+        this.userInfo = userInfo;
+    }
+
+    public UserTourCourse() {
+
+    }
 }
diff --git a/...dto/request/UserTourCourseRequestDto.java → ...quest/CreateUserTourCourseRequestDto.java b/...dto/request/UserTourCourseRequestDto.java → ...quest/CreateUserTourCourseRequestDto.java
@@ -2,11 +2,14 @@
 
 import java.util.List;
 
-public record UserTourCourseRequestDto(
+public record CreateUserTourCourseRequestDto(
         String title,
         String content,
         List<TourPostItemRequestDto> tourPostItems,
 //        List<TourPostHashTag> hashTags,
         List<List<Integer>> imgIndexArr
 ) {
+    public CreateUserTourCourseServiceRequestDto toServiceRequest() {
+        return new CreateUserTourCourseServiceRequestDto(title, content, tourPostItems, imgIndexArr);
+    }
 }
diff --git a/...e_server/global/data/tourcommunity/dto/request/CreateUserTourCourseServiceRequestDto.java b/...e_server/global/data/tourcommunity/dto/request/CreateUserTourCourseServiceRequestDto.java
@@ -0,0 +1,26 @@
+package org.alongtheblue.alongtheblue_server.global.data.tourcommunity.dto.request;
+
+import org.alongtheblue.alongtheblue_server.domain.userInfo.domain.UserInfo;
+import org.alongtheblue.alongtheblue_server.global.data.tourcommunity.TourPostItem;
+import org.alongtheblue.alongtheblue_server.global.data.tourcommunity.UserTourCourse;
+
+import java.util.Date;
+import java.util.List;
+
+public record CreateUserTourCourseServiceRequestDto(
+        String title,
+        String content,
+        List<TourPostItemRequestDto> tourPostItems,
+//        List<TourPostHashTag> hashTags,
+        List<List<Integer>> imgIndexArr
+) {
+    public UserTourCourse toEntity(UserInfo userInfo, Date date, List<TourPostItem> tourItems) {
+        return UserTourCourse.builder()
+                .createdate(date)
+                .title(title)
+                .writing(content)
+                .tourPostItems(tourItems)
+                .userInfo(userInfo)
+                .build();
+    }
+}
diff --git a/...lue/alongtheblue_server/global/data/tourcommunity/dto/request/TourPostItemRequestDto.java b/...lue/alongtheblue_server/global/data/tourcommunity/dto/request/TourPostItemRequestDto.java
@@ -1,5 +1,11 @@
 package org.alongtheblue.alongtheblue_server.global.data.tourcommunity.dto.request;
 
+import org.alongtheblue.alongtheblue_server.global.data.tourcommunity.TourImage;
+import org.alongtheblue.alongtheblue_server.global.data.tourcommunity.TourPostItem;
+import org.alongtheblue.alongtheblue_server.global.data.tourcommunity.UserTourCourse;
+
+import java.util.List;
+
 public record TourPostItemRequestDto(
         String title,
         String category,
@@ -9,5 +15,20 @@ public record TourPostItemRequestDto(
         String comment
 //        String contentsId
 ) {
+    public TourPostItem toEntity(List<TourImage> tourImages) {
+        TourPostItem item =  TourPostItem.builder()
+                .name(title)
+                .category(category)
+                .address(address)
+                .xMap(xMap)
+                .yMap(yMap)
+                .comment(comment)
+                .tourImage(tourImages)
+                .build();
 
+//        for (TourImage tourImage : tourImages) {
+//            tourImage.setTourPostItem(item);
+//        }
+        return item;
+    }
 }