From 695a7cef013914fd4411ebb1cf7f55cf3e47f4c4 Mon Sep 17 00:00:00 2001
From: Vaibhav <thevaibhavdixit@gmail.com>
Date: Tue, 11 Jun 2024 11:31:34 +0530
Subject: [PATCH] chore: address merge conflicts

---
 cala-server/src/integration/mod.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cala-server/src/integration/mod.rs b/cala-server/src/integration/mod.rs
index af682c88..89d5f1a2 100644
--- a/cala-server/src/integration/mod.rs
+++ b/cala-server/src/integration/mod.rs
@@ -64,7 +64,8 @@ impl Integrations {
         name: String,
         data: impl serde::Serialize,
     ) -> Result<Integration, IntegrationError> {
-        let integration = Integration::new(name, data);
+        let integration = Integration::new(id, name, data);
+        
         let (cipher, nonce) = integration.data.encrypt(&self.encryption_config.key)?;
         sqlx::query!(
             r#"INSERT INTO integrations (id, name, cipher, nonce)