From 3c2f4977e478dc7c6b243cab540ac2de4d0e6c84 Mon Sep 17 00:00:00 2001
From: Ilion Beyst <ilion.beyst@gmail.com>
Date: Tue, 2 Aug 2022 20:12:34 +0200
Subject: add parameters to recent_matches api endpoint

---
 planetwars-server/src/lib.rs            |  2 +-
 planetwars-server/src/routes/matches.rs | 28 +++++++++++++++++++++++++---
 2 files changed, 26 insertions(+), 4 deletions(-)

(limited to 'planetwars-server/src')

diff --git a/planetwars-server/src/lib.rs b/planetwars-server/src/lib.rs
index 9983dda..804dcd5 100644
--- a/planetwars-server/src/lib.rs
+++ b/planetwars-server/src/lib.rs
@@ -129,7 +129,7 @@ pub fn api() -> Router {
             "/bots/:bot_name/upload",
             post(routes::bots::upload_code_multipart),
         )
-        .route("/matches", get(routes::matches::list_public_matches))
+        .route("/matches", get(routes::matches::list_recent_matches))
         .route("/matches/:match_id", get(routes::matches::get_match_data))
         .route(
             "/matches/:match_id/log",
diff --git a/planetwars-server/src/routes/matches.rs b/planetwars-server/src/routes/matches.rs
index 03f6653..fde8471 100644
--- a/planetwars-server/src/routes/matches.rs
+++ b/planetwars-server/src/routes/matches.rs
@@ -1,4 +1,8 @@
-use axum::{extract::Path, Extension, Json};
+use axum::{
+    extract::{Path, Query},
+    Extension, Json,
+};
+use chrono::NaiveDateTime;
 use hyper::StatusCode;
 use serde::{Deserialize, Serialize};
 use std::{path::PathBuf, sync::Arc};
@@ -24,10 +28,28 @@ pub struct ApiMatchPlayer {
     bot_name: Option<String>,
 }
 
-pub async fn list_public_matches(
+#[derive(Serialize, Deserialize)]
+pub struct ListRecentMatchesParams {
+    count: Option<usize>,
+    // TODO: should timezone be specified here?
+    // TODO: implement these
+    before: Option<NaiveDateTime>,
+    after: Option<NaiveDateTime>,
+}
+
+const MAX_NUM_RETURNED_MATCHES: usize = 100;
+const DEFAULT_NUM_RETURNED_MATCHES: usize = 50;
+
+pub async fn list_recent_matches(
+    Query(params): Query<ListRecentMatchesParams>,
     conn: DatabaseConnection,
 ) -> Result<Json<Vec<ApiMatch>>, StatusCode> {
-    matches::list_public_matches(100, &conn)
+    let count = std::cmp::min(
+        params.count.unwrap_or(DEFAULT_NUM_RETURNED_MATCHES),
+        MAX_NUM_RETURNED_MATCHES,
+    );
+
+    matches::list_public_matches(count as i64, &conn)
         .map_err(|_| StatusCode::BAD_REQUEST)
         .map(|matches| Json(matches.into_iter().map(match_data_to_api).collect()))
 }
-- 
cgit v1.2.3