[v2.3.0] pick-git 배포

backend/pick-git/build.gradle

@@ -26,6 +26,10 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-web'
     implementation 'org.springframework.boot:spring-boot-starter-validation'
     implementation 'org.springframework.boot:spring-boot-starter-log4j2'
+    implementation 'org.apache.logging.log4j:log4j-slf4j-impl:2.15.0'
+    implementation 'org.apache.logging.log4j:log4j-api:2.15.0'
+    implementation 'org.apache.logging.log4j:log4j-core:2.15.0'
+    implementation 'org.apache.logging.log4j:log4j-jul:2.15.0'
     implementation 'com.lmax:disruptor:3.4.2'
     implementation 'org.springframework.boot:spring-boot-starter-webflux'
     implementation 'org.apache.httpcomponents:httpclient:4.5'

backend/pick-git/src/main/java/com/woowacourse/pickgit/authentication/infrastructure/dao/RedisOAuthAccessTokenDao.java

@@ -2,6 +2,8 @@
 
 import com.woowacourse.pickgit.authentication.domain.OAuthAccessTokenDao;
 import java.util.Optional;
+import java.util.concurrent.TimeUnit;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.data.redis.core.ValueOperations;
 import org.springframework.stereotype.Component;
@@ -10,14 +12,24 @@
 public class RedisOAuthAccessTokenDao implements OAuthAccessTokenDao {
 
     private final ValueOperations<String, String> opsForValue;
+    private final long expirationTimeInMilliSeconds;
 
-    public RedisOAuthAccessTokenDao(StringRedisTemplate redisTemplate) {
+    public RedisOAuthAccessTokenDao(
+        StringRedisTemplate redisTemplate,
+        @Value("${security.jwt.expiration-time}") long expirationTimeInMilliSeconds
+    ) {
         this.opsForValue = redisTemplate.opsForValue();
+        this.expirationTimeInMilliSeconds = expirationTimeInMilliSeconds;
     }
 
     @Override
     public void insert(String token, String oauthAccessToken) {
-        opsForValue.set(token, oauthAccessToken);
+        opsForValue.set(
+            token,
+            oauthAccessToken,
+            expirationTimeInMilliSeconds,
+            TimeUnit.MILLISECONDS
+        );
     }
 
     @Override

backend/pick-git/src/main/java/com/woowacourse/pickgit/portfolio/domain/Portfolio.java

@@ -124,7 +124,7 @@ public static Portfolio empty(User user) {
             user.getName(),
             true,
             user.getImage(),
-            user.getDescription(),
+            Objects.isNull(user.getDescription()) ? "" : user.getDescription(),
             LocalDateTime.now(),
             LocalDateTime.now(),
             Contacts.empty(),

backend/pick-git/src/test/java/com/woowacourse/pickgit/acceptance/AcceptanceTest.java

@@ -1,12 +1,12 @@
 package com.woowacourse.pickgit.acceptance;
 
-import static com.woowacourse.pickgit.query.fixture.TPost.NEOZALPOST;
+import static com.woowacourse.pickgit.common.fixture.TPost.NEOZALPOST;
 
+import com.woowacourse.pickgit.common.fixture.TContact;
+import com.woowacourse.pickgit.common.fixture.TProject;
+import com.woowacourse.pickgit.common.fixture.TSection;
 import com.woowacourse.pickgit.config.DatabaseConfigurator;
 import com.woowacourse.pickgit.config.InfrastructureTestConfiguration;
-import com.woowacourse.pickgit.query.fixture.TContact;
-import com.woowacourse.pickgit.query.fixture.TProject;
-import com.woowacourse.pickgit.query.fixture.TSection;
 import io.restassured.RestAssured;
 import java.util.List;
 import java.util.stream.Stream;
@@ -49,6 +49,10 @@ protected void toRead() {
         databaseConfigurator.toRead();
     }
 
+    protected void toWrite() {
+        databaseConfigurator.toWrite();
+    }
+
     protected static Stream<Arguments> getPostSearchArguments() {
         return Stream.of(
             Arguments.of("java"),
@@ -119,4 +123,13 @@ protected static Stream<Arguments> getPortfolioUpdateDuplicateSectionsArguments(
             )
         );
     }
+
+    protected static Stream<Arguments> getParametersForQueryComments() {
+        return Stream.of(
+            Arguments.of(10, 1, 3, 3),
+            Arguments.of(10, 2, 3, 3),
+            Arguments.of(10, 3, 3, 1),
+            Arguments.of(10, 4, 3, 0)
+        );
+    }
 }

backend/pick-git/src/test/java/com/woowacourse/pickgit/acceptance/authentication/OAuthAcceptanceTest.java

@@ -1,6 +1,6 @@
 package com.woowacourse.pickgit.acceptance.authentication;
 
-import static com.woowacourse.pickgit.query.fixture.TUser.NEOZAL;
+import static com.woowacourse.pickgit.common.fixture.TUser.NEOZAL;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import com.woowacourse.pickgit.acceptance.AcceptanceTest;

backend/pick-git/src/test/java/com/woowacourse/pickgit/acceptance/comment/CommentAcceptanceTest.java → backend/pick-git/src/test/java/com/woowacourse/pickgit/acceptance/comment/CommentCreateAcceptanceTest.java

@@ -1,10 +1,10 @@
 package com.woowacourse.pickgit.acceptance.comment;
 
-import static com.woowacourse.pickgit.query.fixture.TPost.NEOZALPOST;
-import static com.woowacourse.pickgit.query.fixture.TPost.UNKNOWN;
-import static com.woowacourse.pickgit.query.fixture.TUser.GUEST;
-import static com.woowacourse.pickgit.query.fixture.TUser.MARK;
-import static com.woowacourse.pickgit.query.fixture.TUser.NEOZAL;
+import static com.woowacourse.pickgit.common.fixture.TPost.NEOZALPOST;
+import static com.woowacourse.pickgit.common.fixture.TPost.UNKNOWN;
+import static com.woowacourse.pickgit.common.fixture.TUser.GUEST;
+import static com.woowacourse.pickgit.common.fixture.TUser.MARK;
+import static com.woowacourse.pickgit.common.fixture.TUser.NEOZAL;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import com.woowacourse.pickgit.acceptance.AcceptanceTest;
@@ -17,7 +17,7 @@
 import org.junit.jupiter.params.provider.NullAndEmptySource;
 import org.junit.jupiter.params.provider.ValueSource;
 
-class CommentAcceptanceTest extends AcceptanceTest {
+class CommentCreateAcceptanceTest extends AcceptanceTest {
 
     @BeforeEach
     void setUp() {

backend/pick-git/src/test/java/com/woowacourse/pickgit/acceptance/comment/CommentAcceptanceTest_delete.java → backend/pick-git/src/test/java/com/woowacourse/pickgit/acceptance/comment/CommentDeleteAcceptanceTest.java

@@ -1,10 +1,10 @@
 package com.woowacourse.pickgit.acceptance.comment;
 
-import static com.woowacourse.pickgit.query.fixture.TPost.NEOZALPOST;
-import static com.woowacourse.pickgit.query.fixture.TUser.GUEST;
-import static com.woowacourse.pickgit.query.fixture.TUser.KEVIN;
-import static com.woowacourse.pickgit.query.fixture.TUser.MARK;
-import static com.woowacourse.pickgit.query.fixture.TUser.NEOZAL;
+import static com.woowacourse.pickgit.common.fixture.TPost.NEOZALPOST;
+import static com.woowacourse.pickgit.common.fixture.TUser.GUEST;
+import static com.woowacourse.pickgit.common.fixture.TUser.KEVIN;
+import static com.woowacourse.pickgit.common.fixture.TUser.MARK;
+import static com.woowacourse.pickgit.common.fixture.TUser.NEOZAL;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import com.woowacourse.pickgit.acceptance.AcceptanceTest;
@@ -13,7 +13,7 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.http.HttpStatus;
 
-class CommentAcceptanceTest_delete extends AcceptanceTest {
+class CommentDeleteAcceptanceTest extends AcceptanceTest {
 
     @DisplayName("내 게시물의 내 댓글을 삭제한다.")
     @Test

backend/pick-git/src/test/java/com/woowacourse/pickgit/query/acceptance/comment/CommentAcceptanceTest_queryComments.java → backend/pick-git/src/test/java/com/woowacourse/pickgit/acceptance/comment/CommentReadAcceptanceTest.java

@@ -1,26 +1,24 @@
-package com.woowacourse.pickgit.query.acceptance.comment;
+package com.woowacourse.pickgit.acceptance.comment;
 
-import static com.woowacourse.pickgit.query.fixture.TPost.KEVINPOST;
-import static com.woowacourse.pickgit.query.fixture.TPost.MARKPOST;
-import static com.woowacourse.pickgit.query.fixture.TPost.NEOZALPOST;
-import static com.woowacourse.pickgit.query.fixture.TUser.GUEST;
-import static com.woowacourse.pickgit.query.fixture.TUser.KEVIN;
-import static com.woowacourse.pickgit.query.fixture.TUser.MARK;
-import static com.woowacourse.pickgit.query.fixture.TUser.NEOZAL;
+import static com.woowacourse.pickgit.common.fixture.TPost.KEVINPOST;
+import static com.woowacourse.pickgit.common.fixture.TPost.MARKPOST;
+import static com.woowacourse.pickgit.common.fixture.TPost.NEOZALPOST;
+import static com.woowacourse.pickgit.common.fixture.TUser.GUEST;
+import static com.woowacourse.pickgit.common.fixture.TUser.KEVIN;
+import static com.woowacourse.pickgit.common.fixture.TUser.MARK;
+import static com.woowacourse.pickgit.common.fixture.TUser.NEOZAL;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import com.woowacourse.pickgit.acceptance.AcceptanceTest;
 import com.woowacourse.pickgit.comment.presentation.dto.response.CommentResponse;
 import io.restassured.common.mapper.TypeRef;
 import java.util.List;
-import java.util.stream.Stream;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-class CommentAcceptanceTest_queryComments extends AcceptanceTest {
+class CommentReadAcceptanceTest extends AcceptanceTest {
 
     @BeforeEach
     void setUp() {
@@ -65,14 +63,4 @@ void queryComments_GuestCanRequestCommentsOfSpecificPost_Success(int commentSize
 
         assertThat(actual).hasSize(expected);
     }
-
-    private static Stream<Arguments> getParametersForQueryComments() {
-        return Stream.of(
-            Arguments.of(10, 1, 3, 3),
-            Arguments.of(10, 2, 3, 3),
-            Arguments.of(10, 3, 3, 1),
-            Arguments.of(10, 4, 3, 0)
-        );
-    }
-
 }

backend/pick-git/src/test/java/com/woowacourse/pickgit/acceptance/portfolio/PortfolioConstraintsAcceptanceTest.java

@@ -1,22 +1,22 @@
 package com.woowacourse.pickgit.acceptance.portfolio;
 
-import static com.woowacourse.pickgit.query.fixture.TPost.NEOZALPOST;
-import static com.woowacourse.pickgit.query.fixture.TUser.NEOZAL;
+import static com.woowacourse.pickgit.common.fixture.TPost.NEOZALPOST;
+import static com.woowacourse.pickgit.common.fixture.TUser.NEOZAL;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import com.woowacourse.pickgit.acceptance.AcceptanceTest;
+import com.woowacourse.pickgit.common.fixture.CPost;
+import com.woowacourse.pickgit.common.fixture.TItem;
+import com.woowacourse.pickgit.common.fixture.TPortfolio;
+import com.woowacourse.pickgit.common.fixture.TPost;
+import com.woowacourse.pickgit.common.fixture.TProject;
+import com.woowacourse.pickgit.common.fixture.TSection;
 import com.woowacourse.pickgit.exception.dto.ApiErrorResponse;
 import com.woowacourse.pickgit.portfolio.presentation.dto.request.DescriptionRequest;
 import com.woowacourse.pickgit.portfolio.presentation.dto.request.ItemRequest;
 import com.woowacourse.pickgit.portfolio.presentation.dto.request.PortfolioRequest;
 import com.woowacourse.pickgit.portfolio.presentation.dto.request.SectionRequest;
 import com.woowacourse.pickgit.portfolio.presentation.dto.response.PortfolioResponse;
-import com.woowacourse.pickgit.query.fixture.CPost;
-import com.woowacourse.pickgit.query.fixture.TItem;
-import com.woowacourse.pickgit.query.fixture.TPortfolio;
-import com.woowacourse.pickgit.query.fixture.TPost;
-import com.woowacourse.pickgit.query.fixture.TProject;
-import com.woowacourse.pickgit.query.fixture.TSection;
 import java.util.List;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;

backend/pick-git/src/test/java/com/woowacourse/pickgit/query/acceptance/portfolio/PortfolioAcceptanceTest_Query.java → backend/pick-git/src/test/java/com/woowacourse/pickgit/acceptance/portfolio/PortfolioReadAcceptanceTest.java

@@ -1,14 +1,12 @@
-package com.woowacourse.pickgit.query.acceptance.portfolio;
+package com.woowacourse.pickgit.acceptance.portfolio;
 
-import static com.woowacourse.pickgit.query.fixture.TUser.GUEST;
-import static com.woowacourse.pickgit.query.fixture.TUser.KEVIN;
-import static com.woowacourse.pickgit.query.fixture.TUser.KODA;
-import static com.woowacourse.pickgit.query.fixture.TUser.MARK;
-import static com.woowacourse.pickgit.query.fixture.TUser.NEOZAL;
+import static com.woowacourse.pickgit.common.fixture.TUser.GUEST;
+import static com.woowacourse.pickgit.common.fixture.TUser.KODA;
+import static com.woowacourse.pickgit.common.fixture.TUser.MARK;
+import static com.woowacourse.pickgit.common.fixture.TUser.NEOZAL;
 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.portfolio.application.dto.PortfolioDtoAssembler;
 import com.woowacourse.pickgit.portfolio.domain.Portfolio;
 import com.woowacourse.pickgit.portfolio.presentation.dto.response.PortfolioResponse;
@@ -20,7 +18,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 
-class PortfolioAcceptanceTest_Query extends AcceptanceTest {
+class PortfolioReadAcceptanceTest extends AcceptanceTest {
 
     @Autowired
     private PortfolioDtoAssembler portfolioDtoAssembler;

backend/pick-git/src/test/java/com/woowacourse/pickgit/acceptance/portfolio/PortfolioAcceptanceTest.java → backend/pick-git/src/test/java/com/woowacourse/pickgit/acceptance/portfolio/PortfolioUpdateAcceptanceTest.java

@@ -1,27 +1,27 @@
 package com.woowacourse.pickgit.acceptance.portfolio;
 
-import static com.woowacourse.pickgit.query.fixture.TPost.KEVINPOST;
-import static com.woowacourse.pickgit.query.fixture.TPost.NEOZALPOST;
-import static com.woowacourse.pickgit.query.fixture.TUser.GUEST;
-import static com.woowacourse.pickgit.query.fixture.TUser.MARK;
-import static com.woowacourse.pickgit.query.fixture.TUser.NEOZAL;
+import static com.woowacourse.pickgit.common.fixture.TPost.KEVINPOST;
+import static com.woowacourse.pickgit.common.fixture.TPost.NEOZALPOST;
+import static com.woowacourse.pickgit.common.fixture.TUser.GUEST;
+import static com.woowacourse.pickgit.common.fixture.TUser.MARK;
+import static com.woowacourse.pickgit.common.fixture.TUser.NEOZAL;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import com.woowacourse.pickgit.acceptance.AcceptanceTest;
+import com.woowacourse.pickgit.common.fixture.TPortfolio;
 import com.woowacourse.pickgit.exception.dto.ApiErrorResponse;
 import com.woowacourse.pickgit.portfolio.presentation.dto.request.ContactRequest;
 import com.woowacourse.pickgit.portfolio.presentation.dto.request.PortfolioRequest;
 import com.woowacourse.pickgit.portfolio.presentation.dto.request.ProjectRequest;
 import com.woowacourse.pickgit.portfolio.presentation.dto.request.SectionRequest;
 import com.woowacourse.pickgit.portfolio.presentation.dto.response.PortfolioResponse;
-import com.woowacourse.pickgit.query.fixture.TPortfolio;
 import java.util.List;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
-class PortfolioAcceptanceTest extends AcceptanceTest {
+class PortfolioUpdateAcceptanceTest extends AcceptanceTest {
 
     @DisplayName("사용자는 나의 포트폴리오를 수정한다. - 성공")
     @ParameterizedTest