release: 병합 (#81)

* feat: workflow에 EC2 자동 배포 추가 (#78)

* feat: workflow에 EC2 자동 배포 추가

* chore: appleboy/ssh-action 최신버전으로 변경

* feat: 발표방 캐싱 및 인덱싱 적용 feat 새로운 기능 추가 (#80)

* docs: 발표방 생성 요청 dto 스웨거 수정
* feat: Room secretCode Unique 설정
* feat: Room 캐시 적용
* test: Room 캐시 테스트
* test: 비밀코드 중복 문제 해결
* fix: 로그인 500에러 수정
* fix: 로그인 500에러 수정

---------

Co-authored-by: Huiwoong Choi <[email protected]>

Author: rjswjddn

build.gradle

@@ -30,6 +30,7 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-security'
     implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
     implementation 'org.springframework.boot:spring-boot-starter-validation'
+    implementation 'org.springframework.boot:spring-boot-starter-cache'
     testImplementation 'org.springframework.security:spring-security-test'
 
     compileOnly 'org.projectlombok:lombok'
@@ -58,6 +59,10 @@ dependencies {
 
     // bucket4j
     implementation 'com.bucket4j:bucket4j_jdk17-core:8.14.0'
+
+    // caffeine
+    implementation 'com.github.ben-manes.caffeine:caffeine'
+
 }
 
 tasks.named('test') {

src/main/java/com/oronaminc/join/emoji/service/EmojiFacade.java

@@ -1,12 +1,14 @@
 package com.oronaminc.join.emoji.service;
 
+import org.springframework.orm.ObjectOptimisticLockingFailureException;
+import org.springframework.stereotype.Service;
+
 import com.oronaminc.join.emoji.dto.EmojiRequest;
 import com.oronaminc.join.emoji.dto.EmojiResponse;
 import com.oronaminc.join.global.exception.ErrorCode;
 import com.oronaminc.join.global.exception.ErrorException;
+
 import lombok.RequiredArgsConstructor;
-import org.springframework.orm.ObjectOptimisticLockingFailureException;
-import org.springframework.stereotype.Service;
 
 @Service
 @RequiredArgsConstructor

src/main/java/com/oronaminc/join/global/config/CacheConfig.java

@@ -0,0 +1,40 @@
+package com.oronaminc.join.global.config;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import org.springframework.cache.CacheManager;
+import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.cache.caffeine.CaffeineCache;
+import org.springframework.cache.support.SimpleCacheManager;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import com.github.benmanes.caffeine.cache.Caffeine;
+import com.github.benmanes.caffeine.cache.Scheduler;
+
+@EnableCaching
+@Configuration
+public class CacheConfig {
+
+    @Bean
+    public CacheManager cacheManager() {
+        List<CaffeineCache> caches = Arrays.stream(CacheType.values())
+                .map(cache -> new CaffeineCache(
+                        cache.cacheName,
+                        Caffeine.newBuilder()
+                                .expireAfterWrite(cache.expireAfterWrite, TimeUnit.SECONDS)
+                                .maximumSize(cache.maximumSize)
+                                .scheduler(Scheduler.systemScheduler())
+                                .build()
+                    )
+                )
+                .toList();
+
+        SimpleCacheManager cacheManager = new SimpleCacheManager();
+        cacheManager.setCaches(caches);
+
+        return cacheManager;
+    }
+}

src/main/java/com/oronaminc/join/global/config/CacheType.java

@@ -0,0 +1,14 @@
+package com.oronaminc.join.global.config;
+
+import lombok.AllArgsConstructor;
+
+@AllArgsConstructor
+public enum CacheType {
+    ROOM_BY_ID("roomById", 300, 1000),
+    ROOM_BY_SECRET_CODE("roomBySecretCode", 300, 1000)
+    ;
+
+    public final String cacheName;
+    public final long expireAfterWrite;
+    public final long maximumSize;
+}

src/main/java/com/oronaminc/join/global/dev/DevController.java

@@ -18,11 +18,13 @@
 import com.oronaminc.join.member.domain.MemberType;
 import com.oronaminc.join.member.security.MemberDetails;
 
+import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpSession;
 import lombok.RequiredArgsConstructor;
 
 @RestController
+@Tag(name = "개발용 API")
 @RequestMapping("/dev")
 @RequiredArgsConstructor
 public class DevController {

src/main/java/com/oronaminc/join/global/dev/HealthController.java

@@ -0,0 +1,28 @@
+package com.oronaminc.join.global.dev;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.bind.annotation.RestController;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+
+@RestController
+@Tag(name = "개발용 API")
+public class HealthController {
+
+    @Operation(summary = "애플리케이션 헬스체크")
+    @ResponseStatus(HttpStatus.OK)
+    @GetMapping("/health")
+    public String health() {
+        return "Server is Healthy!";
+    }
+
+    @Operation(summary = "홈 헬스체크")
+    @ResponseStatus(HttpStatus.OK)
+    @GetMapping("/")
+    public String home() {
+        return "It's Home!";
+    }
+}

src/main/java/com/oronaminc/join/member/security/SecurityConfig.java

@@ -4,6 +4,7 @@
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
@@ -12,6 +13,7 @@
 import lombok.RequiredArgsConstructor;
 
 @Configuration
+@Profile("!test")
 @EnableWebSecurity
 @RequiredArgsConstructor
 public class SecurityConfig {
@@ -47,5 +49,4 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
                 .logout(withDefaults())
                 .build();
     }
-
 }

src/main/java/com/oronaminc/join/room/domain/Room.java

@@ -6,6 +6,7 @@
 import com.oronaminc.join.global.entity.BaseEntity;
 import com.oronaminc.join.room.dto.RoomUpdateRequest;
 
+import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.EnumType;
 import jakarta.persistence.Enumerated;
@@ -33,6 +34,7 @@ public class Room extends BaseEntity {
     private String title;
     private String description;
 
+    @Column(unique = true)
     private String secretCode;
 
     @Enumerated(EnumType.STRING)

src/main/java/com/oronaminc/join/room/dto/CreateRoomRequest.java

@@ -1,11 +1,11 @@
 package com.oronaminc.join.room.dto;
 
-import io.swagger.v3.oas.annotations.media.Schema;
 import java.time.LocalDate;
 import java.util.List;
 
 import org.hibernate.validator.constraints.Length;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.FutureOrPresent;
 import jakarta.validation.constraints.Max;
 import jakarta.validation.constraints.NotBlank;
@@ -38,7 +38,7 @@ public record CreateRoomRequest(
 
         @NotNull
         @Size(max = 5)
-        @Schema(description = "발표방 추가한 팀원 목록", example = "{팀원[email protected], 팀원[email protected]}")
+        @Schema(description = "발표방 추가한 팀원 목록")
         List<String> teamEmail
 ) {
 }

src/main/java/com/oronaminc/join/room/service/RoomReader.java

@@ -4,6 +4,7 @@
 
 import java.util.Optional;
 
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Component;
 
 import com.oronaminc.join.global.exception.ErrorException;
@@ -26,6 +27,12 @@ public Room getById(Long roomId) {
                 .orElseThrow(() -> new ErrorException(NOT_FOUND_ROOM));
     }
 
+    @Cacheable(cacheNames = "roomById")
+    public Room getCacheById(Long roomId) {
+        return findById(roomId)
+                .orElseThrow(() -> new ErrorException(NOT_FOUND_ROOM));
+    }
+
     public Optional<Room> findBySecretCode(String secretCode) {
         return roomRepository.findBySecretCode(secretCode);
     }
@@ -35,6 +42,12 @@ public Room getBySecretCode(String secretCode) {
                 .orElseThrow(() -> new ErrorException(NOT_FOUND_ROOM));
     }
 
+    @Cacheable(cacheNames = "roomBySecretCode")
+    public Room getCacheBySecretCode(String secretCode) {
+        return this.findBySecretCode(secretCode)
+                .orElseThrow(() -> new ErrorException(NOT_FOUND_ROOM));
+    }
+
     public Boolean existsBySecretCode(String secretCode) {
         return roomRepository.existsBySecretCode(secretCode);
     }