feat: move common model to api-model (#1849)

Author: benjamin-747

common/src/model.rs api-model/src/common.rscommon/src/model.rs renamed to api-model/src/common.rs

@@ -1,22 +1,6 @@
-use clap::Args;
 use serde::{Deserialize, Serialize};
 use utoipa::ToSchema;
 
-#[derive(Args, Clone, Debug)]
-pub struct CommonHttpOptions {
-    #[arg(long, default_value_t = String::from("127.0.0.1"))]
-    pub host: String,
-
-    #[arg(short = 'p', long, default_value_t = 8000)]
-    pub port: u16,
-}
-
-#[derive(Deserialize, Debug)]
-pub struct InfoRefsParams {
-    pub service: Option<String>,
-    pub refspec: Option<String>,
-}
-
 #[derive(PartialEq, Eq, Debug, Clone, Default, Serialize, Deserialize, ToSchema)]
 pub struct CommonResult<T> {
     pub req_result: bool,
@@ -75,18 +59,3 @@ pub struct CommonPage<T> {
     pub total: u64,
     pub items: Vec<T>,
 }
-
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, ToSchema)]
-pub struct DiffItem {
-    pub path: String,
-    pub data: String,
-}
-
-impl From<git_internal::diff::DiffItem> for DiffItem {
-    fn from(value: git_internal::diff::DiffItem) -> Self {
-        Self {
-            path: value.path,
-            data: value.data,
-        }
-    }
-}

api-model/src/lib.rs

@@ -1,2 +1,3 @@
 pub mod buck2;
+pub mod common;
 pub mod git;

ceres/src/api_service/blob_ops.rs

@@ -3,9 +3,9 @@ use std::{
     path::{Path, PathBuf},
 };
 
-use common::model::DiffItem;
 use futures::{StreamExt, stream};
 use git_internal::{
+    DiffItem,
     diff::Diff as GitDiff,
     errors::GitError,
     hash::ObjectHash,
@@ -157,10 +157,7 @@ pub async fn preview_file_diff<T: ApiHandler + ?Sized>(
 
     let read =
         |_: &PathBuf, oid: &ObjectHash| -> Vec<u8> { cache.get(oid).cloned().unwrap_or_default() };
-    let mut items: Vec<DiffItem> = GitDiff::diff(old_entry, new_entry, Vec::new(), read)
-        .into_iter()
-        .map(DiffItem::from)
-        .collect();
+    let mut items: Vec<DiffItem> = GitDiff::diff(old_entry, new_entry, Vec::new(), read);
     Ok(items.pop())
 }
 

ceres/src/api_service/commit_ops.rs

@@ -4,9 +4,12 @@ use std::{
     sync::Arc,
 };
 
-use api_model::git::commit::LatestCommitInfo;
-use common::model::{CommonPage, DiffItem, Pagination};
+use api_model::{
+    common::{CommonPage, Pagination},
+    git::commit::LatestCommitInfo,
+};
 use git_internal::{
+    DiffItem,
     errors::GitError,
     hash::ObjectHash,
     internal::object::{
@@ -20,7 +23,7 @@ use serde::{Deserialize, Serialize};
 use crate::{
     api_service::{ApiHandler, history, tree_ops},
     model::{
-        change_list::MuiTreeNode,
+        change_list::{DiffItemSchema, MuiTreeNode},
         commit::{CommitFilesChangedPage, CommitSummary, GpgStatus},
         git::{CommitBindingInfo, LatestCommitInfoWrapper},
     },
@@ -749,13 +752,13 @@ async fn compute_commit_diff_items<T: ApiHandler + ?Sized>(
         merged
     };
 
-    Ok(diff_results.into_iter().map(Into::into).collect())
+    Ok(diff_results.into_iter().collect())
 }
 
 #[derive(Serialize, Deserialize)]
 struct CachedDiff {
     filter_paths: Option<Vec<String>>,
-    items: Vec<DiffItem>,
+    items: Vec<DiffItemSchema>,
 }
 
 async fn load_or_compute_diff_items<T: ApiHandler + ?Sized>(
@@ -764,7 +767,7 @@ async fn load_or_compute_diff_items<T: ApiHandler + ?Sized>(
     commit_sha: &str,
     cache_key: &str,
     filter_paths: Option<&[String]>,
-) -> Result<Vec<DiffItem>, GitError> {
+) -> Result<Vec<DiffItemSchema>, GitError> {
     let requested_filter = filter_paths.map(|paths| {
         let mut v: Vec<String> = paths.iter().map(|p| p.to_string()).collect();
         v.sort();
@@ -793,6 +796,8 @@ async fn load_or_compute_diff_items<T: ApiHandler + ?Sized>(
         compute_commit_diff_items(handler, &commit, filter_paths).await?
     };
 
+    let diffs: Vec<DiffItemSchema> = diffs.clone().into_iter().map(|x| x.into()).collect();
+
     let cache_value = CachedDiff {
         filter_paths: requested_filter,
         items: diffs.clone(),

ceres/src/api_service/import_api_service.rs

@@ -5,6 +5,7 @@ use std::{
     sync::Arc,
 };
 
+use api_model::common::Pagination;
 use async_trait::async_trait;
 use callisto::{git_tag, import_refs};
 use common::errors::MegaError;
@@ -215,7 +216,7 @@ impl ApiHandler for ImportApiService {
     async fn list_tags(
         &self,
         _repo_path: Option<String>,
-        pagination: common::model::Pagination,
+        pagination: Pagination,
     ) -> Result<(Vec<TagInfo>, u64), GitError> {
         let git_storage = self.storage.git_db_storage();
         // annotated tags: fetch paged annotated tags from storage

ceres/src/api_service/mod.rs

@@ -4,14 +4,11 @@ use std::{
     sync::Arc,
 };
 
-use api_model::git::commit::LatestCommitInfo;
+use api_model::{common::Pagination, git::commit::LatestCommitInfo};
 use async_trait::async_trait;
-use common::{
-    config::BlameConfig,
-    errors::MegaError,
-    model::{DiffItem, Pagination},
-};
+use common::{config::BlameConfig, errors::MegaError};
 use git_internal::{
+    DiffItem,
     errors::GitError,
     internal::object::{
         commit::Commit,

ceres/src/api_service/mono_api_service.rs

@@ -43,6 +43,7 @@ use std::{
     time::Duration,
 };
 
+use api_model::common::Pagination;
 use async_trait::async_trait;
 use bytes::Bytes;
 use callisto::{
@@ -51,10 +52,10 @@ use callisto::{
 };
 use common::{
     errors::{BuckError, MegaError},
-    model::{DiffItem, Pagination},
     utils::MEGA_BRANCH_NAME,
 };
 use git_internal::{
+    DiffItem,
     diff::Diff as GitDiff,
     errors::GitError,
     hash::ObjectHash,
@@ -1823,7 +1824,7 @@ impl MonoApiService {
         // Use the unified diff function with configurable algorithm
         let diff_output = GitDiff::diff(old_blobs, new_blobs, Vec::new(), read_content);
 
-        Ok(diff_output.into_iter().map(DiffItem::from).collect())
+        Ok(diff_output)
     }
 
     pub async fn get_sorted_changed_file_list(

ceres/src/model/change_list.rs

@@ -1,8 +1,8 @@
 use std::{path::PathBuf, str::FromStr};
 
+use api_model::common::CommonPage;
 use callisto::{check_result, sea_orm_active_enums::MergeStatusEnum};
-use common::model::{CommonPage, DiffItem};
-use git_internal::hash::ObjectHash;
+use git_internal::{DiffItem, hash::ObjectHash};
 use jupiter::model::{cl_dto::CLDetails, common::ListParams};
 use serde::{Deserialize, Serialize};
 use utoipa::ToSchema;
@@ -84,7 +84,22 @@ impl From<CLDetails> for CLDetailRes {
 
 #[derive(Serialize, ToSchema)]
 pub struct FilesChangedPage {
-    pub page: CommonPage<DiffItem>,
+    pub page: CommonPage<DiffItemSchema>,
+}
+
+#[derive(Debug, Serialize, Deserialize, ToSchema, Clone)]
+pub struct DiffItemSchema {
+    pub path: String,
+    pub data: String,
+}
+
+impl From<DiffItem> for DiffItemSchema {
+    fn from(item: DiffItem) -> Self {
+        Self {
+            path: item.path,
+            data: item.data,
+        }
+    }
 }
 
 #[derive(Serialize, ToSchema)]

ceres/src/model/commit.rs

@@ -1,7 +1,9 @@
-use common::model::{CommonPage, DiffItem};
+use api_model::common::CommonPage;
 use serde::{Deserialize, Serialize};
 use utoipa::ToSchema;
 
+use crate::model::change_list::DiffItemSchema;
+
 #[derive(Debug, Serialize, Deserialize, ToSchema, Clone, Default)]
 #[serde(rename_all = "PascalCase")]
 pub enum GpgStatus {
@@ -40,7 +42,7 @@ pub struct CommitHistoryParams {
 #[derive(Debug, Serialize, Deserialize, ToSchema, Clone)]
 pub struct CommitFilesChangedPage {
     pub commit: CommitSummary,
-    pub page: CommonPage<DiffItem>,
+    pub page: CommonPage<DiffItemSchema>,
 }
 
 #[derive(Debug, Serialize, Deserialize, ToSchema)]

ceres/src/model/tag.rs

@@ -1,4 +1,4 @@
-use common::model::CommonPage;
+use api_model::common::CommonPage;
 use serde::{Deserialize, Serialize};
 use utoipa::ToSchema;