woowacourse-teams
diff --git a/‎backend/pick-git/src/main/java/com/woowacourse/pickgit/exception/post/FeedRequestUserParameterExtractionException.java‎
Lines changed: 22 additions & 0 deletions b/‎backend/pick-git/src/main/java/com/woowacourse/pickgit/exception/post/FeedRequestUserParameterExtractionException.java‎
Lines changed: 22 additions & 0 deletions
diff --git a/‎backend/pick-git/src/main/java/com/woowacourse/pickgit/exception/post/HomeFeedTypeException.java‎
Lines changed: 18 additions & 0 deletions b/‎backend/pick-git/src/main/java/com/woowacourse/pickgit/exception/post/HomeFeedTypeException.java‎
Lines changed: 18 additions & 0 deletions
diff --git a/‎backend/pick-git/src/main/java/com/woowacourse/pickgit/post/application/PostFeedService.java‎
Lines changed: 10 additions & 1 deletion b/‎backend/pick-git/src/main/java/com/woowacourse/pickgit/post/application/PostFeedService.java‎
Lines changed: 10 additions & 1 deletion
diff --git a/‎backend/pick-git/src/main/java/com/woowacourse/pickgit/post/presentation/PostFeedController.java‎
Lines changed: 12 additions & 2 deletions b/‎backend/pick-git/src/main/java/com/woowacourse/pickgit/post/presentation/PostFeedController.java‎
Lines changed: 12 additions & 2 deletions
diff --git a/‎backend/pick-git/src/main/java/com/woowacourse/pickgit/post/presentation/postfeed/AllFeedType.java‎
Lines changed: 29 additions & 0 deletions b/‎backend/pick-git/src/main/java/com/woowacourse/pickgit/post/presentation/postfeed/AllFeedType.java‎
Lines changed: 29 additions & 0 deletions
diff --git a/‎backend/pick-git/src/main/java/com/woowacourse/pickgit/post/presentation/postfeed/FeedType.java‎
Lines changed: 12 additions & 0 deletions b/‎backend/pick-git/src/main/java/com/woowacourse/pickgit/post/presentation/postfeed/FeedType.java‎
Lines changed: 12 additions & 0 deletions
diff --git a/‎backend/pick-git/src/main/java/com/woowacourse/pickgit/post/presentation/postfeed/FeedTypeAuthorizator.java‎
Lines changed: 41 additions & 0 deletions b/‎backend/pick-git/src/main/java/com/woowacourse/pickgit/post/presentation/postfeed/FeedTypeAuthorizator.java‎
Lines changed: 41 additions & 0 deletions
diff --git a/‎backend/pick-git/src/main/java/com/woowacourse/pickgit/post/presentation/postfeed/FollowingsFeedType.java‎
Lines changed: 29 additions & 0 deletions b/‎backend/pick-git/src/main/java/com/woowacourse/pickgit/post/presentation/postfeed/FollowingsFeedType.java‎
Lines changed: 29 additions & 0 deletions
diff --git a/‎backend/pick-git/src/test/java/com/woowacourse/pickgit/integration/post/PostFeedCacheIntegrationTest.java‎
Lines changed: 4 additions & 4 deletions b/‎backend/pick-git/src/test/java/com/woowacourse/pickgit/integration/post/PostFeedCacheIntegrationTest.java‎
Lines changed: 4 additions & 4 deletions
diff --git a/‎backend/pick-git/src/test/java/com/woowacourse/pickgit/query/acceptance/post/PostAcceptanceTest_Query.java‎
Lines changed: 26 additions & 5 deletions b/‎backend/pick-git/src/test/java/com/woowacourse/pickgit/query/acceptance/post/PostAcceptanceTest_Query.java‎
Lines changed: 26 additions & 5 deletions
@@ -0,0 +1,22 @@
+package com.woowacourse.pickgit.exception.post;
+
+import org.springframework.http.HttpStatus;
+
+public class FeedRequestUserParameterExtractionException extends PostException {
+
+    private static final String ERROR_CODE = "P0011";
+    private static final HttpStatus HTTP_STATUS = HttpStatus.BAD_REQUEST;
+    private static final String MESSAGE = "유저 관련 파라메터 추출 오류";
+
+    public FeedRequestUserParameterExtractionException() {
+        this(ERROR_CODE, HTTP_STATUS, MESSAGE);
+    }
+
+    private FeedRequestUserParameterExtractionException(
+        String errorCode,
+        HttpStatus httpStatus,
+        String message
+    ) {
+        super(errorCode, httpStatus, message);
+    }
+}
@@ -0,0 +1,18 @@
+package com.woowacourse.pickgit.exception.post;
+
+import org.springframework.http.HttpStatus;
+
+public class HomeFeedTypeException extends PostException {
+
+    private static final String ERROR_CODE = "P0010";
+    private static final HttpStatus HTTP_STATUS = HttpStatus.INTERNAL_SERVER_ERROR;
+    private static final String MESSAGE = "홈피드 타입을 찾을 수 없습니다.";
+
+    public HomeFeedTypeException() {
+        this(ERROR_CODE, HTTP_STATUS, MESSAGE);
+    }
+
+    private HomeFeedTypeException(String errorCode, HttpStatus httpStatus, String message) {
+        super(errorCode, httpStatus, message);
+    }
+}
@@ -1,6 +1,7 @@
 package com.woowacourse.pickgit.post.application;
 
 
+import com.woowacourse.pickgit.exception.authentication.UnauthorizedException;
 import com.woowacourse.pickgit.exception.post.PostNotFoundException;
 import com.woowacourse.pickgit.exception.user.UserNotFoundException;
 import com.woowacourse.pickgit.post.application.dto.PostDtoAssembler;
@@ -34,13 +35,21 @@ public class PostFeedService {
         condition = "#homeFeedRequestDto.guest == true",
         unless = "#result == null || #result.empty"
     )
-    public List<PostResponseDto> homeFeed(HomeFeedRequestDto homeFeedRequestDto) {
+    public List<PostResponseDto> allHomeFeed(HomeFeedRequestDto homeFeedRequestDto) {
         Pageable pageable = homeFeedRequestDto.getPageable();
 
         if (homeFeedRequestDto.isGuest()) {
             return PostDtoAssembler.postResponseDtos(null, postRepository.findAllPosts(pageable));
         }
 
+        User requestUser = findUserByName(homeFeedRequestDto.getRequestUserName());
+
+        return PostDtoAssembler.postResponseDtos(requestUser, postRepository.findAllPosts(pageable));
+    }
+
+    public List<PostResponseDto> followingHomeFeed(HomeFeedRequestDto homeFeedRequestDto) {
+        Pageable pageable = homeFeedRequestDto.getPageable();
+
         User requestUser = findUserByName(homeFeedRequestDto.getRequestUserName());
         List<Post> result = postRepository.findAllAssociatedPostsByUser(requestUser, pageable);
 
 
@@ -4,6 +4,7 @@
 import com.woowacourse.pickgit.authentication.domain.user.AppUser;
 import com.woowacourse.pickgit.config.auth_interceptor_register.ForLoginAndGuestUser;
 import com.woowacourse.pickgit.config.auth_interceptor_register.ForOnlyLoginUser;
+import com.woowacourse.pickgit.exception.post.HomeFeedTypeException;
 import com.woowacourse.pickgit.post.application.PostFeedService;
 import com.woowacourse.pickgit.post.application.dto.request.HomeFeedRequestDto;
 import com.woowacourse.pickgit.post.application.dto.request.SearchPostRequestDto;
@@ -12,6 +13,7 @@
 import com.woowacourse.pickgit.post.presentation.dto.PostAssembler;
 import com.woowacourse.pickgit.post.presentation.dto.request.SearchPostsRequest;
 import com.woowacourse.pickgit.post.presentation.dto.response.PostResponse;
+import com.woowacourse.pickgit.post.presentation.postfeed.FeedType;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Pageable;
@@ -31,15 +33,23 @@
 public class PostFeedController {
 
     private final PostFeedService postFeedService;
+    private final List<FeedType> feedTypes;
 
     @ForLoginAndGuestUser
     @GetMapping("/posts")
     public ResponseEntity<List<PostResponse>> readHomeFeed(
         @Authenticated AppUser appUser,
-        @PageableDefault Pageable pageable
+        @PageableDefault Pageable pageable,
+        @RequestParam(required = false, defaultValue = "all") String type
     ) {
+        FeedType selectedFeedType = feedTypes.stream()
+            .filter(feedType -> feedType.isSatisfiedBy(type))
+            .findAny()
+            .orElseThrow(HomeFeedTypeException::new);
+
         HomeFeedRequestDto homeFeedRequestDto = new HomeFeedRequestDto(appUser, pageable);
-        List<PostResponseDto> postResponseDtos = postFeedService.homeFeed(homeFeedRequestDto);
+        List<PostResponseDto> postResponseDtos = selectedFeedType.find(homeFeedRequestDto);
+
         List<PostResponse> postResponses = PostAssembler.postResponses((postResponseDtos));
 
         return ResponseEntity.ok(postResponses);
 
@@ -0,0 +1,29 @@
+package com.woowacourse.pickgit.post.presentation.postfeed;
+
+import com.woowacourse.pickgit.post.application.PostFeedService;
+import com.woowacourse.pickgit.post.application.dto.request.HomeFeedRequestDto;
+import com.woowacourse.pickgit.post.application.dto.response.PostResponseDto;
+import java.util.List;
+import org.springframework.stereotype.Component;
+
+@Component
+public class AllFeedType implements FeedType {
+
+    private static final String TYPE = "all";
+    
+    private final PostFeedService postFeedService;
+
+    public AllFeedType(PostFeedService postFeedService) {
+        this.postFeedService = postFeedService;
+    }
+
+    @Override
+    public boolean isSatisfiedBy(String type) {
+        return TYPE.equalsIgnoreCase(type);
+    }
+
+    @Override
+    public List<PostResponseDto> find(HomeFeedRequestDto homeFeedRequestDto) {
+        return postFeedService.allHomeFeed(homeFeedRequestDto);
+    }
+}
@@ -0,0 +1,12 @@
+package com.woowacourse.pickgit.post.presentation.postfeed;
+
+import com.woowacourse.pickgit.post.application.dto.request.HomeFeedRequestDto;
+import com.woowacourse.pickgit.post.application.dto.response.PostResponseDto;
+import java.util.List;
+
+public interface FeedType {
+
+    boolean isSatisfiedBy(String type);
+
+    List<PostResponseDto> find(HomeFeedRequestDto homeFeedRequestDto);
+}
@@ -0,0 +1,41 @@
+package com.woowacourse.pickgit.post.presentation.postfeed;
+
+import com.woowacourse.pickgit.authentication.domain.user.AppUser;
+import com.woowacourse.pickgit.exception.authentication.UnauthorizedException;
+import com.woowacourse.pickgit.exception.post.FeedRequestUserParameterExtractionException;
+import java.util.Arrays;
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Before;
+import org.springframework.stereotype.Component;
+
+@Aspect
+@Component
+public class FeedTypeAuthorizator {
+
+    @Before("execution(* com.woowacourse.pickgit.post.presentation.PostFeedController.readHomeFeed(..))")
+    public void checkAuthorization(JoinPoint joinPoint) {
+        Object[] args = joinPoint.getArgs();
+
+        AppUser appUser = findAppUser(args);
+        String type = findType(args);
+
+        if("followings".equalsIgnoreCase(type) && appUser.isGuest()) {
+            throw new UnauthorizedException();
+        }
+    }
+
+    public AppUser findAppUser(Object[] args) {
+        return (AppUser) Arrays.stream(args)
+            .filter(arg -> arg instanceof AppUser)
+            .findAny()
+            .orElseThrow(FeedRequestUserParameterExtractionException::new);
+    }
+
+    public String findType(Object[] args) {
+        return (String) Arrays.stream(args)
+            .filter(arg -> arg instanceof String)
+            .findAny()
+            .orElseThrow(FeedRequestUserParameterExtractionException::new);
+    }
+}
@@ -0,0 +1,29 @@
+package com.woowacourse.pickgit.post.presentation.postfeed;
+
+import com.woowacourse.pickgit.post.application.PostFeedService;
+import com.woowacourse.pickgit.post.application.dto.request.HomeFeedRequestDto;
+import com.woowacourse.pickgit.post.application.dto.response.PostResponseDto;
+import java.util.List;
+import org.springframework.stereotype.Component;
+
+@Component
+public class FollowingsFeedType implements FeedType {
+
+    private static final String TYPE = "followings";
+
+    private final PostFeedService postFeedService;
+
+    public FollowingsFeedType(PostFeedService postFeedService) {
+        this.postFeedService = postFeedService;
+    }
+
+    @Override
+    public boolean isSatisfiedBy(String type) {
+        return TYPE.equalsIgnoreCase(type);
+    }
+
+    @Override
+    public List<PostResponseDto> find(HomeFeedRequestDto homeFeedRequestDto) {
+        return postFeedService.followingHomeFeed(homeFeedRequestDto);
+    }
+}
@@ -69,9 +69,9 @@ void readHomeFeed_Guest_LatestPosts() {
 
         // when
         queryCounter.startCount();
-        postFeedService.homeFeed(homeFeedRequestDto);
+        postFeedService.allHomeFeed(homeFeedRequestDto);
 
-        List<PostResponseDto> postResponseDtos = postFeedService.homeFeed(homeFeedRequestDto);
+        List<PostResponseDto> postResponseDtos = postFeedService.allHomeFeed(homeFeedRequestDto);
 
         // then
         assertThat(postResponseDtos)
@@ -88,7 +88,7 @@ void readHomeFeed_Guest_LatestPosts() {
     void writePost_LoginUser_DeleteAllCache() {
         // given
         createMockPosts();
-        postFeedService.homeFeed(createMockGuestHomeFeedRequest());
+        postFeedService.allHomeFeed(createMockGuestHomeFeedRequest());
 
         // when
         User user = UserFactory.user(USERNAME);
@@ -111,7 +111,7 @@ void writePost_LoginUser_DeleteAllCache() {
 
         // then
         queryCounter.startCount();
-        postFeedService.homeFeed(createMockGuestHomeFeedRequest());
+        postFeedService.allHomeFeed(createMockGuestHomeFeedRequest());
         assertThat(queryCounter.getCount().getValue()).isEqualTo(6L);
     }
 
 
@@ -13,6 +13,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import com.woowacourse.pickgit.acceptance.AcceptanceTest;
+import com.woowacourse.pickgit.exception.dto.ApiErrorResponse;
 import com.woowacourse.pickgit.post.application.dto.response.PostResponseDto;
 import io.restassured.common.mapper.TypeRef;
 import java.util.List;
@@ -37,10 +38,22 @@ void setUp() {
         DANI.은로그인을하고().포스트에좋아요를누른다(KEVINPOST);
     }
 
-    @DisplayName("로그인일때 홈 피드를 조회한다. - 게시글 좋아요 여부 true/false")
+    @DisplayName("로그인일때 전체 홈 피드를 조회한다. - 게시글 좋아요 여부 true/false")
     @Test
-    void readHomeFeed_LoginUser_Success() {
-        List<PostResponseDto> response = NEOZAL.은로그인을하고().홈피드를_조회한다().as(new TypeRef<>() {
+    void allHomeFeed_LoginUser_Success() {
+        List<PostResponseDto> response = NEOZAL.은로그인을하고().전체_홈피드를_조회한다().as(new TypeRef<>() {
+        });
+
+        assertThat(response)
+            .hasSize(3)
+            .extracting("liked")
+            .containsExactly(false, false, false);
+    }
+
+    @DisplayName("로그인일때 팔로잉 홈 피드를 조회한다. - 게시글 좋아요 여부 true/false")
+    @Test
+    void followingHomeFeed_LoginUser_Success() {
+        List<PostResponseDto> response = NEOZAL.은로그인을하고().팔로잉_홈피드를_조회한다().as(new TypeRef<>() {
         });
 
         assertThat(response)
@@ -51,8 +64,8 @@ void readHomeFeed_LoginUser_Success() {
 
     @DisplayName("비 로그인이어도 홈 피드 조회가 가능하다. - 게시물 좋아요 여부는 항상 null")
     @Test
-    void read_GuestUser_Success() {
-        List<PostResponseDto> response = GUEST.는().홈피드를_조회한다().as(new TypeRef<>() {
+    void allHomeFeed_GuestUser_Success() {
+        List<PostResponseDto> response = GUEST.는().전체_홈피드를_조회한다().as(new TypeRef<>() {
         });
 
         assertThat(response)
@@ -61,6 +74,14 @@ void read_GuestUser_Success() {
             .containsExactly(null, null, null);
     }
 
+    @DisplayName("게스트는 팔로우 피드 조회가 불가능하다.")
+    @Test
+    void followingHomeFeed_GuestUser_Success() {
+        ApiErrorResponse response = GUEST.는().팔로잉_홈피드를_조회한다().as(ApiErrorResponse.class);
+
+        assertThat(response.getErrorCode()).isEqualTo("A0002");
+    }
+
     @DisplayName("로그인 상태에서 내 피드 조회가 가능하다.")
     @Test
     void readMyFeed_LoginUser_Success() {