Refactor data retrieval functions: get_all_users ,get_all_site_group

src/get_data.py

@@ -107,69 +107,3 @@ def get_metric_value(
 
     return metric_values
 
-
-# get all users
-def get_all_users(session: Session) -> List[UserSQL]:
-    """Get all users from the database.
-    :param session: database session
-    """
-    query = session.query(UserSQL)
-
-    query = query.order_by(UserSQL.email.asc())
-
-    users = query.all()
-
-    return users
-
-
-# get all site groups
-def get_all_site_groups(session: Session) -> List[SiteGroupSQL]:
-    """Get all users from the database.
-    :param session: database session
-    """
-    query = session.query(SiteGroupSQL)
-
-    query = query.order_by(SiteGroupSQL.site_group_name.asc())
-
-    site_groups = query.all()
-
-    return site_groups
-
-
-# update user site group; users only belong to one site group
-def update_user_site_group(
-    session: Session, email: str, site_group_name: str
-) -> UserSQL:
-    """Change site group for user.
-    :param session: database session
-    :param email: email of user
-    :param site_group_name: name of site group
-    """
-    site_group = (
-        session.query(SiteGroupSQL)
-        .filter(SiteGroupSQL.site_group_name == site_group_name)
-        .first()
-    )
-
-    user = session.query(UserSQL).filter(UserSQL.email == email)
-
-    user = user.update({"site_group_uuid": site_group.site_group_uuid})
-
-    session.commit()
-
-    return user
-
-
-# get site group by name
-def get_site_by_client_site_id(session: Session, client_site_id: str) -> List[SiteSQL]:
-    """Get site by client site id.
-    :param session: database session
-    :param client_site_id: client site id
-    """
-    query = session.query(SiteSQL)
-
-    query = query.filter(SiteSQL.client_site_id == client_site_id)
-
-    site = query.first()
-
-    return site

src/sites_toolbox.py

@@ -10,7 +10,7 @@
 from pvsite_datamodel.read.model import get_models
 from pvsite_datamodel.sqlmodels import SiteAssetType
 
-from get_data import get_all_users, get_all_site_groups
+# from get_data import get_all_users, get_all_site_groups   # Function has been already transferred to pvsite_datamodel.read.user
 from pvsite_datamodel.write.user_and_site import (
     assign_model_name_to_site,
     create_site,
@@ -21,6 +21,8 @@
     create_site_group
 )
 
+from pvsite_datamodel.read.user import get_all_users, get_all_site_groups
+
 from site_toolbox.get_details import (
     get_user_details,
     get_site_details,

tests/test_get_data.py

@@ -1,8 +1,10 @@
 """tests for get_data.py"""
-from get_data import (
-    get_all_users,
-    get_all_site_groups,
-)
+# from get_data import (
+#     get_all_users,
+#     get_all_site_groups,
+# )     # Function has been already transferred to pvsite_datamodel.read.user
+
+from pvsite_datamodel.read.user import get_all_users, get_all_site_groups
 from pvsite_datamodel.read import get_all_sites