@sanderegg review: comments

Author: pcrespov

packages/models-library/src/models_library/groups.py

@@ -15,8 +15,8 @@
 EVERYONE_GROUP_ID: Final[int] = 1
 
 GroupID: TypeAlias = PositiveInt
-PrimaryGroupID: TypeAlias = Annotated[GroupID, Field(gt=2)]
-StandardGroupID: TypeAlias = Annotated[GroupID, Field(gt=2)]
+PrimaryGroupID: TypeAlias = Annotated[GroupID, Field(gt=EVERYONE_GROUP_ID)]
+StandardGroupID: TypeAlias = Annotated[GroupID, Field(gt=EVERYONE_GROUP_ID)]
 
 __all__: tuple[str, ...] = ("GroupType",)
 

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

@@ -381,9 +381,7 @@ async def search_merged_pre_and_registered_users(
         users_pre_registration_details.c.state,
         users_pre_registration_details.c.postal_code,
         users_pre_registration_details.c.country,
-        users_pre_registration_details.c.user_id.label(
-            "pre_reg_user_id"
-        ),  # "copy" of user_id from pre-registration
+        users_pre_registration_details.c.user_id.label("pre_reg_user_id"),
         users_pre_registration_details.c.extras,
         users_pre_registration_details.c.account_request_status,
         users_pre_registration_details.c.account_request_reviewed_by,