fix: audit action name

Author: JayDwee

api/migrations/20260126004140_audit.up.sql

@@ -1,7 +1,7 @@
 -- no-transaction
 CREATE TABLE audit(
     id UUID NOT NULL PRIMARY KEY DEFAULT gen_random_uuid(),
-    action VARCHAR,
+    event VARCHAR,
     user_id NUMERIC(20, 0) NOT NULL, -- u64
     guild_id NUMERIC(20, 0), -- u64
     old_data VARCHAR,

api/src/audit.rs

@@ -10,7 +10,7 @@ where
     let queue_url = std::env::var("SQS_URL").expect("SQS_URL must be set");
 
     let new_audit = AuditMessage::new(
-        audit.action,
+        audit.event,
         audit.user_id,
         audit.guild_id,
         audit.data.old_data.map(|v: T| serde_json::to_string(&v).unwrap()),

common/src/audit.rs

@@ -19,7 +19,7 @@ pub struct AuditMessage<T>
 where
     T: Serialize + for<'a> Deserialize<'a>,
 {
-    pub action: String,
+    pub event: String,
     pub user_id: Id<UserMarker>,
     pub guild_id: Option<Id<GuildMarker>>,
     pub data: AuditData<T>
@@ -29,9 +29,9 @@ impl<T> AuditMessage<T>
 where
     T: Serialize + for<'a> Deserialize<'a>,
 {
-    pub fn new(action: String, user_id: Id<UserMarker>, guild_id: Option<Id<GuildMarker>>, old_data: Option<T>, new_data: Option<T>) -> AuditMessage<T> {
+    pub fn new(event: String, user_id: Id<UserMarker>, guild_id: Option<Id<GuildMarker>>, old_data: Option<T>, new_data: Option<T>) -> AuditMessage<T> {
         AuditMessage {
-            action,
+            event,
             user_id,
             guild_id,
             data: AuditData{old_data,new_data}

consumer/src/audit/models.rs

@@ -8,7 +8,7 @@ use common::audit::AuditMessage;
 
 pub struct Audit {
     id: Option<Uuid>, // Optional for when we want to insert a new audit
-    action: String,
+    event: String,
     user_id: Id<UserMarker>,
     guild_id: Option<Id<GuildMarker>>,
     old_data: Option<String>,
@@ -17,9 +17,9 @@ pub struct Audit {
 
 impl Audit {
     pub async fn save(&self, pg_pool: &Pool<Postgres>) {
-        match sqlx::query("INSERT INTO audit (id, action, user_id, guild_id, old_data, new_data) VALUES ($1, $2, $3, $4, $5, $6) ON CONFLICT (id) DO UPDATE SET event = $2, user_id = $3, guild_id = $4, old_data = $5, new_data = $6, updated_at = CURRENT_TIMESTAMP")
+        match sqlx::query("INSERT INTO audit (id, event, user_id, guild_id, old_data, new_data) VALUES ($1, $2, $3, $4, $5, $6) ON CONFLICT (id) DO UPDATE SET event = $2, user_id = $3, guild_id = $4, old_data = $5, new_data = $6, updated_at = CURRENT_TIMESTAMP")
             .bind(self.id)
-            .bind(self.action.as_str())
+            .bind(self.event.as_str())
             .bind(BigDecimal::from(self.user_id.into_nonzero().get()))
             .bind(self.guild_id.map(|id| BigDecimal::from(id.into_nonzero().get())))
             .bind(&self.old_data)
@@ -38,7 +38,7 @@ impl From<AuditMessage<String>> for Audit {
     fn from(value: AuditMessage<String>) -> Self {
         Audit{
             id: None,
-            action: value.action,
+            event: value.event,
             user_id: value.user_id,
             guild_id: value.guild_id,
             old_data: value.data.old_data,