backend/src/api.rs

@@ -31,6 +31,8 @@ struct ApiResponse {
     #[serde(skip_serializing_if = "Option::is_none")]
     gamenights: Option<Vec<GamenightOutput>>,
     #[serde(skip_serializing_if = "Option::is_none")]
+    gamenight: Option<GamenightOutput>,
+    #[serde(skip_serializing_if = "Option::is_none")]
     games: Option<Vec<Game>>,
 }
 
@@ -43,6 +45,7 @@ impl ApiResponse {
         message: None,
         user: None,
         gamenights: None,
+        gamenight: None,
         games: None,
     };
 
@@ -52,6 +55,7 @@ impl ApiResponse {
             message: Some(Cow::Owned(message)),
             user: None,
             gamenights: None,
+            gamenight: None,
             games: None,
         }
     }
@@ -65,16 +69,29 @@ impl ApiResponse {
                 jwt: jwt,
             }),
             gamenights: None,
+            gamenight: None,
             games: None,
         }
     }
 
-    fn gamenight_response(gamenights: Vec<GamenightOutput>) -> Self {
+    fn gamenights_response(gamenights: Vec<GamenightOutput>) -> Self {
         Self {
             result: Self::SUCCES_RESULT,
             message: None,
             user: None,
             gamenights: Some(gamenights),
+            gamenight: None,
+            games: None,
+        }
+    }
+    
+    fn gamenight_response(gamenight: GamenightOutput) -> Self {
+        Self {
+            result: Self::SUCCES_RESULT,
+            message: None,
+            user: None,
+            gamenights: None,
+            gamenight: Some(gamenight),
             games: None,
         }
     }
@@ -85,6 +102,7 @@ impl ApiResponse {
             message: None,
             user: None,
             gamenights: None,
+            gamenight: None,
             games: Some(games),
         }
     }
@@ -140,6 +158,63 @@ pub struct GamenightOutput {
     participants: Vec<User>,
 }
 
+#[derive(Debug, Serialize, Deserialize)]
+pub struct GamenightUpdate {
+    action: String
+}
+
+#[patch("/gamenights/<gamenight_id>", format = "application/json", data = "<patch_json>")]
+pub async fn patch_gamenight(conn: DbConn, user: User, gamenight_id: String, patch_json: Json<GamenightUpdate>) -> ApiResponseVariant {
+    let uuid = Uuid::parse_str(&gamenight_id).unwrap();
+    let patch = patch_json.into_inner();
+    match patch.action.as_str() {
+        "RemoveParticipant" => {
+            let entry = GamenightParticipantsEntry {
+                gamenight_id: uuid,
+                user_id: user.id
+            };
+            match remove_participant(&conn, entry).await {
+                Ok(_) => ApiResponseVariant::Value(json!(ApiResponse::SUCCES)),
+                Err(err) => ApiResponseVariant::Value(json!(ApiResponse::error(err.to_string())))
+            }
+        }
+        "AddParticipant" => {
+            let entry = GamenightParticipantsEntry {
+                gamenight_id: uuid,
+                user_id: user.id
+            };
+            match add_participant(&conn, entry).await {
+                Ok(_) => ApiResponseVariant::Value(json!(ApiResponse::SUCCES)),
+                Err(err) => ApiResponseVariant::Value(json!(ApiResponse::error(err.to_string())))
+            }
+        }
+        _ => ApiResponseVariant::Value(json!(ApiResponse::SUCCES))
+    }
+}
+
+#[get("/gamenights/<gamenight_id>")]
+pub async fn gamenight(conn: DbConn, _user: User, gamenight_id: String) -> ApiResponseVariant {
+    let uuid = Uuid::parse_str(&gamenight_id).unwrap();
+    let gamenight = match get_gamenight(&conn, uuid).await {
+        Ok(result) => result,
+        Err(err) => return ApiResponseVariant::Value(json!(ApiResponse::error(err.to_string()))),
+    };
+    let games = match get_games_of_gamenight(&conn, uuid).await {
+        Ok(result) => result,
+        Err(err) => return ApiResponseVariant::Value(json!(ApiResponse::error(err.to_string()))),
+    };
+    let participants = match load_participants(&conn, uuid).await {
+        Ok(result) => result,
+        Err(err) => return ApiResponseVariant::Value(json!(ApiResponse::error(err.to_string()))),
+    };
+    let gamenight_output = GamenightOutput {
+        gamenight: gamenight,
+        game_list: games,
+        participants: participants
+    };
+    return ApiResponseVariant::Value(json!(ApiResponse::gamenight_response(gamenight_output)))
+}
+
 #[get("/gamenights")]
 pub async fn gamenights(conn: DbConn, _user: User) -> ApiResponseVariant {
     let gamenights = match get_all_gamenights(&conn).await {
@@ -164,7 +239,7 @@ pub async fn gamenights(conn: DbConn, _user: User) -> ApiResponseVariant {
         .collect();
 
     match game_results {
-        Ok(result) => ApiResponseVariant::Value(json!(ApiResponse::gamenight_response(result))),
+        Ok(result) => ApiResponseVariant::Value(json!(ApiResponse::gamenights_response(result))),
         Err(err) => ApiResponseVariant::Value(json!(ApiResponse::error(err.to_string()))),
     }
 }
@@ -220,7 +295,7 @@ pub async fn gamenights_post_json(
         gamenight_id: gamenight_id,
         user_id: user.id,
     };
-    match insert_participant(&conn, participant).await {
+    match add_participant(&conn, participant).await {
         Ok(_) => ApiResponseVariant::Value(json!(ApiResponse::SUCCES)),
         Err(err) => ApiResponseVariant::Value(json!(ApiResponse::error(err.to_string()))),
     }
@@ -375,7 +450,7 @@ pub async fn post_participants(
     _user: User,
     entry_json: Json<GamenightParticipantsEntry>,
 ) -> ApiResponseVariant {
-    match insert_participant(&conn, entry_json.into_inner()).await {
+    match add_participant(&conn, entry_json.into_inner()).await {
         Ok(_) => ApiResponseVariant::Value(json!(ApiResponse::SUCCES)),
         Err(error) => ApiResponseVariant::Value(json!(ApiResponse::error(error.to_string()))),
     }

backend/src/main.rs

@@ -50,6 +50,8 @@ async fn rocket() -> _ {
         .mount(
             "/api",
             routes![
+                api::gamenight,
+                api::patch_gamenight,
                 api::gamenights,
                 api::gamenights_unauthorized,
                 api::gamenights_post_json,

backend/src/schema/gamenight.rs

@@ -110,9 +110,9 @@ pub async fn insert_gamenight(
         .await?)
 }
 
-pub async fn get_gamenight(conn: &DbConn, game_id: Uuid) -> Result<Gamenight, DatabaseError> {
+pub async fn get_gamenight(conn: &DbConn, gamenight_id: Uuid) -> Result<Gamenight, DatabaseError> {
     Ok(conn
-        .run(move |c| gamenight::table.find(game_id).first(c))
+        .run(move |c| gamenight::table.find(gamenight_id).first(c))
         .await?)
 }
 
@@ -190,7 +190,7 @@ pub async fn load_participants(
         .await?)
 }
 
-pub async fn insert_participant(
+pub async fn add_participant(
     conn: &DbConn,
     participant: GamenightParticipantsEntry,
 ) -> Result<usize, DatabaseError> {
@@ -198,6 +198,7 @@ pub async fn insert_participant(
         .run(move |c| {
             diesel::insert_into(gamenight_participants::table)
                 .values(&participant)
+                .on_conflict_do_nothing()
                 .execute(c)
         })
         .await?)

frontend/src/App.js

@@ -15,7 +15,7 @@ function App() {
   const [gamenights, setGamenights] = useState([]);
   const [flashData, setFlashData] = useState({});
   const [games, setGames] = useState([]);
-  const [activeGamenight, setActiveGamenight] = useState(null);
+  const [activeGamenightId, setActiveGamenightId] = useState(null);
 
   const POST_HEADER = {'Content-Type': 'application/json'};
   const AUTH_HEADER = {'Authorization': `Bearer ${user?.jwt}`};
@@ -42,7 +42,7 @@ function App() {
   };
 
   const dismissActiveGamenight = () => {
-    setActiveGamenight(null);
+    setActiveGamenightId(null);
   };
 
   useEffect(() => {
@@ -72,7 +72,7 @@ function App() {
     );
   } else {
     let mainview;
-    if(activeGamenight === null) {
+    if(activeGamenightId === null) {
       mainview = (
         <Gamenights 
           user={user}
@@ -80,13 +80,15 @@ function App() {
           setFlash={setFlash}
           refetchGamenights={refetchGamenights}
           gamenights={gamenights}
-          onSelectGamenight={(g) => setActiveGamenight(g)}/>
+          onSelectGamenight={(g) => setActiveGamenightId(g.id)}/>
       )
     } else {
       mainview = (
       <Gamenight
-        gamenight={activeGamenight}
+        gamenightId={activeGamenightId}
         onDismis={dismissActiveGamenight}
+        setFlash={setFlash}
+        user={user}
       />)
     }
 

frontend/src/api/Api.js

@@ -28,6 +28,15 @@ export function get_gamenights(token) {
   });
 }
 
+export function get_gamenight(gamenight_id, token) {
+  return fetchResource(`api/gamenights/${gamenight_id}`, {
+    method: 'GET',
+    headers: {
+      'Authorization': `Bearer ${token}`
+    },
+  });
+}
+
 export function post_gamenight(input, token) {
   return fetchResource('api/gamenights', {
     method: 'POST',
@@ -39,6 +48,17 @@ export function post_gamenight(input, token) {
   });
 }
 
+export function patch_gamenight(gamenight_id, input, token) {
+  return fetchResource(`api/gamenights/${gamenight_id}`, {
+    method: 'PATCH',
+    headers: {
+      'Content-Type': 'application/json',
+      'Authorization': `Bearer ${token}`
+    },
+    body: JSON.stringify(input)
+  })
+}
+
 export function delete_gamenight(input, token) {
   return fetchResource('api/gamenights', {
     method: 'DELETE',

frontend/src/api/FetchResource.js

@@ -21,9 +21,7 @@ function ApiError(message, data, status) {
 
 const fetchResource = (path, userOptions = {}) => {
   const defaultOptions = {};
-  const defaultHeaders = {
+  const defaultHeaders = {};
-    'Content-Type': 'application/json'
-  };
 
   const options = {
     ...defaultOptions,

frontend/src/components/Gamenight.jsx

@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import React, { useState, useEffect } from 'react';
 import List from '@mui/material/List';
 import ListItem from '@mui/material/ListItem';
 import ListItemText from '@mui/material/ListItemText';
@@ -6,15 +6,26 @@ import ListSubheader from '@mui/material/ListSubheader';
 import ArrowBackIcon from '@mui/icons-material/ArrowBack';
 import IconButton from '@mui/material/IconButton';
 import Typography from '@mui/material/Typography';
+import Button from '@mui/material/Button';
 
 import moment from 'moment';
-
+import {unpack_api_result, get_gamenight, patch_gamenight} from '../api/Api';
 
 function Gamenight(props) {
 
   const [dense, setDense] = useState(true);
+  const [gamenight, setGamenight] = useState(null);
 
-  let games = props.gamenight.game_list.map(g =>
+  const fetchGamenight = () => {
+    if (props.user !== null) {
+      unpack_api_result(get_gamenight(props.gamenightId, props.user.jwt), props.setFlash)
+        .then(result => setGamenight(result.gamenight));
+    }
+  }
+
+  useEffect(fetchGamenight, []);
+
+  let games = gamenight?.game_list.map(g =>
     (
       <ListItem>
         <ListItemText
@@ -24,7 +35,7 @@ function Gamenight(props) {
     )
   );
 
-  let participants = props.gamenight.participants.map(p =>
+  const participants = gamenight?.participants.map(p =>
     (
       <ListItem>
         <ListItemText
@@ -32,7 +43,46 @@ function Gamenight(props) {
         />
       </ListItem>
     )
-  )
+  );
+
+  const Join = () => {
+    const input = {
+      action: 'AddParticipant'
+    };
+    
+    unpack_api_result(patch_gamenight(gamenight.id, input, props.user.jwt), props.setFlash)
+      .then(() => fetchGamenight());
+  };
+
+  const Leave = () => {
+    const input = {
+      action: 'RemoveParticipant',
+    };
+
+    unpack_api_result(patch_gamenight(gamenight.id, input, props.user.jwt), props.setFlash)
+      .then(() => fetchGamenight());
+  };
+
+  let join_or_leave_button;
+  if(gamenight?.participants.find(p => p.id === props.user.id) === undefined) {
+    join_or_leave_button = (
+      <Button 
+        variant="outlined"
+        color="success"
+        onClick={Join}>
+        Join
+      </Button>
+    )
+  } else {
+    join_or_leave_button = (
+      <Button 
+        variant="outlined"
+        color="error"
+        onClick={Leave}>
+        Leave
+      </Button>
+    )
+  }
 
   return (
     <div>
@@ -43,10 +93,10 @@ function Gamenight(props) {
       </IconButton>
 
       <Typography type="h3">
-        {props.gamenight.name}
+        {gamenight?.name}
       </Typography>
       <Typography type="body1">
-        When: {moment(props.gamenight.datetime).format('LL HH:mm')}
+        When: {moment(gamenight?.datetime).format('LL HH:mm')}
       </Typography>
 
       <List 
@@ -69,6 +119,7 @@ function Gamenight(props) {
         }>
         {participants}
       </List>
+      {join_or_leave_button}
     </div>
   )
 }