feat: move mono ui model to ceres for reuse (#1545)

Author: benjamin-747

Cargo.toml

@@ -36,83 +36,83 @@ neptune = { path = "neptune" }
 git-internal = "0.1.0"
 
 #====
-anyhow = "1.0.98"
-serde = { version = "1.0.219", features = ["derive"] }
-serde_json = "1.0.140"
+anyhow = "1.0.100"
+serde = { version = "1.0.228", features = ["derive"] }
+serde_json = "1.0.145"
 tracing = "0.1.41"
-tracing-subscriber = "0.3.19"
+tracing-subscriber = "0.3.20"
 tracing-appender = "0.2.3"
-thiserror = "2.0.12"
-clap = "4.5.43"
+thiserror = "2.0.17"
+clap = "4.5.49"
 
 #====
-tokio = "1.45.1"
+tokio = "1.48"
 tokio-stream = "0.1.17"
-tokio-util = "0.7.15"
-async-trait = "0.1.88"
+tokio-util = "0.7.16"
+async-trait = "0.1.89"
 async-stream = "0.3.6"
 futures = "0.3.31"
 futures-util = "0.3.31"
-axum = { version = "0.8.4", features = ["macros", "json"] }
-axum-extra = "0.10.1"
+axum = { version = "0.8.6", features = ["macros", "json"] }
+axum-extra = "0.10.3"
 russh = "0.52.1"
-tower-http = "0.6.4"
+tower-http = "0.6.6"
 tower = "0.5.2"
 time = { version = "0.3", features = ["serde"] }
 
 #====
-sea-orm = "1.1.12"
-sea-orm-migration = "1.1.12"
+sea-orm = "1.1.17"
+sea-orm-migration = "1.1.17"
 
 #====
 rand = "0.9.2"
 rand_chacha = "0.9.0"
-flate2 = "1.1.1"
+flate2 = "1.1.4"
 bstr = "1.12.0"
 smallvec = "1.15.1"
 bytes = "1.10.1"
-memchr = "2.7.4"
-chrono = { version = "0.4.41", features = ["serde"] }
+memchr = "2.7.6"
+chrono = { version = "0.4.42", features = ["serde"] }
 sha1 = "0.10.6"
 hex = "0.4.3"
 
 go-defer = "0.1.0"
 colored = "3.0.0"
 idgenerator = "2.0.0"
 num_cpus = "1.17.0"
-config = "0.15.11"
-reqwest = "0.12.18"
+config = "0.15.18"
+reqwest = "0.12.24"
 lazy_static = "1.5.0"
-uuid = "1.17.0"
-regex = "1.11.1"
-ed25519-dalek = "2.1.1"
-ctrlc = "3.4.7"
+uuid = "1.18.1"
+regex = "1.12.2"
+ed25519-dalek = "2.2.0"
+ctrlc = "3.5.0"
 ring = "0.17.14"
-cedar-policy = "4.4.1"
+cedar-policy = "4.7.0"
 secp256k1 = "0.30.0"
 pgp = "0.15.0"
 openssl = "0.10.73"
 oauth2 = "5.0.0"
 base64 = "0.22.1"
 encoding_rs = "0.8.35"
-aws-config = "1.6.3"
-aws-sdk-s3 = "1.90.0"
-utoipa = { version = "5.3.1", features = ["chrono"] }
+aws-config = "1.8.8"
+aws-sdk-s3 = "1.108.0"
+utoipa = { version = "5.4.0", features = ["chrono"] }
 utoipa-axum = "0.2.0"
 utoipa-swagger-ui = "9.0.2"
-tempfile = "3.20.0"
+tempfile = "3.23.0"
 rdkafka = "0.38.0"
 threadpool = "1.8.1"
 lru-mem = "0.3.0"
 dashmap = "6.1.0"
-rayon = "1.10.0"
+rayon = "1.11.0"
 byteorder = "1.5.0"
 bincode = "2.0.1"
 once_cell = "1.21.3"
 testcontainers = "0.25.0"
 scopeguard = "1.2.0"
 serial_test = "3.2.0"
-sysinfo = "0.36.0"
+sysinfo = "0.36.1"
 http = "1.3.1"
 byte-unit = "5.1.6"
 ignore = "0.4.23"
@@ -122,13 +122,13 @@ path-absolutize = "3.1.1"
 pathdiff = "0.2.3"
 rpassword = "7.4.0"
 similar = "2.7.0"
-url = "2.5.4"
+url = "2.5.7"
 wax = "0.6.0"
 pager = "0.16.1"
 jemallocator = "0.5.4"
-mimalloc = "0.1.46"
+mimalloc = "0.1.48"
 assert_cmd = "2.0.17"
-tower-sessions = { version = "0.12.1", features = ["memory-store"] }
+tower-sessions = { version = "0.12.3", features = ["memory-store"] }
 dotenvy = "0.15.7"
 tokio-tungstenite = "0.27.0"
 tungstenite = "0.27.0"
@@ -138,17 +138,17 @@ bs58 = "0.5.1"
 syn = "2.0"
 quote = "1.0"
 proc-macro2 = "1.0"
-log = "0.4.27"
-env_logger = "0.11.7"
-qdrant-client = "1.7"
-walkdir = "2.4"
+log = "0.4.28"
+env_logger = "0.11.8"
+qdrant-client = "1.15"
+walkdir = "2.5"
 dagrs = "0.5.0"
 tar = "0.4"
-indexmap = "2.10.0"
+indexmap = "2.11.4"
 envsubst = "0.2.1"
 diffs = "0.5.1"
-libc = "0.2.172"
-zstd-sys = "2.0.15+zstd.1.5.7"
+libc = "0.2.177"
+zstd-sys = "2.0.16"
 quickcheck = "1.0.3"
 directories = "6.0.0"
 dotenv = "0.15"

ceres/Cargo.toml

@@ -39,8 +39,9 @@ sysinfo = { workspace = true }
 utoipa = { workspace = true }
 base64 = { workspace = true }
 http = { workspace = true }
-regex = "1.11.1"
+regex = { workspace = true }
 tokio-util = {workspace = true}
+uuid = { workspace = true, features = ["v4"] }
 
 [dev-dependencies]
 tempfile = { workspace = true }

ceres/src/api_service/mono_api_service.rs

@@ -42,7 +42,7 @@ use std::sync::Arc;
 
 use crate::api_service::ApiHandler;
 use crate::model::blame::{BlameQuery, BlameResult};
-use crate::model::cl::ClDiffFile;
+use crate::model::change_list::ClDiffFile;
 use crate::model::git::CreateEntryInfo;
 use crate::model::third_party::{ThirdPartyClient, ThirdPartyRepoTrait};
 use crate::protocol::{SmartProtocol, TransportProtocol};
@@ -1418,7 +1418,7 @@ impl MonoApiService {
 #[cfg(test)]
 mod test {
     use super::*;
-    use crate::model::cl::ClDiffFile;
+    use crate::model::change_list::ClDiffFile;
     use git_internal::hash::SHA1;
     use std::path::PathBuf;
     use std::str::FromStr;

mono/src/api/cl/mod.rs renamed to ceres/src/model/change_list.rs

@@ -1,21 +1,49 @@
+use std::path::PathBuf;
 use std::str::FromStr;
 
-use ceres::{
-    merge_checker::{CheckType, ConditionResult},
-    model::cl::ClDiffFile,
-};
-use jupiter::model::cl_dto::CLDetails;
-use serde::Serialize;
+use serde::{Deserialize, Serialize};
 use utoipa::ToSchema;
 use uuid::Uuid;
 
-use crate::api::{conversation::ConversationItem, label::LabelItem};
 use callisto::{check_result, sea_orm_active_enums::MergeStatusEnum};
 use common::model::CommonPage;
+use git_internal::hash::SHA1;
+use jupiter::model::cl_dto::CLDetails;
+use jupiter::model::common::ListParams;
 use neptune::model::diff_model::DiffItem;
 
-pub mod cl_router;
-mod model;
+use crate::merge_checker::{CheckType, ConditionResult};
+use crate::model::{conversation::ConversationItem, label::LabelItem};
+
+#[derive(Deserialize, ToSchema)]
+pub struct AssigneeUpdatePayload {
+    pub assignees: Vec<String>,
+    pub item_id: i64,
+    pub link: String,
+}
+
+#[derive(Deserialize, ToSchema)]
+pub struct ListPayload {
+    pub status: String,
+    pub author: Option<String>,
+    pub labels: Option<Vec<i64>>,
+    pub assignees: Option<Vec<String>>,
+    pub sort_by: Option<String>,
+    pub asc: bool,
+}
+
+impl From<ListPayload> for ListParams {
+    fn from(value: ListPayload) -> Self {
+        Self {
+            status: value.status,
+            author: value.author,
+            labels: value.labels,
+            assignees: value.assignees,
+            sort_by: value.sort_by,
+            asc: value.asc,
+        }
+    }
+}
 
 #[derive(Serialize, ToSchema)]
 pub struct CLDetailRes {
@@ -62,22 +90,22 @@ pub struct FilesChangedPage {
 #[derive(Serialize, Debug, ToSchema)]
 pub struct MuiTreeNode {
     id: String,
-    label: String,
+    pub label: String,
     #[serde(skip_serializing_if = "Option::is_none")]
     #[schema(no_recursion)]
-    children: Option<Vec<MuiTreeNode>>,
+    pub children: Option<Vec<MuiTreeNode>>,
 }
 
 impl MuiTreeNode {
-    fn new(label: &str) -> Self {
+    pub fn new(label: &str) -> Self {
         Self {
             id: Uuid::new_v4().to_string(),
             label: label.to_string(),
             children: None,
         }
     }
 
-    fn insert_path(&mut self, parts: &[&str]) {
+    pub fn insert_path(&mut self, parts: &[&str]) {
         if parts.is_empty() {
             return;
         }
@@ -207,3 +235,75 @@ pub enum RequirementsState {
     UNMERGEABLE,
     MERGEABLE,
 }
+
+#[derive(Debug, Clone, serde::Deserialize, serde::Serialize, utoipa::ToSchema)]
+#[allow(dead_code)]
+pub struct VerifyClPayload {
+    pub assignees: Vec<String>,
+}
+
+#[derive(Debug, Clone, serde::Deserialize, serde::Serialize, utoipa::ToSchema)]
+pub struct ReviewerPayload {
+    pub reviewer_usernames: Vec<String>,
+}
+
+#[derive(Debug, Clone, serde::Deserialize, serde::Serialize, utoipa::ToSchema)]
+pub struct ReviewersResponse {
+    pub result: Vec<ReviewerInfo>,
+}
+
+#[derive(Debug, Clone, serde::Deserialize, serde::Serialize, utoipa::ToSchema)]
+pub struct ChangeReviewerStatePayload {
+    pub approved: bool,
+}
+
+#[derive(Debug, Clone, serde::Deserialize, serde::Serialize, utoipa::ToSchema)]
+pub struct ChangeReviewStatePayload {
+    pub conversation_id: i64,
+    pub resolved: bool,
+}
+
+#[derive(Debug, Clone, serde::Deserialize, serde::Serialize, utoipa::ToSchema)]
+pub struct ReviewerInfo {
+    pub username: String,
+    pub approved: bool,
+}
+
+#[derive(Debug, Clone, serde::Deserialize, serde::Serialize, utoipa::ToSchema)]
+pub struct CloneRepoPayload {
+    pub owner: String,
+    pub repo: String,
+}
+
+#[derive(PartialEq, Eq, Debug, Clone, Serialize, Deserialize)]
+pub enum ClDiffFile {
+    New(PathBuf, SHA1),
+    Deleted(PathBuf, SHA1),
+    // path, old_hash, new_hash
+    Modified(PathBuf, SHA1, SHA1),
+}
+
+impl ClDiffFile {
+    pub fn path(&self) -> &PathBuf {
+        match self {
+            ClDiffFile::New(path, _) => path,
+            ClDiffFile::Deleted(path, _) => path,
+            ClDiffFile::Modified(path, _, _) => path,
+        }
+    }
+
+    pub fn kind_weight(&self) -> u8 {
+        match self {
+            ClDiffFile::New(_, _) => 0,
+            ClDiffFile::Deleted(_, _) => 1,
+            ClDiffFile::Modified(_, _, _) => 2,
+        }
+    }
+}
+
+#[derive(Serialize)]
+pub struct BuckFile {
+    pub buck: SHA1,
+    pub buck_config: SHA1,
+    pub path: PathBuf,
+}

ceres/src/model/cl.rs

@@ -1,38 +0,0 @@
-use std::path::PathBuf;
-
-use serde::{Deserialize, Serialize};
-
-use git_internal::hash::SHA1;
-
-#[derive(PartialEq, Eq, Debug, Clone, Serialize, Deserialize)]
-pub enum ClDiffFile {
-    New(PathBuf, SHA1),
-    Deleted(PathBuf, SHA1),
-    // path, old_hash, new_hash
-    Modified(PathBuf, SHA1, SHA1),
-}
-
-impl ClDiffFile {
-    pub fn path(&self) -> &PathBuf {
-        match self {
-            ClDiffFile::New(path, _) => path,
-            ClDiffFile::Deleted(path, _) => path,
-            ClDiffFile::Modified(path, _, _) => path,
-        }
-    }
-
-    pub fn kind_weight(&self) -> u8 {
-        match self {
-            ClDiffFile::New(_, _) => 0,
-            ClDiffFile::Deleted(_, _) => 1,
-            ClDiffFile::Modified(_, _, _) => 2,
-        }
-    }
-}
-
-#[derive(Serialize)]
-pub struct BuckFile {
-    pub buck: SHA1,
-    pub buck_config: SHA1,
-    pub path: PathBuf,
-}

mono/src/api/commit/model.rs renamed to ceres/src/model/commit.rs

@@ -5,8 +5,6 @@ use utoipa::ToSchema;
 
 use callisto::{mega_conversation, reactions, sea_orm_active_enums::ConvTypeEnum};
 
-pub mod conv_router;
-
 #[derive(Serialize, ToSchema)]
 pub struct ConversationItem {
     pub id: i64,