finished up v1 work on project, moving onto frontend

Author: JustAnotherSoftwareDeveloper

lib/app/IngredientsDelegate.py

@@ -0,0 +1,19 @@
+from app.recipe import Recipe
+class IngredientsDelegate:
+
+    def getIngredients(self):
+        recipes=Recipe.query.all()
+        ingredient_lists=map(lambda r: r.ingredients,recipes)
+        return set([tag for ingredients in ingredient_lists for tag in ingredients])
+    
+    def ingredientsInclude(self,ingredients):
+        recipes = Recipe.query.ingredientsInclude(ingredients=ingredients)
+        if recipes is None:
+            return []
+        return list(map((lambda r: r.toJson()), recipes))
+    
+    def ingredientsIncludeAll(self,ingredients):
+        recipes = Recipe.query.ingredientsContainAll(ingredients=ingredients)
+        if recipes is None:
+            return []
+        return list(map((lambda r: r.toJson()), recipes))

lib/app/RecipeQuery.py

@@ -3,16 +3,16 @@
 class Queries(BaseQuery):
 
     def ingredientsInclude(self,ingredients=[]):
-        return self.filter(any(i in self.type.ingredients for i in ingredients))
+        return self.filter({'ingredients':{'$in':ingredients}}).all()
 
     def ingredientsContainAll(self,ingredients=[]):
-        return self.filter(all(i in self.type.ingredients for i in ingredients))
+        return self.filter({'ingredients':{'$all':ingredients}}).all()
 
     def tagsInclude(self,tags=[]):
         return self.filter({'tags':{'$in':tags}}).all()
 
     def tagsIncludeAll(self,tags=[]):
-        return  self.filter({'tags':{'$in':tags}}).all()
+        return  self.filter({'tags':{'$all':tags}}).all()
 
     def titleIsLike(self,match):
         return self.filter(match in self.type.title)

lib/app/TagsDelegate.py

@@ -8,6 +8,12 @@ def getTags(self):
 
     def tagsInclude(self,tags):
         recipes = Recipe.query.tagsInclude(tags=tags)
+        if recipes is None:
+            return []
+        return list(map((lambda r: r.toJson()), recipes))
+    
+    def tagsIncludeAll(self,tags):
+        recipes = Recipe.query.tagsIncludeAll(tags=tags)
         if recipes is None:
             return []
         return list(map((lambda r: r.toJson()), recipes))

lib/app/routes.py

@@ -1,10 +1,13 @@
 from app import app
 import datetime
+import os
 
 from flask.json import jsonify
 from flask import request
+from flask import send_file
 from app.FileDelegate import FileDelegate
 from app.TagsDelegate import TagsDelegate
+from app.IngredientsDelegate import IngredientsDelegate
 from app.recipe import Recipe
 
 
@@ -28,7 +31,9 @@ def searchByTags():
 
 @app.route('/search/byTags/all', methods=['GET'])
 def searchByTagsAll():
-    return jsonify("{}")
+    tags = request.args['tags'].split(',')
+    recipes = TagsDelegate().tagsIncludeAll(tags)
+    return jsonify(recipes)
 
 
 @app.route("/search/all", methods=['GET'])
@@ -40,12 +45,15 @@ def getAll():
 
 @app.route("/search/ByIngredients", methods=['GET'])
 def searchByIngredients():
-    return jsonify("{}")
-
+    ingredients = request.args['ingredients'].split(',')
+    recipes=IngredientsDelegate().ingredientsInclude(ingredients)
+    return jsonify(recipes)
 
 @app.route("/search/ByIngredients/all", methods=['GET'])
 def searchByIngredientsAll():
-    return jsonify("{}")
+    ingredients = request.args['ingredients'].split(',')
+    recipes=IngredientsDelegate().ingredientsIncludeAll(ingredients)
+    return jsonify(recipes)
 
 
 @app.route("/recipes/put", methods=['POST'])
@@ -82,4 +90,12 @@ def getTags():
 
 @app.route('/recipes/ingredients', methods=['GET'])
 def getIngredients():
-    return jsonify("{}")
+    ingredients = IngredientsDelegate().getIngredients()
+    return jsonify(list(ingredients))
+
+@app.route('/download',methods=['GET'])
+def downloadFile():
+    filename=request.args['filename']
+    full_path=os.path.join(os.getcwd(),"pdfs",filename)
+    return send_file(full_path)
+