Skip to content

Commit

Permalink
Fix some syntax errors
Browse files Browse the repository at this point in the history
  • Loading branch information
yeboah326 committed Dec 10, 2021
1 parent 2969a17 commit 40e76ec
Showing 1 changed file with 25 additions and 18 deletions.
43 changes: 25 additions & 18 deletions backend/api/reminder/controllers.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,33 +60,40 @@ def reminder_get_all_upcoming_birthdays():
today = datetime.date.today()

# Find all users who birthdays are after today for the rest of the year
upcoming = db.session.query(Contact).filter(
user_id=get_jwt_identity(),
extract("day", Contact.date_of_birth) >= today.day,
extract("month", Contact.date_of_birth) >= today.month,
).order_by(
extract("day", Contact.date_of_birth),
extract("month", Contact.date_of_birth),
extract("year", Contact.date_of_birth)
).all()

upcoming = (
db.session.query(Contact)
.filter(
extract("day", Contact.date_of_birth) >= today.day,
extract("month", Contact.date_of_birth) >= today.month,
user_id=get_jwt_identity(),
)
.order_by(
extract("day", Contact.date_of_birth),
extract("month", Contact.date_of_birth),
extract("year", Contact.date_of_birth),
)
.all()
)

return jsonify(contacts_schema.dump(upcoming)), 200



@reminder.get("/birthday/current")
@jwt_required()
def reminder_get_all_birthdays_current_year():
# Get today's date
today = datetime.date.today()

# Find all contacts
upcoming = db.session.query(Contact).filter(
user_id=get_jwt_identity()
).order_by(
extract("day", Contact.date_of_birth),
extract("month", Contact.date_of_birth),
extract("year", Contact.date_of_birth)
).all()
upcoming = (
db.session.query(Contact)
.filter(user_id=get_jwt_identity())
.order_by(
extract("day", Contact.date_of_birth),
extract("month", Contact.date_of_birth),
extract("year", Contact.date_of_birth),
)
.all()
)

return jsonify(contacts_schema.dump(upcoming)), 200

0 comments on commit 40e76ec

Please sign in to comment.