Merge branch 'main' into board-stream

src/api/games/read_game.rs

@@ -21,7 +21,7 @@ pub async fn handler(
     let game_board = GameBoard::latest(&mut conn, game_id).await?;
 
     let api_game_board = ApiGameBoard::from(game_board);
-
+  
     Ok(GameIndexTemplate { api_game_board })
 }
 

src/api/games/read_game_board.rs

@@ -0,0 +1,59 @@
+use askama::Template;
+use axum::{
+    extract::{Path, State},
+    response::{IntoResponse, Response},
+};
+use sqlx::types::Uuid;
+
+use crate::api::models::ApiGameBoard;
+use crate::database::models::{Game, GameBoard, GameError};
+use crate::AppState;
+
+pub async fn handler(
+    State(state): State<AppState>,
+    Path(game_id): Path<Uuid>,
+) -> Result<impl IntoResponse, ReadBoardError> {
+    let mut conn = state.database().acquire().await?;
+    if !Game::exists(&mut conn, game_id).await? {
+        return Err(ReadBoardError::NotFound);
+    }
+
+    let game_board = GameBoard::latest(&mut conn, game_id).await?;
+
+    tracing::info!("read game board: {:?}", game_board);
+
+    let api_game_board = ApiGameBoard::from(game_board);
+
+    Ok(TemplateApiGameBoard { api_game_board })
+}
+
+#[derive(Template)]
+#[template(path = "game_board.html")]
+struct TemplateApiGameBoard {
+    api_game_board: ApiGameBoard,
+}
+
+#[derive(Debug, thiserror::Error)]
+pub enum ReadBoardError {
+    #[error("sqlx error: {0}")]
+    Sqlx(#[from] sqlx::Error),
+    #[error("game error: {0}")]
+    Game(#[from] GameError),
+    #[error("game not found")]
+    NotFound,
+}
+
+impl IntoResponse for ReadBoardError {
+    fn into_response(self) -> Response {
+        match self {
+            ReadBoardError::NotFound => {
+                let body = format!("{}", self);
+                (axum::http::StatusCode::NOT_FOUND, body).into_response()
+            }
+            _ => {
+                let body = format!("{}", self);
+                (axum::http::StatusCode::INTERNAL_SERVER_ERROR, body).into_response()
+            }
+        }
+    }
+}

src/api/games/watch_game_sse.rs

@@ -16,8 +16,6 @@ use crate::api::templates::GameBoardTemplate;
 
 // TODO: generalize and use the read_game_board handler
 pub type GameUpdateStream = Sender<GameBoardTemplate>;
-
-// TODO: proper error handling
 pub async fn handler(
     Path(game_id): Path<Uuid>,
     Extension(tx): Extension<GameUpdateStream>,

src/main.rs

@@ -28,7 +28,7 @@ impl AppState {
 #[shuttle_runtime::main]
 async fn main(
     #[shuttle_shared_db::Postgres(
-        local_uri = &std::env::var("DATABASE_URL").expect("DATABASE_URL must be set") 
+        local_uri = &std::env::var("DATABASE_URL").unwrap_or_else(|_| "postgres://localhost:5432".to_string()),
     )]
     db: PgPool,
 ) -> shuttle_axum::ShuttleAxum {

static/js/board.js

@@ -87,6 +87,7 @@ initBoard = function() {
                 clickedSquare.classList.remove('selected');
                 selectedPiece = null;
                 return;
+
             }
 
             toSquare = clickedSquare;