Removed entity/src/prelude, as rust-analyzer doesn't play well with u…

…se + alias (see rust-lang/rust-analyzer#14079)
kaibyao · Aug 21, 2023 · 692a332 · 692a332
1 parent d640010
commit 692a332
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 43 deletions.
diff --git a/entity/src/entities/mod.rs b/entity/src/entities/mod.rs
@@ -1,7 +1,5 @@
 //! SeaORM Entity. Generated by sea-orm-codegen 0.9.2
 
-pub mod prelude;
-
 pub mod auction;
 pub mod auction_bid;
 pub mod contract;

diff --git a/entity/src/entities/prelude.rs b/entity/src/entities/prelude.rs
diff --git a/entity/src/entities/trade.rs b/entity/src/entities/trade.rs
@@ -9,7 +9,7 @@ use sea_orm::{entity::prelude::*, ConnectionTrait};
 use serde::{Deserialize, Serialize};
 use tracing::instrument;
 
-use crate::{prelude::Team, trade_action, trade_asset};
+use crate::{team, trade_action, trade_asset};
 
 /// Trades made between 2 or more teams can be proposed, accepted, counteroffered, canceled, or rejected. When a trade is counteroffered, a new trade is created that refers to the previous. In this way, a historical chain of record can be made.
 ///
@@ -52,7 +52,7 @@ impl Model {
     where
         C: ConnectionTrait + Debug,
     {
-        let teams = self.find_related(Team).all(db).await?;
+        let teams = self.find_related(team::Entity).all(db).await?;
         Ok(teams)
     }
 

diff --git a/entity/src/queries/draft_pick_queries.rs b/entity/src/queries/draft_pick_queries.rs
@@ -4,10 +4,7 @@ use color_eyre::Result;
 use sea_orm::{ActiveModelTrait, ConnectionTrait, LoaderTrait, TransactionTrait};
 use tracing::instrument;
 
-use crate::{
-    draft_pick, draft_pick_option,
-    prelude::{DraftPick, DraftPickDraftPickOption},
-};
+use crate::{draft_pick, draft_pick_draft_pick_option, draft_pick_option};
 
 #[instrument]
 pub async fn insert_draft_pick<C>(
@@ -30,7 +27,7 @@ where
     C: ConnectionTrait + Debug,
 {
     let related_draft_picks: Vec<draft_pick::Model> = draft_pick_options
-        .load_many_to_many(DraftPick, DraftPickDraftPickOption, db)
+        .load_many_to_many(draft_pick::Entity, draft_pick_draft_pick_option::Entity, db)
         .await?
         .into_iter()
         .flatten()

diff --git a/entity/src/queries/team_update_queries/insert_from_trade.rs b/entity/src/queries/team_update_queries/insert_from_trade.rs
@@ -8,7 +8,6 @@ use tracing::instrument;
 use crate::{
     contract::{self, RelatedPlayer},
     draft_pick, draft_pick_option, draft_pick_queries,
-    prelude::TeamUpdate,
     team_update::{
         self, ContractUpdate, ContractUpdateType, DraftPickUpdate, DraftPickUpdateType,
         TeamUpdateAsset, TeamUpdateData, TeamUpdateStatus,
@@ -72,7 +71,7 @@ where
         })
         .collect::<Result<Vec<team_update::ActiveModel>>>()?;
 
-    TeamUpdate::insert_many(team_update_models_to_insert)
+    team_update::Entity::insert_many(team_update_models_to_insert)
         .exec(db)
         .await?;
 

diff --git a/logic/src/trade/external_trade_invalidation.rs b/logic/src/trade/external_trade_invalidation.rs
@@ -5,7 +5,6 @@ use fbkl_entity::{
     contract, draft_pick,
     draft_pick_option::{self, DraftPickOptionStatus},
     draft_pick_queries,
-    prelude::DraftPickOption,
     sea_orm::{
         sea_query::Expr, ColumnTrait, ConnectionTrait, EntityTrait, LoaderTrait, QueryFilter,
     },
@@ -198,7 +197,7 @@ where
     C: ConnectionTrait + Debug,
 {
     let affected_draft_pick_option_ids = external_draft_pick_option_trade_assets.iter().map(|draft_pick_option_trade_asset| draft_pick_option_trade_asset.draft_pick_option_id.ok_or_else(|| eyre!("Couldn't get draft pick option id of supposed draft pick option trade asset (id = {})", draft_pick_option_trade_asset.id))).collect::<Result<Vec<i64>>>()?;
-    DraftPickOption::update_many()
+    draft_pick_option::Entity::update_many()
         .col_expr(
             draft_pick_option::Column::Status,
             Expr::value(DraftPickOptionStatus::InvalidatedByExternalTrade),

diff --git a/logic/src/trade/process_trade.rs b/logic/src/trade/process_trade.rs
@@ -3,7 +3,6 @@ use std::{collections::HashMap, fmt::Debug};
 use color_eyre::{eyre::eyre, Result};
 use fbkl_entity::{
     contract, deadline_queries, draft_pick, draft_pick_option,
-    prelude::{Contract, DraftPick, DraftPickOption},
     sea_orm::{
         prelude::DateTimeWithTimeZone, ActiveModelTrait, ActiveValue, ConnectionTrait, LoaderTrait,
     },
@@ -51,16 +50,18 @@ impl TradeAssetRelatedModelCache {
             };
         }
 
-        let traded_contracts = contract_trade_assets.load_one(Contract, db).await?;
+        let traded_contracts = contract_trade_assets.load_one(contract::Entity, db).await?;
         let trade_asset_contracts_by_trade_asset_id =
             Self::map_trade_asset_models(contract_trade_assets, traded_contracts)?;
 
-        let traded_draft_picks = draft_pick_trade_assets.load_one(DraftPick, db).await?;
+        let traded_draft_picks = draft_pick_trade_assets
+            .load_one(draft_pick::Entity, db)
+            .await?;
         let trade_asset_draft_picks_by_trade_asset_id =
             Self::map_trade_asset_models(draft_pick_trade_assets, traded_draft_picks)?;
 
         let traded_draft_pick_options = draft_pick_option_trade_assets
-            .load_one(DraftPickOption, db)
+            .load_one(draft_pick_option::Entity, db)
             .await?;
         let trade_asset_draft_pick_options_by_trade_asset_id = Self::map_trade_asset_models(
             draft_pick_option_trade_assets,