MikhailMS · MikhailMS · Jan 19, 2018 · Dec 14, 2017 · Dec 15, 2017 · Dec 15, 2017
diff --git a/.travis.yml b/.travis.yml
@@ -1,21 +1,38 @@
 language: java
-jdk:
-  - oraclejdk8
-
-env:
-        - CODACY_PROJECT_TOKEN=30ded88adc3944479b2de1780b26f01b
 
 sudo: required
+
 services:
   - docker
 
 before_install:
-        - sudo apt-get install jq
-        - wget -O ~/codacy-coverage-reporter-assembly-latest.jar $(curl https://api.github.com/repos/codacy/codacy-coverage-reporter/releases/latest | jq -r .assets[0].browser_download_url)
+  - sudo apt-get install jq
+  - wget -O ~/codacy-coverage-reporter-assembly-latest.jar $(curl https://api.github.com/repos/codacy/codacy-coverage-reporter/releases/latest | jq -r .assets[0].browser_download_url)
+
+matrix:
+  include:
+    # Headless Linux
+    - os: linux
+      dist: trusty
+      jdk: oraclejdk8
+      env:
+        - CODACY_PROJECT_TOKEN=30ded88adc3944479b2de1780b26f01b
+        - _JAVA_OPTIONS="-Djava.awt.headless=true -Dtestfx.robot=glass -Dtestfx.headless=true -Dprism.order=sw -Dprism.text=t2k -Dtestfx.setup.timeout=2500"
 
 after_success:
-        - java -cp ~/codacy-coverage-reporter-assembly-latest.jar com.codacy.CodacyCoverageReporter -l Java -r build/reports/jacoco/test/jacocoTestReport.xml
+  - java -cp ~/codacy-coverage-reporter-assembly-latest.jar com.codacy.CodacyCoverageReporter -l Java -r build-reporting/target/coverage-reports/jacoco.xml
 
 notifications:
   slack:
     secure: XLI9vZQkaPSqxychm54I+u6dteSiDzp5aBcukX+CRpP8zF3QMLTYD4kEr0Mh45kWqbznB/Xb+tiDZNyDcU+O+nc+B2HrjU92ENrsWzpztbN6Nz/qGszjjhiU0JfD222qBeFATydJAutlU93PbX/hiIrCZCwSUKz9X0qpTV1XO/i5VvewONH4/yCE4lXo9XYZHKDCO9HxmxlLGxM7mdjlZMSywFYndmqK5Npz5SutPX9Ml7Ap0LpHwrRhuX1eNNkN4L16RKGbkSY1QGv+O7ab3l0Kwmfi4CT/4aeK46YZfb6yypNfQrxf2ZVesS2e11wFYiF4/rzDs/KMBX5fAN/vUv3ABEPj+5DnY29vMS2n3NwlxwD0eXdwdl+O5ScYRl20rZ9xQevlh07toxvOLttnifeocLxMM8M0LvRsaTXGiimjmWOR0yel3h5688I8diF8emUwF9XNfocaSQveU8vKCyYA+BVs2AVH3exGPOzYT66FtJEPAWp0Zu+zSwagPGnnjUUgubZOG2qAFPlnCnIDnPx4G6iEYi1BpjwkIGvSkyXEBVKLZqvMUeSYdEVOojUjSKJLPZ9zDoMEBHOWcY/lduPVotaYHy8C/pBAegqkX7dtM2p9BiHYjO44kYcFeTGgk4lr60DWJ2lpVM/KSyn9Lgtj03JWqoTXG+p2JjbkflY=
+
+before_cache:
+  - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
+  - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
+  - rm -f  $HOME/.gradle/caches/*/fileHashes/fileHashes.bin
+  - rm -f  $HOME/.gradle/caches/*/fileHashes/fileHashes.lock
+
+cache:
+  directories:
+    - $HOME/.gradle/caches/
+    - $HOME/.gradle/wrapper/
diff --git a/README.md b/README.md
@@ -54,39 +54,69 @@ Also I am using TDD approach to complete this project as I found this really con
           - [x] Filter orders by date
           - [x] Filter orders by total price 
 
-  - [ ] As an optional part, I'd like to introduce GUI, which will make it easier to fill basket, see orders and etc
-      - [ ] Login screen
-      - [ ] Can login into system and gain appropriate rights
-      - [ ] Client GUI
-          - [ ] See all available products
-          - [ ] Add to basket
-          - [ ] Remove from basket
-          - [ ] Save basket
-          - [ ] Restore basket
-          - [ ] Make order
-          - [ ] Save order
-          - [ ] Complete order
-          - [ ] Restore order
-          - [ ] See all completed orders (client can see only his orders)
-          - [ ] Search for specific product by name
-          - [ ] Filter products by price, weight
-          - [ ] Filter orders by date/total price
-      - [ ] Administrator GUI
-          - [ ] See all available products
-          - [ ] See total cost of all products
-          - [ ] Add products to inventory
-          - [ ] Remove products from inventory
-          - [ ] See orders completed by any user
-          - [ ] See total cost of all completed orders
-          - [ ] Add user to the system
-          - [ ] Delete user from system
-          - [ ] Search for specific product by name
-          - [ ] Filter products by price, weight
-          - [ ] Filter orders by date/total price
-
+  - [x] As an optional part, I'd like to introduce GUI, which will make it easier to fill basket, see orders and etc
+      - [x] Login screen
+      - [x] Can login into system and gain appropriate rights
+      - [x] Client GUI
+          - [x] See all available products
+          - [x] Add to basket
+          - [x] Remove from basket
+          - [x] Complete order
+          - [x] See all completed orders (client can see only his orders) 
+          - [x] See total cost of all completed orders
+          - [x] Sort orders by total price
+          - [x] Filter orders by total price
+          - [x] Search for specific product by name
+          - [x] Sort products by name, price and weight
+          - [x] Filter products by name, price and weight
+      - [x] Administrator GUI
+          - [x] See all available products 
+          - [x] See total cost of all products
+          - [x] Add new product to inventory 
+          - [x] Add products to inventory
+          - [x] Remove products from inventory 
+          - [x] See orders completed by any user 
+          - [x] See total cost of all completed orders
+          - [x] Sort orders by date, total price
+          - [x] Filter orders by date/total price
+          - [x] Add user to the system
+          - [x] Delete user from system
+          - [x] Search for specific product by name
+          - [x] Sort products by name, price
+          - [x] Filter products by price, weight
+      - [x] Bring all GUI components into one Stage
+          - [x] Create main stage with TabPane(tab panel, that contains scenes) 
+              - [x] Main stage, which creates tab panels depending on the privilege level of the logged user
+              - [x] Save basket 
+              - [x] Restore basket
+          - [x] Connect GUI to database
+              - [x] Login GUI
+              - [x] Client GUI
+                  - [x] Highlighted parts
+              - [x] Administrator GUI
+                  - [x] Highlighted parts
+
+      - [x] Finish up tests
+          - [x] Review tests for the project so far
+          - [x] MainStage GUI tests
+              - [x] Client GUI tests
+              - [x] Administrator GUI tests
+
   - [ ] As an optional part, I'd like to write a service, which will keep shop's inventory in sync with DB and completed orders
       - [ ] Once order is completed, service will update inventory in the DB and update local copy of the inventory
       - [ ] It will also check, if order can be made, ie not enough products in the inventory
       - [ ] If product(-s) not available to order, notify user and administrator  
+
+## Bug trace
+  - [x] When adding new product via form, product is added, but then I cannot change its amount
+  - [x] **METHOD DEPRECATED - WILL BE DELETED** restoreBasketFromDB method shall be fixed, as currently it's hardcoded to use fixed weight and price for all restored products in Basket
+  - [ ] When completing order as Client in GUI, basket is not reset. Should find a way to clear it
+  - [ ] When basket has been restored, restored products cannot be removed.
+
+## Improvements, that could be done later
+  - [ ] At the moment user can add more products into basket than there exist in inventory -> make them talk to one another
+  - [ ] At the moment there is no column to sort orders by date, but could be added. Will require extra column in GUI and extra filed in Order class
+  - [ ] At the moment data in rows does not update straight after product has been added/removed to/from basket/inventory, but rather after row been clicked, table been sorted or Details button been clicked
+  - [ ] At the moment, when new product added to basket/inventory, in order to display it, I delete all entries from observable list + its underlying list
 
-## Build and tested on MacOS and Java 1.8
+## Build and tested on MacOS and Java 1.8 (_**required**_)
diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,16 @@
   <version>1.0</version>
   <name>shop</name>
   <url>https://example.com</url>
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
   <dependencies>
+    <!-- https://mvnrepository.com/artifact/org.controlsfx/controlsfx -->
+    <dependency>
+      <groupId>org.controlsfx</groupId>
+      <artifactId>controlsfx</artifactId>
+      <version>8.40.14</version>
+    </dependency>
     <!-- https://mvnrepository.com/artifact/junit/junit -->
     <dependency>
       <groupId>junit</groupId>
@@ -20,17 +29,17 @@
       <artifactId>postgresql</artifactId>
       <version>42.1.4</version>
     </dependency>
-    <!-- For testing DB related stuff -->
+    <!-- DB testing libraries -->
     <dependency>
       <groupId>org.testcontainers</groupId>
       <artifactId>testcontainers</artifactId>
-      <version>1.4.3</version>
+      <version>1.5.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.testcontainers</groupId>
       <artifactId>postgresql</artifactId>
-      <version>1.4.3</version>
+      <version>1.5.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -45,6 +54,36 @@
       <version>2.0.0</version>
       <scope>test</scope>
     </dependency>
+    <!-- GUI testing libraries -->
+    <dependency>
+      <groupId>org.testfx</groupId>
+      <artifactId>testfx-core</artifactId>
+      <version>4.0.10-alpha</version>
+    </dependency>
+    <dependency>
+      <groupId>org.testfx</groupId>
+      <artifactId>testfx-junit</artifactId>
+      <version>4.0.10-alpha</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+        <groupId>org.loadui</groupId>
+        <artifactId>testFx</artifactId>
+        <version>3.1.2</version>
+        <scope>test</scope>
+    </dependency>
+    <dependency>
+        <groupId>org.testfx</groupId>
+        <artifactId>openjfx-monocle</artifactId>
+        <version>8u76-b04</version> <!-- To run tests in Travis CI -->
+        <scope>test</scope>
+    </dependency>
+<!--    <dependency>
+        <groupId>org.testfx</groupId>
+        <artifactId>testfx-core</artifactId>
+        <version>RELEASE</version>
+        <scope>test</scope>
+    </dependency>-->
   </dependencies>
   <build>
     <plugins>

diff --git a/shop.iml b/shop.iml
@@ -8,12 +8,13 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="1.8-newer" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: org.controlsfx:controlsfx:8.40.14" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
+    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
     <orderEntry type="library" name="Maven: org.postgresql:postgresql:42.1.4" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.testcontainers:testcontainers:1.4.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.testcontainers:testcontainers:1.5.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: com.kohlschutter.junixsocket:junixsocket-common:2.0.4" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: com.kohlschutter.junixsocket:junixsocket-native-common:2.0.4" level="project" />
@@ -28,6 +29,11 @@
     <orderEntry type="library" scope="TEST" name="Maven: org.rnorth.duct-tape:duct-tape:1.0.6" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.jetbrains:annotations:13.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.slf4j:slf4j-ext:1.7.25" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: net.java.dev.jna:jna:4.5.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.testcontainers:postgresql:1.5.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.testcontainers:jdbc:1.5.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.zaxxer:HikariCP:2.7.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.rnorth.visible-assertions:visible-assertions:2.0.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: com.github.jnr:jnr-posix:3.0.41" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: com.github.jnr:jnr-ffi:2.1.4" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: com.github.jnr:jffi:1.2.15" level="project" />
@@ -39,9 +45,12 @@
     <orderEntry type="library" scope="TEST" name="Maven: org.ow2.asm:asm-util:5.0.3" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: com.github.jnr:jnr-x86asm:1.0.2" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: com.github.jnr:jnr-constants:0.9.8" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.testcontainers:postgresql:1.4.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.testcontainers:jdbc:1.4.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: com.zaxxer:HikariCP:2.7.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.rnorth.visible-assertions:visible-assertions:2.0.0" level="project" />
+    <orderEntry type="library" name="Maven: org.testfx:testfx-core:4.0.10-alpha" level="project" />
+    <orderEntry type="library" name="Maven: org.testfx:testfx-internal-java8:4.0.10-alpha" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.testfx:testfx-junit:4.0.10-alpha" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.loadui:testFx:3.1.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.google.guava:guava:14.0.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-all:1.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.testfx:openjfx-monocle:8u76-b04" level="project" />
   </component>
 </module>
diff --git a/src/main/java/com/molotkov/Basket.java b/src/main/java/com/molotkov/Basket.java
@@ -5,10 +5,13 @@
 import com.molotkov.interfaces.StringFormatter;
 import com.molotkov.products.Product;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
 import java.util.stream.Collectors;
 
-import static com.molotkov.Utils.iterateSimultaneously;
+import static com.molotkov.extras.Utils.iterateSimultaneously;
 
 public class Basket implements ProductStorage {
     private HashMap<Product, Integer> products;
@@ -25,7 +28,7 @@ public Basket() {
 
     public void addProducts(final Product product, final int amount) throws BasketException {
         if (product != null) {
-            final int currentAmount = this.products.getOrDefault(product,0);
+            final int currentAmount = this.products.getOrDefault(product, 0);
             this.products.put(product, currentAmount + amount);
         } else {
             throw new BasketException("You cannot add Null objects to Basket!");
@@ -34,9 +37,9 @@ public void addProducts(final Product product, final int amount) throws BasketEx
 
     public void removeProducts(final Product product, final int amount) throws BasketException {
         if (this.products.get(product) > amount) {
-            this.products.replace(product,this.products.get(product)-amount);
+            this.products.replace(product, this.products.get(product) - amount);
         } else if (this.products.get(product) == amount) {
-            this.products.remove(product);
+            this.products.replace(product, 0);
         } else {
             throw new BasketException(String.format("Cannot remove %d instances of product as there are only %d instances!",
                     amount, this.products.get(product)));
@@ -50,7 +53,7 @@ public HashMap<Product, Integer> getProducts() {
     public double calculateTotal() {
         return this.products.entrySet().
                 parallelStream().
-                mapToDouble(product -> product.getKey().getPrice()*product.getValue()).
+                mapToDouble(product -> product.getKey().getPrice() * product.getValue()).
                 sum();
     }
 
@@ -66,7 +69,7 @@ public ArrayList<String> toDBFormat() {
         final ArrayList<String> result = new ArrayList<>();
         final String names = this.products.entrySet().
                 parallelStream().
-                map(p -> String.format("'%s'",p.getKey().getName())).
+                map(p -> p.getKey().getName()).
                 collect(Collectors.joining(","));
         final String amounts = this.products.entrySet().
                 parallelStream().
@@ -78,6 +81,7 @@ public ArrayList<String> toDBFormat() {
         return result;
     }
 
+    @Deprecated
     public void restoreFromDB(final String productsName, final String productsAmount) {
         final List<String> names = Arrays.asList(productsName.split(","));
         final List<String> amounts = Arrays.asList(productsAmount.split(","));

diff --git a/src/main/java/com/molotkov/Inventory.java b/src/main/java/com/molotkov/Inventory.java
@@ -4,14 +4,15 @@
 import com.molotkov.interfaces.ProductStorage;
 import com.molotkov.interfaces.StringFormatter;
 import com.molotkov.products.Product;
+
 import java.text.DecimalFormat;
 import java.util.HashMap;
 
 public class Inventory implements ProductStorage {
     private HashMap<Product, Integer> products;
     private StringFormatter stringFormatter;
 
-    Inventory() {
+    public Inventory() {
         this.products = new HashMap<>();
         this.stringFormatter = () -> {
             final int productsSize = this.products.size();
@@ -23,7 +24,7 @@ public class Inventory implements ProductStorage {
 
     public void addProducts(final Product product, final int amount) throws InventoryException {
         if (product != null) {
-            final int currentAmount = this.products.getOrDefault(product,0);
+            final int currentAmount = this.products.getOrDefault(product, 0);
             this.products.put(product, currentAmount + amount);
         } else {
             throw new InventoryException("You cannot add Null objects to products!");
@@ -32,9 +33,9 @@ public void addProducts(final Product product, final int amount) throws Inventor
 
     public void removeProducts(final Product product, final int amount) throws InventoryException {
         if (this.products.get(product) > amount) {
-            this.products.replace(product,this.products.get(product)-amount);
+            this.products.replace(product, this.products.get(product) - amount);
         } else if (this.products.get(product) == amount) {
-            this.products.remove(product);
+            this.products.replace(product, 0);
         } else {
             throw new InventoryException(String.format("Cannot remove %d instances" +
                     " of product as there are only %d instances!", amount, this.products.get(product)));
@@ -48,7 +49,7 @@ public HashMap<Product, Integer> getProducts() {
     public double calculateTotal() {
         return this.products.entrySet().
                 parallelStream().
-                mapToDouble(product -> product.getKey().getPrice()*product.getValue()).
+                mapToDouble(product -> product.getKey().getPrice() * product.getValue()).
                 sum();
     }