Got filtering working for tags, along with list of tags

Author: JustAnotherSoftwareDeveloper

lib/app/RecipeQuery.py

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

lib/app/TagsDelegate.py

@@ -0,0 +1,13 @@
+from app.recipe import Recipe
+class TagsDelegate:
+
+    def getTags(self):
+        recipes=Recipe.query.all()
+        tag_lists=map(lambda r: r.tags,recipes)
+        return set([tag for tags in tag_lists for tag in tags])
+    
+    def tagsInclude(self,tags):
+        recipes = Recipe.query.tagsInclude(tags=tags)
+        if recipes is None:
+            return []
+        return list(map((lambda r: r.toJson()), recipes))

lib/app/routes.py

@@ -4,20 +4,26 @@
 from flask.json import jsonify
 from flask import request
 from app.FileDelegate import FileDelegate
+from app.TagsDelegate import TagsDelegate
 from app.recipe import Recipe
 
 
 @app.route('/', methods=['GET'])
 @app.route('/status')
 def index():
-    response = {'status': "OK", 'Time': datetime.datetime.now(),
-                                                              'project': 'recipes'}
+    response = {
+        'status': "OK",
+        'Time': datetime.datetime.now(),
+        'project': 'recipes'
+    }
     return jsonify(response)
 
 
 @app.route('/search/byTags', methods=['GET'])
 def searchByTags():
-    return jsonify("{}")
+    tags = request.args['tags'].split(',')
+    recipes = TagsDelegate().tagsInclude(tags)
+    return jsonify(recipes)
 
 
 @app.route('/search/byTags/all', methods=['GET'])
@@ -32,7 +38,6 @@ def getAll():
     return jsonify(toJson)
 
 
-
 @app.route("/search/ByIngredients", methods=['GET'])
 def searchByIngredients():
     return jsonify("{}")
@@ -45,29 +50,34 @@ def searchByIngredientsAll():
 
 @app.route("/recipes/put", methods=['POST'])
 def addRecipe():
-    delegate=FileDelegate()
-    new_file=request.files['file']
+    delegate = FileDelegate()
+    new_file = request.files['file']
     if new_file:
-        json=delegate.addNew(file=request.files['file'],properties=request.args)
+        json = delegate.addNew(
+            file=request.files['file'], properties=request.args)
         return jsonify(json)
     return jsonify("{'error':'no file found'}")
 
 
 @app.route("/recipes/edit", methods=['POST'])
 def editRecipe():
-    delegate=FileDelegate()
-    json=delegate.edit(file=request.files['file'],properties=request.values)
+    delegate = FileDelegate()
+    json = delegate.edit(file=request.files['file'], properties=request.values)
     return jsonify(json)
 
-@app.route("/recipes/remove",methods=['DELETE'])
+
+@app.route("/recipes/remove", methods=['DELETE'])
 def removeRecipe():
-    delegate=FileDelegate()
-    json=delegate.remove(file=request.files['file'],properties=request.values)
+    delegate = FileDelegate()
+    json = delegate.remove(
+        file=request.files['file'], properties=request.values)
     return jsonify(json)
 
+
 @app.route('/recipes/tags', methods=['GET'])
 def getTags():
-    return jsonify("{}")
+    tags = TagsDelegate().getTags()
+    return jsonify(list(tags))
 
 
 @app.route('/recipes/ingredients', methods=['GET'])