[Feat] dev to main merge

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,26 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: feat
+assignees: sss4920
+
+---
+
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+---
+
+## ✨ Description
+
+구현할 기능 작성
+
+## ✅ To Do List
+
+- [ ] 작업 1
+- [ ] 작업 2
+- [ ] 작업 3

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,25 @@
+## 🚩 관련 이슈
+- close #1
+
+## 📋 구현 기능 명세
+- [x] 
+
+## 📌 PR Point
+- 무슨 이유로 어떻게 코드를 변경했는지
+
+
+- 어떤 부분에 리뷰어가 집중해야 하는지
+
+
+- 개발하면서 어떤 점이 궁금했는지
+
+## 📸 결과물 스크린샷
+```java
+@Pattern(regexp = "^[\\S][가-힣a-zA-Z0-9\\s]{0,20}$", message = "위니 피드 제목 형식에 맞지 않습니다.")
+```
+
+## 🛠️ 테스트
+- [x] 테스트
+
+## 🚀 API Endpoint
+- /

src/main/java/org/winey/server/ServerApplication.java

@@ -2,7 +2,9 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 
+@EnableJpaAuditing
 @SpringBootApplication
 public class ServerApplication {
 

src/main/java/org/winey/server/common/advice/ControllerExceptionAdvice.java

@@ -4,6 +4,8 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.FieldError;
 import org.springframework.web.bind.MethodArgumentNotValidException;
+import org.springframework.web.bind.MissingRequestHeaderException;
+import org.springframework.web.bind.MissingServletRequestParameterException;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
@@ -23,7 +25,19 @@ public class ControllerExceptionAdvice {
     @ExceptionHandler(MethodArgumentNotValidException.class)
     protected ApiResponse handleMethodArgumentNotValidException(final MethodArgumentNotValidException e) {
         FieldError fieldError = Objects.requireNonNull(e.getFieldError());
-        return ApiResponse.error(Error.REQUEST_VALIDATION_EXCEPTION, String.format("%s. (%s)", fieldError.getDefaultMessage(), fieldError.getField()));
+        return ApiResponse.error(Error.VALIDATION_REQUEST_MISSING_EXCEPTION, String.format("%s. (%s)", fieldError.getDefaultMessage(), fieldError.getField()));
+    }
+
+    @ResponseStatus(HttpStatus.BAD_REQUEST)
+    @ExceptionHandler(MissingRequestHeaderException.class)
+    protected ApiResponse handleMissingRequestHeaderException(final MissingRequestHeaderException e) {
+        return ApiResponse.error(Error.VALIDATION_REQUEST_HEADER_MISSING_EXCEPTION, String.format("%s. (%s)", Error.VALIDATION_REQUEST_HEADER_MISSING_EXCEPTION.getMessage(), e.getHeaderName()));
+    }
+
+    @ResponseStatus(HttpStatus.BAD_REQUEST)
+    @ExceptionHandler(MissingServletRequestParameterException.class)
+    protected ApiResponse handleMissingRequestParameterException(final MissingServletRequestParameterException e) {
+        return ApiResponse.error(Error.VALIDATION_REQUEST_PARAMETER_MISSING_EXCEPTION, String.format("%s. (%s)", Error.VALIDATION_REQUEST_PARAMETER_MISSING_EXCEPTION.getMessage(), e.getParameterName()));
     }
 
     /**

src/main/java/org/winey/server/controller/FeedController.java

@@ -0,0 +1,43 @@
+package org.winey.server.controller;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.*;
+import org.winey.server.common.dto.ApiResponse;
+import org.winey.server.controller.request.CreateFeedRequestDto;
+import org.winey.server.controller.response.feed.CreateFeedResponseDto;
+import org.winey.server.exception.Success;
+import org.winey.server.external.client.aws.S3Service;
+import org.winey.server.service.FeedService;
+
+import javax.validation.Valid;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/feed")
+public class FeedController {
+    private final S3Service s3Service;
+    private final FeedService feedService;
+
+    @PostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
+    @ResponseStatus(HttpStatus.CREATED)
+    public ApiResponse<CreateFeedResponseDto> createFeed(
+            @RequestHeader("userId") Long userId,
+            @ModelAttribute CreateFeedRequestDto request) {
+        String feedImageUrl = s3Service.uploadImage(request.getFeedImage(), "feed");
+        return ApiResponse.success(Success.CREATE_BOARD_SUCCESS, feedService.createFeed(request,userId,feedImageUrl));
+    }
+
+    @DeleteMapping(value = "/{feedId}")
+    @ResponseStatus(HttpStatus.OK)
+    public ApiResponse deleteFeed(
+            @RequestHeader("userId")Long userId,
+            @PathVariable Long feedId
+    ){
+        String imageUrl = feedService.deleteFeed(userId,feedId);
+        s3Service.deleteFile(imageUrl);
+        return ApiResponse.success(Success.DELETE_FEED_SUCCESS);
+    }
+
+}

src/main/java/org/winey/server/controller/GoalController.java

@@ -0,0 +1,26 @@
+package org.winey.server.controller;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.*;
+import org.winey.server.common.dto.ApiResponse;
+import org.winey.server.controller.request.goal.GoalRequestCreateDto;
+import org.winey.server.controller.response.goal.GoalResponseCreateDto;
+import org.winey.server.exception.Success;
+import org.winey.server.service.GoalService;
+
+import javax.validation.Valid;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/goal")
+public class GoalController {
+
+    private final GoalService goalService;
+
+    @PostMapping("")
+    @ResponseStatus(HttpStatus.CREATED)
+    public ApiResponse<GoalResponseCreateDto> create(@RequestBody @Valid final GoalRequestCreateDto requestDto, @RequestHeader Long userId) {
+        return ApiResponse.success(Success.CREATE_GOAL_SUCCESS, goalService.createGoal(requestDto, userId));
+    }
+}

src/main/java/org/winey/server/controller/RecommendController.java

@@ -0,0 +1,25 @@
+package org.winey.server.controller;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.*;
+import org.winey.server.common.dto.ApiResponse;
+import org.winey.server.controller.response.recommend.RecommendListResponseDto;
+import org.winey.server.exception.Success;
+import org.winey.server.service.RecommendService;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/recommend")
+public class RecommendController {
+
+    private final RecommendService recommendService;
+
+    @GetMapping("")
+    @ResponseStatus(HttpStatus.OK)
+    public ApiResponse<RecommendListResponseDto> getRecommend(@RequestParam int page, @RequestHeader Long userId) {
+        return ApiResponse.success(Success.GET_RECOMMEND_LIST_SUCCESS, recommendService.getRecommend(page, userId));
+    }
+
+
+}

src/main/java/org/winey/server/controller/UserController.java

@@ -0,0 +1,23 @@
+package org.winey.server.controller;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.*;
+import org.winey.server.common.dto.ApiResponse;
+import org.winey.server.controller.response.user.UserResponseDto;
+import org.winey.server.exception.Success;
+import org.winey.server.service.UserService;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/user")
+public class UserController {
+
+    private final UserService userService;
+
+    @GetMapping("")
+    @ResponseStatus(HttpStatus.OK)
+    public ApiResponse<UserResponseDto> getUser(@RequestHeader Long userId) {
+        return ApiResponse.success(Success.GET_USER_SUCCESS, userService.getUser(userId));
+    }
+}

src/main/java/org/winey/server/controller/request/CreateFeedRequestDto.java

@@ -0,0 +1,18 @@
+package org.winey.server.controller.request;
+
+import lombok.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.validation.constraints.NotNull;
+
+@Getter
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+@AllArgsConstructor
+public class CreateFeedRequestDto {
+    @NotNull
+    private String feedTitle;
+    @NotNull
+    private MultipartFile feedImage;
+    @NotNull
+    private Long feedMoney;
+}

src/main/java/org/winey/server/controller/request/goal/GoalRequestCreateDto.java

@@ -0,0 +1,18 @@
+package org.winey.server.controller.request.goal;
+
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.DecimalMin;
+
+@Getter
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+public class GoalRequestCreateDto {
+    @DecimalMin(value = "30000")
+    private Long targetMoney;
+    @DecimalMin(value = "5")
+    private int targetDay;
+}

src/main/java/org/winey/server/controller/response/PageResponseDto.java

@@ -0,0 +1,16 @@
+package org.winey.server.controller.response;
+
+import lombok.*;
+
+@Getter
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+public class PageResponseDto {
+    private int totalPageSize;
+    private int currentPageIndex;
+    private Boolean isEnd;
+
+    public static PageResponseDto of(int totalPageSize, int currentPageIndex, boolean isEnd) {
+        return new PageResponseDto(totalPageSize, currentPageIndex, isEnd);
+    }
+}

src/main/java/org/winey/server/controller/response/feed/CreateFeedResponseDto.java

@@ -0,0 +1,21 @@
+package org.winey.server.controller.response.feed;
+
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+
+@Getter
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+public class CreateFeedResponseDto {
+    private Long feedId;
+    private LocalDateTime createdAt;
+
+    public static CreateFeedResponseDto of(Long feedId, LocalDateTime createdAt){
+        return new CreateFeedResponseDto(feedId, createdAt);
+    }
+
+}

src/main/java/org/winey/server/controller/response/goal/GoalResponseCreateDto.java

@@ -0,0 +1,23 @@
+package org.winey.server.controller.response.goal;
+
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+@Getter
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+public class GoalResponseCreateDto {
+    private Long userId;
+    private Long targetMoney;
+    private LocalDate targetDate;
+    private LocalDateTime createdAt;
+
+    public static GoalResponseCreateDto of(Long userId, Long targetMoney, LocalDate targetDate, LocalDateTime createdAt) {
+        return new GoalResponseCreateDto(userId, targetMoney, targetDate, createdAt);
+    }
+}

src/main/java/org/winey/server/controller/response/recommend/RecommendListResponseDto.java

@@ -0,0 +1,19 @@
+package org.winey.server.controller.response.recommend;
+
+import lombok.*;
+import org.winey.server.controller.response.PageResponseDto;
+
+import java.util.List;
+
+@Getter
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+public class RecommendListResponseDto {
+    private RecommendResponseUserDto recommendResponseUserDto;
+    private PageResponseDto pageResponseDto;
+    private List<RecommendResponseDto> recommendsResponseDto;
+
+    public static RecommendListResponseDto of(RecommendResponseUserDto recommendResponseUserDto, PageResponseDto pageResponseDto, List<RecommendResponseDto> recommendsResponseDto) {
+        return new RecommendListResponseDto(recommendResponseUserDto, pageResponseDto, recommendsResponseDto);
+    }
+}

src/main/java/org/winey/server/controller/response/recommend/RecommendResponseDto.java

@@ -0,0 +1,24 @@
+package org.winey.server.controller.response.recommend;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.*;
+
+import java.time.LocalDateTime;
+
+@Getter
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class RecommendResponseDto {
+    private Long recommendId;
+    private String recommendLink;
+    private String recommendTitle;
+    private Long recommendWon;
+    private Long recommendPercent;
+    private String recommendImage;
+    private LocalDateTime createdAt;
+
+    public static RecommendResponseDto of(Long recommendId, String recommendLink, String recommendTitle, Long recommendWon, Long recommendPercent, String recommendImage, LocalDateTime createdAt) {
+        return new RecommendResponseDto(recommendId, recommendLink, recommendTitle, recommendWon, recommendPercent, recommendImage, createdAt);
+    }
+}

src/main/java/org/winey/server/controller/response/recommend/RecommendResponseUserDto.java

@@ -0,0 +1,15 @@
+package org.winey.server.controller.response.recommend;
+
+import lombok.*;
+
+@Getter
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+public class RecommendResponseUserDto {
+    private Long userId;
+    private String nickname;
+
+    public static RecommendResponseUserDto of(Long userId, String nickname) {
+        return new RecommendResponseUserDto(userId, nickname);
+    }
+}

src/main/java/org/winey/server/controller/response/user/UserResponseDto.java

@@ -0,0 +1,20 @@
+package org.winey.server.controller.response.user;
+
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+
+@Getter
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+public class UserResponseDto {
+    private UserResponseUserDto userResponseUserDto;
+    private UserResponseGoalDto userResponseGoalDto;
+
+    public static UserResponseDto of(UserResponseUserDto userResponseUserDto, UserResponseGoalDto userResponseGoalDto) {
+        return new UserResponseDto(userResponseUserDto, userResponseGoalDto);
+    }
+}
+