Errors fixed when creating/managing products

https://git.server47.de/jens/ShoppingList.git into development

Conflicts:
	phpInterface/shoppingList.php

Database schema/shoppingList.sql

@@ -0,0 +1,196 @@
+-- phpMyAdmin SQL Dump
+-- version 5.0.4
+-- https://www.phpmyadmin.net/
+--
+
+SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO";
+START TRANSACTION;
+SET time_zone = "+00:00";
+
+
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!40101 SET NAMES utf8mb4 */;
+
+--
+-- Database: `shoppingList`
+--
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `listEntries`
+--
+
+CREATE TABLE `listEntries` (
+  `listId` int(11) NOT NULL,
+  `productId` int(11) NOT NULL,
+  `amount` float NOT NULL DEFAULT 1,
+  `unit` int(11) NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `lists`
+--
+
+CREATE TABLE `lists` (
+  `id` int(11) NOT NULL,
+  `creationTime` bigint(20) NOT NULL,
+  `comment` varchar(200) DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `products`
+--
+
+CREATE TABLE `products` (
+  `id` int(11) NOT NULL,
+  `name` varchar(100) NOT NULL,
+  `synonyms` varchar(500) DEFAULT NULL COMMENT 'Separate entries with semicolons.',
+  `storeTypeId` int(11) NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `settings`
+--
+
+CREATE TABLE `settings` (
+  `settingName` varchar(100) NOT NULL,
+  `settingValue` varchar(100) NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+--
+-- Dumping data for table `settings`
+--
+
+INSERT INTO `settings` (`settingName`, `settingValue`) VALUES
+('databaseVersion', '3');
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `storeTypes`
+--
+
+CREATE TABLE `storeTypes` (
+  `id` int(11) NOT NULL,
+  `name` varchar(200) NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `units`
+--
+
+CREATE TABLE `units` (
+  `id` int(11) NOT NULL,
+  `name` varchar(100) NOT NULL,
+  `abbreviation` varchar(10) NOT NULL,
+  `isDefault` tinyint(2) NOT NULL DEFAULT 0,
+  `isDummy` tinyint(2) NOT NULL DEFAULT 0 COMMENT 'This unit will not actually be displayed. Instead an item will just be shown without amount or unit.',
+  `isPiece` tinyint(2) NOT NULL DEFAULT 0
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+--
+-- Indexes for dumped tables
+--
+
+--
+-- Indexes for table `listEntries`
+--
+ALTER TABLE `listEntries`
+  ADD PRIMARY KEY (`listId`,`productId`,`unit`),
+  ADD KEY `listEntries_ibfk_3` (`unit`),
+  ADD KEY `listEntries_ibfk_2` (`productId`);
+
+--
+-- Indexes for table `lists`
+--
+ALTER TABLE `lists`
+  ADD PRIMARY KEY (`id`);
+
+--
+-- Indexes for table `products`
+--
+ALTER TABLE `products`
+  ADD PRIMARY KEY (`id`),
+  ADD UNIQUE KEY `name` (`name`),
+  ADD KEY `storeTypeId` (`storeTypeId`);
+
+--
+-- Indexes for table `settings`
+--
+ALTER TABLE `settings`
+  ADD PRIMARY KEY (`settingName`);
+
+--
+-- Indexes for table `storeTypes`
+--
+ALTER TABLE `storeTypes`
+  ADD PRIMARY KEY (`id`),
+  ADD UNIQUE KEY `name` (`name`);
+
+--
+-- Indexes for table `units`
+--
+ALTER TABLE `units`
+  ADD PRIMARY KEY (`id`);
+
+--
+-- AUTO_INCREMENT for dumped tables
+--
+
+--
+-- AUTO_INCREMENT for table `lists`
+--
+ALTER TABLE `lists`
+  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT;
+
+--
+-- AUTO_INCREMENT for table `products`
+--
+ALTER TABLE `products`
+  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT;
+
+--
+-- AUTO_INCREMENT for table `storeTypes`
+--
+ALTER TABLE `storeTypes`
+  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT;
+
+--
+-- AUTO_INCREMENT for table `units`
+--
+ALTER TABLE `units`
+  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT;
+
+--
+-- Constraints for dumped tables
+--
+
+--
+-- Constraints for table `listEntries`
+--
+ALTER TABLE `listEntries`
+  ADD CONSTRAINT `listEntries_ibfk_1` FOREIGN KEY (`listId`) REFERENCES `lists` (`id`),
+  ADD CONSTRAINT `listEntries_ibfk_2` FOREIGN KEY (`productId`) REFERENCES `products` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  ADD CONSTRAINT `listEntries_ibfk_3` FOREIGN KEY (`unit`) REFERENCES `units` (`id`) ON DELETE CASCADE ON UPDATE CASCADE;
+
+--
+-- Constraints for table `products`
+--
+ALTER TABLE `products`
+  ADD CONSTRAINT `products_ibfk_1` FOREIGN KEY (`storeTypeId`) REFERENCES `storeTypes` (`id`);
+COMMIT;
+
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;

ShoppingList/src/com/jens/rhasspy/shoppinglist/ShoppingList.java

@@ -173,7 +173,7 @@ public class ShoppingList
         return resultList;
 	}
 	
-	public boolean send()
+	public boolean sendViaEmail()
 	{
 		StringBuilder shoppingListString = new StringBuilder();
 

ShoppingList/src/com/jens/rhasspy/shoppinglist/ShoppingListEntry.java

@@ -58,7 +58,10 @@ public class ShoppingListEntry
 		PreparedStatement preparedStmt = null;
 		Connection conn = null;
 		try
-		{
+		{			
+			if(amount <= 0 && unit != null && !unit.isDummy)
+				return false;
+			
 			conn = DatabaseHandler.getInstance().getConnection();
 			
 			if(!combinationExists(this.getParentList(), this.getProduct(), this.getUnit()))
@@ -85,7 +88,7 @@ public class ShoppingListEntry
 			}
 			else
 			{
-				return updateAmount();
+				return updateAmount(false);
 			}
 		}
 		catch(Exception e)
@@ -112,7 +115,10 @@ public class ShoppingListEntry
 		PreparedStatement preparedStmt = null;
 		Connection conn = null;
 		try
-		{
+		{			
+			if(amount <= 0 && unit != null && !unit.isDummy)
+				return false;
+			
 			conn = DatabaseHandler.getInstance().getConnection();
 			
 			if(this.getAmount() == 0 || this.getUnit().isDummy())
@@ -127,7 +133,7 @@ public class ShoppingListEntry
 				
 				long numAffectedRows = preparedStmt.executeUpdate();
 			    Miscellaneous.logEvent("AMOUNT OF UPDATED ROWS: " + numAffectedRows, 5);
-			    ResultSet rs = preparedStmt.getGeneratedKeys();
+//			    ResultSet rs = preparedStmt.getGeneratedKeys();
 	//		    if (numAffectedRows > 0)
 	//		    {
 					preparedStmt.close();
@@ -137,7 +143,9 @@ public class ShoppingListEntry
 			else
 			{
 				if(combinationExists(this.getParentList(), this.getProduct(), this.getUnit()))
-					return updateAmount();
+					return updateAmount(true);
+				else
+					return true;	// Combination to be deleted does not exist. So what?
 			}
 		}
 		catch(Exception e)
@@ -159,7 +167,7 @@ public class ShoppingListEntry
 		return false;
 	}
 
-	protected boolean updateAmount()
+	protected boolean updateAmount(boolean delete)
 	{
 		String query = "SELECT * FROM listEntries WHERE listId=? AND productId=? AND unit=?";
 		
@@ -179,13 +187,22 @@ public class ShoppingListEntry
 	        if(res.next())
 	        {
 	        	float currentAmount = res.getFloat("amount");
-	        	if(currentAmount + this.getAmount() > 0)
+	        	
+	        	boolean condition = true;
+	        	if(delete)
+	        		condition = currentAmount - this.getAmount() > 0;
+	        		
+	        	if(condition)
 	        	{
 	        		// Update the amount
 	        		String updateQuery  = "UPDATE listEntries set amount=? WHERE listId=? AND productId=? AND unit=?";
 					preparedStmt = conn.prepareStatement(updateQuery);
 					
-					preparedStmt.setFloat(1, currentAmount + this.getAmount());
+					if(delete)
+						preparedStmt.setFloat(1, currentAmount - this.getAmount());
+					else
+						preparedStmt.setFloat(1, currentAmount + this.getAmount());
+
 					preparedStmt.setLong(2, this.getParentList().getId());
 					preparedStmt.setLong(3, this.getProduct().getId());
 					preparedStmt.setLong(4, this.getUnit().getId());
@@ -209,7 +226,7 @@ public class ShoppingListEntry
 	        		String updateQuery  = "DELETE FROM listEntries WHERE listId=? AND productId=? AND unit=?";
 					preparedStmt = conn.prepareStatement(updateQuery);
 					
-					preparedStmt.setLong(1, this.getProduct().getId());
+					preparedStmt.setLong(1, this.getParentList().getId());
 					preparedStmt.setLong(2, this.getProduct().getId());
 					preparedStmt.setLong(3, this.getUnit().getId());
 		
@@ -225,6 +242,8 @@ public class ShoppingListEntry
 						preparedStmt.close();
 						return true;
 				    }
+				    else
+						preparedStmt.close();
 	        	}
 	        }
 	        
@@ -254,8 +273,6 @@ public class ShoppingListEntry
 			
 	        ResultSet res = preparedStmt.executeQuery();
 	        
-	        boolean found = false;
-	        
 	        if(res.next())
 	        	entryAmount = res.getLong("combinationAmount");
 	        
@@ -272,4 +289,18 @@ public class ShoppingListEntry
 		
 		return false;
 	}
+
+	@Override
+	public String toString()
+	{
+		if(this.getUnit() != null)
+		{
+			if(!this.getUnit().isDummy())
+				return String.valueOf(getAmount()) + " " + getUnit().getMainName() + " " + getProduct().getName();
+		}
+		
+		return getProduct().getName();
+	}
+	
+	
 }

ShoppingList/src/com/jens/rhasspy/shoppinglist/Start.java

@@ -75,25 +75,28 @@ public class Start
 				    	Unit u = Unit.getByName(unitName);
 				    	Product p = Product.getByName(productName);
 				    	
-				    	if(list == null)
-				    		exitWithError(Settings.languageBlock.get("couldNotCreateList"));
-				    	
-				    	if(p == null)
-				    		exitWithError(Settings.languageBlock.get("productNotFound") + " " + productName);
-				    	
 			    		ShoppingListEntry entry = new ShoppingListEntry();
 			    		entry.setParentList(list);
 			    		entry.setProduct(p);
 			    		entry.setAmount(amount);
 			    		entry.setUnit(u);
-
+			    		
+			    		if(amount > 0 && (u == null || u.isDummy))
+			    			entry.setUnit(Unit.getPieceUnit());
+			    		
+				    	if(list == null)
+				    		exitWithError(Settings.languageBlock.get("couldNotCreateList"));
+				    	
+				    	if(p == null)
+				    		exitWithError(Settings.languageBlock.get("productNotFound") + " " + entry.toString());
+				    	
 			    		if(entry.create())
 			    		{
 			    			DatabaseHandler.getInstance().disconnect();
 			    			System.exit(0);
 			    		}
 			    		else
-			    			exitWithError(Settings.languageBlock.get("couldNotAddProdToList") + " " + productName);
+			    			exitWithError(Settings.languageBlock.get("couldNotAddProdToList") + " " + entry.toString());
 				    }
 				    else
 				    	System.out.println(Settings.languageBlock.get("noProdSpecified"));
@@ -103,26 +106,31 @@ public class Start
 				    {
 				    	ShoppingList list = ShoppingList.getMostRecentList();
 				    	Product p = Product.getByName(productName);
+				    	Unit u = Unit.getByName(unitName);
 				    	
+			    		ShoppingListEntry entry = new ShoppingListEntry();
+			    		entry.setParentList(list);
+			    		entry.setProduct(p);
+			    		entry.setAmount(amount);
+			    		entry.setUnit(u);
+			    		
+			    		if(amount > 0 && (u == null || u.isDummy))
+			    			entry.setUnit(Unit.getPieceUnit());
+			    		
 				    	if(list == null)
 				    		exitWithError(Settings.languageBlock.get("couldNotCreateList"));
 				    	
 				    	if(p == null)
-				    		exitWithError(Settings.languageBlock.get("productNotFound") + " " + productName);
-				    	
-			    		for(ShoppingListEntry entry : list.getEntries())
-			    		{bestehende reduzieren
-			    			if(entry.getProduct().equals(p))
-			    			{
-					    		if(entry.delete())
-					    		{
-					    			DatabaseHandler.getInstance().disconnect();
-					    			System.exit(0);
-					    		}
-					    		else
-					    			Miscellaneous.logEvent(Settings.languageBlock.get("couldNotRemoveProdFromList") + " " + productName, 2);
-				    		}
+				    		exitWithError(Settings.languageBlock.get("productNotFound") + " " + entry.toString());
+			    		
+			    		if(entry.delete())
+			    		{
+			    			DatabaseHandler.getInstance().disconnect();
+			    			System.exit(0);
 			    		}
+			    		else
+			    			exitWithError(Settings.languageBlock.get("couldNotRemoveProdFromList") + " " + entry.toString());
+				    	
 			    		// If it wasn't on the list - why care?
 		    			DatabaseHandler.getInstance().disconnect();
 		    			System.exit(0);
@@ -131,7 +139,7 @@ public class Start
 				    	System.out.println(Settings.languageBlock.get("noProdSpecified"));
 				    break;
 			    case "sendList":
-			    	if(ShoppingList.getMostRecentList().send())
+			    	if(ShoppingList.getMostRecentList().sendViaEmail())
 			    	{
 //				    	System.out.println("Liste wurde verschickt.");
 				    	DatabaseHandler.getInstance().disconnect();

ShoppingList/src/com/jens/rhasspy/shoppinglist/Unit.java

@@ -19,6 +19,7 @@ static ArrayList<Unit> unitCache = null;
 	String abbreviation;
 	boolean isDefault;
 	boolean isDummy;
+	boolean isPiece;
 	
 	public long getId()
 	{
@@ -29,6 +30,14 @@ static ArrayList<Unit> unitCache = null;
 		this.id = id;
 	}
 	
+	public String getMainName()
+	{
+		if(name.contains(";"))
+			return name.split(";")[0];
+		else
+			return name;
+	}
+	
 	public String getName()
 	{
 		return name;
@@ -65,6 +74,15 @@ static ArrayList<Unit> unitCache = null;
 		this.isDummy = isDummy;
 	}
 	
+	public boolean isPiece()
+	{
+		return isPiece;
+	}
+	public void setPiece(boolean isPiece)
+	{
+		this.isPiece = isPiece;
+	}
+	
 	public static ArrayList<Unit> readAllUnits()
 	{
 		if(unitCache == null)
@@ -97,6 +115,7 @@ static ArrayList<Unit> unitCache = null;
 		        	u.setAbbreviation(res.getString("abbreviation"));
 		        	u.setDefault(res.getInt("isDefault") == 1);
 		        	u.setDummy(res.getInt("isDummy") == 1);
+		        	u.setPiece(res.getInt("isPiece") == 1);
 		        	
 		        	unitCache.add(u);
 		        }
@@ -133,10 +152,13 @@ static ArrayList<Unit> unitCache = null;
 		
 		for(Unit u : readAllUnits())
 		{
-			if(u.getName().equalsIgnoreCase(unitName))
-				return u;
-			else if(u.getName().equalsIgnoreCase(unitName.replace("-", " ")))
-				return u;
+			for(String unitSynonym : u.getName().split(";"))
+			{
+				if(unitSynonym.equalsIgnoreCase(unitName))
+					return u;
+				else if(unitSynonym.equalsIgnoreCase(unitName.replace("-", " ")))
+					return u;
+			}
 		}
 		
 		return null;
@@ -145,7 +167,10 @@ static ArrayList<Unit> unitCache = null;
 	@Override
 	public String toString()
 	{
-		return getName();
+		if(getName().contains(";"))
+			return getName().split(";")[0];
+		else
+			return getName();
 	}
 	
 	public static Unit getById(long id)
@@ -161,7 +186,7 @@ static ArrayList<Unit> unitCache = null;
 	
 	public boolean create()
 	{
-		String query = "INSERT INTO units (name, abbreviation, isDefault, isDummy) VALUES (?, ?, ?, ?)";
+		String query = "INSERT INTO units (name, abbreviation, isDefault, isDummy, isPiece) VALUES (?, ?, ?, ?, ?)";
 		Connection conn = DatabaseHandler.getInstance().getConnection();
 		PreparedStatement preparedStmt = null;
 		try
@@ -179,6 +204,11 @@ static ArrayList<Unit> unitCache = null;
 				preparedStmt.setInt(4, 1);
 			else
 				preparedStmt.setInt(4, 0);
+
+			if(this.isPiece)
+				preparedStmt.setInt(5, 1);
+			else
+				preparedStmt.setInt(5, 0);
 		    
 		    preparedStmt.executeUpdate();
 		    ResultSet rs = preparedStmt.getGeneratedKeys();
@@ -219,4 +249,26 @@ static ArrayList<Unit> unitCache = null;
 	      
 		return false;
 	}
+	
+	public static Unit getDefaultUnit()
+	{
+		for(Unit u : readAllUnits())
+		{
+			if(u.isDefault())
+				return u;
+		}
+		
+		return null;
+	}
+	
+	public static Unit getPieceUnit()
+	{
+		for(Unit u : readAllUnits())
+		{
+			if(u.isPiece())
+				return u;
+		}
+		
+		return null;
+	}
 }

phpInterface/shoppingListConfig.php

@@ -7,5 +7,6 @@
 		public static $mysqlpw = 'somePassword';                 //Password
 		public static $mysqldb = 'shoppingList';       //Database                               
 		public static $mysqlPort = 3306;
+		public static $rhasspyMasterUrl = "http://rhasspy-master:12101";	// URL of your Rhasspy master webpage WITHOUT ending slash. It is required if you want to trigger a retraining.
 	}
 ?>

shellScripts/ShoppingListAdd.sh

@@ -1,12 +1,32 @@
 #!/bin/bash
 
 SHOPPINGITEM=""
+AMOUNT=""
+UNIT=""
 SITEID=""
 PARAMS=""
 SESSIONID=""
 
 while (( "$#" )); do
   case "$1" in
+    --shoppingAmount)
+      if [ -n "$2" ] && [ ${2:0:1} != "-" ]; then
+        AMOUNT=$2
+        shift 2
+      else
+        echo "Error: Argument for $1 is missing" >&2
+        exit 1
+      fi
+      ;;
+    --shoppingUnit)
+      if [ -n "$2" ] && [ ${2:0:1} != "-" ]; then
+        UNIT=$2
+        shift 2
+      else
+        echo "Error: Argument for $1 is missing" >&2
+        exit 1
+      fi
+      ;;
     --shoppingProduct)
       if [ -n "$2" ] && [ ${2:0:1} != "-" ]; then
         SHOPPINGITEM=$2
@@ -53,7 +73,21 @@ then
 	echo "Was soll ich auf die Liste setzen?"
 	exit 1
 else
-	java -jar /home/pi/hc_scripts/ShoppingList.jar --action addToList --shoppingProduct $SHOPPINGITEM
+	lengthAmount=${#AMOUNT}
+	lengthUnit=${#UNIT}
+	
+	if [ $lengthAmount -gt 0 ]
+	then
+		if [ $lengthUnit -gt 0 ]
+		then
+			java -jar /home/pi/hc_scripts/ShoppingList.jar --action addToList --shoppingAmount $AMOUNT --shoppingUnit $UNIT --shoppingProduct $SHOPPINGITEM
+		else
+			java -jar /home/pi/hc_scripts/ShoppingList.jar --action addToList --shoppingAmount $AMOUNT --shoppingProduct $SHOPPINGITEM
+		fi
+	else
+		java -jar /home/pi/hc_scripts/ShoppingList.jar --action addToList --shoppingProduct $SHOPPINGITEM
+	fi
+
 	if [ "$?" -eq "0" ]
 	then
 		exit 0

shellScripts/ShoppingListRemove.sh

@@ -1,12 +1,32 @@
 #!/bin/bash
 
 SHOPPINGITEM=""
+AMOUNT=""
+UNIT=""
 SITEID=""
 PARAMS=""
 SESSIONID=""
 
 while (( "$#" )); do
   case "$1" in
+    --shoppingAmount)
+      if [ -n "$2" ] && [ ${2:0:1} != "-" ]; then
+        AMOUNT=$2
+        shift 2
+      else
+        echo "Error: Argument for $1 is missing" >&2
+        exit 1
+      fi
+      ;;
+    --shoppingUnit)
+      if [ -n "$2" ] && [ ${2:0:1} != "-" ]; then
+        UNIT=$2
+        shift 2
+      else
+        echo "Error: Argument for $1 is missing" >&2
+        exit 1
+      fi
+      ;;
     --shoppingProduct)
       if [ -n "$2" ] && [ ${2:0:1} != "-" ]; then
         SHOPPINGITEM=$2
@@ -53,11 +73,25 @@ then
 	echo "Was soll ich von der Liste streichen?"
 	exit 1
 else
-	java -jar /home/pi/hc_scripts/ShoppingList.jar --action removeFromList --shoppingProduct $SHOPPINGITEM
-	if [ "$?" -eq "0" ]
-	then
-		exit 0
-	else
-		exit 1
-	fi
+	lengthAmount=${#AMOUNT}
+        lengthUnit=${#UNIT}
+
+        if [ $lengthAmount -gt 0 ]
+        then
+                if [ $lengthUnit -gt 0 ]
+		then
+                        java -jar /home/pi/hc_scripts/ShoppingList.jar --action removeFromList --shoppingAmount $AMOUNT --shoppingUnit $UNIT --shoppingProduct $SHOPPINGITEM
+                else
+                        java -jar /home/pi/hc_scripts/ShoppingList.jar --action removeFromList --shoppingAmount $AMOUNT --shoppingProduct $SHOPPINGITEM
+                fi
+        else
+                java -jar /home/pi/hc_scripts/ShoppingList.jar --action removeFromList --shoppingProduct $SHOPPINGITEM
+        fi
+
+        if [ "$?" -eq "0" ]
+        then
+                exit 0
+        else
+                exit 1
+        fi
 fi

slotPrograms/shoppingProduct

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+# Adjust the URL to match where your php interface is.
+
+curl http://yourWebserver/rhasspy/shoppingList.php?command=printProductList

slotPrograms/shoppingUnit

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+# Adjust the URL to match where your php interface is.
+
+curl http://yourWebserver/rhasspy/shoppingList.php?command=printUnitList