Merge pull request #176 from pknu-wap/feature/또또추가사항

리드미 수정
pknu-wap · Nov 30, 2023 · 28615ad · 28615ad
2 parents d4d235a + 253b579
commit 28615ad
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 5 deletions.
diff --git a/server/src/main/java/com/project/Glog/controller/BlogController.java b/server/src/main/java/com/project/Glog/controller/BlogController.java
@@ -3,6 +3,7 @@
 import com.project.Glog.domain.Blog;
 import com.project.Glog.dto.request.user.UserCreateRequest;
 import com.project.Glog.dto.response.blog.MyPageResponse;
+import com.project.Glog.dto.response.blog.ReadMeDto;
 import com.project.Glog.repository.BlogRepository;
 import com.project.Glog.security.CurrentUser;
 import com.project.Glog.security.UserPrincipal;
@@ -54,11 +55,12 @@ public ResponseEntity<Long> getBlogId(@RequestParam String blogUrl){
     }
 
     @GetMapping("/read-me")
-    public ResponseEntity<String> readReadme(@RequestParam Long blogId){
+    public ResponseEntity<ReadMeDto> readReadme(@CurrentUser UserPrincipal userPrincipal,
+                                                @RequestParam Long blogId){
 
-        String readme = blogService.getReadme(blogId);
+        ReadMeDto readMeDto = blogService.getReadme(userPrincipal, blogId);
 
-        return new ResponseEntity<>(readme, HttpStatus.OK);
+        return new ResponseEntity<>(readMeDto, HttpStatus.OK);
     }
 
     @PutMapping("/read-me")

diff --git a/server/src/main/java/com/project/Glog/dto/response/blog/ReadMeDto.java b/server/src/main/java/com/project/Glog/dto/response/blog/ReadMeDto.java
@@ -0,0 +1,16 @@
+package com.project.Glog.dto.response.blog;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@AllArgsConstructor
+@NoArgsConstructor
+public class ReadMeDto {
+    private String blogName;
+    private String content;
+    private Boolean isMe;
+}
diff --git a/server/src/main/java/com/project/Glog/repository/BlogRepository.java b/server/src/main/java/com/project/Glog/repository/BlogRepository.java
@@ -1,6 +1,7 @@
 package com.project.Glog.repository;
 
 import com.project.Glog.domain.Blog;
+import com.project.Glog.domain.User;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
@@ -13,6 +14,9 @@ public interface BlogRepository extends JpaRepository<Blog, Long> {
     @Query("SELECT b FROM Blog b JOIN b.user u WHERE u.id=:userId")
     Optional<Blog> findByUserId(@Param("userId") Long uid);
 
+    @Query("SELECT b.user FROM Blog b WHERE b.id=:blogId")
+    Optional<User> findByBlogId(@Param("blogId") Long blogid);
+
     @Query("SELECT b.id FROM Blog b WHERE b.blogUrl=:blogUrl")
     Long findByBlogUrl(@Param("blogUrl") String blogUrl);
 

diff --git a/server/src/main/java/com/project/Glog/service/BlogService.java b/server/src/main/java/com/project/Glog/service/BlogService.java
@@ -5,6 +5,7 @@
 import com.project.Glog.domain.User;
 import com.project.Glog.dto.request.user.UserCreateRequest;
 import com.project.Glog.dto.response.blog.MyPageResponse;
+import com.project.Glog.dto.response.blog.ReadMeDto;
 import com.project.Glog.repository.BlogRepository;
 import com.project.Glog.repository.GuestbookRepository;
 import com.project.Glog.repository.UserRepository;
@@ -56,8 +57,26 @@ public Long getBlogId(String blogUrl){
         return blogRepository.findByBlogUrl(blogUrl);
     }
 
-    public String getReadme(Long blogId){
-        return blogRepository.getReferenceById(blogId).getReadme();
+    public ReadMeDto getReadme(UserPrincipal userPrincipal, Long blogId){
+        ReadMeDto readMeDto = new ReadMeDto();
+        Blog blog = blogRepository.getReferenceById(blogId);
+        Boolean isMe;
+
+        if(userPrincipal == null){
+            isMe = false;
+        }
+        else{
+            if(userPrincipal.getId() == blogRepository.findByBlogId(blogId).get().getId()){
+                isMe = true;
+            }
+            else{
+                isMe = false;
+            }
+        }
+        readMeDto.setBlogName(blog.getBlogName());
+        readMeDto.setContent(blog.getReadme());
+        readMeDto.setIsMe(isMe);
+        return readMeDto;
     }
 
     public void registerReadme(UserPrincipal userPrincipal, String readme){