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

Feature/app checkout #86

Merged
merged 32 commits into from
Apr 21, 2022
Merged

Feature/app checkout #86

merged 32 commits into from
Apr 21, 2022

Conversation

this-kramer
Copy link
Member

@this-kramer this-kramer commented Mar 10, 2022 •
edited
Loading

Reason for this PR:

  • Implement earn / spend process in app

Changes in this PR:

  • Implement batch api (send all earn/spend requests in one POST request)
  • Implement lock mechanism (proof results can only be queried once basket is payed)
  • Update libmcl for the docker images
  • Minor refactoring in promotion along-the-way
  • UI for choosing token-updates (User-understandable text + explanation of cryptographic background)
    image
  • UI for checkout process (summary, progress indicator, finished screen image

Checklist:

Select whatever applies:

  • Test written
  • Code Properly Formatted
  • Documented
  • Changelog updated

@this-kramer
Add instructions on how to run integration tests and comments
49dee12
@this-kramer
Fix test cases/payment api
b76d1e8
@this-kramer
Update mcl
5ffc80a
@this-kramer
Add some logging to batch proof at service
8ab1c3d
@this-kramer
Extend api of repositories, some bugfixes in REST APIs
e9b0060
@this-kramer
Use correct vector index for VIP status in dashboard ui
39f3a3b
@this-kramer
Add simple checkout ui that is opened when user pays basket
2baf172
@this-kramer
Finish PayAndRedeemUseCase
0240b59
@this-kramer
Work on checkout ui, simplify some dataclasses
397f6ec
@this-kramer
Move reward choice to new screen
8796a0a
@this-kramer
Add model to checkout to prepare having user-centered texts
1ad4abd
@this-kramer
Add data model for checkout screen
a0cc8bd
@this-kramer
Work on checkout ui, reduce font size in dashboard
eef470e
@this-kramer
Add test for timestamp serialization to cover long bug
2bd7427
@this-kramer
Remove resolved todo in crypto
48c93bd
@this-kramer
Minor UI tweaks for checkout UI
d59112d
@this-kramer this-kramer marked this pull request as ready for review April 13, 2022 21:08
pschuermann97
pschuermann97 approved these changes Apr 20, 2022
View reviewed changes
Copy link
Collaborator

@pschuermann97 pschuermann97 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

some minor comments on naming and perhaps missing comments, but looks good overall :)

android/app/src/main/java/org/cryptimeleon/incentive/app/domain/IBasketRepository.kt Show resolved Hide resolved
android/app/src/main/java/org/cryptimeleon/incentive/app/domain/model/PromotionState.kt Outdated Show resolved Hide resolved
android/app/src/main/java/org/cryptimeleon/incentive/app/domain/model/UserUpdateChoice.kt Show resolved Hide resolved
...app/src/main/java/org/cryptimeleon/incentive/app/domain/usecase/GetPromotionStatesUseCase.kt Show resolved Hide resolved
android/app/src/main/java/org/cryptimeleon/incentive/app/domain/usecase/PayAndRedeemUseCase.kt Show resolved Hide resolved
...es/client/src/main/java/org/cryptimeleon/incentive/client/dto/inc/TokenUpdateResultsDto.java Outdated Show resolved Hide resolved
...ces/inc/src/main/java/org/cryptimeleon/incentive/services/promotion/PromotionController.java Show resolved Hide resolved
services/inc/src/main/java/org/cryptimeleon/incentive/services/promotion/PromotionService.java Show resolved Hide resolved
services/inc/src/main/java/org/cryptimeleon/incentive/services/promotion/PromotionService.java Show resolved Hide resolved
...va/org/cryptimeleon/incentive/services/promotion/repository/TokenUpdateResultRepository.java Outdated Show resolved Hide resolved
@this-kramer this-kramer merged commit 0d6f810 into develop Apr 21, 2022
@this-kramer this-kramer deleted the feature/app-checkout branch April 21, 2022 07:29
This was referenced Apr 21, 2022
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pschuermann97 pschuermann97 pschuermann97 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@this-kramer @pschuermann97