refactor(repo): refresh branch merge_upstream handler
zhenyi committed
Modified lib/repo/handler/branch/merge_upstream.rs lib/repo/handler/branch/merge_upstream.rs +8 −7 View lib/repo/handler/branch/merge_upstream.rs
@@ -1,5 +1,6 @@
1use axum::Json;
21use axum::extract::{Path, State};
2use export::data::{AppRequest, AppRequestData, AppResponseData};
3
34use jwt::extractor::AuthUser;
45use uuid::Uuid;
56
@@ -11,16 +12,16 @@
1112 post,
1213 path = "/repo/{channel_id}/{repo_id}/merge-upstream",
1314 tag = "repo",
14 request_body = MergeUpstreamRequest,
15 responses((status = 200, description = "Merge upstream", body = MergeUpstreamResponse)),
15 request_body = AppRequestData<MergeUpstreamRequest>,
16 responses((status = 200, description = "Merge upstream", body = AppResponseData<MergeUpstreamResponse>)),
1617 security(("bearer_auth" = []))
1718)]
1819pub(crate) async fn handler(
1920 State(svc): State<RepoService>,
2021 AuthUser { claims }: AuthUser,
2122 Path((_, repo_id)): Path<(Uuid, Uuid)>,
22 Json(input): Json<MergeUpstreamRequest>,
23) -> RepoResult<Json<MergeUpstreamResponse>> {
24 let resp = svc.merge_upstream(claims.sub, repo_id, input).await?;
25 Ok(Json(resp))
23 input: AppRequest<MergeUpstreamRequest>,
24) -> RepoResult<AppResponseData<MergeUpstreamResponse>> {
25 let resp = svc.merge_upstream(claims.sub, repo_id, input.into_inner()).await?;
26 Ok(AppResponseData::ok(resp))
2627}