Finished Implimentaion

Author: Manollo-36

backend/flaskr/__init__.py

@@ -1,3 +1,4 @@
+from tkinter import CURRENT
 from unicodedata import category
 from flask import Flask, request, abort, jsonify
 from flask_cors import CORS
@@ -48,24 +49,23 @@ def after_request(response):
     Create an endpoint to handle GET requests
     for all available categories
     """
-    @app.route("/categories")
+    @app.route("/categories", methods=["GET"])
     def retrieve_categories():
-        selection = Category.query.order_by(Category.id).all()
-        #current_categories = paginate_questions(request, selection)
-        formatted_category = [category.format() for category in selection]
-        if len(formatted_category) == 0:
-            abort(404)
-
-        return jsonify(
-            {
-                "success": True,
-                "categories": formatted_category,
-                "total_category": len(Category.query.all())
-            }
-        )
-
+        try:
+            selection = Category.query.order_by(Category.id).all()
+            print(f'selection:{selection}' )
+            
+            formatted_category = [category.format() for category in selection]
+            print(f'formatted_category:{formatted_category}' )
+            if len(formatted_category) == 0:
+                abort(404)
 
-    
+            response={
+                    "categories": formatted_category,
+                }
+            return jsonify(response)
+        except:
+            abort(404)
 
     """
     @TODO:
@@ -85,34 +85,38 @@ def retrieve_questions():
         page = request.args.get("page", 1, type=int)       
         print(f'page_num:{page}' )
         CURRENT_CATEGORY_ID = page
-        all_categories = Category.query.all()
-        formatted_cat = {cat.id:cat.type for cat in all_categories}
-             
-        #print(f'selection:{selection}')
-        current_category = formatted_cat[CURRENT_CATEGORY_ID]
-        print(f"current_category:{current_category}")
-        
-        #print(f'current_question:{current_question}')        
-        
-        selection = Question.query.filter(Question.category ==CURRENT_CATEGORY_ID).order_by(Question.id).all() 
-        #current_question = paginate_questions(request, selection)
-        print(f'selection:{selection}')
-        questions =  paginate_questions(request, selection)
-        #questions = [question.format() for question in selection]
-        print(f'questions:{questions}')
-        #if len(questions) == 0:
-            #abort(404)
-
-        return jsonify(
-            {
-                "success": True,
-                "questions": questions,
-                "totalQuestion": len(selection),
-                "currentCategory":current_category,
-                "categories":formatted_cat,
-            },
+        try:
+            all_categories = Category.query.all()
+            formatted_cat = {cat.id:cat.type for cat in all_categories}
+                
+            #print(f'selection:{selection}')
+            current_category = formatted_cat[CURRENT_CATEGORY_ID]
+            print(f"current_category:{current_category}")
 
-        )
+            #print(f'current_question:{current_question}')        
+
+            selection = Question.query.filter(Question.category ==CURRENT_CATEGORY_ID).order_by(Question.id).all() 
+            #current_question = paginate_questions(request, selection)
+            print(f'selection:{selection}')
+            if len(selection)>= 10:
+                questions =  paginate_questions(request, selection)
+            else:
+                print(f'length: {len(selection)}')
+                questions = [question.format() for question in selection]
+            print(f'questions:{questions}')
+            if len(questions) == 0:
+                abort(404)
+
+            response = {
+                    "questions": questions,
+                    "total_questions": len(Question.query.all()),                    
+                    "categories":formatted_cat,
+                    "current_category":current_category
+                }
+
+            return jsonify(response)
+        except:
+            abort(422)
     """
     @TODO:
     Create an endpoint to DELETE question using a question ID.
@@ -132,14 +136,13 @@ def delete_book(question_id):
             selection = Question.query.order_by(Question.id).all()
             current_question = paginate_questions(request, selection)
 
-            return jsonify(
-                {
+            response = {
                     "success": True,
                     "deleted": question_id,
-                    "books": current_question,
+                    "question": current_question,
                     "total_books": len(Question.query.all()),
                 }
-            )
+            return jsonify(response)
 
         except:
             abort(422)
@@ -153,7 +156,7 @@ def delete_book(question_id):
     the form will clear and the question will appear at the end of the last page
     of the questions list in the "List" tab.
     """
-    @app.route("/question", methods=["POST"])
+    @app.route("/questions", methods=["POST"])
     def create_question():
         body = request.get_json()
         print(f'body:{body}')
@@ -184,14 +187,12 @@ def create_question():
                 selection = question.query.order_by(Question.id).all()
                 current_questions = paginate_questions(request, selection)
 
-                return jsonify(
-                    {
-                        "success": True,
+                response = {
                         "created": question.id,
                         "question": current_questions,
-                        "total_books": len(Question.query.all()),
+                        "total_questions": len(Question.query.all()),
                     }
-                )
+                return jsonify(response)
 
         except:
             abort(422)
@@ -206,7 +207,7 @@ def create_question():
     Try using the word "title" to start.
     """
 
-    @app.route("/question", methods=["POST"])
+    @app.route("/questions", methods=["POST"])
     def search_question():
         body = request.get_json()
         print(f'body:{body}')
@@ -215,20 +216,24 @@ def search_question():
         new_category = body.get("category", None)
         new_difficulty= body.get("difficulty",None)
 
-        search= body.get("search",None)
-
+        search= body.get("searchTerm",None)
+        print(f'search:{search}')
 
         try:
             if search:
-                selection=Question.query.order_by(Question.id).filter(Question.question.ilike("%{}%".format(search)))
-                current_questions=paginate_questions(request,selection)
-
-                return jsonify(
-                    {
-                        "success": True,
-                        "questions": current_questions,
-                        "total_questions": len(selection.all()),
-                    })
+                selection=Question.query.order_by(Question.id).filter(Question.question.ilike("%{}%".format(search))).all()
+                print(f'selection:{selection}')
+                if len(selection)>=10:
+                   current_question=paginate_questions(request,selection)
+                else:
+                   current_question = [question.format() for question in selection] 
+                   print(f'current_questions:{current_question}')
+
+                response= {
+                        "questions": current_question,
+                        "total_questions": len(selection),
+                    }
+                return jsonify(response)
             else:
                 abort(404)
                 # question = Question(question=new_question, answer=new_answer, category=new_category,difficulty=new_difficulty)
@@ -258,7 +263,37 @@ def search_question():
     categories in the left column will cause only questions of that
     category to be shown.
     """
+    @app.route("/categories/<int:category_id>/questions", methods=["GET"])
+    def retrieve_questions_by_category(category_id):
+     try:
+        all_categories = Category.query.all()
+        formatted_cat = {cat.id:cat.type for cat in all_categories}
+             
+        #print(f'selection:{selection}')
+        current_category = formatted_cat[category_id]
+        print(f"current_category:{current_category}")
+        
+        #print(f'current_question:{current_question}')        
+        
+        selection = Question.query.filter(Question.category ==category_id).order_by(Question.id).all() 
+        #current_question = paginate_questions(request, selection)
+        print(f'selection:{selection}')
+        questions =  paginate_questions(request, selection)
+        #questions = [question.format() for question in selection]
+        print(f'questions:{questions}')
+        #if len(questions) == 0:
+            #abort(404)
 
+        response =  {
+                "success": True,
+                "questions": questions,
+                "total_questions": len(selection),
+                "current_category":current_category,
+                "categories":formatted_cat
+            }
+        return jsonify(response)
+     except:
+            abort(422)
     """
     @TODO:
     Create a POST endpoint to get questions to play the quiz.
@@ -271,6 +306,40 @@ def search_question():
     and shown whether they were correct or not.
     """
 
+    @app.route("/quizzes", methods=["GET"])
+    def play_quiz():
+        #try:
+            quiz_request = request.get_json()
+        
+            print(f'body:{quiz_request}')
+            previous_questions = quiz_request["previous_question"]
+            current_category_id = quiz_request["quiz_category"]["id"]
+
+            print(f'previous_questions:{previous_questions}')
+            print(f'quiz_category:{current_category_id}')
+       
+            if (current_category_id ==0):
+                questions_in_category = db.session.query(Question.id).all()
+            else:
+                questions_in_category = db.session.query(Question.id).filter(Question.category==current_category_id).all()
+            
+            flat_question_in_cat = [i for sub in questions_in_category for i in sub ]
+            filtered_questions_in_category = [q for q in flat_question_in_cat if q not in previous_questions]
+
+            if (len(filtered_questions_in_category)==0):
+                response = {"question":None}
+            else:
+                new_question_id = random.choice(filtered_questions_in_category)
+                question=Question.query.get(new_question_id)
+                response = {"question":question.format()}
+            return jsonify(response)
+             
+        #print(f'selection:{selection}')
+        #new_question = Question.query.filter(Question.id !=previous_questions).filter(Question.category == str(current_category)).all()
+        
+            
+        # except:
+        #         abort(422)
     """
     @TODO:
     Create error handlers for all expected errors

backend/test_flaskr.py

@@ -39,7 +39,7 @@ def tearDown(self):
     Write at least one test for each test for successful operation and for expected errors.
     """
     # def test_get_categories(self):
-    #     res = self.client().get("/categories")        
+    #     res = self.client().get("/api/v1.0/categories")        
     #     data = json.loads(res.data)
     #     print(f'Data:{res.data}')
     #     self.assertEqual(res.status_code, 200)
@@ -48,23 +48,41 @@ def tearDown(self):
     #     self.assertTrue(len(data["categories"]))
 
     # def test_404_sent_requesting_beyond_valid_page(self):
-    #     res = self.client().get("/categories?page=1000", json={"category": 1})
+    #     res = self.client().get("/api/v1.0/categories?page=1000", json={"category": 1})
     #     data = json.loads(res.data)
 
     #     self.assertEqual(res.status_code, 404)
     #     self.assertEqual(data["success"], False)
     #     self.assertEqual(data["message"], "resource not found")
 
-    def test_get_questions_category(self):
-        res = self.client().get("/questions", json={"category": 1})    
+    # def test_get_questions_category(self):
+    #     res = self.client().get("/questions", json={"category": 1})    
+    #     print(f'Data:{res.data}')   
+    #     data = json.loads(res.data)
+    #     print(f'Data:{data}')
+    #     self.assertEqual(res.status_code, 200)
+    #     self.assertTrue(data["total_questions"])
+    #     self.assertTrue(data["current_category"])
+    #     self.assertTrue(len(data["questions"]))
+    
+    # def test_get_questions_by_category_id(self):
+    #     res = self.client().get("/category/2/questions", json={"category": 1})    
+    #     print(f'Data:{res.data}')   
+    #     data = json.loads(res.data)
+    #     print(f'Data:{data}')
+    #     self.assertEqual(res.status_code, 200)
+    #     self.assertTrue(data["total_questions"])
+    #     self.assertTrue(data["current_category"])
+    #     self.assertTrue(len(data["questions"]))
+
+    def test_quiz(self):
+        res = self.client().get("/play",json={"previous_question": [1],"quiz_category":{ "id":1}})    
         print(f'Data:{res.data}')   
         data = json.loads(res.data)
         print(f'Data:{data}')
         self.assertEqual(res.status_code, 200)
-        self.assertEqual(data["success"], True)
-        self.assertTrue(data["totalQuestion"])
-        self.assertTrue(data["currentCategory"])
-        self.assertTrue(len(data["questions"]))
+        self.assertTrue(data["question"])
+        self.assertTrue(len(data["question"]))
 
 # Make the tests conveniently executable
 if __name__ == "__main__":