Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[PAYMENT] Implemented beta controller and service, added swagger to the controller #16

Merged
merged 19 commits into from
Oct 4, 2023
Merged

[PAYMENT] Implemented beta controller and service, added swagger to the controller #16

merged 19 commits into from
Oct 4, 2023

Commits on Oct 3, 2023

  1. added base stucture for paymentController, added Payment dtos and sam… 

    …ple of StripeService
    @ivan0dyatlyukkk
    ivan0dyatlyukkk committed Oct 3, 2023
    Configuration menu
    Copy the full SHA
    6c00b43 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into feat-payment 

    # Conflicts:
#	pom.xml
    @ivan0dyatlyukkk
    ivan0dyatlyukkk committed Oct 3, 2023
    Configuration menu
    Copy the full SHA
    736530f View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into feat-payment

    @ivan0dyatlyukkk
    ivan0dyatlyukkk committed Oct 3, 2023
    Configuration menu
    Copy the full SHA
    ab6a03d View commit details
    Browse the repository at this point in the history

  4. added stategy for choosing payment type, created initial structures f… 

    …or payment controller, service and stripe service
    @ivan0dyatlyukkk
    ivan0dyatlyukkk committed Oct 3, 2023
    Configuration menu
    Copy the full SHA
    7578376 View commit details
    Browse the repository at this point in the history

  5. testing creating payment session

    @ivan0dyatlyukkk
    ivan0dyatlyukkk committed Oct 3, 2023
    Configuration menu
    Copy the full SHA
    04bea7c View commit details
    Browse the repository at this point in the history

  6. implemented create payment and create stripe session endpoint, adjust… 

    …ed rental repository and made some sligth changes in create-payments yaml file
    @ivan0dyatlyukkk
    ivan0dyatlyukkk committed Oct 3, 2023
    Configuration menu
    Copy the full SHA
    93cf475 View commit details
    Browse the repository at this point in the history

  7. improved payment controller, service and repository, adjusted stripe … 

    …service
    @ivan0dyatlyukkk
    ivan0dyatlyukkk committed Oct 3, 2023
    Configuration menu
    Copy the full SHA
    17640a5 View commit details
    Browse the repository at this point in the history

  8. added swagger to the payment controller and fixed checkstyle issues

    @ivan0dyatlyukkk
    ivan0dyatlyukkk committed Oct 3, 2023
    Configuration menu
    Copy the full SHA
    62657c5 View commit details
    Browse the repository at this point in the history

  9. added an option for easy testing

    @ivan0dyatlyukkk
    ivan0dyatlyukkk committed Oct 3, 2023
    Configuration menu
    Copy the full SHA
    0b203a5 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'main' into feat-payment

    @ivan0dyatlyukkk
    ivan0dyatlyukkk authored Oct 3, 2023
    Configuration menu
    Copy the full SHA
    855d029 View commit details
    Browse the repository at this point in the history

  11. adjusted test properties file

    @ivan0dyatlyukkk
    ivan0dyatlyukkk committed Oct 3, 2023
    Configuration menu
    Copy the full SHA
    0a8b36c View commit details
    Browse the repository at this point in the history

  12. Merge remote-tracking branch 'origin/feat-payment' into feat-payment

    @ivan0dyatlyukkk
    ivan0dyatlyukkk committed Oct 3, 2023
    Configuration menu
    Copy the full SHA
    95b7be5 View commit details
    Browse the repository at this point in the history

  13. Update application.properties

    @ivan0dyatlyukkk
    ivan0dyatlyukkk authored Oct 3, 2023
    Configuration menu
    Copy the full SHA
    422d6d0 View commit details
    Browse the repository at this point in the history

  14. Updated PaymentAmountHandlerStrategy.java

    @ivan0dyatlyukkk
    ivan0dyatlyukkk authored Oct 3, 2023
    Configuration menu
    Copy the full SHA
    425ad4e View commit details
    Browse the repository at this point in the history

  15. Updated PaymentService.java

    @ivan0dyatlyukkk
    ivan0dyatlyukkk authored Oct 3, 2023
    Configuration menu
    Copy the full SHA
    1506abd View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2023

  1. Merge branch 'main' into feat-payment

    @ivan0dyatlyukkk
    ivan0dyatlyukkk authored Oct 4, 2023
    Configuration menu
    Copy the full SHA
    6d1bcba View commit details
    Browse the repository at this point in the history

  2. fixed small mistakes

    @ivan0dyatlyukkk
    ivan0dyatlyukkk committed Oct 4, 2023
    Configuration menu
    Copy the full SHA
    5731675 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/feat-payment' into feat-payment 

    # Conflicts:
#	src/main/resources/application.properties
    @ivan0dyatlyukkk
    ivan0dyatlyukkk committed Oct 4, 2023
    Configuration menu
    Copy the full SHA
    81328bc View commit details
    Browse the repository at this point in the history

  4. resolved all of conflicts and updated the branch for implementing pay… 

    …ment features
    @ivan0dyatlyukkk
    ivan0dyatlyukkk committed Oct 4, 2023
    Configuration menu
    Copy the full SHA
    3aa6990 View commit details
    Browse the repository at this point in the history