Merge branch 'develop' of https://github.com/pknu-wap/GLOG into develop

pknu-wap · Nov 30, 2023 · 1f256fe · 1f256fe
2 parents f9442ce + a229745
commit 1f256fe
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 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
@@ -1,6 +1,7 @@
 package com.project.Glog.controller;
 
 import com.project.Glog.domain.Blog;
+import com.project.Glog.dto.ReadmeDto;
 import com.project.Glog.dto.request.user.UserCreateRequest;
 import com.project.Glog.dto.response.blog.MyPageResponse;
 import com.project.Glog.dto.response.blog.ReadMeDto;
@@ -65,8 +66,8 @@ public ResponseEntity<ReadMeDto> readReadme(@CurrentUser UserPrincipal userPrinc
 
     @PutMapping("/read-me")
     public ResponseEntity<String> putReadme(@CurrentUser UserPrincipal userPrincipal,
-                                            @RequestBody String readme){
-        blogService.registerReadme(userPrincipal, readme);
+                                            @RequestBody ReadmeDto readme){
+        blogService.registerReadme(userPrincipal, readme.getReadme());
 
         return new ResponseEntity<>("success update read-me", HttpStatus.OK);
     }

diff --git a/server/src/main/java/com/project/Glog/dto/ReadmeDto.java b/server/src/main/java/com/project/Glog/dto/ReadmeDto.java
@@ -0,0 +1,14 @@
+package com.project.Glog.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@AllArgsConstructor
+@NoArgsConstructor
+public class ReadmeDto {
+    private String readme;
+}
diff --git a/server/src/main/java/com/project/Glog/service/BlogService.java b/server/src/main/java/com/project/Glog/service/BlogService.java
@@ -59,7 +59,7 @@ public Long getBlogId(String blogUrl){
 
     public ReadMeDto getReadme(UserPrincipal userPrincipal, Long blogId){
         ReadMeDto readMeDto = new ReadMeDto();
-        Blog blog = blogRepository.getReferenceById(blogId);
+        Blog blog = blogRepository.findById(blogId).get();
         Boolean isMe;
 
         if(userPrincipal == null){