Modified2

build.gradle

@@ -39,6 +39,8 @@ dependencies {
 
     testImplementation 'org.springframework.security:spring-security-test'
 
+    implementation group: 'com.google.guava', name: 'guava', version: '11.0.2'
+
     //2차
 
     implementation 'io.jsonwebtoken:jjwt:0.9.1'

src/main/java/com/example/demo/feed/controller/CommentController.java

@@ -1,10 +1,16 @@
 package com.example.demo.feed.controller;
 
 
+import com.example.demo.feed.service.CommentDto;
 import com.example.demo.feed.service.CommentService;
 import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.RequestEntity;
+import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
+import java.nio.file.AccessDeniedException;
+
 @RestController
 @RequiredArgsConstructor
 public class CommentController {
@@ -14,14 +20,21 @@ public class CommentController {
 
     @PostMapping("/feed/{feedId}/comments")
     public void makeComment(@PathVariable Long feedId,
-                            @RequestBody String contents){
-        commentService.makeCommentByFeedIdAndContents(feedId, contents);
+                            @RequestBody String contents) throws AccessDeniedException, IllegalAccessException {
+
+        try {
+            CommentDto result = commentService.makeCommentByFeedIdAndContents(feedId, contents);
+            ResponseEntity.ok().body(result);
+        }catch (IllegalArgumentException e){
+            ResponseEntity.status(HttpStatus.BAD_REQUEST);
+
+        }catch (IllegalAccessException e){
+            ResponseEntity.status(HttpStatus.UNAUTHORIZED);
+
+        }
+
+
     }
 
-//    @PostMapping("/feed/{feedId}/comments/{commentId}/like")
-//    public void likeOrDislikeCommentById(@PathVariable Long feedId,
-//                                         @PathVariable int commentId){
-//        commentService.likeOrDislikeCommentByFeedIdAndCommentId(feedId, commentId);
-//    }
 
 }

src/main/java/com/example/demo/feed/controller/FeedController.java

@@ -2,13 +2,18 @@
 
 
 import com.example.demo.feed.domain.Feed;
+import com.example.demo.feed.domain.RequestResult;
+import com.example.demo.feed.service.FeedDto;
 import com.example.demo.feed.service.FeedService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Page;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
 import org.springframework.web.bind.annotation.*;
 
+import java.nio.file.AccessDeniedException;
 import java.util.List;
 
 
@@ -19,37 +24,56 @@ public class FeedController {
 
     private final FeedService feedService;
 
-    @PreAuthorize("hasRole('ROLE_ADMIN')")
-    @GetMapping("/feeds")
-    public Feed[] findTimeline(@RequestParam int page,
-                                   @RequestParam int pageSize){
-        return feedService.findMyTimeLine(page, pageSize);
 
-    }
-
-    @PreAuthorize("hasRole('ROLE_ADMIN')")
     @GetMapping("/feeds/{feedId}")
-    public Feed  findFeedDetailByFeedId(@PathVariable Long feedId){
-        return feedService.findFeedDetailByFeedId(feedId);
+    public ResponseEntity<FeedDto> findFeedDetailByFeedId(@PathVariable Long feedId) throws AccessDeniedException {
+
+
+        try {
+           FeedDto result=   feedService.findFeedDetailByFeedId(feedId);
+           return ResponseEntity.ok().body(result);
+        }catch (IllegalArgumentException e) {
+            return ResponseEntity.badRequest().build();
+        }catch( IllegalAccessException e){
+            return ResponseEntity.status(HttpStatus.UNAUTHORIZED).build();
+        }
+
     }
 
-    @PreAuthorize("hasRole('ROLE_ADMIN')")
+
     @PostMapping("/feeds")
-    public void makeFeed(@RequestBody String contents){
-        feedService.makeFeedByContents(contents);
+    public Object makeFeed(@RequestParam String title,
+                           @RequestParam String contents) throws AccessDeniedException {
+        Object result = feedService.makeFeedByContents(title, contents);
+
+        if (result instanceof FeedDto){
+            ResponseEntity.ok();
+            return result;
+        }else {
+            switch ((RequestResult)result){
+                case BAD_REQUEST:
+                    ResponseEntity.status(HttpStatus.BAD_REQUEST);
+                    break;
+            }
+            return result;
+        }
 
     }
 
     @DeleteMapping("/feeds/{feedId}")
-    public void deleteFeedByFeedId(@PathVariable Long feedId){
-        feedService.deleteFeedByFeedId(feedId);
+    public void deleteFeedByFeedId(@PathVariable Long feedId) throws AccessDeniedException {
+        try {
+            feedService.deleteFeedByFeedId(feedId);
+        }catch (IllegalArgumentException e) {
+
+        }catch( IllegalAccessException e){
+
+        }
 
-    }
 
-    @PostMapping("/feeds/{feedId}/likes")
-    public void likeFeedByFeedId(@PathVariable Long feedId){
-        feedService.likeFeedByFeedID(feedId);
     }
 
 
+
+
 }

src/main/java/com/example/demo/feed/domain/Comment.java

@@ -1,15 +1,14 @@
 package com.example.demo.feed.domain;
 
 
-import com.example.demo.user.domain.User;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
 import javax.persistence.*;
-import java.time.LocalDateTime;
+import java.time.Instant;
 
 @Entity
 @Table(name = "comment")
@@ -27,36 +26,46 @@ public class Comment {
     @JsonIgnoreProperties("feed")
     private Feed feed;
 
+
     @Embedded
     private Writer writer;
 
-    private LocalDateTime wrtTime;
+    private Instant wrtTime;
 
     @Embedded
     private Content content;
 
     @Embedded
-    private Preference preferenceInfo;
+    private PreferenceCount preferenceCountInfo;
 
     private boolean deleted;
 
     public Comment(Writer writer, Content content){
         this.writer = writer;
         this.content = content;
-        this.preferenceInfo = Preference.create();
-        this.wrtTime = LocalDateTime.now();
+        this.preferenceCountInfo = PreferenceCount.create();
+        this.wrtTime = Instant.now();
         this.deleted = false;
     }
 
+    public String getContent(){
+        return this.content.getContent();
+    }
+
 
     public static Comment create(Writer writer, Content content) {
         return new Comment(writer, content);
     }
 
-    public void likeOrDislike() {
+    public void disLike() {
+        this.preferenceCountInfo = PreferenceCount.create(this.preferenceCountInfo.getPreference()-1L);
+    }
 
+    public void like() {
+        this.preferenceCountInfo = PreferenceCount.create(this.preferenceCountInfo.getPreference()+1L);
     }
 
+
 //    public boolean checkPossibleOfLike(User user) {
 //        String writerId = this.getWriter().getWrtName();
 //        String username = user.getUserBasicInfo().getUsername();

src/main/java/com/example/demo/feed/domain/Feed.java

@@ -8,7 +8,8 @@
 import lombok.Setter;
 
 import javax.persistence.*;
-import java.time.LocalDateTime;
+import java.time.Instant;
+import java.util.ArrayList;
 import java.util.List;
 
 @Entity
@@ -25,26 +26,31 @@ public class Feed {
     @Embedded
     private Writer writer;
 
+    @Embedded
+    private Title title;
+
     @Embedded
     private Content content;
 
     @Column(name = "preference")
-    private Preference preferenceInfo;
+    private PreferenceCount preferenceCountInfo;
 
     @Column(name = "wrt_time")
-    private LocalDateTime wrtTime;
+    private Instant wrtTime;
 
     private Boolean deleted;
 
+
     @OneToMany(mappedBy = "feed", cascade = {CascadeType.PERSIST})
     @JsonIgnoreProperties("feed")
-    private List<Comment> comments;
+    private List<Comment> comments = new ArrayList<>();
 
-    private Feed(Writer writer, Content content){
+    private Feed(Writer writer, Title title, Content content){
         this.writer = writer;
         this.content = content;
-        this.wrtTime = LocalDateTime.now();
-        this.preferenceInfo = Preference.create();
+        this.wrtTime = Instant.now();
+        this.preferenceCountInfo = PreferenceCount.create();
+        this.title = title;
         this.deleted = false;
     }
 
@@ -53,12 +59,12 @@ public void delete(){
         this.deleted =true;
     }
 
-    public static Feed create(Writer writer, Content content) {
-        return new Feed(writer, content);
+    public static Feed create(Writer writer, Title title,  Content content) {
+        return new Feed(writer, title, content);
     }
 
     public void like(){
-        this.preferenceInfo = this.preferenceInfo.like();
+        this.preferenceCountInfo = this.preferenceCountInfo.like();
     }
 
     public void enrollComment(Comment comment) {
@@ -70,4 +76,8 @@ public void enrollComment(Comment comment) {
     public Comment getComment(int commentId) {
         return comments.get(commentId);
     }
+
+    public void disLike() {
+        this.preferenceCountInfo = PreferenceCount.create(this.preferenceCountInfo.getPreference()-1L);
+    }
 }

src/main/java/com/example/demo/feed/domain/FeedRepository.java

@@ -3,6 +3,8 @@
 
 
 import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
@@ -18,9 +20,8 @@ public interface FeedRepository extends JpaRepository<Feed, Long> {
 
     Feed findFeedByIdAndDeleted(Long id, Boolean deleted);
 
-    List<Feed> findFeedsByWriter_Id(WriterId id);
 
-    Page<Feed> findAllByWriter(Writer writer);
+    Page<Feed> findAllByWriter_IdIn(List<WriterId> writerIds, Pageable pageable);
 
 
 

src/main/java/com/example/demo/feed/domain/Preference.java → src/main/java/com/example/demo/feed/domain/PreferenceCount.java

@@ -13,23 +13,29 @@
 @Setter(AccessLevel.PACKAGE)
 @Embeddable
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
-public class Preference {
+public class PreferenceCount {
 
     @Column(name = "preference")
     private long preference = 0L;
 
-    private Preference(long like){
+    private PreferenceCount(long like){
         this.preference = like;
     }
 
 
-    public Preference like(){
-        return new Preference(this.preference +1L);
+    public PreferenceCount like(){
+        return new PreferenceCount(this.preference +1L);
     }
 
 
-    public static Preference create(){
-        return new Preference();
+
+
+    public static PreferenceCount create(){
+        return new PreferenceCount();
+    }
+
+    public static PreferenceCount create(long preference){
+        return new PreferenceCount(preference);
     }
 
 

src/main/java/com/example/demo/feed/domain/RequestResult.java

@@ -0,0 +1,9 @@
+package com.example.demo.feed.domain;
+
+public enum RequestResult {
+    BAD_REQUEST,
+    UNAUTHORIZED,
+    FORBIDDEN,
+    OK
+
+}

src/main/java/com/example/demo/feed/domain/Title.java

@@ -0,0 +1,23 @@
+package com.example.demo.feed.domain;
+
+
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Embeddable;
+
+@Embeddable
+@Getter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+public class Title {
+
+    private String title;
+
+    private Title(String title){
+        this.title = title;
+    }
+    public static Title create(String title){
+        return new Title(title);
+    }
+}

src/main/java/com/example/demo/feed/domain/Writer.java

@@ -26,6 +26,14 @@ public Writer(WriterId id, WriterName wrtName) {
         this.wrtName = wrtName;
     }
 
+    public Long getId(){
+        return this.id.getWriterId();
+    }
+
+    public String getName(){
+        return this.wrtName.getWriterName();
+    }
+
     public static Writer create(WriterId wrtId, WriterName wrtName) {
         return new Writer(wrtId, wrtName);
     }