Merge pull request #79 from FixLog/develop

Main <- Develop

Author: youngseo22

src/main/java/com/example/FixLog/controller/Controller

@@ -16,15 +16,15 @@ public MainPageController(MainPageService mainPageService){
 
     @GetMapping
     public Response<Object> mainPageView(@RequestParam(value = "sort", defaultValue = "0") int sort,
-                                         @RequestParam(value = "page", defaultValue = "12") int size){
+                                         @RequestParam(value = "size", defaultValue = "12") int size){
         MainPageResponseDto mainPageView = mainPageService.mainPageView(sort, size);
         return Response.success("메인페이지 불러오기 성공", mainPageView);
     }
 
     @GetMapping("/full")
     public Response<Object> mainPageFullView(@RequestParam(value = "sort", defaultValue = "0") int sort,
                                              @RequestParam(value = "page", defaultValue = "1") int page,
-                                             @RequestParam(value = "page", defaultValue = "12") int size){
+                                             @RequestParam(value = "size", defaultValue = "12") int size){
         MainPageResponseDto mainPageFullView = mainPageService.mainPageFullView(sort, page, size);
         return Response.success("메인페이지 전체보기 성공", mainPageFullView);
     }

src/main/java/com/example/FixLog/controller/MainPageController.java

@@ -4,15 +4,19 @@
 import com.example.FixLog.dto.Response;
 import com.example.FixLog.dto.post.PostResponseDto;
 import com.example.FixLog.service.PostService;
+import com.example.FixLog.service.S3Service;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 @RestController
 @RequestMapping("/posts")
 public class PostController {
     private final PostService postService;
+    private final S3Service s3Service;
 
-    public PostController(PostService postService){
+    public PostController(PostService postService, S3Service s3Service){
         this.postService = postService;
+        this.s3Service = s3Service;
     }
 
     @PostMapping
@@ -21,6 +25,12 @@ public Response<Object> createPost(@RequestBody PostRequestDto postRequestDto){
         return Response.success("게시글 작성 성공.", null);
     }
 
+    @PostMapping("/images")
+    public Response<String> uploadImage(@RequestPart("imageFile") MultipartFile imageFile){
+        String markdownImage = postService.uploadImage(imageFile);
+        return Response.success("이미지 마크다운 형식으로 변환", markdownImage);
+    }
+
     @GetMapping("/{postId}")
     public Response<Object> viewPost(@PathVariable("postId") Long postId){
         PostResponseDto viewPost = postService.viewPost(postId);

src/main/java/com/example/FixLog/controller/PostController.java

@@ -8,6 +8,8 @@
 @Getter
 @AllArgsConstructor
 public class PostDto {
+    private Long userId;
+    private String nickname;
     private String postTitle;
     private String coverImageUrl;
     private String problem;

src/main/java/com/example/FixLog/dto/post/PostDto.java

@@ -9,9 +9,10 @@
 @AllArgsConstructor
 public class PostResponseDto {
     private PostDto postInfo;
+    private LocalDate createdAt;
 
     private String nickname;
-    private LocalDate createdAt;
+    private String profileImageUrl;
     private boolean isLiked;
     private boolean isMarked;
 }

src/main/java/com/example/FixLog/dto/post/PostResponseDto.java

@@ -28,7 +28,8 @@ public enum ErrorCode {
     SAME_AS_OLD_PASSWORD(HttpStatus.BAD_REQUEST, "다른 비밀번호 입력 바랍니다."),
     UNAUTHORIZED(HttpStatus.UNAUTHORIZED, "권한이 없습니다."),
     INVALID_REQUEST(HttpStatus.BAD_REQUEST, "요청 데이터가 유효하지 않습니다."),
-    S3_UPLOAD_FAILED(HttpStatus.BAD_REQUEST, "S3 파일 업로드에 실패했습니다.");
+    S3_UPLOAD_FAILED(HttpStatus.BAD_REQUEST, "S3 파일 업로드에 실패했습니다."),
+    IMAGE_UPLOAD_FAILED(HttpStatus.NOT_FOUND, "이미지 파일이 업로드되지 않았습니다.");
 
     private final HttpStatus status;
     private final String message;

src/main/java/com/example/FixLog/exception/ErrorCode.java

@@ -14,6 +14,7 @@
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 @Service
@@ -37,9 +38,16 @@ public String getDefaultImage(String image){
     // 메인페이지 보기
     public MainPageResponseDto mainPageView(int sort, int size){
         // 사용자 정보 불러오기
-        Member member = memberService.getCurrentMemberInfo();
-        String imageUrl = member.getProfileImageUrl();
-        String profileImageUrl = getDefaultImage(imageUrl);
+        Optional<Member> optionalMember = memberService.getCurrentOptionalMemberInfo();
+        String profileImageUrl;
+
+        if (optionalMember.isPresent()) {
+            Member member = optionalMember.get();
+            String imageUrl = member.getProfileImageUrl();
+            profileImageUrl = getDefaultImage(imageUrl);
+        } else {
+            profileImageUrl = "https://example.com/default-cover-image.png"; // 비로그인 기본 이미지
+        }
 
         // 페이지 (글 12개) 불러오기
         Page<Post> posts;
@@ -48,6 +56,7 @@ public MainPageResponseDto mainPageView(int sort, int size){
         if (sort == 0) { // 최신순 정렬
             sortOption = Sort.by(Sort.Direction.DESC, "createdAt");
         } else if (sort == 1) { // 인기순 정렬
+            // Todo : 이거 정렬할 때 좋아요 0인거 이상하고, 이거랑 연결해서인지 totalpages 계산도 이상하게 됨 
             sortOption = Sort.by(Sort.Direction.DESC, "postLikes");
         } else
             throw new CustomException(ErrorCode.SORT_NOT_EXIST);
@@ -75,9 +84,16 @@ public MainPageResponseDto mainPageView(int sort, int size){
     // 메인페이지 전체보기
     public MainPageResponseDto mainPageFullView(int sort, int page, int size){
         // 사용자 정보 불러오기
-        Member member = memberService.getCurrentMemberInfo();
-        String imageUrl = member.getProfileImageUrl();
-        String profileImageUrl = getDefaultImage(imageUrl);
+        Optional<Member> optionalMember = memberService.getCurrentOptionalMemberInfo();
+        String profileImageUrl;
+
+        if (optionalMember.isPresent()) {
+            Member member = optionalMember.get();
+            String imageUrl = member.getProfileImageUrl();
+            profileImageUrl = getDefaultImage(imageUrl);
+        } else {
+            profileImageUrl = "https://example.com/default-cover-image.png"; // 비로그인 기본 이미지
+        }
 
         // 페이지 설정 (한 페이지당 12개)
         Pageable pageable = PageRequest.of(page - 1, size);