Adding code to save info to get data from bucket

Reviewed-on: #257

.env.docker.sample

@@ -4,9 +4,31 @@ FRONTEND_URL=http://localhost:4200
 RUST_LOG=debug
 ALLOWED_ORIGINS=https://soaricarus.com,https://www.soaricarus.com
 SECRET_MAIN_KEY=refero34o8rfhfjn983thf39fhc943rf923n3h
-ROOT_DIRECTORY=/home/icarus/mydata
-POSTGRES_MAIN_USER=icarus
+ROOT_DIRECTORY=/home/soaricarus/mydata
+POSTGRES_MAIN_USER=soaricarus
 POSTGRES_MAIN_PASSWORD=password
-POSTGRES_MAIN_DB=icarus_db
+POSTGRES_MAIN_DB=soaricarus_db
 POSTGRES_MAIN_HOST=main_db
-DATABASE_URL=postgres://${POSTGRES_MAIN_USER}:${POSTGRES_MAIN_PASSWORD}@${POSTGRES_MAIN_HOST}:5432/${POSTGRES_MAIN_DB}
+POSTGRES_MAIN_PORT=5432
+DATABASE_URL=postgres://${POSTGRES_MAIN_USER}:${POSTGRES_MAIN_PASSWORD}@${POSTGRES_MAIN_HOST}:${POSTGRES_MAIN_PORT}/${POSTGRES_MAIN_DB}
+
+S3_BUCKET_NAME=soaricarus-bucket
+S3_ENDPOINT_URL=http://maze:3900
+GARAGE_S3_REGION=maze
+GARAGE_RPC_SECRET=c2bde5c3f9c04116a7563e25ea5ba6fab25319daa2fe8a952ad57d0b8159b590
+GARAGE_METRICS_TOKEN=sD2g4jiYV66KdZWtIuj2amezuryzv81mZNktpMNcmU4=
+GARAGE_DEFAULT_ACCESS_KEY=GK8eb91557b9a18dcbdc834c16a25ac6fc
+GARAGE_DEFAULT_SECRET_KEY=WhFAtnAtWgYaa0pMfl9jwygalZSwYaVliY3Ndm7nYHo=
+GARAGE_DEFAULT_BUCKET=${S3_BUCKET_NAME}
+GARAGE_ADMIN_TOKEN=5yMAjSINa6U04wr4pDbcTYfsXKl3S9ZjKdiPXWYUbNw=
+GARAGE_METADATA_DIR=/var/lib/garage/meta
+GARAGE_DATA_DIR=/var/lib/garage/data
+GARAGE_DB_ENGINE=sqlite
+GARAGE_REPLICATION_FACTOR=1
+GARAGE_RPC_BIND_ADDR=[::]:3901
+GARAGE_S3_API_BIND_ADDR=[::]:3900
+GARAGE_S3_WEB_BIND_ADDR=[::]:3902
+GARAGE_ROOT_DOMAIN=.localhost
+AWS_DEFAULT_REGION=${GARAGE_S3_REGION}
+AWS_SECRET_ACCESS_KEY=${GARAGE_DEFAULT_ACCESS_KEY}
+AWS_ACCESS_KEY_ID=${GARAGE_DEFAULT_SECRET_KEY}

.env.local.sample

@@ -0,0 +1,34 @@
+APP_ENV=development
+BACKEND_PORT=8000
+FRONTEND_URL=http://localhost:4200
+RUST_LOG=debug
+ALLOWED_ORIGINS=https://soaricarus.com,https://www.soaricarus.com
+SECRET_MAIN_KEY=refero34o8rfhfjn983thf39fhc943rf923n3h
+ROOT_DIRECTORY=/home/soaricarus/mydata
+POSTGRES_MAIN_USER=soaricarus
+POSTGRES_MAIN_PASSWORD=password
+POSTGRES_MAIN_DB=soaricarus_db
+POSTGRES_MAIN_HOST=main_db
+POSTGRES_MAIN_PORT=5432
+DATABASE_URL=postgres://${POSTGRES_MAIN_USER}:${POSTGRES_MAIN_PASSWORD}@${POSTGRES_MAIN_HOST}:${POSTGRES_MAIN_PORT}/${POSTGRES_MAIN_DB}
+
+S3_BUCKET_NAME=soaricarus-bucket
+S3_ENDPOINT_URL=http://maze:3900
+GARAGE_S3_REGION=maze
+GARAGE_RPC_SECRET=c2bde5c3f9c04116a7563e25ea5ba6fab25319daa2fe8a952ad57d0b8159b590
+GARAGE_METRICS_TOKEN=sD2g4jiYV66KdZWtIuj2amezuryzv81mZNktpMNcmU4=
+GARAGE_DEFAULT_ACCESS_KEY=GK8eb91557b9a18dcbdc834c16a25ac6fc
+GARAGE_DEFAULT_SECRET_KEY=WhFAtnAtWgYaa0pMfl9jwygalZSwYaVliY3Ndm7nYHo=
+GARAGE_DEFAULT_BUCKET=${S3_BUCKET_NAME}
+GARAGE_ADMIN_TOKEN=5yMAjSINa6U04wr4pDbcTYfsXKl3S9ZjKdiPXWYUbNw=
+GARAGE_METADATA_DIR=/var/lib/garage/meta
+GARAGE_DATA_DIR=/var/lib/garage/data
+GARAGE_DB_ENGINE=sqlite
+GARAGE_REPLICATION_FACTOR=1
+GARAGE_RPC_BIND_ADDR=[::]:3901
+GARAGE_S3_API_BIND_ADDR=[::]:3900
+GARAGE_S3_WEB_BIND_ADDR=[::]:3902
+GARAGE_ROOT_DOMAIN=.localhost
+AWS_DEFAULT_REGION=${GARAGE_S3_REGION}
+AWS_SECRET_ACCESS_KEY=${GARAGE_DEFAULT_ACCESS_KEY}
+AWS_ACCESS_KEY_ID=${GARAGE_DEFAULT_SECRET_KEY}

.env.sample

@@ -1,12 +0,0 @@
-APP_ENV=production
-BACKEND_PORT=8000
-FRONTEND_URL=http://localhost:4200
-RUST_LOG=debug
-ALLOWED_ORIGINS=https://soaricarus.com,https://www.soaricarus.com,http://localhost:8000,http://127.0.0.1:8000
-SECRET_MAIN_KEY=refero34o8rfhfjn983thf39fhc943rf923n3h
-ROOT_DIRECTORY=/home/icarus/mydata
-POSTGRES_MAIN_USER=icarus
-POSTGRES_MAIN_PASSWORD=password
-POSTGRES_MAIN_DB=icarus_db
-POSTGRES_MAIN_HOST=localhost
-DATABASE_URL=postgres://${POSTGRES_MAIN_USER}:${POSTGRES_MAIN_PASSWORD}@${POSTGRES_MAIN_HOST}:5432/${POSTGRES_MAIN_DB}

.github/workflows/pr.yml

@@ -0,0 +1,116 @@
+name: pr CI
+
+on:
+  pull_request:
+    branches: [ "main" ]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+
+jobs:
+  test:
+    name: Test Suite
+    runs-on: ubuntu-24.04
+    timeout-minutes: 20
+    services:
+      postgres:
+        image: postgres:18.4-alpine
+        env:
+          POSTGRES_USER: ${{ secrets.DB_TEST_USER || 'testuser' }}
+          POSTGRES_PASSWORD: ${{ secrets.DB_TEST_PASSWORD || 'testpassword' }}
+          POSTGRES_DB: ${{ secrets.DB_TEST_NAME || 'testdb' }}
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+
+    steps:
+      - uses: actions/checkout@v6
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          toolchain: 1.97
+      - uses: Swatinem/rust-cache@v2
+      - name: Verify Docker Environment
+        run: |
+          echo "Runner User Info:"
+          id
+          echo "Checking Docker Version:"
+          docker --version
+          echo "Checking Docker Daemon Status (info):"
+          docker info
+          echo "Checking Docker Daemon Status (ps):"
+          docker ps -a
+          echo "Docker environment check complete."
+
+      - name: Setup S3
+        env:
+          AWS_ACCESS_KEY_ID: "${{ secrets.GARAGE_KEY_ID }}"
+          AWS_SECRET_ACCESS_KEY: "${{ secrets.GARAGE_SECRET }}"
+          AWS_DEFAULT_REGION: us-east-1
+          ENDPOINT_URL: "${{ secrets.S3_CI_ENDPOINT_URL}}"
+        run: |
+          sudo apt update
+          echo "Installing curl and unzip"
+          sudo apt install curl unzip -y
+
+          echo "Installing awscli"
+          curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
+          unzip awscliv2.zip
+          sudo ./aws/install
+          aws --version
+
+          BUCKET="soaricarus-ci-bucket-$(echo $RANDOM | md5sum | head -c 8)"
+          echo "S3_BUCKET=$BUCKET" >> $GITHUB_ENV
+          echo "AWS_DEFAULT_REGION=$AWS_DEFAULT_REGION" >> $GITHUB_ENV
+          echo "AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID" >> $GITHUB_ENV
+          echo "AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY" >> $GITHUB_ENV
+
+          echo "Creating bucket: $BUCKET"
+          aws --endpoint-url=$ENDPOINT_URL s3 mb s3://$BUCKET --region $AWS_DEFAULT_REGION
+
+      - name: Run tests
+        env:
+          DATABASE_URL: postgresql://${{ secrets.DB_TEST_USER || 'testuser' }}:${{ secrets.DB_TEST_PASSWORD || 'testpassword' }}@postgres:5432/${{ secrets.DB_TEST_NAME || 'testdb' }}
+          RUST_LOG: info # Optional: configure test log level
+          SECRET_MAIN_KEY: ${{ secrets.TOKEN_SECRET_KEY }}
+          SSH_AUTH_SOCK: ${{ env.SSH_AUTH_SOCK }}
+          ROOT_DIRECTORY: "/tmp"
+          AWS_ACCESS_KEY_ID: "${{ secrets.GARAGE_KEY_ID }}"
+          AWS_SECRET_ACCESS_KEY: "${{ secrets.GARAGE_SECRET }}"
+          AWS_DEFAULT_REGION: "${{ env.AWS_DEFAULT_REGION }}"
+          GARAGE_DEFAULT_ACCESS_KEY: "${{ secrets.GARAGE_KEY_ID }}"
+          GARAGE_DEFAULT_SECRET_KEY: "${{ secrets.GARAGE_SECRET }}"
+          GARAGE_S3_REGION: "${{ env.AWS_DEFAULT_REGION }}"
+          S3_BUCKET_NAME: ${{ env.S3_BUCKET }}
+          S3_ENDPOINT_URL: "${{ secrets.S3_CI_ENDPOINT_URL }}"
+          AWS_S3_FORCE_PATH_STYLE: "true"
+        run: |
+          mkdir -p ~/.ssh
+          echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/soaricarus_models_deploy_key
+          chmod 600 ~/.ssh/soaricarus_models_deploy_key
+          ssh-keyscan ${{ secrets.MYHOST }} >> ~/.ssh/known_hosts
+
+          eval $(ssh-agent -s)
+          ssh-add -v ~/.ssh/soaricarus_models_deploy_key
+
+          cargo test
+
+      - name: Cleanup
+        if: always()
+        run: |
+          echo "Cleaning up bucket $BUCK"
+          echo "Region: $AWS_DEFAULT_REGION"
+
+          aws --endpoint-url=$ENDPOINT_URL \
+              s3 rb s3://$BUCK --force \
+              --region $AWS_DEFAULT_REGION
+        env:
+          ENDPOINT_URL: ${{ secrets.S3_CI_ENDPOINT_URL }} 
+          AWS_ACCESS_KEY_ID: "${{ env.AWS_ACCESS_KEY_ID }}"
+          AWS_SECRET_ACCESS_KEY: "${{ env.AWS_SECRET_ACCESS_KEY }}"
+          AWS_DEFAULT_REGION: "${{ env.AWS_DEFAULT_REGION }}"
+          BUCK: ${{ env.S3_BUCKET }}
+        continue-on-error: true

.github/workflows/release.yml

@@ -9,14 +9,14 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: Checkout code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0 # Important for git describe --tags
 
       - name: Install Rust
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.94
+          toolchain: 1.97
           components: cargo
 
       - name: Extract Version from Cargo.toml

.github/workflows/workflow.yml

@@ -1,23 +1,46 @@
-name: Rust CI
+name: soaricarus_api CI
 
 on:
   push:
     branches: [ "main" ]
-  pull_request:
-    branches: [ "main" ]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 
 jobs:
-  build:
+  check:
+    name: Check
     runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@v6
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          toolchain: 1.97
+      - uses: Swatinem/rust-cache@v2
+      - run: |
+          mkdir -p ~/.ssh
+          echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/soaricarus_models_deploy_key
+          chmod 600 ~/.ssh/soaricarus_models_deploy_key
+          ssh-keyscan ${{ secrets.MYHOST }} >> ~/.ssh/known_hosts
+
+          eval $(ssh-agent -s)
+          ssh-add -v ~/.ssh/soaricarus_models_deploy_key
+
+          cargo check
+
+  test:
+    name: Test Suite
+    runs-on: ubuntu-24.04
+    timeout-minutes: 20
     services:
       postgres:
-        image: postgres:18.3-alpine
+        image: postgres:18.4-alpine
         env:
-          POSTGRES_PASSWORD: ${{ secrets.POSTGRES_PASSWORD }}
-          POSTGRES_USER: ${{ secrets.POSTGRES_USER }}
-          POSTGRES_DB: ${{ secrets.POSTGRES_DB }}
-        ports:
-          - 5432:5432
+          POSTGRES_USER: ${{ secrets.DB_TEST_USER || 'testuser' }}
+          POSTGRES_PASSWORD: ${{ secrets.DB_TEST_PASSWORD || 'testpassword' }}
+          POSTGRES_DB: ${{ secrets.DB_TEST_NAME || 'testdb' }}
         options: >-
           --health-cmd pg_isready
           --health-interval 10s
@@ -25,55 +48,148 @@ jobs:
           --health-retries 5
 
     steps:
-    - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          toolchain: 1.97
+      - uses: Swatinem/rust-cache@v2
+      - name: Verify Docker Environment
+        run: |
+          echo "Runner User Info:"
+          id
+          echo "Checking Docker Version:"
+          docker --version
+          echo "Checking Docker Daemon Status (info):"
+          docker info
+          echo "Checking Docker Daemon Status (ps):"
+          docker ps -a
+          echo "Docker environment check complete."
 
-    - name: Install Rust 1.94
-      uses: actions-rs/toolchain@v1
-      with:
-        toolchain: 1.94
-        components: clippy, rustfmt
-        override: true
+      - name: Setup S3
+        env:
+          AWS_ACCESS_KEY_ID: "${{ secrets.GARAGE_KEY_ID }}"
+          AWS_SECRET_ACCESS_KEY: "${{ secrets.GARAGE_SECRET }}"
+          AWS_DEFAULT_REGION: us-east-1
+          ENDPOINT_URL: "${{ secrets.S3_CI_ENDPOINT_URL}}"
+        run: |
+          sudo apt update
+          echo "Installing curl and unzip"
+          sudo apt install curl unzip -y
 
-    - name: Cache dependencies
-      uses: Swatinem/rust-cache@v2
+          echo "Installing awscli"
+          curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
+          unzip awscliv2.zip
+          sudo ./aws/install
+          aws --version
 
-    - name: Install libpq
-      run: sudo apt-get install -y libpq-dev
+          BUCKET="soaricarus-ci-bucket-$(echo $RANDOM | md5sum | head -c 8)"
+          echo "S3_BUCKET=$BUCKET" >> $GITHUB_ENV
+          echo "AWS_DEFAULT_REGION=$AWS_DEFAULT_REGION" >> $GITHUB_ENV
+          echo "AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID" >> $GITHUB_ENV
+          echo "AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY" >> $GITHUB_ENV
 
-    - name: Setup test database
-      env:
-        DATABASE_URL: "postgres://${{ secrets.POSTGRES_USER }}:${{ secrets.POSTGRES_PASSWORD }}@localhost:5432/${{ secrets.POSTGRES_DB }}"
-      run: |
-        # Wait for PostgreSQL to be ready
-        for i in {1..10}; do
-          pg_isready -U ${{ secrets.POSTGRES_USER }} -d ${{ secrets.POSTGRES_DB }} && break
-          sleep 2
-        done
+          echo "Creating bucket: $BUCKET"
+          aws --endpoint-url=$ENDPOINT_URL s3 mb s3://$BUCKET --region $AWS_DEFAULT_REGION
 
-        # Run database migrations (if you use sqlx migrations)
-        cargo install sqlx-cli --no-default-features --features native-tls,postgres
-        sqlx migrate run --database-url $DATABASE_URL
+      - name: Run tests
+        env:
+          DATABASE_URL: postgresql://${{ secrets.DB_TEST_USER || 'testuser' }}:${{ secrets.DB_TEST_PASSWORD || 'testpassword' }}@postgres:5432/${{ secrets.DB_TEST_NAME || 'testdb' }}
+          RUST_LOG: info # Optional: configure test log level
+          SECRET_MAIN_KEY: ${{ secrets.TOKEN_SECRET_KEY }}
+          SSH_AUTH_SOCK: ${{ env.SSH_AUTH_SOCK }}
+          ROOT_DIRECTORY: "/tmp"
+          AWS_ACCESS_KEY_ID: "${{ secrets.GARAGE_KEY_ID }}"
+          AWS_SECRET_ACCESS_KEY: "${{ secrets.GARAGE_SECRET }}"
+          AWS_DEFAULT_REGION: "${{ env.AWS_DEFAULT_REGION }}"
+          GARAGE_DEFAULT_ACCESS_KEY: "${{ secrets.GARAGE_KEY_ID }}"
+          GARAGE_DEFAULT_SECRET_KEY: "${{ secrets.GARAGE_SECRET }}"
+          GARAGE_S3_REGION: "${{ env.AWS_DEFAULT_REGION }}"
+          S3_BUCKET_NAME: ${{ env.S3_BUCKET }}
+          S3_ENDPOINT_URL: "${{ secrets.S3_CI_ENDPOINT_URL }}"
+          AWS_S3_FORCE_PATH_STYLE: "true"
+        run: |
+          mkdir -p ~/.ssh
+          echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/soaricarus_models_deploy_key
+          chmod 600 ~/.ssh/soaricarus_models_deploy_key
+          ssh-keyscan ${{ secrets.MYHOST }} >> ~/.ssh/known_hosts
 
-    - name: Build
-      run: |
-        mkdir -p ~/.ssh
-        echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/gitea_deploy_key
-        chmod 600 ~/.ssh/gitea_deploy_key
-        ssh-keyscan ${{ vars.MYHOST }} >> ~/.ssh/known_hosts
-        eval $(ssh-agent -s)
-        ssh-add -v ~/.ssh/gitea_deploy_key
-        cargo build --verbose --release
+          eval $(ssh-agent -s)
+          ssh-add -v ~/.ssh/soaricarus_models_deploy_key
 
-    - name: Run tests
-      env:
-        ROOT_DIRECTORY: "/tmp"
-        DATABASE_URL: "postgres://${{ secrets.POSTGRES_USER }}:${{ secrets.POSTGRES_PASSWORD }}@localhost:5432/${{ secrets.POSTGRES_DB }}"
-      run: |
-        cat .env.sample | head -6 > .env
-        cargo test --verbose --
+          cargo test
 
-    - name: Run clippy
-      run: cargo clippy -- -D warnings
+      - name: Cleanup
+        if: always()
+        run: |
+          echo "Cleaning up bucket $BUCK"
+          echo "Region: $AWS_DEFAULT_REGION"
 
-    - name: Run rustfmt
-      run: cargo fmt --all -- --check
+          aws --endpoint-url=$ENDPOINT_URL \
+              s3 rb s3://$BUCK --force \
+              --region $AWS_DEFAULT_REGION
+        env:
+          ENDPOINT_URL: ${{ secrets.S3_CI_ENDPOINT_URL }} 
+          AWS_ACCESS_KEY_ID: "${{ env.AWS_ACCESS_KEY_ID }}"
+          AWS_SECRET_ACCESS_KEY: "${{ env.AWS_SECRET_ACCESS_KEY }}"
+          AWS_DEFAULT_REGION: "${{ env.AWS_DEFAULT_REGION }}"
+          BUCK: ${{ env.S3_BUCKET }}
+        continue-on-error: true
+
+  fmt:
+    name: Rustfmt
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@v6
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          toolchain: 1.97
+      - uses: Swatinem/rust-cache@v2
+      - run: rustup component add rustfmt
+      - run: |
+          mkdir -p ~/.ssh
+          echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/soaricarus_models_deploy_key
+          chmod 600 ~/.ssh/soaricarus_models_deploy_key
+          ssh-keyscan ${{ secrets.MYHOST }} >> ~/.ssh/known_hosts
+
+          eval $(ssh-agent -s)
+          ssh-add -v ~/.ssh/soaricarus_models_deploy_key
+          cargo fmt --all -- --check
+
+  clippy:
+    name: Clippy
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@v6
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          toolchain: 1.97
+      - uses: Swatinem/rust-cache@v2
+      - run: rustup component add clippy
+      - run: |
+          mkdir -p ~/.ssh
+          echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/soaricarus_models_deploy_key
+          chmod 600 ~/.ssh/soaricarus_models_deploy_key
+          ssh-keyscan ${{ secrets.MYHOST }} >> ~/.ssh/known_hosts
+
+          eval $(ssh-agent -s)
+          ssh-add -v ~/.ssh/soaricarus_models_deploy_key
+          cargo clippy -- -D warnings
+
+  build:
+    name: build
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@v6
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          toolchain: 1.97
+      - uses: Swatinem/rust-cache@v2
+      - run: |
+          mkdir -p ~/.ssh
+          echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/soaricarus_models_deploy_key
+          chmod 600 ~/.ssh/soaricarus_models_deploy_key
+          ssh-keyscan ${{ secrets.MYHOST }} >> ~/.ssh/known_hosts
+
+          eval $(ssh-agent -s)
+          ssh-add -v ~/.ssh/soaricarus_models_deploy_key
+          cargo build --release

Cargo.toml

@@ -1,33 +1,35 @@
 [package]
-name = "icarus"
-version = "0.4.0"
+name = "soaricarus_api"
+version = "0.5.3"
 edition = "2024"
-rust-version = "1.94"
+rust-version = "1.95"
+license = "MIT"
+description = "Core API for interacting with soaricarus"
 
 [dependencies]
-axum = { version = "0.8.8", features = ["multipart"] }
-axum-extra = { version = "0.12.5", features = ["cookie"] }
+axum = { version = "0.8.9", features = ["multipart"] }
+axum-extra = { version = "0.12.6", features = ["cookie"] }
+openssl = { version = "0.10.81", features = ["vendored"] }
 serde = { version = "1.0.228", features = ["derive"] }
-serde_json = { version = "1.0.149" }
-tower = { version = "0.5.3", features = ["full"] }
-tokio = { version = "1.51", features = ["full"] }
+serde_json = { version = "1.0.150" }
+tokio = { version = "1.52.3", features = ["full"] }
 tokio-util = { version = "0.7.18", features = ["io"] }
-tower-http = { version = "0.6.8", features = ["cors", "timeout"] }
+tower = { version = "0.5.3", features = ["full"] }
+tower-http = { version = "0.7.0", features = ["cors", "timeout"] }
 tracing-subscriber = "0.3.23"
 futures = { version = "0.3.32" }
 mime_guess = { version = "2.0.5" }
-uuid = { version = "1.23", features = ["v4", "serde"] }
-sqlx = { version = "0.8.6", features = ["postgres", "runtime-tokio-native-tls", "time", "uuid"] }
-time = { version = "0.3.47", features = ["formatting", "macros", "parsing", "serde"]  }
-thiserror = "2.0.18"
-base64 = "0.22.1"
+uuid = { version = "1.23.5", features = ["v4", "serde"] }
+sqlx = { version = "0.9.0", features = ["postgres", "runtime-tokio", "tls-native-tls", "time", "uuid"] }
+time = { version = "0.3.53", features = ["formatting", "macros", "parsing", "serde"]  }
 jsonwebtoken = { version = "10.3.0", features = ["rust_crypto"] }
 josekit = { version = "0.10.3" }
-utoipa = { version = "5.4.0", features = ["axum_extras"] }
+utoipa = { version = "5.5.0", features = ["axum_extras"] }
 utoipa-swagger-ui = { version = "9.0.2", features = ["axum"] }
-icarus_meta = { git = "ssh://git@git.kundeng.us/phoenix/icarus_meta.git", tag = "v0.5.0" }
-icarus_models = { git = "ssh://git@git.kundeng.us/phoenix/icarus_models.git", tag = "v0.10.0" }
-icarus_envy = { git = "ssh://git@git.kundeng.us/phoenix/icarus_envy.git", tag = "v0.6.0" }
+simeta = { git = "ssh://git@git.kundeng.us/phoenix/simeta.git", tag = "v0.6.1-main-b690995806-680" }
+simodels = { git = "ssh://git@git.kundeng.us/phoenix/simodels.git", tag = "v0.11.3-main-fe9d101bd0-111" }
+sienvy = { git = "ssh://git@git.kundeng.us/phoenix/sienvy.git", tag = "v0.8.0-main-d06c8fdf49-006" }
+labyrinth = { git = "ssh://git@git.kundeng.us/phoenix/labyrinth.git", tag = "v0.0.4" }
 
 [dev-dependencies]
 common-multipart-rfc7578 = { version = "0.7.0" }

Dockerfile

@@ -1,5 +1,4 @@
-# Stage 1: Build the application
-FROM rust:1.94 as builder
+FROM rust:1.97 as builder
 
 # Set the working directory inside the container
 WORKDIR /usr/src/app
@@ -17,35 +16,25 @@ RUN mkdir -p -m 0700 ~/.ssh && \
     echo "    User git" >> ~/.ssh/config && \
     chmod 600 ~/.ssh/config
 
-# << --- ADD HOST KEY HERE --- >>
 RUN ssh-keyscan git.kundeng.us >> ~/.ssh/known_hosts
 
 # Copy Cargo manifests
 COPY Cargo.toml Cargo.lock ./
 
-# Build *only* dependencies to leverage Docker cache
-# This dummy build caches dependencies as a separate layer
 RUN --mount=type=ssh mkdir src && \
     echo "fn main() {println!(\"if you see this, the build broke\")}" > src/main.rs && \
     cargo build --release --quiet && \
-    rm -rf src target/release/deps/icarus* # Clean up dummy build artifacts (replace icarus)
+    rm -rf src target/release/deps/soaricarus_api*
 
 # Copy the actual source code
 COPY src ./src
-# If you have other directories like `templates` or `static`, copy them too
 COPY .env ./.env
 COPY migrations ./migrations
 
-# << --- SSH MOUNT ADDED HERE --- >>
-# Build *only* dependencies to leverage Docker cache
-# This dummy build caches dependencies as a separate layer
-# Mount the SSH agent socket for this command
 RUN --mount=type=ssh \
     cargo build --release --quiet
 
-# Stage 2: Create the final, smaller runtime image
-# Use a minimal base image like debian-slim or even distroless for security/size
-FROM ubuntu:24.04
+FROM debian:trixie-slim
 
 # Install runtime dependencies if needed (e.g., SSL certificates)
 RUN apt-get update && apt-get install -y ca-certificates libssl-dev libssl3 && rm -rf /var/lib/apt/lists/*
@@ -53,18 +42,11 @@ RUN apt-get update && apt-get install -y ca-certificates libssl-dev libssl3 && r
 # Set the working directory
 WORKDIR /usr/local/bin
 
-# Copy the compiled binary from the builder stage
-# Replace 'icarus' with the actual name of your binary (usually the crate name)
-COPY --from=builder /usr/src/app/target/release/icarus .
+COPY --from=builder /usr/src/app/target/release/soaricarus_api .
 
-# Copy other necessary files like .env (if used for runtime config) or static assets
-# It's generally better to configure via environment variables in Docker though
 COPY --from=builder /usr/src/app/.env .
 COPY --from=builder /usr/src/app/migrations ./migrations
 
-# Expose the port your Axum app listens on (e.g., 3000 or 8000)
 EXPOSE 8000
 
-# Set the command to run your application
-# Ensure this matches the binary name copied above
-CMD ["./icarus"]
+CMD ["./soaricarus_api"]

README.md

@@ -1,24 +1,39 @@
-# Icarus
-Web API for the Icarus project.
+# soaricarus_api
+Core web API for the soaricarus project.
 
 
 ### Requires
-`icarus_auth` v0.7.x  
-`songparser` v0.5.x
+`soaricarus_auth` v0.8.x  
+`songparser` v0.6.x
 
 ### Compatible with
-`icarus-dm` v0.9.x  
+`sidm` v0.10.x  
 
 
 ## Getting Started
-Quickest way to get started is with docker. Make sure `icarus_auth` and `songparser` repositories 
+Quickest way to get started is with docker. Make sure `soaricarus_auth` and `songparser` repositories 
 are located in the root of the parent directory. Check the respective repositories to ensure they
-are setup correctly before configuring `Icarus`.
+are setup correctly before configuring `soaricarus_api`.
 
 Copy the `.env.docker.sample` file to `.env`. Ensure that the `ROOT_DIRECTORY` variable is populated
 and exists on the docker image's filesystem. The credentials for the database doesn't need to be
 changed for development, but if deploying it, it should be modified.
 
+### S3 Setup
+Using the copied `.env.docker.sample`, ensure that the following has been properly populated.
+```
+S3_ENDPOINT_URL - URL of the S3 bucket
+S3_BUCKET_NAME - Name of the S3 bucket
+GARAGE_S3_REGION - Region of the S3 bucket
+GARAGE_RPC_SECRET - A 32-bit hex string
+GARAGE_DEFAULT_ACCESS_KEY - Access key starting with GK followed with a 16-bit hex string
+GARAGE_DEFAULT_SECRET_KEY - Secret key with a 32-bit hex string
+```
+
+The other S3-related environment variables can be left as is for the sake of getting
+started.
+
+
 Build containers
 ```
 docker compose build --ssh default

docker-compose.yaml

@@ -3,42 +3,44 @@ version: '3.8' # Use a recent version
 services:
   # --- Web API ---
   api:
-    build: # Tells docker-compose to build the Dockerfile in the current directory
+    build:
       context: .
-      ssh: ["default"]  # Uses host's SSH agent
-    container_name: icarus # Optional: Give the container a specific name
+      ssh: ["default"]
+    container_name: api
     ports:
-      # Map host port 8000 to container port 3000 (adjust as needed)
       - "8000:8000"
     env_file:
       - .env
+    volumes:
+      - shared_credentials:/shared:ro  # Mount as read-only 
     depends_on:
       main_db:
         condition: service_healthy
+      maze:
+        condition: service_started
+      auth_api:
+        condition: service_started
     networks:
-      - icarus-network
-    restart: unless-stopped # Optional: Restart policy
+      - soaricarus-network
+    restart: unless-stopped
 
   # --- Web API auth ---
   auth_api:
     build:
-      context: ../icarus_auth # IMPORTANT: Relative path to the local checkout of your web API repo (containing the Dockerfile)
-      ssh: ["default"]  # Uses host's SSH agent
+      context: ../soaricarus_auth # IMPORTANT: Relative path to the local checkout of your web API repo (containing the Dockerfile)
+      ssh: ["default"]
       dockerfile: Dockerfile # Optional: Specify if your Dockerfile has a non-standard name
     container_name: auth_api
     restart: unless-stopped
     ports:
-      - "8001:8001" # Map host port 8000 to container port 8000 (adjust container port based on your app's EXPOSE in Dockerfile)
-    # environment:
-      # Environment variables your API needs, e.g., database connection
-      # Add other necessary environment variables
+      - "8001:8001"
     env_file:
-     - ../icarus_auth/.env
+     - ../soaricarus_auth/.env
     depends_on:
       auth_db:
         condition: service_healthy
     networks:
-      - icarus-network
+      - soaricarus-network
     # Optional: Mount local code for development (live reload)
     # volumes:
     #  - ./path/to/your/web-api-repo:/app
@@ -58,25 +60,89 @@ services:
       - main_db
       - auth_api
       - auth_db
+      - maze
     networks:
-      - icarus-network
+      - soaricarus-network
 
+  # --- storage service ---
+  maze:
+    image: dxflrs/garage:v2.3.0  # Use official Garage image
+    container_name: maze
+    restart: unless-stopped
+    environment:
+      # Garage configuration via environment variables
+      GARAGE_SERVER_BIND_ADDR: "0.0.0.0:3900"
+      GARAGE_SERVER_BIND_PUBLIC_ADDR: "0.0.0.0:3901"
+      GARAGE_S3_API_BIND_ADDR: "0.0.0.0:3900"
+      GARAGE_S3_API_PUBLIC_BIND_ADDR: "0.0.0.0:3901"
+      GARAGE_S3_API_PUBLIC_ADDRS: "http://localhost:3901"
+      GARAGE_S3_API_ROOT_DOMAIN: "${GARAGE_ROOT_DOMAIN}"
+      GARAGE_ADMIN_BIND_ADDR: "0.0.0.0:3902"
+      GARAGE_ADMIN_PUBLIC_BIND_ADDR: "0.0.0.0:3902"
+      
+      # Cluster configuration (single node for simplicity)
+      GARAGE_CLUSTER_REPLICATION_MODE: "none"  # Single node
+      GARAGE_CLUSTER_PEER_REPLICATION_STRATEGY: "ring"
+      
+      # Data storage
+      GARAGE_DATA_DIR: "/data"
+      GARAGE_METADATA_DIR: "/data/meta"
+      
+      # RPC configuration
+      GARAGE_RPC_PUBLIC_ADDR: "http://maze:3901"
+      GARAGE_RPC_BIND_ADDR: "0.0.0.0:3901"
+      GARAGE_RPC_SECRET: "${GARAGE_RPC_SECRET}"  # 32+ chars
+      
+      # Web Admin
+      GARAGE_ADMIN_TOKEN: "${GARAGE_ADMIN_TOKEN}"
+      
+      # Logging
+      GARAGE_LOG_LEVEL: "info"
+
+      GARAGE_S3_BUCKET: "${S3_BUCKET_NAME}"
+      GARAGE_S3_REGION: "${GARAGE_S3_REGION}"
+
+      GARAGE_DEFAULT_ACCESS_KEY: "${GARAGE_DEFAULT_ACCESS_KEY}"
+      GARAGE_DEFAULT_SECRET_KEY: "${GARAGE_DEFAULT_SECRET_KEY}"
+      GARAGE_DEFAULT_BUCKET: "${GARAGE_DEFAULT_BUCKET}"
+
+      AWS_ACCESS_KEY_ID: "${GARAGE_DEFAULT_ACCESS_KEY}"
+      AWS_SECRET_ACCESS_KEY: "${GARAGE_DEFAULT_SECRET_KEY}"
+      AWS_DEFAULT_REGION: "${GARAGE_DEFAULT_BUCKET}"
+      AWS_S3_FORCE_PATH_STYLE: "true"   
+      
+    volumes:
+      - ./garage.toml:/etc/garage.toml:ro  # Mount config file
+      - shared_credentials:/data  # Persist Garage data
+    ports:
+      - "3900:3900"  # S3 API
+      - "3901:3901"  # S3 API public
+      - "3902:3902"  # Admin API
+    command: ["/garage", "server", "--single-node", "--default-bucket"]
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:3900/"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+      start_period: 10s
+    networks:
+      - soaricarus-network
+    extra_hosts:
+      - "garage.local:127.0.0.1"
 
   # PostgreSQL Database Service
-  # --- icarus web api db ---
   main_db:
-    image: postgres:18.3-alpine # Use an official Postgres image (Alpine variant is smaller)
-    container_name: icarus_db # Optional: Give the container a specific name
+    image: postgres:18.4-alpine
+    container_name: soaricarus_db
     environment:
       # These MUST match the user, password, and database name in the DATABASE_URL above
-      POSTGRES_USER: ${POSTGRES_MAIN_USER:-icarus}
+      POSTGRES_USER: ${POSTGRES_MAIN_USER:-soaricarus}
       POSTGRES_PASSWORD: ${POSTGRES_MAIN_PASSWORD:-password}
-      POSTGRES_DB: ${POSTGRES_MAIN_DB:-icarus_db}
+      POSTGRES_DB: ${POSTGRES_MAIN_DB:-soaricarus_db}
     volumes:
       # Persist database data using a named volume
-      - postgres_data:/var/lib/postgresql/data
+      - postgres_data:/var/lib/postgresql
     ports:
-      # Optional: Expose port 5432 ONLY if you need to connect directly from your host machine (e.g., for debugging)
       - "5432:5432"
     healthcheck:
         # Checks if Postgres is ready to accept connections
@@ -85,24 +151,23 @@ services:
         timeout: 5s
         retries: 5
         start_period: 10s
-    restart: always # Optional: Restart policy
+    restart: always
     networks:
-      - icarus-network
+      - soaricarus-network
 
-  # --- icarus web auth api db ---
+  # --- soaricarus web auth api db ---
   auth_db:
-    image: postgres:18.3-alpine # Use an official Postgres image (Alpine variant is smaller)
-    container_name: icarus_auth_db # Optional: Give the container a specific name
+    image: postgres:18.4-alpine
+    container_name: soaricarus_auth_db
     environment:
       # These MUST match the user, password, and database name in the DATABASE_URL above
-      POSTGRES_USER: ${POSTGRES_AUTH_USER:-icarus_op}
+      POSTGRES_USER: ${POSTGRES_AUTH_USER:-soaricarus_op}
       POSTGRES_PASSWORD: ${POSTGRES_AUTH_PASSWORD:-password}
-      POSTGRES_DB: ${POSTGRES_AUTH_DB:-icarus_auth_db}
+      POSTGRES_DB: ${POSTGRES_AUTH_DB:-soaricarus_auth_db}
     volumes:
       # Persist database data using a named volume
-      - postgres_data_auth:/var/lib/postgresql/data
+      - postgres_data_auth:/var/lib/postgresql
     ports: 
-      # Optional: Expose port 5432 ONLY if you need to connect directly from your host machine (e.g., for debugging)
       - "5433:5432"
     healthcheck:
         # Checks if Postgres is ready to accept connections
@@ -111,18 +176,20 @@ services:
         timeout: 5s
         retries: 5
         start_period: 10s
-    restart: always # Optional: Restart policy
+    restart: always
     networks:
-      - icarus-network
+      - soaricarus-network
 
-# Define the named volume for data persistence
 volumes:
   postgres_data:
     driver: local # Use the default local driver
   postgres_data_auth:
     driver: local # Use the default local driver
+  object_data:
+    driver: local # Use the default local driver
+  shared_credentials:  # New shared volume
+    driver: local
 
-# Define the network (optional, but good practice)
 networks:
-  icarus-network:
+  soaricarus-network:
     driver: bridge

garage.toml

@@ -0,0 +1,24 @@
+metadata_dir = "/var/lib/garage/meta"
+data_dir = "/var/lib/garage/data"
+db_engine = "sqlite"
+
+replication_factor = 1
+rpc_public_addr = "127.0.0.1:3901"
+rpc_secret = "${GARAGE_RPC_SECRET}"
+
+rpc_bind_addr = "[::]:3901"
+
+[s3_api]
+s3_region = "maze"
+api_bind_addr = "[::]:3900"
+root_domain = ".s3.maze.localhost"
+
+[s3_web]
+bind_addr = "[::]:3902"
+root_domain = ".web.maze.localhost"
+index = "index.html"
+
+[admin]
+api_bind_addr = "[::]:3903"
+admin_token = "${GARAGE_ADMIN_TOKEN}"
+metrics_token = "${GARAGE_METRICS_TOKEN}"

migrations/20250420185217_init_migration.sql

@@ -10,6 +10,14 @@ CREATE TABLE IF NOT EXISTS "songQueue" (
     user_id UUID NULL
 );
 
+CREATE TABLE IF NOT EXISTS "songQueueData" (
+    id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
+    file_key TEXT NOT NULL,
+    bucket TEXT NOT NULL,
+    region TEXT NOT NULL,
+    song_queue_id UUID NOT NULL
+);
+
 -- Table to store queued metadata
 CREATE TABLE IF NOT EXISTS "metadataQueue" (
     id UUID PRIMARY KEY DEFAULT gen_random_uuid(),

src/auth/mod.rs

@@ -36,11 +36,11 @@ pub async fn auth<B>(
         (StatusCode::UNAUTHORIZED, Json(json_error))
     })?;
 
-    let secret_key = icarus_envy::environment::get_secret_main_key().await.value;
+    let secret_key = sienvy::environment::get_secret_main_key().value;
 
     let mut validation = Validation::new(jsonwebtoken::Algorithm::HS256);
-    validation.set_audience(&["icarus"]); // Must match exactly what's in the token
-    let _claims = decode::<icarus_models::token::UserClaims>(
+    validation.set_audience(&["soaricarus"]);
+    let _claims = decode::<simodels::token::UserClaims>(
         &token,
         &DecodingKey::from_secret(secret_key.as_ref()),
         &validation,

src/callers/coverart.rs

@@ -20,7 +20,7 @@ pub mod response {
         #[derive(Debug, Default, serde::Deserialize, serde::Serialize, utoipa::ToSchema)]
         pub struct Response {
             pub message: String,
-            pub data: Vec<icarus_models::coverart::CoverArt>,
+            pub data: Vec<simodels::coverart::CoverArt>,
         }
     }
 
@@ -28,7 +28,7 @@ pub mod response {
         #[derive(Debug, Default, serde::Deserialize, serde::Serialize, utoipa::ToSchema)]
         pub struct Response {
             pub message: String,
-            pub data: Vec<icarus_models::coverart::CoverArt>,
+            pub data: Vec<simodels::coverart::CoverArt>,
         }
     }
 }
@@ -68,21 +68,21 @@ pub mod endpoint {
                 let song_id = payload.song_id;
                 match crate::repo::song::get_song(&pool, &song_id).await {
                     Ok(song) => {
-                        let directory = icarus_envy::environment::get_root_directory().await.value;
+                        let directory = sienvy::environment::get_root_directory().value;
                         let file_type =
-                            icarus_meta::detection::coverart::file_type_from_data(&data).unwrap();
+                            simeta::detection::coverart::file_type_from_data(&data).unwrap();
                         let coverart_type = if file_type.file_type
-                            == icarus_meta::detection::coverart::constants::JPEG_TYPE
+                            == simeta::detection::coverart::constants::JPEG_TYPE
                         {
-                            icarus_models::types::CoverArtType::JpegExtension
+                            simodels::types::CoverArtType::JpegExtension
                         } else if file_type.file_type
-                            == icarus_meta::detection::coverart::constants::JPG_TYPE
+                            == simeta::detection::coverart::constants::JPG_TYPE
                         {
-                            icarus_models::types::CoverArtType::JpgExtension
+                            simodels::types::CoverArtType::JpgExtension
                         } else if file_type.file_type
-                            == icarus_meta::detection::coverart::constants::PNG_TYPE
+                            == simeta::detection::coverart::constants::PNG_TYPE
                         {
-                            icarus_models::types::CoverArtType::PngExtension
+                            simodels::types::CoverArtType::PngExtension
                         } else {
                             response.message = String::from("Invalid CoverArt type");
                             return (
@@ -91,13 +91,11 @@ pub mod endpoint {
                             );
                         };
                         let filename =
-                            icarus_models::coverart::generate_filename(coverart_type, true)
-                                .unwrap();
+                            simodels::coverart::generate_filename(coverart_type, true).unwrap();
 
-                        let mut coverart =
-                            icarus_models::coverart::init::init_coverart_dir_and_filename(
-                                &directory, &filename,
-                            );
+                        let mut coverart = simodels::coverart::init::init_coverart_dir_and_filename(
+                            &directory, &filename,
+                        );
                         coverart.title = song.album.clone();
                         coverart.file_type = file_type.file_type;
                         coverart.data = data;
@@ -200,23 +198,23 @@ pub mod endpoint {
         axum::extract::Path(id): axum::extract::Path<uuid::Uuid>,
     ) -> (axum::http::StatusCode, axum::response::Response) {
         match repo::coverart::get_coverart(&pool, &id).await {
-            Ok(coverart) => match icarus_models::coverart::io::to_data(&coverart) {
+            Ok(coverart) => match simodels::coverart::io::to_data(&coverart) {
                 Ok(data) => {
                     let (file_type, img_type) =
-                        match icarus_meta::detection::coverart::file_type_from_data(&data) {
+                        match simeta::detection::coverart::file_type_from_data(&data) {
                             Ok(file_type) => {
                                 if file_type.file_type
-                                    == icarus_meta::detection::coverart::constants::JPEG_TYPE
+                                    == simeta::detection::coverart::constants::JPEG_TYPE
                                 {
-                                    (file_type, icarus_models::types::CoverArtType::JpegExtension)
+                                    (file_type, simodels::types::CoverArtType::JpegExtension)
                                 } else if file_type.file_type
-                                    == icarus_meta::detection::coverart::constants::JPG_TYPE
+                                    == simeta::detection::coverart::constants::JPG_TYPE
                                 {
-                                    (file_type, icarus_models::types::CoverArtType::JpgExtension)
+                                    (file_type, simodels::types::CoverArtType::JpgExtension)
                                 } else if file_type.file_type
-                                    == icarus_meta::detection::coverart::constants::PNG_TYPE
+                                    == simeta::detection::coverart::constants::PNG_TYPE
                                 {
-                                    (file_type, icarus_models::types::CoverArtType::PngExtension)
+                                    (file_type, simodels::types::CoverArtType::PngExtension)
                                 } else {
                                     return (
                                         axum::http::StatusCode::INTERNAL_SERVER_ERROR,
@@ -235,8 +233,7 @@ pub mod endpoint {
                     let bytes = axum::body::Bytes::from(data);
                     let mut response = bytes.into_response();
                     let headers = response.headers_mut();
-                    let filename =
-                        icarus_models::coverart::generate_filename(img_type, true).unwrap();
+                    let filename = simodels::coverart::generate_filename(img_type, true).unwrap();
                     headers.insert(
                         axum::http::header::CONTENT_TYPE,
                         file_type.mime.parse().unwrap(),

src/callers/queue/coverart.rs

@@ -102,9 +102,9 @@ pub mod response {
 mod helper {
     pub fn is_coverart_file_type_valid(file_type: &String) -> bool {
         let valid_file_types = vec![
-            String::from(icarus_meta::detection::coverart::constants::JPEG_TYPE),
-            String::from(icarus_meta::detection::coverart::constants::JPG_TYPE),
-            String::from(icarus_meta::detection::coverart::constants::PNG_TYPE),
+            String::from(simeta::detection::coverart::constants::JPEG_TYPE),
+            String::from(simeta::detection::coverart::constants::JPG_TYPE),
+            String::from(simeta::detection::coverart::constants::PNG_TYPE),
         ];
 
         for valid_file_type in valid_file_types {
@@ -150,18 +150,17 @@ pub mod endpoint {
                 let content_type = field.content_type().unwrap().to_string();
                 let data = field.bytes().await.unwrap();
                 let raw_data = data.to_vec();
-                let file_type =
-                    match icarus_meta::detection::coverart::file_type_from_data(&raw_data) {
-                        Ok(file_type) => file_type,
-                        Err(err) => {
-                            eprintln!("Error: {err:?}");
-                            response.message = err.to_string();
-                            return (
-                                axum::http::StatusCode::INTERNAL_SERVER_ERROR,
-                                axum::Json(response),
-                            );
-                        }
-                    };
+                let file_type = match simeta::detection::coverart::file_type_from_data(&raw_data) {
+                    Ok(file_type) => file_type,
+                    Err(err) => {
+                        eprintln!("Error: {err:?}");
+                        response.message = err.to_string();
+                        return (
+                            axum::http::StatusCode::INTERNAL_SERVER_ERROR,
+                            axum::Json(response),
+                        );
+                    }
+                };
 
                 if !super::helper::is_coverart_file_type_valid(&file_type.file_type) {
                     response.message = format!("CoverArt file type not supported: {file_type:?}");
@@ -318,8 +317,7 @@ pub mod endpoint {
     ) -> (axum::http::StatusCode, axum::response::Response) {
         match repo::coverart::get_coverart_queue_data_with_id(&pool, &id).await {
             Ok(data) => {
-                let file_type =
-                    icarus_meta::detection::coverart::file_type_from_data(&data).unwrap();
+                let file_type = simeta::detection::coverart::file_type_from_data(&data).unwrap();
                 let bytes = axum::body::Bytes::from(data);
                 let mut response = bytes.into_response();
                 let headers = response.headers_mut();
@@ -329,25 +327,20 @@ pub mod endpoint {
                 );
 
                 let coverart_type = if file_type.file_type
-                    == icarus_meta::detection::coverart::constants::JPEG_TYPE
+                    == simeta::detection::coverart::constants::JPEG_TYPE
                 {
-                    icarus_models::types::CoverArtType::JpegExtension
-                } else if file_type.file_type
-                    == icarus_meta::detection::coverart::constants::JPG_TYPE
-                {
-                    icarus_models::types::CoverArtType::JpgExtension
-                } else if file_type.file_type
-                    == icarus_meta::detection::coverart::constants::PNG_TYPE
-                {
-                    icarus_models::types::CoverArtType::PngExtension
+                    simodels::types::CoverArtType::JpegExtension
+                } else if file_type.file_type == simeta::detection::coverart::constants::JPG_TYPE {
+                    simodels::types::CoverArtType::JpgExtension
+                } else if file_type.file_type == simeta::detection::coverart::constants::PNG_TYPE {
+                    simodels::types::CoverArtType::PngExtension
                 } else {
                     return (
                         axum::http::StatusCode::INTERNAL_SERVER_ERROR,
                         axum::response::Response::default(),
                     );
                 };
-                let filename =
-                    icarus_models::coverart::generate_filename(coverart_type, true).unwrap();
+                let filename = simodels::coverart::generate_filename(coverart_type, true).unwrap();
                 headers.insert(
                     axum::http::header::CONTENT_DISPOSITION,
                     format!("attachment; filename=\"{filename}\"")

src/callers/queue/song.rs

@@ -97,9 +97,9 @@ pub mod response {
 }
 
 pub async fn is_song_valid(data: &[u8]) -> Result<bool, std::io::Error> {
-    match icarus_meta::detection::song::file_type_from_data(data) {
+    match simeta::detection::song::file_type_from_data(data) {
         Ok(file_type) => {
-            if file_type.file_type == icarus_meta::detection::song::constants::FLAC_TYPE {
+            if file_type.file_type == simeta::detection::song::constants::FLAC_TYPE {
                 Ok(true)
             } else {
                 Ok(false)
@@ -156,6 +156,7 @@ pub mod endpoint {
                     );
 
                     let raw_data: Vec<u8> = data.to_vec();
+                    let copied_raw_data = data.to_vec();
                     match super::is_song_valid(&raw_data).await {
                         Ok(valid) => {
                             if valid {
@@ -169,6 +170,80 @@ pub mod endpoint {
                                 {
                                     Ok(queued_song) => {
                                         results.push(queued_song);
+                                        println!("Uploading to bucket");
+
+                                        let s3_endpoint_url =
+                                            sienvy::environment::get_env("S3_ENDPOINT_URL");
+                                        let bucket_name =
+                                            sienvy::environment::get_env("S3_BUCKET_NAME");
+                                        let region =
+                                            sienvy::environment::get_env("GARAGE_S3_REGION");
+                                        let access_key_id = sienvy::environment::get_env(
+                                            "GARAGE_DEFAULT_ACCESS_KEY",
+                                        );
+                                        let secret_key = sienvy::environment::get_env(
+                                            "GARAGE_DEFAULT_SECRET_KEY",
+                                        );
+
+                                        let lab_config = labyrinth::config::Config {
+                                            url: s3_endpoint_url.value,
+                                            bucket: bucket_name.value,
+                                            region: region.value,
+                                            access_key_id: access_key_id.value,
+                                            secret_key: secret_key.value,
+                                        };
+
+                                        println!("Labyrinth config: {lab_config:?}");
+
+                                        let lr = labyrinth::Labyrinth { config: lab_config };
+                                        let data = labyrinth::Data {
+                                            raw_data: copied_raw_data,
+                                            ..Default::default()
+                                        };
+                                        let filename = simodels::song::generate_filename(
+                                            simodels::types::MusicType::FlacExtension,
+                                            true,
+                                        )
+                                        .unwrap();
+                                        println!("Filename: {filename:?}");
+                                        let file_path = format!("queued/song/{filename}");
+                                        println!("Path: {file_path:?}");
+
+                                        match lr.upload(&file_path, &data).await {
+                                            Ok(res) => {
+                                                println!("Result: {res:?}");
+
+                                                println!("Saving to db");
+
+                                                match repo::data::insert(
+                                                    &pool,
+                                                    &file_path,
+                                                    &lr.config.bucket,
+                                                    &lr.config.region,
+                                                    &queued_song,
+                                                )
+                                                .await
+                                                {
+                                                    Ok(_id) => {}
+                                                    Err(err) => {
+                                                        eprintln!("Error: {err:?}");
+                                                        return (axum::http::StatusCode::INTERNAL_SERVER_ERROR, axum::Json(response));
+                                                    }
+                                                }
+                                            }
+                                            Err(err) => match err {
+                                                labyrinth::Error::Info(err_str) => {
+                                                    eprintln!("Error: {:?}", err_str);
+                                                    response.message = err_str.to_string();
+                                                    return (axum::http::StatusCode::INTERNAL_SERVER_ERROR, axum::Json(response));
+                                                }
+                                                labyrinth::Error::SError(err_s) => {
+                                                    eprintln!("Error: {:?}", err_s);
+                                                    response.message = err_s.to_string();
+                                                    return (axum::http::StatusCode::INTERNAL_SERVER_ERROR, axum::Json(response));
+                                                }
+                                            },
+                                        }
                                     }
                                     Err(err) => {
                                         response.message = err.to_string();

src/callers/song.rs

@@ -36,8 +36,8 @@ pub mod request {
                     || !self.song_queue_id.is_nil()
             }
 
-            pub fn to_song(&self) -> icarus_models::song::Song {
-                icarus_models::song::Song {
+            pub fn to_song(&self) -> simodels::song::Song {
+                simodels::song::Song {
                     id: uuid::Uuid::nil(),
                     title: self.title.clone(),
                     artist: self.artist.clone(),
@@ -71,7 +71,7 @@ pub mod response {
         #[derive(Debug, Default, serde::Deserialize, serde::Serialize, utoipa::ToSchema)]
         pub struct Response {
             pub message: String,
-            pub data: Vec<icarus_models::song::Song>,
+            pub data: Vec<simodels::song::Song>,
         }
     }
 
@@ -79,15 +79,15 @@ pub mod response {
         #[derive(Debug, Default, serde::Deserialize, serde::Serialize, utoipa::ToSchema)]
         pub struct Response {
             pub message: String,
-            pub data: Vec<icarus_models::song::Song>,
+            pub data: Vec<simodels::song::Song>,
         }
     }
 
     pub mod delete_song {
         #[derive(Debug, Default, serde::Deserialize, serde::Serialize, utoipa::ToSchema)]
         pub struct SongAndCoverArt {
-            pub song: icarus_models::song::Song,
-            pub coverart: icarus_models::coverart::CoverArt,
+            pub song: simodels::song::Song,
+            pub coverart: simodels::coverart::CoverArt,
         }
 
         #[derive(Debug, Default, serde::Deserialize, serde::Serialize, utoipa::ToSchema)]
@@ -134,12 +134,10 @@ pub mod endpoint {
 
         if payload.is_valid() {
             let mut song = payload.to_song();
-            song.filename = icarus_models::song::generate_filename(
-                icarus_models::types::MusicType::FlacExtension,
-                true,
-            )
-            .unwrap();
-            song.directory = icarus_envy::environment::get_root_directory().await.value;
+            song.filename =
+                simodels::song::generate_filename(simodels::types::MusicType::FlacExtension, true)
+                    .unwrap();
+            song.directory = sienvy::environment::get_root_directory().value;
 
             match repo_queue::song::get_data(&pool, &payload.song_queue_id).await {
                 Ok(data) => {
@@ -340,7 +338,7 @@ pub mod endpoint {
         axum::extract::Path(id): axum::extract::Path<uuid::Uuid>,
     ) -> (axum::http::StatusCode, axum::response::Response) {
         match repo::song::get_song(&pool, &id).await {
-            Ok(song) => match icarus_models::song::io::to_data(&song) {
+            Ok(song) => match simodels::song::io::to_data(&song) {
                 Ok(data) => {
                     let bytes = axum::body::Bytes::from(data);
                     let mut response = bytes.into_response();

src/config/init.rs

@@ -28,20 +28,18 @@ mod cors {
                 axum::http::Method::POST,
                 axum::http::Method::PUT,
                 axum::http::Method::DELETE,
-            ]) // Specify allowed methods:cite[2]
+            ])
             .allow_headers([
                 axum::http::header::CONTENT_TYPE,
                 axum::http::header::AUTHORIZATION,
-            ]) // Specify allowed headers:cite[2]
-            .allow_credentials(true) // If you need to send cookies or authentication headers:cite[2]
+            ])
+            .allow_credentials(true)
             .max_age(std::time::Duration::from_secs(3600)); // Cache the preflight response for 1 hour:cite[2]
 
-        // Dynamically set the allowed origin based on the environment
-        match std::env::var(icarus_envy::keys::APP_ENV).as_deref() {
+        match std::env::var(sienvy::keys::APP_ENV).as_deref() {
             Ok("production") => {
-                // In production, allow only your specific, trusted origins
-                let allowed_origins_env = icarus_envy::environment::get_allowed_origins().await;
-                match icarus_envy::utility::delimitize(&allowed_origins_env) {
+                let allowed_origins_env = sienvy::environment::get_allowed_origins();
+                match sienvy::utility::delimitize(&allowed_origins_env) {
                     Ok(alwd) => {
                         let allowed_origins: Vec<axum::http::HeaderValue> = alwd
                             .into_iter()
@@ -55,15 +53,14 @@ mod cors {
                     }
                 }
             }
-            _ => {
-                // Development (default): Allow localhost origins
-                cors.allow_origin(vec![
-                    "http://localhost:8000".parse().unwrap(),
-                    "http://127.0.0.1:8000".parse().unwrap(),
-                    "http://localhost:4200".parse().unwrap(),
-                    "http://127.0.0.1:4200".parse().unwrap(),
-                ])
-            }
+            _ => cors.allow_origin(vec![
+                "http://localhost:8000".parse().unwrap(),
+                "http://127.0.0.1:8000".parse().unwrap(),
+                "http://localhost:8001".parse().unwrap(),
+                "http://127.0.0.1:8001".parse().unwrap(),
+                "http://localhost:4200".parse().unwrap(),
+                "http://127.0.0.1:4200".parse().unwrap(),
+            ]),
         }
     }
 }
@@ -84,7 +81,7 @@ mod cors {
             coverart_queue_responses::wipe_data_from_coverart_queue::Response, coverart_responses::get_coverart::Response,
             metadata_queue_responses::queue_metadata::Response, metadata_queue_responses::fetch_metadata::Response)),
     tags(
-        (name = "Icarus API", description = "Web API to manage music")
+        (name = "soaricarus API", description = "Web API to manage music")
     )
 )]
 struct ApiDoc;

src/db/mod.rs

@@ -5,7 +5,7 @@ pub mod connection_settings {
 }
 
 pub async fn create_pool() -> Result<sqlx::PgPool, sqlx::Error> {
-    let database_url = icarus_envy::environment::get_db_url().await.value;
+    let database_url = sienvy::environment::get_db_url().value;
     println!("Database url: {database_url}");
 
     PgPoolOptions::new()
@@ -15,8 +15,6 @@ pub async fn create_pool() -> Result<sqlx::PgPool, sqlx::Error> {
 }
 
 pub async fn migrations(pool: &sqlx::PgPool) {
-    // Run migrations using the sqlx::migrate! macro
-    // Assumes your migrations are in a ./migrations folder relative to Cargo.toml
     sqlx::migrate!("./migrations")
         .run(pool)
         .await

src/main.rs

@@ -25,9 +25,6 @@ async fn main() {
 mod tests {
     use std::io::Write;
 
-    use common_multipart_rfc7578::client::multipart::{
-        Body as MultipartBody, Form as MultipartForm,
-    };
     use tower::ServiceExt;
 
     use crate::db;
@@ -38,7 +35,7 @@ mod tests {
         pub const LIMIT: usize = 6;
 
         pub async fn get_pool() -> Result<sqlx::PgPool, sqlx::Error> {
-            let tm_db_url = icarus_envy::environment::get_db_url().await.value;
+            let tm_db_url = sienvy::environment::get_db_url().value;
             let tm_options = sqlx::postgres::PgConnectOptions::from_str(&tm_db_url).unwrap();
             sqlx::PgPool::connect_with(tm_options).await
         }
@@ -51,7 +48,7 @@ mod tests {
         }
 
         pub async fn connect_to_db(db_name: &str) -> Result<sqlx::PgPool, sqlx::Error> {
-            let db_url = icarus_envy::environment::get_db_url().await.value;
+            let db_url = sienvy::environment::get_db_url().value;
             let options = sqlx::postgres::PgConnectOptions::from_str(&db_url)?.database(db_name);
             sqlx::PgPool::connect_with(options).await
         }
@@ -61,7 +58,10 @@ mod tests {
             db_name: &str,
         ) -> Result<(), sqlx::Error> {
             let create_query = format!("CREATE DATABASE {}", db_name);
-            match sqlx::query(&create_query).execute(template_pool).await {
+            match sqlx::query(sqlx::AssertSqlSafe(create_query))
+                .execute(template_pool)
+                .await
+            {
                 Ok(_) => Ok(()),
                 Err(e) => Err(e),
             }
@@ -73,12 +73,14 @@ mod tests {
             db_name: &str,
         ) -> Result<(), sqlx::Error> {
             let drop_query = format!("DROP DATABASE IF EXISTS {} WITH (FORCE)", db_name);
-            sqlx::query(&drop_query).execute(template_pool).await?;
+            sqlx::query(sqlx::AssertSqlSafe(drop_query))
+                .execute(template_pool)
+                .await?;
             Ok(())
         }
 
         pub async fn get_database_name() -> Result<String, Box<dyn std::error::Error>> {
-            let database_url = icarus_envy::environment::get_db_url().await.value;
+            let database_url = sienvy::environment::get_db_url().value;
             let parsed_url = url::Url::parse(&database_url)?;
 
             if parsed_url.scheme() == "postgres" || parsed_url.scheme() == "postgresql" {
@@ -106,13 +108,16 @@ mod tests {
     }
 
     mod init {
+        use std::time::Duration;
+
         pub async fn app(pool: sqlx::PgPool) -> axum::Router {
             crate::config::init::routes()
                 .await
                 .layer(axum::Extension(pool))
                 .layer(axum::extract::DefaultBodyLimit::max(1024 * 1024 * 1024))
-                .layer(tower_http::timeout::TimeoutLayer::new(
-                    std::time::Duration::from_secs(300),
+                .layer(tower_http::timeout::TimeoutLayer::with_status_code(
+                    axum::http::StatusCode::OK,
+                    Duration::from_secs(300),
                 ))
         }
     }
@@ -141,25 +146,25 @@ mod tests {
     pub fn token_fields() -> (String, String, String) {
         (
             String::from("What a twist!"),
-            String::from("icarus_test"),
-            String::from("icarus"),
+            String::from("soaricarus_test"),
+            String::from("soaricarus"),
         )
     }
 
     pub const TEST_USER_ID: uuid::Uuid = uuid::uuid!("cc938368-615a-4694-b2ca-6e122fa31c52");
 
     pub async fn test_token() -> Result<String, josekit::JoseError> {
-        let key: String = icarus_envy::environment::get_secret_main_key().await.value;
+        let key: String = sienvy::environment::get_secret_main_key().value;
         let (message, issuer, audience) = token_fields();
 
-        let token_resource = icarus_models::token::TokenResource {
+        let token_resource = simodels::token::TokenResource {
             message: message,
             issuer: issuer,
             audiences: vec![audience],
             id: TEST_USER_ID,
         };
 
-        match icarus_models::token::create_token(&key, &token_resource, time::Duration::hours(1)) {
+        match simodels::token::create_token(&key, &token_resource, time::Duration::hours(1)) {
             Ok((access_token, _some_time)) => Ok(access_token),
             Err(err) => Err(err),
         }
@@ -185,269 +190,318 @@ mod tests {
 
         pub async fn song_queue_req(
             app: &axum::Router,
-        ) -> Result<axum::response::Response, std::convert::Infallible> {
+        ) -> Result<axum::response::Response, axum::http::Error> {
             // Create multipart form
-            let mut form = MultipartForm::default();
-            let _ = form.add_file("flac", "tests/I/track01.flac");
-
-            // Create request
-            let content_type = form.content_type();
-            let body = MultipartBody::from(form);
-            let req = axum::http::Request::builder()
-                .method(axum::http::Method::POST)
-                .uri(crate::callers::queue::endpoints::QUEUESONG)
-                .header(axum::http::header::CONTENT_TYPE, content_type)
-                .header(
-                    axum::http::header::AUTHORIZATION,
-                    super::bearer_auth().await,
-                )
-                .body(axum::body::Body::from_stream(body))
-                .unwrap();
-            app.clone().oneshot(req).await
+            match run_post(
+                Some(ReqBody::Multipart((
+                    "flac".to_string(),
+                    "tests/I/track01.flac".to_string(),
+                ))),
+                crate::callers::queue::endpoints::QUEUESONG,
+                axum::http::Method::POST,
+                true,
+            )
+            .await
+            {
+                Ok(request) => match app.clone().oneshot(request).await {
+                    Ok(response) => Ok(response),
+                    Err(err) => Err(axum::http::Error::from(err)),
+                },
+                Err(err) => Err(err),
+            }
         }
 
         pub async fn song_queue_link_req(
             app: &axum::Router,
             song_queue_id: &uuid::Uuid,
             user_id: &uuid::Uuid,
-        ) -> Result<axum::response::Response, std::convert::Infallible> {
+        ) -> Result<axum::response::Response, axum::http::Error> {
             let payload =
                 super::payload_data::link_user_to_queued_song(song_queue_id, user_id).await;
 
-            let req = axum::http::Request::builder()
-                .method(axum::http::Method::PATCH)
-                .uri(crate::callers::queue::endpoints::QUEUESONGLINKUSERID)
-                .header(axum::http::header::CONTENT_TYPE, "application/json")
-                .header(
-                    axum::http::header::AUTHORIZATION,
-                    super::bearer_auth().await,
-                )
-                .body(axum::body::Body::from(payload.to_string()))
-                .unwrap();
-
-            app.clone().oneshot(req).await
+            match run_post(
+                Some(ReqBody::Json(payload)),
+                crate::callers::queue::endpoints::QUEUESONGLINKUSERID,
+                axum::http::Method::PATCH,
+                true,
+            )
+            .await
+            {
+                Ok(request) => match app.clone().oneshot(request).await {
+                    Ok(response) => Ok(response),
+                    Err(err) => Err(axum::http::Error::from(err)),
+                },
+                Err(err) => Err(err),
+            }
         }
 
         pub async fn fetch_queue_req(
             app: &axum::Router,
-        ) -> Result<axum::response::Response, std::convert::Infallible> {
-            let fetch_req = axum::http::Request::builder()
-                .method(axum::http::Method::GET)
-                .uri(crate::callers::queue::endpoints::NEXTQUEUESONG)
-                .header(axum::http::header::CONTENT_TYPE, "application/json")
-                .header(
-                    axum::http::header::AUTHORIZATION,
-                    super::bearer_auth().await,
-                )
-                .body(axum::body::Body::empty())
-                .unwrap();
-            app.clone().oneshot(fetch_req).await
+        ) -> Result<axum::response::Response, axum::http::Error> {
+            match run_post(
+                None,
+                crate::callers::queue::endpoints::NEXTQUEUESONG,
+                axum::http::Method::GET,
+                false,
+            )
+            .await
+            {
+                Ok(request) => match app.clone().oneshot(request).await {
+                    Ok(response) => Ok(response),
+                    Err(err) => Err(axum::http::Error::from(err)),
+                },
+                Err(err) => Err(err),
+            }
         }
 
         pub async fn fetch_metadata_queue_req(
             app: &axum::Router,
             id: &uuid::Uuid,
-        ) -> Result<axum::response::Response, std::convert::Infallible> {
+        ) -> Result<axum::response::Response, axum::http::Error> {
             let uri = format!(
                 "{}?id={}",
                 crate::callers::queue::endpoints::QUEUEMETADATA,
                 id
             );
 
-            let req = axum::http::Request::builder()
-                .method(axum::http::Method::GET)
-                .uri(uri)
-                .header(axum::http::header::CONTENT_TYPE, "application/json")
-                .header(
-                    axum::http::header::AUTHORIZATION,
-                    super::bearer_auth().await,
-                )
-                .body(axum::body::Body::empty())
-                .unwrap();
-
-            app.clone().oneshot(req).await
+            match run_post(None, &uri, axum::http::Method::GET, false).await {
+                Ok(request) => match app.clone().oneshot(request).await {
+                    Ok(response) => Ok(response),
+                    Err(err) => Err(axum::http::Error::from(err)),
+                },
+                Err(err) => Err(err),
+            }
         }
 
         pub async fn fetch_queue_data_req(
             app: &axum::Router,
             id: &uuid::Uuid,
-        ) -> Result<axum::response::Response, std::convert::Infallible> {
+        ) -> Result<axum::response::Response, axum::http::Error> {
             let raw_uri = String::from(crate::callers::queue::endpoints::QUEUESONGDATA);
             let end_index = raw_uri.len() - 4;
             let mut uri: String = (&raw_uri[..end_index]).to_string();
             uri += &id.to_string();
-            let req = axum::http::Request::builder()
-                .method(axum::http::Method::GET)
-                .uri(uri)
-                .header(
-                    axum::http::header::CONTENT_TYPE,
-                    icarus_meta::detection::song::constants::mime::FLAC,
-                )
-                .header(
-                    axum::http::header::AUTHORIZATION,
-                    super::bearer_auth().await,
-                )
-                .body(axum::body::Body::empty())
-                .unwrap();
 
-            app.clone().oneshot(req).await
+            match run_post(None, &uri, axum::http::Method::GET, false).await {
+                Ok(request) => match app.clone().oneshot(request).await {
+                    Ok(response) => Ok(response),
+                    Err(err) => Err(axum::http::Error::from(err)),
+                },
+                Err(err) => Err(err),
+            }
         }
 
         pub async fn upload_coverart_queue_req(
             app: &axum::Router,
-        ) -> Result<axum::response::Response, std::convert::Infallible> {
-            let mut form = MultipartForm::default();
-            let _ = form.add_file(
-                icarus_meta::detection::coverart::constants::JPEG_TYPE,
-                "tests/I/Coverart-1.jpg",
-            );
-
-            // Create request
-            let content_type = form.content_type();
-            let body = MultipartBody::from(form);
-
-            let req = axum::http::Request::builder()
-                .method(axum::http::Method::POST)
-                .uri(crate::callers::queue::endpoints::QUEUECOVERART)
-                .header(axum::http::header::CONTENT_TYPE, content_type)
-                .header(
-                    axum::http::header::AUTHORIZATION,
-                    super::bearer_auth().await,
-                )
-                .body(axum::body::Body::from_stream(body))
-                .unwrap();
-
-            app.clone().oneshot(req).await
+        ) -> Result<axum::response::Response, axum::http::Error> {
+            match run_post(
+                Some(ReqBody::Multipart((
+                    simeta::detection::coverart::constants::JPEG_TYPE.to_string(),
+                    "tests/I/Coverart-1.jpg".to_string(),
+                ))),
+                crate::callers::queue::endpoints::QUEUECOVERART,
+                axum::http::Method::POST,
+                true,
+            )
+            .await
+            {
+                Ok(request) => match app.clone().oneshot(request).await {
+                    Ok(response) => Ok(response),
+                    Err(err) => Err(axum::http::Error::from(err)),
+                },
+                Err(err) => Err(err),
+            }
         }
 
         pub async fn queue_metadata_req(
             app: &axum::Router,
             song_queue_id: &uuid::Uuid,
-        ) -> Result<axum::response::Response, std::convert::Infallible> {
+        ) -> Result<axum::response::Response, axum::http::Error> {
             let payload = super::payload_data::queue_metadata(&song_queue_id).await;
 
-            let req = axum::http::Request::builder()
-                .method(axum::http::Method::POST)
-                .uri(crate::callers::queue::endpoints::QUEUEMETADATA)
-                .header(axum::http::header::CONTENT_TYPE, "application/json")
-                .header(
-                    axum::http::header::AUTHORIZATION,
-                    super::bearer_auth().await,
-                )
-                .body(axum::body::Body::from(payload.to_string()))
-                .unwrap();
-
-            app.clone().oneshot(req).await
+            match run_post(
+                Some(ReqBody::Json(payload)),
+                crate::callers::queue::endpoints::QUEUEMETADATA,
+                axum::http::Method::POST,
+                true,
+            )
+            .await
+            {
+                Ok(request) => match app.clone().oneshot(request).await {
+                    Ok(response) => Ok(response),
+                    Err(err) => Err(axum::http::Error::from(err)),
+                },
+                Err(err) => Err(err),
+            }
         }
 
         pub async fn coverart_queue_song_queue_link_req(
             app: &axum::Router,
             coverart_id: &uuid::Uuid,
             song_queue_id: &uuid::Uuid,
-        ) -> Result<axum::response::Response, std::convert::Infallible> {
+        ) -> Result<axum::response::Response, axum::http::Error> {
             let payload = super::payload_data::link_queued_coverart_to_queued_song(
                 song_queue_id,
                 coverart_id,
             )
             .await;
-            let req = axum::http::Request::builder()
-                .method(axum::http::Method::PATCH)
-                .uri(crate::callers::queue::endpoints::QUEUECOVERARTLINK)
-                .header(axum::http::header::CONTENT_TYPE, "application/json")
-                .header(
-                    axum::http::header::AUTHORIZATION,
-                    super::bearer_auth().await,
-                )
-                .body(axum::body::Body::from(payload.to_string()))
-                .unwrap();
 
-            app.clone().oneshot(req).await
+            match run_post(
+                Some(ReqBody::Json(payload)),
+                crate::callers::queue::endpoints::QUEUECOVERARTLINK,
+                axum::http::Method::PATCH,
+                true,
+            )
+            .await
+            {
+                Ok(request) => match app.clone().oneshot(request).await {
+                    Ok(response) => Ok(response),
+                    Err(err) => Err(axum::http::Error::from(err)),
+                },
+                Err(err) => Err(err),
+            }
         }
 
         pub async fn create_coverart_req(
             app: &axum::Router,
             song_id: &uuid::Uuid,
             coverart_id: &uuid::Uuid,
-        ) -> Result<axum::response::Response, std::convert::Infallible> {
+        ) -> Result<axum::response::Response, axum::http::Error> {
             let payload = super::payload_data::create_coverart(song_id, coverart_id).await;
 
-            let req = axum::http::Request::builder()
-                .method(axum::http::Method::POST)
-                .uri(crate::callers::endpoints::CREATECOVERART)
-                .header(axum::http::header::CONTENT_TYPE, "application/json")
-                .header(
-                    axum::http::header::AUTHORIZATION,
-                    super::bearer_auth().await,
-                )
-                .body(axum::body::Body::from(payload.to_string()))
-                .unwrap();
-            app.clone().oneshot(req).await
+            match run_post(
+                Some(ReqBody::Json(payload)),
+                crate::callers::endpoints::CREATECOVERART,
+                axum::http::Method::POST,
+                true,
+            )
+            .await
+            {
+                Ok(request) => match app.clone().oneshot(request).await {
+                    Ok(response) => Ok(response),
+                    Err(err) => Err(axum::http::Error::from(err)),
+                },
+                Err(err) => Err(err),
+            }
         }
 
         pub async fn create_song_req(
             app: &axum::Router,
             song_queue_id: &uuid::Uuid,
             user_id: &uuid::Uuid,
-        ) -> Result<axum::response::Response, std::convert::Infallible> {
+        ) -> Result<axum::response::Response, axum::http::Error> {
             let payload = super::payload_data::create_song(song_queue_id, user_id).await;
 
-            let req = axum::http::Request::builder()
-                .method(axum::http::Method::POST)
-                .uri(crate::callers::endpoints::CREATESONG)
-                .header(axum::http::header::CONTENT_TYPE, "application/json")
-                .header(
-                    axum::http::header::AUTHORIZATION,
-                    super::bearer_auth().await,
-                )
-                .body(axum::body::Body::from(payload.to_string()))
-                .unwrap();
-
-            app.clone().oneshot(req).await
+            match run_post(
+                Some(ReqBody::Json(payload)),
+                crate::callers::endpoints::CREATESONG,
+                axum::http::Method::POST,
+                true,
+            )
+            .await
+            {
+                Ok(request) => match app.clone().oneshot(request).await {
+                    Ok(response) => Ok(response),
+                    Err(err) => Err(axum::http::Error::from(err)),
+                },
+                Err(err) => Err(err),
+            }
         }
 
         pub async fn update_song_queue_status_req(
             app: &axum::Router,
             song_queue_id: &uuid::Uuid,
-        ) -> Result<axum::response::Response, std::convert::Infallible> {
+        ) -> Result<axum::response::Response, axum::http::Error> {
             let payload =
                 super::payload_data::update_song_queue_status_to_ready(song_queue_id).await;
 
-            let req = axum::http::Request::builder()
-                .method(axum::http::Method::PATCH)
-                .uri(crate::callers::queue::endpoints::QUEUESONG)
-                .header(axum::http::header::CONTENT_TYPE, "application/json")
-                .header(
-                    axum::http::header::AUTHORIZATION,
-                    super::bearer_auth().await,
-                )
-                .body(axum::body::Body::from(payload.to_string()))
-                .unwrap();
-
-            app.clone().oneshot(req).await
+            match run_post(
+                Some(ReqBody::Json(payload)),
+                crate::callers::queue::endpoints::QUEUESONG,
+                axum::http::Method::PATCH,
+                true,
+            )
+            .await
+            {
+                Ok(request) => match app.clone().oneshot(request).await {
+                    Ok(response) => Ok(response),
+                    Err(err) => Err(axum::http::Error::from(err)),
+                },
+                Err(err) => Err(err),
+            }
         }
 
         pub async fn get_queued_coverart(
             app: &axum::Router,
             coverart_queue_id: &uuid::Uuid,
-        ) -> Result<axum::response::Response, std::convert::Infallible> {
+        ) -> Result<axum::response::Response, axum::http::Error> {
             let uri = format!(
                 "{}?id={}",
                 crate::callers::queue::endpoints::QUEUECOVERART,
                 coverart_queue_id
             );
 
-            let req = axum::http::Request::builder()
-                .method(axum::http::Method::GET)
+            match run_post(None, &uri, axum::http::Method::GET, false).await {
+                Ok(request) => match app.clone().oneshot(request).await {
+                    Ok(response) => Ok(response),
+                    Err(err) => Err(axum::http::Error::from(err)),
+                },
+                Err(err) => Err(err),
+            }
+        }
+
+        pub enum ReqBody {
+            Json(serde_json::Value),
+            Multipart((String, String)),
+        }
+
+        pub async fn run_post(
+            payload: Option<ReqBody>,
+            uri: &str,
+            method: axum::http::Method,
+            has_body: bool,
+        ) -> Result<axum::http::Request<axum::body::Body>, axum::http::Error> {
+            let mut content_type = "application/json; charset=utf-8".to_string();
+            let body = if has_body {
+                assert_eq!(
+                    true,
+                    payload.is_some(),
+                    "Has request body and payload has data"
+                );
+
+                match payload {
+                    Some(p) => match p {
+                        ReqBody::Json(val) => axum::body::Body::from(val.to_string()),
+                        ReqBody::Multipart((t, p)) => {
+                            let mut form = MultipartForm::default();
+                            let _ = form.add_file(t, p);
+
+                            content_type = form.content_type();
+                            let body = MultipartBody::from(form);
+                            axum::body::Body::from_stream(body)
+                        }
+                    },
+                    None => {
+                        eprintln!("This should not empty");
+                        axum::body::Body::empty()
+                    }
+                }
+            } else {
+                axum::body::Body::empty()
+            };
+            match axum::http::Request::builder()
+                .method(method)
                 .uri(uri)
-                .header(axum::http::header::CONTENT_TYPE, "application/json")
+                .header(axum::http::header::CONTENT_TYPE, content_type)
                 .header(
                     axum::http::header::AUTHORIZATION,
                     super::bearer_auth().await,
                 )
-                .body(axum::body::Body::empty())
-                .unwrap();
-
-            app.clone().oneshot(req).await
+                .body(body)
+            {
+                Ok(t) => Ok(t),
+                Err(err) => Err(err),
+            }
         }
     }
 
@@ -455,7 +509,7 @@ mod tests {
         // Flow for queueing song
         pub async fn queue_song_flow(
             app: &axum::Router,
-        ) -> Result<(axum::response::Response, uuid::Uuid), std::convert::Infallible> {
+        ) -> Result<(axum::response::Response, uuid::Uuid), axum::http::Error> {
             match super::request::song_queue_req(&app).await {
                 Ok(response) => {
                     let resp = super::util::get_resp_data::<
@@ -498,6 +552,7 @@ mod tests {
                                         Err(err) => Err(err),
                                     }
                                 }
+                                Err(err) => Err(err),
                             }
                         }
                         Err(err) => Err(err),
@@ -511,7 +566,7 @@ mod tests {
         pub async fn queue_coverart_flow(
             app: &axum::Router,
             song_queue_id: &uuid::Uuid,
-        ) -> Result<axum::response::Response, std::convert::Infallible> {
+        ) -> Result<axum::response::Response, axum::http::Error> {
             match super::request::upload_coverart_queue_req(&app).await {
                 Ok(response) => {
                     let resp = super::util::get_resp_data::<
@@ -547,15 +602,17 @@ mod tests {
                                 Err(err) => Err(err),
                             }
                         }
+                        Err(err) => Err(err),
                     }
                 }
+                Err(err) => Err(err),
             }
         }
 
         // Returns coverart response and song_queue_id
         pub async fn queue_song_and_coverart_flow(
             app: &axum::Router,
-        ) -> Result<(axum::response::Response, uuid::Uuid), std::convert::Infallible> {
+        ) -> Result<(axum::response::Response, uuid::Uuid), axum::http::Error> {
             match queue_song_flow(&app).await {
                 Ok((song_response, user_id)) => {
                     let resp = super::util::get_resp_data::<
@@ -905,10 +962,10 @@ mod tests {
                             let temp_file =
                                 tempfile::tempdir().expect("Could not create test directory");
                             let test_dir = String::from(temp_file.path().to_str().unwrap());
-                            let song = icarus_models::song::Song {
+                            let song = simodels::song::Song {
                                 directory: test_dir,
-                                filename: icarus_models::song::generate_filename(
-                                    icarus_models::types::MusicType::FlacExtension,
+                                filename: simodels::song::generate_filename(
+                                    simodels::types::MusicType::FlacExtension,
                                     true,
                                 )
                                 .unwrap(),
@@ -923,13 +980,6 @@ mod tests {
                             }
                             let songpath = song.song_path().unwrap();
 
-                            let mut form = MultipartForm::default();
-                            let _ = form.add_file("flac", &songpath);
-
-                            // Create request
-                            let content_type = form.content_type();
-                            let body = MultipartBody::from(form);
-
                             let raw_uri =
                                 String::from(crate::callers::queue::endpoints::QUEUESONGUPDATE);
                             let end_index = raw_uri.len() - 5;
@@ -943,16 +993,17 @@ mod tests {
                             match app
                                 .clone()
                                 .oneshot(
-                                    axum::http::Request::builder()
-                                        .method(axum::http::Method::PATCH)
-                                        .uri(uri)
-                                        .header(axum::http::header::CONTENT_TYPE, content_type)
-                                        .header(
-                                            axum::http::header::AUTHORIZATION,
-                                            bearer_auth().await,
-                                        )
-                                        .body(axum::body::Body::from_stream(body))
-                                        .unwrap(),
+                                    request::run_post(
+                                        Some(request::ReqBody::Multipart((
+                                            "flac".to_string(),
+                                            songpath,
+                                        ))),
+                                        &uri,
+                                        axum::http::Method::PATCH,
+                                        true,
+                                    )
+                                    .await
+                                    .unwrap(),
                                 )
                                 .await
                             {
@@ -1433,16 +1484,14 @@ mod tests {
                                 match app
                                     .clone()
                                     .oneshot(
-                                        axum::http::Request::builder()
-                                            .method(axum::http::Method::GET)
-                                            .uri(uri)
-                                            .header(axum::http::header::CONTENT_TYPE, "image/jpeg")
-                                            .header(
-                                                axum::http::header::AUTHORIZATION,
-                                                bearer_auth().await,
-                                            )
-                                            .body(axum::body::Body::empty())
-                                            .unwrap(),
+                                        request::run_post(
+                                            None,
+                                            &uri,
+                                            axum::http::Method::GET,
+                                            false,
+                                        )
+                                        .await
+                                        .unwrap(),
                                     )
                                     .await
                                 {
@@ -1640,6 +1689,9 @@ mod tests {
                             }
                         }
                     }
+                    Err(err) => {
+                        assert!(false, "Error: {:?}", err);
+                    }
                 }
             }
             Err(err) => {
@@ -1707,13 +1759,14 @@ mod tests {
                         match app
                             .clone()
                             .oneshot(
-                                axum::http::Request::builder()
-                                    .method(axum::http::Method::PATCH)
-                                    .uri(crate::callers::queue::endpoints::QUEUESONGDATAWIPE)
-                                    .header(axum::http::header::CONTENT_TYPE, "application/json")
-                                    .header(axum::http::header::AUTHORIZATION, bearer_auth().await)
-                                    .body(axum::body::Body::from(payload.to_string()))
-                                    .unwrap(),
+                                request::run_post(
+                                    Some(request::ReqBody::Json(payload)),
+                                    crate::callers::queue::endpoints::QUEUESONGDATAWIPE,
+                                    axum::http::Method::PATCH,
+                                    true,
+                                )
+                                .await
+                                .unwrap(),
                             )
                             .await
                         {
@@ -1825,19 +1878,14 @@ mod tests {
                                 match app
                                     .clone()
                                     .oneshot(
-                                        axum::http::Request::builder()
-                                            .method(axum::http::Method::PATCH)
-                                            .uri(crate::callers::queue::endpoints::QUEUECOVERARTDATAWIPE)
-                                            .header(
-                                                axum::http::header::CONTENT_TYPE,
-                                                "application/json",
-                                            )
-                                            .header(
-                                                axum::http::header::AUTHORIZATION,
-                                                bearer_auth().await,
-                                            )
-                                            .body(axum::body::Body::from(payload.to_string()))
-                                            .unwrap(),
+                                        request::run_post(
+                                            Some(request::ReqBody::Json(payload)),
+                                            crate::callers::queue::endpoints::QUEUECOVERARTDATAWIPE,
+                                            axum::http::Method::PATCH,
+                                            true,
+                                        )
+                                        .await
+                                        .unwrap(),
                                     )
                                     .await
                                 {
@@ -1905,15 +1953,8 @@ mod tests {
             match app
                 .clone()
                 .oneshot(
-                    axum::http::Request::builder()
-                        .method(axum::http::Method::GET)
-                        .uri(uri)
-                        .header(axum::http::header::CONTENT_TYPE, "application/json")
-                        .header(
-                            axum::http::header::AUTHORIZATION,
-                            super::bearer_auth().await,
-                        )
-                        .body(axum::body::Body::empty())
+                    super::request::run_post(None, &uri, axum::http::Method::GET, false)
+                        .await
                         .unwrap(),
                 )
                 .await
@@ -1962,15 +2003,8 @@ mod tests {
             match app
                 .clone()
                 .oneshot(
-                    axum::http::Request::builder()
-                        .method(axum::http::Method::GET)
-                        .uri(uri)
-                        .header(axum::http::header::CONTENT_TYPE, "application/json")
-                        .header(
-                            axum::http::header::AUTHORIZATION,
-                            super::bearer_auth().await,
-                        )
-                        .body(axum::body::Body::empty())
+                    super::request::run_post(None, &uri, axum::http::Method::GET, false)
+                        .await
                         .unwrap(),
                 )
                 .await
@@ -2051,14 +2085,8 @@ mod tests {
             match app
                 .clone()
                 .oneshot(
-                    axum::http::Request::builder()
-                        .method(axum::http::Method::GET)
-                        .uri(&uri)
-                        .header(
-                            axum::http::header::AUTHORIZATION,
-                            super::bearer_auth().await,
-                        )
-                        .body(axum::body::Body::empty())
+                    super::request::run_post(None, &uri, axum::http::Method::GET, false)
+                        .await
                         .unwrap(),
                 )
                 .await
@@ -2111,14 +2139,8 @@ mod tests {
             match app
                 .clone()
                 .oneshot(
-                    axum::http::Request::builder()
-                        .method(axum::http::Method::GET)
-                        .uri(&uri)
-                        .header(
-                            axum::http::header::AUTHORIZATION,
-                            super::bearer_auth().await,
-                        )
-                        .body(axum::body::Body::empty())
+                    super::request::run_post(None, &uri, axum::http::Method::GET, false)
+                        .await
                         .unwrap(),
                 )
                 .await
@@ -2173,14 +2195,8 @@ mod tests {
             match app
                 .clone()
                 .oneshot(
-                    axum::http::Request::builder()
-                        .method(axum::http::Method::GET)
-                        .uri(&uri)
-                        .header(
-                            axum::http::header::AUTHORIZATION,
-                            super::bearer_auth().await,
-                        )
-                        .body(axum::body::Body::empty())
+                    super::request::run_post(None, &uri, axum::http::Method::GET, false)
+                        .await
                         .unwrap(),
                 )
                 .await
@@ -2211,20 +2227,20 @@ mod tests {
             coverart_directory: &String,
             coverart_filename: &String,
         ) -> Result<(Vec<u8>, Vec<u8>), std::io::Error> {
-            let song = icarus_models::song::Song {
+            let song = simodels::song::Song {
                 directory: song_directory.clone(),
                 filename: song_filename.clone(),
                 ..Default::default()
             };
 
-            let coverart = icarus_models::coverart::CoverArt {
+            let coverart = simodels::coverart::CoverArt {
                 directory: coverart_directory.clone(),
                 filename: coverart_filename.clone(),
                 ..Default::default()
             };
 
-            match icarus_models::song::io::to_data(&song) {
-                Ok(song_data) => match icarus_models::coverart::io::to_data(&coverart) {
+            match simodels::song::io::to_data(&song) {
+                Ok(song_data) => match simodels::coverart::io::to_data(&coverart) {
                     Ok(coverart_data) => Ok((song_data, coverart_data)),
                     Err(err) => Err(err),
                 },
@@ -2240,14 +2256,14 @@ mod tests {
             coverart_filename: &String,
             coverart_data: Vec<u8>,
         ) -> Result<(), std::io::Error> {
-            let song = icarus_models::song::Song {
+            let song = simodels::song::Song {
                 directory: song_directory.clone(),
                 filename: song_filename.clone(),
                 data: song_data,
                 ..Default::default()
             };
 
-            let coverart = icarus_models::coverart::CoverArt {
+            let coverart = simodels::coverart::CoverArt {
                 directory: coverart_directory.clone(),
                 filename: coverart_filename.clone(),
                 data: coverart_data,
@@ -2300,14 +2316,8 @@ mod tests {
             match app
                 .clone()
                 .oneshot(
-                    axum::http::Request::builder()
-                        .method(axum::http::Method::DELETE)
-                        .uri(&uri)
-                        .header(
-                            axum::http::header::AUTHORIZATION,
-                            super::bearer_auth().await,
-                        )
-                        .body(axum::body::Body::empty())
+                    super::request::run_post(None, &uri, axum::http::Method::DELETE, false)
+                        .await
                         .unwrap(),
                 )
                 .await
@@ -2372,16 +2382,14 @@ mod tests {
             match app
                 .clone()
                 .oneshot(
-                    axum::http::Request::builder()
-                        .method(axum::http::Method::GET)
-                        .uri(crate::callers::endpoints::GETALLSONGS)
-                        .header(axum::http::header::CONTENT_TYPE, "application/json")
-                        .header(
-                            axum::http::header::AUTHORIZATION,
-                            super::bearer_auth().await,
-                        )
-                        .body(axum::body::Body::empty())
-                        .unwrap(),
+                    super::request::run_post(
+                        None,
+                        crate::callers::endpoints::GETALLSONGS,
+                        axum::http::Method::GET,
+                        false,
+                    )
+                    .await
+                    .unwrap(),
                 )
                 .await
             {

src/repo/coverart.rs

@@ -2,7 +2,7 @@ use sqlx::Row;
 
 pub async fn create(
     pool: &sqlx::PgPool,
-    coverart: &icarus_models::coverart::CoverArt,
+    coverart: &simodels::coverart::CoverArt,
     song_id: &uuid::Uuid,
 ) -> Result<uuid::Uuid, sqlx::Error> {
     let result = sqlx::query(
@@ -36,7 +36,7 @@ pub async fn create(
 pub async fn get_coverart(
     pool: &sqlx::PgPool,
     id: &uuid::Uuid,
-) -> Result<icarus_models::coverart::CoverArt, sqlx::Error> {
+) -> Result<simodels::coverart::CoverArt, sqlx::Error> {
     let result = sqlx::query(
         r#"
         SELECT id, title, directory, filename, file_type, song_id FROM "coverart" WHERE id = $1;
@@ -50,7 +50,7 @@ pub async fn get_coverart(
     });
 
     match result {
-        Ok(row) => Ok(icarus_models::coverart::CoverArt {
+        Ok(row) => Ok(simodels::coverart::CoverArt {
             id: row
                 .try_get("id")
                 .map_err(|_e| sqlx::Error::RowNotFound)
@@ -84,7 +84,7 @@ pub async fn get_coverart(
 pub async fn get_coverart_with_song_id(
     pool: &sqlx::PgPool,
     song_id: &uuid::Uuid,
-) -> Result<icarus_models::coverart::CoverArt, sqlx::Error> {
+) -> Result<simodels::coverart::CoverArt, sqlx::Error> {
     let result = sqlx::query(
         r#"
         SELECT id, title, directory, filename, file_type, song_id FROM "coverart" WHERE song_id = $1;
@@ -98,7 +98,7 @@ pub async fn get_coverart_with_song_id(
     });
 
     match result {
-        Ok(row) => Ok(icarus_models::coverart::CoverArt {
+        Ok(row) => Ok(simodels::coverart::CoverArt {
             id: row
                 .try_get("id")
                 .map_err(|_e| sqlx::Error::RowNotFound)
@@ -132,7 +132,7 @@ pub async fn get_coverart_with_song_id(
 pub async fn delete_coverart(
     pool: &sqlx::PgPool,
     id: &uuid::Uuid,
-) -> Result<icarus_models::coverart::CoverArt, sqlx::Error> {
+) -> Result<simodels::coverart::CoverArt, sqlx::Error> {
     let result = sqlx::query(
         r#"
         DELETE FROM "coverart"
@@ -148,7 +148,7 @@ pub async fn delete_coverart(
     });
 
     match result {
-        Ok(row) => Ok(icarus_models::coverart::CoverArt {
+        Ok(row) => Ok(simodels::coverart::CoverArt {
             id: row
                 .try_get("id")
                 .map_err(|_e| sqlx::Error::RowNotFound)

src/repo/queue/data.rs

@@ -0,0 +1,78 @@
+use sqlx::Row;
+
+pub async fn insert(
+    pool: &sqlx::PgPool,
+    file_key: &str,
+    bucket: &str,
+    region: &str,
+    song_queue_id: &uuid::Uuid,
+) -> Result<uuid::Uuid, sqlx::Error> {
+    match sqlx::query(
+        r#"
+        INSERT INTO "songQueueData" (file_key, bucket, region, song_queue_id) VALUES($1, $2, $3, $4) RETURNING id;
+        "#,
+    )
+    .bind(file_key)
+    .bind(bucket)
+    .bind(region)
+    .bind(song_queue_id)
+    .fetch_one(pool).await {
+        Ok(row) => {
+            let id: uuid::Uuid = row.try_get("id")?;
+            Ok(id)
+        }
+        Err(_err) => Err(sqlx::Error::RowNotFound),
+    }
+}
+
+pub async fn get(
+    pool: &sqlx::PgPool,
+    id: &uuid::Uuid,
+) -> Result<(uuid::Uuid, String, String, String, uuid::Uuid), sqlx::Error> {
+    match sqlx::query(
+        r#"
+        SELECT id, file_key, bucket, region, song_queue_id FROM "songQueueData"
+        WHERE id = $1
+        "#,
+    )
+    .bind(id)
+    .fetch_one(pool)
+    .await
+    {
+        Ok(row) => {
+            let file_key: String = row.try_get("file_key")?;
+            let bucket: String = row.try_get("bucket")?;
+            let region: String = row.try_get("region")?;
+            let song_queue_id: uuid::Uuid = row.try_get("song_queue_id")?;
+
+            Ok((*id, file_key, bucket, region, song_queue_id))
+        }
+        Err(err) => Err(err),
+    }
+}
+
+pub async fn get_with_song_queue_id(
+    pool: &sqlx::PgPool,
+    song_queue_id: &uuid::Uuid,
+) -> Result<(uuid::Uuid, String, String, String, uuid::Uuid), sqlx::Error> {
+    match sqlx::query(
+        r#"
+        SELECT id, file_key, bucket, region, song_queue_id FROM "songQueueData"
+        WHERE song_queue_id = $1
+        "#,
+    )
+    .bind(song_queue_id)
+    .fetch_one(pool)
+    .await
+    {
+        Ok(row) => {
+            let id: uuid::Uuid = row.try_get("id")?;
+            let file_key: String = row.try_get("file_key")?;
+            let bucket: String = row.try_get("bucket")?;
+            let region: String = row.try_get("region")?;
+
+            Ok((id, file_key, bucket, region, *song_queue_id))
+        }
+        Err(err) => Err(err),
+    }
+}

src/repo/queue/mod.rs

@@ -1,3 +1,4 @@
 pub mod coverart;
+pub mod data;
 pub mod metadata;
 pub mod song;

src/repo/song.rs

@@ -2,7 +2,7 @@ use sqlx::Row;
 
 pub async fn insert(
     pool: &sqlx::PgPool,
-    song: &icarus_models::song::Song,
+    song: &simodels::song::Song,
 ) -> Result<(time::OffsetDateTime, uuid::Uuid), sqlx::Error> {
     let result = sqlx::query(
         r#"
@@ -52,7 +52,7 @@ pub async fn insert(
 pub async fn get_song(
     pool: &sqlx::PgPool,
     id: &uuid::Uuid,
-) -> Result<icarus_models::song::Song, sqlx::Error> {
+) -> Result<simodels::song::Song, sqlx::Error> {
     let result = sqlx::query(
         r#"
         SELECT * FROM "song" WHERE id = $1
@@ -72,7 +72,7 @@ pub async fn get_song(
                 .map_err(|_e| sqlx::Error::RowNotFound)
                 .unwrap();
 
-            Ok(icarus_models::song::Song {
+            Ok(simodels::song::Song {
                 id: row
                     .try_get("id")
                     .map_err(|_e| sqlx::Error::RowNotFound)
@@ -145,9 +145,7 @@ pub async fn get_song(
     }
 }
 
-pub async fn get_all_songs(
-    pool: &sqlx::PgPool,
-) -> Result<Vec<icarus_models::song::Song>, sqlx::Error> {
+pub async fn get_all_songs(pool: &sqlx::PgPool) -> Result<Vec<simodels::song::Song>, sqlx::Error> {
     let result = sqlx::query(
         r#"
         SELECT * FROM "song";
@@ -161,7 +159,7 @@ pub async fn get_all_songs(
 
     match result {
         Ok(rows) => {
-            let mut songs: Vec<icarus_models::song::Song> = Vec::new();
+            let mut songs: Vec<simodels::song::Song> = Vec::new();
 
             for row in rows {
                 let date_created_time: time::OffsetDateTime = row
@@ -169,7 +167,7 @@ pub async fn get_all_songs(
                     .map_err(|_e| sqlx::Error::RowNotFound)
                     .unwrap();
 
-                let song = icarus_models::song::Song {
+                let song = simodels::song::Song {
                     id: row
                         .try_get("id")
                         .map_err(|_e| sqlx::Error::RowNotFound)
@@ -250,9 +248,9 @@ pub async fn get_all_songs(
 pub async fn delete_song(
     pool: &sqlx::PgPool,
     id: &uuid::Uuid,
-) -> Result<icarus_models::song::Song, sqlx::Error> {
+) -> Result<simodels::song::Song, sqlx::Error> {
     let result = sqlx::query(
-        // icarus_models::song::Song,
+        // simodels::song::Song,
         r#"
         DELETE FROM "song"
         WHERE id = $1
@@ -273,7 +271,7 @@ pub async fn delete_song(
                 .map_err(|_e| sqlx::Error::RowNotFound)
                 .unwrap();
 
-            Ok(icarus_models::song::Song {
+            Ok(simodels::song::Song {
                 id: row
                     .try_get("id")
                     .map_err(|_e| sqlx::Error::RowNotFound)

test_migrations/20250725213944_init.sql

@@ -10,6 +10,14 @@ CREATE TABLE IF NOT EXISTS "songQueue" (
     user_id UUID NULL
 );
 
+CREATE TABLE IF NOT EXISTS "songQueueData" (
+    id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
+    file_key TEXT NOT NULL,
+    bucket TEXT NOT NULL,
+    region TEXT NOT NULL,
+    song_queue_id UUID NOT NULL
+);
+
 -- Table to store queued metadata
 CREATE TABLE IF NOT EXISTS "metadataQueue" (
     id UUID PRIMARY KEY DEFAULT gen_random_uuid(),