add MatchState to ApiMatch

2 files changed, 4 insertions, 1 deletions

diff --git a/planetwars-server/src/db_types.rs b/planetwars-server/src/db_types.rs
index d1225d7..1b99e49 100644
--- a/planetwars-server/src/db_types.rs
+++ b/planetwars-server/src/db_types.rs
@@ -1,6 +1,7 @@
 use diesel_derive_enum::DbEnum;
+use serde::{Deserialize, Serialize};
 
-#[derive(DbEnum, Debug, Clone, Copy, PartialEq, Eq, Hash)]
+#[derive(DbEnum, Debug, Clone, Copy, Serialize, Deserialize, PartialEq, Eq, Hash)]
 #[DieselType = "Match_state"]
 
 pub enum MatchState {
diff --git a/planetwars-server/src/routes/matches.rs b/planetwars-server/src/routes/matches.rs
index 44c8607..f2599cd 100644
--- a/planetwars-server/src/routes/matches.rs
+++ b/planetwars-server/src/routes/matches.rs
@@ -101,6 +101,7 @@ async fn run_match_task(
 pub struct ApiMatch {
     id: i32,
     timestamp: chrono::NaiveDateTime,
+    state: MatchState,
     players: Vec<ApiMatchPlayer>,
 }
 
@@ -119,6 +120,7 @@ pub fn match_data_to_api(data: matches::MatchData) -> ApiMatch {
     ApiMatch {
         id: data.base.id,
         timestamp: data.base.created_at,
+        state: data.base.state,
         players: data
             .match_players
             .iter()