update local branch and fix conflicts

Signed-off-by: AidCheng <cn.aiden.cheng@gmail.com>

Author: AidCheng

ceres/src/build_trigger/dispatcher.rs

@@ -1,6 +1,9 @@
 use std::sync::Arc;
 
-use bellatrix::{Bellatrix, orion_client::OrionBuildRequest};
+use bellatrix::{
+    Bellatrix,
+    orion_client::{BuildInfo, OrionBuildRequest},
+};
 use common::errors::MegaError;
 use jupiter::storage::Storage;
 
@@ -17,91 +20,77 @@ impl BuildDispatcher {
         Self { storage, bellatrix }
     }
 
-    /// Dispatch a build trigger.
-    ///
-    /// This method:
-    /// 1. Persists the trigger to the database
-    /// 2. Sends the build request to Bellatrix/Orion asynchronously
-    ///
-    /// Returns the ID of the created trigger record.
     pub async fn dispatch(&self, trigger: BuildTrigger) -> Result<i64, MegaError> {
         let trigger_payload = serde_json::to_value(&trigger.payload).map_err(|e| {
             tracing::error!("Failed to serialize payload: {}", e);
             MegaError::Other(format!("Failed to serialize payload: {}", e))
         })?;
 
+        // Determine task_id based on whether build system is enabled
+        let task_id: Option<uuid::Uuid> = if self.bellatrix.enable_build() {
+            // Extract data from payload using pattern matching
+            let (cl_link, repo, builds_json, cl_id) = match &trigger.payload {
+                BuildTriggerPayload::GitPush(p) => (&p.cl_link, &p.repo, &p.builds, p.cl_id),
+                BuildTriggerPayload::Manual(p) => (&p.cl_link, &p.repo, &p.builds, p.cl_id),
+                BuildTriggerPayload::Retry(p) => (&p.cl_link, &p.repo, &p.builds, p.cl_id),
+                BuildTriggerPayload::Webhook(p) => (&p.cl_link, &p.repo, &p.builds, p.cl_id),
+                BuildTriggerPayload::Schedule(p) => (&p.cl_link, &p.repo, &p.builds, p.cl_id),
+                BuildTriggerPayload::WebEdit(p) => (&p.cl_link, &p.repo, &p.builds, p.cl_id),
+            };
+
+            let builds: Vec<SerializableBuildInfo> = serde_json::from_value(builds_json.clone())
+                .map_err(|e| {
+                    tracing::error!("Failed to deserialize builds from payload: {}", e);
+                    MegaError::Other(format!("Failed to deserialize builds from payload: {}", e))
+                })?;
+
+            let bellatrix_builds: Vec<BuildInfo> = builds
+                .into_iter()
+                .map(|info| BuildInfo {
+                    changes: info.changes.into_iter().map(|s| s.into()).collect(),
+                })
+                .collect();
+
+            let req = OrionBuildRequest {
+                cl_link: cl_link.to_string(),
+                mount_path: repo.to_string(),
+                cl: cl_id.unwrap_or(0),
+                builds: bellatrix_builds,
+            };
+
+            let task_id_str = self.bellatrix.on_post_receive(req).await.map_err(|e| {
+                tracing::error!("Failed to dispatch build to Bellatrix: {}", e);
+                MegaError::Other(format!("Failed to dispatch build to Bellatrix: {}", e))
+            })?;
+
+            let task_uuid = uuid::Uuid::parse_str(&task_id_str).map_err(|e| {
+                tracing::error!("Invalid task_id format '{}': {}", task_id_str, e);
+                MegaError::Other(format!("Invalid task_id format '{}': {}", task_id_str, e))
+            })?;
+
+            Some(task_uuid)
+        } else {
+            tracing::info!("BuildDispatcher: Build system disabled, skipping Orion call");
+            None
+        };
+
+        // Insert trigger record with task_id (complete record in one operation)
         let db_record = self
             .storage
             .build_trigger_storage()
             .insert(
                 trigger.trigger_type.to_string(),
                 trigger.trigger_source.to_string(),
                 trigger_payload,
+                task_id,
             )
             .await?;
 
-        // Persist to database
-        tracing::info!("BuildDispatcher: Persisted trigger ID: {}", db_record.id);
-
-        if !self.bellatrix.enable_build() {
-            tracing::info!("BuildDispatcher: Completed (build system disabled)");
-            return Ok(db_record.id);
-        }
-
-        // Extract data from payload using pattern matching
-        let (cl_link, repo, builds_json, cl_id) = match &trigger.payload {
-            BuildTriggerPayload::GitPush(p) => (&p.cl_link, &p.repo, &p.builds, p.cl_id),
-            BuildTriggerPayload::Manual(p) => (&p.cl_link, &p.repo, &p.builds, p.cl_id),
-            BuildTriggerPayload::Retry(p) => (&p.cl_link, &p.repo, &p.builds, p.cl_id),
-            BuildTriggerPayload::Webhook(p) => (&p.cl_link, &p.repo, &p.builds, p.cl_id),
-            BuildTriggerPayload::Schedule(p) => (&p.cl_link, &p.repo, &p.builds, p.cl_id),
-            BuildTriggerPayload::WebEdit(p) => (&p.cl_link, &p.repo, &p.builds, p.cl_id),
-        };
-
-        let builds: Vec<SerializableBuildInfo> = serde_json::from_value(builds_json.clone())
-            .map_err(|e| {
-                tracing::error!("Failed to deserialize builds from payload: {}", e);
-                MegaError::Other(format!("Failed to deserialize builds from payload: {}", e))
-            })?;
-
-        let bellatrix_builds: Vec<bellatrix::orion_client::BuildInfo> = builds
-            .into_iter()
-            .enumerate()
-            .map(|(idx, info)| {
-                tracing::debug!("  Build [{}]: {} change(s)", idx + 1, info.changes.len());
-                bellatrix::orion_client::BuildInfo {
-                    changes: info.changes.into_iter().map(|s| s.into()).collect(),
-                }
-            })
-            .collect();
-
-        let req = OrionBuildRequest {
-            cl_link: cl_link.to_string(),
-            mount_path: repo.to_string(),
-            cl: cl_id.unwrap_or(0),
-            builds: bellatrix_builds,
-        };
-
-        // Dispatch asynchronously
-        let bellatrix = self.bellatrix.clone();
-        let trigger_id = db_record.id;
-        tokio::spawn(async move {
-            match bellatrix.on_post_receive(req).await {
-                Ok(_) => {
-                    tracing::info!(
-                        "BuildDispatcher: Build request sent to Bellatrix (Trigger ID: {})",
-                        trigger_id
-                    );
-                }
-                Err(err) => {
-                    tracing::error!(
-                        "BuildDispatcher: Failed to dispatch build (Trigger ID: {}): {}",
-                        trigger_id,
-                        err
-                    );
-                }
-            }
-        });
+        tracing::info!(
+            "BuildDispatcher: Trigger persisted (ID: {}, Task ID: {:?})",
+            db_record.id,
+            task_id
+        );
 
         Ok(db_record.id)
     }

ceres/src/pack/monorepo.rs

@@ -1054,13 +1054,16 @@ impl MonoRepo {
                 triggered_by: self.username.clone(),
             };
 
-            let _trigger_id = BuildTriggerService::handle_git_push_event(
+            if let Err(e) = BuildTriggerService::handle_git_push_event(
                 self.storage.clone(),
                 self.git_object_cache.clone(),
                 self.bellatrix.clone(),
                 event,
             )
-            .await?;
+            .await
+            {
+                tracing::error!("Failed to trigger CI pipeline: {}", e);
+            }
         }
 
         let check_reg = CheckerRegistry::new(self.storage.clone().into(), self.username());

jupiter/callisto/src/targets.rs jupiter/callisto/src/build_targets.rsjupiter/callisto/src/targets.rs renamed to jupiter/callisto/src/build_targets.rs

@@ -4,7 +4,7 @@ use sea_orm::entity::prelude::*;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
-#[sea_orm(table_name = "targets")]
+#[sea_orm(table_name = "build_targets")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
     pub id: Uuid,
@@ -18,18 +18,18 @@ pub struct Model {
 #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
 pub enum Relation {
     #[sea_orm(
-        belongs_to = "super::tasks::Entity",
+        belongs_to = "super::orion_tasks::Entity",
         from = "Column::TaskId",
-        to = "super::tasks::Column::Id",
+        to = "super::orion_tasks::Column::Id",
         on_update = "Cascade",
         on_delete = "Cascade"
     )]
-    Tasks,
+    OrionTasks,
 }
 
-impl Related<super::tasks::Entity> for Entity {
+impl Related<super::orion_tasks::Entity> for Entity {
     fn to() -> RelationDef {
-        Relation::Tasks.def()
+        Relation::OrionTasks.def()
     }
 }
 

jupiter/callisto/src/mod.rs

@@ -6,7 +6,9 @@ pub mod access_token;
 pub mod buck_session;
 pub mod buck_session_file;
 pub mod build_events;
+pub mod build_targets;
 pub mod build_triggers;
+pub mod builds;
 pub mod check_result;
 pub mod commit_auths;
 pub mod dynamic_sidebar;
@@ -42,10 +44,9 @@ pub mod mega_tag;
 pub mod mega_tree;
 pub mod merge_queue;
 pub mod notes;
+pub mod orion_tasks;
 pub mod path_check_configs;
 pub mod reactions;
 pub mod sea_orm_active_enums;
 pub mod ssh_keys;
-pub mod targets;
-pub mod tasks;
 pub mod vault;

jupiter/callisto/src/tasks.rs jupiter/callisto/src/orion_tasks.rsjupiter/callisto/src/tasks.rs renamed to jupiter/callisto/src/orion_tasks.rs

@@ -4,7 +4,7 @@ use sea_orm::entity::prelude::*;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
-#[sea_orm(table_name = "tasks")]
+#[sea_orm(table_name = "orion_tasks")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
     pub id: Uuid,
@@ -19,8 +19,8 @@ pub struct Model {
 pub enum Relation {
     #[sea_orm(has_many = "super::build_events::Entity")]
     BuildEvents,
-    #[sea_orm(has_many = "super::targets::Entity")]
-    Targets,
+    #[sea_orm(has_many = "super::build_targets::Entity")]
+    BuildTargets,
 }
 
 impl Related<super::build_events::Entity> for Entity {
@@ -29,9 +29,9 @@ impl Related<super::build_events::Entity> for Entity {
     }
 }
 
-impl Related<super::targets::Entity> for Entity {
+impl Related<super::build_targets::Entity> for Entity {
     fn to() -> RelationDef {
-        Relation::Targets.def()
+        Relation::BuildTargets.def()
     }
 }
 

jupiter/callisto/src/prelude.rs

@@ -2,12 +2,13 @@
 
 pub use super::{
     access_token::Entity as AccessToken, buck_session::Entity as BuckSession,
-    buck_session_file::Entity as BuckSessionFile, builds::Entity as Builds,
-    check_result::Entity as CheckResult, commit_auths::Entity as CommitAuths,
-    dynamic_sidebar::Entity as DynamicSidebar, git_blob::Entity as GitBlob,
-    git_commit::Entity as GitCommit, git_issue::Entity as GitIssue, git_pr::Entity as GitPr,
-    git_repo::Entity as GitRepo, git_tag::Entity as GitTag, git_tree::Entity as GitTree,
-    gpg_key::Entity as GpgKey, import_refs::Entity as ImportRefs,
+    buck_session_file::Entity as BuckSessionFile, build_events::Entity as BuildEvents,
+    build_targets::Entity as BuildTargets, build_triggers::Entity as BuildTriggers,
+    builds::Entity as Builds, check_result::Entity as CheckResult,
+    commit_auths::Entity as CommitAuths, dynamic_sidebar::Entity as DynamicSidebar,
+    git_blob::Entity as GitBlob, git_commit::Entity as GitCommit, git_issue::Entity as GitIssue,
+    git_pr::Entity as GitPr, git_repo::Entity as GitRepo, git_tag::Entity as GitTag,
+    git_tree::Entity as GitTree, gpg_key::Entity as GpgKey, import_refs::Entity as ImportRefs,
     issue_cl_references::Entity as IssueClReferences, item_assignees::Entity as ItemAssignees,
     item_labels::Entity as ItemLabels, label::Entity as Label, lfs_locks::Entity as LfsLocks,
     lfs_objects::Entity as LfsObjects, mega_blob::Entity as MegaBlob, mega_cl::Entity as MegaCl,
@@ -18,7 +19,7 @@ pub use super::{
     mega_code_review_thread::Entity as MegaCodeReviewThread, mega_commit::Entity as MegaCommit,
     mega_conversation::Entity as MegaConversation, mega_issue::Entity as MegaIssue,
     mega_refs::Entity as MegaRefs, mega_tag::Entity as MegaTag, mega_tree::Entity as MegaTree,
-    merge_queue::Entity as MergeQueue, notes::Entity as Notes,
+    merge_queue::Entity as MergeQueue, notes::Entity as Notes, orion_tasks::Entity as OrionTasks,
     path_check_configs::Entity as PathCheckConfigs, reactions::Entity as Reactions,
-    ssh_keys::Entity as SshKeys, tasks::Entity as Tasks, vault::Entity as Vault,
+    ssh_keys::Entity as SshKeys, vault::Entity as Vault,
 };