Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion jupiter/src/storage/issue_storage.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@ use sea_orm::{
PaginatorTrait, QueryFilter, QuerySelect, RelationTrait, Set, TransactionTrait,
};

use callisto::{issue_mr_references, item_assignees, item_labels, label, mega_conversation, mega_issue};
use callisto::{
issue_mr_references, item_assignees, item_labels, label, mega_conversation, mega_issue,
};
use common::errors::MegaError;
use common::model::Pagination;

Expand Down
2 changes: 1 addition & 1 deletion mono/src/api/conversation/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ impl From<ConvTypeEnum> for ConvType {
ConvTypeEnum::Reopen => ConvType::Reopen,
ConvTypeEnum::Label => ConvType::Label,
ConvTypeEnum::Assignee => ConvType::Assignee,
ConvTypeEnum::Mention => ConvType::Mention
ConvTypeEnum::Mention => ConvType::Mention,
}
}
}
6 changes: 0 additions & 6 deletions mono/src/api/mr/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,6 @@ impl From<MRDetails> for MRDetailRes {
}
}

#[derive(Serialize, ToSchema)]
pub struct FilesChangedList {
pub mui_trees: Vec<MuiTreeNode>,
pub content: Vec<DiffItem>,
}

#[derive(Serialize, ToSchema)]
pub struct FilesChangedPage {
pub mui_trees: Vec<MuiTreeNode>,
Expand Down
43 changes: 4 additions & 39 deletions mono/src/api/mr/mr_router.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ use crate::api::{
conversation::ContentPayload,
issue::ItemRes,
label::LabelUpdatePayload,
mr::{Condition, FilesChangedList, MRDetailRes, MergeBoxRes, MrFilesRes, MuiTreeNode},
mr::{Condition, MRDetailRes, MergeBoxRes, MrFilesRes, MuiTreeNode},
oauth::model::LoginUser,
};
use crate::api::{mr::FilesChangedPage, MonoApiServiceState};
Expand All @@ -39,7 +39,6 @@ pub fn routers() -> OpenApiRouter<MonoApiServiceState> {
.routes(routes!(close_mr))
.routes(routes!(reopen_mr))
.routes(routes!(mr_files_changed_by_page))
.routes(routes!(mr_files_changed))
.routes(routes!(mr_files_list))
.routes(routes!(save_comment))
.routes(routes!(labels))
Expand Down Expand Up @@ -259,33 +258,6 @@ async fn mr_detail(
Ok(Json(CommonResult::success(Some(mr_details))))
}

/// Get List of All Changed Files in Merge Request
#[utoipa::path(
get,
params(
("link", description = "MR link"),
),
path = "/{link}/files-changed",
responses(
(status = 200, body = CommonResult<FilesChangedList>, content_type = "application/json")
),
tag = MR_TAG
)]
async fn mr_files_changed(
Path(link): Path<String>,
state: State<MonoApiServiceState>,
) -> Result<Json<CommonResult<FilesChangedList>>, ApiError> {
let diff_res = state.monorepo().content_diff(&link).await?;

let paths = diff_res.iter().map(|i| i.path.clone()).collect();
let mui_trees = build_forest(paths);
let res = CommonResult::success(Some(FilesChangedList {
mui_trees,
content: diff_res,
}));
Ok(Json(res))
}

/// Get Merge Request file changed list in Pagination
#[utoipa::path(
post,
Expand Down Expand Up @@ -515,7 +487,6 @@ fn build_forest(paths: Vec<String>) -> Vec<MuiTreeNode> {
#[cfg(test)]
mod test {
use crate::api::mr::mr_router::build_forest;
use crate::api::mr::FilesChangedList;
use neptune::model::diff_model::DiffItem;
use std::collections::HashMap;

Expand Down Expand Up @@ -638,19 +609,13 @@ mod test {
assert!(root_labels.contains(&"src"));
assert!(root_labels.contains(&"README.md"));

let content = vec![DiffItem {
let content = [DiffItem {
data: sample_diff_output.to_string(),
path: "diff_output.txt".to_string(),
}];

// Test the complete response structure
let files_changed_list = FilesChangedList { mui_trees, content };

assert!(!files_changed_list.mui_trees.is_empty());
assert_eq!(
files_changed_list.content.first().unwrap().data,
sample_diff_output
);
assert!(!mui_trees.is_empty());
assert_eq!(content.first().unwrap().data, sample_diff_output);
}

#[test]
Expand Down
Loading
Loading