From 71f4650d080c67e72f6d6557a14dd08c26ce8034 Mon Sep 17 00:00:00 2001 From: Bryan Stitt Date: Thu, 27 Jul 2023 12:35:56 -0700 Subject: [PATCH] auto-generate entities. this breaks things. manual patching required --- Cargo.lock | 2 +- entities/Cargo.toml | 2 +- entities/src/admin.rs | 2 +- .../src/admin_increase_balance_receipt.rs | 2 +- entities/src/admin_trail.rs | 2 +- entities/src/balance.rs | 4 ++-- .../src/increase_on_chain_balance_receipt.rs | 2 +- entities/src/login.rs | 11 +++------ entities/src/mod.rs | 3 +-- entities/src/pending_login.rs | 9 ++------ entities/src/prelude.rs | 2 +- entities/src/referee.rs | 6 ++--- entities/src/referrer.rs | 2 +- entities/src/revert_log.rs | 7 +----- entities/src/rpc_accounting.rs | 6 ++--- entities/src/rpc_accounting_v2.rs | 23 ++++--------------- entities/src/rpc_key.rs | 23 +++++-------------- entities/src/sea_orm_active_enums.rs | 12 +++++++++- entities/src/secondary_user.rs | 2 +- .../src/stripe_increase_balance_receipt.rs | 2 +- entities/src/user.rs | 9 ++------ entities/src/user_tier.rs | 2 +- 22 files changed, 49 insertions(+), 86 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6fb8e4ec..a74c140a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1757,7 +1757,7 @@ dependencies = [ [[package]] name = "entities" -version = "0.42.0" +version = "0.42.1" dependencies = [ "ethers", "sea-orm", diff --git a/entities/Cargo.toml b/entities/Cargo.toml index 44872226..38350107 100644 --- a/entities/Cargo.toml +++ b/entities/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "entities" -version = "0.42.0" +version = "0.42.1" edition = "2021" [lib] diff --git a/entities/src/admin.rs b/entities/src/admin.rs index 3b8dc7df..d1e40568 100644 --- a/entities/src/admin.rs +++ b/entities/src/admin.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3 +//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1 use sea_orm::entity::prelude::*; use serde::{Deserialize, Serialize}; diff --git a/entities/src/admin_increase_balance_receipt.rs b/entities/src/admin_increase_balance_receipt.rs index 1723c52b..5d0d1497 100644 --- a/entities/src/admin_increase_balance_receipt.rs +++ b/entities/src/admin_increase_balance_receipt.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3 +//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1 use sea_orm::entity::prelude::*; use serde::{Deserialize, Serialize}; diff --git a/entities/src/admin_trail.rs b/entities/src/admin_trail.rs index 185f75d7..08017be4 100644 --- a/entities/src/admin_trail.rs +++ b/entities/src/admin_trail.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3 +//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1 use sea_orm::entity::prelude::*; use serde::{Deserialize, Serialize}; diff --git a/entities/src/balance.rs b/entities/src/balance.rs index e0d7a39c..ec1b03f5 100644 --- a/entities/src/balance.rs +++ b/entities/src/balance.rs @@ -1,9 +1,9 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3 +//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1 use sea_orm::entity::prelude::*; use serde::{Deserialize, Serialize}; -#[derive(Clone, Debug, Default, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)] +#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)] #[sea_orm(table_name = "balance")] pub struct Model { #[sea_orm(primary_key)] diff --git a/entities/src/increase_on_chain_balance_receipt.rs b/entities/src/increase_on_chain_balance_receipt.rs index 31633cac..6ab2cf2b 100644 --- a/entities/src/increase_on_chain_balance_receipt.rs +++ b/entities/src/increase_on_chain_balance_receipt.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3 +//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1 use sea_orm::entity::prelude::*; use serde::{Deserialize, Serialize}; diff --git a/entities/src/login.rs b/entities/src/login.rs index 094ef91f..fc6f7b21 100644 --- a/entities/src/login.rs +++ b/entities/src/login.rs @@ -1,6 +1,5 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3 +//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1 -use crate::serialization; use sea_orm::entity::prelude::*; use serde::{Deserialize, Serialize}; @@ -10,14 +9,10 @@ pub struct Model { #[sea_orm(primary_key)] pub id: u64, #[sea_orm(column_type = "Binary(BlobSize::Blob(Some(16)))", unique)] - #[serde( - serialize_with = "serialization::uuid_as_ulid", - deserialize_with = "serialization::ulid_to_uuid" - )] - pub bearer_token: Uuid, + pub bearer_token: Vec, pub user_id: u64, pub expires_at: DateTimeUtc, - pub read_only: bool, + pub read_only: i8, } #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)] diff --git a/entities/src/mod.rs b/entities/src/mod.rs index 4f8c1289..d560c1d5 100644 --- a/entities/src/mod.rs +++ b/entities/src/mod.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3 +//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1 pub mod prelude; @@ -17,7 +17,6 @@ pub mod rpc_accounting_v2; pub mod rpc_key; pub mod sea_orm_active_enums; pub mod secondary_user; -pub mod serialization; pub mod stripe_increase_balance_receipt; pub mod user; pub mod user_tier; diff --git a/entities/src/pending_login.rs b/entities/src/pending_login.rs index 344bd7d9..1b19c235 100644 --- a/entities/src/pending_login.rs +++ b/entities/src/pending_login.rs @@ -1,6 +1,5 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3 +//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1 -use crate::serialization; use sea_orm::entity::prelude::*; use serde::{Deserialize, Serialize}; @@ -10,11 +9,7 @@ pub struct Model { #[sea_orm(primary_key)] pub id: u64, #[sea_orm(column_type = "Binary(BlobSize::Blob(Some(16)))", unique)] - #[serde( - serialize_with = "serialization::uuid_as_ulid", - deserialize_with = "serialization::ulid_to_uuid" - )] - pub nonce: Uuid, + pub nonce: Vec, #[sea_orm(column_type = "Text")] pub message: String, pub expires_at: DateTimeUtc, diff --git a/entities/src/prelude.rs b/entities/src/prelude.rs index 821e997f..6d7a7bd9 100644 --- a/entities/src/prelude.rs +++ b/entities/src/prelude.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3 +//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1 pub use super::admin::Entity as Admin; pub use super::admin_increase_balance_receipt::Entity as AdminIncreaseBalanceReceipt; diff --git a/entities/src/referee.rs b/entities/src/referee.rs index 0a42cbb9..ac3a6224 100644 --- a/entities/src/referee.rs +++ b/entities/src/referee.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3 +//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1 use sea_orm::entity::prelude::*; use serde::{Deserialize, Serialize}; @@ -9,13 +9,13 @@ pub struct Model { #[sea_orm(primary_key)] pub id: i32, #[sea_orm(column_type = "Decimal(Some((20, 10)))")] - pub one_time_bonus_applied_for_referee: Decimal, - #[sea_orm(column_type = "Decimal(Some((20, 10)))")] pub credits_applied_for_referrer: Decimal, pub referral_start_date: DateTime, pub used_referral_code: i32, #[sea_orm(unique)] pub user_id: u64, + #[sea_orm(column_type = "Decimal(Some((20, 10)))")] + pub one_time_bonus_applied_for_referee: Decimal, } #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)] diff --git a/entities/src/referrer.rs b/entities/src/referrer.rs index 8b959ac5..0380c34d 100644 --- a/entities/src/referrer.rs +++ b/entities/src/referrer.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3 +//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1 use sea_orm::entity::prelude::*; use serde::{Deserialize, Serialize}; diff --git a/entities/src/revert_log.rs b/entities/src/revert_log.rs index f377bbbe..505b335e 100644 --- a/entities/src/revert_log.rs +++ b/entities/src/revert_log.rs @@ -1,7 +1,6 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3 +//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1 use super::sea_orm_active_enums::Method; -use crate::serialization; use sea_orm::entity::prelude::*; use serde::{Deserialize, Serialize}; @@ -14,10 +13,6 @@ pub struct Model { pub timestamp: DateTimeUtc, pub method: Method, #[sea_orm(column_type = "Binary(BlobSize::Blob(Some(20)))")] - #[serde( - serialize_with = "serialization::vec_as_address", - deserialize_with = "serialization::address_to_vec" - )] pub to: Vec, #[sea_orm(column_type = "Text", nullable)] pub call_data: Option, diff --git a/entities/src/rpc_accounting.rs b/entities/src/rpc_accounting.rs index 7051edaa..fa950c0e 100644 --- a/entities/src/rpc_accounting.rs +++ b/entities/src/rpc_accounting.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3 +//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1 use sea_orm::entity::prelude::*; use serde::{Deserialize, Serialize}; @@ -11,7 +11,7 @@ pub struct Model { pub rpc_key_id: Option, pub chain_id: u64, pub method: Option, - pub error_response: bool, + pub error_response: i8, pub period_datetime: DateTimeUtc, pub frontend_requests: u64, pub backend_requests: u64, @@ -41,7 +41,7 @@ pub struct Model { pub p90_response_bytes: u64, pub p99_response_bytes: u64, pub max_response_bytes: u64, - pub archive_request: bool, + pub archive_request: i8, pub origin: Option, pub migrated: Option, } diff --git a/entities/src/rpc_accounting_v2.rs b/entities/src/rpc_accounting_v2.rs index 1a67ccfc..1a3617f2 100644 --- a/entities/src/rpc_accounting_v2.rs +++ b/entities/src/rpc_accounting_v2.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3 +//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1 use sea_orm::entity::prelude::*; use serde::{Deserialize, Serialize}; @@ -11,8 +11,8 @@ pub struct Model { pub rpc_key_id: Option, pub chain_id: u64, pub period_datetime: DateTimeUtc, - pub archive_needed: bool, - pub error_response: bool, + pub archive_needed: i8, + pub error_response: i8, pub frontend_requests: u64, pub backend_requests: u64, pub backend_retries: u64, @@ -29,21 +29,6 @@ pub struct Model { } #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)] -pub enum Relation { - #[sea_orm( - belongs_to = "super::rpc_key::Entity", - from = "Column::RpcKeyId", - to = "super::rpc_key::Column::Id", - on_update = "NoAction", - on_delete = "NoAction" - )] - RpcKey, -} - -impl Related for Entity { - fn to() -> RelationDef { - Relation::RpcKey.def() - } -} +pub enum Relation {} impl ActiveModelBehavior for ActiveModel {} diff --git a/entities/src/rpc_key.rs b/entities/src/rpc_key.rs index e9114a2b..59fd92ac 100644 --- a/entities/src/rpc_key.rs +++ b/entities/src/rpc_key.rs @@ -1,6 +1,6 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3 +//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1 -use crate::serialization; +use super::sea_orm_active_enums::LogLevel; use sea_orm::entity::prelude::*; use serde::{Deserialize, Serialize}; @@ -11,14 +11,10 @@ pub struct Model { pub id: u64, pub user_id: u64, #[sea_orm(column_type = "Binary(BlobSize::Blob(Some(16)))", unique)] - #[serde( - serialize_with = "serialization::uuid_as_ulid", - deserialize_with = "serialization::ulid_to_uuid" - )] - pub secret_key: Uuid, + pub secret_key: Vec, pub description: Option, - pub private_txs: bool, - pub active: bool, + pub private_txs: i8, + pub active: i8, #[sea_orm(column_type = "Text", nullable)] pub allowed_ips: Option, #[sea_orm(column_type = "Text", nullable)] @@ -29,6 +25,7 @@ pub struct Model { pub allowed_user_agents: Option, #[sea_orm(column_type = "Double")] pub log_revert_chance: f64, + pub log_level: LogLevel, } #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)] @@ -37,8 +34,6 @@ pub enum Relation { RevertLog, #[sea_orm(has_many = "super::rpc_accounting::Entity")] RpcAccounting, - #[sea_orm(has_many = "super::rpc_accounting_v2::Entity")] - RpcAccountingV2, #[sea_orm(has_many = "super::secondary_user::Entity")] SecondaryUser, #[sea_orm( @@ -63,12 +58,6 @@ impl Related for Entity { } } -impl Related for Entity { - fn to() -> RelationDef { - Relation::RpcAccountingV2.def() - } -} - impl Related for Entity { fn to() -> RelationDef { Relation::SecondaryUser.def() diff --git a/entities/src/sea_orm_active_enums.rs b/entities/src/sea_orm_active_enums.rs index 99c5565b..9c3c22e1 100644 --- a/entities/src/sea_orm_active_enums.rs +++ b/entities/src/sea_orm_active_enums.rs @@ -1,8 +1,18 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3 +//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1 use sea_orm::entity::prelude::*; use serde::{Deserialize, Serialize}; +#[derive(Debug, Clone, PartialEq, Eq, EnumIter, DeriveActiveEnum, Serialize, Deserialize)] +#[sea_orm(rs_type = "String", db_type = "Enum", enum_name = "log_level")] +pub enum LogLevel { + #[sea_orm(string_value = "none")] + None, + #[sea_orm(string_value = "aggregated")] + Aggregated, + #[sea_orm(string_value = "detailed")] + Detailed, +} #[derive(Debug, Clone, PartialEq, Eq, EnumIter, DeriveActiveEnum, Serialize, Deserialize)] #[sea_orm(rs_type = "String", db_type = "Enum", enum_name = "method")] pub enum Method { diff --git a/entities/src/secondary_user.rs b/entities/src/secondary_user.rs index 4efa6f46..7e79aaa0 100644 --- a/entities/src/secondary_user.rs +++ b/entities/src/secondary_user.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3 +//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1 use super::sea_orm_active_enums::Role; use sea_orm::entity::prelude::*; diff --git a/entities/src/stripe_increase_balance_receipt.rs b/entities/src/stripe_increase_balance_receipt.rs index 71eb2608..c8b18536 100644 --- a/entities/src/stripe_increase_balance_receipt.rs +++ b/entities/src/stripe_increase_balance_receipt.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3 +//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1 use sea_orm::entity::prelude::*; use serde::{Deserialize, Serialize}; diff --git a/entities/src/user.rs b/entities/src/user.rs index ee957c0b..b8745539 100644 --- a/entities/src/user.rs +++ b/entities/src/user.rs @@ -1,19 +1,14 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3 +//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1 -use crate::serialization; use sea_orm::entity::prelude::*; use serde::{Deserialize, Serialize}; -#[derive(Clone, Debug, Hash, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)] +#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)] #[sea_orm(table_name = "user")] pub struct Model { #[sea_orm(primary_key)] pub id: u64, #[sea_orm(column_type = "Binary(BlobSize::Blob(Some(20)))", unique)] - #[serde( - serialize_with = "serialization::vec_as_address", - deserialize_with = "serialization::address_to_vec" - )] pub address: Vec, pub description: Option, pub email: Option, diff --git a/entities/src/user_tier.rs b/entities/src/user_tier.rs index 4117b93c..b78f2366 100644 --- a/entities/src/user_tier.rs +++ b/entities/src/user_tier.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3 +//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1 use sea_orm::entity::prelude::*; use serde::{Deserialize, Serialize};