Skip to content

Commit 9b245c4

Browse files
committed
fixes migration
1 parent 0204522 commit 9b245c4

File tree

4 files changed

+49
-38
lines changed

4 files changed

+49
-38
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
"""new account_request_status column
2+
3+
Revision ID: c2e3e38f115e
4+
Revises: 742123f0933a
5+
Create Date: 2025-04-24 07:29:42.530145+00:00
6+
7+
"""
8+
9+
import sqlalchemy as sa
10+
from alembic import op
11+
12+
# revision identifiers, used by Alembic.
13+
revision = "c2e3e38f115e"
14+
down_revision = "742123f0933a"
15+
branch_labels = None
16+
depends_on = None
17+
18+
19+
def upgrade():
20+
# Create the enum type first
21+
account_request_status = sa.Enum(
22+
"PENDING", "APPROVED", "REJECTED", name="accountrequeststatus"
23+
)
24+
account_request_status.create(op.get_bind())
25+
26+
# Reuse the enum in the column definition
27+
op.add_column(
28+
"users_pre_registration_details",
29+
sa.Column(
30+
"account_request_status",
31+
account_request_status,
32+
server_default=sa.text("'PENDING'::accountrequeststatus"),
33+
nullable=False,
34+
),
35+
)
36+
37+
38+
def downgrade():
39+
op.drop_column("users_pre_registration_details", "account_request_status")
40+
41+
# Drop the enum type after dropping the column
42+
sa.Enum(name="accountrequeststatus").drop(op.get_bind())

packages/postgres-database/src/simcore_postgres_database/migration/versions/de44e42e2e3b_new_account_request_status_column.py

Lines changed: 0 additions & 37 deletions
This file was deleted.

services/web/server/src/simcore_service_webserver/users/_users_service.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ async def pre_register_user(
4343
app: web.Application,
4444
profile: PreRegisteredUserGet,
4545
creator_user_id: UserID,
46+
product_name: ProductName,
4647
) -> UserForAdminGet:
4748

4849
found = await search_users_as_admin(
@@ -71,6 +72,11 @@ async def pre_register_user(
7172
if key in details:
7273
details[f"pre_{key}"] = details.pop(key)
7374

75+
# adds the product name to the extras field
76+
extras = details.get("extras", {})
77+
extras["product_name"] = product_name
78+
details["extras"] = extras
79+
7480
await _users_repository.create_user_details(
7581
get_asyncpg_engine(app),
7682
email=profile.email,

services/web/server/tests/unit/with_dbs/03/test_users.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -779,7 +779,7 @@ async def test_list_users_for_admin(
779779
# Register one of the pre-registered users
780780
new_user = await simcore_service_webserver.login._auth_service.create_user(
781781
client.app,
782-
email=pre_registered_users[0]["data"]["email"],
782+
email=pre_registered_users[0]["email"],
783783
password=DEFAULT_TEST_PASSWORD,
784784
status_upon_creation=UserStatus.ACTIVE,
785785
expires_at=None,

0 commit comments

Comments
 (0)