v1.0.1

Goder-0 · web-flow · commit f8e759c710d5 · 2024-10-24T17:16:34.000+09:00
[FIX] 이미지 변경 시, 적용 안되는 문제 해결
diff --git a/README.md b/README.md
@@ -1,5 +1,13 @@
 # MeeTeam_BackEnd
 
+# 아키텍처
+<img width="619" alt="스크린샷 2024-06-30 오전 9 52 41" src="https://github.com/user-attachments/assets/2dfd9693-f571-4a8d-9c34-ecacb3818014">
+
+
+# ERD(V1)
+<img width="696" alt="스크린샷 2024-06-30 오전 12 24 30" src="https://github.com/MeeTeamNumdle/MeeTeam_BackEnd/assets/100754581/a6b72f8d-fc1c-4211-b3af-b1ca18aff962">
+
+
 # 🌱 Branch
 
 <aside>
diff --git a/src/main/java/synk/meeteam/domain/portfolio/portfolio/dto/SimplePortfolioDto.java b/src/main/java/synk/meeteam/domain/portfolio/portfolio/dto/SimplePortfolioDto.java
@@ -23,18 +23,22 @@ public class SimplePortfolioDto {
     private boolean isPinned;
     @Schema(description = "핀순서", example = "1")
     private int pinOrder;
+    @Schema(description = "버전", example = "1")
+    private Long version;
 
     @Builder
     @QueryProjection
     public SimplePortfolioDto(Long id, String title, String mainImageUrl, String field, String role,
                               boolean isPinned,
-                              int pinOrder) {
+                              int pinOrder,
+                              Long version) {
         this.id = id;
         this.title = title;
         this.mainImageUrl = mainImageUrl;
         this.field = field;
         this.role = role;
         this.isPinned = isPinned;
         this.pinOrder = pinOrder;
+        this.version = version;
     }
 }
diff --git a/src/main/java/synk/meeteam/domain/portfolio/portfolio/entity/Portfolio.java b/src/main/java/synk/meeteam/domain/portfolio/portfolio/entity/Portfolio.java
@@ -107,6 +107,9 @@ public class Portfolio extends BaseEntity {
     @ColumnDefault("'ALIVE'")
     private DeleteStatus deleteStatus = DeleteStatus.ALIVE;
 
+    @ColumnDefault("1")
+    private long version = 1;
+
     @Builder
     public Portfolio(Long id, String title, String description, String content, LocalDate proceedStart,
                      LocalDate proceedEnd,
@@ -142,6 +145,7 @@ public void updatePortfolio(String title, String description, String content, Lo
         this.role = role;
         this.fileOrder = fileOrder;
         this.mainImageFileName = mainImageFileName;
+        version++;
     }
 
     public boolean isAllViewAble(Long userId) {
diff --git a/src/main/java/synk/meeteam/domain/portfolio/portfolio/repository/PortfolioCustomRepositoryImpl.java b/src/main/java/synk/meeteam/domain/portfolio/portfolio/repository/PortfolioCustomRepositoryImpl.java
@@ -68,7 +68,8 @@ private List<SimplePortfolioDto> getSimplePortfolios(User user, Pageable pageabl
                         portfolio.field.name,
                         portfolio.role.name,
                         portfolio.isPin,
-                        portfolio.pinOrder
+                        portfolio.pinOrder,
+                        portfolio.version
                 ))
                 .from(portfolio)
                 .leftJoin(portfolio.role, role)
diff --git a/src/main/java/synk/meeteam/domain/portfolio/portfolio/service/PortfolioFacade.java b/src/main/java/synk/meeteam/domain/portfolio/portfolio/service/PortfolioFacade.java
@@ -56,8 +56,8 @@ public GetPortfolioResponseDto getPortfolio(Long portfolioId, User user) {
 
         List<Skill> skills = portfolioSkillService.getPortfolioSkill(portfolio);
         List<PortfolioLink> links = portfolioLinkService.getPortfolioLink(portfolio);
-        String zipFileUrl = cloudFrontService.getSignedUrl(S3FilePath.getPortfolioPath(user.getEncryptUserId()),
-                portfolio.getZipFileName());
+        String zipFileUrl = cloudFrontService.getSignedUrl(S3FilePath.getPortfolioPath(writer.getEncryptUserId()),
+                portfolio.getZipFileName(), portfolio.getVersion());
         List<Portfolio> otherPinPortfolios = getUserPortfolio(portfolio);
         return new GetPortfolioResponseDto(
                 portfolio.getTitle(),
@@ -74,8 +74,8 @@ public GetPortfolioResponseDto getPortfolio(Long portfolioId, User user) {
                 links.stream().map(link -> new PortfolioLinkDto(link.getUrl(), link.getDescription())).toList(),
                 otherPinPortfolios.stream().map(otherPortfolio ->
                         portfolioMapper.toGetProfilePortfolioDto(otherPortfolio,
-                                cloudFrontService.getSignedUrl(S3FilePath.getPortfolioPath(user.getEncryptUserId()),
-                                        otherPortfolio.getMainImageFileName()))).toList(),
+                                cloudFrontService.getSignedUrl(S3FilePath.getPortfolioPath(writer.getEncryptUserId()),
+                                        otherPortfolio.getMainImageFileName(), otherPortfolio.getVersion()))).toList(),
                 portfolio.isWriter(userId),
                 writer.getNickname()
         );
diff --git a/src/main/java/synk/meeteam/domain/portfolio/portfolio/service/PortfolioServiceImpl.java b/src/main/java/synk/meeteam/domain/portfolio/portfolio/service/PortfolioServiceImpl.java
@@ -81,7 +81,7 @@ public GetUserPortfolioResponseDto getSliceMyAllPortfolio(int page, int size, Us
                 pageable, user);
         userPortfolioDtos.getContent().forEach(userPortfolio -> {
             String imageUrl = cloudFrontService.getSignedUrl(S3FilePath.getPortfolioPath(user.getEncryptUserId()),
-                    userPortfolio.getMainImageUrl());
+                    userPortfolio.getMainImageUrl(), userPortfolio.getVersion());
             userPortfolio.setMainImageUrl(imageUrl);
         });
         SliceInfo pageInfo = new SliceInfo(page, size, userPortfolioDtos.hasNext());
@@ -95,7 +95,7 @@ public PaginationPortfolioDto<SimplePortfolioDto> getPageMyAllPortfolio(int page
                 PageRequest.of(page - 1, size), user);
         myPortfolios.getContent().forEach(myPortfolio -> {
             String imageUrl = cloudFrontService.getSignedUrl(S3FilePath.getPortfolioPath(user.getEncryptUserId()),
-                    myPortfolio.getMainImageUrl());
+                    myPortfolio.getMainImageUrl(), myPortfolio.getVersion());
             myPortfolio.setMainImageUrl(imageUrl);
         });
         PageInfo pageInfo = new PageInfo(page, size, myPortfolios.getTotalElements(), myPortfolios.getTotalPages());
diff --git a/src/main/java/synk/meeteam/domain/recruitment/recruitment_applicant/dto/response/GetApplicantDto.java b/src/main/java/synk/meeteam/domain/recruitment/recruitment_applicant/dto/response/GetApplicantDto.java
@@ -32,12 +32,14 @@ public class GetApplicantDto {
     String applyRoleName;
     @Schema(description = "전하는 말", example = "저 관심있어용")
     String message;
+    @Schema(description = "버전", example = "1")
+    Long version;
 
     @QueryProjection
     public GetApplicantDto(Long applicantId, String userId, String nickname, String profileImg, String name,
-                           double score, String universityName, String departmentName, String email,
-                           int year,
-                           String applyRoleName, String message) {
+                           double score,
+                           String universityName, String departmentName, String email, int year, String applyRoleName,
+                           String message, Long version) {
         this.applicantId = applicantId;
         this.userId = userId;
         this.nickname = nickname;
@@ -50,6 +52,7 @@ public GetApplicantDto(Long applicantId, String userId, String nickname, String
         this.year = year;
         this.applyRoleName = applyRoleName;
         this.message = message;
+        this.version = version;
     }
 
     public void setEncryptedUserIdAndProfileImg(String userId, String profileImg) {
diff --git a/src/main/java/synk/meeteam/domain/recruitment/recruitment_applicant/repository/RecruitmentApplicantCustomRepositoryImpl.java b/src/main/java/synk/meeteam/domain/recruitment/recruitment_applicant/repository/RecruitmentApplicantCustomRepositoryImpl.java
@@ -54,7 +54,8 @@ public Slice<GetApplicantDto> findByPostIdAndRoleId(Long postId, Long roleId, Pa
                         recruitmentApplicant.applicant.name, recruitmentApplicant.applicant.gpa,
                         recruitmentApplicant.applicant.university.name, recruitmentApplicant.applicant.department.name,
                         getMainMail, recruitmentApplicant.applicant.admissionYear,
-                        recruitmentApplicant.role.name, recruitmentApplicant.comment))
+                        recruitmentApplicant.role.name, recruitmentApplicant.comment,
+                        recruitmentApplicant.applicant.imgVersion))
                 .from(recruitmentApplicant)
                 .leftJoin(recruitmentApplicant.applicant, user)
                 .leftJoin(recruitmentApplicant.recruitmentPost, recruitmentPost)
diff --git a/src/main/java/synk/meeteam/domain/recruitment/recruitment_applicant/service/RecruitmentApplicantService.java b/src/main/java/synk/meeteam/domain/recruitment/recruitment_applicant/service/RecruitmentApplicantService.java
@@ -108,7 +108,7 @@ public GetApplicantResponseDto getAllByRole(Long postId, Long roleId, Long userI
                 roleId, pageable);
         applicantDtos.stream().forEach(applicant -> applicant.setEncryptedUserIdAndProfileImg(
                 Encryption.encryptLong(Long.parseLong(applicant.getUserId())),
-                cloudFrontService.getSignedUrl(USER, applicant.getProfileImg())));
+                cloudFrontService.getSignedUrl(USER, applicant.getProfileImg(), applicant.getVersion())));
 
         SliceInfo pageInfo = new SliceInfo(page, size, applicantDtos.hasNext());
         return new GetApplicantResponseDto(applicantDtos.getContent(), pageInfo);
diff --git a/src/main/java/synk/meeteam/domain/recruitment/recruitment_comment/repository/RecruitmentCommentRepositoryCustomImpl.java b/src/main/java/synk/meeteam/domain/recruitment/recruitment_comment/repository/RecruitmentCommentRepositoryCustomImpl.java
@@ -22,7 +22,7 @@ public List<RecruitmentCommentVO> findAllByRecruitmentId(Long postId) {
                         user.nickname,
                         user.profileImgFileName, recruitmentComment.content, recruitmentComment.createdAt,
                         recruitmentComment.isParent, recruitmentComment.groupNumber, recruitmentComment.groupOrder,
-                        recruitmentComment.isDeleted))
+                        recruitmentComment.isDeleted, user.imgVersion))
                 .from(recruitmentComment)
                 .leftJoin(user)
                 .on(recruitmentComment.createdBy.eq(user.id))
diff --git a/src/main/java/synk/meeteam/domain/recruitment/recruitment_comment/service/RecruitmentCommentService.java b/src/main/java/synk/meeteam/domain/recruitment/recruitment_comment/service/RecruitmentCommentService.java
@@ -36,7 +36,8 @@ public List<GetCommentResponseDto> getRecruitmentComments(RecruitmentPost recrui
 
         for (RecruitmentCommentVO comment : commentVOs) {
             boolean isWriter = writerId.equals(comment.getUserId());
-            String profileImg = cloudFrontService.getSignedUrl(S3FilePath.USER, comment.getProfileImg());
+            String profileImg = cloudFrontService.getSignedUrl(S3FilePath.USER, comment.getProfileImg(),
+                    comment.getUserVersion());
             String commentWriterId = Encryption.encryptLong(comment.getUserId());
 
             if (comment.isParent()) {
diff --git a/src/main/java/synk/meeteam/domain/recruitment/recruitment_comment/service/vo/RecruitmentCommentVO.java b/src/main/java/synk/meeteam/domain/recruitment/recruitment_comment/service/vo/RecruitmentCommentVO.java
@@ -17,12 +17,14 @@ public class RecruitmentCommentVO {
     long groupNumber;
     long groupOrder;
     boolean isDeleted;
+    Long userVersion;
 
     @Builder
     @QueryProjection
     public RecruitmentCommentVO(Long id, Long userId, String nickname, String profileImg, String content,
                                 LocalDateTime createAt,
-                                boolean isParent, long groupNumber, long groupOrder, boolean isDeleted) {
+                                boolean isParent, long groupNumber, long groupOrder, boolean isDeleted,
+                                Long userVersion) {
         this.id = id;
         this.userId = userId;
         this.nickname = nickname;
@@ -33,6 +35,7 @@ public RecruitmentCommentVO(Long id, Long userId, String nickname, String profil
         this.groupNumber = groupNumber;
         this.groupOrder = groupOrder;
         this.isDeleted = isDeleted;
+        this.userVersion = userVersion;
     }
 
     public Long getUserId() {
diff --git a/src/main/java/synk/meeteam/domain/recruitment/recruitment_post/api/RecruitmentPostController.java b/src/main/java/synk/meeteam/domain/recruitment/recruitment_post/api/RecruitmentPostController.java
@@ -133,7 +133,8 @@ public ResponseEntity<GetRecruitmentPostResponseDto> getRecruitmentPost(
         }
 
         User writer = userService.findById(recruitmentPost.getCreatedBy());
-        String writerImgUrl = cloudFrontService.getSignedUrl(S3FilePath.USER, writer.getProfileImgFileName());
+        String writerImgUrl = cloudFrontService.getSignedUrl(S3FilePath.USER, writer.getProfileImgFileName(),
+                writer.getImgVersion());
 
         List<RecruitmentRole> recruitmentRoles = recruitmentRoleService.findByRecruitmentPostId(postId);
 
diff --git a/src/main/java/synk/meeteam/domain/recruitment/recruitment_post/repository/RecruitmentManagementRepositoryImpl.java b/src/main/java/synk/meeteam/domain/recruitment/recruitment_post/repository/RecruitmentManagementRepositoryImpl.java
@@ -54,7 +54,8 @@ private List<RecruitmentPostVo> getManagementPostVos(Pageable pageable, User use
                                 manageType == ManageType.BOOKMARKED ? Expressions.asBoolean(true)
                                         : RecruitmentExpressionUtils.isBookmark(userDomain),
                                 recruitmentPost.createdAt,
-                                recruitmentPost.isClosed
+                                recruitmentPost.isClosed,
+                                writer.imgVersion
                         )
                 )
                 .distinct()
diff --git a/src/main/java/synk/meeteam/domain/recruitment/recruitment_post/repository/RecruitmentPostSearchRepositoryImpl.java b/src/main/java/synk/meeteam/domain/recruitment/recruitment_post/repository/RecruitmentPostSearchRepositoryImpl.java
@@ -65,7 +65,8 @@ private List<RecruitmentPostVo> getPostVos(Pageable pageable, SearchCondition co
                                 recruitmentPost.deadline,
                                 isBookmark(userDomain),
                                 recruitmentPost.createdAt,
-                                recruitmentPost.isClosed
+                                recruitmentPost.isClosed,
+                                writer.imgVersion
                         )
                 )
                 .distinct()
diff --git a/src/main/java/synk/meeteam/domain/recruitment/recruitment_post/repository/vo/RecruitmentPostVo.java b/src/main/java/synk/meeteam/domain/recruitment/recruitment_post/repository/vo/RecruitmentPostVo.java
@@ -21,13 +21,15 @@ public class RecruitmentPostVo {
     private Boolean isBookmarked;
     private LocalDateTime createdAt;
     private Boolean isClosed;
+    private Long writerVersion;
 
     @Builder
     @QueryProjection
     public RecruitmentPostVo(Long id, String title, Category category, Scope scope, Long writerId,
                              String writerNickname,
                              String writerProfileImg, LocalDate deadline, Boolean isBookmarked, LocalDateTime createdAt,
-                             Boolean isClosed) {
+                             Boolean isClosed,
+                             Long writerVersion) {
         this.id = id;
         this.title = title;
         this.category = category;
@@ -39,5 +41,6 @@ public RecruitmentPostVo(Long id, String title, Category category, Scope scope,
         this.isBookmarked = isBookmarked;
         this.createdAt = createdAt;
         this.isClosed = isClosed;
+        this.writerVersion = writerVersion;
     }
 }
diff --git a/src/main/java/synk/meeteam/domain/recruitment/recruitment_post/service/RecruitmentPostService.java b/src/main/java/synk/meeteam/domain/recruitment/recruitment_post/service/RecruitmentPostService.java
@@ -106,7 +106,8 @@ public PaginationSearchPostResponseDto searchWithPageRecruitmentPost(int size, i
         List<SimpleRecruitmentPostDto> contents = postVos.stream()
                 .map((postVo) -> {
                     String writerEncryptedId = Encryption.encryptLong(postVo.getWriterId());
-                    String imageUrl = cloudFrontService.getSignedUrl(S3FilePath.USER, postVo.getWriterProfileImg());
+                    String imageUrl = cloudFrontService.getSignedUrl(S3FilePath.USER, postVo.getWriterProfileImg(),
+                            postVo.getWriterVersion());
                     return simpleRecruitmentPostMapper.toSimpleRecruitmentPostDto(postVo, writerEncryptedId, imageUrl);
                 }).toList();
 
@@ -138,7 +139,8 @@ public PaginationDto<SimpleRecruitmentPostDto> getManagementPost(int size, int p
         List<SimpleRecruitmentPostDto> contents = postVos.stream()
                 .map((postVo) -> {
                     String writerEncryptedId = Encryption.encryptLong(postVo.getWriterId());
-                    String imageUrl = cloudFrontService.getSignedUrl(S3FilePath.USER, postVo.getWriterProfileImg());
+                    String imageUrl = cloudFrontService.getSignedUrl(S3FilePath.USER, postVo.getWriterProfileImg(),
+                            postVo.getWriterVersion());
                     return simpleRecruitmentPostMapper.toSimpleRecruitmentPostDto(postVo, writerEncryptedId, imageUrl);
                 }).toList();
         return new PaginationDto<>(contents, pageInfo);
diff --git a/src/main/java/synk/meeteam/domain/user/user/api/UserController.java b/src/main/java/synk/meeteam/domain/user/user/api/UserController.java
@@ -82,7 +82,7 @@ public ResponseEntity<GetUserPortfolioResponseDto> getUserPortfolio(
     @Override
     @GetMapping("/profile/image")
     public ResponseEntity<GetProfileImageResponseDto> getProfileImage(@AuthUser User user) {
-        String profileImgUrl = cloudFrontService.getSignedUrl(USER, user.getProfileImgFileName());
+        String profileImgUrl = cloudFrontService.getSignedUrl(USER, user.getProfileImgFileName(), user.getImgVersion());
         return ResponseEntity.ok(GetProfileImageResponseDto.of(profileImgUrl));
     }
 
diff --git a/src/main/java/synk/meeteam/domain/user/user/entity/User.java b/src/main/java/synk/meeteam/domain/user/user/entity/User.java
@@ -163,6 +163,9 @@ public class User extends BaseTimeEntity {
     @ColumnDefault("1")
     private boolean isFirstApplicantAccess = true;
 
+    @ColumnDefault("1")
+    private long imgVersion = 1;
+
     public User(String platformId) {
         this.platformId = platformId;
     }
@@ -220,6 +223,7 @@ public void updateProfile(
         this.gpa = gpa;
         this.maxGpa = maxGpa;
         this.interestRole = role;
+        this.imgVersion++;
 
         if (subEmail == null && !isUniversityMainEmail) {
             this.isUniversityMainEmail = true;
@@ -302,7 +306,7 @@ public void processFirstAccess() {
         this.isFirstApplicantAccess = false;
     }
 
-    public String getMainEmail(){
+    public String getMainEmail() {
         return isUniversityMainEmail ? universityEmail : subEmail;
     }
 }
diff --git a/src/main/java/synk/meeteam/domain/user/user/service/ProfileFacade.java b/src/main/java/synk/meeteam/domain/user/user/service/ProfileFacade.java
@@ -71,7 +71,8 @@ public void editProfile(User user, UpdateProfileRequestDto profileDto) {
     public GetProfileResponseDto readProfile(User user, String encryptedId) {
         Long userId = Encryption.decryptLong(encryptedId);
         ProfileDto openProfile = userService.getOpenProfile(userId, user);
-        String profileImgUrl = cloudFrontService.getSignedUrl(S3FilePath.USER, openProfile.profileImgFileName());
+        String profileImgUrl = cloudFrontService.getSignedUrl(S3FilePath.USER, openProfile.profileImgFileName(),
+                user.getImgVersion());
         List<GetProfileUserLinkDto> links = getProfileLinks(userId);
         List<GetProfileAwardDto> awards = getProfileAwards(userId);
         List<SimplePortfolioDto> portfolios = getProfilePortfolios(userId, encryptedId);
@@ -96,7 +97,7 @@ private List<SimplePortfolioDto> getProfilePortfolios(Long userId, String encryp
         return portfolios.stream().map((portfolio) -> {
             String imageUrl = cloudFrontService.getSignedUrl(
                     S3FilePath.getPortfolioPath(encryptedId),
-                    portfolio.getMainImageFileName());
+                    portfolio.getMainImageFileName(), portfolio.getVersion());
             return portfolioMapper.toGetProfilePortfolioDto(portfolio, imageUrl);
         }).toList();
     }
diff --git a/src/main/java/synk/meeteam/global/api/ServerProfileController.java b/src/main/java/synk/meeteam/global/api/ServerProfileController.java
@@ -26,7 +26,8 @@ public ResponseEntity<SignedUrlVO> getSignedUrl(@AuthUser User user,
                                                     @RequestParam(name = "file-name") String fileName) {
         String extension = StringUtils.getFilenameExtension(fileName);
 
-        return ResponseEntity.ok().body(cloudFrontService.getProfileSignedUrl(extension, user.getId()));
+        return ResponseEntity.ok()
+                .body(cloudFrontService.getProfileSignedUrl(extension, user.getId(), user.getImgVersion()));
     }
 
     @GetMapping("/portfolio/signed-url")
@@ -35,11 +36,7 @@ public ResponseEntity<List<SignedUrlVO>> getSignedUrl(@AuthUser User user,
                                                           @RequestParam(name = "portfolio", required = false) Long portfolioId
     ) {
         String thumbnailExtension = StringUtils.getFilenameExtension(fileName);
-        Portfolio portfolio = null;
-
-        if (portfolioId != null) {
-            portfolio = portfolioService.getPortfolio(portfolioId);
-        }
+        Portfolio portfolio = portfolioId != null ? portfolioService.getPortfolio(portfolioId) : null;
 
         return ResponseEntity.ok().body(
                 cloudFrontService.getPortfolioSignedUrl(thumbnailExtension, portfolio, user.getId())
diff --git a/src/main/java/synk/meeteam/infra/aws/service/CloudFrontService.java b/src/main/java/synk/meeteam/infra/aws/service/CloudFrontService.java
diff --git a/src/main/java/synk/meeteam/infra/aws/strategy/NoPortfolioStrategy.java b/src/main/java/synk/meeteam/infra/aws/strategy/NoPortfolioStrategy.java
diff --git a/src/main/java/synk/meeteam/infra/aws/strategy/PortfolioExistStrategy.java b/src/main/java/synk/meeteam/infra/aws/strategy/PortfolioExistStrategy.java
diff --git a/src/main/java/synk/meeteam/infra/aws/strategy/PortfolioStrategy.java b/src/main/java/synk/meeteam/infra/aws/strategy/PortfolioStrategy.java
diff --git a/src/test/java/synk/meeteam/domain/portfolio/portfolio/PortfolioFixture.java b/src/test/java/synk/meeteam/domain/portfolio/portfolio/PortfolioFixture.java
diff --git a/src/test/java/synk/meeteam/domain/portfolio/portfolio/PortfolioServiceTest.java b/src/test/java/synk/meeteam/domain/portfolio/portfolio/PortfolioServiceTest.java
diff --git a/src/test/java/synk/meeteam/domain/recruitment/recruitment_applicant/RecruitmentApplicantServiceTest.java b/src/test/java/synk/meeteam/domain/recruitment/recruitment_applicant/RecruitmentApplicantServiceTest.java
diff --git a/src/test/java/synk/meeteam/domain/recruitment/recruitment_comment/RecruitmentCommentServiceTest.java b/src/test/java/synk/meeteam/domain/recruitment/recruitment_comment/RecruitmentCommentServiceTest.java
diff --git a/src/test/java/synk/meeteam/domain/user/user/UserFixture.java b/src/test/java/synk/meeteam/domain/user/user/UserFixture.java
