From 4fbb3c9ba3f3cdb6600a8e39a28fc6e4e5a32c12 Mon Sep 17 00:00:00 2001 From: pywoo Date: Wed, 19 Feb 2025 15:07:41 +0900 Subject: [PATCH 1/6] =?UTF-8?q?[FIX]=20=EB=A6=AC=EB=8B=A4=EC=9D=B4?= =?UTF-8?q?=EB=A0=89=ED=8A=B8=20url=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/brainpix/kakaopay/api_client/KakaoPayApiClient.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/brainpix/kakaopay/api_client/KakaoPayApiClient.java b/src/main/java/com/brainpix/kakaopay/api_client/KakaoPayApiClient.java index 8b946e9f..f2fa2070 100644 --- a/src/main/java/com/brainpix/kakaopay/api_client/KakaoPayApiClient.java +++ b/src/main/java/com/brainpix/kakaopay/api_client/KakaoPayApiClient.java @@ -78,9 +78,9 @@ private Map getReadyParams( params.put("tax_free_amount", "0"); params.put("vat_amount", String.valueOf(parameter.getVat())); params.put("approval_url", - "http://localhost:5173/purchase/approve?ideaId=" + ideaMarket.getId() + "&orderId=" + orderId); - params.put("cancel_url", "http://localhost:5173/purchase/cancel?ideaId=" + ideaMarket.getId()); - params.put("fail_url", "http://localhost:5173/purchase/fail?ideaId=" + ideaMarket.getId()); + "https://www.brainpix.net/purchase/approve?ideaId=" + ideaMarket.getId() + "&orderId=" + orderId); + params.put("cancel_url", "https://www.brainpix.net/purchase/cancel?ideaId=" + ideaMarket.getId()); + params.put("fail_url", "https://www.brainpix.net/purchase/fail?ideaId=" + ideaMarket.getId()); return params; } From a557228502d9b785dd691ddb4504ee3aa3b86907 Mon Sep 17 00:00:00 2001 From: pywoo Date: Wed, 19 Feb 2025 16:21:30 +0900 Subject: [PATCH 2/6] =?UTF-8?q?[FEAT]=20IDEA=5FSOLUTION=20=EB=93=B1?= =?UTF-8?q?=EB=A1=9D=20=EC=8B=9C=20=EC=88=98=EB=9F=89=EC=9D=84=20=EB=AC=B4?= =?UTF-8?q?=ED=95=9C=EC=9C=BC=EB=A1=9C=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/brainpix/post/service/IdeaMarketService.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/main/java/com/brainpix/post/service/IdeaMarketService.java b/src/main/java/com/brainpix/post/service/IdeaMarketService.java index b6a0feed..1528c1b3 100644 --- a/src/main/java/com/brainpix/post/service/IdeaMarketService.java +++ b/src/main/java/com/brainpix/post/service/IdeaMarketService.java @@ -9,6 +9,7 @@ import com.brainpix.api.code.error.IdeaMarketErrorCode; import com.brainpix.api.code.error.PostErrorCode; import com.brainpix.api.exception.BrainPixException; +import com.brainpix.joining.dto.IdeaMarketPriceDto; import com.brainpix.joining.entity.quantity.Price; import com.brainpix.joining.repository.CollectionGatheringRepository; import com.brainpix.joining.repository.RequestTaskPurchasingRepository; @@ -26,6 +27,7 @@ import com.brainpix.post.dto.IdeaMarketUpdateDto; import com.brainpix.post.entity.PostAuth; import com.brainpix.post.entity.idea_market.IdeaMarket; +import com.brainpix.post.entity.idea_market.IdeaMarketType; import com.brainpix.post.repository.IdeaMarketRepository; import com.brainpix.post.repository.PostRepository; import com.brainpix.post.repository.SavedPostRepository; @@ -54,6 +56,13 @@ public Long createIdeaMarket(Long userId, IdeaMarketCreateDto createDto) { User writer = userRepository.findById(userId) .orElseThrow(() -> new BrainPixException(PostErrorCode.USER_NOT_FOUND)); + // IDEA_SOLUTION은 수량화가 불가능한 무형의 자산이므로 totalQuantity를 무한으로 설정 + if (createDto.getIdeaMarketType().equals(IdeaMarketType.IDEA_SOLUTION)) { + IdeaMarketPriceDto ideaMarketPriceDto = new IdeaMarketPriceDto(createDto.getPriceDto().getPrice(), + (long)Integer.MAX_VALUE); + createDto = new IdeaMarketCreateDto(createDto.getIdeaMarketType(), ideaMarketPriceDto); + } + Price price = priceService.createIdeaMarketPrice(createDto.getPriceDto()); IdeaMarket ideaMarket = createIdeaMarketConverter.convertToIdeaMarket(createDto, writer, price); From 1b059138bc84a64b088217a4a136da63d78b92dd Mon Sep 17 00:00:00 2001 From: pywoo Date: Wed, 19 Feb 2025 16:56:01 +0900 Subject: [PATCH 3/6] =?UTF-8?q?[FIX]=20=EB=8B=89=EB=84=A4=EC=9E=84?= =?UTF-8?q?=EC=9D=B4=20=EC=95=84=EB=8B=8C=20=EC=95=84=EC=9D=B4=EB=94=94?= =?UTF-8?q?=EB=A5=BC=20=EB=B0=98=ED=99=98=ED=95=98=EB=8F=84=EB=A1=9D=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../post/converter/GetCollaborationHubDetailDtoConverter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/brainpix/post/converter/GetCollaborationHubDetailDtoConverter.java b/src/main/java/com/brainpix/post/converter/GetCollaborationHubDetailDtoConverter.java index 30854f9a..e46ee28e 100644 --- a/src/main/java/com/brainpix/post/converter/GetCollaborationHubDetailDtoConverter.java +++ b/src/main/java/com/brainpix/post/converter/GetCollaborationHubDetailDtoConverter.java @@ -95,7 +95,7 @@ public static GetCollaborationHubDetailDto.Recruitment toRecruitment(Collaborati public static GetCollaborationHubDetailDto.OpenMember toOpenMember(CollectionGathering collectionGathering) { return GetCollaborationHubDetailDto.OpenMember.builder() .userId(collectionGathering.getJoiner().getId()) - .name(collectionGathering.getJoiner().getNickName()) + .name(collectionGathering.getJoiner().getIdentifier()) .domain(collectionGathering.getCollaborationRecruitment().getDomain()) .build(); } From 01827546b8c7de368c7755c27760c397abc41e40 Mon Sep 17 00:00:00 2001 From: pywoo Date: Wed, 19 Feb 2025 16:57:35 +0900 Subject: [PATCH 4/6] =?UTF-8?q?[FIX]=20=ED=94=84=EB=A1=9C=ED=95=84=20?= =?UTF-8?q?=EA=B3=B5=EA=B0=9C=20=EC=97=AC=EB=B6=80=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../post/converter/GetCollaborationHubDetailDtoConverter.java | 1 + .../java/com/brainpix/post/dto/GetCollaborationHubDetailDto.java | 1 + 2 files changed, 2 insertions(+) diff --git a/src/main/java/com/brainpix/post/converter/GetCollaborationHubDetailDtoConverter.java b/src/main/java/com/brainpix/post/converter/GetCollaborationHubDetailDtoConverter.java index e46ee28e..72341603 100644 --- a/src/main/java/com/brainpix/post/converter/GetCollaborationHubDetailDtoConverter.java +++ b/src/main/java/com/brainpix/post/converter/GetCollaborationHubDetailDtoConverter.java @@ -97,6 +97,7 @@ public static GetCollaborationHubDetailDto.OpenMember toOpenMember(CollectionGat .userId(collectionGathering.getJoiner().getId()) .name(collectionGathering.getJoiner().getIdentifier()) .domain(collectionGathering.getCollaborationRecruitment().getDomain()) + .openMyProfile(collectionGathering.getOpenProfile()) .build(); } } diff --git a/src/main/java/com/brainpix/post/dto/GetCollaborationHubDetailDto.java b/src/main/java/com/brainpix/post/dto/GetCollaborationHubDetailDto.java index 16d50faa..4cdbeb2e 100644 --- a/src/main/java/com/brainpix/post/dto/GetCollaborationHubDetailDto.java +++ b/src/main/java/com/brainpix/post/dto/GetCollaborationHubDetailDto.java @@ -65,5 +65,6 @@ public static class OpenMember { private Long userId; // 유저 식별자 값 private String name; // 유저 이름 private String domain; // 유저 역할 + private Boolean openMyProfile; // 프로필 공개 여부 } } From 1cd9b55a95170160db11564c7acc16ceaa86291d Mon Sep 17 00:00:00 2001 From: pywoo Date: Wed, 19 Feb 2025 20:57:51 +0900 Subject: [PATCH 5/6] =?UTF-8?q?[FIX]=20yml=EB=A1=9C=20=EB=A6=AC=EB=8B=A4?= =?UTF-8?q?=EC=9D=B4=EB=A0=89=ED=8A=B8=20=EB=8F=84=EB=A9=94=EC=9D=B8=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../brainpix/kakaopay/api_client/KakaoPayApiClient.java | 8 +++++--- src/main/resources/application-dev.yml | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/brainpix/kakaopay/api_client/KakaoPayApiClient.java b/src/main/java/com/brainpix/kakaopay/api_client/KakaoPayApiClient.java index f2fa2070..31d64efa 100644 --- a/src/main/java/com/brainpix/kakaopay/api_client/KakaoPayApiClient.java +++ b/src/main/java/com/brainpix/kakaopay/api_client/KakaoPayApiClient.java @@ -25,6 +25,8 @@ public class KakaoPayApiClient { private String READY_URL; @Value("${kakao.pay.approve-url}") private String APPROVE_URL; + @Value("${kakao.pay.redirect-domain}") + private String REDIRECT_DOMAIN; @Value("${kakao.pay.cid}") private String cid; // TC0ONETIME (테스트용 가맹점 cid) @@ -78,9 +80,9 @@ private Map getReadyParams( params.put("tax_free_amount", "0"); params.put("vat_amount", String.valueOf(parameter.getVat())); params.put("approval_url", - "https://www.brainpix.net/purchase/approve?ideaId=" + ideaMarket.getId() + "&orderId=" + orderId); - params.put("cancel_url", "https://www.brainpix.net/purchase/cancel?ideaId=" + ideaMarket.getId()); - params.put("fail_url", "https://www.brainpix.net/purchase/fail?ideaId=" + ideaMarket.getId()); + REDIRECT_DOMAIN + "/purchase/approve?ideaId=" + ideaMarket.getId() + "&orderId=" + orderId); + params.put("cancel_url", REDIRECT_DOMAIN + "/purchase/cancel?ideaId=" + ideaMarket.getId()); + params.put("fail_url", REDIRECT_DOMAIN + "/purchase/fail?ideaId=" + ideaMarket.getId()); return params; } diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index b8277493..95b91a8f 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -40,6 +40,7 @@ kakao: cid: ENC(+Kb6JKxydvdU8AtNjy6i8E/0cr3mcK3/yIXO4oULT/Z41Ri57uepQtt7vEAl1uyk) ready-url: https://open-api.kakaopay.com/online/v1/payment/ready approve-url: https://open-api.kakaopay.com/online/v1/payment/approve + redirect-domain: https://www.brainpix.net cloud: aws: From 0a72e045e99f4dd1fd1c533bd2e06167230c125d Mon Sep 17 00:00:00 2001 From: pywoo Date: Wed, 19 Feb 2025 21:15:40 +0900 Subject: [PATCH 6/6] =?UTF-8?q?[FIX]=20yml=EC=97=90=20=EB=A1=9C=EC=BB=AC?= =?UTF-8?q?=20url=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 95b91a8f..cf97cdd2 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -40,7 +40,7 @@ kakao: cid: ENC(+Kb6JKxydvdU8AtNjy6i8E/0cr3mcK3/yIXO4oULT/Z41Ri57uepQtt7vEAl1uyk) ready-url: https://open-api.kakaopay.com/online/v1/payment/ready approve-url: https://open-api.kakaopay.com/online/v1/payment/approve - redirect-domain: https://www.brainpix.net + redirect-domain: http://localhost:5173 cloud: aws: