diff --git a/jupiter/src/storage/issue_storage.rs b/jupiter/src/storage/issue_storage.rs index cdfb09226..d2c24173a 100644 --- a/jupiter/src/storage/issue_storage.rs +++ b/jupiter/src/storage/issue_storage.rs @@ -51,6 +51,10 @@ impl IssueStorage { JoinType::LeftJoin, callisto::entity_ext::mega_issue::Relation::ItemLabels.def(), ) + .join( + JoinType::LeftJoin, + callisto::entity_ext::mega_issue::Relation::ItemAssignees.def(), + ) .filter(mega_issue::Column::Status.eq(params.status)) .filter(cond) .distinct(); diff --git a/jupiter/src/storage/mr_storage.rs b/jupiter/src/storage/mr_storage.rs index 09411866a..5f24fe2c8 100644 --- a/jupiter/src/storage/mr_storage.rs +++ b/jupiter/src/storage/mr_storage.rs @@ -76,6 +76,10 @@ impl MrStorage { JoinType::LeftJoin, callisto::entity_ext::mega_mr::Relation::ItemLabels.def(), ) + .join( + JoinType::LeftJoin, + callisto::entity_ext::mega_mr::Relation::ItemAssignees.def(), + ) .filter(mega_mr::Column::Status.is_in(status)) .filter(cond) .distinct(); diff --git a/mono/src/api/issue/mod.rs b/mono/src/api/issue/mod.rs index d9f9e2cb7..2d8ff3754 100644 --- a/mono/src/api/issue/mod.rs +++ b/mono/src/api/issue/mod.rs @@ -9,6 +9,7 @@ pub mod issue_router; #[derive(Serialize, Deserialize, ToSchema)] pub struct ItemRes { + pub id: i64, pub link: String, pub title: String, pub status: String, @@ -26,6 +27,7 @@ impl From for ItemRes { fn from(value: ItemDetails) -> Self { match value.item { ItemKind::Issue(model) => Self { + id: model.id, link: model.link, title: model.title, status: model.status.to_string(), @@ -39,6 +41,7 @@ impl From for ItemRes { comment_num: value.comment_num, }, ItemKind::Mr(model) => Self { + id: model.id, link: model.link, title: model.title, status: format!("{:?}", model.status), diff --git a/mono/src/api/label/label_router.rs b/mono/src/api/label/label_router.rs index 011afae64..ef3cacd02 100644 --- a/mono/src/api/label/label_router.rs +++ b/mono/src/api/label/label_router.rs @@ -28,7 +28,6 @@ pub fn routers() -> OpenApiRouter { tag = LABEL_TAG )] async fn fetch_label_list( - _user: LoginUser, state: State, Json(json): Json>, ) -> Result>>, ApiError> {