Commit 705ec12b authored by Ramu Dosapati's avatar Ramu Dosapati

RetailStoreService and Utility classes are updated

parent 95c640a8
...@@ -324,7 +324,7 @@ public class RetailStoreService implements RetailStore, ProductFilter { ...@@ -324,7 +324,7 @@ public class RetailStoreService implements RetailStore, ProductFilter {
Connection connection = getConnection(); Connection connection = getConnection();
while (orderSelectFlag) { while (orderSelectFlag) {
Map<Integer, Order> orders = getOrders(connection); Map<Integer, Order> orders = getOrders(connection);
String orderMenu = orders.entrySet().stream().map(entry -> entry.getKey() + ". " + entry.getValue().getOrderId() + "\t" + entry.getValue().getCustomerName()).reduce((allorders, order) -> allorders + "\n" + order).get(); String orderMenu = orders.entrySet().stream().map(entry -> entry.getKey() + ". " + entry.getValue().getOrderId() + "\t" + entry.getValue().getCustomerName()).reduce((allorders, order) -> allorders + "\n" + order).orElse("\n----------\nNo orders currently in your orders list");
getLogger().info(orderMenu); getLogger().info(orderMenu);
getLogger().info("\n-----------------------------\nEnter 0 to go back.\n-----------------------------\n"); getLogger().info("\n-----------------------------\nEnter 0 to go back.\n-----------------------------\n");
getLogger().info("\n-----------------------------\nSelect order from the above list\n-----------------------------\n"); getLogger().info("\n-----------------------------\nSelect order from the above list\n-----------------------------\n");
......
...@@ -31,15 +31,18 @@ public final class Utility { ...@@ -31,15 +31,18 @@ public final class Utility {
} }
public static Size getSize(boolean check, String message) { public static Size getSize(boolean check, String message) {
Size sizeValue;
String categoryOptions = Arrays.stream(Size.values()).filter(size -> !size.equals(Size.EXIT)).map(size -> "(" + size.getOption() + ")" + size).reduce((sizes, size) -> sizes + " " + size).get() + "\nPress 0 to go back."; String categoryOptions = Arrays.stream(Size.values()).filter(size -> !size.equals(Size.EXIT)).map(size -> "(" + size.getOption() + ")" + size).reduce((sizes, size) -> sizes + " " + size).get() + "\nPress 0 to go back.";
if (check) { if (check) {
getLogger().info("\n------------------------\n" + message + "\n------------------------\n" + categoryOptions + "\n------------------------\n"); getLogger().info("\n------------------------\n" + message + "\n------------------------\n" + categoryOptions + "\n------------------------\n");
} }
int option = getInt(); int option = getInt();
return Arrays.stream(Size.values()).filter(size -> size.getOption() == option).findFirst().orElseGet(() -> { sizeValue = Arrays.stream(Size.values()).filter(size -> size.getOption() == option).findFirst().orElseGet(() -> {
getLogger().info("\n------------------------\nPlease enter valid category\n------------------------\n" + categoryOptions + "\n------------------------\n"); getLogger().info("\n------------------------\nPlease enter valid category\n------------------------\n" + categoryOptions + "\n------------------------\n");
return getSize(false, message); return getSize(false, message);
}); });
return sizeValue.equals(Size.EXIT) ? null : sizeValue;
} }
public static Gender getGender(boolean check, String message) { public static Gender getGender(boolean check, String message) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment