fix: adjust event data structure and prevent duplicate webhooks

Author: wangeguo

Cargo.lock

@@ -7,7 +7,7 @@ resolver = "2"
 [package]
 name = "backend"
 description = "Backend API and services for StackClass"
-version = "0.32.8"
+version = "0.32.9"
 edition = "2024"
 
 default-run = "stackclass-server"

Cargo.toml

@@ -17,7 +17,7 @@ use reqwest::StatusCode;
 use crate::{
     client::GiteaClient,
     error::ClientError,
-    types::{CreateHookRequest, Hook},
+    types::{CreateHookRequest, Hook, HookType},
 };
 
 impl GiteaClient {
@@ -34,13 +34,16 @@ impl GiteaClient {
 
     /// Lists all system hooks (admin endpoint).
     ///
+    /// # Arguments
+    /// * `hook_type` - The type of hooks to list (defaults to `HookType::System`).
+    ///
     /// # Possible Responses
     /// - 200: List of hooks returned successfully (returns `Vec<Hook>`).
     ///
     /// https://docs.gitea.com/api/1.24/#tag/admin/operation/adminListHooks
     #[inline]
-    pub async fn list_system_hooks(&self) -> Result<Vec<Hook>, ClientError> {
-        self.list_hooks("admin/hooks").await
+    pub async fn list_system_hooks(&self, hook_type: HookType) -> Result<Vec<Hook>, ClientError> {
+        self.list_hooks(&format!("admin/hooks?type={hook_type}")).await
     }
 
     /// Creates a new hook at the specified path.

crates/gitea-client/src/client/hook.rs

@@ -14,13 +14,15 @@
 
 use serde::{Deserialize, Serialize};
 
-use super::{PartialCommit, PartialRepository, PartialUser};
+use crate::types::{Repository, User};
+
+use super::PartialCommit;
 
 /// GitHub webhook event payload.
 #[derive(Debug, Serialize, Deserialize)]
 pub struct Event {
     /// Secret token for verifying the webhook origin.
-    pub secret: String,
+    pub secret: Option<String>,
 
     /// The full Git ref that was pushed.
     #[serde(rename = "ref")]
@@ -38,12 +40,18 @@ pub struct Event {
     /// List of commits included in the push.
     pub commits: Vec<PartialCommit>,
 
+    /// Total number of commits in the push event.
+    pub total_commits: u64,
+
+    /// The most recent commit in the push event.
+    pub head_commit: PartialCommit,
+
     /// Repository where the event occurred.
-    pub repository: PartialRepository,
+    pub repository: Repository,
 
     /// User who performed the push.
-    pub pusher: PartialUser,
+    pub pusher: User,
 
     /// User who triggered the event.
-    pub sender: PartialUser,
+    pub sender: User,
 }

crates/gitea-client/src/types/event.rs

@@ -55,9 +55,10 @@ pub struct Hook {
 /// This is used to avoid duplicate hooks with the same settings.
 pub fn matching(hook: &Hook, req: &CreateHookRequest) -> bool {
     hook.kind == req.kind &&
-        hook.config == req.config &&
         hook.branch_filter == req.branch_filter &&
-        hook.events == req.events
+        hook.events == req.events &&
+        hook.config.get("url") == req.config.get("url") &&
+        hook.config.get("content_type") == req.config.get("content_type")
 }
 
 /// Request body for creating a hook.
@@ -82,3 +83,26 @@ pub struct CreateHookRequest {
     #[serde(rename = "type")]
     pub kind: String,
 }
+
+/// Represents the type of hooks to list.
+#[derive(Debug, Clone, Copy, Default)]
+pub enum HookType {
+    /// System hooks.
+    #[default]
+    System,
+    /// Default hooks.
+    Default,
+    /// Both system and default hooks.
+    All,
+}
+
+impl std::fmt::Display for HookType {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        let s = match self {
+            HookType::System => "system",
+            HookType::Default => "default",
+            HookType::All => "all",
+        };
+        write!(f, "{}", s)
+    }
+}

crates/gitea-client/src/types/hook.rs

@@ -77,6 +77,9 @@ pub struct User {
     /// Number of repositories starred by the user.
     pub starred_repos_count: u64,
 
+    /// Username of the user.
+    pub username: String,
+
     /// Visibility setting of the user.
     pub visibility: String,
 
@@ -127,21 +130,12 @@ pub struct CreateUserRequest {
 /// containing only the most essential fields.
 #[derive(Debug, Serialize, Deserialize)]
 pub struct PartialUser {
-    /// Unique identifier for the user.
-    pub id: u64,
-
-    /// Username of the user.
-    pub login: String,
-
     /// Full name of the user.
-    pub full_name: String,
+    pub name: String,
 
     /// Email address of the user.
     pub email: String,
 
-    /// URL to the user's avatar.
-    pub avatar_url: String,
-
-    /// Login name of the user.
+    /// Username of the user.
     pub username: String,
 }

crates/gitea-client/src/types/user.rs

@@ -6,7 +6,7 @@
     "license": {
       "name": ""
     },
-    "version": "0.32.8"
+    "version": "0.32.9"
   },
   "paths": {
     "/v1/courses": {

openapi.json

@@ -110,7 +110,7 @@ impl RepoService {
     /// - Otherwise, it triggers the pipeline for the current stage and monitors completion.
     /// - On success, marks the stage as complete.
     pub async fn process(&self, event: &Event) -> Result<()> {
-        let PartialRepository { owner, name, .. } = &event.repository;
+        let Repository { owner, name, .. } = &event.repository;
         debug!("Handling push event for repository: {}", name);
 
         let ctx = self.ctx.clone();
@@ -215,6 +215,7 @@ impl RepoService {
             active: true,
             branch_filter: Some("main".to_string()),
             config: HashMap::from([
+                ("is_system_webhook".to_string(), "true".to_string()),
                 ("content_type".to_string(), "json".to_string()),
                 ("url".to_string(), url.clone()),
             ]),
@@ -224,7 +225,7 @@ impl RepoService {
         };
 
         // List all existing hooks
-        let hooks = self.ctx.git.list_system_hooks().await?;
+        let hooks = self.ctx.git.list_system_hooks(HookType::System).await?;
 
         // Check if a hook with the same configuration already exists
         if !hooks.iter().any(|hook| matching(hook, &req)) {