use new find_by for coaching_relationships

This function is not currently being used

Author: calebbourg

domain/src/coaching_relationship.rs

@@ -1,4 +1,23 @@
+use crate::coaching_relationships::Model;
+use crate::error::Error;
+use entity_api::IntoQueryFilterMap;
+use entity_api::{coaching_relationships, query};
+use sea_orm::DatabaseConnection;
+
 pub use entity_api::coaching_relationship::{
-    create, find_by, find_by_id, find_by_organization_with_user_names, find_by_user,
+    create, find_by_id, find_by_organization_with_user_names, find_by_user,
     get_relationship_with_user_names, CoachingRelationshipWithUserNames,
 };
+
+pub async fn find_by(
+    db: &DatabaseConnection,
+    params: impl IntoQueryFilterMap,
+) -> Result<Vec<Model>, Error> {
+    let coaching_relationships = query::find_by::<
+        coaching_relationships::Entity,
+        coaching_relationships::Column,
+    >(db, params.into_query_filter_map())
+    .await?;
+
+    Ok(coaching_relationships)
+}

entity_api/src/coaching_relationship.rs

@@ -1,5 +1,4 @@
 use super::error::{EntityApiErrorKind, Error};
-use crate::uuid_parse_str;
 use chrono::Utc;
 use entity::{
     coachees, coaches,
@@ -143,29 +142,6 @@ pub async fn get_relationship_with_user_names(
     Ok(query.one(db).await?)
 }
 
-pub async fn find_by(
-    db: &DatabaseConnection,
-    params: std::collections::HashMap<String, String>,
-) -> Result<Vec<Model>, Error> {
-    let mut query = coaching_relationships::Entity::find();
-
-    for (key, value) in params.iter() {
-        match key.as_str() {
-            "organization_id" => {
-                query = by_organization(query, uuid_parse_str(value)?).await;
-            }
-            _ => {
-                return Err(Error {
-                    source: None,
-                    error_kind: EntityApiErrorKind::InvalidQueryTerm,
-                });
-            }
-        }
-    }
-
-    Ok(query.all(db).await?)
-}
-
 pub async fn by_coaching_relationship(
     query: Select<coaching_relationships::Entity>,
     id: Id,