@sanderegg review: rename filters

Author: pcrespov

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

@@ -345,9 +345,9 @@ async def search_merged_pre_and_registered_users(
     engine: AsyncEngine,
     connection: AsyncConnection | None = None,
     *,
-    email_like: str | None = None,
-    user_name_like: str | None = None,
-    primary_group_id: int | None = None,
+    filter_by_email_like: str | None = None,
+    filter_by_user_name_like: str | None = None,
+    filter_by_primary_group_id: int | None = None,
     product_name: ProductName | None = None,
 ) -> list[Row]:
     """Searches and merges users from both users and pre-registration tables"""
@@ -392,9 +392,15 @@ async def search_merged_pre_and_registered_users(
         users_pre_registration_details.c.created,
     )
 
-    left_outer_join = _build_left_outer_join_query(email_like, product_name, columns)
+    left_outer_join = _build_left_outer_join_query(
+        filter_by_email_like, product_name, columns
+    )
     right_outer_join = _build_right_outer_join_query(
-        email_like, user_name_like, primary_group_id, product_name, columns
+        filter_by_email_like,
+        filter_by_user_name_like,
+        filter_by_primary_group_id,
+        product_name,
+        columns,
     )
 
     queries = []

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

@@ -164,7 +164,7 @@ def _glob_to_sql_like(glob_pattern: str) -> str:
 
     rows = await _accounts_repository.search_merged_pre_and_registered_users(
         get_asyncpg_engine(app),
-        email_like=_glob_to_sql_like(email_glob),
+        filter_by_email_like=_glob_to_sql_like(email_glob),
         product_name=product_name,
     )
 

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

@@ -555,7 +555,7 @@ async def test_get_profile_user_without_pre_registration(
     # Verify user has no pre-registration data
     pre_reg_users = await search_merged_pre_and_registered_users(
         asyncpg_engine,
-        email_like=logged_user["email"],
+        filter_by_email_like=logged_user["email"],
         product_name="osparc",
     )
 

services/web/server/tests/unit/with_dbs/03/users/test_users_accounts_repository.py

@@ -852,7 +852,7 @@ async def test_search_merged_users_by_email(
     # Act
     rows = await _accounts_repository.search_merged_pre_and_registered_users(
         asyncpg_engine,
-        email_like=email_pattern,
+        filter_by_email_like=email_pattern,
         product_name=product_name,
     )
 
@@ -894,7 +894,7 @@ async def test_search_merged_users_by_username(
     # Act
     rows = await _accounts_repository.search_merged_pre_and_registered_users(
         asyncpg_engine,
-        user_name_like=username_pattern,
+        filter_by_user_name_like=username_pattern,
         product_name=product_name,
     )
 
@@ -939,7 +939,7 @@ async def test_search_merged_users_by_primary_group_id(
     # Act
     results = await _accounts_repository.search_merged_pre_and_registered_users(
         asyncpg_engine,
-        primary_group_id=primary_group_id,
+        filter_by_primary_group_id=primary_group_id,
         product_name=product_name,
     )