add create/update times too

.sqlx/query-cbdaa45597de14d1eb6dc0f6a95788d56334757bb3d03eda2eb64df3ba2a0144.json

@@ -1,6 +1,6 @@
 {
   "db_name": "MySQL",
-  "query": "\nSELECT\n    j.status as `job_status: enums::common::job_status_plus::JobStatusPlus`,\n    j.failure_reason as job_failure_reason,\n    wle.credits_delta,\n    wle.maybe_linked_refund_ledger_token as `maybe_linked_refund_ledger_token: tokens::tokens::wallet_ledger_entries::WalletLedgerEntryToken`,\n    j.on_success_result_entity_token as `on_success_result_media_token: tokens::tokens::media_files::MediaFileToken`,\n    j.token as `job_token: tokens::tokens::generic_inference_jobs::InferenceJobToken`,\n    wle.token as `wallet_ledger_entry_token: tokens::tokens::wallet_ledger_entries::WalletLedgerEntryToken`,\n    wle.entry_type as `wallet_ledger_entry_type: enums::by_table::wallet_ledger_entries::wallet_ledger_entry_type::WalletLedgerEntryType`\nFROM generic_inference_jobs as j\nLEFT OUTER JOIN users as u\n    ON j.maybe_creator_user_token = u.token\nLEFT OUTER JOIN wallet_ledger_entries as wle\n    ON wle.maybe_entity_ref = j.token\nWHERE u.token = ?\nORDER BY j.id DESC\n    ",
+  "query": "\nSELECT\n    j.status as `job_status: enums::common::job_status_plus::JobStatusPlus`,\n    j.failure_reason as job_failure_reason,\n    wle.credits_delta,\n    wle.maybe_linked_refund_ledger_token as `maybe_linked_refund_ledger_token: tokens::tokens::wallet_ledger_entries::WalletLedgerEntryToken`,\n    j.on_success_result_entity_token as `on_success_result_media_token: tokens::tokens::media_files::MediaFileToken`,\n    j.token as `job_token: tokens::tokens::generic_inference_jobs::InferenceJobToken`,\n    wle.token as `wallet_ledger_entry_token: tokens::tokens::wallet_ledger_entries::WalletLedgerEntryToken`,\n    wle.entry_type as `wallet_ledger_entry_type: enums::by_table::wallet_ledger_entries::wallet_ledger_entry_type::WalletLedgerEntryType`,\n    j.maybe_external_third_party as `maybe_external_third_party: enums::by_table::generic_inference_jobs::inference_job_external_third_party::InferenceJobExternalThirdParty`,\n    j.maybe_external_third_party_id,\n    j.created_at,\n    j.updated_at\nFROM generic_inference_jobs as j\nLEFT OUTER JOIN users as u\n    ON j.maybe_creator_user_token = u.token\nLEFT OUTER JOIN wallet_ledger_entries as wle\n    ON wle.maybe_entity_ref = j.token\nWHERE u.token = ?\nORDER BY j.id DESC\n    ",
   "describe": {
     "columns": [
       {
@@ -82,6 +82,46 @@
           "char_set": 224,
           "max_size": 128
         }
+      },
+      {
+        "ordinal": 8,
+        "name": "maybe_external_third_party: enums::by_table::generic_inference_jobs::inference_job_external_third_party::InferenceJobExternalThirdParty",
+        "type_info": {
+          "type": "VarString",
+          "flags": "MULTIPLE_KEY | BINARY",
+          "char_set": 224,
+          "max_size": 64
+        }
+      },
+      {
+        "ordinal": 9,
+        "name": "maybe_external_third_party_id",
+        "type_info": {
+          "type": "VarString",
+          "flags": "MULTIPLE_KEY | BINARY",
+          "char_set": 224,
+          "max_size": 256
+        }
+      },
+      {
+        "ordinal": 10,
+        "name": "created_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | TIMESTAMP",
+          "char_set": 63,
+          "max_size": 19
+        }
+      },
+      {
+        "ordinal": 11,
+        "name": "updated_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "NOT_NULL | BINARY | TIMESTAMP | ON_UPDATE_NOW",
+          "char_set": 63,
+          "max_size": 19
+        }
       }
     ],
     "parameters": {
@@ -95,8 +135,12 @@
       true,
       false,
       true,
-      true
+      true,
+      true,
+      true,
+      false,
+      false
     ]
   },
-  "hash": "0757d81ba153b2ad2df25df3dd92b655ef08b95f5f83251bf3573f9be3a9f8d1"
+  "hash": "cbdaa45597de14d1eb6dc0f6a95788d56334757bb3d03eda2eb64df3ba2a0144"
 }

crates/api_clients/artcraft/artcraft_api_defs/src/moderation/jobs/user/list_user_jobs.rs

@@ -1,3 +1,5 @@
+use chrono::{DateTime, Utc};
+use enums::by_table::generic_inference_jobs::inference_job_external_third_party::InferenceJobExternalThirdParty;
 use enums::by_table::wallet_ledger_entries::wallet_ledger_entry_type::WalletLedgerEntryType;
 use enums::common::job_status_plus::JobStatusPlus;
 use serde_derive::{Deserialize, Serialize};
@@ -30,4 +32,8 @@ pub struct ListUserJobsEntry {
   pub job_token: InferenceJobToken,
   pub wallet_ledger_entry_token: Option<WalletLedgerEntryToken>,
   pub wallet_ledger_entry_type: Option<WalletLedgerEntryType>,
+  pub maybe_external_third_party: Option<InferenceJobExternalThirdParty>,
+  pub maybe_external_third_party_id: Option<String>,
+  pub created_at: DateTime<Utc>,
+  pub updated_at: DateTime<Utc>,
 }

crates/schema/database/mysql_queries/src/queries/generic_inference/web/list_user_jobs_for_moderation.rs

@@ -1,7 +1,9 @@
 use anyhow::anyhow;
+use chrono::{DateTime, Utc};
 use log::warn;
 use sqlx::MySqlPool;
 
+use enums::by_table::generic_inference_jobs::inference_job_external_third_party::InferenceJobExternalThirdParty;
 use enums::by_table::wallet_ledger_entries::wallet_ledger_entry_type::WalletLedgerEntryType;
 use enums::common::job_status_plus::JobStatusPlus;
 use errors::AnyhowResult;
@@ -19,6 +21,10 @@ pub struct UserJobForModerationResult {
   pub job_token: InferenceJobToken,
   pub wallet_ledger_entry_token: Option<WalletLedgerEntryToken>,
   pub wallet_ledger_entry_type: Option<WalletLedgerEntryType>,
+  pub maybe_external_third_party: Option<InferenceJobExternalThirdParty>,
+  pub maybe_external_third_party_id: Option<String>,
+  pub created_at: DateTime<Utc>,
+  pub updated_at: DateTime<Utc>,
 }
 
 pub async fn list_user_jobs_for_moderation(
@@ -36,7 +42,11 @@ SELECT
     j.on_success_result_entity_token as `on_success_result_media_token: tokens::tokens::media_files::MediaFileToken`,
     j.token as `job_token: tokens::tokens::generic_inference_jobs::InferenceJobToken`,
     wle.token as `wallet_ledger_entry_token: tokens::tokens::wallet_ledger_entries::WalletLedgerEntryToken`,
-    wle.entry_type as `wallet_ledger_entry_type: enums::by_table::wallet_ledger_entries::wallet_ledger_entry_type::WalletLedgerEntryType`
+    wle.entry_type as `wallet_ledger_entry_type: enums::by_table::wallet_ledger_entries::wallet_ledger_entry_type::WalletLedgerEntryType`,
+    j.maybe_external_third_party as `maybe_external_third_party: enums::by_table::generic_inference_jobs::inference_job_external_third_party::InferenceJobExternalThirdParty`,
+    j.maybe_external_third_party_id,
+    j.created_at,
+    j.updated_at
 FROM generic_inference_jobs as j
 LEFT OUTER JOIN users as u
     ON j.maybe_creator_user_token = u.token

crates/schema/public/enums/src/by_table/generic_inference_jobs/inference_job_external_third_party.rs

@@ -9,7 +9,7 @@ use strum::EnumIter;
 ///
 /// YOU CAN ADD NEW VALUES, BUT DO NOT CHANGE EXISTING VALUES WITHOUT A MIGRATION STRATEGY.
 #[cfg_attr(test, derive(EnumIter, EnumCount))]
-#[derive(Clone, Copy, Eq, PartialEq, Hash, Ord, PartialOrd, Deserialize, Serialize, Default)]
+#[derive(Clone, Copy, Eq, PartialEq, Hash, Ord, PartialOrd, Deserialize, Serialize, Default, utoipa::ToSchema)]
 #[serde(rename_all = "snake_case")]
 pub enum InferenceJobExternalThirdParty {
   /// Fal jobs

crates/service/web/storyteller_web/src/docs/api_doc.rs

@@ -197,6 +197,7 @@ use enums::by_table::comments::comment_entity_type::CommentEntityType;
 use enums::by_table::featured_items::featured_item_entity_type::FeaturedItemEntityType;
 use enums::by_table::generic_inference_jobs::frontend_failure_category::FrontendFailureCategory;
 use enums::by_table::generic_inference_jobs::inference_category::InferenceCategory;
+use enums::by_table::generic_inference_jobs::inference_job_external_third_party::InferenceJobExternalThirdParty;
 use enums::by_table::media_files::media_file_animation_type::MediaFileAnimationType;
 use enums::by_table::media_files::media_file_class::MediaFileClass;
 use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory;
@@ -680,6 +681,7 @@ use crate::http_server::endpoints::media_files::list::list_batch_generated_redux
     ListUserJobsPathInfo,
     ListUserJobsResponse,
     ListUserJobsEntry,
+    InferenceJobExternalThirdParty,
     ListUserWalletsPathInfo,
     ListUserWalletsResponse,
     ListUserWalletsEntry,

crates/service/web/storyteller_web/src/http_server/endpoints/moderation/jobs/user/list_user_jobs_handler.rs

@@ -56,6 +56,10 @@ pub async fn list_user_jobs_handler(
     job_token: row.job_token,
     wallet_ledger_entry_token: row.wallet_ledger_entry_token,
     wallet_ledger_entry_type: row.wallet_ledger_entry_type,
+    maybe_external_third_party: row.maybe_external_third_party,
+    maybe_external_third_party_id: row.maybe_external_third_party_id,
+    created_at: row.created_at,
+    updated_at: row.updated_at,
   }).collect();
 
   Ok(Json(ListUserJobsResponse {