Add system ID field to db

Cargo.toml

@@ -17,10 +17,11 @@ rust-s3 = { version = "0.33.0", default-features = false, features = ["tokio-rus
 serde = { version = "1.0.196", features = ["derive"] }
 serde_json = "1.0.113"
 sha2 = "0.10.8"
-sqlx = { version = "0.7.3", features = ["runtime-tokio", "postgres", "time"] }
+sqlx = { version = "0.7.3", features = ["runtime-tokio", "postgres", "time", "uuid"] }
 thiserror = "1.0.56"
 time = "0.3.34"
 tokio = { version = "1.36.0", features = ["full"] }
 tracing = "0.1.40"
 tracing-subscriber = "0.3.18"
+uuid = { version = "1.7.0", features = ["serde"] }
 webp = "0.2.6"

src/db.rs

@@ -2,6 +2,7 @@ use crate::ImageKind;
 use s3::creds::time::OffsetDateTime;
 use serde::Serialize;
 use sqlx::{Executor, FromRow, PgPool, Postgres, Transaction};
+use uuid::Uuid;
 
 #[derive(FromRow)]
 pub struct ImageMeta {
@@ -18,6 +19,7 @@ pub struct ImageMeta {
     pub original_file_size: Option<i32>,
     pub original_type: Option<String>,
     pub uploaded_by_account: Option<i64>,
+    pub uploaded_by_system: Option<Uuid>,
 }
 
 #[derive(FromRow, Serialize)]
@@ -90,7 +92,7 @@ pub async fn add_image(pool: &PgPool, meta: ImageMeta) -> anyhow::Result<bool> {
         ImageKind::Banner => "banner",
     };
 
-    let res = sqlx::query("insert into images (id, url, original_url, file_size, width, height, original_file_size, original_type, original_attachment_id, kind, uploaded_by_account, uploaded_at) values ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, (now() at time zone 'utc')) on conflict (id) do nothing")
+    let res = sqlx::query("insert into images (id, url, original_url, file_size, width, height, original_file_size, original_type, original_attachment_id, kind, uploaded_by_account, uploaded_by_system, uploaded_at) values ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, (now() at time zone 'utc')) on conflict (id) do nothing")
         .bind(meta.id)
         .bind(meta.url)
         .bind(meta.original_url)
@@ -102,6 +104,7 @@ pub async fn add_image(pool: &PgPool, meta: ImageMeta) -> anyhow::Result<bool> {
         .bind(meta.original_attachment_id)
         .bind(kind_str)
         .bind(meta.uploaded_by_account)
+        .bind(meta.uploaded_by_system)
         .execute(pool).await?;
     Ok(res.rows_affected() > 0)
 }

src/init.sql

@@ -18,4 +18,6 @@ create index on images (original_url);
 create index on images (original_attachment_id);
 create index on images (uploaded_by_account);
 
-create table if not exists image_queue (itemid serial primary key, url text not null, kind text not null);
+create table if not exists image_queue (itemid serial primary key, url text not null, kind text not null);
+
+alter table images add column if not exists uploaded_by_system uuid;

src/main.rs

@@ -24,6 +24,7 @@ use sqlx::PgPool;
 use std::sync::Arc;
 use thiserror::Error;
 use tracing::{error, info};
+use uuid::Uuid;
 
 #[derive(Error, Debug)]
 pub enum PKAvatarError {
@@ -83,6 +84,7 @@ pub struct PullRequest {
     url: String,
     kind: ImageKind,
     uploaded_by: Option<u64>, // should be String? serde makes this hard :/
+    system_id: Option<Uuid>,
 
     #[serde(default)]
     force: bool,
@@ -134,6 +136,7 @@ async fn pull(
             kind: req.kind,
             uploaded_at: None,
             uploaded_by_account: req.uploaded_by.map(|x| x as i64),
+            uploaded_by_system: req.system_id,
         },
     )
     .await?;

src/migrate.rs

@@ -41,6 +41,7 @@ pub async fn handle_item_inner(
             kind: item.kind,
             uploaded_at: None,
             uploaded_by_account: None,
+            uploaded_by_system: None,
         },
     )
     .await?;