Skip to content

Remove unverified books from books collection #93

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ahadith merged 1 commit into from
Sep 7, 2020
Merged

Remove unverified books from books collection #93

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 2 additions & 24 deletions main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
from sqlalchemy import func, or_
from werkzeug.exceptions import HTTPException


app = Flask(__name__)
app.config.from_object("config.Config")

Expand Down Expand Up @@ -72,14 +71,14 @@ def api_collection(name):
@app.route("/v1/collections/<string:name>/books", methods=["GET"])
@paginate_results
def api_collection_books(name):
return Book.query.filter_by(collection=name).order_by(func.abs(Book.ourBookID))
return Book.query.filter_by(collection=name, status=4).order_by(func.abs(Book.ourBookID))


@app.route("/v1/collections/<string:name>/books/<string:bookNumber>", methods=["GET"])
@single_resource
def api_collection_book(name, bookNumber):
book_id = Book.get_id_from_number(bookNumber)
return Book.query.filter_by(collection=name, ourBookID=book_id)
return Book.query.filter_by(collection=name, status=4, ourBookID=book_id)


@app.route("/v1/collections/<string:collection_name>/books/<string:bookNumber>/hadiths", methods=["GET"])
Expand Down Expand Up @@ -108,27 +107,6 @@ def api_collection_book_chapter(collection_name, bookNumber, chapterId):
return Chapter.query.filter_by(collection=collection_name, arabicBookID=book_id, babID=chapterId)


@app.route("/v1/hadiths", methods=["GET"])
@paginate_results
def api_hadiths():
collection = request.args.get("collection")
bookNumber = request.args.get("bookNumber")
babId = request.args.get("chapterId")
hadithNumber = request.args.get("hadithNumber")

queryset = Hadith.query
if hadithNumber:
queryset = queryset.filter_by(hadithNumber=hadithNumber)
if babId:
queryset = queryset.filter_by(babID=float(babId))
if bookNumber:
queryset = queryset.filter_by(bookNumber=bookNumber)
if collection:
queryset = queryset.filter_by(collection=collection)

return queryset


@app.route("/v1/hadiths/<int:urn>", methods=["GET"])
@single_resource
def api_hadith(urn):
Expand Down