Merge pull request 'Next release' (#38) from devel into main

Reviewed-on: #38

.gitea/workflows/tag_release.yaml

@@ -3,9 +3,8 @@ name: Release Tagging
 on:
   push:
     branches:
+      - main
       - devel
-    tags:
-      - 'v*' # Trigger on tags matching v*
 
 jobs:
   release:
@@ -19,7 +18,7 @@ jobs:
       - name: Install Rust
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.85.0
+          toolchain: 1.86.0
           components: cargo
 
       - name: Extract Version from Cargo.toml

.gitea/workflows/workflow.yaml

@@ -18,7 +18,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.85.0
+          toolchain: 1.86.0
       - run: cargo check
 
   test:
@@ -28,7 +28,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.85.0
+          toolchain: 1.86.0
       - run: cargo test
 
   fmt:
@@ -38,7 +38,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.85.0
+          toolchain: 1.86.0
       - run: rustup component add rustfmt
       - run: cargo fmt --all -- --check
 
@@ -49,7 +49,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.85.0
+          toolchain: 1.86.0
       - run: rustup component add clippy
       - run: cargo clippy -- -D warnings
 
@@ -60,7 +60,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.85.0
+          toolchain: 1.86.0
       - run: cargo build
 
 

Cargo.toml

@@ -1,7 +1,8 @@
 [package]
 name = "icarus_models"
-version = "0.3.0"
+version = "0.4.3"
 edition = "2024"
+rust-version = "1.86"
 description = "models used for the icarus project"
 license = "MIT"
 
@@ -9,6 +10,8 @@ license = "MIT"
 serde = { version = "1.0.218", features = ["derive"] }
 serde_json = { version = "1.0.139" }
 rand = { version = "0.9" }
+time = { version = "0.3.41", features = ["formatting", "macros", "parsing", "serde"] }
 uuid = { version = "1.16.0", features = ["v4", "serde"] }
+
 [dev-dependencies]
 tempfile = { version = "3.19.1" }

src/access_level.rs

@@ -12,7 +12,7 @@ pub struct AccessLevel {
 impl Default for AccessLevel {
     fn default() -> Self {
         AccessLevel {
-            id: uuid::Uuid::new_v4(),
+            id: uuid::Uuid::nil(),
             level: String::new(),
             song_id: uuid::Uuid::new_v4(),
         }
@@ -21,7 +21,7 @@ impl Default for AccessLevel {
 
 pub fn default_level() -> AccessLevel {
     AccessLevel {
-        id: uuid::Uuid::new_v4(),
+        id: uuid::Uuid::nil(),
         level: String::from("Public"),
         song_id: uuid::Uuid::new_v4(),
     }

src/coverart.rs

@@ -10,6 +10,19 @@ pub struct CoverArt {
     pub data: Vec<u8>,
 }
 
+pub mod init {
+    use crate::coverart::CoverArt;
+
+    pub fn init_coverart_only_path(path: String) -> CoverArt {
+        CoverArt {
+            id: uuid::Uuid::nil(),
+            title: String::new(),
+            path: path.clone(),
+            data: Vec::new(),
+        }
+    }
+}
+
 impl CoverArt {
     pub fn to_data(&self) -> Result<Vec<u8>, std::io::Error> {
         let path: &String = &self.path;
@@ -21,3 +34,16 @@ impl CoverArt {
         }
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use crate::coverart;
+
+    #[test]
+    fn test_cover_art_image() {
+        let path: String = String::from("somepath");
+        let coverart = coverart::init::init_coverart_only_path(path.clone());
+
+        assert_eq!(path, coverart.path);
+    }
+}

src/login_result.rs

@@ -9,13 +9,13 @@ pub struct LoginResult {
     pub token: String,
     #[serde(alias = "token_type")]
     pub token_type: String,
-    pub expiration: i32,
+    pub expiration: i64,
 }
 
 impl Default for LoginResult {
     fn default() -> Self {
         LoginResult {
-            id: uuid::Uuid::new_v4(),
+            id: uuid::Uuid::nil(),
             username: String::new(),
             token: String::new(),
             token_type: String::new(),

src/song.rs

@@ -40,8 +40,8 @@ pub struct Song {
     pub date_created: String,
     #[serde(skip_serializing_if = "String::is_empty")]
     pub filename: String,
-    #[serde(skip_serializing_if = "init::is_zero")]
-    pub user_id: i32,
+    #[serde(skip_serializing_if = "init::is_uuid_nil")]
+    pub user_id: uuid::Uuid,
     #[serde(skip)]
     pub data: Vec<u8>,
     #[serde(skip)]
@@ -227,9 +227,9 @@ mod embedded {
     // The song's duration is a floating point in seconds
     #[derive(Clone, Debug, Deserialize, Serialize)]
     pub struct Song {
-        #[serde(skip_serializing_if = "is_embed_zero")]
+        #[serde(skip_serializing_if = "init::is_uuid_nil")]
         #[serde(alias = "id")]
-        pub id: i32,
+        pub id: uuid::Uuid,
         #[serde(skip_serializing_if = "String::is_empty")]
         pub title: String,
         #[serde(skip_serializing_if = "String::is_empty")]
@@ -240,17 +240,17 @@ mod embedded {
         pub album_artist: String,
         #[serde(skip_serializing_if = "String::is_empty")]
         pub genre: String,
-        #[serde(skip_serializing_if = "is_embed_zero")]
+        #[serde(skip_serializing_if = "init::is_embed_zero")]
         pub year: i32,
-        #[serde(skip_serializing_if = "is_embed_dur_not_set")]
+        #[serde(skip_serializing_if = "init::is_embed_dur_not_set")]
         pub duration: f64,
-        #[serde(skip_serializing_if = "is_embed_zero")]
+        #[serde(skip_serializing_if = "init::is_embed_zero")]
         pub track: i32,
-        #[serde(skip_serializing_if = "is_embed_zero")]
+        #[serde(skip_serializing_if = "init::is_embed_zero")]
         pub disc: i32,
-        #[serde(skip_serializing_if = "is_embed_zero")]
+        #[serde(skip_serializing_if = "init::is_embed_zero")]
         pub disc_count: i32,
-        #[serde(skip_serializing_if = "is_embed_zero")]
+        #[serde(skip_serializing_if = "init::is_embed_zero")]
         pub track_count: i32,
         #[serde(skip_serializing_if = "String::is_empty")]
         pub audio_type: String,
@@ -258,7 +258,7 @@ mod embedded {
         pub date_created: String,
         #[serde(skip_serializing_if = "String::is_empty")]
         pub filename: String,
-        #[serde(skip_serializing_if = "is_embed_zero")]
+        #[serde(skip_serializing_if = "init::is_embed_zero")]
         pub user_id: i32,
         #[serde(skip)]
         pub data: Vec<u8>,
@@ -274,18 +274,11 @@ mod embedded {
         // pub coverart_id: i32,
     }
 
-    fn is_embed_zero(num: &i32) -> bool {
-        *num == 0
-    }
-
-    fn is_embed_dur_not_set(num: &f64) -> bool {
-        *num == 0.0
-    }
 
     impl Default for Song {
         fn default() -> Self {
             Song {
-                id: 0,
+                id: uuid::Uuid::nil(),
                 title: String::new(),
                 artist: String::new(),
                 album: String::new(),

src/token.rs

@@ -5,10 +5,10 @@ use serde::{Deserialize, Serialize};
 #[derive(Clone, Debug, Deserialize, Serialize)]
 pub struct Token {
     pub scope: String,
-    pub expiration: i32,
+    pub expiration: i64,
     pub audience: String,
     pub issuer: String,
-    pub issued: i32,
+    pub issued: i64,
 }
 
 #[derive(Clone, Debug, Deserialize, Serialize)]
@@ -22,7 +22,7 @@ pub struct AccessToken {
     #[serde(alias = "token_type")]
     pub token_type: String,
     #[serde(alias = "expiration")]
-    pub expiration: i32,
+    pub expiration: i64,
     #[serde(alias = "message")]
     pub message: String,
 }
@@ -57,14 +57,27 @@ impl Token {
         false
     }
 
-    // TODO: Implement
     pub fn contains_scope(&self, des_scope: &String) -> bool {
-        let extracted_token: String = String::from("Token");
-
-        if extracted_token == *des_scope {
-            return true;
-        }
-
-        false
+        self.scope.contains(des_scope)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_token_scope_check() {
+        let mut token = Token::default();
+        token.scope = String::from("song:read song:upload song:download");
+
+        let check_scope = String::from("song:download");
+        let result = token.contains_scope(&check_scope);
+
+        assert!(
+            result,
+            "Error: The scope {:?} was not found in the token's scope {:?}",
+            check_scope, token.scope
+        );
     }
 }

src/user.rs

@@ -21,12 +21,14 @@ pub struct User {
     #[serde(skip_serializing_if = "String::is_empty")]
     pub lastname: String,
     pub email_verified: bool,
-    #[serde(skip_serializing_if = "String::is_empty")]
-    pub date_created: String,
+    #[serde(with = "time::serde::rfc3339::option")]
+    pub date_created: Option<time::OffsetDateTime>,
     #[serde(skip_serializing_if = "String::is_empty")]
     pub status: String,
-    #[serde(skip_serializing_if = "String::is_empty")]
-    pub last_login: String,
+    #[serde(with = "time::serde::rfc3339::option")]
+    pub last_login: Option<time::OffsetDateTime>,
+    #[serde(skip_serializing_if = "init::is_uuid_nil")]
+    pub salt_id: uuid::Uuid,
 }
 
 impl Default for User {
@@ -40,9 +42,10 @@ impl Default for User {
             firstname: String::new(),
             lastname: String::new(),
             email_verified: false,
-            date_created: String::new(),
+            date_created: None,
             status: String::new(),
-            last_login: String::new(),
+            last_login: None,
+            salt_id: uuid::Uuid::nil(),
         }
     }
 }
@@ -56,3 +59,29 @@ impl User {
         }
     }
 }
+
+pub mod salt {
+    use std::default::Default;
+
+    use crate::init;
+
+    use serde::{Deserialize, Serialize};
+
+    #[derive(Clone, Debug, Default, Deserialize, Serialize)]
+    pub struct Salt {
+        #[serde(skip_serializing_if = "init::is_uuid_nil")]
+        pub id: uuid::Uuid,
+        #[serde(skip_serializing_if = "String::is_empty")]
+        pub salt: String,
+    }
+
+    impl Salt {
+        pub fn to_json(&self, output_pretty: bool) -> Result<String, serde_json::Error> {
+            if output_pretty {
+                serde_json::to_string_pretty(&self)
+            } else {
+                serde_json::to_string(&self)
+            }
+        }
+    }
+}

tests/tests.rs

@@ -28,6 +28,7 @@ mod utils {
     }
 }
 
+#[cfg(test)]
 mod song_tests {
     use std::fs::File;
     use std::io::Write;
@@ -151,6 +152,7 @@ mod song_tests {
     }
 }
 
+#[cfg(test)]
 mod album_tests {
 
     use crate::utils;