tsk-57: Added schema to models

.gitea/workflows/tag_release.yaml

@@ -1,7 +1,7 @@
 name: Release Tagging
 
 on:
-  push:
+  pull_request:
     branches:
       - main
 
@@ -10,14 +10,14 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: Checkout code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0 # Important for git describe --tags
 
       - name: Install Rust
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.90.0
+          toolchain: 1.88.0
           components: cargo
 
       - name: Extract Version from Cargo.toml
@@ -25,15 +25,12 @@ jobs:
         run: |
           VERSION=$(grep '^version = "' Cargo.toml | sed -E 's/version = "([^"]+)"/\1/')
           PROJECT_COMMIT_HASH=$(git rev-parse HEAD | cut -c 1-10)
-          BRANCH_REF="${{ gitea.ref }}"
+          BRANCH_REF="${GITHUB_REF}"
           BRANCH_NAME=$(echo "$BRANCH_REF" | cut -d '/' -f 3)
-          PROJECT_TAG_RELEASE="v$VERSION-$BRANCH_NAME-$PROJECT_COMMIT_HASH-111"
+          PROJECT_TAG_RELEASE="v$VERSION-$BRANCH_NAME-$PROJECT_COMMIT_HASH"
-
+          echo "::set-output name=project_tag_release::$PROJECT_TAG_RELEASE-111"
-          echo "::set-output name=project_tag_release::$PROJECT_TAG_RELEASE"
-
           echo "Version: $VERSION"
           echo "Hash: $PROJECT_COMMIT_HASH"
-          echo "Branh ref: $BRANCH_REF"
           echo "Branch: $BRANCH_NAME"
           echo "Tag Release: $PROJECT_TAG_RELEASE"
 

.gitea/workflows/workflow.yaml

@@ -13,30 +13,30 @@ jobs:
     name: Check
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.90.0
+          toolchain: 1.88.0
       - run: cargo check
 
   test:
     name: Test Suite
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.90.0
+          toolchain: 1.88.0
       - run: cargo test
 
   fmt:
     name: Rustfmt
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.90.0
+          toolchain: 1.88.0
       - run: rustup component add rustfmt
       - run: cargo fmt --all -- --check
 
@@ -44,10 +44,10 @@ jobs:
     name: Clippy
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.90.0
+          toolchain: 1.88.0
       - run: rustup component add clippy
       - run: cargo clippy -- -D warnings
 
@@ -55,8 +55,10 @@ jobs:
     name: build
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.90.0
+          toolchain: 1.88.0
       - run: cargo build
+
+

Cargo.lock

@@ -19,9 +19,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.100"
+version = "1.0.98"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61"
+checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487"
 
 [[package]]
 name = "base64"
@@ -31,9 +31,9 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 
 [[package]]
 name = "bitflags"
-version = "2.10.0"
+version = "2.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3"
+checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd"
 
 [[package]]
 name = "bumpalo"
@@ -43,19 +43,18 @@ checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
 
 [[package]]
 name = "cc"
-version = "1.2.41"
+version = "1.2.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac9fe6cdbb24b6ade63616c0a0688e45bb56732262c158df3c0c4bea4ca47cb7"
+checksum = "deec109607ca693028562ed836a5f1c4b8bd77755c4e132fc5ce11b0b6211ae7"
 dependencies = [
- "find-msvc-tools",
  "shlex",
 ]
 
 [[package]]
 name = "cfg-if"
-version = "1.0.4"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "crc32fast"
@@ -68,12 +67,12 @@ dependencies = [
 
 [[package]]
 name = "deranged"
-version = "0.5.4"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a41953f86f8a05768a6cda24def994fd2f424b04ec5c719cf89989779f199071"
+checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e"
 dependencies = [
  "powerfmt",
- "serde_core",
+ "serde",
 ]
 
 [[package]]
@@ -84,9 +83,9 @@ checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
 
 [[package]]
 name = "errno"
-version = "0.3.14"
+version = "0.3.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
+checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
 dependencies = [
  "libc",
  "windows-sys",
@@ -98,17 +97,11 @@ version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
 
-[[package]]
-name = "find-msvc-tools"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52051878f80a721bb68ebfbc930e07b65ba72f2da88968ea5c06fd6ca3d3a127"
-
 [[package]]
 name = "flate2"
-version = "1.1.4"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc5a4e564e38c699f2880d3fda590bedc2e69f3f84cd48b457bd892ce61d0aa9"
+checksum = "4a3d7db9596fecd151c5f638c0ee5d5bd487b6e0ea232e5dc96d5250f6f94b1d"
 dependencies = [
  "crc32fast",
  "miniz_oxide",
@@ -131,25 +124,25 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
 
 [[package]]
 name = "getrandom"
-version = "0.3.4"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"
+checksum = "73fea8450eea4bac3940448fb7ae50d91f034f941199fcd9d909a5a07aa455f0"
 dependencies = [
  "cfg-if",
  "libc",
  "r-efi",
- "wasip2",
+ "wasi",
 ]
 
 [[package]]
 name = "hashbrown"
-version = "0.16.0"
+version = "0.15.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d"
+checksum = "5971ac85611da7067dbfcabef3c70ebb5606018acd9e2a3903a0da507521e0d5"
 
 [[package]]
 name = "icarus_models"
-version = "0.8.2"
+version = "0.5.5"
 dependencies = [
  "josekit",
  "rand",
@@ -163,14 +156,13 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.12.0"
+version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6717a8d2a5a929a1a2eb43a12812498ed141a0bcfb7e8f7844fbdbe4303bba9f"
+checksum = "fe4cd85333e22411419a0bcae1297d25e58c9443848b11dc6a86fefe8c78a661"
 dependencies = [
  "equivalent",
  "hashbrown",
  "serde",
- "serde_core",
 ]
 
 [[package]]
@@ -198,9 +190,9 @@ dependencies = [
 
 [[package]]
 name = "js-sys"
-version = "0.3.81"
+version = "0.3.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec48937a97411dcb524a265206ccd4c90bb711fca92b2792c407f268825b9305"
+checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f"
 dependencies = [
  "once_cell",
  "wasm-bindgen",
@@ -208,27 +200,27 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.177"
+version = "0.2.171"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976"
+checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6"
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.11.0"
+version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039"
+checksum = "fe7db12097d22ec582439daf8618b8fdd1a7bef6270e9af3b1ebcd30893cf413"
 
 [[package]]
 name = "log"
-version = "0.4.28"
+version = "0.4.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432"
+checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
 
 [[package]]
 name = "memchr"
-version = "2.7.6"
+version = "2.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 
 [[package]]
 name = "miniz_oxide"
@@ -237,7 +229,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
 dependencies = [
  "adler2",
- "simd-adler32",
 ]
 
 [[package]]
@@ -254,9 +245,9 @@ checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
 
 [[package]]
 name = "openssl"
-version = "0.10.74"
+version = "0.10.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24ad14dd45412269e1a30f52ad8f0664f0f4f4a89ee8fe28c3b3527021ebb654"
+checksum = "8505734d46c8ab1e19a1dce3aef597ad87dcb4c37e7188231769bd6bd51cebf8"
 dependencies = [
  "bitflags",
  "cfg-if",
@@ -280,9 +271,9 @@ dependencies = [
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.110"
+version = "0.9.109"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a9f0075ba3c21b09f8e8b2026584b1d18d49388648f2fbbf3c97ea8deced8e2"
+checksum = "90096e2e47630d78b7d1c20952dc621f957103f8bc2c8359ec81290d75238571"
 dependencies = [
  "cc",
  "libc",
@@ -313,33 +304,33 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.101"
+version = "1.0.94"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89ae43fd86e4158d6db51ad8e2b80f313af9cc74f5c0e03ccb87de09998732de"
+checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.41"
+version = "1.0.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce25767e7b499d1b604768e7cde645d14cc8584231ea6b295e9c9eb22c02e1d1"
+checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
 dependencies = [
  "proc-macro2",
 ]
 
 [[package]]
 name = "r-efi"
-version = "5.3.0"
+version = "5.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
+checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5"
 
 [[package]]
 name = "rand"
-version = "0.9.2"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
+checksum = "9fbfd9d094a40bf3ae768db9361049ace4c0e04a4fd6b359518bd7b73a73dd97"
 dependencies = [
  "rand_chacha",
  "rand_core",
@@ -366,9 +357,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.12.2"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4"
+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -378,9 +369,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.13"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c"
+checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -389,15 +380,15 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.8"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
 [[package]]
 name = "rustix"
-version = "1.1.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e"
+checksum = "e56a18552996ac8d29ecc3b190b4fdbb2d91ca4ec396de7bbffaf43f3d637e96"
 dependencies = [
  "bitflags",
  "errno",
@@ -408,9 +399,9 @@ dependencies = [
 
 [[package]]
 name = "rustversion"
-version = "1.0.22"
+version = "1.0.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
+checksum = "8a0d197bd2c9dc6e53b84da9556a69ba4cdfab8619eb41a8bd1cc2027a0f6b1d"
 
 [[package]]
 name = "ryu"
@@ -420,28 +411,18 @@ checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
 
 [[package]]
 name = "serde"
-version = "1.0.228"
+version = "1.0.219"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
+checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
-dependencies = [
- "serde_core",
- "serde_derive",
-]
-
-[[package]]
-name = "serde_core"
-version = "1.0.228"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.228"
+version = "1.0.219"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
+checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -450,16 +431,15 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.145"
+version = "1.0.140"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c"
+checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373"
 dependencies = [
  "indexmap",
  "itoa",
  "memchr",
  "ryu",
  "serde",
- "serde_core",
 ]
 
 [[package]]
@@ -468,17 +448,11 @@ version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 
-[[package]]
-name = "simd-adler32"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
-
 [[package]]
 name = "syn"
-version = "2.0.107"
+version = "2.0.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a26dbd934e5451d21ef060c018dae56fc073894c5a7896f882928a76e6d081b"
+checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -487,9 +461,9 @@ dependencies = [
 
 [[package]]
 name = "tempfile"
-version = "3.23.0"
+version = "3.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d31c77bdf42a745371d260a26ca7163f1e0924b64afa0b688e61b5a9fa02f16"
+checksum = "e8a64e3985349f2441a1a9ef0b853f869006c3855f2cda6862a94d26ebb9d6a1"
 dependencies = [
  "fastrand",
  "getrandom",
@@ -500,18 +474,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "2.0.17"
+version = "2.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8"
+checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "2.0.17"
+version = "2.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913"
+checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -520,9 +494,9 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.44"
+version = "0.3.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91e7d9e3bb61134e77bde20dd4825b97c010155709965fedf0f49bb138e52a9d"
+checksum = "8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40"
 dependencies = [
  "deranged",
  "itoa",
@@ -535,15 +509,15 @@ dependencies = [
 
 [[package]]
 name = "time-core"
-version = "0.1.6"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40868e7c1d2f0b8d73e4a8c7f0ff63af4f6d19be117e90bd73eb1d62cf831c6b"
+checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c"
 
 [[package]]
 name = "time-macros"
-version = "0.2.24"
+version = "0.2.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30cfb0125f12d9c277f35663a0a33f8c30190f4e4574868a330595412d34ebf3"
+checksum = "3526739392ec93fd8b359c8e98514cb3e8e021beb4e5f597b00a0221f8ed8a49"
 dependencies = [
  "num-conv",
  "time-core",
@@ -551,9 +525,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.19"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f63a545481291138910575129486daeaf8ac54aee4387fe7906919f7830c7d9d"
+checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
 
 [[package]]
 name = "utoipa"
@@ -581,9 +555,9 @@ dependencies = [
 
 [[package]]
 name = "uuid"
-version = "1.18.1"
+version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f87b8aa10b915a06587d0dec516c282ff295b475d94abf425d62b57710070a2"
+checksum = "3cf4199d1e5d15ddd86a694e4d0dffa9c323ce759fea589f00fef9d81cc1931d"
 dependencies = [
  "getrandom",
  "js-sys",
@@ -598,32 +572,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
 
 [[package]]
-name = "wasip2"
+name = "wasi"
-version = "1.0.1+wasi-0.2.4"
+version = "0.14.2+wasi-0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7"
+checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3"
 dependencies = [
- "wit-bindgen",
+ "wit-bindgen-rt",
 ]
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.104"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1da10c01ae9f1ae40cbfac0bac3b1e724b320abfcf52229f80b547c0d250e2d"
+checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5"
 dependencies = [
  "cfg-if",
  "once_cell",
  "rustversion",
  "wasm-bindgen-macro",
- "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.104"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "671c9a5a66f49d8a47345ab942e2cb93c7d1d0339065d4f8139c486121b43b19"
+checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
 dependencies = [
  "bumpalo",
  "log",
@@ -635,9 +608,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.104"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ca60477e4c59f5f2986c50191cd972e3a50d8a95603bc9434501cf156a9a119"
+checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -645,9 +618,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.104"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f07d2f20d4da7b26400c9f4a0511e6e0345b040694e8a75bd41d578fa4421d7"
+checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -658,48 +631,109 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.104"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bad67dc8b2a1a6e5448428adec4c3e84c43e561d8c9ee8a9e5aabeb193ec41d1"
+checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d"
 dependencies = [
  "unicode-ident",
 ]
 
-[[package]]
-name = "windows-link"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
-
 [[package]]
 name = "windows-sys"
-version = "0.61.2"
+version = "0.59.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
 dependencies = [
- "windows-link",
+ "windows-targets",
 ]
 
 [[package]]
-name = "wit-bindgen"
+name = "windows-targets"
-version = "0.46.0"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+dependencies = [
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+
+[[package]]
+name = "wit-bindgen-rt"
+version = "0.39.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
+dependencies = [
+ "bitflags",
+]
 
 [[package]]
 name = "zerocopy"
-version = "0.8.27"
+version = "0.8.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0894878a5fa3edfd6da3f88c4805f4c8558e2b996227a3d864f47fe11e38282c"
+checksum = "2586fea28e186957ef732a5f8b3be2da217d65c5969d4b1e17f973ebbe876879"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.8.27"
+version = "0.8.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831"
+checksum = "a996a8f63c5c4448cd959ac1bab0aaa3306ccfd060472f85943ee0750f0169be"
 dependencies = [
  "proc-macro2",
  "quote",

Cargo.toml

@@ -1,19 +1,19 @@
 [package]
 name = "icarus_models"
-version = "0.8.2"
+version = "0.5.5"
 edition = "2024"
-rust-version = "1.90"
+rust-version = "1.88"
 description = "models used for the icarus project"
 license = "MIT"
 
 [dependencies]
-serde = { version = "1.0.228", features = ["derive"] }
+serde = { version = "1.0.219", features = ["derive"] }
-serde_json = { version = "1.0.145" }
+serde_json = { version = "1.0.140" }
-rand = { version = "0.9.2" }
+rand = { version = "0.9.1" }
-time = { version = "0.3.44", features = ["formatting", "macros", "parsing", "serde"] }
+time = { version = "0.3.41", features = ["formatting", "macros", "parsing", "serde"] }
-uuid = { version = "1.18.1", features = ["v4", "serde"] }
+uuid = { version = "1.17.0", features = ["v4", "serde"] }
 josekit = { version = "0.10.3" }
 utoipa = { version = "5.4.0", features = ["uuid", "time"] }
 
 [dev-dependencies]
-tempfile = { version = "3.23.0" }
+tempfile = { version = "3.20.0" }

README.md

@@ -1,3 +1,2 @@
-A library containing commonly used structs, functions, enums, constants and other code
+A library containing commonly used models and functions that is used throughout
-that is used throughout the icarus projects. Code from this library serves as the model
+icarus projects. This reduces the amount of duplicated code without a benefit.
-for other projects in the icarus project.

src/constants.rs

@@ -12,9 +12,3 @@ pub mod file_extensions {
         pub const PNGEXTENSION: &str = ".png";
     }
 }
-
-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";
-    pub const LAST_CHARACTER_IN_DIRECTORY: &str = "Could not access last character of directory";
-}

src/coverart.rs

@@ -1,140 +1,39 @@
-use std::io::Write;
+use std::io::Read;
 
-use rand::Rng;
 use serde::{Deserialize, Serialize};
 
-const FILENAME_LENGTH: i32 = 16;
-
 #[derive(Clone, Debug, Default, Deserialize, Serialize, utoipa::ToSchema)]
 pub struct CoverArt {
     pub id: uuid::Uuid,
     pub title: String,
     #[serde(skip)]
-    pub directory: String,
+    pub path: String,
-    pub filename: String,
     #[serde(skip)]
     pub data: Vec<u8>,
     pub song_id: uuid::Uuid,
 }
 
 pub mod init {
-    use super::CoverArt;
+    use crate::coverart::CoverArt;
 
-    /// Initializes the CoverArt with just the directory and filename
+    pub fn init_coverart_only_path(path: String) -> CoverArt {
-    pub fn init_coverart_dir_and_filename(directory: &str, filename: &str) -> CoverArt {
         CoverArt {
-            directory: String::from(directory),
+            id: uuid::Uuid::nil(),
-            filename: String::from(filename),
+            title: String::new(),
-            ..Default::default()
+            path: path.clone(),
+            data: Vec::new(),
+            song_id: uuid::Uuid::nil(),
         }
     }
 }
 
 impl CoverArt {
-    /// Saves the coverart to the filesystem
+    pub fn to_data(&self) -> Result<Vec<u8>, std::io::Error> {
-    pub fn save_to_filesystem(&self) -> Result<(), std::io::Error> {
+        let path: &String = &self.path;
-        match self.get_path() {
+        let mut file = std::fs::File::open(path)?;
-            Ok(path) => match std::fs::File::create(&path) {
+        let mut buffer = Vec::new();
-                Ok(mut file) => match file.write_all(&self.data) {
+        match file.read_to_end(&mut buffer) {
-                    Ok(_) => Ok(()),
+            Ok(_) => Ok(buffer),
-                    Err(err) => Err(err),
-                },
-                Err(err) => Err(err),
-            },
-            Err(err) => Err(err),
-        }
-    }
-
-    /// Removes the coverart from the filesystem
-    pub fn remove_from_filesystem(&self) -> Result<(), std::io::Error> {
-        match self.get_path() {
-            Ok(path) => {
-                let p = std::path::Path::new(&path);
-                if p.exists() {
-                    match std::fs::remove_file(p) {
-                        Ok(_) => Ok(()),
-                        Err(err) => Err(err),
-                    }
-                } else {
-                    Err(std::io::Error::other(
-                        "Cannot delete file that does not exist",
-                    ))
-                }
-            }
-            Err(err) => Err(err),
-        }
-    }
-
-    /// Gets the path of the CoverArt
-    pub fn get_path(&self) -> Result<String, std::io::Error> {
-        if self.directory.is_empty() {
-            return Err(std::io::Error::other(
-                crate::constants::error::DIRECTORY_NOT_INITIALIZED,
-            ));
-        } else if self.filename.is_empty() {
-            return Err(std::io::Error::other(
-                crate::constants::error::FILENAME_NOT_INITIALIZED,
-            ));
-        }
-
-        let directory = &self.directory;
-        let last_index = directory.len() - 1;
-
-        match crate::util::concatenate_path(directory, &self.filename, last_index) {
-            Ok(path) => Ok(path),
-            Err(err) => Err(err),
-        }
-    }
-}
-
-/// Generates filename for a CoverArt
-pub fn generate_filename(typ: crate::types::CoverArtTypes, randomize: bool) -> String {
-    let file_extension = match typ {
-        crate::types::CoverArtTypes::PngExtension => {
-            String::from(crate::constants::file_extensions::image::PNGEXTENSION)
-        }
-        crate::types::CoverArtTypes::JpegExtension => {
-            String::from(crate::constants::file_extensions::image::JPEGEXTENSION)
-        }
-        crate::types::CoverArtTypes::JpgExtension => {
-            String::from(crate::constants::file_extensions::image::JPGEXTENSION)
-        }
-    };
-
-    if randomize {
-        let mut filename: String = String::new();
-        let some_chars: String = String::from("abcdefghij0123456789");
-        let some_chars_length = some_chars.len();
-        let mut rng = rand::rng();
-
-        for _ in 0..FILENAME_LENGTH {
-            let index = rng.random_range(0..=some_chars_length);
-            let rando_char = some_chars.chars().nth(index);
-
-            if let Some(c) = rando_char {
-                filename.push(c);
-            }
-        }
-        filename + &file_extension
-    } else {
-        "track-output".to_string() + &file_extension
-    }
-}
-
-pub mod io {
-    use std::io::Read;
-
-    /// Gets the raw data of the cover art
-    pub fn to_data(coverart: &super::CoverArt) -> Result<Vec<u8>, std::io::Error> {
-        match coverart.get_path() {
-            Ok(path) => {
-                let mut file = std::fs::File::open(path)?;
-                let mut buffer = Vec::new();
-                match file.read_to_end(&mut buffer) {
-                    Ok(_) => Ok(buffer),
-                    Err(err) => Err(err),
-                }
-            }
             Err(err) => Err(err),
         }
     }
@@ -146,11 +45,9 @@ mod tests {
 
     #[test]
     fn test_cover_art_image() {
-        let dir = String::from("./");
+        let path: String = String::from("somepath");
-        let filename = String::from("CoverArt.png");
+        let coverart = coverart::init::init_coverart_only_path(path.clone());
-        let coverart = coverart::init::init_coverart_dir_and_filename(&dir, &filename);
 
-        assert_eq!(dir, coverart.directory);
+        assert_eq!(path, coverart.path);
-        assert_eq!(filename, coverart.filename);
     }
 }

src/lib.rs

@@ -7,7 +7,6 @@ pub mod song;
 pub mod token;
 pub mod types;
 pub mod user;
-pub mod util;
 
 pub mod init {
     pub fn is_id_valid(num: &i32) -> bool {

src/login_result.rs

@@ -2,7 +2,7 @@ use std::default::Default;
 
 use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, Default, Deserialize, Serialize, utoipa::ToSchema)]
+#[derive(Clone, Debug, Deserialize, Serialize, utoipa::ToSchema)]
 pub struct LoginResult {
     pub id: uuid::Uuid,
     pub username: String,
@@ -12,14 +12,20 @@ pub struct LoginResult {
     pub expiration: i64,
 }
 
-impl LoginResult {
+impl Default for LoginResult {
-    pub fn to_json(&self) -> Result<String, serde_json::Error> {
+    fn default() -> Self {
-        serde_json::to_string_pretty(&self)
+        LoginResult {
-    }
+            id: uuid::Uuid::nil(),
-
+            username: String::new(),
-    pub fn token_expired(&self) -> bool {
+            token: String::new(),
-        let current_time = time::OffsetDateTime::now_utc();
+            token_type: String::new(),
-        let expired = time::OffsetDateTime::from_unix_timestamp(self.expiration).unwrap();
+            expiration: -1,
-        current_time > expired
+        }
+    }
+}
+
+impl LoginResult {
+    pub fn _to_json(&self) -> Result<String, serde_json::Error> {
+        serde_json::to_string_pretty(&self)
     }
 }

src/song.rs

@@ -1,14 +1,11 @@
-use std::io::Write;
+use std::io::Read;
-
-use rand::Rng;
-use serde::{Deserialize, Serialize};
 
 use crate::constants;
 use crate::init;
 use crate::types;
 
-/// Length of characters of a filename to be generated
+use rand::Rng;
-const FILENAME_LENGTH: i32 = 16;
+use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Debug, Default, Deserialize, Serialize, utoipa::ToSchema)]
 pub struct Song {
@@ -39,8 +36,8 @@ pub struct Song {
     pub track_count: i32,
     #[serde(skip_serializing_if = "String::is_empty")]
     pub audio_type: String,
-    #[serde(with = "time::serde::rfc3339::option")]
+    #[serde(skip_serializing_if = "String::is_empty")]
-    pub date_created: Option<time::OffsetDateTime>,
+    pub date_created: String,
     #[serde(skip_serializing_if = "String::is_empty")]
     pub filename: String,
     #[serde(skip_serializing_if = "init::is_uuid_nil")]
@@ -69,135 +66,34 @@ impl Song {
         }
     }
 
-    /// Gets the path of a Song
     pub fn song_path(&self) -> Result<String, std::io::Error> {
         if self.directory.is_empty() {
-            return Err(std::io::Error::other(
+            return Err(std::io::Error::other("Directory does not exist"));
-                crate::constants::error::DIRECTORY_NOT_INITIALIZED,
-            ));
-        } else if self.filename.is_empty() {
-            return Err(std::io::Error::other(
-                crate::constants::error::FILENAME_NOT_INITIALIZED,
-            ));
         }
 
         let directory = &self.directory;
+        let mut buffer: String = directory.clone();
         let last_index = directory.len() - 1;
 
-        match crate::util::concatenate_path(directory, &self.filename, last_index) {
+        if let Some(character) = directory.chars().nth(last_index) {
-            Ok(path) => Ok(path),
+            if character != '/' {
-            Err(err) => Err(err),
+                buffer += "/";
-        }
-    }
-
-    /// Saves the song to the filesystem using the song's data
-    pub fn save_to_filesystem(&self) -> Result<(), std::io::Error> {
-        match self.song_path() {
-            Ok(song_path) => match std::fs::File::create(&song_path) {
-                Ok(mut file) => match file.write_all(&self.data) {
-                    Ok(_res) => Ok(()),
-                    Err(err) => Err(err),
-                },
-                Err(err) => Err(err),
-            },
-            Err(err) => Err(err),
-        }
-    }
-
-    /// Removes the song from the filesystem
-    pub fn remove_from_filesystem(&self) -> Result<(), std::io::Error> {
-        match self.song_path() {
-            Ok(song_path) => {
-                let p = std::path::Path::new(&song_path);
-                if p.exists() {
-                    match std::fs::remove_file(p) {
-                        Ok(_) => Ok(()),
-                        Err(err) => Err(err),
-                    }
-                } else {
-                    Err(std::io::Error::other(
-                        "Cannot delete file that does not exist",
-                    ))
-                }
             }
-            Err(err) => Err(err),
-        }
-    }
-}
 
-/// Generates a filename. In order to save a song to the filesystem
+            buffer += &self.filename.clone();
-pub fn generate_filename(typ: types::MusicTypes, randomize: bool) -> String {
-    let file_extension = match typ {
-        types::MusicTypes::DefaultMusicExtension => {
-            String::from(constants::file_extensions::audio::DEFAULTMUSICEXTENSION)
-        }
-        types::MusicTypes::WavExtension => {
-            String::from(constants::file_extensions::audio::WAVEXTENSION)
-        }
-        types::MusicTypes::FlacExtension => {
-            String::from(constants::file_extensions::audio::FLACEXTENSION)
-        }
-        types::MusicTypes::MPThreeExtension => {
-            String::from(constants::file_extensions::audio::MPTHREEEXTENSION)
-        }
-    };
 
-    if randomize {
+            Ok(buffer)
-        let mut filename: String = String::new();
+        } else {
-        let some_chars: String = String::from("abcdefghij0123456789");
+            Err(std::io::Error::other(
-        let mut rng = rand::rng();
+                "Could not access last character of directory",
-
+            ))
-        for _ in 0..FILENAME_LENGTH {
-            let index = rng.random_range(0..=19);
-            let rando_char = some_chars.chars().nth(index);
-
-            if let Some(c) = rando_char {
-                filename.push(c);
-            }
-        }
-        filename + &file_extension
-    } else {
-        "track-output".to_string() + &file_extension
-    }
-}
-
-/// I/O operations for songs
-pub mod io {
-    use std::io::Read;
-
-    /// Copies a song using the source song's data
-    pub fn copy_song(
-        song_source: &super::Song,
-        song_target: &mut super::Song,
-    ) -> Result<(), std::io::Error> {
-        match song_target.song_path() {
-            Ok(songpath) => {
-                let p = std::path::Path::new(&songpath);
-                if p.exists() {
-                    Err(std::io::Error::other(
-                        "Cannot copy song over to one that already exists",
-                    ))
-                } else {
-                    if song_target.data.is_empty() {
-                        song_target.data = song_source.data.clone();
-                    } else {
-                        song_target.data.clear();
-                        song_target.data = song_source.data.clone();
-                    }
-
-                    match song_target.save_to_filesystem() {
-                        Ok(_) => Ok(()),
-                        Err(err) => Err(err),
-                    }
-                }
-            }
-            Err(err) => Err(err),
         }
     }
 
-    /// Gets the raw file data of a song from the filesystem
+    pub fn to_data(&self) -> Result<Vec<u8>, std::io::Error> {
-    pub fn to_data(song: &super::Song) -> Result<Vec<u8>, std::io::Error> {
+        let path_result = self.song_path();
-        match song.song_path() {
+
+        match path_result {
             Ok(path) => {
                 let mut file = std::fs::File::open(path)?;
                 let mut buffer: Vec<u8> = Vec::new();
@@ -212,4 +108,46 @@ pub mod io {
             Err(er) => Err(er),
         }
     }
+
+    pub fn generate_filename(&self, typ: types::MusicTypes, randomize: bool) -> String {
+        let mut filename: String = String::new();
+        let filename_len = 10;
+
+        let file_extension = match typ {
+            types::MusicTypes::DefaultMusicExtension => {
+                String::from(constants::file_extensions::audio::DEFAULTMUSICEXTENSION)
+            }
+
+            types::MusicTypes::WavExtension => {
+                String::from(constants::file_extensions::audio::WAVEXTENSION)
+            }
+            types::MusicTypes::FlacExtension => {
+                String::from(constants::file_extensions::audio::FLACEXTENSION)
+            }
+            types::MusicTypes::MPThreeExtension => {
+                String::from(constants::file_extensions::audio::MPTHREEEXTENSION)
+            }
+        };
+
+        if randomize {
+            let some_chars: String = String::from("abcdefghij0123456789");
+            let mut rng = rand::rng();
+
+            for _i in 0..filename_len {
+                let random_number: i32 = rng.random_range(0..=19);
+                let index = random_number as usize;
+                let rando_char = some_chars.chars().nth(index);
+
+                if let Some(c) = rando_char {
+                    filename.push(c);
+                }
+            }
+        } else {
+            filename += "track-output";
+        }
+
+        filename += &file_extension;
+
+        filename
+    }
 }

src/token.rs

@@ -2,7 +2,7 @@ use std::default::Default;
 
 use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, Default, Deserialize, Serialize)]
+#[derive(Clone, Debug, Deserialize, Serialize)]
 pub struct Token {
     pub scope: String,
     pub expiration: i64,
@@ -27,16 +27,23 @@ pub struct AccessToken {
     pub message: String,
 }
 
-impl AccessToken {
+impl Default for Token {
-    /// Get the token fit for Bearer authentication
+    fn default() -> Self {
-    pub fn bearer_token(&self) -> String {
+        Token {
-        format!("Bearer {}", self.token)
+            scope: String::new(),
+            expiration: -1,
+            audience: String::new(),
+            issuer: String::new(),
+            issued: -1,
+        }
     }
+}
 
-    pub fn token_expired(&self) -> bool {
+impl AccessToken {
-        let current_time = time::OffsetDateTime::now_utc();
+    pub fn bearer_token(&self) -> String {
-        let expired = time::OffsetDateTime::from_unix_timestamp(self.expiration).unwrap();
+        let mut token: String = String::from("Bearer ");
-        current_time > expired
+        token += &self.token.clone();
+        token
     }
 }
 
@@ -45,10 +52,9 @@ impl Token {
         serde_json::to_string_pretty(&self)
     }
 
+    // TODO: Implement
     pub fn token_expired(&self) -> bool {
-        let current_time = time::OffsetDateTime::now_utc();
+        false
-        let expired = time::OffsetDateTime::from_unix_timestamp(self.expiration).unwrap();
-        current_time > expired
     }
 
     pub fn contains_scope(&self, des_scope: &String) -> bool {

src/types.rs

@@ -1,14 +1,6 @@
-#[derive(Debug)]
 pub enum MusicTypes {
     DefaultMusicExtension,
     WavExtension,
     FlacExtension,
     MPThreeExtension,
 }
-
-#[derive(Debug)]
-pub enum CoverArtTypes {
-    PngExtension,
-    JpegExtension,
-    JpgExtension,
-}

src/util/mod.rs

@@ -1,19 +0,0 @@
-pub fn concatenate_path(
-    directory: &str,
-    filename: &str,
-    last_index: usize,
-) -> Result<String, std::io::Error> {
-    if let Some(character) = directory.chars().nth(last_index) {
-        let buffer: String = if character != '/' {
-            format!("{directory}/")
-        } else {
-            String::from(directory)
-        };
-
-        Ok(format!("{buffer}{filename}"))
-    } else {
-        Err(std::io::Error::other(
-            crate::constants::error::LAST_CHARACTER_IN_DIRECTORY,
-        ))
-    }
-}

tests/tests.rs

@@ -30,12 +30,16 @@ mod utils {
 
 #[cfg(test)]
 mod song_tests {
+    use std::fs::File;
+    use std::io::Write;
+
     use tempfile::tempdir;
 
-    use crate::utils;
     use icarus_models::song;
     use icarus_models::types;
 
+    use crate::utils;
+
     #[test]
     fn test_song_to_data() {
         println!("Test");
@@ -61,7 +65,7 @@ mod song_tests {
                 Ok(buffer) => {
                     assert_eq!(buffer.is_empty(), false);
 
-                    match song::io::to_data(&song) {
+                    match song.to_data() {
                         Ok(song_data) => {
                             println!("Both files match");
                             assert_eq!(buffer, song_data);
@@ -99,47 +103,50 @@ mod song_tests {
         song.directory = utils::get_tests_directory();
         song.filename = String::from("track01.flac");
 
-        let mut song_cpy = song.clone();
+        match song.song_path() {
-        let temp_dir = tempdir().expect("Failed to create temp dir");
+            Ok(songpath) => match utils::extract_data_from_file(&songpath) {
-        song_cpy.directory = match temp_dir.path().to_str() {
+                Ok(buffer) => {
-            Some(s) => String::from(s),
+                    let mut song_cpy = song.clone();
-            None => String::new(),
+                    let temp_dir = tempdir().expect("Failed to create temp dir");
-        };
+                    song_cpy.directory = match temp_dir.path().to_str() {
+                        Some(s) => String::from(s),
+                        None => String::new(),
+                    };
 
-        assert_eq!(song.directory.is_empty(), false);
+                    assert_eq!(song.directory.is_empty(), false);
-        song_cpy.filename = song::generate_filename(types::MusicTypes::FlacExtension, true);
+                    song_cpy.filename =
-        println!("Directory: {:?}", song_cpy.directory);
+                        song.generate_filename(types::MusicTypes::FlacExtension, true);
-        println!("File to be created: {:?}", song_cpy.filename);
+                    println!("Directory: {:?}", song_cpy.directory);
+                    println!("File to be created: {:?}", song_cpy.filename);
 
-        match song::io::copy_song(&song, &mut song_cpy) {
+                    let path = match song_cpy.song_path() {
-            Ok(_) => {}
+                        Ok(s_path) => s_path,
-            Err(err) => {
+                        Err(err) => {
-                assert!(false, "Error copying song: Error: {err:?}")
+                            assert!(false, "Error: {:?}", err);
-            }
+                            String::new()
-        }
+                        }
-    }
+                    };
 
-    #[test]
+                    match File::create(path) {
-    fn test_save_song_to_filesystem_and_remove() {
+                        Ok(mut file_cpy) => match file_cpy.write_all(&buffer) {
-        let mut song = song::Song::default();
+                            Ok(success) => {
-        song.directory = utils::get_tests_directory();
+                                println!("Success: {:?}", success);
-        song.filename = String::from("track02.flac");
+                            }
-
+                            Err(err) => {
-        let mut copied_song = song::Song {
+                                assert!(false, "Error saving file: {:?}", err);
-            directory: utils::get_tests_directory(),
+                            }
-            filename: String::from("track02-coppied.flac"),
+                        },
-            ..Default::default()
+                        Err(err) => {
-        };
+                            assert!(false, "Error: {:?}", err);
-
+                        }
-        match song::io::copy_song(&song, &mut copied_song) {
+                    };
-            Ok(_) => match copied_song.remove_from_filesystem() {
+                }
-                Ok(_) => {}
                 Err(err) => {
-                    assert!(false, "Error: {err:?}")
+                    assert!(false, "Error: {:?}", err);
                 }
             },
             Err(err) => {
-                assert!(false, "Error: {err:?}")
+                assert!(false, "Error extracting song data: {:?}", err);
             }
         }
     }
@@ -147,6 +154,7 @@ mod song_tests {
 
 #[cfg(test)]
 mod album_tests {
+
     use crate::utils;
     use icarus_models::album;