From 4db118fb64518a616e04a2d67ab60bcb6cb1e8d7 Mon Sep 17 00:00:00 2001 From: chae_1 <129128205+sungchaewon@users.noreply.github.com> Date: Sat, 14 Jun 2025 14:36:52 +0900 Subject: [PATCH 01/13] =?UTF-8?q?Update=20SecurityConfig.java=20:=20?= =?UTF-8?q?=EB=A9=94=EC=9D=B8=20=EC=A0=91=EA=B7=BC=20=ED=97=88=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/example/FixLog/config/SecurityConfig.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/example/FixLog/config/SecurityConfig.java b/src/main/java/com/example/FixLog/config/SecurityConfig.java index c6408d6..1c7b1c1 100644 --- a/src/main/java/com/example/FixLog/config/SecurityConfig.java +++ b/src/main/java/com/example/FixLog/config/SecurityConfig.java @@ -36,6 +36,7 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { .requestMatchers(HttpMethod.GET, "/members/check-email").permitAll() .requestMatchers(HttpMethod.GET, "/members/check-nickname").permitAll() .requestMatchers(HttpMethod.GET, "/h2-console/**").permitAll() + .requestMatchers(HttpMethod.GET, "/members/**").permitAll() .requestMatchers(HttpMethod.GET, "/test", "/test/**").permitAll() // 테스트용 허용 .anyRequest().authenticated() ) From e8d81005700991c42de3078ef51f186e6f3d1541 Mon Sep 17 00:00:00 2001 From: chae_1 <129128205+sungchaewon@users.noreply.github.com> Date: Sat, 14 Jun 2025 14:42:51 +0900 Subject: [PATCH 02/13] =?UTF-8?q?Update=20SecurityConfig.java=20:=20?= =?UTF-8?q?=EC=A0=84=EC=97=90=20=EC=9E=98=EB=AA=BB=20=EC=88=98=EC=A0=95?= =?UTF-8?q?=ED=95=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/example/FixLog/config/SecurityConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/example/FixLog/config/SecurityConfig.java b/src/main/java/com/example/FixLog/config/SecurityConfig.java index 1c7b1c1..45be351 100644 --- a/src/main/java/com/example/FixLog/config/SecurityConfig.java +++ b/src/main/java/com/example/FixLog/config/SecurityConfig.java @@ -36,7 +36,7 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { .requestMatchers(HttpMethod.GET, "/members/check-email").permitAll() .requestMatchers(HttpMethod.GET, "/members/check-nickname").permitAll() .requestMatchers(HttpMethod.GET, "/h2-console/**").permitAll() - .requestMatchers(HttpMethod.GET, "/members/**").permitAll() + .requestMatchers(HttpMethod.GET, "/main/**").permitAll() .requestMatchers(HttpMethod.GET, "/test", "/test/**").permitAll() // 테스트용 허용 .anyRequest().authenticated() ) From 70645a4f3353b4ff1d06bd715df208d56ec7c625 Mon Sep 17 00:00:00 2001 From: chae_1 <129128205+sungchaewon@users.noreply.github.com> Date: Sun, 15 Jun 2025 20:26:11 +0900 Subject: [PATCH 03/13] =?UTF-8?q?feat:=20=EB=A3=A8=ED=8A=B8=20=EA=B2=BD?= =?UTF-8?q?=EB=A1=9C(/)=20=EC=9A=94=EC=B2=AD=20=EC=8B=9C=20/main=EC=9C=BC?= =?UTF-8?q?=EB=A1=9C=20=EB=A6=AC=EB=94=94=EB=A0=89=ED=8A=B8=ED=95=98?= =?UTF-8?q?=EB=8A=94=20RedirectController=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FixLog/controller/RedirceController.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 src/main/java/com/example/FixLog/controller/RedirceController.java diff --git a/src/main/java/com/example/FixLog/controller/RedirceController.java b/src/main/java/com/example/FixLog/controller/RedirceController.java new file mode 100644 index 0000000..0ad6cc0 --- /dev/null +++ b/src/main/java/com/example/FixLog/controller/RedirceController.java @@ -0,0 +1,13 @@ +package com.example.FixLog.controller; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; + +@Controller +public class RedirectController { + + @GetMapping("/") + public String redirectToMain() { + return "redirect:/main"; + } +} From e067e57d9227188c2c462dcb0ec9e6132a57ec6d Mon Sep 17 00:00:00 2001 From: chae_1 <129128205+sungchaewon@users.noreply.github.com> Date: Sun, 15 Jun 2025 20:28:53 +0900 Subject: [PATCH 04/13] Rename RedirceController.java to RedirectController.java --- .../{RedirceController.java => RedirectController.java} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/main/java/com/example/FixLog/controller/{RedirceController.java => RedirectController.java} (100%) diff --git a/src/main/java/com/example/FixLog/controller/RedirceController.java b/src/main/java/com/example/FixLog/controller/RedirectController.java similarity index 100% rename from src/main/java/com/example/FixLog/controller/RedirceController.java rename to src/main/java/com/example/FixLog/controller/RedirectController.java From c06c0ce536c8b50790695cac2ed9fc1ead3f2cbc Mon Sep 17 00:00:00 2001 From: chae_1 <129128205+sungchaewon@users.noreply.github.com> Date: Sun, 15 Jun 2025 20:33:17 +0900 Subject: [PATCH 05/13] Update SecurityConfig.java --- src/main/java/com/example/FixLog/config/SecurityConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/example/FixLog/config/SecurityConfig.java b/src/main/java/com/example/FixLog/config/SecurityConfig.java index 45be351..4295a20 100644 --- a/src/main/java/com/example/FixLog/config/SecurityConfig.java +++ b/src/main/java/com/example/FixLog/config/SecurityConfig.java @@ -30,13 +30,13 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { .csrf(csrf -> csrf.disable()) .cors(Customizer.withDefaults()) // CORS 설정 추가 (WebConfig와 연결됨) .authorizeHttpRequests(auth -> auth + .requestMatchers(HttpMethod.GET, "/", "/main", "/main/**").permitAll() .requestMatchers(HttpMethod.GET, "/auth/**").permitAll() .requestMatchers(HttpMethod.POST, "/auth/**").permitAll() .requestMatchers(HttpMethod.POST, "/members/signup").permitAll() .requestMatchers(HttpMethod.GET, "/members/check-email").permitAll() .requestMatchers(HttpMethod.GET, "/members/check-nickname").permitAll() .requestMatchers(HttpMethod.GET, "/h2-console/**").permitAll() - .requestMatchers(HttpMethod.GET, "/main/**").permitAll() .requestMatchers(HttpMethod.GET, "/test", "/test/**").permitAll() // 테스트용 허용 .anyRequest().authenticated() ) From 97662b641cede8e89ab27c597d6bf88167ea54bd Mon Sep 17 00:00:00 2001 From: chae_1 <129128205+sungchaewon@users.noreply.github.com> Date: Sun, 15 Jun 2025 23:10:53 +0900 Subject: [PATCH 06/13] Update MypagePostController.java --- .../controller/MypagePostController.java | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/example/FixLog/controller/MypagePostController.java b/src/main/java/com/example/FixLog/controller/MypagePostController.java index 87c6f23..d6d3d05 100644 --- a/src/main/java/com/example/FixLog/controller/MypagePostController.java +++ b/src/main/java/com/example/FixLog/controller/MypagePostController.java @@ -33,18 +33,18 @@ public ResponseEntity>> getMyPos return ResponseEntity.ok(Response.success("내가 작성한 글 보기 성공", data)); } -// // 내가 좋아요한 글 -// @GetMapping("/likes") -// public ResponseEntity>> getLikedPosts( -// @AuthenticationPrincipal UserDetails userDetails, -// @RequestParam(defaultValue = "0") int page, -// @RequestParam(defaultValue = "4") int size, -// @RequestParam(defaultValue = "0") int sort) { -// -// String email = userDetails.getUsername(); -// PageResponseDto result = mypagePostService.getLikedPosts(email, page, sort, size); -// return ResponseEntity.ok(Response.success("내가 좋아요한 글 보기 성공", result)); -// } + // 내가 좋아요한 글 + @GetMapping("/likes") + public ResponseEntity>> getLikedPosts( + @AuthenticationPrincipal UserDetails userDetails, + @RequestParam(defaultValue = "0") int page, + @RequestParam(defaultValue = "4") int size, + @RequestParam(defaultValue = "0") int sort) { + + String email = userDetails.getUsername(); + PageResponseDto result = mypagePostService.getLikedPosts(email, page, sort, size); + return ResponseEntity.ok(Response.success("내가 좋아요한 글 보기 성공", result)); + } } From 7540029a5c0d6465d73ccf681a0a30bbfba97feb Mon Sep 17 00:00:00 2001 From: chae_1 <129128205+sungchaewon@users.noreply.github.com> Date: Sun, 15 Jun 2025 23:51:23 +0900 Subject: [PATCH 07/13] Update application.properties --- src/main/resources/application.properties | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 760dbb0..f8da5a6 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -23,10 +23,6 @@ spring.datasource.username=${MYSQL_USERNAME} spring.datasource.password=${MYSQL_PASSWORD} -spring.datasource.url=jdbc:mysql://fixlog-db.c7cau8y2srl7.ap-northeast-2.rds.amazonaws.com:3306/fixlog?serverTimezone=Asia/Seoul -spring.datasource.username=admin -spring.datasource.password=${MYSQL_PASSWORD} - spring.jpa.hibernate.ddl-auto=update spring.jpa.show-sql=true spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQLDialect From 9367ace1e989a6fbbc47eaebe068f3908917976b Mon Sep 17 00:00:00 2001 From: chae_1 <129128205+sungchaewon@users.noreply.github.com> Date: Mon, 16 Jun 2025 00:09:04 +0900 Subject: [PATCH 08/13] Update JwtUtil.java --- src/main/java/com/example/FixLog/util/JwtUtil.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/example/FixLog/util/JwtUtil.java b/src/main/java/com/example/FixLog/util/JwtUtil.java index 6ef7972..4db6170 100644 --- a/src/main/java/com/example/FixLog/util/JwtUtil.java +++ b/src/main/java/com/example/FixLog/util/JwtUtil.java @@ -14,7 +14,7 @@ @Component public class JwtUtil { - @Value("${jwt.secret}") + @Value("${spring.jwt.secret}") private String secretKeyString; private Key secretKey; @@ -59,4 +59,4 @@ public String getEmailFromToken(String token) { public Long getUserIdFromToken(String token) { return getClaims(token).get("userId", Long.class); } -} \ No newline at end of file +} From b498bd4e6df336a475b437f72fa8cf447abea133 Mon Sep 17 00:00:00 2001 From: chae_1 <129128205+sungchaewon@users.noreply.github.com> Date: Mon, 16 Jun 2025 00:14:09 +0900 Subject: [PATCH 09/13] Update cd.yml --- .github/workflows/cd.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index c32fd39..9fee36b 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -42,6 +42,8 @@ jobs: sed -i "s|\${MYSQL_USERNAME}|${{ secrets.MYSQL_USERNAME }}|g" src/main/resources/application.properties sed -i "s|\${MYSQL_PASSWORD}|${{ secrets.MYSQL_PASSWORD }}|g" src/main/resources/application.properties sed -i "s|\${JWT_KEY}|${{ secrets.JWT_KEY }}|g" src/main/resources/application.properties + sed -i "s|\${AWS_ACCESS_KEY_ID}|${{ secrets.AWS_ACCESS_KEY_ID }}|g" src/main/resources/application.properties + sed -i "s|\${AWS_SECRET_ACCESS_KEY}|${{ secrets.AWS_SECRET_ACCESS_KEY }}|g" src/main/resources/application.properties - name: Build with Gradle run: ./gradlew clean build -x test @@ -59,6 +61,8 @@ jobs: echo "MYSQL_USERNAME=${{ secrets.MYSQL_USERNAME }}" >> .env echo "MYSQL_PASSWORD=${{ secrets.MYSQL_PASSWORD }}" >> .env echo "JWT_KEY=${{ secrets.JWT_KEY }}" >> .env + echo "AWS_ACCESS_KEY_ID=${{ secrets.AWS_ACCESS_KEY_ID }}" >> .env + echo "AWS_SECRET_ACCESS_KEY=${{ secrets.AWS_SECRET_ACCESS_KEY }}" >> .env - name: Prepare deployment package run: | From 346d29ca13a19456077abe17ce908c3506b1a060 Mon Sep 17 00:00:00 2001 From: chae_1 <129128205+sungchaewon@users.noreply.github.com> Date: Mon, 16 Jun 2025 00:18:33 +0900 Subject: [PATCH 10/13] Update cd.yml --- .github/workflows/cd.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 9fee36b..3032900 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -44,7 +44,9 @@ jobs: sed -i "s|\${JWT_KEY}|${{ secrets.JWT_KEY }}|g" src/main/resources/application.properties sed -i "s|\${AWS_ACCESS_KEY_ID}|${{ secrets.AWS_ACCESS_KEY_ID }}|g" src/main/resources/application.properties sed -i "s|\${AWS_SECRET_ACCESS_KEY}|${{ secrets.AWS_SECRET_ACCESS_KEY }}|g" src/main/resources/application.properties - + sed -i "s|\${AWS_REGION}|${{ env.AWS_REGION }}|g" src/main/resources/application.properties + sed -i "s|\${AWS_S3_BUCKET}|${{ env.S3_BUCKET_NAME }}|g" src/main/resources/application.properties + - name: Build with Gradle run: ./gradlew clean build -x test @@ -63,6 +65,8 @@ jobs: echo "JWT_KEY=${{ secrets.JWT_KEY }}" >> .env echo "AWS_ACCESS_KEY_ID=${{ secrets.AWS_ACCESS_KEY_ID }}" >> .env echo "AWS_SECRET_ACCESS_KEY=${{ secrets.AWS_SECRET_ACCESS_KEY }}" >> .env + echo "AWS_REGION=${{ env.AWS_REGION }}" >> .env + echo "AWS_S3_BUCKET=${{ env.S3_BUCKET_NAME }}" >> .env - name: Prepare deployment package run: | From 9b89abf8f929bb2ff937b3d720c9af3db2131a3c Mon Sep 17 00:00:00 2001 From: chae_1 <129128205+sungchaewon@users.noreply.github.com> Date: Thu, 19 Jun 2025 21:08:51 +0900 Subject: [PATCH 11/13] Update build.gradle --- build.gradle | 121 ++++++++++++++++++++++++--------------------------- 1 file changed, 58 insertions(+), 63 deletions(-) diff --git a/build.gradle b/build.gradle index 2d4aef1..1afeb36 100644 --- a/build.gradle +++ b/build.gradle @@ -1,97 +1,92 @@ plugins { - id 'java' - id 'org.springframework.boot' version '3.2.5'//스웨거로 인해 버전 낮춤 - id 'io.spring.dependency-management' version '1.1.7' -} - -ext { - queryDslVersion = "5.0.0" + id 'java' + id 'org.springframework.boot' version '3.2.5' // 스웨거로 인해 버전 낮춤 + id 'io.spring.dependency-management' version '1.1.7' } group = 'com.example' version = '0.0.1-SNAPSHOT' java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } } ext { - queryDslVersion = "5.0.0" + queryDslVersion = "5.0.0" } configurations { - compileOnly { - extendsFrom annotationProcessor - } + compileOnly { + extendsFrom annotationProcessor + } } repositories { - mavenCentral() - - // springdoc 2.5.0은 여기서 제공됨 - maven { url 'https://repo.spring.io/release' } + mavenCentral() + // springdoc 2.5.0은 여기서 제공됨 + maven { url 'https://repo.spring.io/release' } } dependencies { - // Spring Boot - implementation 'org.springframework.boot:spring-boot-starter-data-jpa' - implementation 'org.springframework.boot:spring-boot-starter-security' - implementation 'org.springframework.boot:spring-boot-starter-web' - implementation 'org.springframework.boot:spring-boot-starter-validation' - - // JWT - implementation 'io.jsonwebtoken:jjwt-api:0.11.5' - runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.5' - runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.11.5' - - // DB - runtimeOnly 'com.h2database:h2' - runtimeOnly 'com.mysql:mysql-connector-j' - - // AWS - implementation 'com.amazonaws:aws-java-sdk-s3:1.12.538' - - // QueryDSL - implementation "com.querydsl:querydsl-jpa:${queryDslVersion}:jakarta" - annotationProcessor "com.querydsl:querydsl-apt:${queryDslVersion}:jakarta" - annotationProcessor "jakarta.annotation:jakarta.annotation-api" - annotationProcessor "jakarta.persistence:jakarta.persistence-api" - - // Swagger (springdoc) - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.5.0' - - // Lombok - compileOnly 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - - // Test - testImplementation 'org.springframework.boot:spring-boot-starter-test' - testRuntimeOnly 'org.junit.platform:junit-platform-launcher' + // Spring Boot + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + implementation 'org.springframework.boot:spring-boot-starter-security' + implementation 'org.springframework.boot:spring-boot-starter-web' + implementation 'org.springframework.boot:spring-boot-starter-validation' + + // JWT + implementation 'io.jsonwebtoken:jjwt-api:0.11.5' + runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.5' + runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.11.5' + + // DB + runtimeOnly 'com.h2database:h2' + runtimeOnly 'com.mysql:mysql-connector-j' + + // AWS + implementation 'com.amazonaws:aws-java-sdk-s3:1.12.538' + + // QueryDSL + implementation "com.querydsl:querydsl-jpa:${queryDslVersion}:jakarta" + annotationProcessor "com.querydsl:querydsl-apt:${queryDslVersion}:jakarta" + annotationProcessor "jakarta.annotation:jakarta.annotation-api" + annotationProcessor "jakarta.persistence:jakarta.persistence-api" + + // Swagger (springdoc) + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.5.0' + + // Lombok + compileOnly 'org.projectlombok:lombok' + annotationProcessor 'org.projectlombok:lombok' + + // Test + testImplementation 'org.springframework.boot:spring-boot-starter-test' + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' +} +// 테스트 설정 (JUnit 플랫폼 사용) tasks.named('test') { - useJUnitPlatform() + useJUnitPlatform() } -// WAR 파일 안 만들게 설정 +// WAR 파일 비활성화 (jar만 생성) jar { - enabled = false + enabled = false } // QueryDSL 설정 def querydslDir = "src/main/generated" sourceSets { - main { - java { - srcDirs += querydslDir - } - } + main { + java { + srcDirs += querydslDir + } + } } tasks.withType(JavaCompile).configureEach { - options.annotationProcessorGeneratedSourcesDirectory = file(querydslDir) + options.annotationProcessorGeneratedSourcesDirectory = file(querydslDir) } - - From 8c3b29f6a3d80816742259a332f4499f930e1efa Mon Sep 17 00:00:00 2001 From: chae_1 <129128205+sungchaewon@users.noreply.github.com> Date: Thu, 19 Jun 2025 21:10:41 +0900 Subject: [PATCH 12/13] Update application.properties --- src/main/resources/application.properties | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index dae0b10..786104f 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,28 +1,15 @@ spring.application.name=FixLog - ##### [DEV] ##### server.port=8083 -# DB - -server.port=8083 - # DB (MySQL) spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -<<<<<<< HEAD -spring.datasource.url=${MYSQL_URL} -spring.datasource.username=${MYSQL_USERNAME} -spring.datasource.password=${MYSQL_PASSWORD} - - -======= spring.datasource.url=jdbc:mysql://fixlog-db.c7cau8y2srl7.ap-northeast-2.rds.amazonaws.com:3306/fixlog?serverTimezone=Asia/Seoul spring.datasource.username=admin spring.datasource.password=${MYSQL_PASSWORD} # JPA ->>>>>>> origin/develop spring.jpa.hibernate.ddl-auto=update spring.jpa.show-sql=true spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQLDialect @@ -37,14 +24,10 @@ cloud.aws.s3.bucket=${AWS_S3_BUCKET} # JWT jwt.secret=${JWT_KEY} -# ?? ?? +# Spring Security 디버깅 로그 logging.level.org.springframework.security=DEBUG - - - ##### [PROD] ##### - # server.port=8083 # # spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver From 7c04cb0e04c85d14d3ee80388ec415aa957a505a Mon Sep 17 00:00:00 2001 From: chae_1 <129128205+sungchaewon@users.noreply.github.com> Date: Thu, 19 Jun 2025 21:15:11 +0900 Subject: [PATCH 13/13] Update MypagePostController.java --- .../FixLog/controller/MypagePostController.java | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/src/main/java/com/example/FixLog/controller/MypagePostController.java b/src/main/java/com/example/FixLog/controller/MypagePostController.java index e1da547..97bfab9 100644 --- a/src/main/java/com/example/FixLog/controller/MypagePostController.java +++ b/src/main/java/com/example/FixLog/controller/MypagePostController.java @@ -33,20 +33,6 @@ public ResponseEntity>> getMyPos return ResponseEntity.ok(Response.success("내가 작성한 글 보기 성공", data)); } -<<<<<<< HEAD - // 내가 좋아요한 글 - @GetMapping("/likes") - public ResponseEntity>> getLikedPosts( - @AuthenticationPrincipal UserDetails userDetails, - @RequestParam(defaultValue = "0") int page, - @RequestParam(defaultValue = "4") int size, - @RequestParam(defaultValue = "0") int sort) { - - String email = userDetails.getUsername(); - PageResponseDto result = mypagePostService.getLikedPosts(email, page, sort, size); - return ResponseEntity.ok(Response.success("내가 좋아요한 글 보기 성공", result)); - } -======= // 내가 좋아요한 글 @GetMapping("/likes") public ResponseEntity>> getLikedPosts( @@ -58,8 +44,7 @@ public ResponseEntity>> getLiked String email = userDetails.getUsername(); PageResponseDto result = mypagePostService.getLikedPosts(email, page, sort, size); return ResponseEntity.ok(Response.success("내가 좋아요한 글 보기 성공", result)); - } ->>>>>>> origin/develop + }