Review

.github/workflows/spring_test.yml

@@ -27,6 +27,13 @@ jobs:
           DB_NAME=super_poo
           DB_CONTAINER_NAME=super_poo_container
           JWT_SECRET_KEY=top_secret_key_for_ci
+          SERVICE_KEY = test_key
+          REDIS_PORT = 1111
+          REDIS_URL = jdbc:redis://aaa/superfoo:1111
+          REDIS_HOST = yeah
+          REDIS_ID = hello
+          REDIS_PASSWORD = redis
+
           EOF
 
       - name: Set up JDK 21
@@ -53,7 +60,7 @@ jobs:
         run: ./gradlew build -x test
 
       - name: Run Tests
-        run: ./gradlew test --info
+        run: ./gradlew test
 
       - name: Publish Test Report
         uses: mikepenz/action-junit-report@v3

.gitignore

@@ -40,4 +40,5 @@ out/
 compose.yml.network.yml
 
 ## dev options
-.env*
+.env*
+*.network.yml

build.gradle.kts

@@ -24,6 +24,9 @@ repositories {
 }
 
 dependencies {
+	implementation ("com.googlecode.json-simple:json-simple:1.1")
+	implementation("org.springframework.boot:spring-boot-starter-webflux")
+	implementation ("io.netty:netty-resolver-dns-native-macos:4.1.70.Final:osx-aarch_64")
 	implementation("org.springframework.boot:spring-boot-starter-data-jpa")
 	implementation("org.springframework.boot:spring-boot-starter-web")
 	compileOnly("org.projectlombok:lombok")
@@ -34,9 +37,15 @@ dependencies {
 	testImplementation("org.springframework.boot:spring-boot-starter-test")
 	developmentOnly("org.springframework.boot:spring-boot-docker-compose")
 	testRuntimeOnly("org.junit.platform:junit-platform-launcher")
+
+	//jwt
 	implementation("io.jsonwebtoken:jjwt-api:0.12.6")
 	runtimeOnly("io.jsonwebtoken:jjwt-impl:0.12.6")
 	runtimeOnly("io.jsonwebtoken:jjwt-jackson:0.12.6")
+
+
+	//redis
+	implementation("org.springframework.boot:spring-boot-starter-data-redis")
 }
 
 tasks.withType<Test> {

docker/Dockerfile

@@ -28,6 +28,6 @@ COPY --from=build /app/build/libs/*.jar app.jar
 USER appuser
 
 HEALTHCHECK --interval=30s --timeout=3s \
-  CMD curl -f http://localhost:8080 || exit 1
+  CMD nc -z localhost 8080 || exit 1
 
 ENTRYPOINT sh -c "java -Xms${JAVA_MIN_MEM} -Xmx${JAVA_MAX_MEM} -XX:MaxMetaspaceSize=${JAVA_MAX_METASPACE} -jar app.jar"

docker/compose.prod.yml

@@ -2,8 +2,6 @@
 
 # $docker compose -f compose.yml -f compose.prod.yml -p aeat_prod up --build
 
-version: '3.8'
-
 services:
   db:
     volumes:

docker/compose.yml

@@ -1,6 +1,8 @@
 services:
   db:
-    image: mysql:latest  #MySQL 이미지 버전맞춰서하면될듯
+    env_file:
+     - .env
+    image: mysql:latest
     container_name: ${DB_CONTAINER_NAME}
     environment:
       MYSQL_ROOT_PASSWORD: ${DB_ROOT_PASSWORD}
@@ -15,8 +17,10 @@ services:
       start_period: 30s
     ports:
       - ${DB_HOST_PORT}:${DB_CONTAINER_PORT}
-    command: ['mysqld', '--character-set-server=utf8mb4', '--collation-server=utf8mb4_unicode_ci']
+    command: ['mysqld', '--character-set-server=utf8mb4', '--collation-server=utf8mb4_unicode_ci', '--lower_case_table_names=1']
 
 #  app:
+#    depends_on:
+#      - db
 #    env_file:
 #      - .env

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,6 @@
+#Fri Nov 08 21:33:23 KST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
-networkTimeout=10000
-validateDistributionUrl=true
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/jeje/work/aeatbe/config/RedisConfig.java

@@ -0,0 +1,57 @@
+package jeje.work.aeatbe.config;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.connection.RedisStandaloneConfiguration;
+import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.repository.configuration.EnableRedisRepositories;
+import org.springframework.data.redis.serializer.StringRedisSerializer;
+
+@Configuration
+@EnableRedisRepositories
+public class RedisConfig {
+
+    @Value("${spring.data.redis.host}")
+    private String host;
+
+    @Value("${spring.data.redis.port}")
+    private int port;
+
+    @Value("${spring.data.redis.password}")
+    private String password;
+
+    @Value("${spring.data.redis.username}")
+    private String username;
+
+    @Bean
+    public RedisConnectionFactory redisConnectionFactory() {
+        RedisStandaloneConfiguration config = new RedisStandaloneConfiguration(host, port);
+        config.setUsername(username);
+        config.setPassword(password);
+        return new LettuceConnectionFactory(config);
+
+    }
+
+
+    @Bean
+    public RedisTemplate<String, Object> redisTemplate() {
+        RedisTemplate<String, Object> redisTemplate = new RedisTemplate<>();
+        redisTemplate.setConnectionFactory(redisConnectionFactory());
+
+        redisTemplate.setKeySerializer(new StringRedisSerializer());
+        redisTemplate.setValueSerializer(new StringRedisSerializer());
+
+        redisTemplate.setHashKeySerializer(new StringRedisSerializer());
+        redisTemplate.setHashValueSerializer(new StringRedisSerializer());
+
+        redisTemplate.setDefaultSerializer(new StringRedisSerializer());
+
+        return redisTemplate;
+    }
+
+
+
+}

src/main/java/jeje/work/aeatbe/config/WebConfig.java

@@ -26,7 +26,9 @@ public void addInterceptors(InterceptorRegistry registry) {
         registry.addInterceptor(jwtInterceptor)
             .addPathPatterns("/api/article/likes/**")
                 .addPathPatterns("/api/users/logout/**")
-                . addPathPatterns("/api/wishlist/**");
+                . addPathPatterns("/api/wishlist/**")
+                .addPathPatterns("/api/reviews/my/**")
+                .addPathPatterns("/api/users/info/**");
     }
 
     @Override
@@ -37,11 +39,14 @@ public void addArgumentResolvers(List<HandlerMethodArgumentResolver> argumentRes
     @Override
     public void addCorsMappings(CorsRegistry registry) {
         registry.addMapping("/**")
-            .allowedOriginPatterns("*")
+            .allowedOriginPatterns("https://aeat.jeje.work", "http://localhost","*")
             .allowedMethods("*")
             .allowedHeaders("*")
             .allowCredentials(true)
+            .exposedHeaders("Set-Cookie", "Access-Control-Allow-Origin",
+                "Access-Control-Allow-Credentials","Authorization")
             .maxAge(3600);
     }
 
+
 }

src/main/java/jeje/work/aeatbe/controller/ArticleController.java

@@ -5,6 +5,9 @@
 import jeje.work.aeatbe.dto.article.ArticleResponseDTO;
 import jeje.work.aeatbe.service.ArticleService;
 import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.web.PageableDefault;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -33,21 +36,17 @@ public ResponseEntity<ArticleDTO> createArticle(@RequestBody ArticleDTO articleD
      * @param category 칼럼의 카테고리
      * @param title 칼럼의 제목
      * @param subtitle 칼럼의 소제목
-     * @param sortby 정렬 기준
-     * @param pageToken 페이지 토큰
-     * @param maxResults 한 페이지당 가져올 칼럼의 최대 개수 (기본값: 10)
+     * @param pageable 페이지네이션 정보 (기본값: 페이지 크기 10, 날짜 기준 내림차순 정렬)
      * @return 칼럼 목록과 페이지 정보가 포함된 DTO와 상태 코드 200 (OK)
      */
     @GetMapping
     public ResponseEntity<ArticleListResponseDTO> getArticles(
         @RequestParam(required = false) String category,
         @RequestParam(required = false) String title,
         @RequestParam(required = false) String subtitle,
-        @RequestParam(defaultValue = "new") String sortby,
-        @RequestParam(defaultValue = "0") String pageToken,
-        @RequestParam(defaultValue = "10") int maxResults) {
+        @PageableDefault(size = 10, sort = "date", direction = Sort.Direction.DESC) Pageable pageable) {
 
-        ArticleListResponseDTO articles = articleService.getArticles(category, title, subtitle, sortby, pageToken, maxResults);
+        ArticleListResponseDTO articles = articleService.getArticles(category, title, subtitle, pageable);
         return ResponseEntity.ok(articles);
     }
 

src/main/java/jeje/work/aeatbe/controller/ArticleLikeController.java

@@ -3,6 +3,7 @@
 import jeje.work.aeatbe.annotation.LoginUser;
 import jeje.work.aeatbe.dto.articleLike.ArticleLikeRequestDTO;
 import jeje.work.aeatbe.dto.articleLike.ArticleLikeResponseDTO;
+import jeje.work.aeatbe.dto.user.LoginUserInfo;
 import jeje.work.aeatbe.entity.ArticleLike;
 import jeje.work.aeatbe.service.ArticleLikeService;
 import lombok.RequiredArgsConstructor;
@@ -25,14 +26,14 @@ public class ArticleLikeController {
     /**
      * 좋아요를 가져온다
      * @param articleId
-     * @param loginUserId
+     * @param loginUserInfo
      * @return ArticleLikeResponseDTO
      */
     @GetMapping
-    public ResponseEntity<ArticleLikeResponseDTO> getArticleLikes(@RequestParam Long articleId, @LoginUser Long loginUserId) {
-        ArticleLike articlelike = articleLikeService.findArticleLikeByUserAndArticle(loginUserId, articleId);
+    public ResponseEntity<ArticleLikeResponseDTO> getArticleLikes(@RequestParam Long articleId, @LoginUser LoginUserInfo loginUserInfo) {
+        Long articleLikeId = articleLikeService.findArticleLikeByUserAndArticle(loginUserInfo.userId(), articleId);
         int like = articleLikeService.getArticleLikeCount(articleId);
-        return ResponseEntity.ok().body(new ArticleLikeResponseDTO(articlelike.getId(),like));
+        return ResponseEntity.ok().body(new ArticleLikeResponseDTO(articleLikeId,like));
     }
 
 
@@ -42,21 +43,21 @@ public ResponseEntity<ArticleLikeResponseDTO> getArticleLikes(@RequestParam Long
      * @return ArticleLikePostResponseDTO
      */
     @PostMapping
-    public ResponseEntity<ArticleLikeResponseDTO> addArticleLike(@RequestBody ArticleLikeRequestDTO articleLikeRequestDTO, @LoginUser Long loginUserId) {
-        ArticleLike articleLike = articleLikeService.likeArticle(loginUserId, articleLikeRequestDTO.articleId());
+    public ResponseEntity<ArticleLikeResponseDTO> addArticleLike(@RequestBody ArticleLikeRequestDTO articleLikeRequestDTO, @LoginUser LoginUserInfo loginUserInfo) {
+        Long articleLikeId = articleLikeService.likeArticle(loginUserInfo.userId(), articleLikeRequestDTO.articleId());
         int like = articleLikeService.getArticleLikeCount(articleLikeRequestDTO.articleId());
-        return ResponseEntity.ok().body(new ArticleLikeResponseDTO(articleLike.getId(),like));
+        return ResponseEntity.ok().body(new ArticleLikeResponseDTO(articleLikeId,like));
     }
 
     /**
      * 좋아요 삭제
      * @param articleLikeId
-     * @param loginUserId
+     * @param loginUserInfo
      * @return HTTP.status.OK
      */
     @DeleteMapping("/{articleLikeId}")
-    public ResponseEntity<?> deleteArticleLike(@PathVariable Long articleLikeId, @LoginUser Long loginUserId) {
-        articleLikeService.deleteArticleLike(articleLikeId);
+    public ResponseEntity<?> deleteArticleLike(@PathVariable Long articleLikeId, @LoginUser LoginUserInfo loginUserInfo) {
+        articleLikeService.deleteArticleLike(loginUserInfo.userId());
         return ResponseEntity.ok().build();
     }
 

src/main/java/jeje/work/aeatbe/controller/HaccpController.java

@@ -0,0 +1,36 @@
+//package jeje.work.aeatbe.controller;
+//
+//import jeje.work.aeatbe.service.HaccpService;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.web.bind.annotation.GetMapping;
+//import org.springframework.web.bind.annotation.RequestMapping;
+//import org.springframework.web.bind.annotation.RestController;
+//import org.springframework.web.servlet.view.RedirectView;
+//
+//
+///**
+// * haccp api 호출용 컨트롤러
+// */
+//@RestController
+//@RequestMapping("/api/test")
+//public class HaccpController {
+//
+//    private final HaccpService haccpService;
+//
+//    @Autowired
+//    public HaccpController(HaccpService haccpService) {
+//        this.haccpService = haccpService;
+//    }
+//
+//    /**
+//     * api 호출
+//     */
+//    @GetMapping
+//    public void redirectToHaccpApi() {
+////        String apiUrl = haccpService.getProductApiUrl(); // 생성된 URL 가져오기
+////        System.out.println("Redirecting to: " + apiUrl); // 리다이렉트할 URL 로그 출력
+//
+//        haccpService.getProductApi();
+////        return new RedirectView(apiUrl); // 해당 URL로 리다이렉트
+//    }
+//}

src/main/java/jeje/work/aeatbe/controller/KakaoAuthController.java

@@ -6,15 +6,18 @@
 import jeje.work.aeatbe.domian.KakaoProperties;
 import jeje.work.aeatbe.domian.KakaoTokenResponsed;
 import jeje.work.aeatbe.dto.Kakao.LogoutResponseDto;
-import jeje.work.aeatbe.dto.Kakao.TokenResponseDto;
+import jeje.work.aeatbe.dto.user.TokenResponseDTO;
+import jeje.work.aeatbe.dto.user.LoginUserInfo;
 import jeje.work.aeatbe.service.KakaoService;
+import jeje.work.aeatbe.service.TokenService;
 import jeje.work.aeatbe.service.UserService;
 import jeje.work.aeatbe.utility.JwtUtil;
 import lombok.RequiredArgsConstructor;
-import org.springframework.http.HttpStatus;
+import org.springframework.http.HttpHeaders;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
@@ -28,6 +31,7 @@ public class KakaoAuthController {
     private final JwtUtil jwtUtil;
     private final KakaoProperties kakaoProperties;
     private final KakaoService kakaoService;
+    private final TokenService tokenService;
 
     /**
      * 카카오 로그인페이지로 리다이렉션
@@ -45,26 +49,28 @@ public void redirectKakaoLogin(HttpServletResponse response) throws IOException
     /**
      * 카카오 로그인후 jwt토큰 발급
      * @param code
-     * @return
+     * @return httpHeader(Cookie)
      */
     @GetMapping("/callback")
-    public ResponseEntity<TokenResponseDto> getAccessToken(@RequestParam String code){
+    public ResponseEntity<TokenResponseDTO> getAccessToken(@RequestParam String code) {
         KakaoTokenResponsed token = kakaoService.getKakaoTokenResponse(code);
-        String jwt = kakaoService.login(token.accessToken(), token.refreshToken());
-        return ResponseEntity.ok(new TokenResponseDto(jwt));
+        TokenResponseDTO tokenResponseDto = kakaoService.login(token.accessToken(), token.refreshToken());
+        HttpHeaders httpHeaders = userService.setCookie(tokenResponseDto);
+        return ResponseEntity.ok().body(tokenResponseDto);
     }
 
     /**
      * 카카오 로그아웃후 카카오계정과 함께 로그아웃으로 리다이렉션
      * @param response
-     * @param userid
+     * @param loginUserInfo
      * @throws IOException
      */
     @PostMapping("/logout")
-    public void logout(HttpServletResponse response, @LoginUser Long userid) throws IOException{
+    public void logout(HttpServletResponse response, @RequestHeader("Authorization") String token, @LoginUser LoginUserInfo loginUserInfo) throws IOException{
         String url = kakaoProperties.logoutUrl() +
                 "?client_id=" + kakaoProperties.clientId() + "&logout_redirect_uri=" + kakaoProperties.logoutRedirectUrl();
-        LogoutResponseDto logoutResponseDto = kakaoService.logout(userid);
+        tokenService.addBlackList(tokenService.removePrefix(token), loginUserInfo.userId().toString());
+        LogoutResponseDto logoutResponseDto = kakaoService.logout(loginUserInfo.userId());
         response.sendRedirect(url);
     }