Move to FKs

src/web/routes/dashboard/api/images.rs

@@ -114,9 +114,9 @@ pub async fn upload_image(
         warn!("S3 image upload returned {}", response.status_code());
         return Err(error(Status::BadGateway, "Could not store image. Please try again."));
     }
-    if let Err(err) = sqlx::query("INSERT INTO image_uploads (uploader, url) VALUES (?, ?)")
+    if let Err(err) = sqlx::query("INSERT INTO image_uploads (uploader, path) VALUES (?, ?)")
         .bind(uploader.0)
-        .bind(&url)
+        .bind(&key)
         .execute(pool.inner())
         .await
     {
@@ -304,11 +304,18 @@ mod tests {
         assert_eq!(response.status(), Status::Ok);
         let response = response.into_json::<Value>().await.unwrap();
         let url = response["url"].as_str().unwrap();
-        let row: (u64, String) = sqlx::query_as("SELECT uploader, url FROM image_uploads")
-            .fetch_one(&pool)
-            .await
-            .unwrap();
-        assert_eq!(row, (123456789012345678, url.to_string()));
+        let row: (u64, String) =
+            sqlx::query_as("SELECT uploader, path COLLATE utf8mb4_unicode_ci FROM image_uploads")
+                .fetch_one(&pool)
+                .await
+                .unwrap();
+        assert_eq!(
+            row,
+            (
+                123456789012345678,
+                url.strip_prefix("https://images.example.com/").unwrap().to_string()
+            )
+        );
         let (headers, body) = storage.await.unwrap();
         assert!(headers.starts_with("PUT /images/uploads/"));
         assert!(headers.to_lowercase().contains("content-type: image/png"));