add separate mail for admins

Signed-off-by: Chayan Das <[email protected]>

Author: ChayanDass

pkg/api/licenses.go

@@ -9,7 +9,6 @@
 package api
 
 import (
-	"context"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -22,7 +21,6 @@ import (
 
 	"github.com/fossology/LicenseDb/pkg/db"
 	email "github.com/fossology/LicenseDb/pkg/email"
-	template "github.com/fossology/LicenseDb/pkg/email/templetes"
 	logger "github.com/fossology/LicenseDb/pkg/log"
 	"github.com/fossology/LicenseDb/pkg/models"
 	"github.com/fossology/LicenseDb/pkg/utils"
@@ -728,24 +726,7 @@ func ImportLicenses(c *gin.Context) {
 	if email.Email != nil && email.Email.IsRunning() {
 		userName := *user.UserName
 		userEmail := *user.UserEmail
-		subject, html := template.ImportSummaryEmailTemplate(
-			userName,
-			"Licenses",
-			total,
-			success,
-			failed,
-			time.Now(),
-		)
-		ctx, cancel := context.WithTimeout(context.Background(), time.Second*2)
-		defer cancel()
-
-		if err := email.Email.Queue(ctx, email.EmailData{
-			To:      []string{userEmail},
-			Subject: subject,
-			HTML:    html,
-		}); err != nil {
-			logger.LogError("Failed to enqueue email")
-		}
+		email.NotifyImportSummary(userEmail, userName, "Licenses", total, success, failed)
 	} else {
 		logger.LogInfo("SMTP disabled or not reachable. Skipping email.")
 	}

pkg/email/wrapper.go

@@ -22,20 +22,30 @@ func NotifyLicenseCreated(toEmail, userName, shortName string) {
 		if Email == nil || !Email.IsRunning() {
 			return
 		}
-
+		// sent mail to creator
 		subject, html := templates.SingleLicenseEmailTemplate(
 			userName,
 			"Created",
 			time.Now(),
 			shortName,
 		)
-
+		// email sent to admins
 		_ = Email.Queue(ctx, EmailData{
 			To:      []string{toEmail},
-			Cc:      admins,
 			Subject: subject,
 			HTML:    html,
 		})
+		Adminsubject, Adminhtml := templates.SingleLicenseEmailTemplate(
+			"Admins",
+			"Created",
+			time.Now(),
+			shortName,
+		)
+		_ = Email.Queue(ctx, EmailData{
+			To:      admins,
+			Subject: Adminsubject,
+			HTML:    Adminhtml,
+		})
 	}()
 }
 
@@ -51,7 +61,7 @@ func NotifyLicenseUpdated(to, userName, licenseName string) {
 		if Email == nil || !Email.IsRunning() {
 			return
 		}
-
+		// sent mail to creator
 		subject, html := templates.SingleLicenseEmailTemplate(
 			userName,
 			"Updated",
@@ -62,11 +72,26 @@ func NotifyLicenseUpdated(to, userName, licenseName string) {
 		data := EmailData{
 			To:      []string{to},
 			Subject: subject,
-			Cc:      admins,
 			HTML:    html,
 		}
 
 		_ = Email.Queue(ctx, data)
+
+		// email sent to admins
+		Adminsubject, Adminhtml := templates.SingleLicenseEmailTemplate(
+			"Admins",
+			"Updated",
+			time.Now(),
+			licenseName,
+		)
+
+		Admindata := EmailData{
+			To:      admins,
+			Subject: Adminsubject,
+			HTML:    Adminhtml,
+		}
+
+		_ = Email.Queue(ctx, Admindata)
 	}()
 }
 
@@ -83,6 +108,7 @@ func NotifyImportSummary(to, userName, importedType string, total, success, fail
 			return
 		}
 
+		// email sent to the creator
 		subject, html := templates.ImportSummaryEmailTemplate(
 			userName,
 			importedType,
@@ -95,10 +121,28 @@ func NotifyImportSummary(to, userName, importedType string, total, success, fail
 		data := EmailData{
 			To:      []string{to},
 			Subject: subject,
-			Cc:      admins,
 			HTML:    html,
 		}
 
 		_ = Email.Queue(ctx, data)
+
+		// email sent to admins
+		Adminsubject, Adminhtml := templates.ImportSummaryEmailTemplate(
+			"Admins",
+			importedType,
+			total,
+			success,
+			failed,
+			time.Now(),
+		)
+
+		Admindata := EmailData{
+			To:      admins,
+			Subject: Adminsubject,
+			HTML:    Adminhtml,
+		}
+
+		_ = Email.Queue(ctx, Admindata)
+
 	}()
 }