Compare commits

..
Author SHA1 Message Date
phoenix 8e91af657e Add SongEvent (#9)
simodels Build / Clippy (push) Successful in 19s
simodels Build / Check (push) Successful in 24s
simodels Build / build (push) Successful in 24s
simodels Build / Rustfmt (push) Successful in 26s
simodels Build / Test Suite (push) Successful in 27s
Release Tagging / release (push) Successful in 30s
Reviewed-on: http://git.kundeng.us/phoenix/simodels/pulls/9
2026-11-05 16:03:21 -05:00
5 changed files with 44 additions and 16 deletions

No files matched your search

+16
View File
@@ -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" }
+9 -7
View File
@@ -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(),
}
}
+16
View File
@@ -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";
+2 -6
View File
@@ -14,12 +14,8 @@ impl SongEvent {
pub fn is_event_type_valid(&self) -> bool {
matches!(
self.event_type.as_str(),
SONG_EVENT_TYPE_PLAY | SONG_EVENT_TYPE_PAUSE
super::constants::song_event::SONG_EVENT_TYPE_PLAY
| super::constants::song_event::SONG_EVENT_TYPE_PAUSE
)
}
}
/// Song Event Type - Play
pub const SONG_EVENT_TYPE_PLAY: &str = "PLAY";
/// Song Event Type - PAUSE
pub const SONG_EVENT_TYPE_PAUSE: &str = "PAUSE";
+1 -3
View File
@@ -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;