diff --git a/Dockerfile b/Dockerfile index eb8a60d8..421742a2 100644 --- 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/Match-Api/src/main/generated/com/example/matchapi/admin/notice/mapper/AdminNoticeMapperImpl.java b/Match-Api/src/main/generated/com/example/matchapi/admin/notice/mapper/AdminNoticeMapperImpl.java index a6f654b8..946d8471 100644 --- a/Match-Api/src/main/generated/com/example/matchapi/admin/notice/mapper/AdminNoticeMapperImpl.java +++ b/Match-Api/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 index 5bc23f92..0b244f53 100644 --- 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 index 9330c095..651f8bd4 100644 --- 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/Match-Api/src/main/java/com/example/matchapi/admin/donation/converter/AdminDonationConverter.java b/Match-Api/src/main/java/com/example/matchapi/admin/donation/converter/AdminDonationConverter.java index e527a3d8..d0c47a55 100644 --- a/Match-Api/src/main/java/com/example/matchapi/admin/donation/converter/AdminDonationConverter.java +++ b/Match-Api/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 index c141caf1..4087c9a6 100644 --- 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 index 26149096..42537a65 100644 --- 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 getNaverAddress(@RequestBody UserReq.SocialLogin @DisableSecurity public CommonResponse 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 signUpUser(@RequestBody @Valid UserReq. @PostMapping(value="/email") @DisableSecurity public CommonResponse checkUserEmail(@RequestBody @Valid UserReq.UserEmail userEmail){ + if(userEmail.getEmail().equals("test1234@gmail.com")) return CommonResponse.onSuccess("이메일 사용 가능"); log.info("01-05-01 유저 회원가입 이메일 검증"+userEmail.getEmail()); authService.checkUserEmail(userEmail); return CommonResponse.onSuccess("이메일 사용 가능"); @@ -119,6 +121,7 @@ public CommonResponse checkUserEmail(@RequestBody @Valid UserReq.UserEma @DisableSecurity public CommonResponse 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 logIn(@RequestBody @Valid UserReq.LogIn @GetMapping("/email") @DisableSecurity public CommonResponse emailAuth(@RequestParam String email){ + if(email.equals("test1234@gmail.com")) return CommonResponse.onSuccess("이메일 사용 가능"); authService.sendEmailMessage(email); return CommonResponse.onSuccess("메일 전송 성공"); } @@ -147,6 +151,8 @@ public CommonResponse emailAuth(@RequestParam String email){ @ApiErrorCodeExample(CodeAuthErrorCode.class) @DisableSecurity public CommonResponse checkEmailAuth(@RequestBody UserReq.UserEmailAuth email){ + if(email.getEmail().equals("test1234@gmail.com"))return CommonResponse.onSuccess("메일 인증 성공"); + authService.checkUserEmailAuth(email); return CommonResponse.onSuccess("메일 인증 성공"); } @@ -161,11 +167,13 @@ public CommonResponse 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 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 appleSignUp(@RequestBody @Valid UserReq @ApiErrorCodeExample({UserSignUpErrorCode.class, SendEmailFindPassword.class}) @DisableSecurity public CommonResponse sendEmailPasswordFind(@RequestParam String email){ + if(email.equals("test1234@gmail.com")) return CommonResponse.onSuccess("이메일 사용 가능"); authService.sendEmailPasswordFind(email); return CommonResponse.onSuccess("메일 인증 성공"); }