woowacourse-teams
diff --git a/‎.github/workflows/be-cd-dev.yml‎
Lines changed: 0 additions & 3 deletions b/‎.github/workflows/be-cd-dev.yml‎
Lines changed: 0 additions & 3 deletions
diff --git a/‎backend/build.gradle‎
Lines changed: 8 additions & 0 deletions b/‎backend/build.gradle‎
Lines changed: 8 additions & 0 deletions
diff --git a/‎backend/src/main/java/kr/touroot/TourootApplication.java‎
Lines changed: 6 additions & 2 deletions b/‎backend/src/main/java/kr/touroot/TourootApplication.java‎
Lines changed: 6 additions & 2 deletions
diff --git a/‎backend/src/main/java/kr/touroot/authentication/service/LoginService.java‎
Lines changed: 1 addition & 1 deletion b/‎backend/src/main/java/kr/touroot/authentication/service/LoginService.java‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎backend/src/main/java/kr/touroot/global/config/CacheConfig.java‎
Lines changed: 63 additions & 0 deletions b/‎backend/src/main/java/kr/touroot/global/config/CacheConfig.java‎
Lines changed: 63 additions & 0 deletions
diff --git a/‎backend/src/main/java/kr/touroot/global/config/EmbeddedS3Config.java‎
Lines changed: 1 addition & 1 deletion b/‎backend/src/main/java/kr/touroot/global/config/EmbeddedS3Config.java‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎backend/src/main/java/kr/touroot/global/config/SchedulingConfig.java‎
Lines changed: 9 additions & 0 deletions b/‎backend/src/main/java/kr/touroot/global/config/SchedulingConfig.java‎
Lines changed: 9 additions & 0 deletions
diff --git a/‎backend/src/main/java/kr/touroot/global/exception/GlobalExceptionHandler.java‎
Lines changed: 1 addition & 1 deletion b/‎backend/src/main/java/kr/touroot/global/exception/GlobalExceptionHandler.java‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎backend/src/main/java/kr/touroot/global/util/PageDeserializer.java‎
Lines changed: 75 additions & 0 deletions b/‎backend/src/main/java/kr/touroot/global/util/PageDeserializer.java‎
Lines changed: 75 additions & 0 deletions
diff --git a/‎backend/src/main/java/kr/touroot/global/util/SortDeserializer.java‎
Lines changed: 77 additions & 0 deletions b/‎backend/src/main/java/kr/touroot/global/util/SortDeserializer.java‎
Lines changed: 77 additions & 0 deletions
@@ -21,9 +21,6 @@ jobs:
           distribution: 'temurin'
           java-version: '17'
 
-      - name: Make keystore file
-        run: echo "${{secrets.SSL_KEYSTORE}}" | base64 --decode > ./src/main/resources/keystore.p12
-
       - name: Gradle Caching
         uses: actions/cache@v3
         with:
 
@@ -51,8 +51,16 @@ dependencies {
     testAnnotationProcessor 'org.projectlombok:lombok'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 
+    // testcontainers
+    testImplementation "org.testcontainers:testcontainers:1.20.4"
+    testImplementation "org.testcontainers:junit-jupiter:1.20.4"
+    testImplementation "org.testcontainers:mysql"
+    testImplementation 'org.testcontainers:localstack'
+    testImplementation 'com.redis:testcontainers-redis:2.2.2'
+
     // cache
     implementation 'org.springframework.boot:spring-boot-starter-cache'
+    implementation 'org.springframework.boot:spring-boot-starter-data-redis'
     implementation 'com.github.ben-manes.caffeine:caffeine:3.1.8'
 
     // QueryDSL
 
@@ -1,7 +1,8 @@
 package kr.touroot;
 
-import org.springframework.boot.SpringApplication;
+import com.ulisesbocchio.jasyptspringboot.environment.StandardEncryptableEnvironment;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 
@@ -11,6 +12,9 @@
 public class TourootApplication {
 
     public static void main(String[] args) {
-        SpringApplication.run(TourootApplication.class, args);
+        new SpringApplicationBuilder()
+                .environment(new StandardEncryptableEnvironment())
+                .sources(TourootApplication.class)
+                .run(args);
     }
 }
@@ -34,7 +34,7 @@ public LoginResponse login(String code, String encodedRedirectUri) {
         return LoginResponse.of(member, tokenProvider.createToken(member.getId()));
     }
 
-    private Member signUp(OauthUserInformationResponse userInformation) {
+    public Member signUp(OauthUserInformationResponse userInformation) {
         return memberRepository.save(userInformation.toMember());
     }
 
 
@@ -0,0 +1,63 @@
+package kr.touroot.global.config;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectMapper.DefaultTyping;
+import com.fasterxml.jackson.databind.jsontype.BasicPolymorphicTypeValidator;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import java.time.Duration;
+import kr.touroot.global.util.PageDeserializer;
+import kr.touroot.global.util.SortDeserializer;
+import org.springframework.cache.CacheManager;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.redis.cache.RedisCacheConfiguration;
+import org.springframework.data.redis.cache.RedisCacheManager;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer;
+import org.springframework.data.redis.serializer.RedisSerializationContext.SerializationPair;
+import org.springframework.data.redis.serializer.StringRedisSerializer;
+
+@Configuration
+public class CacheConfig {
+
+    private static final Duration CACHE_TTL = Duration.ofMinutes(30);
+
+    @Bean
+    public CacheManager cacheManager(RedisConnectionFactory connectionFactory) {
+        return RedisCacheManager.builder(connectionFactory)
+                .cacheDefaults(getRedisCacheConfiguration())
+                .build();
+    }
+
+    private RedisCacheConfiguration getRedisCacheConfiguration() {
+        SerializationPair<String> keySerializationPair = SerializationPair.fromSerializer(new StringRedisSerializer());
+        SerializationPair<Object> valueSerializationPair = SerializationPair.fromSerializer(
+                new GenericJackson2JsonRedisSerializer(getObjectMapperForRedisCacheManager())
+        );
+
+        return RedisCacheConfiguration.defaultCacheConfig()
+                .serializeKeysWith(keySerializationPair)
+                .serializeValuesWith(valueSerializationPair)
+                .entryTtl(CACHE_TTL)
+                .disableCachingNullValues();
+    }
+
+    private ObjectMapper getObjectMapperForRedisCacheManager() {
+        ObjectMapper objectMapper = new ObjectMapper();
+
+        SimpleModule pageModule = new SimpleModule();
+        pageModule.addDeserializer(PageImpl.class, new PageDeserializer());
+        pageModule.addDeserializer(Sort.class, new SortDeserializer());
+
+        objectMapper.registerModules(new JavaTimeModule(), pageModule);
+        objectMapper.activateDefaultTyping(
+                BasicPolymorphicTypeValidator.builder().allowIfBaseType(Object.class).build(),
+                DefaultTyping.EVERYTHING
+        );
+
+        return objectMapper;
+    }
+}
@@ -14,7 +14,7 @@
 import software.amazon.awssdk.services.s3.model.CreateBucketRequest;
 
 @Configuration
-@Profile({"default", "local"})
+@Profile("local")
 public class EmbeddedS3Config {
 
     private static final int DYNAMIC_PORT_NUMBER_LOWER = 49152;
 
@@ -0,0 +1,9 @@
+package kr.touroot.global.config;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.EnableScheduling;
+
+@Configuration
+@EnableScheduling
+public class SchedulingConfig {
+}
@@ -73,7 +73,7 @@ public ResponseEntity<ExceptionResponse> handleException(Exception exception) {
 
     @ExceptionHandler(S3UploadException.class)
     public ResponseEntity<ExceptionResponse> handleS3UploadException(S3UploadException exception) {
-        log.warn("S3_UPLOAD_EXCEPTION :: message = {}", exception.getMessage());
+        log.warn("S3_UPLOAD_EXCEPTION :: stackTrace = ", exception);
 
         ExceptionResponse data = new ExceptionResponse("이미지 업로드에 실패했습니다.");
         return ResponseEntity.badRequest()
 
@@ -0,0 +1,75 @@
+package kr.touroot.global.util;
+
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonToken;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Sort;
+
+public class PageDeserializer extends JsonDeserializer<PageImpl<?>> {
+
+    @Override
+    public PageImpl<?> deserialize(JsonParser p, DeserializationContext ctxt) throws IOException {
+        List<Object> content = new ArrayList<>();
+        int pageNumber = 0;
+        int pageSize = 0;
+        long totalElements = 0;
+        Sort sort = Sort.unsorted();
+
+        if (p.getCurrentToken() != JsonToken.START_OBJECT) {
+            throw new JsonParseException("Page 객체를 역직렬화하는 과정에서 예외가 발생했습니다.");
+        }
+
+        while (p.nextToken() != JsonToken.END_OBJECT) {
+            String fieldName = p.getCurrentName();
+            p.nextToken();
+
+            if (fieldName == null) {
+                continue;
+            }
+
+            if (fieldName.equals("content") && p.getCurrentToken() == JsonToken.START_ARRAY) {
+                content = ctxt.readValue(
+                        p,
+                        ctxt.getTypeFactory().constructCollectionType(List.class, Object.class)
+                );
+                continue;
+            }
+
+            if (fieldName.equals("number")) {
+                pageNumber = p.getIntValue();
+                continue;
+            }
+
+            if (fieldName.equals("size")) {
+                pageSize = p.getIntValue();
+                continue;
+            }
+
+            if (fieldName.equals("totalElements")) {
+                totalElements = p.getLongValue();
+                continue;
+            }
+
+            if (fieldName.equals("sort")) {
+                while (p.getCurrentToken() == JsonToken.START_OBJECT) {
+                    p.nextToken();
+                }
+                sort = ctxt.readValue(p, Sort.class);
+                continue;
+            }
+
+            p.skipChildren();
+        }
+
+        PageRequest pageable = PageRequest.of(pageNumber, pageSize, sort);
+        return new PageImpl<>(content, pageable, totalElements);
+    }
+}
+
@@ -0,0 +1,77 @@
+package kr.touroot.global.util;
+
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonToken;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.domain.Sort.Direction;
+import org.springframework.data.domain.Sort.Order;
+
+public class SortDeserializer extends JsonDeserializer<Sort> {
+
+    @Override
+    public Sort deserialize(JsonParser p, DeserializationContext ctxt) throws IOException {
+        List<Sort.Order> orders = new ArrayList<>();
+        boolean sorted = false;
+
+        if (p.getCurrentToken() != JsonToken.START_OBJECT) {
+            throw new JsonParseException("Sort 객체를 역직렬화하는 과정에서 예외가 발생했습니다.");
+        }
+
+        while (p.nextToken() != JsonToken.END_OBJECT) {
+            String fieldName = p.getCurrentName();
+            p.nextToken();
+
+            if (fieldName.equals("sorted")) {
+                sorted = p.getBooleanValue();
+                continue;
+            }
+
+            if (fieldName.equals("orders")) {
+                deserializeOrders(p, orders);
+                continue;
+            }
+
+            p.skipChildren();
+        }
+
+        if (sorted) {
+            return Sort.by(Sort.Order.asc("dummy"));
+        }
+
+        return Sort.unsorted();
+    }
+
+    private void deserializeOrders(JsonParser p, List<Order> orders) throws IOException {
+        if (p.getCurrentToken() != JsonToken.START_ARRAY) {
+            throw new JsonParseException("Sort.orders 객체를 역직렬화하는 과정에서 예외가 발생했습니다.");
+        }
+
+        while (p.nextToken() != JsonToken.END_ARRAY) {
+            String direction = null;
+            String property = null;
+
+            while (p.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = p.getCurrentName();
+
+                if (fieldName.equals("property")) {
+                    property = p.getText();
+                    continue;
+                }
+
+                if (fieldName.equals("direction")) {
+                    direction = p.getText();
+                }
+            }
+
+            if (property != null && direction != null) {
+                orders.add(new Order(Direction.fromString(direction), property));
+            }
+        }
+    }
+}
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public LoginResponse login(String code, String encodedRedirectUri) {`
`34`	`34`	`return LoginResponse.of(member, tokenProvider.createToken(member.getId()));`
`35`	`35`	`}`
`36`	`36`
`37`		`- private Member signUp(OauthUserInformationResponse userInformation) {`
	`37`	`+ public Member signUp(OauthUserInformationResponse userInformation) {`
`38`	`38`	`return memberRepository.save(userInformation.toMember());`
`39`	`39`	`}`
`40`	`40`