-
Notifications
You must be signed in to change notification settings - Fork 17
Refactor #12
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.
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
Open
andriikonoh
wants to merge
8
commits into
alexanderko:master
Choose a base branch
from
andriikonoh:Refactor
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Refactor #12
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
90004b0
Move implementations to specific classes
andriikonoh 10ade4f
Implement the ability to use offers before closing a check
andriikonoh b5f70e2
Implement the ability to use offers before closing a check
andriikonoh 379f99c
Implement expiration date cheker
andriikonoh cdf13b4
Implement StrategyRealisation
andriikonoh b463e1c
refactor
andriikonoh cd75158
refactor
andriikonoh 8d3712e
refactor(all project and test)
andriikonoh File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| package checkout; | ||
|
|
||
| public enum Brand { | ||
| VOLOSHKOVE_POLE | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| package checkout; | ||
|
|
||
| public class ByBrand implements Condition { | ||
| Brand brand; | ||
|
|
||
| public ByBrand(Brand brand){ | ||
| setBrand(brand); | ||
| } | ||
| @Override | ||
| public boolean checkCondition(Check check) { | ||
| boolean marker = false; | ||
| for (Product p : check.getProducts()) { | ||
| if (p.brand == brand) marker = true; | ||
| } | ||
| return marker; | ||
| } | ||
|
|
||
| public void setBrand(Brand brand) { | ||
| this.brand = brand; | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| package checkout; | ||
|
|
||
| public class ByCategory implements Condition{ | ||
| Category category; | ||
|
|
||
| public ByCategory(Category category){ | ||
| setCategory(category); | ||
| } | ||
| @Override | ||
| public boolean checkCondition(Check check){ | ||
| boolean marker = false; | ||
| for(Product p : check.getProducts()){ | ||
| if (p.category == category) marker = true; | ||
| } | ||
| return marker; | ||
| } | ||
|
|
||
| public void setCategory(Category category) { | ||
| this.category = category; | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| package checkout; | ||
|
|
||
| public interface Condition { | ||
| boolean checkCondition(Check check); | ||
| } | ||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| package checkout; | ||
|
|
||
| public class DiscountByBrand implements Reward { | ||
| private double discount; | ||
| private Brand brand; | ||
|
|
||
| public DiscountByBrand(double discount, Brand brand){ | ||
| setBrand(brand); | ||
| setDiscount(discount); | ||
| } | ||
| @Override | ||
| public void apply(Check check){ | ||
| Double points = check.getPointsForBrand(brand) * discount * 10; | ||
| check.addDiscount(points.intValue()); | ||
| } | ||
|
|
||
| public void setBrand(Brand brand) { | ||
| this.brand = brand; | ||
| } | ||
|
|
||
| public void setDiscount(double discount) { | ||
| this.discount = discount; | ||
| } | ||
| } |
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| package checkout; | ||
|
|
||
| public class FactorRewardByCategory implements Reward { | ||
| private int factor; | ||
| Category category; | ||
|
|
||
| public FactorRewardByCategory(int factor, Category category){ | ||
| setCategory(category); | ||
| setFactor(factor); | ||
| } | ||
| @Override | ||
| public void apply(Check check){ | ||
| int points = check.getCostByCategory(category); | ||
| check.addPoints(points * (factor-1)); | ||
| } | ||
|
|
||
| public void setFactor(int factor){ | ||
| this.factor = factor; | ||
| } | ||
|
|
||
| public void setCategory(Category category) { | ||
| this.category = category; | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| package checkout; | ||
|
|
||
| public class FlatReward implements Reward { | ||
| private int reward; | ||
|
|
||
| public FlatReward (int reward){ | ||
| setReward(reward); | ||
| } | ||
| @Override | ||
| public void apply(Check check) { | ||
| check.addPoints(reward); | ||
| } | ||
|
|
||
| public void setReward(int reward) { | ||
| this.reward = reward; | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.