diff --git a/src/main/java/com/gabojait/gabojaitspring/api/controller/develop/DevelopController.java b/src/main/java/com/gabojait/gabojaitspring/api/controller/develop/DevelopController.java index 08df7d5c..3241e66d 100644 --- a/src/main/java/com/gabojait/gabojaitspring/api/controller/develop/DevelopController.java +++ b/src/main/java/com/gabojait/gabojaitspring/api/controller/develop/DevelopController.java @@ -18,8 +18,8 @@ import javax.validation.constraints.Positive; -import static com.gabojait.gabojaitspring.common.code.ErrorCode.SERVER_ERROR; -import static com.gabojait.gabojaitspring.common.code.SuccessCode.*; +import static com.gabojait.gabojaitspring.common.constant.code.ErrorCode.SERVER_ERROR; +import static com.gabojait.gabojaitspring.common.constant.code.SuccessCode.*; @Api(tags = "개발") @Validated diff --git a/src/main/java/com/gabojait/gabojaitspring/api/controller/favorite/FavoriteController.java b/src/main/java/com/gabojait/gabojaitspring/api/controller/favorite/FavoriteController.java index d71effaa..927b486c 100644 --- a/src/main/java/com/gabojait/gabojaitspring/api/controller/favorite/FavoriteController.java +++ b/src/main/java/com/gabojait/gabojaitspring/api/controller/favorite/FavoriteController.java @@ -24,7 +24,7 @@ import javax.validation.constraints.Positive; import java.util.List; -import static com.gabojait.gabojaitspring.common.code.SuccessCode.*; +import static com.gabojait.gabojaitspring.common.constant.code.SuccessCode.*; import static org.springframework.http.HttpHeaders.AUTHORIZATION; @Api(tags = "찜") diff --git a/src/main/java/com/gabojait/gabojaitspring/api/controller/notification/NotificationController.java b/src/main/java/com/gabojait/gabojaitspring/api/controller/notification/NotificationController.java index 9adf19cd..d11b0505 100644 --- a/src/main/java/com/gabojait/gabojaitspring/api/controller/notification/NotificationController.java +++ b/src/main/java/com/gabojait/gabojaitspring/api/controller/notification/NotificationController.java @@ -21,8 +21,8 @@ import javax.validation.constraints.Positive; import java.util.List; -import static com.gabojait.gabojaitspring.common.code.SuccessCode.NOTIFICATIONS_FOUND; -import static com.gabojait.gabojaitspring.common.code.SuccessCode.NOTIFICATION_READ; +import static com.gabojait.gabojaitspring.common.constant.code.SuccessCode.NOTIFICATIONS_FOUND; +import static com.gabojait.gabojaitspring.common.constant.code.SuccessCode.NOTIFICATION_READ; import static org.springframework.http.HttpHeaders.AUTHORIZATION; @Api(tags = "알림") diff --git a/src/main/java/com/gabojait/gabojaitspring/api/controller/offer/OfferController.java b/src/main/java/com/gabojait/gabojaitspring/api/controller/offer/OfferController.java index 126b4097..c83a5878 100644 --- a/src/main/java/com/gabojait/gabojaitspring/api/controller/offer/OfferController.java +++ b/src/main/java/com/gabojait/gabojaitspring/api/controller/offer/OfferController.java @@ -29,7 +29,7 @@ import javax.validation.constraints.Positive; import java.util.List; -import static com.gabojait.gabojaitspring.common.code.SuccessCode.*; +import static com.gabojait.gabojaitspring.common.constant.code.SuccessCode.*; import static org.springframework.http.HttpHeaders.AUTHORIZATION; @Api(tags = "제안") diff --git a/src/main/java/com/gabojait/gabojaitspring/api/controller/profile/ProfileController.java b/src/main/java/com/gabojait/gabojaitspring/api/controller/profile/ProfileController.java index da2c0b19..ebf29a6f 100644 --- a/src/main/java/com/gabojait/gabojaitspring/api/controller/profile/ProfileController.java +++ b/src/main/java/com/gabojait/gabojaitspring/api/controller/profile/ProfileController.java @@ -30,7 +30,7 @@ import java.util.List; -import static com.gabojait.gabojaitspring.common.code.SuccessCode.*; +import static com.gabojait.gabojaitspring.common.constant.code.SuccessCode.*; import static org.springframework.http.HttpHeaders.AUTHORIZATION; @Api(tags = "프로필") diff --git a/src/main/java/com/gabojait/gabojaitspring/api/controller/review/ReviewController.java b/src/main/java/com/gabojait/gabojaitspring/api/controller/review/ReviewController.java index ece0bcdb..05d151f4 100644 --- a/src/main/java/com/gabojait/gabojaitspring/api/controller/review/ReviewController.java +++ b/src/main/java/com/gabojait/gabojaitspring/api/controller/review/ReviewController.java @@ -28,7 +28,7 @@ import java.time.LocalDateTime; import java.util.List; -import static com.gabojait.gabojaitspring.common.code.SuccessCode.*; +import static com.gabojait.gabojaitspring.common.constant.code.SuccessCode.*; import static org.springframework.http.HttpHeaders.AUTHORIZATION; @Api(tags = "리뷰") diff --git a/src/main/java/com/gabojait/gabojaitspring/api/controller/team/TeamController.java b/src/main/java/com/gabojait/gabojaitspring/api/controller/team/TeamController.java index a4318fb9..8f41d99f 100644 --- a/src/main/java/com/gabojait/gabojaitspring/api/controller/team/TeamController.java +++ b/src/main/java/com/gabojait/gabojaitspring/api/controller/team/TeamController.java @@ -31,7 +31,7 @@ import java.time.LocalDateTime; import java.util.List; -import static com.gabojait.gabojaitspring.common.code.SuccessCode.*; +import static com.gabojait.gabojaitspring.common.constant.code.SuccessCode.*; import static org.springframework.http.HttpHeaders.AUTHORIZATION; @Api(tags = "팀") diff --git a/src/main/java/com/gabojait/gabojaitspring/api/controller/user/ContactController.java b/src/main/java/com/gabojait/gabojaitspring/api/controller/user/ContactController.java index e489a732..7e0a248e 100644 --- a/src/main/java/com/gabojait/gabojaitspring/api/controller/user/ContactController.java +++ b/src/main/java/com/gabojait/gabojaitspring/api/controller/user/ContactController.java @@ -17,8 +17,8 @@ import javax.validation.Valid; -import static com.gabojait.gabojaitspring.common.code.SuccessCode.EMAIL_VERIFIED; -import static com.gabojait.gabojaitspring.common.code.SuccessCode.VERIFICATION_CODE_SENT; +import static com.gabojait.gabojaitspring.common.constant.code.SuccessCode.EMAIL_VERIFIED; +import static com.gabojait.gabojaitspring.common.constant.code.SuccessCode.VERIFICATION_CODE_SENT; @Api(tags = "연락처") @RestController diff --git a/src/main/java/com/gabojait/gabojaitspring/api/controller/user/UserController.java b/src/main/java/com/gabojait/gabojaitspring/api/controller/user/UserController.java index 2c016706..c0633024 100644 --- a/src/main/java/com/gabojait/gabojaitspring/api/controller/user/UserController.java +++ b/src/main/java/com/gabojait/gabojaitspring/api/controller/user/UserController.java @@ -26,7 +26,7 @@ import javax.validation.constraints.Size; import java.time.LocalDateTime; -import static com.gabojait.gabojaitspring.common.code.SuccessCode.*; +import static com.gabojait.gabojaitspring.common.constant.code.SuccessCode.*; import static org.springframework.http.HttpHeaders.AUTHORIZATION; @Api(tags = "회원") diff --git a/src/main/java/com/gabojait/gabojaitspring/api/dto/notification/response/DeepLinkResponse.java b/src/main/java/com/gabojait/gabojaitspring/api/dto/notification/response/DeepLinkResponse.java new file mode 100644 index 00000000..ee9bcc24 --- /dev/null +++ b/src/main/java/com/gabojait/gabojaitspring/api/dto/notification/response/DeepLinkResponse.java @@ -0,0 +1,24 @@ +package com.gabojait.gabojaitspring.api.dto.notification.response; + +import com.gabojait.gabojaitspring.common.constant.deepLink.DeepLink; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.ToString; + +@Getter +@ToString +@ApiModel(value = "딥링크 응답") +public class DeepLinkResponse { + + @ApiModelProperty(position = 1, required = true, value = "URL") + private String url; + + @ApiModelProperty(position = 2, required = true, value = "설명") + private String description; + + public DeepLinkResponse(DeepLink deepLink) { + this.url = deepLink.getUrl(); + this.description = deepLink.getDescription(); + } +} diff --git a/src/main/java/com/gabojait/gabojaitspring/api/dto/notification/response/NotificationPageResponse.java b/src/main/java/com/gabojait/gabojaitspring/api/dto/notification/response/NotificationPageResponse.java index 488567c3..9b10c903 100644 --- a/src/main/java/com/gabojait/gabojaitspring/api/dto/notification/response/NotificationPageResponse.java +++ b/src/main/java/com/gabojait/gabojaitspring/api/dto/notification/response/NotificationPageResponse.java @@ -30,6 +30,9 @@ public class NotificationPageResponse { @ApiModelProperty(position = 5, required = true, value = "읽음 여부") private Boolean isRead; + @ApiModelProperty(position = 6, required = true, value = "딥링크") + private DeepLinkResponse deepLink; + @ApiModelProperty(position = 6, required = true, value = "생성일") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createdAt; diff --git a/src/main/java/com/gabojait/gabojaitspring/api/service/develop/DevelopService.java b/src/main/java/com/gabojait/gabojaitspring/api/service/develop/DevelopService.java index 67771545..de191136 100644 --- a/src/main/java/com/gabojait/gabojaitspring/api/service/develop/DevelopService.java +++ b/src/main/java/com/gabojait/gabojaitspring/api/service/develop/DevelopService.java @@ -35,7 +35,7 @@ import java.util.List; import java.util.Random; -import static com.gabojait.gabojaitspring.common.code.ErrorCode.TESTER_NOT_FOUND; +import static com.gabojait.gabojaitspring.common.constant.code.ErrorCode.TESTER_NOT_FOUND; @Service @RequiredArgsConstructor diff --git a/src/main/java/com/gabojait/gabojaitspring/api/service/favorite/FavoriteService.java b/src/main/java/com/gabojait/gabojaitspring/api/service/favorite/FavoriteService.java index 85a6f45a..98eff65f 100644 --- a/src/main/java/com/gabojait/gabojaitspring/api/service/favorite/FavoriteService.java +++ b/src/main/java/com/gabojait/gabojaitspring/api/service/favorite/FavoriteService.java @@ -23,8 +23,8 @@ import java.util.Optional; import java.util.stream.Collectors; -import static com.gabojait.gabojaitspring.common.code.ErrorCode.TEAM_NOT_FOUND; -import static com.gabojait.gabojaitspring.common.code.ErrorCode.USER_NOT_FOUND; +import static com.gabojait.gabojaitspring.common.constant.code.ErrorCode.TEAM_NOT_FOUND; +import static com.gabojait.gabojaitspring.common.constant.code.ErrorCode.USER_NOT_FOUND; @Service @RequiredArgsConstructor diff --git a/src/main/java/com/gabojait/gabojaitspring/api/service/offer/OfferService.java b/src/main/java/com/gabojait/gabojaitspring/api/service/offer/OfferService.java index d07e79c7..09436bd3 100644 --- a/src/main/java/com/gabojait/gabojaitspring/api/service/offer/OfferService.java +++ b/src/main/java/com/gabojait/gabojaitspring/api/service/offer/OfferService.java @@ -27,7 +27,7 @@ import java.util.Map; import java.util.stream.Collectors; -import static com.gabojait.gabojaitspring.common.code.ErrorCode.*; +import static com.gabojait.gabojaitspring.common.constant.code.ErrorCode.*; @Service @RequiredArgsConstructor diff --git a/src/main/java/com/gabojait/gabojaitspring/api/service/profile/ProfileService.java b/src/main/java/com/gabojait/gabojaitspring/api/service/profile/ProfileService.java index 6f7e5c9a..da1c3c8f 100644 --- a/src/main/java/com/gabojait/gabojaitspring/api/service/profile/ProfileService.java +++ b/src/main/java/com/gabojait/gabojaitspring/api/service/profile/ProfileService.java @@ -30,7 +30,7 @@ import java.util.*; import java.util.stream.Collectors; -import static com.gabojait.gabojaitspring.common.code.ErrorCode.*; +import static com.gabojait.gabojaitspring.common.constant.code.ErrorCode.*; @Service @RequiredArgsConstructor diff --git a/src/main/java/com/gabojait/gabojaitspring/api/service/review/ReviewService.java b/src/main/java/com/gabojait/gabojaitspring/api/service/review/ReviewService.java index dea21c04..318326c7 100644 --- a/src/main/java/com/gabojait/gabojaitspring/api/service/review/ReviewService.java +++ b/src/main/java/com/gabojait/gabojaitspring/api/service/review/ReviewService.java @@ -20,7 +20,7 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; -import static com.gabojait.gabojaitspring.common.code.ErrorCode.TEAM_MEMBER_NOT_FOUND; +import static com.gabojait.gabojaitspring.common.constant.code.ErrorCode.TEAM_MEMBER_NOT_FOUND; @Service @RequiredArgsConstructor diff --git a/src/main/java/com/gabojait/gabojaitspring/api/service/team/TeamService.java b/src/main/java/com/gabojait/gabojaitspring/api/service/team/TeamService.java index 0c9fc871..6c8296b4 100644 --- a/src/main/java/com/gabojait/gabojaitspring/api/service/team/TeamService.java +++ b/src/main/java/com/gabojait/gabojaitspring/api/service/team/TeamService.java @@ -26,7 +26,7 @@ import java.util.List; import java.util.stream.Collectors; -import static com.gabojait.gabojaitspring.common.code.ErrorCode.*; +import static com.gabojait.gabojaitspring.common.constant.code.ErrorCode.*; @Service @RequiredArgsConstructor diff --git a/src/main/java/com/gabojait/gabojaitspring/api/service/user/ContactService.java b/src/main/java/com/gabojait/gabojaitspring/api/service/user/ContactService.java index b5dd4cb2..e5ce46d4 100644 --- a/src/main/java/com/gabojait/gabojaitspring/api/service/user/ContactService.java +++ b/src/main/java/com/gabojait/gabojaitspring/api/service/user/ContactService.java @@ -12,7 +12,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import static com.gabojait.gabojaitspring.common.code.ErrorCode.*; +import static com.gabojait.gabojaitspring.common.constant.code.ErrorCode.*; @Service @RequiredArgsConstructor diff --git a/src/main/java/com/gabojait/gabojaitspring/api/service/user/UserDetailsService.java b/src/main/java/com/gabojait/gabojaitspring/api/service/user/UserDetailsService.java index 7643d5b1..20c5dab7 100644 --- a/src/main/java/com/gabojait/gabojaitspring/api/service/user/UserDetailsService.java +++ b/src/main/java/com/gabojait/gabojaitspring/api/service/user/UserDetailsService.java @@ -15,7 +15,7 @@ import java.util.List; import java.util.stream.Collectors; -import static com.gabojait.gabojaitspring.common.code.ErrorCode.USER_NOT_FOUND; +import static com.gabojait.gabojaitspring.common.constant.code.ErrorCode.USER_NOT_FOUND; @Service @Transactional(readOnly = true) diff --git a/src/main/java/com/gabojait/gabojaitspring/api/service/user/UserService.java b/src/main/java/com/gabojait/gabojaitspring/api/service/user/UserService.java index 84871f17..1b555e8c 100644 --- a/src/main/java/com/gabojait/gabojaitspring/api/service/user/UserService.java +++ b/src/main/java/com/gabojait/gabojaitspring/api/service/user/UserService.java @@ -32,7 +32,7 @@ import java.time.LocalDateTime; import java.util.Optional; -import static com.gabojait.gabojaitspring.common.code.ErrorCode.*; +import static com.gabojait.gabojaitspring.common.constant.code.ErrorCode.*; @Service @RequiredArgsConstructor diff --git a/src/main/java/com/gabojait/gabojaitspring/common/code/ErrorCode.java b/src/main/java/com/gabojait/gabojaitspring/common/constant/code/ErrorCode.java similarity index 99% rename from src/main/java/com/gabojait/gabojaitspring/common/code/ErrorCode.java rename to src/main/java/com/gabojait/gabojaitspring/common/constant/code/ErrorCode.java index 3f18e411..f6b096f3 100644 --- a/src/main/java/com/gabojait/gabojaitspring/common/code/ErrorCode.java +++ b/src/main/java/com/gabojait/gabojaitspring/common/constant/code/ErrorCode.java @@ -1,4 +1,4 @@ -package com.gabojait.gabojaitspring.common.code; +package com.gabojait.gabojaitspring.common.constant.code; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/com/gabojait/gabojaitspring/common/code/SuccessCode.java b/src/main/java/com/gabojait/gabojaitspring/common/constant/code/SuccessCode.java similarity index 99% rename from src/main/java/com/gabojait/gabojaitspring/common/code/SuccessCode.java rename to src/main/java/com/gabojait/gabojaitspring/common/constant/code/SuccessCode.java index 1821b950..ff122165 100644 --- a/src/main/java/com/gabojait/gabojaitspring/common/code/SuccessCode.java +++ b/src/main/java/com/gabojait/gabojaitspring/common/constant/code/SuccessCode.java @@ -1,4 +1,4 @@ -package com.gabojait.gabojaitspring.common.code; +package com.gabojait.gabojaitspring.common.constant.code; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/com/gabojait/gabojaitspring/common/constant/deepLink/DeepLink.java b/src/main/java/com/gabojait/gabojaitspring/common/constant/deepLink/DeepLink.java new file mode 100644 index 00000000..ddf8a58d --- /dev/null +++ b/src/main/java/com/gabojait/gabojaitspring/common/constant/deepLink/DeepLink.java @@ -0,0 +1,19 @@ +package com.gabojait.gabojaitspring.common.constant.deepLink; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public enum DeepLink { + + HOME_PAGE("gabojait://home", "홈페이지"), + TEAM_PAGE("gabojait://team", "팀 페이지"), + REVIEW_PAGE("gabojait://my/team-history/review", "리뷰 작성 페이지"), + USER_OFFER_RECEIVE_PAGE("gabojait://my/offer/user/received", "회원 제안 페이지"), + TEAM_OFFER_RECEIVE_PAGE("gabojait://my/offer/team/received", "팀 제안 페이지") + ; + + private final String url; + private final String description; +} diff --git a/src/main/java/com/gabojait/gabojaitspring/common/exception/CustomException.java b/src/main/java/com/gabojait/gabojaitspring/common/exception/CustomException.java index d29c22cf..139897b2 100644 --- a/src/main/java/com/gabojait/gabojaitspring/common/exception/CustomException.java +++ b/src/main/java/com/gabojait/gabojaitspring/common/exception/CustomException.java @@ -1,6 +1,6 @@ package com.gabojait.gabojaitspring.common.exception; -import com.gabojait.gabojaitspring.common.code.ErrorCode; +import com.gabojait.gabojaitspring.common.constant.code.ErrorCode; import lombok.Getter; @Getter diff --git a/src/main/java/com/gabojait/gabojaitspring/common/exception/CustomExceptionHandler.java b/src/main/java/com/gabojait/gabojaitspring/common/exception/CustomExceptionHandler.java index 9663b665..e6cf0074 100644 --- a/src/main/java/com/gabojait/gabojaitspring/common/exception/CustomExceptionHandler.java +++ b/src/main/java/com/gabojait/gabojaitspring/common/exception/CustomExceptionHandler.java @@ -21,7 +21,7 @@ import javax.validation.ConstraintViolationException; import java.util.Objects; -import static com.gabojait.gabojaitspring.common.code.ErrorCode.*; +import static com.gabojait.gabojaitspring.common.constant.code.ErrorCode.*; import static org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR; import static org.springframework.http.HttpStatus.PAYLOAD_TOO_LARGE; diff --git a/src/main/java/com/gabojait/gabojaitspring/common/response/ExceptionResponse.java b/src/main/java/com/gabojait/gabojaitspring/common/response/ExceptionResponse.java index 659d9aed..eab2385b 100644 --- a/src/main/java/com/gabojait/gabojaitspring/common/response/ExceptionResponse.java +++ b/src/main/java/com/gabojait/gabojaitspring/common/response/ExceptionResponse.java @@ -1,7 +1,7 @@ package com.gabojait.gabojaitspring.common.response; -import com.gabojait.gabojaitspring.common.code.ErrorCode; +import com.gabojait.gabojaitspring.common.constant.code.ErrorCode; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Builder; diff --git a/src/main/java/com/gabojait/gabojaitspring/common/util/EmailUtility.java b/src/main/java/com/gabojait/gabojaitspring/common/util/EmailUtility.java index f6f373ba..f86c55e8 100644 --- a/src/main/java/com/gabojait/gabojaitspring/common/util/EmailUtility.java +++ b/src/main/java/com/gabojait/gabojaitspring/common/util/EmailUtility.java @@ -11,7 +11,7 @@ import javax.mail.MessagingException; import javax.mail.internet.MimeMessage; -import static com.gabojait.gabojaitspring.common.code.ErrorCode.EMAIL_SEND_ERROR; +import static com.gabojait.gabojaitspring.common.constant.code.ErrorCode.EMAIL_SEND_ERROR; @Component @RequiredArgsConstructor diff --git a/src/main/java/com/gabojait/gabojaitspring/common/util/FileUtility.java b/src/main/java/com/gabojait/gabojaitspring/common/util/FileUtility.java index e52fec23..8c918afe 100644 --- a/src/main/java/com/gabojait/gabojaitspring/common/util/FileUtility.java +++ b/src/main/java/com/gabojait/gabojaitspring/common/util/FileUtility.java @@ -12,9 +12,10 @@ import java.io.File; import java.io.FileOutputStream; import java.io.IOException; +import java.net.URL; import java.util.Objects; -import static com.gabojait.gabojaitspring.common.code.ErrorCode.*; +import static com.gabojait.gabojaitspring.common.constant.code.ErrorCode.*; @Component @RequiredArgsConstructor @@ -43,20 +44,20 @@ public String upload(String bucketName, File file = convertMultipartToFile(multipartFile); String folderFileName = folderName + "/" + fileName; - String url; + URL url; try { amazonS3Client.putObject(new PutObjectRequest(bucketName, folderFileName, file) .withCannedAcl(CannedAccessControlList.PublicRead)); - url = amazonS3Client.getUrl(bucketName, folderFileName).toString(); + url = amazonS3Client.getUrl(bucketName, folderFileName); } catch (AmazonServiceException e) { throw new CustomException(SERVER_ERROR, e.getCause()); } file.delete(); - return url; + return url.toString(); } /** diff --git a/src/main/java/com/gabojait/gabojaitspring/config/FcmConfig.java b/src/main/java/com/gabojait/gabojaitspring/config/FcmConfig.java index ccda107a..544ea101 100644 --- a/src/main/java/com/gabojait/gabojaitspring/config/FcmConfig.java +++ b/src/main/java/com/gabojait/gabojaitspring/config/FcmConfig.java @@ -11,7 +11,7 @@ import java.io.ByteArrayInputStream; import java.io.IOException; -import static com.gabojait.gabojaitspring.common.code.ErrorCode.SERVER_ERROR; +import static com.gabojait.gabojaitspring.common.constant.code.ErrorCode.SERVER_ERROR; @Configuration public class FcmConfig { diff --git a/src/main/java/com/gabojait/gabojaitspring/config/auth/CustomAuthenticationEntryPoint.java b/src/main/java/com/gabojait/gabojaitspring/config/auth/CustomAuthenticationEntryPoint.java index 38e37fbc..632e33f7 100644 --- a/src/main/java/com/gabojait/gabojaitspring/config/auth/CustomAuthenticationEntryPoint.java +++ b/src/main/java/com/gabojait/gabojaitspring/config/auth/CustomAuthenticationEntryPoint.java @@ -14,8 +14,8 @@ import java.io.IOException; import java.io.OutputStream; -import static com.gabojait.gabojaitspring.common.code.ErrorCode.SERVER_ERROR; -import static com.gabojait.gabojaitspring.common.code.ErrorCode.TOKEN_UNAUTHENTICATED; +import static com.gabojait.gabojaitspring.common.constant.code.ErrorCode.SERVER_ERROR; +import static com.gabojait.gabojaitspring.common.constant.code.ErrorCode.TOKEN_UNAUTHENTICATED; @Component @RequiredArgsConstructor diff --git a/src/main/java/com/gabojait/gabojaitspring/config/auth/JwtProvider.java b/src/main/java/com/gabojait/gabojaitspring/config/auth/JwtProvider.java index 0cc0954d..5d25bb27 100644 --- a/src/main/java/com/gabojait/gabojaitspring/config/auth/JwtProvider.java +++ b/src/main/java/com/gabojait/gabojaitspring/config/auth/JwtProvider.java @@ -21,7 +21,7 @@ import java.util.List; import java.util.stream.Collectors; -import static com.gabojait.gabojaitspring.common.code.ErrorCode.TOKEN_UNAUTHENTICATED; +import static com.gabojait.gabojaitspring.common.constant.code.ErrorCode.TOKEN_UNAUTHENTICATED; @Component @RequiredArgsConstructor diff --git a/src/main/java/com/gabojait/gabojaitspring/domain/team/Team.java b/src/main/java/com/gabojait/gabojaitspring/domain/team/Team.java index a4b2d772..2f1c37c4 100644 --- a/src/main/java/com/gabojait/gabojaitspring/domain/team/Team.java +++ b/src/main/java/com/gabojait/gabojaitspring/domain/team/Team.java @@ -9,7 +9,7 @@ import java.time.LocalDateTime; import java.util.Objects; -import static com.gabojait.gabojaitspring.common.code.ErrorCode.*; +import static com.gabojait.gabojaitspring.common.constant.code.ErrorCode.*; @Getter @Entity diff --git a/src/main/java/com/gabojait/gabojaitspring/domain/team/TeamMember.java b/src/main/java/com/gabojait/gabojaitspring/domain/team/TeamMember.java index d316db81..105532fe 100644 --- a/src/main/java/com/gabojait/gabojaitspring/domain/team/TeamMember.java +++ b/src/main/java/com/gabojait/gabojaitspring/domain/team/TeamMember.java @@ -10,8 +10,8 @@ import java.time.LocalDateTime; import java.util.Objects; -import static com.gabojait.gabojaitspring.common.code.ErrorCode.TEAM_LEADER_UNAVAILABLE; -import static com.gabojait.gabojaitspring.common.code.ErrorCode.UNREGISTER_UNAVAILABLE; +import static com.gabojait.gabojaitspring.common.constant.code.ErrorCode.TEAM_LEADER_UNAVAILABLE; +import static com.gabojait.gabojaitspring.common.constant.code.ErrorCode.UNREGISTER_UNAVAILABLE; @Getter @Entity diff --git a/src/test/java/com/gabojait/gabojaitspring/api/controller/develop/DevelopControllerTest.java b/src/test/java/com/gabojait/gabojaitspring/api/controller/develop/DevelopControllerTest.java index 8fb6f278..ccda88f9 100644 --- a/src/test/java/com/gabojait/gabojaitspring/api/controller/develop/DevelopControllerTest.java +++ b/src/test/java/com/gabojait/gabojaitspring/api/controller/develop/DevelopControllerTest.java @@ -15,9 +15,9 @@ import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.ResultActions; -import static com.gabojait.gabojaitspring.common.code.ErrorCode.SERVER_ERROR; -import static com.gabojait.gabojaitspring.common.code.ErrorCode.TESTER_ID_POSITIVE_ONLY; -import static com.gabojait.gabojaitspring.common.code.SuccessCode.*; +import static com.gabojait.gabojaitspring.common.constant.code.ErrorCode.SERVER_ERROR; +import static com.gabojait.gabojaitspring.common.constant.code.ErrorCode.TESTER_ID_POSITIVE_ONLY; +import static com.gabojait.gabojaitspring.common.constant.code.SuccessCode.*; import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.when; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; diff --git a/src/test/java/com/gabojait/gabojaitspring/api/controller/favorite/FavoriteControllerTest.java b/src/test/java/com/gabojait/gabojaitspring/api/controller/favorite/FavoriteControllerTest.java index fd780eb8..c2bc475e 100644 --- a/src/test/java/com/gabojait/gabojaitspring/api/controller/favorite/FavoriteControllerTest.java +++ b/src/test/java/com/gabojait/gabojaitspring/api/controller/favorite/FavoriteControllerTest.java @@ -15,8 +15,8 @@ import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.ResultActions; -import static com.gabojait.gabojaitspring.common.code.ErrorCode.*; -import static com.gabojait.gabojaitspring.common.code.SuccessCode.*; +import static com.gabojait.gabojaitspring.common.constant.code.ErrorCode.*; +import static com.gabojait.gabojaitspring.common.constant.code.SuccessCode.*; import static org.springframework.http.MediaType.APPLICATION_JSON; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; diff --git a/src/test/java/com/gabojait/gabojaitspring/api/controller/notification/NotificationControllerTest.java b/src/test/java/com/gabojait/gabojaitspring/api/controller/notification/NotificationControllerTest.java index 251df0ed..dbf7033c 100644 --- a/src/test/java/com/gabojait/gabojaitspring/api/controller/notification/NotificationControllerTest.java +++ b/src/test/java/com/gabojait/gabojaitspring/api/controller/notification/NotificationControllerTest.java @@ -14,9 +14,9 @@ import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.ResultActions; -import static com.gabojait.gabojaitspring.common.code.ErrorCode.*; -import static com.gabojait.gabojaitspring.common.code.SuccessCode.NOTIFICATIONS_FOUND; -import static com.gabojait.gabojaitspring.common.code.SuccessCode.NOTIFICATION_READ; +import static com.gabojait.gabojaitspring.common.constant.code.ErrorCode.*; +import static com.gabojait.gabojaitspring.common.constant.code.SuccessCode.NOTIFICATIONS_FOUND; +import static com.gabojait.gabojaitspring.common.constant.code.SuccessCode.NOTIFICATION_READ; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; diff --git a/src/test/java/com/gabojait/gabojaitspring/api/controller/offer/OfferControllerTest.java b/src/test/java/com/gabojait/gabojaitspring/api/controller/offer/OfferControllerTest.java index 6e0b4728..e23ae0ec 100644 --- a/src/test/java/com/gabojait/gabojaitspring/api/controller/offer/OfferControllerTest.java +++ b/src/test/java/com/gabojait/gabojaitspring/api/controller/offer/OfferControllerTest.java @@ -17,8 +17,8 @@ import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.ResultActions; -import static com.gabojait.gabojaitspring.common.code.ErrorCode.*; -import static com.gabojait.gabojaitspring.common.code.SuccessCode.*; +import static com.gabojait.gabojaitspring.common.constant.code.ErrorCode.*; +import static com.gabojait.gabojaitspring.common.constant.code.SuccessCode.*; import static org.springframework.http.MediaType.APPLICATION_JSON; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print; diff --git a/src/test/java/com/gabojait/gabojaitspring/api/controller/profile/ProfileControllerTest.java b/src/test/java/com/gabojait/gabojaitspring/api/controller/profile/ProfileControllerTest.java index 40cc08dc..aa574390 100644 --- a/src/test/java/com/gabojait/gabojaitspring/api/controller/profile/ProfileControllerTest.java +++ b/src/test/java/com/gabojait/gabojaitspring/api/controller/profile/ProfileControllerTest.java @@ -23,8 +23,8 @@ import java.time.LocalDate; import java.util.List; -import static com.gabojait.gabojaitspring.common.code.ErrorCode.*; -import static com.gabojait.gabojaitspring.common.code.SuccessCode.*; +import static com.gabojait.gabojaitspring.common.constant.code.ErrorCode.*; +import static com.gabojait.gabojaitspring.common.constant.code.SuccessCode.*; import static org.springframework.http.MediaType.APPLICATION_JSON; import static org.springframework.http.MediaType.MULTIPART_FORM_DATA_VALUE; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; diff --git a/src/test/java/com/gabojait/gabojaitspring/api/controller/review/ReviewControllerTest.java b/src/test/java/com/gabojait/gabojaitspring/api/controller/review/ReviewControllerTest.java index d84fcf43..3921957d 100644 --- a/src/test/java/com/gabojait/gabojaitspring/api/controller/review/ReviewControllerTest.java +++ b/src/test/java/com/gabojait/gabojaitspring/api/controller/review/ReviewControllerTest.java @@ -19,8 +19,8 @@ import java.util.List; import java.util.stream.Collectors; -import static com.gabojait.gabojaitspring.common.code.ErrorCode.*; -import static com.gabojait.gabojaitspring.common.code.SuccessCode.*; +import static com.gabojait.gabojaitspring.common.constant.code.ErrorCode.*; +import static com.gabojait.gabojaitspring.common.constant.code.SuccessCode.*; import static org.springframework.http.MediaType.APPLICATION_JSON; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; diff --git a/src/test/java/com/gabojait/gabojaitspring/api/controller/team/TeamControllerTest.java b/src/test/java/com/gabojait/gabojaitspring/api/controller/team/TeamControllerTest.java index 629511e3..8e66ddde 100644 --- a/src/test/java/com/gabojait/gabojaitspring/api/controller/team/TeamControllerTest.java +++ b/src/test/java/com/gabojait/gabojaitspring/api/controller/team/TeamControllerTest.java @@ -19,8 +19,8 @@ import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.ResultActions; -import static com.gabojait.gabojaitspring.common.code.ErrorCode.*; -import static com.gabojait.gabojaitspring.common.code.SuccessCode.*; +import static com.gabojait.gabojaitspring.common.constant.code.ErrorCode.*; +import static com.gabojait.gabojaitspring.common.constant.code.SuccessCode.*; import static org.springframework.http.MediaType.APPLICATION_JSON; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print; diff --git a/src/test/java/com/gabojait/gabojaitspring/api/controller/user/ContactControllerTest.java b/src/test/java/com/gabojait/gabojaitspring/api/controller/user/ContactControllerTest.java index f7598698..d37863f3 100644 --- a/src/test/java/com/gabojait/gabojaitspring/api/controller/user/ContactControllerTest.java +++ b/src/test/java/com/gabojait/gabojaitspring/api/controller/user/ContactControllerTest.java @@ -16,9 +16,9 @@ import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.ResultActions; -import static com.gabojait.gabojaitspring.common.code.ErrorCode.*; -import static com.gabojait.gabojaitspring.common.code.SuccessCode.EMAIL_VERIFIED; -import static com.gabojait.gabojaitspring.common.code.SuccessCode.VERIFICATION_CODE_SENT; +import static com.gabojait.gabojaitspring.common.constant.code.ErrorCode.*; +import static com.gabojait.gabojaitspring.common.constant.code.SuccessCode.EMAIL_VERIFIED; +import static com.gabojait.gabojaitspring.common.constant.code.SuccessCode.VERIFICATION_CODE_SENT; import static org.springframework.http.MediaType.APPLICATION_JSON; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.patch; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; diff --git a/src/test/java/com/gabojait/gabojaitspring/api/controller/user/UserControllerTest.java b/src/test/java/com/gabojait/gabojaitspring/api/controller/user/UserControllerTest.java index 7e907c60..282a94c4 100644 --- a/src/test/java/com/gabojait/gabojaitspring/api/controller/user/UserControllerTest.java +++ b/src/test/java/com/gabojait/gabojaitspring/api/controller/user/UserControllerTest.java @@ -23,8 +23,8 @@ import java.time.LocalDate; import java.time.LocalDateTime; -import static com.gabojait.gabojaitspring.common.code.ErrorCode.*; -import static com.gabojait.gabojaitspring.common.code.SuccessCode.*; +import static com.gabojait.gabojaitspring.common.constant.code.ErrorCode.*; +import static com.gabojait.gabojaitspring.common.constant.code.SuccessCode.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.Mockito.when; diff --git a/src/test/java/com/gabojait/gabojaitspring/api/service/develop/DevelopServiceTest.java b/src/test/java/com/gabojait/gabojaitspring/api/service/develop/DevelopServiceTest.java index 9449c147..f74b5cb9 100644 --- a/src/test/java/com/gabojait/gabojaitspring/api/service/develop/DevelopServiceTest.java +++ b/src/test/java/com/gabojait/gabojaitspring/api/service/develop/DevelopServiceTest.java @@ -27,7 +27,7 @@ import java.time.LocalDateTime; import java.util.List; -import static com.gabojait.gabojaitspring.common.code.ErrorCode.TESTER_NOT_FOUND; +import static com.gabojait.gabojaitspring.common.constant.code.ErrorCode.TESTER_NOT_FOUND; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.assertj.core.groups.Tuple.tuple; diff --git a/src/test/java/com/gabojait/gabojaitspring/api/service/favorite/FavoriteServiceTest.java b/src/test/java/com/gabojait/gabojaitspring/api/service/favorite/FavoriteServiceTest.java index c23ae336..3c6063fb 100644 --- a/src/test/java/com/gabojait/gabojaitspring/api/service/favorite/FavoriteServiceTest.java +++ b/src/test/java/com/gabojait/gabojaitspring/api/service/favorite/FavoriteServiceTest.java @@ -27,7 +27,7 @@ import java.util.List; import java.util.Optional; -import static com.gabojait.gabojaitspring.common.code.ErrorCode.USER_NOT_FOUND; +import static com.gabojait.gabojaitspring.common.constant.code.ErrorCode.USER_NOT_FOUND; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.assertj.core.groups.Tuple.tuple; diff --git a/src/test/java/com/gabojait/gabojaitspring/api/service/notification/NotificationServiceTest.java b/src/test/java/com/gabojait/gabojaitspring/api/service/notification/NotificationServiceTest.java index c200fdbc..2b8506b4 100644 --- a/src/test/java/com/gabojait/gabojaitspring/api/service/notification/NotificationServiceTest.java +++ b/src/test/java/com/gabojait/gabojaitspring/api/service/notification/NotificationServiceTest.java @@ -1,7 +1,7 @@ package com.gabojait.gabojaitspring.api.service.notification; -import com.gabojait.gabojaitspring.common.response.PageData; import com.gabojait.gabojaitspring.api.dto.notification.response.NotificationPageResponse; +import com.gabojait.gabojaitspring.common.response.PageData; import com.gabojait.gabojaitspring.domain.notification.Notification; import com.gabojait.gabojaitspring.domain.notification.NotificationType; import com.gabojait.gabojaitspring.domain.offer.Offer; @@ -18,6 +18,7 @@ import com.gabojait.gabojaitspring.repository.team.TeamRepository; import com.gabojait.gabojaitspring.repository.user.ContactRepository; import com.gabojait.gabojaitspring.repository.user.UserRepository; +import com.google.firebase.FirebaseApp; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -32,7 +33,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.groups.Tuple.tuple; -import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertAll; @ActiveProfiles("test") @SpringBootTest @@ -46,9 +47,10 @@ class NotificationServiceTest { @Autowired private UserRepository userRepository; @Autowired private ContactRepository contactRepository; @Autowired private OfferRepository offerRepository; + @Autowired private FirebaseApp firebaseApp; @Test - @DisplayName("알림 페이징 조회를 한다.") + @DisplayName("알림 페이징 조회가 정상 작동한다") void givenValid_whenFindPageNotifications_thenReturn() { // given User user = createSavedDefaultUser("tester@gabojait.com", "tester", "테스터"); @@ -65,23 +67,24 @@ void givenValid_whenFindPageNotifications_thenReturn() { notificationService.findPageNotifications(user.getId(), pageFrom, pageSize); // then - assertThat(responses.getData()) - .extracting("notificationId", "notificationType", "title", "body", "isRead", "createdAt", "updatedAt") - .containsExactly( - tuple(notification3.getId(), notification3.getNotificationType(), notification3.getTitle(), - notification3.getBody(), notification3.getIsRead(), notification3.getCreatedAt(), - notification3.getUpdatedAt()), - tuple(notification2.getId(), notification2.getNotificationType(), notification2.getTitle(), - notification2.getBody(), notification2.getIsRead(), notification2.getCreatedAt(), - notification2.getUpdatedAt()) - ); - - assertEquals(pageSize, responses.getData().size()); - assertEquals(3L, responses.getTotal()); + assertAll( + () -> assertThat(responses.getData()) + .extracting("notificationId", "notificationType", "title", "body", "isRead", "createdAt", "updatedAt") + .containsExactly( + tuple(notification3.getId(), notification3.getNotificationType(), notification3.getTitle(), + notification3.getBody(), notification3.getIsRead(), notification3.getCreatedAt(), + notification3.getUpdatedAt()), + tuple(notification2.getId(), notification2.getNotificationType(), notification2.getTitle(), + notification2.getBody(), notification2.getIsRead(), notification2.getCreatedAt(), + notification2.getUpdatedAt()) + ), + () -> assertThat(responses.getData().size()).isEqualTo(pageSize), + () -> assertThat(responses.getTotal()).isEqualTo(3) + ); } @Test - @DisplayName("알림 읽기를 한다.") + @DisplayName("알림 읽기가 정상 작동한다") void giveValid_whenReadNotification_thenReturn() { // given User user = createSavedDefaultUser("tester@gabojait.com", "tester", "테스터"); @@ -99,7 +102,7 @@ void giveValid_whenReadNotification_thenReturn() { } @Test - @DisplayName("이미 읽은 알림으로 알림 읽기를 한다.") + @DisplayName("이미 읽은 알림으로 알림 읽기가 정상 작동한다") void giveRead_whenReadNotification_thenReturn() { // given User user = createSavedDefaultUser("tester@gabojait.com", "tester", "테스터"); @@ -118,13 +121,13 @@ void giveRead_whenReadNotification_thenReturn() { } @Test - @DisplayName("새 팀원 합류 알림을 전송한다.") + @DisplayName("새 팀원 합류 알림 전송이 정상 작동한다") void givenValid_whenSendTeamMemberJoin_thenReturn() { // given User user1 = createSavedDefaultUser("tester1@gabojait.com", "tester1", "테스터일"); User user2 = createSavedDefaultUser("tester2@gabojait.com", "tester2", "테스터이"); User user3 = createSavedDefaultUser("tester3@gabojait.com", "tester3", "테스터삼"); - Team team = createSavedTeam("가보자잇", (byte) 3); + Team team = createSavedTeam(); createSavedTeamMember(Position.MANAGER, true, user1, team); createSavedTeamMember(Position.DESIGNER, false, user2, team); @@ -139,36 +142,38 @@ void givenValid_whenSendTeamMemberJoin_thenReturn() { List notifications2 = notificationRepository.findAllByUser(user2); List notifications3 = notificationRepository.findAllByUser(user3); - assertThat(notifications1) - .extracting("notificationType", "title", "body", "isRead", "isDeleted") - .containsExactlyInAnyOrder( - tuple(NotificationType.NEW_TEAM_MEMBER, "새로운 " + offer.getPosition().getText() + " 합류", - user3.getNickname() + "님이 " + offer.getPosition().getText() + "로 팀에 합류하였어요.", false, - false) - ); - assertThat(notifications2) - .extracting("notificationType", "title", "body", "isRead", "isDeleted") - .containsExactlyInAnyOrder( - tuple(NotificationType.NEW_TEAM_MEMBER, "새로운 " + offer.getPosition().getText() + " 합류", - user3.getNickname() + "님이 " + offer.getPosition().getText() + "로 팀에 합류하였어요.", false, - false) - ); - assertThat(notifications3) - .extracting("notificationType", "title", "body", "isRead", "isDeleted") - .containsExactlyInAnyOrder( - tuple(NotificationType.NEW_TEAM_MEMBER, team.getProjectName() + "팀 합류", - offer.getPosition().getText() + "로서 역량을 펼쳐보세요!", false, false) - ); + assertAll( + () -> assertThat(notifications1) + .extracting("notificationType", "title", "body", "isRead", "isDeleted") + .containsExactlyInAnyOrder( + tuple(NotificationType.NEW_TEAM_MEMBER, "새로운 " + offer.getPosition().getText() + " 합류", + user3.getNickname() + "님이 " + offer.getPosition().getText() + "로 팀에 합류하였어요.", false, + false) + ), + () -> assertThat(notifications2) + .extracting("notificationType", "title", "body", "isRead", "isDeleted") + .containsExactlyInAnyOrder( + tuple(NotificationType.NEW_TEAM_MEMBER, "새로운 " + offer.getPosition().getText() + " 합류", + user3.getNickname() + "님이 " + offer.getPosition().getText() + "로 팀에 합류하였어요.", false, + false) + ), + () -> assertThat(notifications3) + .extracting("notificationType", "title", "body", "isRead", "isDeleted") + .containsExactlyInAnyOrder( + tuple(NotificationType.NEW_TEAM_MEMBER, team.getProjectName() + "팀 합류", + offer.getPosition().getText() + "로서 역량을 펼쳐보세요!", false, false) + ) + ); } @Test - @DisplayName("팀원 추방 알림을 전송한다.") + @DisplayName("팀원 추방 알림 전송이 정상 작동한다") void givenValid_whenSendTeamMemberFired_thenReturn() { // given User user1 = createSavedDefaultUser("tester1@gabojait.com", "tester1", "테스터일"); User user2 = createSavedDefaultUser("tester2@gabojait.com", "tester2", "테스터이"); User user3 = createSavedDefaultUser("tester3@gabojait.com", "tester3", "테스터삼"); - Team team = createSavedTeam("가보자잇", (byte) 3); + Team team = createSavedTeam(); createSavedTeamMember(Position.MANAGER, true, user1, team); createSavedTeamMember(Position.DESIGNER, false, user2, team); @@ -182,34 +187,36 @@ void givenValid_whenSendTeamMemberFired_thenReturn() { List notifications2 = notificationRepository.findAllByUser(user2); List notifications3 = notificationRepository.findAllByUser(user3); - assertThat(notifications1) - .extracting("notificationType", "title", "body", "isRead", "isDeleted") - .containsExactlyInAnyOrder( - tuple(NotificationType.FIRED_TEAM_MEMBER, user3.getNickname() + "님 팀에서 추방", - user3.getNickname() + "님이 팀장에 의해 추방되었어요.", false, false) - ); - assertThat(notifications2) - .extracting("notificationType", "title", "body", "isRead", "isDeleted") - .containsExactlyInAnyOrder( - tuple(NotificationType.FIRED_TEAM_MEMBER, user3.getNickname() + "님 팀에서 추방", - user3.getNickname() + "님이 팀장에 의해 추방되었어요.", false, false) - ); - assertThat(notifications3) - .extracting("notificationType", "title", "body", "isRead", "isDeleted") - .containsExactlyInAnyOrder( - tuple(NotificationType.FIRED_TEAM_MEMBER, team.getProjectName() + "팀에서 추방", - team.getProjectName() + "팀에서 추방 되었어요. 아쉽지만 새로운 팀을 찾아보세요.", false, false) - ); + assertAll( + () -> assertThat(notifications1) + .extracting("notificationType", "title", "body", "isRead", "isDeleted") + .containsExactlyInAnyOrder( + tuple(NotificationType.FIRED_TEAM_MEMBER, user3.getNickname() + "님 팀에서 추방", + user3.getNickname() + "님이 팀장에 의해 추방되었어요.", false, false) + ), + () -> assertThat(notifications2) + .extracting("notificationType", "title", "body", "isRead", "isDeleted") + .containsExactlyInAnyOrder( + tuple(NotificationType.FIRED_TEAM_MEMBER, user3.getNickname() + "님 팀에서 추방", + user3.getNickname() + "님이 팀장에 의해 추방되었어요.", false, false) + ), + () -> assertThat(notifications3) + .extracting("notificationType", "title", "body", "isRead", "isDeleted") + .containsExactlyInAnyOrder( + tuple(NotificationType.FIRED_TEAM_MEMBER, team.getProjectName() + "팀에서 추방", + team.getProjectName() + "팀에서 추방 되었어요. 아쉽지만 새로운 팀을 찾아보세요.", false, false) + ) + ); } @Test - @DisplayName("팀원 탈퇴 알림을 전송한다.") + @DisplayName("팀원 탈퇴 알림 전송이 정상 작동한다") void givenValid_whenSendTeamMemberQuit_thenReturn() { // given User user1 = createSavedDefaultUser("tester1@gabojait.com", "tester1", "테스터일"); User user2 = createSavedDefaultUser("tester2@gabojait.com", "tester2", "테스터이"); User user3 = createSavedDefaultUser("tester3@gabojait.com", "tester3", "테스터삼"); - Team team = createSavedTeam("가보자잇", (byte) 3); + Team team = createSavedTeam(); createSavedTeamMember(Position.MANAGER, true, user1, team); createSavedTeamMember(Position.DESIGNER, false, user2, team); @@ -223,29 +230,31 @@ void givenValid_whenSendTeamMemberQuit_thenReturn() { List notifications2 = notificationRepository.findAllByUser(user2); List notifications3 = notificationRepository.findAllByUser(user3); - assertThat(notifications1) - .extracting("notificationType", "title", "body", "isRead", "isDeleted") - .containsExactlyInAnyOrder( - tuple(NotificationType.QUIT_TEAM_MEMBER, user3.getNickname() + "님 팀 탈퇴", - user3.getNickname() + "님이 팀에서 탈퇴하였습니다.", false, false) - ); - assertThat(notifications2) - .extracting("notificationType", "title", "body", "isRead", "isDeleted") - .containsExactlyInAnyOrder( - tuple(NotificationType.QUIT_TEAM_MEMBER, user3.getNickname() + "님 팀 탈퇴", - user3.getNickname() + "님이 팀에서 탈퇴하였습니다.", false, false) - ); - assertThat(notifications3).isEmpty(); + assertAll( + () -> assertThat(notifications1) + .extracting("notificationType", "title", "body", "isRead", "isDeleted") + .containsExactlyInAnyOrder( + tuple(NotificationType.QUIT_TEAM_MEMBER, user3.getNickname() + "님 팀 탈퇴", + user3.getNickname() + "님이 팀에서 탈퇴하였습니다.", false, false) + ), + () -> assertThat(notifications2) + .extracting("notificationType", "title", "body", "isRead", "isDeleted") + .containsExactlyInAnyOrder( + tuple(NotificationType.QUIT_TEAM_MEMBER, user3.getNickname() + "님 팀 탈퇴", + user3.getNickname() + "님이 팀에서 탈퇴하였습니다.", false, false) + ), + () -> assertThat(notifications3).isEmpty() + ); } @Test - @DisplayName("팀 해산 알림을 전송한다.") + @DisplayName("팀 해산 알림 전송이 정상 작동한다") void givenValid_whenSendTeamIncomplete_thenReturn() { // given User user1 = createSavedDefaultUser("tester1@gabojait.com", "tester1", "테스터일"); User user2 = createSavedDefaultUser("tester2@gabojait.com", "tester2", "테스터이"); User user3 = createSavedDefaultUser("tester3@gabojait.com", "tester3", "테스터삼"); - Team team = createSavedTeam("가보자잇", (byte) 3); + Team team = createSavedTeam(); createSavedTeamMember(Position.MANAGER, true, user1, team); createSavedTeamMember(Position.DESIGNER, false, user2, team); @@ -259,34 +268,36 @@ void givenValid_whenSendTeamIncomplete_thenReturn() { List notifications2 = notificationRepository.findAllByUser(user2); List notifications3 = notificationRepository.findAllByUser(user3); - assertThat(notifications1) - .extracting("notificationType", "title", "body", "isRead", "isDeleted") - .containsExactlyInAnyOrder( - tuple(NotificationType.TEAM_INCOMPLETE, team.getProjectName() + "팀 해산", - "아쉽지만 팀장에 의해 " + team.getProjectName() + "팀이 해산 되었어요.", false, false) - ); - assertThat(notifications2) - .extracting("notificationType", "title", "body", "isRead", "isDeleted") - .containsExactlyInAnyOrder( - tuple(NotificationType.TEAM_INCOMPLETE, team.getProjectName() + "팀 해산", - "아쉽지만 팀장에 의해 " + team.getProjectName() + "팀이 해산 되었어요.", false, false) - ); - assertThat(notifications3) - .extracting("notificationType", "title", "body", "isRead", "isDeleted") - .containsExactlyInAnyOrder( - tuple(NotificationType.TEAM_INCOMPLETE, team.getProjectName() + "팀 해산", - "아쉽지만 팀장에 의해 " + team.getProjectName() + "팀이 해산 되었어요.", false, false) - ); + assertAll( + () -> assertThat(notifications1) + .extracting("notificationType", "title", "body", "isRead", "isDeleted") + .containsExactlyInAnyOrder( + tuple(NotificationType.TEAM_INCOMPLETE, team.getProjectName() + "팀 해산", + "아쉽지만 팀장에 의해 " + team.getProjectName() + "팀이 해산 되었어요.", false, false) + ), + () -> assertThat(notifications2) + .extracting("notificationType", "title", "body", "isRead", "isDeleted") + .containsExactlyInAnyOrder( + tuple(NotificationType.TEAM_INCOMPLETE, team.getProjectName() + "팀 해산", + "아쉽지만 팀장에 의해 " + team.getProjectName() + "팀이 해산 되었어요.", false, false) + ), + () -> assertThat(notifications3) + .extracting("notificationType", "title", "body", "isRead", "isDeleted") + .containsExactlyInAnyOrder( + tuple(NotificationType.TEAM_INCOMPLETE, team.getProjectName() + "팀 해산", + "아쉽지만 팀장에 의해 " + team.getProjectName() + "팀이 해산 되었어요.", false, false) + ) + ); } @Test - @DisplayName("팀 완료 알림을 전송한다.") + @DisplayName("팀 완료 알림 전송이 정상 작동한다") void givenValid_whenSendTeamComplete_thenReturn() { // given User user1 = createSavedDefaultUser("tester1@gabojait.com", "tester1", "테스터일"); User user2 = createSavedDefaultUser("tester2@gabojait.com", "tester2", "테스터이"); User user3 = createSavedDefaultUser("tester3@gabojait.com", "tester3", "테스터삼"); - Team team = createSavedTeam("가보자잇", (byte) 3); + Team team = createSavedTeam(); createSavedTeamMember(Position.MANAGER, true, user1, team); createSavedTeamMember(Position.DESIGNER, false, user2, team); @@ -300,34 +311,36 @@ void givenValid_whenSendTeamComplete_thenReturn() { List notifications2 = notificationRepository.findAllByUser(user2); List notifications3 = notificationRepository.findAllByUser(user3); - assertThat(notifications1) - .extracting("notificationType", "title", "body", "isRead", "isDeleted") - .containsExactlyInAnyOrder( - tuple(NotificationType.TEAM_COMPLETE, team.getProjectName() + " 프로젝트 완료", - "수고하셨어요! 프로젝트를 완료했어요. 팀원 리뷰를 작성해보세요!", false, false) - ); - assertThat(notifications2) - .extracting("notificationType", "title", "body", "isRead", "isDeleted") - .containsExactlyInAnyOrder( - tuple(NotificationType.TEAM_COMPLETE, team.getProjectName() + " 프로젝트 완료", - "수고하셨어요! 프로젝트를 완료했어요. 팀원 리뷰를 작성해보세요!", false, false) - ); - assertThat(notifications3) - .extracting("notificationType", "title", "body", "isRead", "isDeleted") - .containsExactlyInAnyOrder( - tuple(NotificationType.TEAM_COMPLETE, team.getProjectName() + " 프로젝트 완료", - "수고하셨어요! 프로젝트를 완료했어요. 팀원 리뷰를 작성해보세요!", false, false) - ); + assertAll( + () -> assertThat(notifications1) + .extracting("notificationType", "title", "body", "isRead", "isDeleted") + .containsExactlyInAnyOrder( + tuple(NotificationType.TEAM_COMPLETE, team.getProjectName() + " 프로젝트 완료", + "수고하셨어요! 프로젝트를 완료했어요. 팀원 리뷰를 작성해보세요!", false, false) + ), + () -> assertThat(notifications2) + .extracting("notificationType", "title", "body", "isRead", "isDeleted") + .containsExactlyInAnyOrder( + tuple(NotificationType.TEAM_COMPLETE, team.getProjectName() + " 프로젝트 완료", + "수고하셨어요! 프로젝트를 완료했어요. 팀원 리뷰를 작성해보세요!", false, false) + ), + () -> assertThat(notifications3) + .extracting("notificationType", "title", "body", "isRead", "isDeleted") + .containsExactlyInAnyOrder( + tuple(NotificationType.TEAM_COMPLETE, team.getProjectName() + " 프로젝트 완료", + "수고하셨어요! 프로젝트를 완료했어요. 팀원 리뷰를 작성해보세요!", false, false) + ) + ); } @Test - @DisplayName("팀 프로필 수정 알림을 전송한다.") + @DisplayName("팀 프로필 수정 알림 전송이 정상 작동한다") void givenValid_whenSendTeamProfileUpdated_thenReturn() { // given User user1 = createSavedDefaultUser("tester1@gabojait.com", "tester1", "테스터일"); User user2 = createSavedDefaultUser("tester2@gabojait.com", "tester2", "테스터이"); User user3 = createSavedDefaultUser("tester3@gabojait.com", "tester3", "테스터삼"); - Team team = createSavedTeam("가보자잇", (byte) 3); + Team team = createSavedTeam(); createSavedTeamMember(Position.MANAGER, true, user1, team); createSavedTeamMember(Position.DESIGNER, false, user2, team); @@ -341,34 +354,36 @@ void givenValid_whenSendTeamProfileUpdated_thenReturn() { List notifications2 = notificationRepository.findAllByUser(user2); List notifications3 = notificationRepository.findAllByUser(user3); - assertThat(notifications1) - .extracting("notificationType", "title", "body", "isRead", "isDeleted") - .containsExactlyInAnyOrder( - tuple(NotificationType.TEAM_PROFILE_UPDATED, team.getProjectName() + "팀 프로필 수정", - team.getProjectName() + "팀 프로필이 팀장에 의해 수정되었어요.", false, false) - ); - assertThat(notifications2) - .extracting("notificationType", "title", "body", "isRead", "isDeleted") - .containsExactlyInAnyOrder( - tuple(NotificationType.TEAM_PROFILE_UPDATED, team.getProjectName() + "팀 프로필 수정", - team.getProjectName() + "팀 프로필이 팀장에 의해 수정되었어요.", false, false) - ); - assertThat(notifications3) - .extracting("notificationType", "title", "body", "isRead", "isDeleted") - .containsExactlyInAnyOrder( - tuple(NotificationType.TEAM_PROFILE_UPDATED, team.getProjectName() + "팀 프로필 수정", - team.getProjectName() + "팀 프로필이 팀장에 의해 수정되었어요.", false, false) - ); + assertAll( + () -> assertThat(notifications1) + .extracting("notificationType", "title", "body", "isRead", "isDeleted") + .containsExactlyInAnyOrder( + tuple(NotificationType.TEAM_PROFILE_UPDATED, team.getProjectName() + "팀 프로필 수정", + team.getProjectName() + "팀 프로필이 팀장에 의해 수정되었어요.", false, false) + ), + () -> assertThat(notifications2) + .extracting("notificationType", "title", "body", "isRead", "isDeleted") + .containsExactlyInAnyOrder( + tuple(NotificationType.TEAM_PROFILE_UPDATED, team.getProjectName() + "팀 프로필 수정", + team.getProjectName() + "팀 프로필이 팀장에 의해 수정되었어요.", false, false) + ), + () -> assertThat(notifications3) + .extracting("notificationType", "title", "body", "isRead", "isDeleted") + .containsExactlyInAnyOrder( + tuple(NotificationType.TEAM_PROFILE_UPDATED, team.getProjectName() + "팀 프로필 수정", + team.getProjectName() + "팀 프로필이 팀장에 의해 수정되었어요.", false, false) + ) + ); } @Test - @DisplayName("팀이 회원에게 제안 알림을 전송한다.") + @DisplayName("팀이 회원에게 제안 알림 전송이 정상 작동한다") void givenValid_whenSendOfferByTeam_thenReturn() { // given User user1 = createSavedDefaultUser("tester1@gabojait.com", "tester1", "테스터일"); User user2 = createSavedDefaultUser("tester2@gabojait.com", "tester2", "테스터이"); User user3 = createSavedDefaultUser("tester3@gabojait.com", "tester3", "테스터삼"); - Team team = createSavedTeam("가보자잇", (byte) 3); + Team team = createSavedTeam(); createSavedTeamMember(Position.MANAGER, true, user1, team); createSavedTeamMember(Position.DESIGNER, false, user2, team); @@ -383,25 +398,27 @@ void givenValid_whenSendOfferByTeam_thenReturn() { List notifications2 = notificationRepository.findAllByUser(user2); List notifications3 = notificationRepository.findAllByUser(user3); - assertThat(notifications3) - .extracting("notificationType", "title", "body", "isRead", "isDeleted") - .containsExactlyInAnyOrder( - tuple(NotificationType.TEAM_OFFER, offer.getPosition().toString() + " 스카웃 제의", - offer.getTeam().getProjectName() + "팀에서 " + offer.getPosition().getText() + " 스카웃 제의가 왔어요!", - false, false) - ); - assertThat(notifications1).isEmpty(); - assertThat(notifications2).isEmpty(); + assertAll( + () -> assertThat(notifications3) + .extracting("notificationType", "title", "body", "isRead", "isDeleted") + .containsExactlyInAnyOrder( + tuple(NotificationType.TEAM_OFFER, offer.getPosition().toString() + " 스카웃 제의", + offer.getTeam().getProjectName() + "팀에서 " + offer.getPosition().getText() + " 스카웃 제의가 왔어요!", + false, false) + ), + () -> assertThat(notifications1).isEmpty(), + () -> assertThat(notifications2).isEmpty() + ); } @Test - @DisplayName("회원이 팀에게 제안 알림을 전송한다.") + @DisplayName("회원이 팀에게 제안 알림 전송이 정상 작동한다") void givenValid_whenSendOfferByUser_thenReturn() { // given User user1 = createSavedDefaultUser("tester1@gabojait.com", "tester1", "테스터일"); User user2 = createSavedDefaultUser("tester2@gabojait.com", "tester2", "테스터이"); User user3 = createSavedDefaultUser("tester3@gabojait.com", "tester3", "테스터삼"); - Team team = createSavedTeam("가보자잇", (byte) 3); + Team team = createSavedTeam(); createSavedTeamMember(Position.MANAGER, true, user1, team); createSavedTeamMember(Position.DESIGNER, false, user2, team); @@ -416,15 +433,17 @@ void givenValid_whenSendOfferByUser_thenReturn() { List notifications2 = notificationRepository.findAllByUser(user2); List notifications3 = notificationRepository.findAllByUser(user3); - assertThat(notifications1) - .extracting("notificationType", "title", "body", "isRead", "isDeleted") - .containsExactlyInAnyOrder( - tuple(NotificationType.USER_OFFER, offer.getPosition().getText() + " 지원", - offer.getPosition().getText() + " " + offer.getUser().getNickname() + "님이 지원을 했습니다.", - false, false) - ); - assertThat(notifications2).isEmpty(); - assertThat(notifications3).isEmpty(); + assertAll( + () -> assertThat(notifications1) + .extracting("notificationType", "title", "body", "isRead", "isDeleted") + .containsExactlyInAnyOrder( + tuple(NotificationType.USER_OFFER, offer.getPosition().getText() + " 지원", + offer.getPosition().getText() + " " + offer.getUser().getNickname() + "님이 지원을 했습니다.", + false, false) + ), + () -> assertThat(notifications2).isEmpty(), + () -> assertThat(notifications3).isEmpty() + ); } private Notification createSavedNotification(User user, NotificationType notificationType, String title, String body) { @@ -460,17 +479,17 @@ private void createSavedTeamMember(Position position, boolean isLeader, User use teamMemberRepository.save(teamMember); } - private Team createSavedTeam(String projectName, byte maxCnt) { + private Team createSavedTeam() { Team team = Team.builder() - .projectName(projectName) + .projectName("가보자잇") .projectDescription("프로젝트 설명입니다.") .expectation("열정적인 팀원을 구합니다.") .openChatUrl("kakao.com/o/gabojait") - .designerMaxCnt(maxCnt) - .backendMaxCnt(maxCnt) - .frontendMaxCnt(maxCnt) - .designerMaxCnt(maxCnt) - .managerMaxCnt(maxCnt) + .designerMaxCnt((byte) 3) + .backendMaxCnt((byte) 3) + .frontendMaxCnt((byte) 3) + .designerMaxCnt((byte) 3) + .managerMaxCnt((byte) 3) .build(); return teamRepository.save(team); diff --git a/src/test/java/com/gabojait/gabojaitspring/api/service/offer/OfferServiceTest.java b/src/test/java/com/gabojait/gabojaitspring/api/service/offer/OfferServiceTest.java index 9c95d077..29b1efd9 100644 --- a/src/test/java/com/gabojait/gabojaitspring/api/service/offer/OfferServiceTest.java +++ b/src/test/java/com/gabojait/gabojaitspring/api/service/offer/OfferServiceTest.java @@ -7,7 +7,6 @@ import com.gabojait.gabojaitspring.common.response.PageData; import com.gabojait.gabojaitspring.domain.offer.Offer; import com.gabojait.gabojaitspring.domain.offer.OfferedBy; -import com.gabojait.gabojaitspring.domain.profile.Skill; import com.gabojait.gabojaitspring.domain.team.Team; import com.gabojait.gabojaitspring.domain.team.TeamMember; import com.gabojait.gabojaitspring.domain.team.TeamMemberStatus; @@ -31,7 +30,7 @@ import java.time.LocalDateTime; import java.util.List; -import static com.gabojait.gabojaitspring.common.code.ErrorCode.*; +import static com.gabojait.gabojaitspring.common.constant.code.ErrorCode.*; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.assertj.core.groups.Tuple.tuple; diff --git a/src/test/java/com/gabojait/gabojaitspring/api/service/profile/ProfileServiceTest.java b/src/test/java/com/gabojait/gabojaitspring/api/service/profile/ProfileServiceTest.java index 4fd926a4..eda5bea6 100644 --- a/src/test/java/com/gabojait/gabojaitspring/api/service/profile/ProfileServiceTest.java +++ b/src/test/java/com/gabojait/gabojaitspring/api/service/profile/ProfileServiceTest.java @@ -39,7 +39,7 @@ import java.util.ArrayList; import java.util.List; -import static com.gabojait.gabojaitspring.common.code.ErrorCode.*; +import static com.gabojait.gabojaitspring.common.constant.code.ErrorCode.*; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.assertj.core.api.AssertionsForClassTypes.tuple; diff --git a/src/test/java/com/gabojait/gabojaitspring/api/service/review/ReviewServiceTest.java b/src/test/java/com/gabojait/gabojaitspring/api/service/review/ReviewServiceTest.java index 01894342..1096faae 100644 --- a/src/test/java/com/gabojait/gabojaitspring/api/service/review/ReviewServiceTest.java +++ b/src/test/java/com/gabojait/gabojaitspring/api/service/review/ReviewServiceTest.java @@ -31,7 +31,7 @@ import java.util.List; import java.util.stream.Collectors; -import static com.gabojait.gabojaitspring.common.code.ErrorCode.TEAM_MEMBER_NOT_FOUND; +import static com.gabojait.gabojaitspring.common.constant.code.ErrorCode.TEAM_MEMBER_NOT_FOUND; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.assertj.core.groups.Tuple.tuple; diff --git a/src/test/java/com/gabojait/gabojaitspring/api/service/team/TeamServiceTest.java b/src/test/java/com/gabojait/gabojaitspring/api/service/team/TeamServiceTest.java index 344f4a8a..ffea8263 100644 --- a/src/test/java/com/gabojait/gabojaitspring/api/service/team/TeamServiceTest.java +++ b/src/test/java/com/gabojait/gabojaitspring/api/service/team/TeamServiceTest.java @@ -37,7 +37,7 @@ import java.util.Optional; import java.util.stream.Stream; -import static com.gabojait.gabojaitspring.common.code.ErrorCode.*; +import static com.gabojait.gabojaitspring.common.constant.code.ErrorCode.*; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy; import static org.assertj.core.api.AssertionsForClassTypes.tuple; diff --git a/src/test/java/com/gabojait/gabojaitspring/api/service/user/ContactServiceTest.java b/src/test/java/com/gabojait/gabojaitspring/api/service/user/ContactServiceTest.java index ad315345..eb0ae584 100644 --- a/src/test/java/com/gabojait/gabojaitspring/api/service/user/ContactServiceTest.java +++ b/src/test/java/com/gabojait/gabojaitspring/api/service/user/ContactServiceTest.java @@ -20,7 +20,7 @@ import java.time.LocalDateTime; import java.util.Optional; -import static com.gabojait.gabojaitspring.common.code.ErrorCode.*; +import static com.gabojait.gabojaitspring.common.constant.code.ErrorCode.*; import static org.assertj.core.api.Assertions.*; import static org.assertj.core.api.Assertions.assertThatThrownBy; diff --git a/src/test/java/com/gabojait/gabojaitspring/api/service/user/UserDetailsServiceTest.java b/src/test/java/com/gabojait/gabojaitspring/api/service/user/UserDetailsServiceTest.java index df309f36..cb9c7151 100644 --- a/src/test/java/com/gabojait/gabojaitspring/api/service/user/UserDetailsServiceTest.java +++ b/src/test/java/com/gabojait/gabojaitspring/api/service/user/UserDetailsServiceTest.java @@ -18,7 +18,7 @@ import java.time.LocalDateTime; import java.util.List; -import static com.gabojait.gabojaitspring.common.code.ErrorCode.USER_NOT_FOUND; +import static com.gabojait.gabojaitspring.common.constant.code.ErrorCode.USER_NOT_FOUND; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.junit.jupiter.api.Assertions.assertAll; diff --git a/src/test/java/com/gabojait/gabojaitspring/api/service/user/UserServiceTest.java b/src/test/java/com/gabojait/gabojaitspring/api/service/user/UserServiceTest.java index ec9f66bf..9f047137 100644 --- a/src/test/java/com/gabojait/gabojaitspring/api/service/user/UserServiceTest.java +++ b/src/test/java/com/gabojait/gabojaitspring/api/service/user/UserServiceTest.java @@ -33,7 +33,7 @@ import java.util.List; import java.util.Optional; -import static com.gabojait.gabojaitspring.common.code.ErrorCode.*; +import static com.gabojait.gabojaitspring.common.constant.code.ErrorCode.*; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.junit.jupiter.api.Assertions.assertAll; diff --git a/src/test/java/com/gabojait/gabojaitspring/common/util/FileUtilityTest.java b/src/test/java/com/gabojait/gabojaitspring/common/util/FileUtilityTest.java new file mode 100644 index 00000000..d5dbed11 --- /dev/null +++ b/src/test/java/com/gabojait/gabojaitspring/common/util/FileUtilityTest.java @@ -0,0 +1,83 @@ +package com.gabojait.gabojaitspring.common.util; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + +// TODO +//@ActiveProfiles("test") +//@SpringBootTest +//class FileUtilityTest { +// +// @MockBean private AmazonS3Client amazonS3Client; +// @Autowired private FileUtility fileUtility; +// +// @Test +// @DisplayName("파일 업로드가 정상 작동한다") +// void givenValid_whenUpload_thenReturn() throws MalformedURLException { +// // given +// String bucketName = "test"; +// String folderName = ""; +// String fileName = "file"; +// String contentType = "image/jpeg"; +// byte[] content = "a".getBytes(); +// MultipartFile multipartFile = new MockMultipartFile(fileName, fileName, contentType, content); +// boolean isImage = true; +// +// URL url = new URL("https://gabojait.com/test"); +// +// when(amazonS3Client.getUrl(anyString(), anyString())) +// .thenReturn(url); +// +// // when +// String uploadedUrl = fileUtility.upload(bucketName, folderName, fileName, multipartFile, isImage); +// +// // then +// assertThat(uploadedUrl).isEqualTo(url.toString()); +// } +// +// @Test +// @DisplayName("null인 파일로 파일 업로드시 예외가 발생한다") +// void givenNullMultipartFile_whenUpload_thenThrow() throws MalformedURLException { +// // given +// String bucketName = "test"; +// String folderName = ""; +// String fileName = "file"; +// MultipartFile multipartFile = null; +// boolean isImage = true; +// +// URL url = new URL("https://gabojait.com/test"); +// +// when(amazonS3Client.getUrl(anyString(), anyString())) +// .thenReturn(url); +// +// // when & then +// assertThatThrownBy(() -> fileUtility.upload(bucketName, folderName, fileName, multipartFile, isImage)) +// .isInstanceOf(CustomException.class) +// .extracting("errorCode") +// .isEqualTo(FILE_FIELD_REQUIRED); +// } +// +// @Test +// @DisplayName("빈 파일로 파일 업로드시 예외가 발생한다") +// void givenEmptyMultipartFile_whenUpload_thenThrow() throws MalformedURLException { +// // given +// String bucketName = "test"; +// String folderName = ""; +// String fileName = "file"; +// String contentType = "image/jpeg"; +// byte[] content = new byte[0]; +// MultipartFile multipartFile = new MockMultipartFile(fileName, fileName, contentType, content); +// boolean isImage = true; +// +// URL url = new URL("https://gabojait.com/test"); +// +// when(amazonS3Client.getUrl(anyString(), anyString())) +// .thenReturn(url); +// +// // when & then +// assertThatThrownBy(() -> fileUtility.upload(bucketName, folderName, fileName, multipartFile, isImage)) +// .isInstanceOf(CustomException.class) +// .extracting("errorCode") +// .isEqualTo(FILE_FIELD_REQUIRED); +// } +//} \ No newline at end of file diff --git a/src/test/java/com/gabojait/gabojaitspring/config/auth/JwtProviderTest.java b/src/test/java/com/gabojait/gabojaitspring/config/auth/JwtProviderTest.java index 269d90fe..94f3726d 100644 --- a/src/test/java/com/gabojait/gabojaitspring/config/auth/JwtProviderTest.java +++ b/src/test/java/com/gabojait/gabojaitspring/config/auth/JwtProviderTest.java @@ -18,8 +18,8 @@ import java.util.ArrayList; import java.util.List; -import static com.gabojait.gabojaitspring.common.code.ErrorCode.TOKEN_UNAUTHENTICATED; -import static com.gabojait.gabojaitspring.common.code.ErrorCode.USER_NOT_FOUND; +import static com.gabojait.gabojaitspring.common.constant.code.ErrorCode.TOKEN_UNAUTHENTICATED; +import static com.gabojait.gabojaitspring.common.constant.code.ErrorCode.USER_NOT_FOUND; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.springframework.http.HttpHeaders.AUTHORIZATION; diff --git a/src/test/java/com/gabojait/gabojaitspring/domain/team/TeamMemberTest.java b/src/test/java/com/gabojait/gabojaitspring/domain/team/TeamMemberTest.java index 6a35d677..008cfc95 100644 --- a/src/test/java/com/gabojait/gabojaitspring/domain/team/TeamMemberTest.java +++ b/src/test/java/com/gabojait/gabojaitspring/domain/team/TeamMemberTest.java @@ -16,7 +16,7 @@ import java.time.LocalDateTime; import java.util.stream.Stream; -import static com.gabojait.gabojaitspring.common.code.ErrorCode.*; +import static com.gabojait.gabojaitspring.common.constant.code.ErrorCode.*; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/gabojait/gabojaitspring/domain/team/TeamTest.java b/src/test/java/com/gabojait/gabojaitspring/domain/team/TeamTest.java index 354d02bf..521488eb 100644 --- a/src/test/java/com/gabojait/gabojaitspring/domain/team/TeamTest.java +++ b/src/test/java/com/gabojait/gabojaitspring/domain/team/TeamTest.java @@ -17,7 +17,7 @@ import java.util.stream.LongStream; import java.util.stream.Stream; -import static com.gabojait.gabojaitspring.common.code.ErrorCode.*; +import static com.gabojait.gabojaitspring.common.constant.code.ErrorCode.*; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy;