fix: Add committer parameter to the create_entry API and bind committer information (#1581)

Signed-off-by: Ruizhi Huang <[email protected]>

Author: 231220075

ceres/src/api_service/import_api_service.rs

@@ -35,7 +35,7 @@ impl ApiHandler for ImportApiService {
         self.storage.clone()
     }
 
-    async fn create_monorepo_entry(&self, _: CreateEntryInfo) -> Result<(), GitError> {
+    async fn create_monorepo_entry(&self, _: CreateEntryInfo) -> Result<String, GitError> {
         return Err(GitError::CustomError(
             "import dir does not support create entry".to_string(),
         ));

ceres/src/api_service/mod.rs

@@ -48,7 +48,8 @@ impl GitObjectCache {
 pub trait ApiHandler: Send + Sync {
     fn get_context(&self) -> Storage;
 
-    async fn create_monorepo_entry(&self, file_info: CreateEntryInfo) -> Result<(), GitError>;
+    /// Create a file or directory entry under the monorepo path. Returns the new commit id on success.
+    async fn create_monorepo_entry(&self, file_info: CreateEntryInfo) -> Result<String, GitError>;
 
     async fn get_raw_blob_by_hash(&self, hash: &str) -> Result<Option<raw_blob::Model>, MegaError> {
         let context = self.get_context();

ceres/src/api_service/mono_api_service.rs

@@ -145,11 +145,12 @@ impl ApiHandler for MonoApiService {
     ///
     /// # Returns
     ///
-    /// Returns `Ok(())` on success, or a `GitError` on failure.
-    async fn create_monorepo_entry(&self, entry_info: CreateEntryInfo) -> Result<(), GitError> {
+    /// Returns new commit id on success, or a `GitError` on failure.
+    async fn create_monorepo_entry(&self, entry_info: CreateEntryInfo) -> Result<String, GitError> {
         let storage = self.storage.mono_storage();
         let path = PathBuf::from(&entry_info.path);
         let mut save_trees = vec![];
+        let last_commit_id: String;
 
         // Try to get the update chain for the given path.
         // If the path exists, return an empty missing_parts and prefix.
@@ -286,6 +287,7 @@ impl ApiHandler for MonoApiService {
                 })
                 .collect();
             storage.batch_save_model(save_trees).await?;
+            last_commit_id = new_commit_id;
         } else {
             // If missing_parts is not empty, we must create intermediate
             // directories (trees) for each missing segment. This branch
@@ -395,9 +397,10 @@ impl ApiHandler for MonoApiService {
                 .batch_save_model(save_trees)
                 .await
                 .map_err(|e| GitError::CustomError(e.to_string()))?;
+            last_commit_id = new_commit_id;
         }
 
-        Ok(())
+        Ok(last_commit_id)
     }
 
     fn strip_relative(&self, path: &Path) -> Result<PathBuf, MegaError> {

ceres/src/model/git.rs

@@ -17,6 +17,10 @@ pub struct CreateEntryInfo {
     pub path: String,
     // pub import_dir: bool,
     pub content: Option<String>,
+    /// web user email for commit binding
+    pub author_email: Option<String>,
+    /// web username for commit binding (optional)
+    pub author_username: Option<String>,
 }
 
 impl CreateEntryInfo {

mono/src/api/router/preview_router.rs

@@ -74,11 +74,16 @@ async fn create_entry(
     state: State<MonoApiServiceState>,
     Json(json): Json<CreateEntryInfo>,
 ) -> Result<Json<CommonResult<String>>, ApiError> {
-    state
-        .api_handler(json.path.as_ref())
-        .await?
-        .create_monorepo_entry(json.clone())
-        .await?;
+    let handler = state.api_handler(json.path.as_ref()).await?;
+    let commit_id = handler.create_monorepo_entry(json.clone()).await?;
+
+    // If frontend provided author info, bind commit to that user (same as save_edit)
+    if let Some(email) = json.author_email.as_ref() {
+        let stg = state.storage.commit_binding_storage();
+        stg.upsert_binding(&commit_id, email, json.author_username.clone(), false)
+            .await
+            .map_err(|e| ApiError::from(anyhow::anyhow!("Failed to save commit binding: {}", e)))?;
+    }
     Ok(Json(CommonResult::success(None)))
 }