diff --git a/crates/domain/src/entities/asset_stack.rs b/crates/domain/src/entities/asset_stack.rs index b21880b..5c2d038 100644 --- a/crates/domain/src/entities/asset_stack.rs +++ b/crates/domain/src/entities/asset_stack.rs @@ -37,7 +37,7 @@ pub struct AssetStack { impl AssetStack { pub fn new(stack_type: StackType, primary_asset_id: SystemId, owner: SystemId) -> Self { let primary_member = AssetStackMember { - asset_id: primary_asset_id.clone(), + asset_id: primary_asset_id, role: StackMemberRole::PrimaryDisplay, sort_order: 0, }; diff --git a/crates/domain/src/entities/invite_code.rs b/crates/domain/src/entities/invite_code.rs index 13a21d9..5abb0d4 100644 --- a/crates/domain/src/entities/invite_code.rs +++ b/crates/domain/src/entities/invite_code.rs @@ -26,15 +26,11 @@ impl InviteCode { } pub fn is_valid(&self) -> bool { - if let Some(exp) = &self.expires_at { - if exp.as_datetime() < &Utc::now() { - return false; - } + if self.expires_at.is_some_and(|exp| exp.as_datetime() < &Utc::now()) { + return false; } - if let Some(max) = self.max_uses { - if self.use_count >= max { - return false; - } + if self.max_uses.is_some_and(|max| self.use_count >= max) { + return false; } true } diff --git a/crates/domain/src/entities/share_link.rs b/crates/domain/src/entities/share_link.rs index 5448313..06957d2 100644 --- a/crates/domain/src/entities/share_link.rs +++ b/crates/domain/src/entities/share_link.rs @@ -35,15 +35,11 @@ impl ShareLink { if !self.is_active { return false; } - if let Some(exp) = &self.expires_at { - if exp.as_datetime() < &Utc::now() { - return false; - } + if self.expires_at.is_some_and(|exp| exp.as_datetime() < &Utc::now()) { + return false; } - if let Some(max) = self.max_uses { - if self.use_count >= max { - return false; - } + if self.max_uses.is_some_and(|max| self.use_count >= max) { + return false; } true }