zhenyi
cec6dce955
- Add git operation endpoints: archive, compare branches, diff, tree, repository extras - Add repo endpoints: contributors, delete fork, get branch/commit status/deploy key/invitation/member/release/tag/webhook, topics, release assets, webhook deliveries/retry - Add PR endpoints: review requests, templates - Add user endpoints: block/unblock, follow/unfollow, presence, personal access tokens, account restore - Add workspace endpoints: billing history, approvals, domains, integrations, invitations, members, webhooks, restore - Add internal API, notification API, IM API modules - Update route configuration and OpenAPI spec
55 lines
1.6 KiB
Rust
55 lines
1.6 KiB
Rust
use actix_web::{HttpResponse, web};
|
|
use serde::Deserialize;
|
|
use utoipa::IntoParams;
|
|
|
|
use crate::api::response::{ApiErrorResponse, ApiResponse};
|
|
use crate::error::AppError;
|
|
use crate::service::AppService;
|
|
use crate::service::repo::git::merge::MergeParams;
|
|
use crate::session::Session;
|
|
|
|
#[derive(Debug, Deserialize, IntoParams)]
|
|
pub struct PathParams {
|
|
pub workspace_name: String,
|
|
pub repo_name: String,
|
|
}
|
|
|
|
/// Merge branches
|
|
#[utoipa::path(
|
|
post,
|
|
path = "/api/v1/workspaces/{workspace_name}/repos/{repo_name}/git/merge",
|
|
tag = "Git",
|
|
operation_id = "gitMerge",
|
|
params(PathParams),
|
|
request_body(
|
|
content = MergeParams,
|
|
description = "Merge parameters",
|
|
content_type = "application/json"
|
|
),
|
|
responses(
|
|
(status = 200, description = "Merge completed successfully", body = ApiResponse<crate::pb::repo::MergeResult>),
|
|
(status = 401, description = "Unauthorized", body = ApiErrorResponse),
|
|
(status = 409, description = "Merge conflict", body = ApiErrorResponse),
|
|
(status = 500, description = "Internal server error", body = ApiErrorResponse),
|
|
),
|
|
security(("session_cookie" = []))
|
|
)]
|
|
pub async fn git_merge(
|
|
service: web::Data<AppService>,
|
|
session: Session,
|
|
path: web::Path<PathParams>,
|
|
params: web::Json<MergeParams>,
|
|
) -> Result<HttpResponse, AppError> {
|
|
let result = service
|
|
.repo
|
|
.git_merge(
|
|
&session,
|
|
&path.workspace_name,
|
|
&path.repo_name,
|
|
params.into_inner(),
|
|
)
|
|
.await?;
|
|
|
|
Ok(HttpResponse::Ok().json(ApiResponse::new(result)))
|
|
}
|