e1df092
use axum::extract::{Path, Query, State};
use export::rest::AppResponseData;
use jwt::Session;
use crate::errors::{ApiError, GitApiError};
use crate::handler;
use crate::service::GitService;
use crate::service::conflicts::ConflictDetailDto;
#[derive(Debug, Clone, serde::Deserialize, utoipa::IntoParams)]
pub struct ConflictDetailQuery {
pub base: String,
pub head: String,
pub path: String,
}
#[utoipa::path(
get,
path = "/repos/{space_name}/{repo_name}/conflicts/detail",
tag = "conflicts",
description = "读取指定冲突文件在合并检查中生成的冲突内容。",
params(crate::handler::RepoPath, ConflictDetailQuery),
responses(
(status = 200, description = "conflict detail", body = AppResponseData<ConflictDetailDto>)
)
)]
pub async fn conflict_detail(
State(service): State<GitService>,
session: Session,
Path(path): Path<crate::handler::RepoPath>,
Query(q): Query<ConflictDetailQuery>,
) -> Result<AppResponseData<ConflictDetailDto>, ApiError> {
let _ = handler::resolve_reader(
&service,
&session,
path.space_name.clone(),
path.repo_name.clone(),
)
.await?;
let out = service
.conflict_detail(path.space_name, path.repo_name, q.base, q.head, q.path)
.await
.map_err(GitApiError::from)?;
Ok(AppResponseData::ok(out))
}