Updating some of the sample env

.env.docker.sample

@@ -12,15 +12,7 @@ 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
@@ -28,7 +20,8 @@ GARAGE_REPLICATION_FACTOR=1
 GARAGE_RPC_BIND_ADDR=[::]:3901
 GARAGE_S3_API_BIND_ADDR=[::]:3900
 GARAGE_S3_WEB_BIND_ADDR=[::]:3902
+GARAGE_S3_REGION=maze
 GARAGE_ROOT_DOMAIN=.localhost
-AWS_DEFAULT_REGION=${GARAGE_S3_REGION}
+AWS_DEFAULT_REGION=maze
-AWS_SECRET_ACCESS_KEY=${GARAGE_DEFAULT_ACCESS_KEY}
+AWS_SECRET_ACCESS_KEY=3o4n7yfo34985yrfcq9238765ry3928475rcy349857ty394578cy
-AWS_ACCESS_KEY_ID=${GARAGE_DEFAULT_SECRET_KEY}
+AWS_ACCESS_KEY_ID=2q39fnoy59q2347yfdrc327894ryfc0q2834rcyq023897

.env.local.sample

@@ -11,24 +11,3 @@ 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}

.github/workflows/pr.yml

@@ -1,116 +0,0 @@
-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/workflow.yml

@@ -3,6 +3,8 @@ name: soaricarus_api CI
 on:
   push:
     branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -33,7 +35,6 @@ jobs:
   test:
     name: Test Suite
     runs-on: ubuntu-24.04
-    timeout-minutes: 20
     services:
       postgres:
         image: postgres:18.4-alpine
@@ -64,49 +65,14 @@ jobs:
           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:
+          # Define DATABASE_URL for tests to use
           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
@@ -118,23 +84,6 @@ jobs:
 
           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
-
   fmt:
     name: Rustfmt
     runs-on: ubuntu-24.04

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "soaricarus_api"
-version = "0.5.7"
+version = "0.5.2"
 edition = "2024"
 rust-version = "1.95"
 license = "MIT"
@@ -10,26 +10,25 @@ description = "Core API for interacting with soaricarus"
 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.229", features = ["derive"] }
+serde = { version = "1.0.228", features = ["derive"] }
-serde_json = { version = "1.0.151" }
+serde_json = { version = "1.0.150" }
-tokio = { version = "1.53.1", features = ["full"] }
+tokio = { version = "1.52.3", features = ["full"] }
-tokio-util = { version = "0.7.19", features = ["io"] }
+tokio-util = { version = "0.7.18", features = ["io"] }
 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.34" }
+futures = { version = "0.3.32" }
 mime_guess = { version = "2.0.5" }
-uuid = { version = "1.24.1", features = ["v4", "serde"] }
+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.55", features = ["formatting", "macros", "parsing", "serde"]  }
+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.5.0", features = ["axum_extras"] }
 utoipa-swagger-ui = { version = "9.0.2", features = ["axum"] }
-simeta = { git = "ssh://git@git.kundeng.us/phoenix/simeta.git", tag = "v0.6.2" }
+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.5-main-94d97cb81d-111" }
+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.1" }
+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.5" }
 
 [dev-dependencies]
 common-multipart-rfc7578 = { version = "0.7.0" }

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2026 Kun Deng
+Copyright (c) 2025 Kun Deng
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -19,21 +19,6 @@ Copy the `.env.docker.sample` file to `.env`. Ensure that the `ROOT_DIRECTORY` v
 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

@@ -6,20 +6,14 @@ services:
     build:
       context: .
       ssh: ["default"]
-    container_name: api
+    container_name: soaricarus
     ports:
       - "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:
       - soaricarus-network
     restart: unless-stopped
@@ -60,75 +54,25 @@ services:
       - main_db
       - auth_api
       - auth_db
-      - maze
     networks:
       - soaricarus-network
-
   # --- storage service ---
   maze:
-    image: dxflrs/garage:v2.3.0  # Use official Garage image
+    image: dxflrs/garage:v2.3.0
     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
+      - "3901:3901"  # RPC for cluster communication
-      - "3902:3902"  # Admin API
+      - "3902:3902"  # S3 web interface
-    command: ["/garage", "server", "--single-node", "--default-bucket"]
+      - "3903:3903"  # Admin API
-    healthcheck:
+    volumes:
-      test: ["CMD", "curl", "-f", "http://localhost:3900/"]
+      - ./garage.toml:/etc/garage.toml:ro
-      interval: 30s
+      - object_data:/var/lib/garage/meta
-      timeout: 10s
+      - object_data:/var/lib/garage/data
-      retries: 3
+    env_file:
-      start_period: 10s
+      - .env
-    networks:
+
-      - soaricarus-network
-    extra_hosts:
-      - "garage.local:127.0.0.1"
 
   # PostgreSQL Database Service
   main_db:
@@ -187,8 +131,6 @@ volumes:
     driver: local # Use the default local driver
   object_data:
     driver: local # Use the default local driver
-  shared_credentials:  # New shared volume
-    driver: local
 
 networks:
   soaricarus-network:

garage.toml

@@ -1,24 +1,16 @@
 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"
+rpc_secret = "${GARAGE_RPC_SECRET}"
 
 [s3_api]
 s3_region = "maze"
 api_bind_addr = "[::]:3900"
-root_domain = ".s3.maze.localhost"
+root_domain = ".localhost"
 
 [s3_web]
 bind_addr = "[::]:3902"
-root_domain = ".web.maze.localhost"
+root_domain = ".localhost"
-index = "index.html"
-
-[admin]
-api_bind_addr = "[::]:3903"
-admin_token = "${GARAGE_ADMIN_TOKEN}"
-metrics_token = "${GARAGE_METRICS_TOKEN}"

migrations/20250420185217_init_migration.sql

@@ -6,17 +6,10 @@ CREATE TABLE IF NOT EXISTS "songQueue" (
     id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
     filename TEXT NOT NULL,
     status TEXT CHECK (status IN ('pending', 'ready', 'processing', 'done')),
+    data BYTEA NULL,
     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(),
@@ -28,18 +21,11 @@ CREATE TABLE IF NOT EXISTS "metadataQueue" (
 -- Table to store queued coverart
 CREATE TABLE IF NOT EXISTS "coverartQueue" (
     id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
+    data BYTEA NULL,
     file_type TEXT NOT NULL,
     song_queue_id UUID NULL
 );
 
-CREATE TABLE IF NOT EXISTS "coverartQueueData" (
-    id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
-    file_key TEXT NOT NULL,
-    bucket TEXT NOT NULL,
-    region TEXT NOT NULL,
-    coverart_queue_id UUID NOT NULL
-);
-
 -- Create an index for better query performance
 CREATE INDEX metadata_queue_data_metadata ON "metadataQueue" USING gin (metadata);
 
@@ -63,7 +49,6 @@ CREATE TABLE IF NOT EXISTS "song" (
     date_created timestamptz DEFAULT now(),
     filename TEXT NOT NULL,
     directory TEXT NOT NULL,
-    file_key TEXT NOT NULL,
     user_id UUID NULL
     -- TODO: Add coverart id later. This will allow multiple songs to be linked to a single cover art
 );
@@ -74,6 +59,5 @@ CREATE TABLE IF NOT EXISTS "coverart" (
     directory TEXT NOT NULL,
     filename TEXT NOT NULL,
     file_type TEXT NOT NULL,
-    file_key TEXT NOT NULL,
     song_id UUID NOT NULL
 );

src/callers/coverart.rs

@@ -63,16 +63,14 @@ pub mod endpoint {
         let mut response = super::response::create_coverart::Response::default();
         let id = payload.coverart_queue_id;
 
-        match repo_queue::data::queue::coverart::get_with_coverart_queue_id(&pool, &id).await {
+        match repo_queue::coverart::get_coverart_queue_data_with_id(&pool, &id).await {
-            Ok((_id, file_key, _bucket, _region, _)) => {
-                let lab_config = crate::util::maze::get_config();
-                let lr = labyrinth::Labyrinth { config: lab_config };
-
-                match lr.download(&file_key).await {
             Ok(data) => {
+                let song_id = payload.song_id;
+                match crate::repo::song::get_song(&pool, &song_id).await {
+                    Ok(song) => {
+                        let directory = sienvy::environment::get_root_directory().value;
                         let file_type =
                             simeta::detection::coverart::file_type_from_data(&data).unwrap();
-
                         let coverart_type = if file_type.file_type
                             == simeta::detection::coverart::constants::JPEG_TYPE
                         {
@@ -95,45 +93,18 @@ pub mod endpoint {
                         let filename =
                             simodels::coverart::generate_filename(coverart_type, true).unwrap();
 
-                        let data = labyrinth::Data {
+                        let mut coverart = simodels::coverart::init::init_coverart_dir_and_filename(
-                            raw_data: data,
-                            ..Default::default()
-                        };
-                        let new_file_key = format!("processed/coverart/{filename}");
-
-                        match lr.upload(&new_file_key, &data).await {
-                            Ok(_resp) => {
-                                // TODO: Change it to the s3 bucket
-                                let directory = sienvy::environment::get_root_directory().value;
-                                let mut coverart =
-                                    simodels::coverart::init::init_coverart_dir_and_filename(
                             &directory, &filename,
                         );
-                                let song = match crate::repo::song::get_song(
-                                    &pool,
-                                    &payload.song_id,
-                                )
-                                .await
-                                {
-                                    Ok(song) => song,
-                                    Err(err) => {
-                                        eprintln!("Error: {err:?}");
-                                        return (
-                                            axum::http::StatusCode::BAD_REQUEST,
-                                            axum::Json(response),
-                                        );
-                                    }
-                                };
                         coverart.title = song.album.clone();
                         coverart.file_type = file_type.file_type;
-                                coverart.data = data.raw_data;
+                        coverart.data = data;
-                                coverart.file_key = new_file_key;
 
-                                match repo::coverart::create(&pool, &coverart, &payload.song_id)
+                        match coverart.save_to_filesystem() {
-                                    .await
+                            Ok(_) => {
-                                {
+                                match repo::coverart::create(&pool, &coverart, &song.id).await {
                                     Ok(id) => {
-                                        coverart.song_id = payload.song_id;
+                                        coverart.song_id = song_id;
                                         coverart.id = id;
                                         println!("Cover Art created");
 
@@ -149,7 +120,7 @@ pub mod endpoint {
                                 }
                             }
                             Err(err) => {
-                                eprintln!("Error: {err:?}");
+                                response.message = err.to_string();
                                 (
                                     axum::http::StatusCode::INTERNAL_SERVER_ERROR,
                                     axum::Json(response),
@@ -158,20 +129,14 @@ pub mod endpoint {
                         }
                     }
                     Err(err) => {
-                        eprintln!("Error: {err:?}");
+                        response.message = err.to_string();
-                        (
+                        (axum::http::StatusCode::BAD_REQUEST, axum::Json(response))
-                            axum::http::StatusCode::INTERNAL_SERVER_ERROR,
-                            axum::Json(response),
-                        )
                     }
                 }
             }
             Err(err) => {
-                eprintln!("Error: {err:?}");
+                response.message = err.to_string();
-                (
+                (axum::http::StatusCode::BAD_REQUEST, axum::Json(response))
-                    axum::http::StatusCode::INTERNAL_SERVER_ERROR,
-                    axum::Json(response),
-                )
             }
         }
     }
@@ -232,11 +197,8 @@ pub mod endpoint {
         axum::Extension(pool): axum::Extension<sqlx::PgPool>,
         axum::extract::Path(id): axum::extract::Path<uuid::Uuid>,
     ) -> (axum::http::StatusCode, axum::response::Response) {
-        let lab_config = crate::util::maze::get_config();
-        let lr = labyrinth::Labyrinth { config: lab_config };
-
         match repo::coverart::get_coverart(&pool, &id).await {
-            Ok(coverart) => match lr.download(&coverart.file_key).await {
+            Ok(coverart) => match simodels::coverart::io::to_data(&coverart) {
                 Ok(data) => {
                     let (file_type, img_type) =
                         match simeta::detection::coverart::file_type_from_data(&data) {

src/callers/queue/coverart.rs

@@ -178,60 +178,14 @@ pub mod endpoint {
                         file_type
                     );
 
-                    let lab_config = crate::util::maze::get_config();
+                    match repo::coverart::insert(&pool, &raw_data, &file_type.file_type).await {
-
-                    let lr = labyrinth::Labyrinth { config: lab_config };
-                    let data = labyrinth::Data {
-                        raw_data,
-                        ..Default::default()
-                    };
-
-                    let filename = simodels::coverart::generate_filename(
-                        simodels::types::CoverArtType::JpegExtension,
-                        true,
-                    )
-                    .unwrap();
-                    let file_path = format!("queued/coverart/{filename}");
-
-                    println!("Key: {file_path:?}");
-
-                    match lr.upload(&file_path, &data).await {
-                        Ok(_res) => {
-                            match repo::coverart::insert(&pool, &file_type.file_type).await {
                         Ok(id) => {
-                                    println!("Inserting queued data");
-                                    match repo::data::queue::coverart::insert(
-                                        &pool,
-                                        &file_path,
-                                        &lr.config.bucket,
-                                        &lr.config.region,
-                                        &id,
-                                    )
-                                    .await
-                                    {
-                                        Ok(_id) => {
-                                            println!("Successfully did it");
                             response.message = String::from("Successful");
                             response.data.push(id);
                             (axum::http::StatusCode::OK, axum::Json(response))
                         }
                         Err(err) => {
                             response.message = err.to_string();
-                                            (
-                                                axum::http::StatusCode::BAD_REQUEST,
-                                                axum::Json(response),
-                                            )
-                                        }
-                                    }
-                                }
-                                Err(err) => {
-                                    response.message = err.to_string();
-                                    (axum::http::StatusCode::BAD_REQUEST, axum::Json(response))
-                                }
-                            }
-                        }
-                        Err(err) => {
-                            eprintln!("Error: {err:?}");
                             (axum::http::StatusCode::BAD_REQUEST, axum::Json(response))
                         }
                     }
@@ -359,19 +313,11 @@ pub mod endpoint {
     )]
     pub async fn fetch_coverart_with_data(
         axum::Extension(pool): axum::Extension<sqlx::PgPool>,
-        axum::extract::Path(coverart_queue_id): axum::extract::Path<uuid::Uuid>,
+        axum::extract::Path(id): axum::extract::Path<uuid::Uuid>,
     ) -> (axum::http::StatusCode, axum::response::Response) {
-        match repo::data::queue::coverart::get_with_coverart_queue_id(&pool, &coverart_queue_id)
+        match repo::coverart::get_coverart_queue_data_with_id(&pool, &id).await {
-            .await
-        {
-            Ok((_id, file_key, _bucket, _region, _)) => {
-                let lab_config = crate::util::maze::get_config();
-                let lr = labyrinth::Labyrinth { config: lab_config };
-
-                match lr.download(&file_key).await {
             Ok(data) => {
-                        let file_type =
+                let file_type = simeta::detection::coverart::file_type_from_data(&data).unwrap();
-                            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();
@@ -384,13 +330,9 @@ pub mod endpoint {
                     == simeta::detection::coverart::constants::JPEG_TYPE
                 {
                     simodels::types::CoverArtType::JpegExtension
-                        } else if file_type.file_type
+                } else if file_type.file_type == simeta::detection::coverart::constants::JPG_TYPE {
-                            == simeta::detection::coverart::constants::JPG_TYPE
-                        {
                     simodels::types::CoverArtType::JpgExtension
-                        } else if file_type.file_type
+                } else if file_type.file_type == simeta::detection::coverart::constants::PNG_TYPE {
-                            == simeta::detection::coverart::constants::PNG_TYPE
-                        {
                     simodels::types::CoverArtType::PngExtension
                 } else {
                     return (
@@ -398,8 +340,7 @@ pub mod endpoint {
                         axum::response::Response::default(),
                     );
                 };
-                        let filename =
+                let filename = simodels::coverart::generate_filename(coverart_type, true).unwrap();
-                            simodels::coverart::generate_filename(coverart_type, true).unwrap();
                 headers.insert(
                     axum::http::header::CONTENT_DISPOSITION,
                     format!("attachment; filename=\"{filename}\"")
@@ -409,23 +350,10 @@ pub mod endpoint {
 
                 (axum::http::StatusCode::OK, response)
             }
-                    Err(err) => {
+            Err(_err) => (
-                        eprintln!("Error: {err:?}");
+                axum::http::StatusCode::BAD_REQUEST,
-                        (
-                            axum::http::StatusCode::INTERNAL_SERVER_ERROR,
                 axum::response::Response::default(),
-                        )
+            ),
-                    }
-                }
-            }
-            Err(err) => {
-                eprintln!("Record not found");
-                eprintln!("Error: {err:?}");
-                (
-                    axum::http::StatusCode::INTERNAL_SERVER_ERROR,
-                    axum::response::Response::default(),
-                )
-            }
         }
     }
 
@@ -455,39 +383,16 @@ pub mod endpoint {
         let coverart_queue_id = payload.coverart_queue_id;
 
         match repo::coverart::get_coverart_queue_with_id(&pool, &coverart_queue_id).await {
-            Ok(_coverart_queue) => {
+            Ok(coverart_queue) => {
-                match repo::data::queue::coverart::get_with_coverart_queue_id(
+                match repo::coverart::wipe_data(&pool, &coverart_queue.id).await {
-                    &pool,
+                    Ok(id) => {
-                    &coverart_queue_id,
-                )
-                .await
-                {
-                    Ok((_id, file_key, _bucket, _region, _)) => {
-                        let lab_config = crate::util::maze::get_config();
-                        let lr = labyrinth::Labyrinth { config: lab_config };
-
-                        match lr.delete(&file_key).await {
-                            Ok(_) => {
                         response.message = String::from("Success");
-                                response.data.push(coverart_queue_id);
+                        response.data.push(id);
-
                         (axum::http::StatusCode::OK, axum::Json(response))
                     }
-                            Err(err) => {
-                                eprintln!("Error: {err:?}");
-                                (
-                                    axum::http::StatusCode::INTERNAL_SERVER_ERROR,
-                                    axum::Json(response),
-                                )
-                            }
-                        }
-                    }
                     Err(err) => {
                         response.message = err.to_string();
-                        (
+                        (axum::http::StatusCode::BAD_REQUEST, axum::Json(response))
-                            axum::http::StatusCode::INTERNAL_SERVER_ERROR,
-                            axum::Json(response),
-                        )
                     }
                 }
             }

src/callers/queue/song.rs

@@ -156,12 +156,12 @@ 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 {
                                 match repo::song::insert(
                                     &pool,
+                                    &raw_data,
                                     &file_name,
                                     &crate::repo::queue::song::status::PENDING.to_string(),
                                 )
@@ -169,51 +169,6 @@ pub mod endpoint {
                                 {
                                     Ok(queued_song) => {
                                         results.push(queued_song);
-                                        println!("Uploading to bucket");
-
-                                        let lab_config = crate::util::maze::get_config();
-
-                                        let lr = labyrinth::Labyrinth { config: lab_config };
-                                        let data = labyrinth::Data {
-                                            raw_data: copied_raw_data,
-                                            ..Default::default()
-                                        };
-
-                                        println!("Filename: {file_name:?}");
-                                        let file_path = format!("queued/song/{file_name}");
-                                        println!("Path: {file_path:?}");
-
-                                        match lr.upload(&file_path, &data).await {
-                                            Ok(_res) => {
-                                                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();
@@ -342,15 +297,11 @@ pub mod endpoint {
     )]
     pub async fn download_queued_song(
         axum::Extension(pool): axum::Extension<sqlx::PgPool>,
-        axum::extract::Path(song_queue_id): axum::extract::Path<uuid::Uuid>,
+        axum::extract::Path(id): axum::extract::Path<uuid::Uuid>,
     ) -> (axum::http::StatusCode, axum::response::Response) {
-        println!("Id: {song_queue_id}");
+        println!("Id: {id}");
 
-        let lab_config = crate::util::maze::get_config();
+        match repo::song::get_data(&pool, &id).await {
-        let lr = labyrinth::Labyrinth { config: lab_config };
-
-        match repo::data::get_with_song_queue_id(&pool, &song_queue_id).await {
-            Ok((id, file_key, _bucket, _region, _)) => match lr.download(&file_key).await {
             Ok(data) => {
                 let by = axum::body::Bytes::from(data);
                 let mut response = by.into_response();
@@ -368,14 +319,6 @@ pub mod endpoint {
 
                 (axum::http::StatusCode::OK, response)
             }
-                Err(err) => {
-                    eprintln!("Error: {err:?}");
-                    (
-                        axum::http::StatusCode::INTERNAL_SERVER_ERROR,
-                        axum::response::Response::default(),
-                    )
-                }
-            },
             Err(_err) => (
                 axum::http::StatusCode::BAD_REQUEST,
                 axum::response::Response::default(),
@@ -463,7 +406,7 @@ pub mod endpoint {
         )
     )]
     pub async fn update_song_queue(
-        axum::extract::Path(song_queue_id): axum::extract::Path<uuid::Uuid>,
+        axum::extract::Path(id): axum::extract::Path<uuid::Uuid>,
         axum::Extension(pool): axum::Extension<sqlx::PgPool>,
         mut multipart: axum::extract::Multipart,
     ) -> (
@@ -494,45 +437,12 @@ pub mod endpoint {
             match super::is_song_valid(&raw_data).await {
                 Ok(valid) => {
                     if valid {
-                        let lab_config = crate::util::maze::get_config();
+                        match repo::song::update(&pool, &raw_data, &id).await {
-                        let lr = labyrinth::Labyrinth { config: lab_config };
-
-                        println!("Valid song");
-
-                        match repo::data::get_with_song_queue_id(&pool, &song_queue_id).await {
-                            Ok((id, file_key, _bucket, _region, _)) => {
-                                match lr.delete(&file_key).await {
-                                    Ok(_response) => {
-                                        let data = labyrinth::Data {
-                                            raw_data,
-                                            ..Default::default()
-                                        };
-
-                                        let filename = simodels::song::generate_filename(
-                                            simodels::types::MusicType::FlacExtension,
-                                            true,
-                                        )
-                                        .unwrap();
-                                        let new_file_key = format!("queued/song/{filename}");
-                                        println!("New key: {new_file_key:?}");
-
-                                        match lr.upload(&new_file_key, &data).await {
-                                            Ok(_) => {
-                                                match repo::data::update_file_key(
-                                                    &pool,
-                                                    &id,
-                                                    &new_file_key,
-                                                )
-                                                .await
-                                                {
                             Ok(_) => {
                                 response.message =
-                                    super::super::super::response::SUCCESSFUL.to_string();
+                                    String::from(super::super::super::response::SUCCESSFUL);
-                                                        response.data.push(song_queue_id);
+                                response.data.push(id);
-                                                        (
+                                (axum::http::StatusCode::OK, axum::Json(response))
-                                                            axum::http::StatusCode::OK,
-                                                            axum::Json(response),
-                                                        )
                             }
                             Err(err) => {
                                 response.message = err.to_string();
@@ -542,33 +452,6 @@ pub mod endpoint {
                                 )
                             }
                         }
-                                            }
-                                            Err(err) => {
-                                                eprintln!("Error: {err:?}");
-                                                (
-                                                    axum::http::StatusCode::INTERNAL_SERVER_ERROR,
-                                                    axum::Json(response),
-                                                )
-                                            }
-                                        }
-                                    }
-                                    Err(err) => {
-                                        eprintln!("Error: {err:?}");
-                                        (
-                                            axum::http::StatusCode::INTERNAL_SERVER_ERROR,
-                                            axum::Json(response),
-                                        )
-                                    }
-                                }
-                            }
-                            Err(err) => {
-                                eprintln!("Error: {err:?}");
-                                (
-                                    axum::http::StatusCode::INTERNAL_SERVER_ERROR,
-                                    axum::Json(response),
-                                )
-                            }
-                        }
                     } else {
                         response.message = String::from("Invalid song type");
                         (axum::http::StatusCode::BAD_REQUEST, axum::Json(response))
@@ -599,8 +482,7 @@ pub mod endpoint {
             ),
         responses(
             (status = 200, description = "Queued song data wiped", body = super::response::wipe_data_from_song_queue::Response),
-            (status = 404, description = "Queued song cannot be found", body = super::response::wipe_data_from_song_queue::Response),
+            (status = 404, description = "Queued song cannot be found", body = super::response::wipe_data_from_song_queue::Response)
-            (status = 500, description = "Error wiping song data", body = super::response::wipe_data_from_song_queue::Response)
         )
     )]
     pub async fn wipe_data_from_song_queue(
@@ -611,37 +493,21 @@ pub mod endpoint {
         axum::Json<super::response::wipe_data_from_song_queue::Response>,
     ) {
         let mut response = super::response::wipe_data_from_song_queue::Response::default();
-        let song_queue_id = payload.song_queue_id;
+        let id = payload.song_queue_id;
 
-        match repo::song::get_song_queue(&pool, &song_queue_id).await {
+        match repo::song::get_song_queue(&pool, &id).await {
-            Ok(_song_queue) => {
+            Ok(song_queue) => match repo::song::wipe_data(&pool, &song_queue.id).await {
-                match repo::data::get_with_song_queue_id(&pool, &song_queue_id).await {
+                Ok(wiped_id) => {
-                    Ok((_id, file_key, _bucket, _region, _)) => {
-                        let lab_config = crate::util::maze::get_config();
-                        let lr = labyrinth::Labyrinth { config: lab_config };
-
-                        match lr.delete(&file_key).await {
-                            Ok(_) => {
                     response.message = String::from("Success");
-                                response.data.push(song_queue_id);
+                    response.data.push(wiped_id);
 
                     (axum::http::StatusCode::OK, axum::Json(response))
                 }
-                            Err(err) => {
-                                eprintln!("Error: {err:?}");
-                                (
-                                    axum::http::StatusCode::INTERNAL_SERVER_ERROR,
-                                    axum::Json(response),
-                                )
-                            }
-                        }
-                    }
                 Err(err) => {
                     response.message = err.to_string();
                     (axum::http::StatusCode::NOT_FOUND, axum::Json(response))
                 }
-                }
+            },
-            }
             Err(err) => {
                 response.message = err.to_string();
                 (axum::http::StatusCode::NOT_FOUND, axum::Json(response))

src/callers/song.rs

@@ -139,11 +139,7 @@ pub mod endpoint {
                     .unwrap();
             song.directory = sienvy::environment::get_root_directory().value;
 
-            let lab_config = crate::util::maze::get_config();
+            match repo_queue::song::get_data(&pool, &payload.song_queue_id).await {
-            let lr = labyrinth::Labyrinth { config: lab_config };
-
-            match repo_queue::data::get_with_song_queue_id(&pool, &payload.song_queue_id).await {
-                Ok((_id, file_key, _bucket, _region, _)) => match lr.download(&file_key).await {
                 Ok(data) => {
                     song.data = data;
                     let dir = std::path::Path::new(&song.directory);
@@ -159,14 +155,8 @@ pub mod endpoint {
                         }
                     }
 
-                        song.file_key = format!("processed/song/{}", song.filename);
+                    match song.save_to_filesystem() {
-                        let data_of_song = labyrinth::Data {
+                        Ok(_) => match repo::song::insert(&pool, &song).await {
-                            raw_data: song.data.clone(),
-                            ..Default::default()
-                        };
-
-                        match lr.upload(&song.file_key, &data_of_song).await {
-                            Ok(_resp) => match repo::song::insert(&pool, &song).await {
                             Ok((date_created, id)) => {
                                 song.id = id;
                                 song.date_created = Some(date_created);
@@ -176,13 +166,12 @@ pub mod endpoint {
                                 (axum::http::StatusCode::OK, axum::Json(response))
                             }
                             Err(err) => {
-                                    response.message =
+                                response.message = format!("{:?} song {:?}", err.to_string(), song);
-                                        format!("{:?} song {:?}", err.to_string(), song);
                                 (axum::http::StatusCode::BAD_REQUEST, axum::Json(response))
                             }
                         },
                         Err(err) => {
-                                eprintln!("Error: {err:?}");
+                            response.message = err.to_string();
                             (
                                 axum::http::StatusCode::INTERNAL_SERVER_ERROR,
                                 axum::Json(response),
@@ -190,11 +179,6 @@ pub mod endpoint {
                         }
                     }
                 }
-                    Err(err) => {
-                        eprintln!("Error: {err:?}");
-                        (axum::http::StatusCode::BAD_REQUEST, axum::Json(response))
-                    }
-                },
                 Err(err) => {
                     response.message = err.to_string();
                     (axum::http::StatusCode::BAD_REQUEST, axum::Json(response))
@@ -296,41 +280,17 @@ pub mod endpoint {
         axum::extract::Path(id): axum::extract::Path<uuid::Uuid>,
     ) -> impl IntoResponse {
         match repo::song::get_song(&pool, &id).await {
-            Ok(mut song) => {
+            Ok(song) => {
-                let lab_config = crate::util::maze::get_config();
-                let lr = labyrinth::Labyrinth { config: lab_config };
-
-                match lr.download(&song.file_key).await {
-                    Ok(data) => {
-                        song.filename = simodels::song::generate_filename(
-                            simodels::types::MusicType::FlacExtension,
-                            true,
-                        )
-                        .unwrap();
-                        // TODO: At some point, directory will no longer be needed with s3
-                        song.directory = sienvy::environment::get_root_directory().value;
-                        song.data = data;
-
-                        match song.save_to_filesystem() {
-                            Ok(_) => {
                 let song_path = song.song_path().unwrap();
                 let path = std::path::Path::new(&song_path);
 
                 if !path.starts_with(&song.directory) || !path.exists() {
-                                    return Err((
+                    return Err((axum::http::StatusCode::NOT_FOUND, "File not found"));
-                                        axum::http::StatusCode::NOT_FOUND,
-                                        "File not found",
-                                    ));
                 }
 
                 let file = match tokio::fs::File::open(&path).await {
                     Ok(file) => file,
-                                    Err(_) => {
+                    Err(_) => return Err((axum::http::StatusCode::NOT_FOUND, "File not found")),
-                                        return Err((
-                                            axum::http::StatusCode::NOT_FOUND,
-                                            "File not found",
-                                        ));
-                                    }
                 };
 
                 let file_size = match file.metadata().await {
@@ -352,34 +312,8 @@ pub mod endpoint {
                     .header("content-length", file_size.to_string())
                     .body(axum::body::Body::from_stream(stream))
                     .unwrap();
-                                match song.remove_from_filesystem() {
+
-                                    Ok(_) => Ok(rep),
+                Ok(rep)
-                                    Err(err) => {
-                                        eprintln!("Error: {err:?}");
-                                        Err((
-                                            axum::http::StatusCode::INTERNAL_SERVER_ERROR,
-                                            "Could not read file",
-                                        ))
-                                    }
-                                }
-                            }
-                            Err(err) => {
-                                eprintln!("Error: {err:?}");
-                                Err((
-                                    axum::http::StatusCode::INTERNAL_SERVER_ERROR,
-                                    "Could not find file",
-                                ))
-                            }
-                        }
-                    }
-                    Err(err) => {
-                        eprintln!("Error: {err:?}");
-                        Err((
-                            axum::http::StatusCode::INTERNAL_SERVER_ERROR,
-                            "Could not find file",
-                        ))
-                    }
-                }
             }
             Err(_err) => Err((
                 axum::http::StatusCode::INTERNAL_SERVER_ERROR,
@@ -403,11 +337,8 @@ pub mod endpoint {
         axum::Extension(pool): axum::Extension<sqlx::PgPool>,
         axum::extract::Path(id): axum::extract::Path<uuid::Uuid>,
     ) -> (axum::http::StatusCode, axum::response::Response) {
-        let lab_config = crate::util::maze::get_config();
-        let lr = labyrinth::Labyrinth { config: lab_config };
-
         match repo::song::get_song(&pool, &id).await {
-            Ok(song) => match lr.download(&song.file_key).await {
+            Ok(song) => match simodels::song::io::to_data(&song) {
                 Ok(data) => {
                     let bytes = axum::body::Bytes::from(data);
                     let mut response = bytes.into_response();
@@ -456,8 +387,6 @@ pub mod endpoint {
         axum::Json<super::response::delete_song::Response>,
     ) {
         let mut response = super::response::delete_song::Response::default();
-        let lab_config = crate::util::maze::get_config();
-        let lr = labyrinth::Labyrinth { config: lab_config };
 
         match repo::song::get_song(&pool, &id).await {
             Ok(song) => {
@@ -481,7 +410,7 @@ pub mod endpoint {
                                     match repo::coverart::delete_coverart(&pool, &coverart.id).await
                                     {
                                         Ok(deleted_coverart) => {
-                                            match lr.delete(&song.file_key).await {
+                                            match song.remove_from_filesystem() {
                                                 Ok(_) => match coverart.remove_from_filesystem() {
                                                     Ok(_) => {
                                                         response.message = String::from(
@@ -499,7 +428,7 @@ pub mod endpoint {
                                                     }
                                                 },
                                                 Err(err) => {
-                                                    eprintln!("Error: {err:?}");
+                                                    response.message = err.to_string();
                                                     (axum::http::StatusCode::INTERNAL_SERVER_ERROR, axum::Json(response))
                                                 }
                                             }

src/lib.rs

@@ -1,6 +0,0 @@
-pub mod auth;
-pub mod callers;
-pub mod config;
-pub mod db;
-pub mod repo;
-pub mod util;

src/repo/coverart.rs

@@ -7,14 +7,13 @@ pub async fn create(
 ) -> Result<uuid::Uuid, sqlx::Error> {
     let result = sqlx::query(
         r#"
-        INSERT INTO "coverart" (title, directory, filename, file_type, file_key, song_id) VALUES($1, $2, $3, $4, $5, $6) RETURNING id;
+        INSERT INTO "coverart" (title, directory, filename, file_type, song_id) VALUES($1, $2, $3, $4, $5) RETURNING id;
         "#,
     )
     .bind(&coverart.title)
     .bind(&coverart.directory)
     .bind(&coverart.filename)
     .bind(&coverart.file_type)
-    .bind(&coverart.file_key)
     .bind(song_id)
     .fetch_one(pool)
     .await
@@ -40,7 +39,7 @@ pub async fn get_coverart(
 ) -> Result<simodels::coverart::CoverArt, sqlx::Error> {
     let result = sqlx::query(
         r#"
-        SELECT id, title, directory, filename, file_type, file_key, song_id FROM "coverart" WHERE id = $1;
+        SELECT id, title, directory, filename, file_type, song_id FROM "coverart" WHERE id = $1;
         "#,
     )
     .bind(id)
@@ -72,10 +71,6 @@ pub async fn get_coverart(
                 .try_get("file_type")
                 .map_err(|_e| sqlx::Error::RowNotFound)
                 .unwrap(),
-            file_key: row
-                .try_get("file_key")
-                .map_err(|_e| sqlx::Error::RowNotFound)
-                .unwrap(),
             song_id: row
                 .try_get("song_id")
                 .map_err(|_e| sqlx::Error::RowNotFound)
@@ -92,7 +87,7 @@ pub async fn get_coverart_with_song_id(
 ) -> Result<simodels::coverart::CoverArt, sqlx::Error> {
     let result = sqlx::query(
         r#"
-        SELECT id, title, directory, filename, file_type, file_key, song_id FROM "coverart" WHERE song_id = $1;
+        SELECT id, title, directory, filename, file_type, song_id FROM "coverart" WHERE song_id = $1;
         "#,
     )
     .bind(song_id)
@@ -124,10 +119,6 @@ pub async fn get_coverart_with_song_id(
                 .try_get("file_type")
                 .map_err(|_e| sqlx::Error::RowNotFound)
                 .unwrap(),
-            file_key: row
-                .try_get("file_key")
-                .map_err(|_e| sqlx::Error::RowNotFound)
-                .unwrap(),
             data: Vec::new(),
             song_id: row
                 .try_get("song_id")
@@ -146,7 +137,7 @@ pub async fn delete_coverart(
         r#"
         DELETE FROM "coverart"
         WHERE id = $1
-        RETURNING id, title, directory, filename, file_type, file_key, song_id
+        RETURNING id, title, directory, filename, file_type, song_id
         "#,
     )
     .bind(id)
@@ -157,15 +148,7 @@ pub async fn delete_coverart(
     });
 
     match result {
-        Ok(row) => parse_row(&row).await,
+        Ok(row) => Ok(simodels::coverart::CoverArt {
-        Err(_err) => Err(sqlx::Error::RowNotFound),
-    }
-}
-
-async fn parse_row(
-    row: &sqlx::postgres::PgRow,
-) -> Result<simodels::coverart::CoverArt, sqlx::Error> {
-    Ok(simodels::coverart::CoverArt {
             id: row
                 .try_get("id")
                 .map_err(|_e| sqlx::Error::RowNotFound)
@@ -186,14 +169,12 @@ async fn parse_row(
                 .try_get("file_type")
                 .map_err(|_e| sqlx::Error::RowNotFound)
                 .unwrap(),
-        file_key: row
-            .try_get("file_key")
-            .map_err(|_e| sqlx::Error::RowNotFound)
-            .unwrap(),
             song_id: row
                 .try_get("song_id")
                 .map_err(|_e| sqlx::Error::RowNotFound)
                 .unwrap(),
             data: Vec::new(),
-    })
+        }),
+        Err(_err) => Err(sqlx::Error::RowNotFound),
+    }
 }

src/repo/queue/coverart.rs

@@ -1,11 +1,16 @@
 use sqlx::Row;
 
-pub async fn insert(pool: &sqlx::PgPool, file_type: &str) -> Result<uuid::Uuid, sqlx::Error> {
+pub async fn insert(
+    pool: &sqlx::PgPool,
+    data: &Vec<u8>,
+    file_type: &str,
+) -> Result<uuid::Uuid, sqlx::Error> {
     let result = sqlx::query(
         r#"
-        INSERT INTO "coverartQueue" (file_type) VALUES($1) RETURNING id;
+        INSERT INTO "coverartQueue" (data, file_type) VALUES($1, $2) RETURNING id;
         "#,
     )
+    .bind(data)
     .bind(file_type)
     .fetch_one(pool)
     .await
@@ -115,3 +120,78 @@ pub async fn get_coverart_queue_with_song_queue_id(
         Err(_) => Err(sqlx::Error::RowNotFound),
     }
 }
+
+pub async fn get_coverart_queue_data_with_id(
+    pool: &sqlx::PgPool,
+    id: &uuid::Uuid,
+) -> Result<Vec<u8>, sqlx::Error> {
+    let result = sqlx::query(
+        r#"
+        SELECT data FROM "coverartQueue" WHERE id = $1;
+        "#,
+    )
+    .bind(id)
+    .fetch_one(pool)
+    .await
+    .map_err(|e| {
+        eprintln!("Error querying data: {e:?}");
+    });
+
+    match result {
+        Ok(row) => Ok(row
+            .try_get("data")
+            .map_err(|_e| sqlx::Error::RowNotFound)
+            .unwrap()),
+        Err(_) => Err(sqlx::Error::RowNotFound),
+    }
+}
+
+pub async fn get_coverart_queue_data_with_song_queue_id(
+    pool: &sqlx::PgPool,
+    song_queue_id: &uuid::Uuid,
+) -> Result<Vec<u8>, sqlx::Error> {
+    let result = sqlx::query(
+        r#"
+        SELECT data FROM "coverartQueue" WHERE song_queue_id = $1;
+        "#,
+    )
+    .bind(song_queue_id)
+    .fetch_one(pool)
+    .await
+    .map_err(|e| {
+        eprintln!("Error querying data: {e}");
+    });
+
+    match result {
+        Ok(row) => Ok(row
+            .try_get("data")
+            .map_err(|_e| sqlx::Error::RowNotFound)
+            .unwrap()),
+        Err(_) => Err(sqlx::Error::RowNotFound),
+    }
+}
+
+pub async fn wipe_data(
+    pool: &sqlx::PgPool,
+    coverart_queue_id: &uuid::Uuid,
+) -> Result<uuid::Uuid, sqlx::Error> {
+    let result = sqlx::query(
+        r#"
+        UPDATE "coverartQueue" SET data = NULL WHERE id = $1 RETURNING id;
+        "#,
+    )
+    .bind(coverart_queue_id)
+    .fetch_one(pool)
+    .await
+    .map_err(|e| {
+        eprintln!("Error updating query: {e}");
+    });
+
+    match result {
+        Ok(row) => Ok(row
+            .try_get("id")
+            .map_err(|_e| sqlx::Error::RowNotFound)
+            .unwrap()),
+        Err(_) => Err(sqlx::Error::RowNotFound),
+    }
+}

src/repo/queue/data.rs

@@ -1,204 +0,0 @@
-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 update_file_key(
-    pool: &sqlx::PgPool,
-    id: &uuid::Uuid,
-    file_key: &str,
-) -> Result<(), sqlx::Error> {
-    match sqlx::query(
-        r#"
-        UPDATE "songQueueData" SET file_key = $1 WHERE id = $2;
-        "#,
-    )
-    .bind(file_key)
-    .bind(id)
-    .execute(pool)
-    .await
-    {
-        Ok(_row) => Ok(()),
-        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),
-    }
-}
-
-pub mod queue {
-    pub mod coverart {
-        use sqlx::Row;
-
-        pub async fn insert(
-            pool: &sqlx::PgPool,
-            file_key: &str,
-            bucket: &str,
-            region: &str,
-            coverart_queue_id: &uuid::Uuid,
-        ) -> Result<uuid::Uuid, sqlx::Error> {
-            match sqlx::query(
-                r#"
-                    INSERT INTO "coverartQueueData" (file_key, bucket, region, coverart_queue_id) 
-                    VALUES($1, $2, $3, $4) RETURNING id;
-                    "#,
-            )
-            .bind(file_key)
-            .bind(bucket)
-            .bind(region)
-            .bind(coverart_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 update_file_key(
-            pool: &sqlx::PgPool,
-            id: &uuid::Uuid,
-            file_key: &str,
-        ) -> Result<(), sqlx::Error> {
-            match sqlx::query(
-                r#"
-                    UPDATE "coverartQueueData" SET file_key = $1 WHERE id = $2;
-                    "#,
-            )
-            .bind(file_key)
-            .bind(id)
-            .execute(pool)
-            .await
-            {
-                Ok(_row) => Ok(()),
-                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, coverart_queue_id FROM "coverartQueueData"
-                    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 coverart_queue_id: uuid::Uuid = row.try_get("coverart_queue_id")?;
-
-                    Ok((*id, file_key, bucket, region, coverart_queue_id))
-                }
-                Err(err) => Err(err),
-            }
-        }
-
-        pub async fn get_with_coverart_queue_id(
-            pool: &sqlx::PgPool,
-            coverart_queue_id: &uuid::Uuid,
-        ) -> Result<(uuid::Uuid, String, String, String, uuid::Uuid), sqlx::Error> {
-            match sqlx::query(
-                r#"
-                    SELECT id, file_key, bucket, region, coverart_queue_id FROM "coverartQueueData"
-                    WHERE coverart_queue_id = $1
-                    "#,
-            )
-            .bind(coverart_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, *coverart_queue_id))
-                }
-                Err(err) => Err(err),
-            }
-        }
-    }
-}

src/repo/queue/mod.rs

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

src/repo/queue/song.rs

@@ -24,14 +24,16 @@ pub mod dbtype {
 
 pub async fn insert(
     pool: &sqlx::PgPool,
+    data: &Vec<u8>,
     filename: &String,
     status: &String,
 ) -> Result<uuid::Uuid, sqlx::Error> {
     let result = sqlx::query(
         r#"
-        INSERT INTO "songQueue" (filename, status) VALUES($1, $2) RETURNING id;
+        INSERT INTO "songQueue" (data, filename, status) VALUES($1, $2, $3) RETURNING id;
         "#,
     )
+    .bind(data)
     .bind(filename)
     .bind(status)
     .fetch_one(pool)
@@ -251,3 +253,51 @@ pub async fn get_song_queue(
         Err(_err) => Err(sqlx::Error::RowNotFound),
     }
 }
+
+pub async fn wipe_data(pool: &sqlx::PgPool, id: &uuid::Uuid) -> Result<uuid::Uuid, sqlx::Error> {
+    let result = sqlx::query(
+        r#"
+        UPDATE "songQueue" SET data = NULL WHERE id = $1 RETURNING id;
+        "#,
+    )
+    .bind(id)
+    .fetch_one(pool)
+    .await
+    .map_err(|e| {
+        eprintln!("Error updating record: {e}");
+    });
+
+    match result {
+        Ok(row) => Ok(row
+            .try_get("id")
+            .map_err(|_e| sqlx::Error::RowNotFound)
+            .unwrap()),
+        Err(_) => Err(sqlx::Error::RowNotFound),
+    }
+}
+
+pub async fn get_data(pool: &sqlx::PgPool, id: &uuid::Uuid) -> Result<Vec<u8>, sqlx::Error> {
+    let result = sqlx::query(
+        r#"
+        SELECT data FROM "songQueue"
+        WHERE id = $1;
+        "#,
+    )
+    .bind(id)
+    .fetch_one(pool)
+    .await
+    .map_err(|e| {
+        eprintln!("Error inserting: {e}");
+    });
+
+    match result {
+        Ok(row) => {
+            let data = row
+                .try_get("data")
+                .map_err(|_e| sqlx::Error::RowNotFound)
+                .unwrap();
+            Ok(data)
+        }
+        Err(_err) => Err(sqlx::Error::RowNotFound),
+    }
+}

src/repo/song.rs

@@ -6,8 +6,8 @@ pub async fn insert(
 ) -> Result<(time::OffsetDateTime, uuid::Uuid), sqlx::Error> {
     let result = sqlx::query(
         r#"
-        INSERT INTO "song" (title, artist, album_artist, album, genre, year, track, disc, track_count, disc_count, duration, audio_type, filename, directory, file_key, user_id) 
+        INSERT INTO "song" (title, artist, album_artist, album, genre, year, track, disc, track_count, disc_count, duration, audio_type, filename, directory, user_id) 
-        VALUES($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16) RETURNING date_created, id;
+        VALUES($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15) RETURNING date_created, id;
         "#
         )
         .bind(&song.title)
@@ -24,7 +24,6 @@ pub async fn insert(
         .bind(&song.audio_type)
         .bind(&song.filename)
         .bind(&song.directory)
-        .bind(&song.file_key)
         .bind(song.user_id)
         .fetch_one(pool)
         .await
@@ -134,10 +133,6 @@ pub async fn get_song(
                     .try_get("directory")
                     .map_err(|_e| sqlx::Error::RowNotFound)
                     .unwrap(),
-                file_key: row
-                    .try_get("file_key")
-                    .map_err(|_e| sqlx::Error::RowNotFound)
-                    .unwrap(),
                 date_created: Some(date_created_time),
                 user_id: row
                     .try_get("user_id")
@@ -233,10 +228,6 @@ pub async fn get_all_songs(pool: &sqlx::PgPool) -> Result<Vec<simodels::song::So
                         .try_get("directory")
                         .map_err(|_e| sqlx::Error::RowNotFound)
                         .unwrap(),
-                    file_key: row
-                        .try_get("file_key")
-                        .map_err(|_e| sqlx::Error::RowNotFound)
-                        .unwrap(),
                     date_created: Some(date_created_time),
                     user_id: row
                         .try_get("user_id")
@@ -263,7 +254,7 @@ pub async fn delete_song(
         r#"
         DELETE FROM "song"
         WHERE id = $1
-        RETURNING id, title, artist, album, album_artist, genre, year, disc, track, track_count, disc_count, duration, audio_type, date_created, filename, directory, file_key, user_id
+        RETURNING id, title, artist, album, album_artist, genre, year, disc, track, track_count, disc_count, duration, audio_type, date_created, filename, directory, user_id
         "#,
     )
     .bind(id)
@@ -341,10 +332,6 @@ pub async fn delete_song(
                     .try_get("directory")
                     .map_err(|_e| sqlx::Error::RowNotFound)
                     .unwrap(),
-                file_key: row
-                    .try_get("file_key")
-                    .map_err(|_e| sqlx::Error::RowNotFound)
-                    .unwrap(),
                 date_created: Some(date_created_time),
                 user_id: row
                     .try_get("user_id")

src/util/mod.rs

@@ -1,17 +0,0 @@
-pub mod maze {
-    pub fn get_config() -> labyrinth::config::Config {
-        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");
-
-        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,
-        }
-    }
-}

test_migrations/20250725213944_init.sql

@@ -6,17 +6,10 @@ CREATE TABLE IF NOT EXISTS "songQueue" (
     id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
     filename TEXT NOT NULL,
     status TEXT CHECK (status IN ('pending', 'ready', 'processing', 'done')),
+    data BYTEA NULL,
     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(),
@@ -28,18 +21,11 @@ CREATE TABLE IF NOT EXISTS "metadataQueue" (
 -- Table to store queued coverart
 CREATE TABLE IF NOT EXISTS "coverartQueue" (
     id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
+    data BYTEA NULL,
     file_type TEXT NOT NULL,
     song_queue_id UUID NULL
 );
 
-CREATE TABLE IF NOT EXISTS "coverartQueueData" (
-    id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
-    file_key TEXT NOT NULL,
-    bucket TEXT NOT NULL,
-    region TEXT NOT NULL,
-    coverart_queue_id UUID NOT NULL
-);
-
 -- Create an index for better query performance
 CREATE INDEX metadata_queue_data_metadata ON "metadataQueue" USING gin (metadata);
 
@@ -61,7 +47,6 @@ CREATE TABLE IF NOT EXISTS "song" (
     date_created timestamptz DEFAULT now(),
     filename TEXT NOT NULL,
     directory TEXT NOT NULL,
-    file_key TEXT NOT NULL,
     user_id UUID NULL
 );
 
@@ -72,6 +57,5 @@ CREATE TABLE IF NOT EXISTS "coverart" (
     directory TEXT NOT NULL,
     filename TEXT NOT NULL,
     file_type TEXT NOT NULL,
-    file_key TEXT NOT NULL,
     song_id UUID NOT NULL
 );

test_migrations/20250725214735_song_queue_processed.sql

@@ -1,11 +1,6 @@
 -- Add migration script here
-INSERT INTO "song" (id, title, artist, album_artist, album, genre, year, track, disc, track_count, disc_count, duration, audio_type, date_created, filename, directory, file_key, user_id) 
+INSERT INTO "song" (id, title, artist, album_artist, album, genre, year, track, disc, track_count, disc_count, duration, audio_type, date_created, filename, directory, user_id) VALUES('44cf7940-34ff-489f-9124-d0ec90a55af9', 'Hypocrite Like The Rest', 'Kuoth', 'Kuoth', 'I', 'Alternative Hip-Hop', 2020, 1, 1, 9, 1, 139, 'flac', '2020-01-01 13:00:00-05', 'track01.flac', 'tests/I', '47491f9b-725a-4ba4-b9a5-711e1be46670');
-VALUES('44cf7940-34ff-489f-9124-d0ec90a55af9', 'Hypocrite Like The Rest', 'Kuoth', 'Kuoth', 'I', 'Alternative Hip-Hop', 2020, 1, 1, 9, 1, 139, 'flac', '2020-01-01 13:00:00-05', 'track01.flac', 'tests/I', 'processed/song/track01.flac', '47491f9b-725a-4ba4-b9a5-711e1be46670');
+INSERT INTO "coverart" (id, title, directory, filename, file_type, song_id) VALUES('996122cd-5ae9-4013-9934-60768d3006ed', 'I', 'tests/I', 'Coverart-1.jpg', 'jpeg', '44cf7940-34ff-489f-9124-d0ec90a55af9');
 
-INSERT INTO "coverart" (id, title, directory, filename, file_type, file_key, song_id) 
+INSERT INTO "song" (id, title, artist, album_artist, album, genre, year, track, disc, track_count, disc_count, duration, audio_type, date_created, filename, directory, user_id) VALUES('94cf7940-34ff-489f-9124-d0ec90a55af4', 'It''s Too Late', 'Kuoth', 'Kuoth', 'I', 'Alternative Hip-Hop', 2020, 2, 1, 9, 1, 116, 'flac', '2020-01-01 13:01:00-05', 'track02.flac', 'tests/I', '47491f9b-725a-4ba4-b9a5-711e1be46670');
-VALUES('996122cd-5ae9-4013-9934-60768d3006ed', 'I', 'tests/I', 'Coverart-1.jpg', 'jpeg', 'processed/coverart/Coverart-1.jpg', '44cf7940-34ff-489f-9124-d0ec90a55af9');
+INSERT INTO "coverart" (id, title, directory, filename, file_type, song_id) VALUES('d96122cd-5ae9-4013-9934-60768d3006e9', 'I', 'tests/I', 'Coverart-2.jpg', 'jpeg', '94cf7940-34ff-489f-9124-d0ec90a55af4');
-
-INSERT INTO "song" (id, title, artist, album_artist, album, genre, year, track, disc, track_count, disc_count, duration, audio_type, date_created, filename, directory, file_key, user_id) 
-VALUES('94cf7940-34ff-489f-9124-d0ec90a55af4', 'It''s Too Late', 'Kuoth', 'Kuoth', 'I', 'Alternative Hip-Hop', 2020, 2, 1, 9, 1, 116, 'flac', '2020-01-01 13:01:00-05', 'track02.flac', 'tests/I', 'processed/song/track02.flac', '47491f9b-725a-4ba4-b9a5-711e1be46670');
-INSERT INTO "coverart" (id, title, directory, filename, file_type, file_key, song_id) 
-VALUES('d96122cd-5ae9-4013-9934-60768d3006e9', 'I', 'tests/I', 'Coverart-2.jpg', 'jpeg', 'processed/coverart/Coverart-2.jpg', '94cf7940-34ff-489f-9124-d0ec90a55af4');