Skip to content

10 #2

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

Open
PawelAbleneo wants to merge 2 commits into
base: main
Choose a base branch
from
Open

10 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7773544
10
PawelAbleneo Oct 19, 2023
34d07e8
Merge branch 'main' into 10
ktor Oct 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 15 additions & 11 deletions src/main/java/sk/ableneo/openslava2023/codefix/BalloonChallenge.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,25 @@
public class BalloonChallenge {

public LinkedList findOrdersForProduct(Product p, boolean debug) {
ArrayList l = new ArrayList();
ArrayList list = getAllOrders();
for (int i = 0; i < list.size(); i++) {
Order order = (Order) list.get(i);
ArrayList checkedOrderList = new ArrayList();
ArrayList allOrderslist = getAllOrders();
for (Object o : allOrderslist) {
Order order = (Order) o;
boolean found = false;
if (order.getProducts().size() > 0) {
for (int j = 0; j <= order.getProducts().size(); j++) {
Product p2 = (Product) order.getProducts().get(j);
found = (p2 == p);
if (!order.getProducts().isEmpty()) {
for (int j = 0; j < order.getProducts().size(); j++) {
Product p2 = order.getProducts().get(j);
found = (p2.equals(p));
}
if (found && order != null)
l.add(order);
if (found)
try {
checkedOrderList.add(order);
} catch (RuntimeException e) {
throw new RuntimeException("Can`t add order " + e);
}
}
}
return new LinkedList(l);
return new LinkedList(checkedOrderList);
}

public ArrayList getAllOrders() {
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/sk/ableneo/openslava2023/codefix/BalloonChallengeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class BalloonChallengeTest {
@BeforeEach
void setUp() {
when(balloonChallenge.getAllOrders()).thenReturn(
new ArrayList<Object>(Arrays.asList(
new ArrayList<Order>(Arrays.asList(
new Order(new ArrayList<>(Arrays.asList(new Product("hot air balloon")))),
new Order(new ArrayList<>(Arrays.asList(new Product("gas balloon")))),
new Order(new ArrayList<>(Arrays.asList(new Product("gas balloon"))))
Expand Down