Merge pull request #70 from sireto/61-feat/server-mail-send

61 feat/server mail send

Author: mesudip

backend/migrations/2025-03-14-153842_repair_server_table_schema/down.sql

@@ -0,0 +1,5 @@
+ALTER TABLE servers DROP COLUMN IF EXISTS aws_credentials;
+
+ALTER TABLE servers ALTER COLUMN server_type TYPE VARCHAR(255) USING server_type::TEXT;
+
+DROP TYPE IF EXISTS server_type;

backend/migrations/2025-03-14-153842_repair_server_table_schema/up.sql

@@ -0,0 +1,50 @@
+DO $$
+DECLARE
+    enum_exists boolean;
+    col_exists boolean;
+BEGIN
+    -- 1. Create server_type enum if not exists
+    SELECT EXISTS (
+        SELECT 1 FROM pg_type WHERE typname = 'server_type'
+    ) INTO enum_exists;
+    
+    IF NOT enum_exists THEN
+        CREATE TYPE server_type AS ENUM ('SMTP', 'AWS');
+    END IF;
+
+    -- 2. Add aws_credentials column if not exists
+    SELECT EXISTS (
+        SELECT 1 
+        FROM information_schema.columns 
+        WHERE table_name = 'servers' 
+        AND column_name = 'aws_credentials'
+    ) INTO col_exists;
+    
+    IF NOT col_exists THEN
+        ALTER TABLE servers 
+        ADD COLUMN aws_credentials JSONB NOT NULL DEFAULT '{}';
+    END IF;
+
+    -- 3. Convert server_type column to ENUM type safely
+    IF EXISTS (
+        SELECT 1 
+        FROM information_schema.columns 
+        WHERE table_name = 'servers' 
+        AND column_name = 'server_type' 
+        AND data_type = 'character varying'
+    ) THEN
+        -- Add temporary check constraint
+        ALTER TABLE servers 
+        ADD CONSTRAINT temp_check_server_type 
+        CHECK (server_type IN ('SMTP', 'AWS'));
+
+        -- Convert column type using USING clause
+        ALTER TABLE servers 
+        ALTER COLUMN server_type TYPE server_type 
+        USING server_type::server_type;
+
+        -- Remove temporary constraint
+        ALTER TABLE servers 
+        DROP CONSTRAINT temp_check_server_type;
+    END IF;
+END $$;

backend/migrations/2025-04-16-073435_add__default_from_email__to_server/down.sql

@@ -0,0 +1,3 @@
+-- Down Migration: Remove "default_from_email" column from the servers table
+ALTER TABLE "servers"
+DROP COLUMN "default_from_email";

backend/migrations/2025-04-16-073435_add__default_from_email__to_server/up.sql

@@ -0,0 +1,3 @@
+-- Up Migration: Add "default_from_email" column to the servers table
+ALTER TABLE "servers"
+ADD COLUMN "default_from_email" VARCHAR NOT NULL DEFAULT '';

backend/migrations/2025-04-16-141925_add__server_id__to_mail/down.sql

@@ -0,0 +1,3 @@
+-- Down Migration: Remove "server_id" column from the mails table
+ALTER TABLE "mails"
+DROP COLUMN "server_id";

backend/migrations/2025-04-16-141925_add__server_id__to_mail/up.sql

@@ -0,0 +1,3 @@
+-- Up Migration: Add "server_id" column to the mails table
+ALTER TABLE "mails"
+ADD COLUMN "server_id" UUID;

backend/migrations/2025-04-18-053044_update__open_to_timestamp_datatype/down.sql

@@ -0,0 +1,8 @@
+ALTER TABLE mails
+ALTER COLUMN open TYPE BOOLEAN
+USING (
+    CASE
+        WHEN open IS NOT NULL THEN TRUE
+        ELSE FALSE
+    END
+);

backend/migrations/2025-04-18-053044_update__open_to_timestamp_datatype/up.sql

@@ -0,0 +1,10 @@
+ALTER TABLE "mails"
+    ALTER COLUMN "open" DROP DEFAULT,
+    ALTER COLUMN "open" TYPE TIMESTAMPTZ
+    USING (
+        CASE
+            WHEN open IS TRUE THEN CURRENT_TIMESTAMP
+            ELSE NULL
+        END
+    ),
+    ALTER COLUMN "open" DROP NOT NULL;

backend/src/handlers/bounce_logs_handler.rs

@@ -80,7 +80,7 @@ pub async fn handle_sns_notification (
                 match event_type.as_str() {
                     "Open" => {
                         mail_service.update_mail(mail_id, UpdateMailRequest {
-                            open: Some(true),
+                            open: Some(chrono::Utc::now()),
                             ..Default::default()
                         }).await?;
                     },

backend/src/handlers/mail_handler.rs

@@ -33,6 +33,7 @@ pub async fn add_mail(
             campaign_id: mail.campaign_id,
             sent_at: mail.sent_at,
             status: mail.status,
+            server_id: mail.server_id,
         });
     }
     Ok(Json(responses))
@@ -72,6 +73,7 @@ pub async fn get_all_mails(
             clicks: mail.clicks,
             status: mail.status.clone(),
             status_reason: mail.reason.clone(),
+            server_id: mail.server_id.clone(),
         });
     });
     Ok(Json(responses))