diff --git a/Cargo.lock b/Cargo.lock index 889b8a1..86f508f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -43,9 +43,9 @@ checksum = "72f5acc6cb2ba439de613abc23857ec3d78374d8ed5ac84e9d11336e87da8649" [[package]] name = "cc" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86e055fa6e3e40ad6187ba25b6855eeb635d5271f8e0f0e1e9a5826b8d75bea0" +checksum = "375989decec1a0fa424442bed520fa12ede43a48475ce8c7417d2c69b32b5f6b" dependencies = [ "find-msvc-tools", "shlex", @@ -79,9 +79,9 @@ dependencies = [ [[package]] name = "crc32fast" -version = "1.5.3" +version = "1.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ba106e844045ddc02c20768ac4b0b7cb45f2cc2ecbd833ac9f5dacb183c2055" +checksum = "5f97d3416d5337d15c4b0d78c8c91df922ca143f57ec20e2d1c188333047ef04" dependencies = [ "cfg-if", ] @@ -285,9 +285,9 @@ checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50" [[package]] name = "openssl" -version = "0.10.81" +version = "0.10.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77823a27f0babb03091cb9ed9ef80af3b39dbc82f97e8fa530374b7dafd87a45" +checksum = "4de8111e94a56adca7ebfe6c365b6d42f99deb69b74b6becacd4204e2f193aa2" dependencies = [ "bitflags", "cfg-if", @@ -310,9 +310,9 @@ dependencies = [ [[package]] name = "openssl-sys" -version = "0.9.117" +version = "0.9.118" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b47e7e6bb2c38cd930d25a23b40fa52e068c10e85f3e03a7f5ba5aaca5713695" +checksum = "19c413d6ec9ebaf5e1c829d355cb3e9f783778d700f135be0921d52fce3c60ae" dependencies = [ "cc", "libc", @@ -486,7 +486,7 @@ checksum = "3a219298ac11a56ea9a6d2120044824d6f01aeb034955e7af7bc16858527deea" [[package]] name = "simodels" -version = "0.11.8" +version = "0.11.9" dependencies = [ "josekit", "rand", diff --git a/Cargo.toml b/Cargo.toml index 025fa74..1cf077d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "simodels" -version = "0.11.8" +version = "0.11.9" edition = "2024" rust-version = "1.95" description = "Models used for the soaricarus project" @@ -15,5 +15,21 @@ uuid = { version = "1.29.0", features = ["v4", "serde"] } josekit = { version = "0.10.3" } utoipa = { version = "6.0.0", features = ["uuid", "time"] } +[features] +default = ["full"] +full = ["access_level", "album", "constants", "coverart", "ledger", "login_result", "song", "token", "types", "user", "util"] +auth = ["constants", "login_result", "token", "user"] +access_level = ["constants"] +album = [] +constants = [] +coverart = ["constants", "types"] +ledger = ["constants", "song", "types", "user"] +login_result = ["constants", "token", "user"] +song = ["constants", "types"] +token = [] +types = [] +user = [] +util = [] + [dev-dependencies] tempfile = { version = "3.27.0" } diff --git a/src/access_level.rs b/src/access_level.rs index 35901f2..6ad2a8e 100644 --- a/src/access_level.rs +++ b/src/access_level.rs @@ -2,6 +2,8 @@ use std::default::Default; use serde::{Deserialize, Serialize}; +const DEFAULT_ACCESS_LEVEL: &str = super::constants::access_level::PUBLIC; + #[derive(Clone, Debug, Deserialize, Serialize, utoipa::ToSchema)] pub struct AccessLevel { pub id: uuid::Uuid, @@ -13,8 +15,8 @@ impl Default for AccessLevel { fn default() -> Self { AccessLevel { id: uuid::Uuid::nil(), - level: String::new(), - song_id: uuid::Uuid::new_v4(), + level: DEFAULT_ACCESS_LEVEL.to_string(), + song_id: uuid::Uuid::nil(), } } } @@ -22,16 +24,16 @@ impl Default for AccessLevel { pub fn default_level() -> AccessLevel { AccessLevel { id: uuid::Uuid::nil(), - level: String::from("Public"), - song_id: uuid::Uuid::new_v4(), + level: DEFAULT_ACCESS_LEVEL.to_string(), + song_id: uuid::Uuid::nil(), } } pub fn private_level() -> AccessLevel { AccessLevel { - id: uuid::Uuid::new_v4(), - level: String::from("Private"), - song_id: uuid::Uuid::new_v4(), + id: uuid::Uuid::nil(), + level: super::constants::access_level::PRIVATE.to_string(), + song_id: uuid::Uuid::nil(), } } diff --git a/src/constants.rs b/src/constants.rs index 4432a85..cde62f2 100644 --- a/src/constants.rs +++ b/src/constants.rs @@ -13,6 +13,22 @@ pub mod file_extensions { } } +pub mod song_event { + /// Song Event Type - Play + pub const SONG_EVENT_TYPE_PLAY: &str = "PLAY"; + /// Song Event Type - PAUSE + pub const SONG_EVENT_TYPE_PAUSE: &str = "PAUSE"; +} + +pub mod access_level { + pub const PUBLIC: &str = "PUBLIC"; + pub const PRIVATE: &str = "PRIVATE"; +} + +pub mod token { + pub const TOKEN_TYPE: &str = "JWT"; +} + pub mod error { pub const DIRECTORY_NOT_INITIALIZED: &str = "Directory has not been initialized"; pub const FILENAME_NOT_INITIALIZED: &str = "Filename has not bee initialized"; diff --git a/src/ledger/mod.rs b/src/ledger/mod.rs new file mode 100644 index 0000000..933f819 --- /dev/null +++ b/src/ledger/mod.rs @@ -0,0 +1,21 @@ +#[derive(Debug, Default, serde::Deserialize, serde::Serialize, utoipa::ToSchema)] +pub struct SongEvent { + pub id: uuid::Uuid, + pub song_id: uuid::Uuid, + pub user_id: uuid::Uuid, + pub event_type: String, + #[serde(with = "time::serde::rfc3339::option")] + pub event_time: Option, + #[serde(with = "time::serde::rfc3339::option")] + pub date_created: Option, +} + +impl SongEvent { + pub fn is_event_type_valid(&self) -> bool { + matches!( + self.event_type.as_str(), + super::constants::song_event::SONG_EVENT_TYPE_PLAY + | super::constants::song_event::SONG_EVENT_TYPE_PAUSE + ) + } +} diff --git a/src/lib.rs b/src/lib.rs index f4fcab5..88bb098 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -2,6 +2,7 @@ pub mod access_level; pub mod album; pub mod constants; pub mod coverart; +pub mod ledger; pub mod login_result; pub mod song; pub mod token; diff --git a/src/token.rs b/src/token.rs index 3e013a5..216cd7a 100644 --- a/src/token.rs +++ b/src/token.rs @@ -111,15 +111,13 @@ pub struct TokenResource { pub id: uuid::Uuid, } -pub const TOKEN_TYPE: &str = "JWT"; - pub fn create_token( key: &String, token_resource: &TokenResource, duration: time::Duration, ) -> Result<(String, i64), josekit::JoseError> { let mut header = josekit::jws::JwsHeader::new(); - header.set_token_type(TOKEN_TYPE); + header.set_token_type(super::constants::token::TOKEN_TYPE); let mut payload = josekit::jwt::JwtPayload::new(); let message = &token_resource.message;