Implement chapters list API endpoint

config.py

@@ -4,6 +4,7 @@
 load_dotenv('.env.local')
 
 class Config(object):
+    JSON_SORT_KEYS = False
     AWS_SECRET = '{AWS_SECRET}'.format(**os.environ)
     SQLALCHEMY_TRACK_MODIFICATIONS = False
     SQLALCHEMY_DATABASE_URI = 'mysql+pymysql://{MYSQL_USER}:{MYSQL_PASSWORD}@{MYSQL_HOST}/{MYSQL_DATABASE}'.format(**os.environ)

main.py

@@ -8,7 +8,7 @@
 app = Flask(__name__)
 app.config.from_object('config.Config')
 
-from models import db, HadithCollection, Book, Hadith
+from models import db, HadithCollection, Book, Chapter, Hadith
 
 @app.before_request
 def verify_secret():
@@ -93,20 +93,21 @@ def api_collection_books(name):
 
 @app.route('/v1/collections/<string:name>/books/<string:bookNumber>', methods=['GET'])
 def api_collection_book(name, bookNumber):
-    number_id_map = {v: k for k, v in Book.id_number_map.items()}
-    bookID = number_id_map.get(bookNumber, int(bookNumber))
-    book = Book.query.filter_by(collection=name).filter_by(ourBookID=bookID).first_or_404();
+    book_id = Book.get_id_from_number(bookNumber)
+    book = Book.query.filter_by(collection=name, ourBookID=book_id).first_or_404()
     return jsonify(book.serialize())
 
 @app.route('/v1/collections/<string:collection_name>/books/<string:bookNumber>/hadiths', methods=['GET'])
 @paginate_results
 def api_collection_book_hadiths(collection_name, bookNumber):
     return Hadith.query.filter_by(collection=collection_name, bookNumber=bookNumber).order_by(Hadith.englishURN)
 
-@app.route('/v1/collections/<string:collection_name>/books/<int:book_id>/chapters', methods=['GET'])
+@app.route('/v1/collections/<string:collection_name>/books/<string:bookNumber>/chapters', methods=['GET'])
 @paginate_results
-def api_collection_book_chapters(collection_name, book_id):
-    abort(501)
+def api_collection_book_chapters(collection_name, bookNumber):
+    book_id = Book.get_id_from_number(bookNumber)
+    return Chapter.query.filter_by(collection=collection_name, arabicBookID=book_id).order_by(Chapter.babID)
+
 
 if __name__ == '__main__':
     app.run(host='0.0.0.0')

models.py

@@ -5,6 +5,13 @@
 db = SQLAlchemy(app)
 db.reflect()
 
+def is_number(s):
+    try:
+        int(s)
+        return True
+    except ValueError:
+        return False
+
 
 class HadithCollection(db.Model):
     __tablename__ = 'Collections'
@@ -36,9 +43,25 @@ class Book(db.Model):
 
     id_number_map = {-1: "introduction", -35: "35b"}
 
-    def serialize(self):
+    @staticmethod
+    def get_number_from_id(book_id):
         # Logic for dealing with non-straightforward ourBookIDs
-        bookNumber = self.id_number_map.get(self.ourBookID, str(self.ourBookID))
+        book_number = Book.id_number_map.get(book_id, int(book_id))
+        return str(book_number)
+
+    @staticmethod
+    def get_id_from_number(book_number):
+        number_id_map = {v: k for k, v in Book.id_number_map.items()}
+
+        if is_number(book_number):
+            book_id = int(book_number)
+        else:
+            book_id = number_id_map.get(book_number)
+
+        return str(book_id)
+
+    def serialize(self):
+        bookNumber = Book.get_number_from_id(self.ourBookID)
         return {
             'bookNumber': bookNumber,
             'book': [
@@ -57,13 +80,41 @@ def serialize(self):
         }
 
 
+class Chapter(db.Model):
+    __tablename__ = 'ChapterData'
+
+    def serialize(self):
+        bookNumber = Book.get_number_from_id(self.arabicBookID)
+        return {
+            'bookNumber': bookNumber,
+            'chapterId': str(self.babID),
+            'chapter': [
+                {
+                    'lang': 'en',
+                    'chapterNumber': str(self.englishBabNumber),
+                    'chapterTitle': self.englishBabName,
+                    'intro': self.englishIntro,
+                    'ending': self.englishEnding
+                },
+                {
+                    'lang': 'ar',
+                    'chapterNumber': str(self.arabicBabNumber),
+                    'chapterTitle': self.arabicBabName,
+                    'intro': self.arabicIntro,
+                    'ending': self.arabicEnding
+                }
+            ]
+        }
+
+
 class Hadith(db.Model):
     __tablename__ = 'HadithTable'
 
     def serialize(self):
         return {
             'collection': self.collection,
             'bookNumber': self.bookNumber,
+            'chapterId': str(self.babID),
             'hadithNumber': self.hadithNumber,
             'hadith': [
                 {
@@ -82,5 +133,5 @@ def serialize(self):
                     'body': cleanup_text(self.arabicText),
                     'grade': self.arabicgrade1,
                 }
-            ],
+            ]
         }