Add competition_id as paramter to search question api

server/app/apis/questions.py

@@ -60,12 +60,12 @@ class QuestionSearch(Resource):
     def get(self, CID):
 
         args = question_search_parser.parse_args(strict=True)
-        print("fadsfdas")
 
         name = args.get("name")
         # total_score = args.get("total_score")
         slide_id = args.get("slide_id")
         type_id = args.get("type_id")
+        competition_id = args.get("competition_id")
         page = args.get("page", 0)
         page_size = args.get("page_size", 15)
         order = args.get("order", 1)
@@ -75,6 +75,7 @@ class QuestionSearch(Resource):
             name=name,
             type_id=type_id,
             slide_id=slide_id,
+            competition_id=competition_id,
             page=page,
             page_size=page_size,
             order=order,

server/app/core/controller/get.py

@@ -44,7 +44,15 @@ def search_user(email=None, name=None, city_id=None, role_id=None, page=0, page_
 
 
 def search_questions(
-    name=None, total_score=None, type_id=None, slide_id=None, page=0, page_size=15, order=1, order_by=None
+    name=None,
+    total_score=None,
+    type_id=None,
+    slide_id=None,
+    competition_id=None,
+    page=0,
+    page_size=15,
+    order=1,
+    order_by=None,
 ):
     query = Question.query
     if name:
@@ -55,6 +63,11 @@ def search_questions(
         query = query.filter(Question.type_id == type_id)
     if slide_id:
         query = query.filter(Question.slide_id == slide_id)
+    if competition_id:
+        slide_ids = set(
+            [x.id for x in Slide.query.filter(Slide.competition_id == competition_id).all()]
+        )  # TODO: Filter using database instead of creating a set of slide_ids
+        query = query.filter(Question.slide_id.in_(slide_ids))
 
     order_column = Question.id  # Default order_by
     if order_by:

server/app/core/parsers.py

@@ -68,3 +68,4 @@ question_search_parser.add_argument("name", type=str, default=None, location="js
 # question_parser.add_argument("total_score", type=int)
 question_search_parser.add_argument("slide_id", type=int, default=None, location="json")
 question_search_parser.add_argument("type_id", type=int, default=None, location="json")
+question_search_parser.add_argument("competition_id", type=int, default=None, location="json")