Updating workflow

Reviewed-on: phoenix/icarus_models#2

.gitea/workflows/tag_release.yaml

@@ -20,7 +20,7 @@ jobs:
       - name: Install Rust
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.96.1
+          toolchain: 1.97
           components: cargo
       - uses: Swatinem/rust-cache@v2
 

.gitea/workflows/workflow.yaml

@@ -1,4 +1,4 @@
-name: Rust Build
+name: simodels Build
 
 on:
   push:
@@ -21,7 +21,7 @@ jobs:
       - uses: actions/checkout@v6
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.96.1
+          toolchain: 1.97
       - uses: Swatinem/rust-cache@v2
       - run: cargo check
 
@@ -32,7 +32,7 @@ jobs:
       - uses: actions/checkout@v6
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.96.1
+          toolchain: 1.97
       - uses: Swatinem/rust-cache@v2
       - run: cargo test
 
@@ -43,7 +43,7 @@ jobs:
       - uses: actions/checkout@v6
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.96.1
+          toolchain: 1.97
       - uses: Swatinem/rust-cache@v2
       - run: rustup component add rustfmt
       - run: cargo fmt --all -- --check
@@ -55,7 +55,7 @@ jobs:
       - uses: actions/checkout@v6
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.96.1
+          toolchain: 1.97
       - uses: Swatinem/rust-cache@v2
       - run: rustup component add clippy
       - run: cargo clippy -- -D warnings
@@ -67,6 +67,6 @@ jobs:
       - uses: actions/checkout@v6
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.96.1
+          toolchain: 1.97
       - uses: Swatinem/rust-cache@v2
       - run: cargo build

Cargo.lock

@@ -190,20 +190,6 @@ version = "0.17.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a"
 
-[[package]]
-name = "icarus_models"
-version = "0.11.2"
-dependencies = [
- "josekit",
- "rand",
- "serde",
- "serde_json",
- "tempfile",
- "time",
- "utoipa",
- "uuid",
-]
-
 [[package]]
 name = "indexmap"
 version = "2.14.0"
@@ -490,6 +476,20 @@ version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "703d5c7ef118737c72f1af64ad2f6f8c5e1921f818cdcb97b8fe6fc69bf66214"
 
+[[package]]
+name = "simodels"
+version = "0.11.3"
+dependencies = [
+ "josekit",
+ "rand",
+ "serde",
+ "serde_json",
+ "tempfile",
+ "time",
+ "utoipa",
+ "uuid",
+]
+
 [[package]]
 name = "slab"
 version = "0.4.12"

Cargo.toml

@@ -1,9 +1,9 @@
 [package]
-name = "icarus_models"
+name = "simodels"
-version = "0.11.2"
+version = "0.11.3"
 edition = "2024"
 rust-version = "1.95"
-description = "models used for the icarus project"
+description = "models used for the soaricarus project"
 license = "MIT"
 
 [dependencies]

README.md

@@ -1,3 +1,4 @@
-A library containing commonly used structs, functions, enums, constants and other code
+# simodels
-that is used throughout the icarus projects. Code from this library serves as the model
+Library containing commonly used structs, functions, enums, constants and other code
+that is used throughout the soaricarus projects. Code from this library serves as the model
 for other projects in the icarus project.

src/album.rs

@@ -37,7 +37,42 @@ pub mod collection {
         pub artist: String,
         pub disc: i32,
         pub track: i32,
-        // In seconds
+        /// In seconds
         pub duration: f64,
     }
+
+    pub fn deserialize_json(json_data: &str, album: &mut Album) -> Result<(), serde_json::Error> {
+        match serde_json::from_str::<Album>(json_data) {
+            Ok(parsed_album) => {
+                *album = parsed_album;
+                Ok(())
+            }
+            Err(err) => Err(err),
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    #[test]
+    fn test_deserilize_album_collection_json() {
+        let album_file_path = "tests/album.json";
+        let album_file_content = match std::fs::read_to_string(album_file_path) {
+            Ok(content) => content,
+            Err(err) => {
+                assert!(false, "Error: {err:?}");
+                String::new()
+            }
+        };
+
+        let mut album = super::collection::Album::default();
+        match super::collection::deserialize_json(&album_file_content, &mut album) {
+            Ok(_) => {
+                assert_eq!(3, album.tracks.len(), "Track count do not match");
+            }
+            Err(err) => {
+                assert!(false, "Error: {err:?}");
+            }
+        }
+    }
 }

src/token.rs

@@ -164,9 +164,9 @@ mod tests {
 
     fn test_resource() -> TokenResource {
         TokenResource {
-            issuer: String::from("icarus_auth_test"),
+            issuer: String::from("soaricarus_auth_test"),
             message: String::from("Authorization"),
-            audiences: vec![String::from("icarus_test")],
+            audiences: vec![String::from("soaricarus_test")],
             id: uuid::Uuid::nil(),
         }
     }

tests/tests.rs

@@ -33,8 +33,8 @@ mod song_tests {
     use tempfile::tempdir;
 
     use crate::utils;
-    use icarus_models::song;
+    use simodels::song;
-    use icarus_models::types;
+    use simodels::types;
 
     #[test]
     fn test_song_to_data() {
@@ -157,7 +157,7 @@ mod song_tests {
 #[cfg(test)]
 mod album_tests {
     use crate::utils;
-    use icarus_models::album;
+    use simodels::album;
 
     #[test]
     fn parse_album() {