feat: fully functional audit creation

Author: Randoooom

Cargo.lock

@@ -39,14 +39,12 @@ paste = "1.0.14"
 prost = "0.13.0"
 prost-types = "0.13.0"
 rustls = "0.23.29"
-rbatis = "=4.5.33"
+rbatis = "4.6.8"
 rayon = "1.10.0"
-rbdc = "=4.5.45"
-rbdc-pool-fast = "=4.5.11"
-rbdc-pg = { version = "=4.5.17" }
-rbdc-mysql = { version = "=4.5.17" }
-rbdc-mssql = { version = "=4.5.7" }
-rbs = "4.5.13"
+rbdc-pg = "4.6.1"
+rbdc-mysql = "4.6.0"
+rbdc-mssql = "4.6.1"
+rbs = "4.5.2"
 serde = { version = "1.0.197", features = ["derive"] }
 serde-inline-default = "0.2.3"
 serde_json = "1.0.115"
@@ -62,7 +60,11 @@ tonic-web = "0.13.0"
 tokio = { version = "1.37.0", features = ["full"] }
 tower = "0.5.0"
 tokio-retry = "0.3"
-tower-http = { version = "0.5.2", features = ["trace", "validate-request", "cors"] }
+tower-http = { version = "0.5.2", features = [
+  "trace",
+  "validate-request",
+  "cors",
+] }
 tracing = "0.1.39"
 tracing-opentelemetry = { version = "0.25.0" }
 tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }

Cargo.toml

@@ -14,13 +14,11 @@ itertools = "0.13.0"
 lazy_static = { version = "1.5.0" }
 log = "0.4.27"
 nanoid = "0.4.0"
-rbatis = "=4.5.33"
-rbdc = "=4.5.45"
-rbdc-pool-fast = "=4.5.11"
-rbdc-pg = { version = "=4.5.17" }
-rbdc-mysql = { version = "=4.5.17" }
-rbdc-mssql = { version = "=4.5.7" }
-rbs = "4.5.13"
+rbatis = "4.6.8"
+rbdc-pg = "4.6.1" 
+rbdc-mysql = "4.6.0"
+rbdc-mssql ="4.6.1"
+rbs = "4.6.2"
 tracing = "0.1.41"
 tracing-opentelemetry = { version = "0.25.0" }
 tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }

common/Cargo.toml

@@ -185,9 +185,15 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         .unwrap();
 
     tonic_build::configure()
-        .type_attribute("Event", "#[derive(Eq, Hash)]")
-        .type_attribute("Event.event", "#[derive(Eq, Hash)]")
-        .type_attribute("ResourceModifiedEvent", "#[derive(Eq, Hash)]")
+        .type_attribute("Event", "#[derive(Eq, Hash, typed_builder::TypedBuilder)]")
+        .type_attribute("Event", "#[builder(field_defaults(setter(into)))]")
+        .field_attribute("Event.created_at", "#[builder(default_code = r#\"Some(prost_types::Timestamp::from(std::time::SystemTime::now()))\"#)]")
+        .field_attribute("Event.event_type", "#[builder(setter(transform = |event_type: EventType| event_type as i32))]")
+        .type_attribute("Event.event_content", "#[derive(Eq, Hash)]")
+        .type_attribute("ResourceModifiedEvent", "#[derive(Eq, Hash, typed_builder::TypedBuilder)]")
+        .field_attribute("ResourceModifiedEvent.operation", "#[builder(setter(transform = |operation: ResourceModificationOperation| operation as i32))]")
+        .field_attribute("ResourceModifiedEvent.resource_kind", "#[builder(setter(transform = |kind: ResourceKind| kind as i32))]")
+        .field_attribute("ResourceModifiedEvent.data", "#[builder(setter(transform = |message: &impl prost::Message| {let mut buffer = Vec::new();message.encode(&mut buffer).unwrap();buffer}))]")
         .file_descriptor_set_path(out_dir.join("feedback-fusion-event-v1-descriptor.bin"))
         .compile_protos(&["../proto/feedback-fusion-event-v1.proto"], &["../proto"])
         .unwrap();

common/build.rs

@@ -57,3 +57,13 @@ CREATE TABLE IF NOT EXISTS resource_authorization (
   updated_at  TIMESTAMP(3),
   created_at  TIMESTAMP(3)
 );
+
+CREATE TABLE IF NOT EXISTS audit_version (
+  id                  VARCHAR(32) UNIQUE NOT NULL,
+  resource_type       VARCHAR(255) NOT NULL,
+  resource_id         VARCHAR(32) NOT NULL,
+  data                BYTEA NOT NULL, 
+  action              VARCHAR(32) NOT NULL,
+  version             VARCHAR(32) NOT NULL,
+  created_at  TIMESTAMP(3)
+);

common/src/database/postgres.sql

@@ -21,19 +21,17 @@
 //OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 use crate::{impl_select_page_wrapper, prelude::*};
-use rbatis::rbdc::DateTime;
+use rbatis::rbdc::{Bytes, DateTime};
 
-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, Ord, PartialOrd)]
-#[serde(tag = "type")]
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, Ord, PartialOrd, Hash)]
 #[serde(rename_all = "lowercase")]
 pub enum AuditResource {
     Target,
     Prompt,
     Field,
 }
 
-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, Ord, PartialOrd)]
-#[serde(tag = "type")]
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, Ord, PartialOrd, Hash)]
 #[serde(rename_all = "lowercase")]
 pub enum AuditAction {
     Create,
@@ -42,19 +40,9 @@ pub enum AuditAction {
 }
 
 #[derive(
-    Deserialize,
-    Serialize,
-    Clone,
-    Derivative,
-    Debug,
-    Getters,
-    Setters,
-    TypedBuilder,
-    Eq,
-    Ord,
-    PartialOrd,
+    Deserialize, Serialize, Clone, Derivative, Debug, Getters, Setters, TypedBuilder, Eq, PartialOrd, Hash
 )]
-#[derivative(PartialEq)]
+#[derivative(PartialEq, Ord)]
 #[get = "pub"]
 #[set = "pub"]
 #[builder(field_defaults(setter(into)))]
@@ -64,7 +52,8 @@ pub struct AuditVersion {
     resource_id: String,
     resource_type: AuditResource,
     action: AuditAction,
-    data: Vec<u8>,
+    #[derivative(Ord = "ignore")]
+    data: Bytes,
     version: u32,
     #[derivative(PartialEq = "ignore")]
     #[builder(default_code = r#"DateTime::utc()"#)]