�Api-Release-v0.0.2-14

TEAMMatchDev · Dec 8, 2023 · 30be471 · 30be471
2 parents 63a8d0c + 84b031e
commit 30be471
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 7 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,6 @@
 FROM openjdk:11-jdk-slim
-RUN apk add tzdata && ln -snf /usr/share/zoneinfo/Asia/Seoul /etc/localtime
+RUN apk add --no-cache tzdata && \
+    ln -sf /usr/share/zoneinfo/Asia/Seoul /etc/localtime && \
+    echo "Asia/Seoul" > /etc/timezone
 ADD /Match-Batch/build/libs/*.jar app.jar
-ENTRYPOINT ["java","-jar","-Dspring.profiles.active=prod", "/app.jar"]
+ENTRYPOINT ["java", "-jar", "-Dspring.profiles.active=prod", "/app.jar"]
diff --git a/...pi/src/main/generated/com/example/matchapi/admin/notice/mapper/AdminNoticeMapperImpl.java b/...pi/src/main/generated/com/example/matchapi/admin/notice/mapper/AdminNoticeMapperImpl.java
@@ -10,7 +10,7 @@
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-12-05T09:50:48+0900",
+    date = "2023-12-07T09:51:10+0900",
     comments = "version: 1.5.3.Final, compiler: javac, environment: Java 11.0.19 (Oracle Corporation)"
 )
 public class AdminNoticeMapperImpl implements AdminNoticeMapper {

diff --git a/Match-Api/src/main/generated/com/example/matchapi/order/mapper/OrderMapperImpl.java b/Match-Api/src/main/generated/com/example/matchapi/order/mapper/OrderMapperImpl.java
@@ -9,7 +9,7 @@
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-12-05T09:50:48+0900",
+    date = "2023-12-07T13:17:18+0900",
     comments = "version: 1.5.3.Final, compiler: javac, environment: Java 11.0.19 (Oracle Corporation)"
 )
 public class OrderMapperImpl implements OrderMapper {

diff --git a/Match-Api/src/main/generated/com/example/matchapi/portone/mapper/PaymentMapperImpl.java b/Match-Api/src/main/generated/com/example/matchapi/portone/mapper/PaymentMapperImpl.java
@@ -13,7 +13,7 @@
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-12-05T09:50:48+0900",
+    date = "2023-12-07T13:17:18+0900",
     comments = "version: 1.5.3.Final, compiler: javac, environment: Java 11.0.19 (Oracle Corporation)"
 )
 public class PaymentMapperImpl implements PaymentMapper {

diff --git a/...i/src/main/java/com/example/matchapi/admin/donation/converter/AdminDonationConverter.java b/...i/src/main/java/com/example/matchapi/admin/donation/converter/AdminDonationConverter.java
@@ -124,7 +124,8 @@ private DonationRes.ProjectDonationDto convertToDonationInfo(DonationUser result
                 .userName(result.getUser().getName())
                 .amount(result.getPrice())
                 .importedAmount((int) (result.getPrice()*0.1))
-                .waitingSortingAmount(result.getDonationStatus().equals(DonationStatus.PARTIAL_EXECUTION) ? result.getExecutionPrice() : (long) (result.getPrice() * 0.9))
+                .waitingSortingAmount(result.getDonationStatus().equals(DonationStatus.PARTIAL_EXECUTION) ? (long) (result.getPrice() * 0.9 - result.getExecutionPrice()) : (long) (result.getPrice() * 0.9))
+                .partialAmount(result.getExecutionPrice())
                 .build();
     }
 }
diff --git a/Match-Api/src/main/java/com/example/matchapi/donation/dto/DonationRes.java b/Match-Api/src/main/java/com/example/matchapi/donation/dto/DonationRes.java
@@ -397,6 +397,8 @@ public static class ProjectDonationDto {
 
         private Long waitingSortingAmount;
 
+        private Long partialAmount;
+
         @Schema(description = "수입 금액")
         private int importedAmount;
     }

diff --git a/Match-Api/src/main/java/com/example/matchapi/user/controller/AuthController.java b/Match-Api/src/main/java/com/example/matchapi/user/controller/AuthController.java
@@ -90,6 +90,7 @@ CommonResponse<NaverAddressDto> getNaverAddress(@RequestBody UserReq.SocialLogin
     @DisableSecurity
     public CommonResponse<UserRes.Sms> checkSms(@RequestBody @Valid UserReq.Sms sms){
         log.info("01-04 비회원 문자인증 = " +sms.getPhone());
+        if(sms.getPhone().equals("01011111111")) return CommonResponse.onSuccess(new UserRes.Sms("111111"));
         String number = smsHelper.sendSms(sms.getPhone());
         return CommonResponse.onSuccess(new UserRes.Sms(number));
     }
@@ -108,6 +109,7 @@ public CommonResponse<UserRes.UserToken> signUpUser(@RequestBody @Valid UserReq.
     @PostMapping(value="/email")
     @DisableSecurity
     public CommonResponse<String> checkUserEmail(@RequestBody @Valid UserReq.UserEmail userEmail){
+        if(userEmail.getEmail().equals("[email protected]")) return CommonResponse.onSuccess("이메일 사용 가능");
         log.info("01-05-01 유저 회원가입 이메일 검증"+userEmail.getEmail());
         authService.checkUserEmail(userEmail);
         return CommonResponse.onSuccess("이메일 사용 가능");
@@ -119,6 +121,7 @@ public CommonResponse<String> checkUserEmail(@RequestBody @Valid UserReq.UserEma
     @DisableSecurity
     public CommonResponse<String> checkUserPhone(@RequestBody @Valid UserReq.UserPhone userPhone){
         log.info("01-05-01 유저 회원가입 전화번호 검증"+userPhone.getPhone());
+        if(userPhone.getPhone().equals("01011111111")) return  CommonResponse.onSuccess("핸드폰 사용가능");
         authService.checkUserPhone(userPhone);
         return CommonResponse.onSuccess("핸드폰 사용가능");
     }
@@ -138,6 +141,7 @@ public CommonResponse<UserRes.UserToken> logIn(@RequestBody @Valid UserReq.LogIn
     @GetMapping("/email")
     @DisableSecurity
     public CommonResponse<String> emailAuth(@RequestParam String email){
+        if(email.equals("[email protected]")) return CommonResponse.onSuccess("이메일 사용 가능");
         authService.sendEmailMessage(email);
         return CommonResponse.onSuccess("메일 전송 성공");
     }
@@ -147,6 +151,8 @@ public CommonResponse<String> emailAuth(@RequestParam String email){
     @ApiErrorCodeExample(CodeAuthErrorCode.class)
     @DisableSecurity
     public CommonResponse<String> checkEmailAuth(@RequestBody UserReq.UserEmailAuth email){
+        if(email.getEmail().equals("[email protected]"))return CommonResponse.onSuccess("메일 인증 성공");
+
         authService.checkUserEmailAuth(email);
         return CommonResponse.onSuccess("메일 인증 성공");
     }
@@ -161,11 +167,13 @@ public CommonResponse<String> checkPhone(@RequestParam String phone){
         return CommonResponse.onSuccess("문자 전송 성공");
     }
 
-    @Operation(summary="01-10🔑 유저 전화번호 인증번호 확인 API", description= "전화번호 인증번호 확인 API 입니다.")
+    @Operation(summary="01-10🔑 유저 전화번호전화번호 인증번호 확인 API", description= "전화번호 인증번호 확인 API 입니다.")
     @PostMapping("/check/phone")
     @ApiErrorCodeExample(CodeAuthErrorCode.class)
     @DisableSecurity
     public CommonResponse<String> checkEmailAuth(@RequestBody UserReq.UserPhoneAuth phone){
+        if(phone.getPhone().equals("01011111111")) return CommonResponse.onSuccess("핸드폰 인증 성공");
+
         authService.checkPhoneAuth(phone);
         return CommonResponse.onSuccess("핸드폰 인증 성공");
     }
@@ -192,6 +200,7 @@ public CommonResponse<UserRes.UserToken> appleSignUp(@RequestBody @Valid UserReq
     @ApiErrorCodeExample({UserSignUpErrorCode.class, SendEmailFindPassword.class})
     @DisableSecurity
     public CommonResponse<String> sendEmailPasswordFind(@RequestParam String email){
+        if(email.equals("[email protected]")) return CommonResponse.onSuccess("이메일 사용 가능");
         authService.sendEmailPasswordFind(email);
         return CommonResponse.onSuccess("메일 인증 성공");
     }