Package refactor. Extra work on Session 4 Homework - IN PROGRESS

src/JavaBasicsLab/MainClassForFirstSession.java → src/JavaBasicsLab/S01_02_03/MainClassForFirstSession.java

@@ -1,4 +1,4 @@
-package JavaBasicsLab;
+package JavaBasicsLab.S01_02_03;
 
 import java.util.ArrayList;
 import java.util.Random;

src/JavaBasicsLab/CabinetVeterinar.java → src/JavaBasicsLab/S04/CabinetVeterinar.java

@@ -1,4 +1,4 @@
-package JavaBasicsLab;
+package JavaBasicsLab.S04;
 
 public class CabinetVeterinar {
  Caine[] registruCaini = new Caine[100];

src/JavaBasicsLab/Caine.java → src/JavaBasicsLab/S04/Caine.java

@@ -1,4 +1,4 @@
-package JavaBasicsLab;
+package JavaBasicsLab.S04;
 
 public class Caine {
  private String rasa;

src/JavaBasicsLab/S04/Homework/CashRegister.java

@@ -0,0 +1,37 @@
+package JavaBasicsLab.S04.Homework;
+
+public class CashRegister {
+ private String name;
+ private String currency;
+ private double availableAmount;
+
+ public CashRegister(String name, String currency, double availableAmount) {
+ this.name = name;
+ this.currency = currency;
+ this.availableAmount = availableAmount;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getCurrency() {
+ return currency;
+ }
+
+ public void setCurrency(String currency) {
+ this.currency = currency;
+ }
+
+ public double getAvailableAmount() {
+ return availableAmount;
+ }
+
+ public void sellShopItems() {
+ //TODO
+ }
+}

src/JavaBasicsLab/SessionFourHomework/Inventory.java → src/JavaBasicsLab/S04/Homework/Inventory.java

@@ -1,7 +1,8 @@
-package JavaBasicsLab.SessionFourHomework;
+package JavaBasicsLab.S04.Homework;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
+import java.util.Scanner;
 
 public class Inventory {
  private String name;
@@ -27,24 +28,33 @@ public void addToStock(ShopItem si, int amount) {
  stock.put(si, amount);
  }
  } else {
- System.out.println("Invalid amount. Amount must be greater or equal to 0");
+ System.out.println("Invalid amount. Amount must be greater than or equal to 0");
  }
  }
 
  public void removeFromStock(ShopItem si, int amount){
  if(isInStock(si)){
- if ((stock.get(si)) < amount){
- stock.replace(si, amount);
+ if (!(stock.get(si) < amount)){
+ stock.replace(si, stock.get(si) - amount);
  } else {
  System.out.println(String.format("The amount entered <enteredAmount: %s> is greater than the available" +
- " stock amount <existingAmount: %s> for the %s Shop Item. No remove action was performed.",
+ " stock amount <existingAmount: %s> for the \"%s\" Shop Item. No remove action was performed.",
  amount, stock.get(si), si.getName()));
  }
  } else {
  System.out.println("Shop Item " + si.getName() + " is not in stock");
  }
  }
 
+
+ public void purgeFromStock(ShopItem si){
+ if(isInStock(si) && areYouSureValidation("PURGE", si)) {
+ stock.remove(si);
+ } else {
+ System.out.println("Shop Item not in stock.");
+ }
+ }
+
  public boolean isInStock(ShopItem si) {
  return stock.containsKey(si);
  }
@@ -56,4 +66,16 @@ public void printStock() {
  }
  System.out.println("---------");
  }
+
+ public boolean areYouSureValidation(String action, ShopItem si){
+ Scanner sc = new Scanner(System.in);
+ System.out.println(String.format("Are you sure you want to %s the Shop Item \"%s?\" (y/n)", action, si.getName()));
+ String i = sc.nextLine();
+ if(!i.toLowerCase().equals("y") && !i.toLowerCase().equals("n")) {
+ System.out.println("Please insert only \'y\' or \'n\'");
+ areYouSureValidation(action, si);
+ }
+ return i.toLowerCase().equals("y");
+ }
+
 }

src/JavaBasicsLab/SessionFourHomework/Main.java → src/JavaBasicsLab/S04/Homework/Main.java

@@ -1,23 +1,25 @@
-package JavaBasicsLab.SessionFourHomework;
+package JavaBasicsLab.S04.Homework;
 
 public class Main {
  public static void main(String[] args) {
  ShopItem ouaDeGaina = new ShopItem("oua", "Oua De Gaina", "O-001", 0.82);
  ShopItem ouaDePrepelita = new ShopItem("oua", "Oua De Prepelita", "O-002", 1.44);
  ShopItem carneDeVita = new ShopItem("carne", "Carne De Vita", "C-001", 8.21);
- ShopItem zahar = new ShopItem("Ingrediente", "Oua De Prepelita", "I-001", 4.00);
+ ShopItem zahar = new ShopItem("Ingrediente", "Zahar", "I-001", 4.00);
 
  Inventory magazin1 = new Inventory("Magazin 1");
  magazin1.addToStock(ouaDeGaina, 30);
  magazin1.addToStock(ouaDePrepelita, -3);
  magazin1.addToStock(ouaDePrepelita, 6);
+ magazin1.printStock();
+ magazin1.purgeFromStock(ouaDePrepelita);
  magazin1.addToStock(carneDeVita, 10);
  magazin1.addToStock(zahar, 23);
  System.out.println(magazin1.isInStock(ouaDePrepelita));
  magazin1.printStock();
  magazin1.addToStock(zahar, 23);
  magazin1.printStock();
- magazin1.removeFromStock(zahar, 26);
+ magazin1.removeFromStock(zahar, 46);
  magazin1.printStock();
  magazin1.removeFromStock(zahar, 2);
  }

src/JavaBasicsLab/SessionFourHomework/ShopItem.java → src/JavaBasicsLab/S04/Homework/ShopItem.java

@@ -1,4 +1,4 @@
-package JavaBasicsLab.SessionFourHomework;
+package JavaBasicsLab.S04.Homework;
 
 public class ShopItem {
  private String category;

src/JavaBasicsLab/S04/Homework/ShoppingCart.java

@@ -0,0 +1,17 @@
+package JavaBasicsLab.S04.Homework;
+
+public class ShoppingCart extends Inventory {
+
+ public ShoppingCart(String name) {
+ super(name);
+ }
+
+ public double returnTotalPrice(){
+ //TODO
+ return 0;
+ }
+
+ public void buyShoppingCart(){
+ //TODO
+ }
+}

src/JavaBasicsLab/MainClassSession4.java → src/JavaBasicsLab/S04/MainClassSession4.java

@@ -1,4 +1,6 @@
-package JavaBasicsLab;
+package JavaBasicsLab.S04;
+
+import JavaBasicsLab.S04.Caine;
 
 public class MainClassSession4 {
  public static void main(String[] args) {