diff options
Diffstat (limited to 'gn_auth/auth/authorisation/resources')
| -rw-r--r-- | gn_auth/auth/authorisation/resources/groups/models.py | 13 | ||||
| -rw-r--r-- | gn_auth/auth/authorisation/resources/groups/views.py | 6 | ||||
| -rw-r--r-- | gn_auth/auth/authorisation/resources/views.py | 2 |
3 files changed, 9 insertions, 12 deletions
diff --git a/gn_auth/auth/authorisation/resources/groups/models.py b/gn_auth/auth/authorisation/resources/groups/models.py index 959389c..9a60df9 100644 --- a/gn_auth/auth/authorisation/resources/groups/models.py +++ b/gn_auth/auth/authorisation/resources/groups/models.py @@ -2,6 +2,7 @@ import json from uuid import UUID, uuid4 from functools import reduce +from dataclasses import dataclass from typing import Any, Sequence, Iterable, Optional, NamedTuple from flask import g @@ -21,18 +22,14 @@ from gn_auth.auth.authorisation.roles.models import ( Role, create_role, check_user_editable, revoke_user_role_by_name, assign_user_role_by_name) -class Group(NamedTuple): + +@dataclass(frozen=True) +class Group: """Class representing a group.""" group_id: UUID group_name: str group_metadata: dict[str, Any] - def dictify(self): - """Return a dict representation of `Group` objects.""" - return { - "group_id": self.group_id, "group_name": self.group_name, - "group_metadata": self.group_metadata - } DUMMY_GROUP = Group( group_id=UUID("77cee65b-fe29-4383-ae41-3cb3b480cc70"), @@ -50,8 +47,8 @@ class GroupRole(NamedTuple): def dictify(self) -> dict[str, Any]: """Return a dict representation of `GroupRole` objects.""" return { - "group_role_id": self.group_role_id, "group": dictify(self.group), "role": dictify(self.role) + "group_role_id": self.group_role_id, "group": asdict(self.group), } class GroupCreationError(AuthorisationError): diff --git a/gn_auth/auth/authorisation/resources/groups/views.py b/gn_auth/auth/authorisation/resources/groups/views.py index 26534fc..b655a0f 100644 --- a/gn_auth/auth/authorisation/resources/groups/views.py +++ b/gn_auth/auth/authorisation/resources/groups/views.py @@ -6,13 +6,13 @@ import datetime from typing import Iterable from functools import partial +from dataclasses import asdict from MySQLdb.cursors import DictCursor from flask import request, jsonify, Response, Blueprint, current_app from gn_auth.auth.db import sqlite3 as db from gn_auth.auth.db import mariadb as gn3db from gn_auth.auth.db.sqlite3 import with_db_connection -from gn_auth.auth.dictify import dictify from gn_auth.auth.authorisation.roles.models import Role from gn_auth.auth.authorisation.roles.models import user_roles @@ -42,7 +42,7 @@ def list_groups(): the_groups = all_groups(conn) return jsonify(the_groups.maybe( - [], lambda grps: [dictify(grp) for grp in grps])) + [], lambda grps: [asdict(grp) for grp in grps])) @groups.route("/create", methods=["POST"]) @require_oauth("profile group") @@ -59,7 +59,7 @@ def create_group(): new_group = _create_group( conn, group_name, user, request.form.get("group_description")) return jsonify({ - **dictify(new_group), "group_leader": asdict(user) + **asdict(new_group), "group_leader": asdict(user) }) @groups.route("/members/<uuid:group_id>", methods=["GET"]) diff --git a/gn_auth/auth/authorisation/resources/views.py b/gn_auth/auth/authorisation/resources/views.py index 8976dfa..5d00f8c 100644 --- a/gn_auth/auth/authorisation/resources/views.py +++ b/gn_auth/auth/authorisation/resources/views.py @@ -193,9 +193,9 @@ def resource_users(resource_id: uuid.UUID): "users.") results = ( { - "user_group": dictify(row["user_group"]), "roles": tuple(dictify(role) for role in row["roles"]) "user": asdict(row["user"]), + "user_group": asdict(row["user_group"]), } for row in ( user_row for user_id, user_row in with_db_connection(__the_users__).items())) |