From 5b307b09ebc0c5b276591d630259108aa2746cdd Mon Sep 17 00:00:00 2001 From: sungchaewon Date: Mon, 23 Jun 2025 21:38:32 +0900 Subject: [PATCH 1/3] =?UTF-8?q?fix(postmock)=20:=20=EC=8D=B8=EB=84=A4?= =?UTF-8?q?=EC=9D=BC=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/example/FixLog/mock/PostMockDataInitializer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/example/FixLog/mock/PostMockDataInitializer.java b/src/main/java/com/example/FixLog/mock/PostMockDataInitializer.java index 1c602be..212de45 100644 --- a/src/main/java/com/example/FixLog/mock/PostMockDataInitializer.java +++ b/src/main/java/com/example/FixLog/mock/PostMockDataInitializer.java @@ -66,7 +66,7 @@ public void run(String... args) { Post post = Post.builder() .userId(member) .postTitle("테스트 업그레이드 " + (i + 2)) - .coverImage("https://cdn.example.com/images/test" + (i + 2) + ".jpg") + .coverImage("https://fixlog-bucket.s3.ap-northeast-2.amazonaws.com/default/profile.png" + (i + 2) + ".jpg") .problem("이 게시물은 문제 설명이 200자를 넘도록 작성되었습니다. 문제 발생 상황, 재현 과정, 로그, 화면 캡처 등 다양한 정보가 포함될 수 있습니다. 이 텍스트는 말줄임표가 잘 붙는지 확인하기 위한 용도로 작성되었으며, 검색 결과에서는 200자까지만 보여야 합니다. 이후 내용은 생략될 수 있습니다. 추가 텍스트를 더 붙입니다. 더 붙입니다. 더 붙입니다.") .errorMessage("이건 에러다 keyword 포함") .environment("환경 정보") From 0cbd4b849f99eb6cd099ced5b61ee1a5cbb9bf15 Mon Sep 17 00:00:00 2001 From: sungchaewon Date: Mon, 23 Jun 2025 23:20:51 +0900 Subject: [PATCH 2/3] =?UTF-8?q?fix(search)=20:=20=EA=B2=80=EC=83=89=20?= =?UTF-8?q?=EA=B2=B0=EA=B3=BC=20=EA=B2=8C=EC=8B=9C=EB=AC=BC=20=EC=8D=B8?= =?UTF-8?q?=EB=84=A4=EC=9D=BC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/main/MainPagePostResponseDto.java | 1 + .../dto/post/MyPostPageResponseDto.java | 2 +- .../FixLog/dto/search/SearchPostDto.java | 1 + .../FixLog/mock/PostMockDataInitializer.java | 2 +- .../repository/post/PostRepositoryImpl.java | 1 + .../FixLog/service/MainPageService.java | 8 ++-- .../example/FixLog/service/PostService.java | 4 +- .../com/example/FixLog/util/DefaultImage.java | 2 +- src/main/resources/application.properties | 48 +++++++++---------- 9 files changed, 37 insertions(+), 32 deletions(-) diff --git a/src/main/java/com/example/FixLog/dto/main/MainPagePostResponseDto.java b/src/main/java/com/example/FixLog/dto/main/MainPagePostResponseDto.java index 41755cd..e7b8adc 100644 --- a/src/main/java/com/example/FixLog/dto/main/MainPagePostResponseDto.java +++ b/src/main/java/com/example/FixLog/dto/main/MainPagePostResponseDto.java @@ -9,6 +9,7 @@ @Getter @AllArgsConstructor public class MainPagePostResponseDto { + private Long postId; private String postTitle; private String coverImage; private List tags; diff --git a/src/main/java/com/example/FixLog/dto/post/MyPostPageResponseDto.java b/src/main/java/com/example/FixLog/dto/post/MyPostPageResponseDto.java index 7a94dbe..7b86fd0 100644 --- a/src/main/java/com/example/FixLog/dto/post/MyPostPageResponseDto.java +++ b/src/main/java/com/example/FixLog/dto/post/MyPostPageResponseDto.java @@ -28,7 +28,7 @@ public class MyPostPageResponseDto { // 이미지 null일 때 default 사진으로 변경 - 프로필 사진 public static String getDefaultProfile(String image){ String imageUrl = (image == null || image.isBlank()) - ? "https://fixlog-bucket.s3.ap-northeast-2.amazonaws.com/default/profile.png" : image; + ? "https://fixlogsmwubucket.s3.ap-northeast-2.amazonaws.com/default/DefaultImage.png" : image; System.out.println(imageUrl); return imageUrl; } diff --git a/src/main/java/com/example/FixLog/dto/search/SearchPostDto.java b/src/main/java/com/example/FixLog/dto/search/SearchPostDto.java index 571359e..527a2c0 100644 --- a/src/main/java/com/example/FixLog/dto/search/SearchPostDto.java +++ b/src/main/java/com/example/FixLog/dto/search/SearchPostDto.java @@ -12,6 +12,7 @@ public class SearchPostDto { private Long postId; private String title; private String content; + private String coverImageUrl; private String writerNickname; private String writerProfileImage; private List tags; // 예: [“spring-boot”, “jwt”, “java”] diff --git a/src/main/java/com/example/FixLog/mock/PostMockDataInitializer.java b/src/main/java/com/example/FixLog/mock/PostMockDataInitializer.java index 212de45..94c61fe 100644 --- a/src/main/java/com/example/FixLog/mock/PostMockDataInitializer.java +++ b/src/main/java/com/example/FixLog/mock/PostMockDataInitializer.java @@ -66,7 +66,7 @@ public void run(String... args) { Post post = Post.builder() .userId(member) .postTitle("테스트 업그레이드 " + (i + 2)) - .coverImage("https://fixlog-bucket.s3.ap-northeast-2.amazonaws.com/default/profile.png" + (i + 2) + ".jpg") + .coverImage("https://fixlogsmwubucket.s3.ap-northeast-2.amazonaws.com/default/DefaultImage.png" + (i + 2) + ".jpg") .problem("이 게시물은 문제 설명이 200자를 넘도록 작성되었습니다. 문제 발생 상황, 재현 과정, 로그, 화면 캡처 등 다양한 정보가 포함될 수 있습니다. 이 텍스트는 말줄임표가 잘 붙는지 확인하기 위한 용도로 작성되었으며, 검색 결과에서는 200자까지만 보여야 합니다. 이후 내용은 생략될 수 있습니다. 추가 텍스트를 더 붙입니다. 더 붙입니다. 더 붙입니다.") .errorMessage("이건 에러다 keyword 포함") .environment("환경 정보") diff --git a/src/main/java/com/example/FixLog/repository/post/PostRepositoryImpl.java b/src/main/java/com/example/FixLog/repository/post/PostRepositoryImpl.java index 8b6dd28..231abd1 100644 --- a/src/main/java/com/example/FixLog/repository/post/PostRepositoryImpl.java +++ b/src/main/java/com/example/FixLog/repository/post/PostRepositoryImpl.java @@ -71,6 +71,7 @@ public Page searchByKeywordAndTags(String keyword, List t .postId(p.getPostId()) .title(p.getPostTitle()) .content(p.getProblem().length() > 200 ? p.getProblem().substring(0, 200) + "…" : p.getProblem()) + .coverImageUrl(p.getCoverImage()) .writerNickname(p.getUserId().getNickname()) .writerProfileImage(p.getUserId().getProfileImageUrl()) .tags(p.getPostTags().stream().map(pt -> pt.getTagId().getTagName()).toList()) diff --git a/src/main/java/com/example/FixLog/service/MainPageService.java b/src/main/java/com/example/FixLog/service/MainPageService.java index 9c8ff00..6b3b246 100644 --- a/src/main/java/com/example/FixLog/service/MainPageService.java +++ b/src/main/java/com/example/FixLog/service/MainPageService.java @@ -30,7 +30,7 @@ public MainPageService(PostRepository postRepository, MemberService memberServic // 이미지 null일 때 default 사진으로 변경 - 프로필 사진 public String getDefaultProfile(String image){ String imageUrl = (image == null || image.isBlank()) - ? "https://fixlog-bucket.s3.ap-northeast-2.amazonaws.com/default/profile.png" : image; + ? "https://fixlogsmwubucket.s3.ap-northeast-2.amazonaws.com/default/DefaultImage.png" : image; System.out.println(imageUrl); return imageUrl; } @@ -53,7 +53,7 @@ public MainPageResponseDto mainPageView(int sort, int size){ String imageUrl = member.getProfileImageUrl(); profileImageUrl = getDefaultProfile(imageUrl); } else { - profileImageUrl = "https://fixlog-bucket.s3.ap-northeast-2.amazonaws.com/default/profile.png"; // 비로그인 기본 이미지 + profileImageUrl = "https://fixlogsmwubucket.s3.ap-northeast-2.amazonaws.com/default/DefaultImage.png"; // 비로그인 기본 이미지 } // 페이지 (글 12개) 불러오기 @@ -73,6 +73,7 @@ public MainPageResponseDto mainPageView(int sort, int size){ List postList = posts.stream() .map(post -> new MainPagePostResponseDto( + post.getPostId(), post.getPostTitle(), getDefaultCover(post.getCoverImage()), post.getPostTags().stream() @@ -99,7 +100,7 @@ public MainPageResponseDto mainPageFullView(int sort, int page, int size){ String imageUrl = member.getProfileImageUrl(); profileImageUrl = getDefaultProfile(imageUrl); } else { - profileImageUrl = "https://fixlog-bucket.s3.ap-northeast-2.amazonaws.com/default/profile.png"; // 비로그인 기본 이미지 + profileImageUrl = "https://fixlogsmwubucket.s3.ap-northeast-2.amazonaws.com/default/DefaultImage.png"; // 비로그인 기본 이미지 } // 페이지 설정 (한 페이지당 12개) @@ -115,6 +116,7 @@ public MainPageResponseDto mainPageFullView(int sort, int page, int size){ List postList = postPage.stream() .map(post -> new MainPagePostResponseDto( + post.getPostId(), post.getPostTitle(), getDefaultCover(post.getCoverImage()), post.getPostTags().stream() diff --git a/src/main/java/com/example/FixLog/service/PostService.java b/src/main/java/com/example/FixLog/service/PostService.java index 2197a18..adccc1e 100644 --- a/src/main/java/com/example/FixLog/service/PostService.java +++ b/src/main/java/com/example/FixLog/service/PostService.java @@ -57,7 +57,7 @@ public PostService(PostRepository postRepository, PostLikeRepository postLikeRep // 이미지 null일 때 default 사진으로 변경 - 프로필 사진 public String getDefaultProfile(String image){ String imageUrl = (image == null || image.isBlank()) - ? "https://fixlog-bucket.s3.ap-northeast-2.amazonaws.com/default/profile.png" : image; + ? "https://fixlogsmwubucket.s3.ap-northeast-2.amazonaws.com/default/DefaultImage.png" : image; System.out.println(imageUrl); return imageUrl; } @@ -270,7 +270,7 @@ public PostResponseDto viewPost(Long postId){ .anyMatch(bookmark -> bookmark.getFolderId().getUserId().equals(member)); } else { nickname = "로그인하지 않았습니다."; - profileImageUrl = "https://fixlog-bucket.s3.ap-northeast-2.amazonaws.com/default/profile.png"; // 비로그인 기본 이미지 + profileImageUrl = "https://fixlogsmwubucket.s3.ap-northeast-2.amazonaws.com/default/DefaultImage.png"; // 비로그인 기본 이미지 isLiked = false; isMarked = false; } diff --git a/src/main/java/com/example/FixLog/util/DefaultImage.java b/src/main/java/com/example/FixLog/util/DefaultImage.java index 701b2af..6300eef 100644 --- a/src/main/java/com/example/FixLog/util/DefaultImage.java +++ b/src/main/java/com/example/FixLog/util/DefaultImage.java @@ -1,5 +1,5 @@ package com.example.FixLog.util; public class DefaultImage { - public static final String PROFILE = "https://fixlog-bucket.s3.ap-northeast-2.amazonaws.com/default/profile.png"; + public static final String PROFILE = "https://fixlogsmwubucket.s3.ap-northeast-2.amazonaws.com/default/DefaultImage.png"; } diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index b63eb06..80d9e16 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -28,27 +28,27 @@ spring.application.name=FixLog ## Spring Security #logging.level.org.springframework.security=DEBUG -##### [PROD] ##### -server.port=8083 - -spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.url=${MYSQL_URL} -spring.datasource.username=${MYSQL_USERNAME} -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 -spring.jpa.properties.hibernate.format_sql=true - -cloud.aws.credentials.access-key=${AWS_ACCESS_KEY_ID} -cloud.aws.credentials.secret-key=${AWS_SECRET_ACCESS_KEY} -cloud.aws.region.static=${AWS_REGION} -cloud.aws.s3.bucket=${AWS_S3_BUCKET} - -jwt.secret=${JWT_KEY} - -logging.level.root=INFO -logging.level.com.example.FixLog=DEBUG -logging.level.org.springframework.web.servlet.DispatcherServlet=DEBUG -logging.file.name=logs/app.log +###### [PROD] ##### +#server.port=8083 +# +#spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver +#spring.datasource.url=${MYSQL_URL} +#spring.datasource.username=${MYSQL_USERNAME} +#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 +#spring.jpa.properties.hibernate.format_sql=true +# +#cloud.aws.credentials.access-key=${AWS_ACCESS_KEY_ID} +#cloud.aws.credentials.secret-key=${AWS_SECRET_ACCESS_KEY} +#cloud.aws.region.static=${AWS_REGION} +#cloud.aws.s3.bucket=${AWS_S3_BUCKET} +# +#jwt.secret=${JWT_KEY} +# +#logging.level.root=INFO +#logging.level.com.example.FixLog=DEBUG +#logging.level.org.springframework.web.servlet.DispatcherServlet=DEBUG +#logging.file.name=logs/app.log From 113392f324c04e326a65429dfefcefc7ce5674d8 Mon Sep 17 00:00:00 2001 From: sungchaewon Date: Mon, 23 Jun 2025 23:26:59 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=EC=9E=84=EC=8B=9C=20=EC=BB=A4=EB=B0=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/example/FixLog/domain/post/Post.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/com/example/FixLog/domain/post/Post.java b/src/main/java/com/example/FixLog/domain/post/Post.java index b5ba702..af74e14 100644 --- a/src/main/java/com/example/FixLog/domain/post/Post.java +++ b/src/main/java/com/example/FixLog/domain/post/Post.java @@ -119,4 +119,6 @@ public void changeExtraContent(String newExtraContent){ public void updateEditedAt(LocalDateTime newLocalDateTime){ this.editedAt = newLocalDateTime; } + + } \ No newline at end of file