jacob/munch-ease-backend
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Return participants with meals

Browse source
This commit is contained in:
jableader 2024-04-30 21:21:59 +10:00
parent 41aa1f8e00
commit 3ee7511aea
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
main.py
View file

@ -125,6 +125,7 @@ async def get_meals(date_from: Annotated[datetime.datetime, Query(alias='from')]
for meal in await meals.find_meals_by_date_range(conn, date_from, to): for meal in await meals.find_meals_by_date_range(conn, date_from, to):
await meals.load_recipes(conn, meal) await meals.load_recipes(conn, meal)
await meals.load_extra_ingredients(conn, meal) await meals.load_extra_ingredients(conn, meal)
await meals.load_participants(conn, meal)
result.append(meal) result.append(meal)
return result return result
@ -196,6 +197,6 @@ async def login(data: LoginBody, conn: sqlite3.Connection = Depends(get_db)) ->
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') @app.post('/auth/refresh')
async def current_user(user: persons.Person = Depends(cookie_person)) -> persons.Person: async def current_user(user: persons.Person = Depends(cookie_person)) -> persons.Person:
return user return user

10
tests.py
View file

@ -151,6 +151,16 @@ class TestMeals(unittest.IsolatedAsyncioTestCase):
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.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(len(meals_by_date_range), 1)
self.assertEqual(meals_by_date_range[0].id, meal.id) self.assertEqual(meals_by_date_range[0].id, meal.id)
self.assertEqual(meals_by_date_range[0].meal_date, meal.meal_date)
self.assertEqual(len(meals_by_date_range[0].chefs), 1)
self.assertEqual(meals_by_date_range[0].chefs[0].id, meal.chefs[0].id)
self.assertEqual(meals_by_date_range[0].chefs[0].name, meal.chefs[0].name)
self.assertEqual(len(meals_by_date_range[0].cleanup), 1)
self.assertEqual(meals_by_date_range[0].cleanup[0].id, meal.cleanup[0].id)
self.assertEqual(meals_by_date_range[0].cleanup[0].name, meal.cleanup[0].name)
self.assertEqual(len(meals_by_date_range[0].consumers), 2)
self.assertEqual(meals_by_date_range[0].recipes[0].id, recipe.id)
self.assertEqual(meals_by_date_range[0].recipes[0].name, recipe.name)
if __name__ == '__main__': if __name__ == '__main__':
unittest.main() unittest.main()