Merge pull request #225 from holaplex/abdul/sea-orm-0-12-2

Update sea-orm crate to 0.12.2
holaplex · Sep 14, 2023 · ec86c3e · ec86c3e
2 parents 6d202cb + 28c5b59
commit ec86c3e
Show file tree

Hide file tree

Showing 8 changed files with 753 additions and 930 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/api/Cargo.toml b/api/Cargo.toml
@@ -17,7 +17,7 @@ categories = ["cryptography::cryptocurrencies", "web-programming"]
 [lib]
 
 [dependencies]
-sea-orm = { version = "^0.10.0", features = [
+sea-orm = { version = "0.12.2", features = [
   "debug-print",
   "runtime-tokio-rustls",
   "sqlx-postgres",
@@ -31,7 +31,7 @@ async-graphql = { version = "5.0.4", features = [
 ] }
 serde = { version = "1.0.152", features = ["derive"] }
 serde_json = "1.0.93"
-solana-program = "1.15.0"
+solana-program = "1"
 poem = { version = "1.3.50", features = ["anyhow", "test"] }
 async-graphql-poem = "5.0.3"
 prost = "0.11.9"
@@ -42,7 +42,7 @@ strum = { version = "0.24.1", features = ["derive"] }
 
 [dependencies.hub-core]
 package = "holaplex-hub-core"
-version = "0.5.3"
+version = "0.5.4"
 git = "https://github.com/holaplex/hub-core"
 branch = "stable"
 features = ["kafka", "credits", "asset_proxy", "sea-orm"]

diff --git a/api/src/entities/sea_orm_active_enums.rs b/api/src/entities/sea_orm_active_enums.rs
@@ -47,17 +47,12 @@ pub enum CreationStatus {
     Queued,
 }
 
-#[derive(Debug, Clone, PartialEq, Eq, EnumIter, DeriveActiveEnum, Enum, Copy)]
+#[derive(Debug, Clone, Default, PartialEq, Eq, EnumIter, DeriveActiveEnum, Enum, Copy)]
 #[sea_orm(rs_type = "String", db_type = "Enum", enum_name = "drop_type")]
 pub enum DropType {
+    #[default]
     #[sea_orm(string_value = "edition")]
     Edition,
     #[sea_orm(string_value = "open")]
     Open,
 }
-
-impl Default for DropType {
-    fn default() -> Self {
-        DropType::Edition
-    }
-}
diff --git a/api/src/events.rs b/api/src/events.rs
@@ -522,7 +522,7 @@ impl Processor {
 
         let created_at = timestamp
             .and_then(|t| {
-                Some(DateTime::from_utc(
+                Some(DateTime::from_naive_utc_and_offset(
                     NaiveDateTime::from_timestamp_opt(t.seconds, t.nanos.try_into().ok()?)?,
                     Utc.fix(),
                 ))
@@ -863,7 +863,7 @@ impl Processor {
     }
 
     async fn mint_updated(&self, id: String, payload: UpdateResult) -> ProcessResult<()> {
-        let update_history = UpdateHistories::find_by_id(id.parse()?)
+        let update_history = UpdateHistories::find_by_id(Uuid::from_str(&id)?)
             .one(self.db.get())
             .await?
             .ok_or(ProcessorErrorKind::DbMissingUpdateHistory)?;

diff --git a/api/src/mutations/collection.rs b/api/src/mutations/collection.rs
@@ -598,7 +598,7 @@ pub async fn fetch_owner(
 
     let owner = wallet
         .ok_or(Error::new(format!(
-            "no project wallet found for {blockchain} blockchain"
+            "no project wallet found for {blockchain:?} blockchain"
         )))?
         .wallet_address;
     Ok(owner)

diff --git a/api/src/mutations/drop.rs b/api/src/mutations/drop.rs
@@ -664,7 +664,7 @@ async fn fetch_owner(
 
     let owner = wallet
         .ok_or(Error::new(format!(
-            "no project wallet found for {blockchain} blockchain"
+            "no project wallet found for {blockchain:?} blockchain"
         )))?
         .wallet_address;
     Ok(owner)

diff --git a/api/src/mutations/mint.rs b/api/src/mutations/mint.rs
@@ -6,7 +6,11 @@ use hub_core::{
     credits::{CreditsClient, TransactionId},
     producer::Producer,
 };
-use sea_orm::{prelude::*, JoinType, Order, QueryOrder, QuerySelect, Set, TransactionTrait};
+use sea_orm::{
+    prelude::*,
+    sea_query::{Func, SimpleExpr},
+    JoinType, Order, QueryOrder, QuerySelect, Set, TransactionTrait,
+};
 
 use super::collection::{
     fetch_owner, validate_creators, validate_json, validate_solana_creator_verification,
@@ -100,7 +104,7 @@ impl Mutation {
 
         let owner_address = wallet
             .ok_or(Error::new(format!(
-                "no project wallet found for {} blockchain",
+                "no project wallet found for {:?} blockchain",
                 collection.blockchain
             )))?
             .wallet_address;
@@ -280,7 +284,7 @@ impl Mutation {
 
         let owner_address = wallet
             .ok_or(Error::new(format!(
-                "no project wallet found for {} blockchain",
+                "no project wallet found for {:?} blockchain",
                 collection.blockchain
             )))?
             .wallet_address;
@@ -1095,7 +1099,7 @@ impl Mutation {
             .select_also(collections::Entity)
             .filter(collection_mints::Column::CollectionId.eq(drop.collection_id))
             .filter(collection_mints::Column::CreationStatus.eq(CreationStatus::Queued))
-            .order_by(sea_orm::sea_query::Func::random(), Order::Asc)
+            .order_by(SimpleExpr::FunctionCall(Func::random()), Order::Asc)
             .one(conn)
             .await?
             .ok_or(Error::new("No Queued mint found for the drop"))?;

diff --git a/migration/Cargo.toml b/migration/Cargo.toml
@@ -25,7 +25,7 @@ name = "migration"
 tokio = { version = "1.22.0", features = ["macros"] }
 
 [dependencies.sea-orm-migration]
-version = "^0.10.0"
+version = "0.12.2"
 features = [
   "runtime-tokio-rustls",
   "sqlx-postgres",