[payment-8]: Payment api refactoring with customer and shoping session logic #87

Reyzis2021 · 2023-08-20T14:34:18Z

…ring-with-customer-and-shoping-session-logic

…i classes.

…otalPrice' into feature/Payment-8/payment-api-refactoring-with-customer-and-shoping-session-logic # Conflicts: # src/main/java/com/zufar/onlinestore/payment/api/PaymentApi.java # src/main/java/com/zufar/onlinestore/payment/api/dto/ProcessedPaymentDetailsDto.java # src/main/java/com/zufar/onlinestore/payment/api/impl/PaymentApiImpl.java # src/main/java/com/zufar/onlinestore/payment/api/impl/intent/PaymentCreator.java # src/main/java/com/zufar/onlinestore/payment/api/impl/intent/PaymentIntentCreator.java # src/main/java/com/zufar/onlinestore/payment/api/impl/intent/PaymentMethodCreator.java # src/main/java/com/zufar/onlinestore/payment/api/impl/intent/PaymentRetriever.java # src/main/java/com/zufar/onlinestore/payment/converter/StripePaymentIntentConverter.java # src/main/java/com/zufar/onlinestore/payment/dto/CreatePaymentDto.java # src/main/java/com/zufar/onlinestore/payment/endpoint/PaymentEndpoint.java # src/main/java/com/zufar/onlinestore/payment/entity/Payment.java # src/main/java/com/zufar/onlinestore/payment/exception/PaymentMethodProcessingException.java # src/main/resources/db/changelog/version-1.0/20.07.2023.create-payment-table.sql

…ring-with-customer-and-shoping-session-logic # Conflicts: # src/main/java/com/zufar/onlinestore/payment/converter/StripePaymentIntentConverter.java

…ring-with-customer-and-shoping-session-logic

vitaliibredun

Approved

vitaliibredun · 2023-08-25T10:26:21Z

src/main/java/com/zufar/onlinestore/cart/converter/ShoppingSessionDtoConverter.java


-
-@Mapper(componentModel = "spring", uses = ShoppingSessionItemDtoConverter.class)
+@Mapper(componentModel = MappingConstants.ComponentModel.SPRING, uses = {ShoppingSessionItemDtoConverter.class, ItemsTotalPriceCalculator.class})


maybe better use "spring" in the componentModel instead of MappingConstants.ComponentModel.SPRING ?

vitaliibredun · 2023-08-25T10:27:25Z

src/main/java/com/zufar/onlinestore/cart/converter/ShoppingSessionItemDtoConverter.java

 import org.mapstruct.Named;


-@Mapper(componentModel = "spring", uses = ProductInfoDtoConverter.class)
+@Mapper(componentModel = MappingConstants.ComponentModel.SPRING, uses = ProductInfoDtoConverter.class)


maybe better use "spring" in the componentModel instead of MappingConstants.ComponentModel.SPRING ?

vitaliibredun · 2023-08-25T10:40:39Z

src/main/java/com/zufar/onlinestore/payment/converter/StripePaymentIntentConverter.java

+    @Mapping(target = "itemsTotalPrice", source = "paymentIntent.amount", qualifiedByName = {"calculateForPayment"})
+    Payment toEntity(final PaymentIntent paymentIntent, final ShoppingSessionDto shoppingSession);
+
+    @Mapping(target = "customer", source = "paymentMethod.customer")


it seems like we can drop this annotation, because of the the names

it’s not possible to do it this way because there is an ambiguity in the target types, and the maptract will not understand how to properly map

vitaliibredun · 2023-08-25T10:40:50Z

src/main/java/com/zufar/onlinestore/payment/converter/StripePaymentIntentConverter.java

+    Payment toEntity(final PaymentIntent paymentIntent, final ShoppingSessionDto shoppingSession);
+
+    @Mapping(target = "customer", source = "paymentMethod.customer")
+    @Mapping(target = "currency", source = "currency")


it seems like we can drop this annotation, because of the the names

yevr19 · 2023-08-26T21:03:30Z

src/main/java/com/zufar/onlinestore/cart/api/AddItemsToShoppingSessionHelper.java

@@ -72,7 +72,7 @@ private List<ShoppingSessionItem> createItems(Set<NewShoppingSessionItemDto> ite
                        .productsQuantity(productsWithQuantity.get(productInfo.getProductId()))
                        .productInfo(productInfo)
                        .build())
-                .collect(Collectors.toList());
+                .toList();


be careful here. Should we return an immutable list here?

yevr19 · 2023-08-26T21:05:03Z

src/main/java/com/zufar/onlinestore/cart/api/ItemsTotalPriceCalculator.java


 @Service
 public class ItemsTotalPriceCalculator {

-    public BigDecimal calculate(List<ShoppingSessionItemDto> items) {
+    @Named("toItemsTotalPrice")


why do we need this annotation here

yevr19 · 2023-08-26T21:05:20Z

src/main/java/com/zufar/onlinestore/cart/converter/ShoppingSessionDtoConverter.java


-
-@Mapper(componentModel = "spring", uses = ShoppingSessionItemDtoConverter.class)
+@Mapper(componentModel = MappingConstants.ComponentModel.SPRING, uses = {ShoppingSessionItemDtoConverter.class, ItemsTotalPriceCalculator.class})


yevr19 · 2023-08-26T21:06:00Z

src/main/java/com/zufar/onlinestore/cart/converter/ShoppingSessionDtoConverter.java

 public interface ShoppingSessionDtoConverter {

    @Mapping(target = "items", source = "entity.items", qualifiedByName = {"toShoppingSessionItemDto"})
+    @Mapping(target = "itemsTotalPrice", source = "entity.items", qualifiedByName = {"toItemsTotalPrice"})
    ShoppingSessionDto toDto(final ShoppingSession entity);
 }


add new line here

yevr19 · 2023-08-26T21:06:13Z

src/main/java/com/zufar/onlinestore/cart/converter/ShoppingSessionItemDtoConverter.java

 import org.mapstruct.Named;


-@Mapper(componentModel = "spring", uses = ProductInfoDtoConverter.class)
+@Mapper(componentModel = MappingConstants.ComponentModel.SPRING, uses = ProductInfoDtoConverter.class)


yevr19 · 2023-08-26T21:51:57Z

src/main/java/com/zufar/onlinestore/payment/endpoint/PaymentEndpoint.java

-        return ResponseEntity.ok()
+
+        ApiResponse<Void> apiResponse = ApiResponse.<Void>builder()
+                .message("Payment event successfully processed")


probably needs to be in centralized storage

yevr19 · 2023-08-26T21:52:41Z

src/main/java/com/zufar/onlinestore/payment/enums/PaymentStatus.java

@@ -33,5 +33,6 @@ public enum PaymentStatus {

    private final String status;
    private final String description;
+
 }



remove redunant empty line

yevr19 · 2023-08-26T21:52:51Z

src/main/java/com/zufar/onlinestore/payment/exception/handler/PaymentExceptionHandler.java

-import com.zufar.onlinestore.payment.exception.PaymentNotFoundException;
-import com.zufar.onlinestore.payment.exception.PaymentMethodProcessingException;
-import com.zufar.onlinestore.payment.exception.PaymentEventParsingException;
+import com.zufar.onlinestore.payment.exception.*;


Is it fixed?

yevr19 · 2023-08-26T21:57:10Z

src/main/resources/db/changelog/version-1.0/20.07.2023.create-payment-table.sql

 CREATE TABLE IF NOT EXISTS payment
 (
    payment_id        BIGSERIAL PRIMARY KEY,
-    payment_intent_id VARCHAR(32) NOT NULL UNIQUE,
+    payment_intent_id VARCHAR(64) NOT NULL UNIQUE,
+    shopping_session_id UUID NOT NULL UNIQUE,
    items_total_price DECIMAL    NOT NULL CHECK (items_total_price > 0),
    status            VARCHAR(32),
    description       TEXT
-
 );


i guess we have to define cons on table lvl

yevr19 · 2023-08-26T21:57:25Z

src/main/resources/db/changelog/version-1.0/28.07.2023.part4.create-user-details-table.sql

@@ -3,6 +3,7 @@ CREATE TABLE user_details
    id                      UUID        NOT NULL PRIMARY KEY,
    first_name              VARCHAR(55) NOT NULL,
    last_name               VARCHAR(55) NOT NULL,
+    stripe_customer_id      VARCHAR(64)  UNIQUE,


…ring-with-customer-and-shoping-session-logic # Conflicts: # src/main/java/com/zufar/onlinestore/user/converter/UserDtoConverter.java

…s from review

…ring-with-customer-and-shoping-session-logic # Conflicts: # src/main/java/com/zufar/onlinestore/payment/exception/handler/PaymentExceptionHandler.java

Sunagatov

Reviewed

Sunagatov · 2023-09-02T19:54:31Z

src/main/java/com/zufar/onlinestore/payment/api/dto/ProcessPaymentDto.java

+import jakarta.validation.constraints.NotBlank;
+import java.util.UUID;
+
+public record ProcessPaymentDto(


ProcessPaymentRequest looks better

Sunagatov · 2023-09-02T19:58:07Z

src/main/resources/db/changelog/version-1.0/28.07.2023.part4.create-user-details-table.sql

@@ -3,6 +3,7 @@ CREATE TABLE user_details
    id                      UUID        NOT NULL PRIMARY KEY,
    first_name              VARCHAR(55) NOT NULL,
    last_name               VARCHAR(55) NOT NULL,
+    stripe_customer_token   VARCHAR(64) UNIQUE,


Add NOT_NULL

this field must be filled after creating the user, so it needs to be able to store the null

Sunagatov · 2023-09-02T19:59:43Z

src/main/java/com/zufar/onlinestore/payment/exception/handler/PaymentExceptionHandler.java

-import com.zufar.onlinestore.payment.exception.PaymentNotFoundException;
-import com.zufar.onlinestore.payment.exception.PaymentMethodProcessingException;
-import com.zufar.onlinestore.payment.exception.PaymentEventParsingException;
+import com.zufar.onlinestore.payment.exception.*;


Is it fixed?

Sunagatov · 2023-09-02T20:02:23Z

src/main/java/com/zufar/onlinestore/payment/endpoint/PaymentEndpoint.java

+
+        ApiResponse<ProcessedPaymentWithClientSecretDto> apiResponse = ApiResponse.<ProcessedPaymentWithClientSecretDto>builder()
+                .data(processedPayment)
+                .messages(List.of("Payment successfully processed"))


I think we should use messages only for errors. Just leave messages empty as you have data field filled by processedPayment

Sunagatov · 2023-09-02T20:03:17Z

src/main/java/com/zufar/onlinestore/payment/endpoint/PaymentEndpoint.java

-                .body(paymentMethodId);
+        ApiResponse<ProcessedPaymentDetailsDto> apiResponse = ApiResponse.<ProcessedPaymentDetailsDto>builder()
+                .data(retrievedPayment)
+                .messages(List.of("Payment successfully retrieved"))


I think we should use messages only for errors. Just leave messages empty as you have data field filled by retrievedPayment

Sunagatov · 2023-09-02T20:13:22Z

src/main/java/com/zufar/onlinestore/payment/api/dto/CreateCardDetailsTokenDto.java

+import lombok.Builder;
+
+@Builder
+public record CreateCardDetailsTokenDto(


Where are @notempty annotations?

Sunagatov · 2023-09-02T20:18:23Z

src/main/java/com/zufar/onlinestore/payment/endpoint/PaymentEndpoint.java

+
+    @PostMapping("/card")
+    public ResponseEntity<ApiResponse<String>> processCardDetailsToken(@RequestBody @Valid final CreateCardDetailsTokenDto createCardDetailsTokenDto) {
+


remove extra space

Sunagatov · 2023-09-02T20:18:31Z

src/main/java/com/zufar/onlinestore/payment/endpoint/PaymentEndpoint.java

-                                                     @RequestHeader("Stripe-Signature") @NotEmpty final String stripeSignatureHeader) throws PaymentEventProcessingException, PaymentEventParsingException {
+    public ResponseEntity<ApiResponse<Void>> paymentEventProcess(@RequestBody @NotEmpty final String paymentIntentPayload,
+                                                     @RequestHeader("Stripe-Signature") @NotEmpty final String stripeSignatureHeader) {
+


remove extra space

Sunagatov · 2023-09-02T20:19:36Z

src/main/java/com/zufar/onlinestore/payment/api/impl/customer/StripeCustomerDataProcessor.java

+ * This class responsible for Stipe customer creation. It needed in order to connect
+ * customer with payment intent, this will ensure the correct management of payment by Stripe API
+ */
+


remove extra space

Sunagatov · 2023-09-02T20:19:39Z

src/main/java/com/zufar/onlinestore/payment/api/impl/customer/StripePaymentMethodProcessor.java

+ * on their payment method (stripe object). Payment method is secondary object for
+ * creating and processing payment by Stripe API.
+ */
+


remove extra space

yevr19 · 2023-09-02T21:37:02Z

src/main/java/com/zufar/onlinestore/payment/api/impl/customer/CardDetailsProcessor.java

+        return cardDetailsToken.getId();
+    }
+
+    private static Map<String, Object> createCardDetails(CreateCardDetailsTokenDto createCardDetailsTokenDto) {


remove static

yevr19 · 2023-09-02T21:39:13Z

src/main/java/com/zufar/onlinestore/payment/exception/handler/PaymentExceptionHandler.java

-import com.zufar.onlinestore.payment.exception.PaymentNotFoundException;
-import com.zufar.onlinestore.payment.exception.PaymentMethodProcessingException;
-import com.zufar.onlinestore.payment.exception.PaymentEventParsingException;
+import com.zufar.onlinestore.payment.exception.*;


Reyzis2021 added 11 commits August 6, 2023 11:05

Merge branch 'development' into feature/Payment-8/payment-api-refacto…

91ce3e6

…ring-with-customer-and-shoping-session-logic

Added Stripe customer and payment method logic. Refactored Payment Ap…

51a28f8

…i classes.

Merge branch 'development' into feature/Payment-8/payment-api-refacto…

0f098ad

…ring-with-customer-and-shoping-session-logic # Conflicts: # src/main/java/com/zufar/onlinestore/payment/converter/StripePaymentIntentConverter.java

Merge branch 'development' into feature/Payment-8/payment-api-refacto…

3003d75

…ring-with-customer-and-shoping-session-logic

Small converters refactoring

890d5ad

Merge branch 'development' into feature/Payment-8/payment-api-refacto…

82ae42b

…ring-with-customer-and-shoping-session-logic

Small converters refactoring part 2

1660628

Small converters refactoring part 3

98ed903

Add last changes

5a44313

Fixed code smells

e2ae8a6

vitaliibredun approved these changes Aug 25, 2023

View reviewed changes

yevr19 suggested changes Aug 26, 2023

View reviewed changes

Reyzis2021 added 5 commits August 31, 2023 19:13

Merge branch 'development' into feature/Payment-8/payment-api-refacto…

28acd3a

…ring-with-customer-and-shoping-session-logic # Conflicts: # src/main/java/com/zufar/onlinestore/user/converter/UserDtoConverter.java

Fix bug with multiple stripe customer creation and fix code by remark…

c5be6d3

…s from review

Merge branch 'development' into feature/Payment-8/payment-api-refacto…

e0d33fe

…ring-with-customer-and-shoping-session-logic # Conflicts: # src/main/java/com/zufar/onlinestore/payment/exception/handler/PaymentExceptionHandler.java

Add error handling for new exceptions

d317ec2

Add error handling for new exceptions

274c6e3

Sunagatov self-requested a review September 2, 2023 20:20

Sunagatov reviewed Sep 2, 2023

View reviewed changes

yevr19 reviewed Sep 2, 2023

View reviewed changes

Fixed errors by review comments part-2

ba5f096

yevr19 approved these changes Sep 4, 2023

View reviewed changes

Sunagatov merged commit 473fc52 into Sunagatov:development Sep 9, 2023



		@Mapper(componentModel = "spring", uses = ShoppingSessionItemDtoConverter.class)
		@Mapper(componentModel = MappingConstants.ComponentModel.SPRING, uses = {ShoppingSessionItemDtoConverter.class, ItemsTotalPriceCalculator.class})


		@PostMapping("/card")
		public ResponseEntity<ApiResponse<String>> processCardDetailsToken(@RequestBody @Valid final CreateCardDetailsTokenDto createCardDetailsTokenDto) {

[payment-8]: Payment api refactoring with customer and shoping session logic #87

[payment-8]: Payment api refactoring with customer and shoping session logic #87

Conversation

Reyzis2021 commented Aug 20, 2023

vitaliibredun left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Sunagatov left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment