Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev #4

Merged
merged 17 commits into from
Mar 9, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions Astrox.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ port = 8080
env = "dev"
astro_port = 5431
prod_astro_build = true
cors_url = "https://astrox.spaceout.pl"
cors_url = "http://localhost:5431"

[public_keys]
public_api_url = "https://astrox.spaceout.pl/api"
public_api_url = "http://localhost:8080/api"
public_ws_url = "ws://localhost:8080/ws/"
6 changes: 6 additions & 0 deletions src/backend/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
uuid = { version = "1.15.1", features = ["v4"]}
actix-web = "4"
actix-rt = "2"
actix-files = "0.6.6"
Expand All @@ -18,9 +19,14 @@ serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
reqwest = { version = "0.12", features = ["json"] }
env_logger = "0.11.5"
log = "*"
anyhow = "1.0"
dotenv = "0.15.0"
thiserror = "1.0.63"
pin-project = "1.1.5"
futures = "0.3.30"
globset = "0.4.14"
actix-ws = "0.3.0"
tokio = { version="*", features = ["rt", "time", "macros"] }


26 changes: 0 additions & 26 deletions src/backend/src/api/hello/get.rs

This file was deleted.

2 changes: 0 additions & 2 deletions src/backend/src/api/hello/mod.rs

This file was deleted.

27 changes: 0 additions & 27 deletions src/backend/src/api/hello/post.rs

This file was deleted.

3 changes: 1 addition & 2 deletions src/backend/src/api/mod.rs
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
pub mod hello;
pub mod space_x;
pub mod room;
46 changes: 46 additions & 0 deletions src/backend/src/api/room/create_room.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
use actix_session::Session;
use actix_web::{web, HttpResponse, Responder};
use serde::{Deserialize, Serialize};
use std::sync::Arc;
use uuid::Uuid;

use crate::room::room_manager::AppState;

#[derive(Deserialize)]
pub struct CreateRoomRequest {
pub room_name: String,
pub user_name: String,
}

#[derive(Serialize)]
pub struct CreateRoomResponse {
pub room_name: String,
pub room_id: String,
pub user_name: String,
}

pub async fn create_room(
data: web::Data<Arc<AppState>>,
session: Session,
req: web::Json<CreateRoomRequest>,
) -> impl Responder {
let room_name = req.room_name.clone();
let user_name = req.user_name.clone();
let room_id = Uuid::new_v4().to_string();

// Store user name in session
session.insert("user_name", &user_name).unwrap();
session.insert("room_name", &room_name).unwrap();
session.insert("room_id", &room_id).unwrap();

// Add room
data.add_room(room_id.clone(), room_name.clone(), user_name.clone());

let response = CreateRoomResponse {
room_name,
room_id,
user_name,
};

HttpResponse::Ok().json(response)
}
47 changes: 47 additions & 0 deletions src/backend/src/api/room/create_room_session.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
use actix_session::Session;
use actix_web::{web, HttpResponse, Responder};
use serde::{Deserialize, Serialize};
use std::sync::Arc;
use uuid::Uuid;

use crate::room::room_manager::AppState;

#[derive(Deserialize)]
pub struct CreateRoomRequest {
pub room_name: String,
}

#[derive(Serialize)]
pub struct CreateRoomResponse {
pub room_name: String,
pub room_id: String,
pub user_name: String,
}

pub async fn create_room_session(
data: web::Data<Arc<AppState>>,
session: Session,
req: web::Json<CreateRoomRequest>,
) -> impl Responder {
let room_name = req.room_name.clone();
let user_name: String = match session.get("user_name") {
Ok(Some(name)) => name,
_ => return HttpResponse::Unauthorized().body("User not in session"),
};
let room_id = Uuid::new_v4().to_string();

// Store room details in session
session.insert("room_name", &room_name).unwrap();
session.insert("room_id", &room_id).unwrap();

// Add room
data.add_room(room_id.clone(), room_name.clone(), user_name.clone());

let response = CreateRoomResponse {
room_name,
room_id,
user_name,
};

HttpResponse::Ok().json(response)
}
66 changes: 66 additions & 0 deletions src/backend/src/api/room/get_room.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
use actix_session::Session;
use actix_web::{web, HttpResponse, Responder};
use serde::Serialize;
use std::sync::Arc;

use crate::room::room_manager::{AppState, Estimation};

#[derive(Serialize)]
pub struct RoomResponse<'a> {
pub id: &'a String,
pub name: &'a String,
pub owner: &'a String,
pub estimations: &'a Vec<Estimation>,
pub users: &'a Vec<String>,
pub current_estimation: u8,
}

pub async fn get_room(
data: web::Data<Arc<AppState>>,
session: Session,
room_id: web::Path<String>,
) -> impl Responder {
let room_id = room_id.into_inner();
if let Some(room) = data.get_room(&room_id) {
let user_name: Option<String> = session.get("user_name").unwrap_or(None);
let user_is_owner = user_name.as_deref() == Some(&room.owner);

// if link is shared the user is not the owner
// add him to users list

if !user_is_owner {
// check if user on the users list
let user_already_in_room = room
.users
.iter()
.any(|u| u == user_name.as_deref().unwrap());
if !user_already_in_room {
let mut rooms = data.rooms.lock().unwrap();
let room = rooms.get_mut(&room_id).unwrap();
room.users.push(user_name.unwrap());
}
}

let response = RoomResponse {
id: &room.id,
name: &room.name,
owner: &room.owner,
current_estimation: room.current_estimation,
estimations: &room.estimations,
users: &room.users,
};

let ws_room = room.clone();

let ws_response = crate::api::room::ws_handler::ResponseMessageWS {
type_: "UserJoined".to_string(),
data: ws_room,
};

let serde_msg = serde_json::to_string(&ws_response).unwrap();
data.broadcast(&room_id, &serde_msg);
HttpResponse::Ok().json(response)
} else {
HttpResponse::NotFound().body("Room not found")
}
}
41 changes: 41 additions & 0 deletions src/backend/src/api/room/list_rooms.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
use actix_session::Session;
use actix_web::{web, HttpResponse, Responder};
use serde::Serialize;
use std::sync::Arc;

use crate::room::room_manager::AppState;

#[derive(Serialize)]
pub struct ListResponse {
pub username: String,
pub rooms: Vec<RoomInfo>,
}

#[derive(Serialize)]
pub struct RoomInfo {
id: String,
name: String,
}

pub async fn list_rooms(data: web::Data<Arc<AppState>>, session: Session) -> impl Responder {
if let Some(user_name) = session.get::<String>("user_name").unwrap_or(None) {
let rooms = data.rooms.lock().unwrap();
let room_list: Vec<RoomInfo> = rooms
.iter()
.filter(|(_, room)| room.owner == user_name)
.map(|(id, room)| RoomInfo {
id: id.clone(),
name: room.name.clone(),
})
.collect();

let room_list_response = ListResponse {
username: user_name,
rooms: room_list,
};

HttpResponse::Ok().json(room_list_response)
} else {
HttpResponse::Unauthorized().body("User not logged in")
}
}
5 changes: 5 additions & 0 deletions src/backend/src/api/room/mod.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pub mod create_room;
pub mod create_room_session;
pub mod get_room;
pub mod list_rooms;
pub mod ws_handler;
Loading
Loading