Merge pull request #4 from ThomasTJdev/bug/ttj/send-mail-to-list

Bug/ttj/send mail to list

Author: ThomasTJdev

nimletter.nimble

@@ -1,6 +1,6 @@
 # Package
 
-version       = "0.4.0"
+version       = "0.4.1"
 author        = "ThomasTJdev"
 description   = "Newsletter"
 license       = "AGPL v3"

src/routes/routes_event.nim

@@ -88,13 +88,11 @@ proc(request: Request) =
     if userID == "":
       resp Http400, "User not found"
 
-    let mailID = getMailIDfromIdent(mail)
-    if mailID == "":
-      resp Http400, "Mail not found"
+    let mailID = if mail == "": "" else: getMailIDfromIdent(mail)
 
     pg.withConnection conn:
       # For a specific mailID
-      if mail != "":
+      if mailID != "":
         if getValue(conn, sqlSelect(
               table = "mails",
               select = [

src/routes/routes_mail.nim

@@ -466,8 +466,6 @@ proc(request: Request) =
     listID = @"listID"
     email  = @"email"
 
-  echo email.isValidEmail()
-
   var
     mailData: seq[string]
     contactData: seq[string]
@@ -526,4 +524,6 @@ proc(request: Request) =
   elif listExists:
     createPendingEmailToAllListContacts(listID, mailID)
 
+    resp Http200, "Mail sent to listID: " & listID
+
 )

src/scheduling/schedule_mail.nim

@@ -59,44 +59,34 @@ proc createPendingEmail*(
         "NULL"
     )
 
-  let argsData = @[
-        userID,
-        listID,
-        flowID,
-        flowStepID,
-        mailID,
-        triggerType,
-        status,
-        scheduledFor
-      ]
-
-  var args  = @[
-        userID,
-        listID,
-        flowID,
-        flowStepID,
-        mailID,
-        triggerType,
-        status
-      ]
+  var args = @[userID]
+  var data = @["user_id"]
+  if listID != "":
+    data.add("list_id")
+    args.add(listID)
+  if flowID != "":
+    data.add("flow_id")
+    args.add(flowID)
+  if flowStepID != "":
+    data.add("flow_step_id")
+    args.add(flowStepID)
+  if mailID != "":
+    data.add("mail_id")
+    args.add(mailID)
+  if triggerType != "":
+    data.add("trigger_type")
+    args.add(triggerType)
+  if status != "":
+    data.add("status")
+    args.add(status)
   if scheduledFor != "NULL":
+    data.add("scheduled_for")
     args.add(scheduledFor)
 
   pg.withConnection conn:
-
     exec(conn, sqlInsert(
       table = "pending_emails",
-      data  = [
-        "user_id",
-        "list_id",
-        "flow_id",
-        "flow_step_id",
-        "mail_id",
-        "trigger_type",
-        "status",
-        "scheduled_for",
-      ],
-      args = argsData
+      data  = data,
     ), args)