develop to main

backend/build.gradle

@@ -36,6 +36,7 @@ dependencies {
     implementation 'org.springdoc:springdoc-openapi-ui:1.6.14'
     implementation 'org.springframework.boot:spring-boot-starter-amqp'
     implementation 'org.springframework.boot:spring-boot-starter-websocket'
+    implementation 'org.springframework.boot:spring-boot-starter-webflux' //webClient
     implementation 'org.springframework.boot:spring-boot-starter-reactor-netty'
     implementation 'org.springframework.session:spring-session-jdbc'
     compileOnly 'org.projectlombok:lombok'

backend/src/main/java/com/rising/backend/domain/comment/service/CommentService.java

@@ -23,7 +23,6 @@ public class CommentService {
     private final CommentMapper commentMapper;
 
     public Comment createComment(CommentDto.CommentCreateRequest dto, Long userId) {
-        findByCommentId(dto.getParentId());
         Comment entity = commentMapper.toCommentEntity(dto, userId);
         return commentRepository.save(entity);
     }

backend/src/main/java/com/rising/backend/domain/post/controller/PostController.java

@@ -1,5 +1,6 @@
 package com.rising.backend.domain.post.controller;
 
+import com.rising.backend.domain.post.domain.PostType;
 import com.rising.backend.domain.post.dto.PostDto;
 import com.rising.backend.domain.post.service.PostService;
 import com.rising.backend.domain.user.domain.User;
@@ -17,6 +18,7 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
+
 import java.util.List;
 
 import static com.rising.backend.domain.post.dto.PostDto.PostCreateRequest;
@@ -42,13 +44,15 @@ public ResponseEntity<ResultResponse> create(
     }
 
     @GetMapping
-    public ResponseEntity<ResultResponse> getList(@PageableDefault(size = 10, sort = "createdAt", direction = Sort.Direction.DESC) final Pageable pageable) {
-        List<PostDto.PostGetListResponse> list = postService.pageList(pageable);
-        return ResponseEntity.ok(ResultResponse.of(ResultCode.POST_PAGINATION_SUCCESS, list));
+    public ResponseEntity<ResultResponse> getList(@RequestParam(value = "type", required = false) PostType postType, @PageableDefault(size = 10, sort = "createdAt", direction = Sort.Direction.DESC) final Pageable pageable) {
+        List<PostDto.PostGetListResponse> result = null;
+        if (postType == null)
+            result = postService.pageList(pageable);
+        else
+            result = postService.getPostsByType(postType, pageable);
+        return ResponseEntity.ok(ResultResponse.of(ResultCode.POST_PAGINATION_SUCCESS, result));
     }
 
-
-
     @LoginRequired
     @GetMapping("/{postId}/session")
     public ResponseEntity<ResultResponse> getSession(
@@ -81,5 +85,23 @@ public ResponseEntity<ResultResponse> getPostListByUserId(@PathVariable Long use
         return ResponseEntity.ok(ResultResponse.of(ResultCode.POSTLIST_FIND_BY_USERID_SUCCESS, postList));
     }
 
+    @PutMapping("/{postId}")
+    public ResponseEntity<ResultResponse> update(
+            @PathVariable Long postId,
+            @RequestBody PostDto.PostUpdateRequest updateRequest) {
+        postService.updatePost(postId, updateRequest);
+        return ResponseEntity.ok(ResultResponse.of(ResultCode.POST_UPDATE_SUCCESS));
+
+    }
+
+    //멘토링 종료
+    @PutMapping("/{postId}/solve")
+    public ResponseEntity<ResultResponse> solve(
+            @PathVariable Long postId,
+            @RequestBody PostDto.SolvedCodeRequest solvedCode) {
+        postService.solve(postId, solvedCode.getSolvedCode());
+        return ResponseEntity.ok(ResultResponse.of(ResultCode.POST_SOLVED));
+
+    }
 
-}
+}

backend/src/main/java/com/rising/backend/domain/post/domain/Post.java

@@ -1,8 +1,10 @@
 package com.rising.backend.domain.post.domain;
 
+import com.rising.backend.domain.post.dto.PostDto.PostUpdateRequest;
 import com.rising.backend.domain.user.domain.User;
 import com.rising.backend.global.domain.BaseEntity;
 import lombok.*;
+import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.SQLDelete;
 import org.hibernate.annotations.Where;
 
@@ -31,31 +33,48 @@ public class Post extends BaseEntity {
 
     @NotBlank
     @Column(length = 100)
+    @Setter
     private String title;
 
     @NotBlank
     @Column(columnDefinition = "TEXT")
+    @Setter
     private String content;
 
+
     @Column(length = 255)
     private String videoUrl;
 
     @Column(length = 255)
     private String sessionUrl;
 
+    @ColumnDefault("false")
+    private boolean isSolved;
+
+    @Column(length = 1000)
+    @Setter
+    private String solvedCode;
+
     @NotNull
     @Enumerated(EnumType.STRING)
-    private PostType type;
+    private PostType postType;
 
     @ManyToMany
     @JoinTable(name = "POST_TAG",
             joinColumns = @JoinColumn(name = "POST_ID"),
             inverseJoinColumns = @JoinColumn(name = "TAG_ID")
     )
+
+    @Setter
     private List<Tag> tag = new ArrayList<>();
 
 
     public void setTags(List<Tag> tags) {
         this.tag = tags;
     }
+
+    public void setSolved() {
+        this.isSolved = true;
+    }
+
 }

backend/src/main/java/com/rising/backend/domain/post/dto/PostDto.java

@@ -30,6 +30,22 @@ public static class PostCreateRequest {
         private List<String> tags = new ArrayList<>();
     }
 
+    @AllArgsConstructor(access = AccessLevel.PRIVATE)
+    @NoArgsConstructor(access =  AccessLevel.PRIVATE)
+    @Getter
+    public static class PostUpdateRequest {
+        private String title;
+        private String content;
+        private List<String> tags = new ArrayList<>();
+    }
+
+    @AllArgsConstructor(access = AccessLevel.PRIVATE)
+    @NoArgsConstructor(access =  AccessLevel.PRIVATE)
+    @Getter
+    public static class SolvedCodeRequest {
+        private String solvedCode;
+    }
+
     @Builder
     @AllArgsConstructor(access = AccessLevel.PRIVATE)
     @NoArgsConstructor(access =  AccessLevel.PRIVATE)
@@ -52,6 +68,8 @@ public static class PostGetListResponse {
         @NotEmpty
         private Long commentCount;
 
+        private boolean isSolved;
+
         private List<String> tags;
     }
 
@@ -76,6 +94,10 @@ public static class PostDetailResponse {
 
         private LocalDate created_at;
 
+        private boolean isSolved;
+
+        private String solvedCode;
+
         private List<String> tags;
     }
 

backend/src/main/java/com/rising/backend/domain/post/mapper/PostMapper.java

@@ -30,7 +30,7 @@ public Post toPostEntity(PostCreateRequest postCreate, User loginUser) {
                 .title(postCreate.getTitle())
                 .videoUrl(null)
                 .sessionUrl(uuidConverter.toBase64(UUID.randomUUID()))
-                .type(postCreate.getType()).build();
+                .postType(postCreate.getType()).build();
     }
 
     public PostDto.PostDetailResponse toPostDto(Post post, List<String> tags) {
@@ -39,7 +39,9 @@ public PostDto.PostDetailResponse toPostDto(Post post, List<String> tags) {
                 .title(post.getTitle())
                 .content(post.getContent())
                 .videoUrl(post.getVideoUrl())
-                .type(post.getType())
+                .type(post.getPostType())
+                .isSolved(post.isSolved())
+                .solvedCode(post.getSolvedCode())
                 .tags(tags)
                 .created_at(post.getCreatedAt().toLocalDate())
                 .build();
@@ -68,8 +70,9 @@ public PostGetListResponse toPostListResponse(Post post) {
                 .content(post.getContent())
                 .created_at(post.getCreatedAt().toLocalDate())
                 .title(post.getTitle())
-                .type(post.getType())
+                .type(post.getPostType())
                 .tags(TagtoString(post.getTag()))
+                .isSolved(post.isSolved())
                 .commentCount(commentRepository.countByPost_Id(post.getId()))
                 .build();
     }

backend/src/main/java/com/rising/backend/domain/post/repository/PostRepository.java

@@ -1,7 +1,10 @@
 package com.rising.backend.domain.post.repository;
 
 import com.rising.backend.domain.post.domain.Post;
+import com.rising.backend.domain.post.domain.PostType;
 import com.rising.backend.domain.post.domain.Tag;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;
@@ -11,4 +14,6 @@ public interface PostRepository extends JpaRepository<Post, Long> {
     List<Post> findByUserId(Long userId);
 
     List<Tag> findTagById(Long id);
+
+    Page<Post> findByPostType(PostType postType, Pageable pageable);
 }

backend/src/main/java/com/rising/backend/domain/post/service/PostService.java

@@ -1,6 +1,7 @@
 package com.rising.backend.domain.post.service;
 
 import com.rising.backend.domain.post.domain.Post;
+import com.rising.backend.domain.post.domain.PostType;
 import com.rising.backend.domain.post.domain.Tag;
 import com.rising.backend.domain.post.dto.PostDto;
 import com.rising.backend.domain.post.mapper.PostMapper;
@@ -15,6 +16,7 @@
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 
+import java.util.Comparator;
 import java.util.List;
 import java.util.NoSuchElementException;
 import java.util.stream.Collectors;
@@ -57,6 +59,11 @@ public List<PostGetListResponse> pageList(Pageable pageable) {
         return postMapper.toDtoPageList(postList).getContent();
     }
 
+    public List<PostGetListResponse> getPostsByType(PostType postType, Pageable pageable) {
+        Page<Post> posts = postRepository.findByPostType(postType, pageable);
+        return postMapper.toDtoPageList(posts).getContent();
+    }
+
     public String getSessionUrl(Long postId, User user) {
         Post post = findPostById(postId);
         if (!checkIsAuthor(post, user)) {
@@ -75,7 +82,10 @@ public PostDto.PostDetailResponse getPostDtoById(Long postId) {
 
     public List<PostDto.PostGetListResponse> getPostListByUserId(Long userId) {
         List<Post> postList = postRepository.findByUserId(userId);
-        return postMapper.toDtoList(postList);
+        List<Post> sortedList = postList.stream()
+                .sorted(Comparator.comparing(Post::getCreatedAt).reversed())
+                .collect(Collectors.toList());
+        return postMapper.toDtoList(sortedList);
     }
 
     public Tag getTagByContent(String content) {
@@ -85,4 +95,21 @@ public Tag getTagByContent(String content) {
     public void deletePostById(Long postId) {
         postRepository.deleteById(postId);
     }
+
+    public void updatePost(Long postId, PostDto.PostUpdateRequest updateRequest) {
+        Post post = findPostById(postId);
+
+        List<Tag> tags = updateRequest.getTags().stream().map(t -> getTagByContent(t))
+                .collect(Collectors.toList());
+
+        post.setTitle(updateRequest.getTitle());
+        post.setContent(updateRequest.getContent());
+        post.setTags(tags);
+    }
+
+    public void solve(Long postId, String solvedCode) {
+        Post post = findPostById(postId);
+        post.setSolved(); //멘토링 완료
+        post.setSolvedCode(solvedCode);
+    }
 }

backend/src/main/java/com/rising/backend/domain/sharecoding/controller/CodeController.java

@@ -1,23 +1,34 @@
 package com.rising.backend.domain.sharecoding.controller;
 
 import com.rising.backend.domain.sharecoding.domain.Operation;
+import com.rising.backend.domain.sharecoding.dto.CodingDto;
+import com.rising.backend.domain.sharecoding.service.CodeService;
+import com.rising.backend.global.result.ResultCode;
+import com.rising.backend.global.result.ResultResponse;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
+import org.springframework.http.ResponseEntity;
 import org.springframework.messaging.handler.annotation.DestinationVariable;
 import org.springframework.messaging.handler.annotation.MessageMapping;
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
 
-import static com.rising.backend.global.constant.RabbitMQ.*;
+import static com.rising.backend.global.constant.RabbitMQ.CODE_QUEUE_NAME;
+import static com.rising.backend.global.constant.RabbitMQ.EXCHANGE_NAME;
 
-@Controller
+@RestController
 @RequiredArgsConstructor
 @Slf4j
+@Tag(name = "SHARE CODE API")
 public class CodeController {
 
     private final RabbitTemplate rabbitTemplate;
+    private final CodeService codeService;
 
     @MessageMapping("code.message.{postId}")
     public void send(@RequestBody Operation operation, @DestinationVariable Long postId) {
@@ -30,4 +41,13 @@ public void send(@RequestBody Operation operation, @DestinationVariable Long pos
     public void receive(Operation operation) {
         log.info("code send success");
     }
+
+    @PostMapping("api/v1/codes")
+    public ResponseEntity<ResultResponse> compile(
+            @RequestBody CodingDto.CompilerReqeust request) {
+
+        CodingDto.CompilerResponse response = codeService.getCompileResponse(request);
+        return ResponseEntity.ok(ResultResponse.of(ResultCode.GET_COMPILE_RESULT, response));
+    }
+
 }