diff --git a/ee/api/chalicelib/core/roles.py b/ee/api/chalicelib/core/roles.py index d5c4fb7da..0a32d9d5e 100644 --- a/ee/api/chalicelib/core/roles.py +++ b/ee/api/chalicelib/core/roles.py @@ -24,10 +24,13 @@ def update(tenant_id, user_id, role_id, changes): WHERE role_id = %(role_id)s AND tenant_id = %(tenant_id)s AND deleted_at ISNULL - AND protected = FALSE;""", + AND protected = FALSE + RETURNING *;""", {"tenant_id": tenant_id, "role_id": role_id, **changes}) ) - return get_roles(tenant_id=tenant_id) + row = cur.fetchone() + row["created_at"] = TimeUTC.datetime_to_timestamp(row["created_at"]) + return helper.dict_to_camel_case(row) def create(tenant_id, user_id, name, description, permissions): @@ -39,10 +42,13 @@ def create(tenant_id, user_id, name, description, permissions): with pg_client.PostgresClient() as cur: cur.execute( cur.mogrify("""INSERT INTO roles(tenant_id, name, description, permissions) - VALUES (%(tenant_id)s, %(name)s, %(description)s, %(permissions)s::text[]);""", + VALUES (%(tenant_id)s, %(name)s, %(description)s, %(permissions)s::text[]) + RETURNING *;""", {"tenant_id": tenant_id, "name": name, "description": description, "permissions": permissions}) ) - return get_roles(tenant_id=tenant_id) + row=cur.fetchone() + row["created_at"] = TimeUTC.datetime_to_timestamp(row["created_at"]) + return helper.dict_to_camel_case(row) def get_roles(tenant_id):