diff --git a/.dockerignore b/.dockerignore index 4c49bd7..0311a10 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1 +1,2 @@ .env +!.git diff --git a/app.py b/app.py index 6cc73c5..ab6b96f 100644 --- a/app.py +++ b/app.py @@ -90,9 +90,13 @@ async def get_issues(): type: string """ try: + # Get year from query parameters + year = request.args.get('year') + year = int(year) if year and year.isdigit() else None + # Fetch all issues with their details - print('inside get all issues') - data = await DmpAPIQueries.get_issue_query(async_session) + print(f'inside get all issues for year: {year}' if year else 'inside get all issues (all years)') + data = await DmpAPIQueries.get_issue_query(async_session, year=year) response = [] for result in data: @@ -101,7 +105,8 @@ async def get_issues(): 'org_name': result.org_name, 'issues': result.issues }) - + # Sort response by org_name alphabetically + response.sort(key=lambda x: x['org_name'].lower()) return jsonify({"issues": response}) except Exception as e: diff --git a/shared_migrations b/shared_migrations index ec465a2..f22bad9 160000 --- a/shared_migrations +++ b/shared_migrations @@ -1 +1 @@ -Subproject commit ec465a29357edf78b2727d31e50a6f6d3b4d57dc +Subproject commit f22bad965438497715d4ac0959a135f5af161cf7