Skip to content
Snippets Groups Projects

add staging deployment to CI

Merged Aymeric Chaumont requested to merge staging-ci into main
1 file
+ 15
7
Compare changes
  • Side-by-side
  • Inline
+ 15
7
@@ -285,7 +285,7 @@ def get_user(cookie: str, db: Session):
try:
user = db.query(models.Users).filter(
models.Users.cookie == cookie).one()
except:
except BaseException:
raise HTTPException(status_code=401, detail="Invalid cookie")
if pytz.timezone("Europe/Paris").localize(user.expiration_date) < datetime.now(tz=pytz.timezone("Europe/Paris")):
@@ -379,9 +379,13 @@ def create_collaborative_record(user: schemas.User, place: str, db: Session):
), current_date.weekday(), current_date.time()
try:
time_slot = db.query(models.OpeningHours).filter(models.OpeningHours.place == place, models.OpeningHours.day ==
weekday, models.OpeningHours.open_time <= current_time, models.OpeningHours.close_time >= current_time).one()
except:
time_slot = db.query(
models.OpeningHours).filter(
models.OpeningHours.place == place,
models.OpeningHours.day == weekday,
models.OpeningHours.open_time <= current_time,
models.OpeningHours.close_time >= current_time).one()
except BaseException:
raise HTTPException(status_code=404, detail="No restaurant opened")
last_record = db.query(models.CollaborativeRecords).filter(
@@ -405,9 +409,13 @@ def update_collaborative_record(user: schemas.User, db: Session):
models.CollaborativeRecords.user_id == user.id).order_by(models.CollaborativeRecords.date.desc()).first()
try:
time_slot = db.query(models.OpeningHours).filter(models.OpeningHours.place == last_record.place, models.OpeningHours.day ==
weekday, models.OpeningHours.open_time <= current_time, models.OpeningHours.close_time >= current_time).one()
except:
time_slot = db.query(
models.OpeningHours).filter(
models.OpeningHours.place == last_record.place,
models.OpeningHours.day == weekday,
models.OpeningHours.open_time <= current_time,
models.OpeningHours.close_time >= current_time).one()
except BaseException:
raise HTTPException(status_code=404, detail="No restaurant opened")
if last_record.date >= datetime.combine(date, time_slot.open_time) and not last_record.waiting_time:
Loading