Skip to content

Commit ad72a29

Browse files
authored
[FIX] 결제 url 배포서버로 변경 및 IDEA_SOLUTION 수량 설정 (#230) (#232)
* [FIX] 리다이렉트 url 수정 * [FEAT] IDEA_SOLUTION 등록 시 수량을 무한으로 설정 * [FIX] 닉네임이 아닌 아이디를 반환하도록 수정 * [FIX] 프로필 공개 여부 추가 * [FIX] yml로 리다이렉트 도메인 수정 * [FIX] yml에 로컬 url 변경
1 parent c1cfefd commit ad72a29

File tree

5 files changed

+18
-4
lines changed

5 files changed

+18
-4
lines changed

src/main/java/com/brainpix/kakaopay/api_client/KakaoPayApiClient.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ public class KakaoPayApiClient {
2525
private String READY_URL;
2626
@Value("${kakao.pay.approve-url}")
2727
private String APPROVE_URL;
28+
@Value("${kakao.pay.redirect-domain}")
29+
private String REDIRECT_DOMAIN;
2830

2931
@Value("${kakao.pay.cid}")
3032
private String cid; // TC0ONETIME (테스트용 가맹점 cid)
@@ -78,9 +80,9 @@ private Map<String, String> getReadyParams(
7880
params.put("tax_free_amount", "0");
7981
params.put("vat_amount", String.valueOf(parameter.getVat()));
8082
params.put("approval_url",
81-
"http://localhost:5173/purchase/approve?ideaId=" + ideaMarket.getId() + "&orderId=" + orderId);
82-
params.put("cancel_url", "http://localhost:5173/purchase/cancel?ideaId=" + ideaMarket.getId());
83-
params.put("fail_url", "http://localhost:5173/purchase/fail?ideaId=" + ideaMarket.getId());
83+
REDIRECT_DOMAIN + "/purchase/approve?ideaId=" + ideaMarket.getId() + "&orderId=" + orderId);
84+
params.put("cancel_url", REDIRECT_DOMAIN + "/purchase/cancel?ideaId=" + ideaMarket.getId());
85+
params.put("fail_url", REDIRECT_DOMAIN + "/purchase/fail?ideaId=" + ideaMarket.getId());
8486

8587
return params;
8688
}

src/main/java/com/brainpix/post/converter/GetCollaborationHubDetailDtoConverter.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,9 @@ public static GetCollaborationHubDetailDto.Recruitment toRecruitment(Collaborati
9595
public static GetCollaborationHubDetailDto.OpenMember toOpenMember(CollectionGathering collectionGathering) {
9696
return GetCollaborationHubDetailDto.OpenMember.builder()
9797
.userId(collectionGathering.getJoiner().getId())
98-
.name(collectionGathering.getJoiner().getNickName())
98+
.name(collectionGathering.getJoiner().getIdentifier())
9999
.domain(collectionGathering.getCollaborationRecruitment().getDomain())
100+
.openMyProfile(collectionGathering.getOpenProfile())
100101
.build();
101102
}
102103
}

src/main/java/com/brainpix/post/dto/GetCollaborationHubDetailDto.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,5 +65,6 @@ public static class OpenMember {
6565
private Long userId; // 유저 식별자 값
6666
private String name; // 유저 이름
6767
private String domain; // 유저 역할
68+
private Boolean openMyProfile; // 프로필 공개 여부
6869
}
6970
}

src/main/java/com/brainpix/post/service/IdeaMarketService.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import com.brainpix.api.code.error.IdeaMarketErrorCode;
1010
import com.brainpix.api.code.error.PostErrorCode;
1111
import com.brainpix.api.exception.BrainPixException;
12+
import com.brainpix.joining.dto.IdeaMarketPriceDto;
1213
import com.brainpix.joining.entity.quantity.Price;
1314
import com.brainpix.joining.repository.CollectionGatheringRepository;
1415
import com.brainpix.joining.repository.RequestTaskPurchasingRepository;
@@ -26,6 +27,7 @@
2627
import com.brainpix.post.dto.IdeaMarketUpdateDto;
2728
import com.brainpix.post.entity.PostAuth;
2829
import com.brainpix.post.entity.idea_market.IdeaMarket;
30+
import com.brainpix.post.entity.idea_market.IdeaMarketType;
2931
import com.brainpix.post.repository.IdeaMarketRepository;
3032
import com.brainpix.post.repository.PostRepository;
3133
import com.brainpix.post.repository.SavedPostRepository;
@@ -54,6 +56,13 @@ public Long createIdeaMarket(Long userId, IdeaMarketCreateDto createDto) {
5456
User writer = userRepository.findById(userId)
5557
.orElseThrow(() -> new BrainPixException(PostErrorCode.USER_NOT_FOUND));
5658

59+
// IDEA_SOLUTION은 수량화가 불가능한 무형의 자산이므로 totalQuantity를 무한으로 설정
60+
if (createDto.getIdeaMarketType().equals(IdeaMarketType.IDEA_SOLUTION)) {
61+
IdeaMarketPriceDto ideaMarketPriceDto = new IdeaMarketPriceDto(createDto.getPriceDto().getPrice(),
62+
(long)Integer.MAX_VALUE);
63+
createDto = new IdeaMarketCreateDto(createDto.getIdeaMarketType(), ideaMarketPriceDto);
64+
}
65+
5766
Price price = priceService.createIdeaMarketPrice(createDto.getPriceDto());
5867

5968
IdeaMarket ideaMarket = createIdeaMarketConverter.convertToIdeaMarket(createDto, writer, price);

src/main/resources/application-dev.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ kakao:
4040
cid: ENC(+Kb6JKxydvdU8AtNjy6i8E/0cr3mcK3/yIXO4oULT/Z41Ri57uepQtt7vEAl1uyk)
4141
ready-url: https://open-api.kakaopay.com/online/v1/payment/ready
4242
approve-url: https://open-api.kakaopay.com/online/v1/payment/approve
43+
redirect-domain: http://localhost:5173
4344

4445
cloud:
4546
aws:

0 commit comments

Comments
 (0)