File tree Expand file tree Collapse file tree 4 files changed +8
-2
lines changed
packages/models-library/src/models_library/api_schemas_webserver
services/web/server/src/simcore_service_webserver/users Expand file tree Collapse file tree 4 files changed +8
-2
lines changed Original file line number Diff line number Diff line change @@ -300,8 +300,9 @@ class UserAccountGet(OutputSchema):
300300 ),
301301 ] = DEFAULT_FACTORY
302302
303- # pre-registration
303+ # pre-registration NOTE: that some users have no pre-registartion and therefore all options here can be none
304304 pre_registration_id : int | None
305+ pre_registration_created : datetime | None
305306 invited_by : str | None = None
306307 account_request_status : AccountRequestStatus | None
307308 account_request_reviewed_by : UserID | None = None
Original file line number Diff line number Diff line change @@ -766,6 +766,7 @@ async def search_merged_pre_and_registered_users(
766766 users_pre_registration_details .c .account_request_reviewed_at ,
767767 users .c .status ,
768768 invited_by ,
769+ users_pre_registration_details .c .created ,
769770 )
770771
771772 join_condition = users .c .id == users_pre_registration_details .c .user_id
Original file line number Diff line number Diff line change @@ -223,7 +223,10 @@ async def list_users_accounts(request: web.Request) -> web.Response:
223223
224224 def _to_domain_model (user : dict [str , Any ]) -> UserAccountGet :
225225 return UserAccountGet (
226- extras = user .pop ("extras" ) or {}, pre_registration_id = user .pop ("id" ), ** user
226+ extras = user .pop ("extras" ) or {},
227+ pre_registration_id = user .pop ("id" ),
228+ pre_registration_created = user .pop ("created" ),
229+ ** user ,
227230 )
228231
229232 page = Page [UserAccountGet ].model_validate (
Original file line number Diff line number Diff line change @@ -458,6 +458,7 @@ async def _list_products_or_none(user_id):
458458 extras = r .extras or {},
459459 invited_by = r .invited_by ,
460460 pre_registration_id = r .id ,
461+ pre_registration_created = r .created ,
461462 account_request_status = r .account_request_status ,
462463 account_request_reviewed_by = r .account_request_reviewed_by ,
463464 account_request_reviewed_at = r .account_request_reviewed_at ,
You can’t perform that action at this time.
0 commit comments