16366cf9f2
https://github.com/zed-industries/zed/issues/30972 brought up another case where our context is not enough to track the actual source of the issue: we get a general top-level error without inner error. The reason for this was `.ok_or_else(|| anyhow!("failed to read HEAD SHA"))?; ` on the top level. The PR finally reworks the way we use anyhow to reduce such issues (or at least make it simpler to bubble them up later in a fix). On top of that, uses a few more anyhow methods for better readability. * `.ok_or_else(|| anyhow!("..."))`, `map_err` and other similar error conversion/option reporting cases are replaced with `context` and `with_context` calls * in addition to that, various `anyhow!("failed to do ...")` are stripped with `.context("Doing ...")` messages instead to remove the parasitic `failed to` text * `anyhow::ensure!` is used instead of `if ... { return Err(...); }` calls * `anyhow::bail!` is used instead of `return Err(anyhow!(...));` Release Notes: - N/A
92 lines
2.4 KiB
Rust
92 lines
2.4 KiB
Rust
use crate::db::{ProjectId, Result, RoomId, ServerId, UserId};
|
|
use anyhow::Context as _;
|
|
use rpc::ConnectionId;
|
|
use sea_orm::entity::prelude::*;
|
|
|
|
#[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel)]
|
|
#[sea_orm(table_name = "projects")]
|
|
pub struct Model {
|
|
#[sea_orm(primary_key)]
|
|
pub id: ProjectId,
|
|
pub room_id: Option<RoomId>,
|
|
pub host_user_id: Option<UserId>,
|
|
pub host_connection_id: Option<i32>,
|
|
pub host_connection_server_id: Option<ServerId>,
|
|
}
|
|
|
|
impl Model {
|
|
pub fn host_connection(&self) -> Result<ConnectionId> {
|
|
let host_connection_server_id = self
|
|
.host_connection_server_id
|
|
.context("empty host_connection_server_id")?;
|
|
let host_connection_id = self
|
|
.host_connection_id
|
|
.context("empty host_connection_id")?;
|
|
Ok(ConnectionId {
|
|
owner_id: host_connection_server_id.0 as u32,
|
|
id: host_connection_id as u32,
|
|
})
|
|
}
|
|
}
|
|
|
|
#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
|
|
pub enum Relation {
|
|
#[sea_orm(
|
|
belongs_to = "super::user::Entity",
|
|
from = "Column::HostUserId",
|
|
to = "super::user::Column::Id"
|
|
)]
|
|
HostUser,
|
|
#[sea_orm(
|
|
belongs_to = "super::room::Entity",
|
|
from = "Column::RoomId",
|
|
to = "super::room::Column::Id"
|
|
)]
|
|
Room,
|
|
#[sea_orm(has_many = "super::worktree::Entity")]
|
|
Worktrees,
|
|
#[sea_orm(has_many = "super::project_repository::Entity")]
|
|
Repositories,
|
|
#[sea_orm(has_many = "super::project_collaborator::Entity")]
|
|
Collaborators,
|
|
#[sea_orm(has_many = "super::language_server::Entity")]
|
|
LanguageServers,
|
|
}
|
|
|
|
impl Related<super::user::Entity> for Entity {
|
|
fn to() -> RelationDef {
|
|
Relation::HostUser.def()
|
|
}
|
|
}
|
|
|
|
impl Related<super::room::Entity> for Entity {
|
|
fn to() -> RelationDef {
|
|
Relation::Room.def()
|
|
}
|
|
}
|
|
|
|
impl Related<super::worktree::Entity> for Entity {
|
|
fn to() -> RelationDef {
|
|
Relation::Worktrees.def()
|
|
}
|
|
}
|
|
|
|
impl Related<super::project_repository::Entity> for Entity {
|
|
fn to() -> RelationDef {
|
|
Relation::Repositories.def()
|
|
}
|
|
}
|
|
|
|
impl Related<super::project_collaborator::Entity> for Entity {
|
|
fn to() -> RelationDef {
|
|
Relation::Collaborators.def()
|
|
}
|
|
}
|
|
|
|
impl Related<super::language_server::Entity> for Entity {
|
|
fn to() -> RelationDef {
|
|
Relation::LanguageServers.def()
|
|
}
|
|
}
|
|
|
|
impl ActiveModelBehavior for ActiveModel {}
|