fix: adjust get_latest_commit && get_blob API (#1576)

* refactor

* restore UI edits

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

* accept code review comments

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

---------

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

Author: 231220075

ceres/src/api_service/mod.rs

@@ -84,10 +84,14 @@ pub trait ApiHandler: Send + Sync {
 
     async fn get_commits_by_hashes(&self, c_hashes: Vec<String>) -> Result<Vec<Commit>, GitError>;
 
-    async fn get_blob_as_string(&self, file_path: PathBuf) -> Result<Option<String>, GitError> {
+    async fn get_blob_as_string(
+        &self,
+        file_path: PathBuf,
+        refs: Option<&str>,
+    ) -> Result<Option<String>, GitError> {
         let filename = file_path.file_name().unwrap().to_str().unwrap();
         let parent = file_path.parent().unwrap();
-        if let Some(tree) = self.search_tree_by_path(parent).await?
+        if let Some(tree) = self.search_tree_by_path_with_refs(parent, refs).await?
             && let Some(item) = tree.tree_items.into_iter().find(|x| x.name == filename)
         {
             match self.get_raw_blob_by_hash(&item.id.to_string()).await {
@@ -111,8 +115,14 @@ pub trait ApiHandler: Send + Sync {
         let commit = self.get_tree_relate_commit(tree.id, path).await?;
         let mut commit_info: LatestCommitInfo = commit.into();
 
-        // Build commit binding information
-        commit_info.binding_info = self.build_commit_binding_info(&commit_info.oid).await?;
+        if let Some(binding) = self.build_commit_binding_info(&commit_info.oid).await? {
+            let display = binding.display_name.clone();
+            let avatar = binding.avatar_url.clone().unwrap_or_default();
+
+            // Fill both author for UI consumption
+            commit_info.author.display_name = display.clone();
+            commit_info.author.avatar_url = avatar.clone();
+        }
 
         Ok(commit_info)
     }

ceres/src/model/git.rs

@@ -46,6 +46,8 @@ pub struct TreeQuery {
 
 #[derive(Debug, Deserialize, IntoParams)]
 pub struct BlobContentQuery {
+    #[serde(default)]
+    pub refs: String,
     #[serde(default = "default_path")]
     pub path: String,
 }
@@ -58,7 +60,6 @@ pub struct LatestCommitInfo {
     pub author: UserInfo,
     pub committer: UserInfo,
     pub status: String,
-    pub binding_info: Option<CommitBindingInfo>,
 }
 
 #[derive(Serialize, Deserialize, ToSchema)]
@@ -89,7 +90,6 @@ impl From<Commit> for LatestCommitInfo {
             author,
             committer,
             status: "success".to_string(),
-            binding_info: None, // Will be populated at API layer
         }
     }
 }
@@ -210,6 +210,12 @@ pub struct EditFilePayload {
     pub content: String,
     /// Commit message to use when creating the commit
     pub commit_message: String,
+    /// author email to bind this commit to a user
+    #[serde(default)]
+    pub author_email: Option<String>,
+    /// platform username (used to verify and bind commit to user)
+    #[serde(default)]
+    pub author_username: Option<String>,
 }
 
 /// Response body after saving an edited file

mono/src/api/mod.rs

@@ -158,7 +158,7 @@ pub mod util {
                 let cedar_path = component.join(".mega_cedar.json");
                 let entity_str = state
                     .monorepo()
-                    .get_blob_as_string(cedar_path)
+                    .get_blob_as_string(cedar_path, None)
                     .await
                     .unwrap();
                 if let Some(entity_str) = entity_str {

mono/src/api/router/preview_router.rs

@@ -55,7 +55,7 @@ async fn get_blob_string(
     let data = state
         .api_handler(query.path.as_ref())
         .await?
-        .get_blob_as_string(query.path.into())
+        .get_blob_as_string(query.path.into(), Some(query.refs.as_str()))
         .await?;
     Ok(Json(CommonResult::success(data)))
 }
@@ -378,6 +378,20 @@ async fn save_edit(
     Json(payload): Json<EditFilePayload>,
 ) -> Result<Json<CommonResult<EditFileResult>>, ApiError> {
     let handler = state.api_handler(payload.path.as_ref()).await?;
-    let res = handler.save_file_edit(payload).await?;
+    let res = handler.save_file_edit(payload.clone()).await?;
+
+    // If frontend provided author info, bind commit to that user
+    if let Some(email) = payload.author_email.as_ref() {
+        let stg = state.storage.commit_binding_storage();
+        stg.upsert_binding(
+            &res.commit_id,
+            email,
+            payload.author_username.clone(),
+            false,
+        )
+        .await
+        .map_err(|e| ApiError::from(anyhow::anyhow!("Failed to save commit binding: {}", e)))?;
+    }
+
     Ok(Json(CommonResult::success(Some(res))))
 }

moon/packages/types/generated.ts

@@ -15255,4 +15255,4 @@ Continuously monitors the log file and streams new content as it becomes availab
       }
     }
   }
-}
+}