Change meal.date to meal_date
This commit is contained in:
parent
cdd4cc1f3b
commit
4747f4e7f5
4 changed files with 17 additions and 4 deletions
5
db.py
5
db.py
|
|
@ -24,5 +24,8 @@ if __name__ == '__main__':
|
||||||
async def initdb():
|
async def initdb():
|
||||||
conn = await connect()
|
conn = await connect()
|
||||||
await create(conn)
|
await create(conn)
|
||||||
|
await conn.commit()
|
||||||
|
|
||||||
|
await conn.close()
|
||||||
|
|
||||||
asyncio.run(initdb)
|
asyncio.run(initdb())
|
||||||
6
main.py
6
main.py
|
|
@ -188,4 +188,8 @@ async def login(data: LoginBody, conn: sqlite3.Connection = Depends(get_db)) ->
|
||||||
|
|
||||||
response = JSONResponse(content=jsonable_encoder(person))
|
response = JSONResponse(content=jsonable_encoder(person))
|
||||||
response.set_cookie(key='user_id', value=str(person.id))
|
response.set_cookie(key='user_id', value=str(person.id))
|
||||||
return response
|
return response
|
||||||
|
|
||||||
|
@app.get('/auth/refresh')
|
||||||
|
async def current_user(user: persons.Person = Depends(cookie_person)) -> persons.Person:
|
||||||
|
return user
|
||||||
|
|
@ -94,7 +94,7 @@ async def find_meal_by_id(conn, meal_id: int) -> Meal:
|
||||||
async def find_meal_by_date(conn, date: datetime) -> Meal:
|
async def find_meal_by_date(conn, date: datetime) -> Meal:
|
||||||
async with conn.execute(f'''
|
async with conn.execute(f'''
|
||||||
SELECT {','.join(Meal.KEYS)} FROM Meal
|
SELECT {','.join(Meal.KEYS)} FROM Meal
|
||||||
WHERE date = ?
|
WHERE meal_date = ?
|
||||||
LIMIT 1
|
LIMIT 1
|
||||||
''', (date,)) as cursor:
|
''', (date,)) as cursor:
|
||||||
async for row in cursor:
|
async for row in cursor:
|
||||||
|
|
@ -103,7 +103,7 @@ async def find_meal_by_date(conn, date: datetime) -> Meal:
|
||||||
async def find_meals_by_date_range(conn, start: datetime, end: datetime) -> List[Meal]:
|
async def find_meals_by_date_range(conn, start: datetime, end: datetime) -> List[Meal]:
|
||||||
async with conn.execute(f'''
|
async with conn.execute(f'''
|
||||||
SELECT {','.join(Meal.KEYS)} FROM Meal
|
SELECT {','.join(Meal.KEYS)} FROM Meal
|
||||||
WHERE date >= ? AND date <= ?
|
WHERE meal_date >= ? AND meal_date <= ?
|
||||||
''', (start, end)) as cursor:
|
''', (start, end)) as cursor:
|
||||||
result = []
|
result = []
|
||||||
async for row in cursor:
|
async for row in cursor:
|
||||||
|
|
|
||||||
6
tests.py
6
tests.py
|
|
@ -144,5 +144,11 @@ class TestMeals(unittest.IsolatedAsyncioTestCase):
|
||||||
self.assertEqual(meal_by_id.extra_ingredients[0].id, extra_ingredient.id)
|
self.assertEqual(meal_by_id.extra_ingredients[0].id, extra_ingredient.id)
|
||||||
self.assertEqual(meal_by_id.extra_ingredients[0].line, extra_ingredient.line)
|
self.assertEqual(meal_by_id.extra_ingredients[0].line, extra_ingredient.line)
|
||||||
|
|
||||||
|
meals_by_date_range = await main.get_meals(meal.meal_date, meal.meal_date, self.conn)
|
||||||
|
self.assertIsNotNone(meals_by_date_range)
|
||||||
|
self.assertIsInstance(meals_by_date_range, list, msg=meals_by_date_range.body if hasattr(meals_by_date_range, 'body') else meals_by_date_range)
|
||||||
|
self.assertEqual(len(meals_by_date_range), 1)
|
||||||
|
self.assertEqual(meals_by_date_range[0].id, meal.id)
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
unittest.main()
|
unittest.main()
|
||||||
Loading…
Reference in a new issue