diff options
Diffstat (limited to 'gn_auth/scripts')
| -rw-r--r-- | gn_auth/scripts/assign_data_to_default_admin.py | 13 | ||||
| -rw-r--r-- | gn_auth/scripts/batch_assign_data_to_default_admin.py | 9 |
2 files changed, 13 insertions, 9 deletions
diff --git a/gn_auth/scripts/assign_data_to_default_admin.py b/gn_auth/scripts/assign_data_to_default_admin.py index 69fc50c..5c8dae7 100644 --- a/gn_auth/scripts/assign_data_to_default_admin.py +++ b/gn_auth/scripts/assign_data_to_default_admin.py @@ -7,6 +7,7 @@ import json import time import random import logging +import datetime from pathlib import Path from uuid import UUID, uuid4 @@ -135,11 +136,11 @@ def __resource_category_by_key__( row["resource_category_description"]) -def __create_resources__(cursor: authdb.DbCursor) -> tuple[Resource, ...]: +def __create_resources__(cursor: authdb.DbCursor, admin: User) -> tuple[Resource, ...]: """Create default resources.""" resources = tuple(Resource( uuid4(), name, __resource_category_by_key__(cursor, catkey), - True, tuple() + True, admin, datetime.datetime.now(), tuple() ) for name, catkey in ( ("mRNA-euhrin", "mrna"), ("pheno-xboecp", "phenotype"), @@ -155,7 +156,7 @@ def __create_resources__(cursor: authdb.DbCursor) -> tuple[Resource, ...]: return resources -def default_resources(conn: authdb.DbConnection, group: Group) -> tuple[ +def default_resources(conn: authdb.DbConnection, group: Group, admin: User) -> tuple[ Resource, ...]: """Create default resources, or return them if they exist.""" with authdb.cursor(conn) as cursor: @@ -170,7 +171,7 @@ def default_resources(conn: authdb.DbConnection, group: Group) -> tuple[ (str(group.group_id),)) rows = cursor.fetchall() if len(rows) == 0: - return __create_resources__(cursor) + return __create_resources__(cursor, admin) return tuple(Resource( UUID(row["resource_id"]), @@ -180,6 +181,8 @@ def default_resources(conn: authdb.DbConnection, group: Group) -> tuple[ row["resource_category_key"], row["resource_category_description"]), bool(row["public"]), + admin, + datetime.datetime.now(), tuple() ) for row in rows) @@ -405,7 +408,7 @@ def entry(authdbpath, mysqldburi): biodb.database_connection(mysqldburi) as bioconn): admin = select_sys_admin(sys_admins(authconn)) the_admin_group = admin_group(authconn, admin) - resources = default_resources(authconn, the_admin_group) + resources = default_resources(authconn, the_admin_group, admin) add_resources_to_group(authconn, resources, the_admin_group) for resource in resources: assign_data_to_resource( diff --git a/gn_auth/scripts/batch_assign_data_to_default_admin.py b/gn_auth/scripts/batch_assign_data_to_default_admin.py index 95d9794..862c4bd 100644 --- a/gn_auth/scripts/batch_assign_data_to_default_admin.py +++ b/gn_auth/scripts/batch_assign_data_to_default_admin.py @@ -16,7 +16,7 @@ from gn_auth.auth.authentication.users import User from gn_auth.auth.authorisation.resources.groups.models import ( Group, db_row_to_group) from gn_auth.scripts.assign_data_to_default_admin import ( - default_resources, assign_data_to_resource) + sys_admins, default_resources, assign_data_to_resource) def resources_group(conn: authdb.DbConnection) -> Maybe: @@ -48,10 +48,10 @@ def resource_owner(conn: authdb.DbConnection) -> Maybe: User.from_sqlite3_row) -def assign_data(authconn: authdb.DbConnection, bioconn, group: Group): +def assign_data(authconn: authdb.DbConnection, bioconn, group: Group, admin: User): """Do actual data assignments.""" try: - for resource in default_resources(authconn, group): + for resource in default_resources(authconn, group, admin): assign_data_to_resource(authconn, bioconn, resource, group) return 1 @@ -76,9 +76,10 @@ if __name__ == "__main__": if Path(authdbpath).exists(): with (authdb.connection(authdbpath) as authconn, biodb.database_connection(mysqldburi) as bioconn): + admin = sys_admins(authconn)[0] return resources_group(authconn).maybe( 1, - lambda group: assign_data(authconn, bioconn, group)) + lambda group: assign_data(authconn, bioconn, group, admin)) logging.error("There is no such SQLite3 database file.") return 1 |
