From dbf0f9f0d34c9969aa6ae76f556745a9eb122106 Mon Sep 17 00:00:00 2001 From: Frederick Muriuki Muriithi Date: Sat, 15 Apr 2023 19:35:53 +0300 Subject: Decouple `gn3.db_utils` from `flask.current_app`. Decouple the `gn3.db_utils` module from the global `flask.current_app` object, ensuring that the database uri value is passed in as a required argument to the `gn3.db_utils.database_connection` function. --- gn3/auth/authorisation/groups/views.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gn3/auth/authorisation/groups') diff --git a/gn3/auth/authorisation/groups/views.py b/gn3/auth/authorisation/groups/views.py index d7a46c0..e933bcd 100644 --- a/gn3/auth/authorisation/groups/views.py +++ b/gn3/auth/authorisation/groups/views.py @@ -207,7 +207,7 @@ def ungrouped_data(dataset_type: str) -> Response: raise AuthorisationError(f"Invalid dataset type {dataset_type}") with require_oauth.acquire("profile group resource") as _the_token: - with gn3dbutils.database_connection() as gn3conn: + with gn3dbutils.database_connection(current_app.config["SQL_URI"]) as gn3conn: return jsonify(with_db_connection(partial( retrieve_ungrouped_data, gn3conn=gn3conn, dataset_type=dataset_type, @@ -226,7 +226,7 @@ def link_data() -> Response: raise InvalidData("Unexpected dataset type requested!") def __link__(conn: db.DbConnection): group = group_by_id(conn, group_id) - with gn3dbutils.database_connection() as gn3conn: + with gn3dbutils.database_connection(current_app.config["SQL_URI"]) as gn3conn: return link_data_to_group( conn, gn3conn, dataset_type, dataset_ids, group) -- cgit v1.2.3