From 6cfd50d329f5d5559393518285b059bd3563861a Mon Sep 17 00:00:00 2001 From: andrewlalis Date: Tue, 22 May 2018 23:06:11 +0200 Subject: [PATCH] Updated recipe database to remove unneeded components. --- model/database/database.cpp | 9 ++ model/database/database.h | 4 + model/database/recipedatabase.cpp | 216 +++--------------------------- model/database/recipedatabase.h | 14 +- 4 files changed, 32 insertions(+), 211 deletions(-) diff --git a/model/database/database.cpp b/model/database/database.cpp index 6e914b0..ca23338 100644 --- a/model/database/database.cpp +++ b/model/database/database.cpp @@ -39,6 +39,15 @@ bool Database::insertInto(string tableName, vector columnNames, vectorexecuteSQL(query); + return (t.getReturnCode() == SQLITE_DONE); +} + ResultTable Database::selectFrom(string tableName, string columnNames, string conditions){ if (columnNames.size() == 0 || tableName.empty()){ return ResultTable(); diff --git a/model/database/database.h b/model/database/database.h index 0ccc9fd..d98aacb 100644 --- a/model/database/database.h +++ b/model/database/database.h @@ -24,8 +24,12 @@ public: //Executes an SQL string statement in a safe way and returns the result. ResultTable executeSQL(string statement); + //Inserts into a table. bool insertInto(string tableName, vector columnNames, vector values); + bool insertInto(string tableName, string columnName, string value); + //Selects from a table. ResultTable selectFrom(string tableName, string columnNames, string conditions); + //Deletes from a table. bool deleteFrom(string tableName, string conditions); bool tableExists(string tableName); diff --git a/model/database/recipedatabase.cpp b/model/database/recipedatabase.cpp index 3909c3f..9cd1351 100644 --- a/model/database/recipedatabase.cpp +++ b/model/database/recipedatabase.cpp @@ -57,66 +57,18 @@ bool RecipeDatabase::storeRecipe(Recipe recipe){ return false; } -bool RecipeDatabase::storeRecipeIngredient(RecipeIngredient ri, int recipeId){ - int ingId = this->storeIngredient(ri); - if (ingId < 0) return false; - - if (!this->storeUnitOfMeasure(ri.getUnit())) return false; - +bool RecipeDatabase::storeRecipeIngredient(Ingredient i, int recipeId){ return this->insertInto("recipeIngredient", vector({ - "ingredientId", - "recipeId", - "quantity", - "unitName", - "comment" + "content", + "recipeId" }), vector({ - std::to_string(ingId), - std::to_string(recipeId), - std::to_string(ri.getQuantity()), - ri.getUnit().getName(), - ri.getComment() + i.getContent(), + std::to_string(recipeId) })); } -int RecipeDatabase::storeIngredient(Ingredient ingredient){ - ResultTable t = this->selectFrom("ingredient", "*", "WHERE name="+surroundString(ingredient.getName(), "'")); - if (t.isEmpty()){ - bool success = this->insertInto("ingredient", vector({"foodGroup", "name"}), vector({ingredient.getFoodGroup(), ingredient.getName()})); - if (success){ - return this->getLastInsertedRowId(); - } else { - return -1; - } - } else { - return std::stoi(t.at(0, 0)); - } -} - -bool RecipeDatabase::storeUnitOfMeasure(UnitOfMeasure u){ - ResultTable t = this->selectFrom("unitOfMeasure", "name", "WHERE name="+surroundString(u.getName(), "'")); - if (!t.isEmpty()){ - return true; - } - bool success = this->insertInto("unitOfMeasure", - vector({ - "name", - "plural", - "abbreviation", - "type", - "metricCoefficient" - }), - vector({ - u.getName(), - u.getNamePlural(), - u.getAbbreviation(), - std::to_string(u.getType()), - std::to_string(u.getMetricCoefficient()) - })); - return success; -} - bool RecipeDatabase::storeInstruction(Instruction instruction, int recipeId){ return FileUtils::saveInstruction(recipeId, instruction); } @@ -166,31 +118,6 @@ vector RecipeDatabase::retrieveAllRecipes(){ return this->readRecipesFromTable(t); } -vector RecipeDatabase::retrieveRecipesWithIngredients(vector ingredients){ - vector recipes; - if (ingredients.empty()){ - return recipes; - } - string filterList = surroundString(ingredients.at(0).getName(), "'"); - for (unsigned int i = 1; i < ingredients.size(); i++){ - filterList += ", " + surroundString(ingredients[i].getName(), "'"); - } - filterList = '(' + filterList + ')'; - ResultTable t = this->executeSQL("SELECT * " - "FROM recipe " - "WHERE recipeId IN (" - " SELECT recipeIngredient.recipeId " - " FROM recipeIngredient " - " INNER JOIN (" - " SELECT ingredientId " - " FROM ingredient " - " WHERE name IN "+filterList+"" - " ) filteredIngredients " - " ON recipeIngredient.ingredientId = filteredIngredients.ingredientId" - ") ORDER BY name;"); - return this->readRecipesFromTable(t); -} - vector RecipeDatabase::retrieveRecipesWithTags(vector tags){ vector recipes; if (tags.empty()){ @@ -210,53 +137,15 @@ vector RecipeDatabase::retrieveRecipesWithSubstring(string s){ return this->readRecipesFromTable(t); } -vector RecipeDatabase::retrieveRecipesWithFoodGroups(vector groups){ - vector recipes; - if (groups.empty()){ - return recipes; - } - string filterList = surroundString(groups.at(0), "'"); - for (unsigned int i = 1; i < groups.size(); i++){ - filterList += ", " + surroundString(groups.at(i), "'"); - } - filterList = '(' + filterList + ')'; - ResultTable t = this->executeSQL("SELECT * FROM recipe WHERE recipeId IN (SELECT recipeId FROM recipeIngredient WHERE ingredientId IN (SELECT ingredientId FROM ingredient WHERE foodGroup IN "+filterList+" ) ) ORDER BY name;"); - return this->readRecipesFromTable(t); -} - -vector RecipeDatabase::retrieveAllFoodGroups(){ - ResultTable t = this->executeSQL("SELECT DISTINCT foodGroup FROM ingredient ORDER BY foodGroup;"); - vector foodGroups; +vector RecipeDatabase::retrieveRecipeIngredients(int recipeId){ + ResultTable t = this->executeSQL("SELECT content " + "FROM recipeIngredient " + "WHERE recipeId = "+std::to_string(recipeId)+";"); + vector ingredients; for (TableRow row : t.rows()){ - foodGroups.push_back(row.at(0)); + ingredients.push_back(Ingredient(row.at(0))); } - return foodGroups; -} - -vector RecipeDatabase::retrieveRecipeIngredients(int recipeId){ - ResultTable t = this->executeSQL("SELECT ingredient.name, ingredient.foodGroup, "//0, 1 - "recipeIngredient.quantity, recipeIngredient.unitName, recipeIngredient.comment,"//2, 3, 4 - "unitOfMeasure.name, unitOfMeasure.plural, unitOfMeasure.abbreviation, unitOfMeasure.type, unitOfMeasure.metricCoefficient "//5, 6, 7, 8, 9 - "FROM ingredient " - "INNER JOIN recipeIngredient " - "ON ingredient.ingredientId = recipeIngredient.ingredientId " - "INNER JOIN unitOfMeasure " - "ON recipeIngredient.unitName = unitOfMeasure.name " - "WHERE recipeIngredient.recipeId = "+std::to_string(recipeId)+";"); - vector ings; - for (TableRow row : t.rows()){ - RecipeIngredient r(row.at(0), - row.at(1), - std::stof(row.at(2)), - UnitOfMeasure(row.at(5), row.at(6), row.at(7), std::stoi(row.at(8)), std::stod(row.at(9))), - row.at(4)); - ings.push_back(r); - } - return ings; -} - -int RecipeDatabase::retrieveIngredientId(string ingredientName){ - return std::stoi(this->selectFrom("ingredient", "ingredientId", "WHERE name = '"+ingredientName+"'").at(0, 0)); + return ingredients; } bool RecipeDatabase::deleteRecipeTags(int recipeId){ @@ -268,27 +157,14 @@ bool RecipeDatabase::deleteRecipeIngredients(int recipeId){ } vector RecipeDatabase::retrieveAllIngredients(){ - ResultTable t = this->selectFrom("ingredient", "name, foodGroup", "ORDER BY name"); + ResultTable t = this->selectFrom("recipeIngredient", "content", "ORDER BY content"); vector ings; for (TableRow row : t.rows()){ - Ingredient i(row.at(0), row.at(1)); - ings.push_back(i); + ings.push_back(Ingredient(row.at(0))); } return ings; } -vector RecipeDatabase::retrieveAllUnitsOfMeasure(){ - ResultTable t = this->selectFrom("unitOfMeasure", "name, plural, abbreviation, type, metricCoefficient", "ORDER BY name"); - vector units; - if (!t.isEmpty()){ - for (TableRow row : t.rows()){ - UnitOfMeasure u(row.at(0), row.at(1), row.at(2), std::stoi(row.at(3)), std::stod(row.at(4))); - units.push_back(u); - } - } - return units; -} - vector RecipeDatabase::retrieveTags(int recipeId){ ResultTable t = this->selectFrom("recipeTag", "tagName", "WHERE recipeId="+std::to_string(recipeId)+" ORDER BY tagName"); vector tags; @@ -358,14 +234,6 @@ bool RecipeDatabase::deleteIngredient(string name){ return this->deleteFrom("ingredient", "WHERE name='"+name+"'"); } -bool RecipeDatabase::deleteUnitOfMeasure(string name){ - ResultTable t = this->selectFrom("recipeIngredient", "recipeId", "WHERE unitName='"+name+"'"); - if (!t.isEmpty()){ - return false; - } - return this->deleteFrom("unitOfMeasure", "WHERE name='"+name+"'"); -} - bool RecipeDatabase::deleteTag(RecipeTag tag){ return this->deleteFrom("recipeTag", "WHERE tagName='"+tag.getValue()+"'"); } @@ -405,22 +273,16 @@ bool RecipeDatabase::updateRecipe(Recipe recipe, string originalName) { return false; } bool ingredientsSuccess = this->deleteRecipeIngredients(id); - for (RecipeIngredient ri : recipe.getIngredients()){ + for (Ingredient i : recipe.getIngredients()){ ingredientsSuccess = ingredientsSuccess && this->insertInto( "recipeIngredient", vector({ "recipeId", - "ingredientId", - "unitName", - "quantity", - "comment" + "content" }), vector({ idS, - std::to_string(this->retrieveIngredientId(ri.getName())), - ri.getUnit().getName(), - std::to_string(ri.getQuantity()), - ri.getComment() + i.getContent() })); } if (!ingredientsSuccess){ @@ -438,50 +300,6 @@ bool RecipeDatabase::updateRecipe(Recipe recipe, string originalName) { } } -bool RecipeDatabase::addBasicUnits(){ - this->beginTransaction(); - //Volume - this->storeUnitOfMeasure(UnitOfMeasure("Teaspoon", "Teaspoons", "tsp", UnitOfMeasure::VOLUME, 5.0)); - this->storeUnitOfMeasure(UnitOfMeasure("Tablespoon", "Tablespoons", "tbsp", UnitOfMeasure::VOLUME, 15.0)); - this->storeUnitOfMeasure(UnitOfMeasure("Fluid Ounce", "Fluid Ounces", "fl oz", UnitOfMeasure::VOLUME, 30.0)); - this->storeUnitOfMeasure(UnitOfMeasure("Cup", "Cups", "c", UnitOfMeasure::VOLUME, 250.0)); - this->storeUnitOfMeasure(UnitOfMeasure("Milliliter", "Milliliters", "mL", UnitOfMeasure::VOLUME, 1.0)); - this->storeUnitOfMeasure(UnitOfMeasure("Liter", "Liters", "L", UnitOfMeasure::VOLUME, 1000.0)); - this->storeUnitOfMeasure(UnitOfMeasure("Gallon", "Gallons", "gal", UnitOfMeasure::VOLUME, 3800.0)); - //Mass/Weight - this->storeUnitOfMeasure(UnitOfMeasure("Ounce", "Ounces", "oz", UnitOfMeasure::MASS, 28.0)); - this->storeUnitOfMeasure(UnitOfMeasure("Pound", "Pounds", "lb", UnitOfMeasure::MASS, 454.0)); - this->storeUnitOfMeasure(UnitOfMeasure("Gram", "Grams", "g", UnitOfMeasure::MASS, 1.0)); - this->storeUnitOfMeasure(UnitOfMeasure("Milligram", "Milligrams", "mg", UnitOfMeasure::MASS, 0.001)); - this->storeUnitOfMeasure(UnitOfMeasure("Kilogram", "Kilograms", "kg", UnitOfMeasure::MASS, 1000.0)); - //Length - this->storeUnitOfMeasure(UnitOfMeasure("Inch", "Inches", "in", UnitOfMeasure::LENGTH, 2.54)); - this->storeUnitOfMeasure(UnitOfMeasure("Centimeter", "Centimeters", "cm", UnitOfMeasure::LENGTH, 1.0)); - //MISC - this->storeUnitOfMeasure(UnitOfMeasure("Piece", "Pieces", "pc", UnitOfMeasure::MISC, 1.0)); - this->storeUnitOfMeasure(UnitOfMeasure("Item", "Items", "", UnitOfMeasure::MISC, 1.0)); - this->commitTransaction(); - return true; -} - -bool RecipeDatabase::addBasicIngredients(){ - this->beginTransaction(); - this->storeIngredient(Ingredient("Flour", "grains")); - this->storeIngredient(Ingredient("Eggs", "eggs")); - this->storeIngredient(Ingredient("Milk", "dairy")); - this->storeIngredient(Ingredient("Cheese", "dairy")); - this->storeIngredient(Ingredient("Salt", "spices")); - this->storeIngredient(Ingredient("Sugar", "sugars")); - this->storeIngredient(Ingredient("Vegetable Oil", "oils")); - this->storeIngredient(Ingredient("Olive Oil", "oils")); - this->storeIngredient(Ingredient("Water", "water")); - this->storeIngredient(Ingredient("Bell Pepper", "vegetables")); - this->storeIngredient(Ingredient("Onion", "vegetables")); - this->storeIngredient(Ingredient("Garlic", "spices")); - this->commitTransaction(); - return true; -} - void RecipeDatabase::ensureTablesExist(){ //Make sure that foreign keys are enabled. this->executeSQL("PRAGMA foreign_keys = ON;"); diff --git a/model/database/recipedatabase.h b/model/database/recipedatabase.h index 2452e42..79c949a 100644 --- a/model/database/recipedatabase.h +++ b/model/database/recipedatabase.h @@ -23,21 +23,15 @@ class RecipeDatabase : public Database //SQL Helper methods. //Storage. - bool storeRecipeIngredient(RecipeIngredient ri, int recipeId); - int storeIngredient(Ingredient ingredient); - bool storeUnitOfMeasure(UnitOfMeasure u); + bool storeRecipeIngredient(Ingredient i, int recipeId); //Retrieval. Recipe retrieveRecipe(string name); Recipe retrieveRandomRecipe(); vector retrieveAllRecipes(); - vector retrieveRecipesWithIngredients(vector ingredients); vector retrieveRecipesWithTags(vector tags); vector retrieveRecipesWithSubstring(string s); - vector retrieveRecipesWithFoodGroups(vector groups); - vector retrieveAllFoodGroups(); vector retrieveAllIngredients(); - vector retrieveAllUnitsOfMeasure(); vector retrieveAllTags(); //Deletion. @@ -50,9 +44,6 @@ class RecipeDatabase : public Database //Updating. bool updateRecipe(Recipe recipe, string originalName); - //Adding basic information at start. - bool addBasicUnits(); - bool addBasicIngredients(); private: //Utility methods. @@ -68,8 +59,7 @@ class RecipeDatabase : public Database //Retrieval vector retrieveTags(int recipeId); - vector retrieveRecipeIngredients(int recipeId); - int retrieveIngredientId(string ingredientName); + vector retrieveRecipeIngredients(int recipeId); //Deletion bool deleteRecipeTags(int recipeId);