Merge pull request #202 from refactor-group/160-feature-enhanced-coaching-sessions-endpoint

160 feature enhanced coaching sessions endpoint

Author: jhodapp

domain/src/coaching_session.rs

@@ -11,7 +11,10 @@ use log::*;
 use sea_orm::{DatabaseConnection, IntoActiveModel};
 use service::config::Config;
 
-pub use entity_api::coaching_session::{find_by_id, find_by_id_with_coaching_relationship};
+pub use entity_api::coaching_session::{
+    find_by_id, find_by_id_with_coaching_relationship, find_by_user_with_includes, EnrichedSession,
+    IncludeOptions,
+};
 
 #[derive(Debug, Clone)]
 struct SessionDate(NaiveDateTime);

domain/src/lib.rs

@@ -9,10 +9,10 @@ pub use entity_api::{
     query::{FilterOnly, IntoQueryFilterMap, QueryFilterMap},
 };
 
-// Re-exports from `entity` crate
+// Re-exports from `entity` crate via `entity_api`
 pub use entity_api::{
     actions, agreements, coachees, coaches, coaching_relationships, coaching_sessions, jwts, notes,
-    organizations, overarching_goals, query::QuerySort, user_roles, users, Id,
+    organizations, overarching_goals, query::QuerySort, status, user_roles, users, Id,
 };
 
 pub mod action;

entity/src/status.rs

@@ -1,25 +1,22 @@
 use sea_orm::entity::prelude::*;
 use serde::{Deserialize, Serialize};
 
-#[derive(Debug, Clone, Eq, PartialEq, EnumIter, Deserialize, Serialize, DeriveActiveEnum)]
+#[derive(
+    Debug, Clone, Eq, PartialEq, EnumIter, Deserialize, Serialize, DeriveActiveEnum, Default,
+)]
 #[sea_orm(rs_type = "String", db_type = "Enum", enum_name = "status")]
 pub enum Status {
     #[sea_orm(string_value = "not_started")]
     NotStarted,
     #[sea_orm(string_value = "in_progress")]
+    #[default]
     InProgress,
     #[sea_orm(string_value = "completed")]
     Completed,
     #[sea_orm(string_value = "wont_do")]
     WontDo,
 }
 
-impl std::default::Default for Status {
-    fn default() -> Self {
-        Self::InProgress
-    }
-}
-
 impl From<&str> for Status {
     fn from(value: &str) -> Self {
         match value {
@@ -31,3 +28,14 @@ impl From<&str> for Status {
         }
     }
 }
+
+impl std::fmt::Display for Status {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            Self::NotStarted => write!(f, "Not Started"),
+            Self::InProgress => write!(f, "In Progress"),
+            Self::Completed => write!(f, "Completed"),
+            Self::WontDo => write!(f, "Won't Do"),
+        }
+    }
+}