merge sendemail to entity Type

Author: xiahongze

gutils/tasks.go

@@ -28,17 +28,6 @@ func init() {
 	}
 }
 
-func composeEmail(ent models.Entity) string {
-	key, err := ent.K.MarshalJSON()
-	if err != nil {
-		key = []byte("unrecognizable key")
-	}
-	return fmt.Sprintf(`Link to the website: %s
-Name: %s
-XPATH: %s
-Key: %s`, ent.URL, ent.Name, ent.XPATH, key)
-}
-
 // Refresh refreshes prices from datastore
 func Refresh() {
 	log.Println("INFO: Refresh started")
@@ -61,10 +50,10 @@ func Refresh() {
 					}
 					if ent.Options.AlertType == "onChange" && content != last.Price {
 						subject := fmt.Sprintf("[%s] <%s> Alert: price changes to %s!", email.Identity, ent.Name, content)
-						email.Send(composeEmail(ent), subject, ent.Options.Email)
+						ent.SendEmail(&subject)
 					} else if ent.Options.AlertType == "threshold" && ent.Options.Threshold >= float32(thisP) {
 						subject := fmt.Sprintf("[%s] <%s> Alert: price drops to %s!", email.Identity, ent.Name, content)
-						email.Send(composeEmail(ent), subject, ent.Options.Email)
+						ent.SendEmail(&subject)
 					}
 
 					// update history & save entity
@@ -88,7 +77,7 @@ func Refresh() {
 				key, _ := ent.K.MarshalJSON()
 				log.Printf("URL: %s\nXPATH: %s\nKey: %s", ent.URL, ent.XPATH, key)
 				subject := fmt.Sprintf("[%s] <%s> Alert: failed to fetch price for reason `%s`!", email.Identity, ent.Name, content)
-				email.Send(composeEmail(ent), subject, ent.Options.Email)
+				ent.SendEmail(&subject)
 			}
 		}
 	}

handlers/create.go

@@ -8,6 +8,7 @@ import (
 	"strings"
 
 	"github.com/labstack/echo"
+	"github.com/xiahongze/pricetracker/email"
 	"github.com/xiahongze/pricetracker/gutils"
 	"github.com/xiahongze/pricetracker/models"
 	"github.com/xiahongze/pricetracker/trackers"
@@ -59,7 +60,8 @@ func Create(c echo.Context) error {
 		return err
 	}
 
-	sendEmail(&entity, "Created")
+	subject := fmt.Sprintf("[%s] <%s> INFO: %s!", email.Identity, entity.Name, "Created")
+	entity.SendEmail(&subject)
 
 	return c.JSON(http.StatusCreated, entity)
 }

handlers/delete.go

@@ -2,9 +2,11 @@ package handlers
 
 import (
 	"context"
+	"fmt"
 	"net/http"
 
 	"github.com/labstack/echo"
+	"github.com/xiahongze/pricetracker/email"
 	"github.com/xiahongze/pricetracker/gutils"
 	"github.com/xiahongze/pricetracker/models"
 )
@@ -28,7 +30,8 @@ func Delete(c echo.Context) error {
 		return err
 	}
 
-	sendEmail(entity, "Deleted")
+	subject := fmt.Sprintf("[%s] <%s> INFO: %s!", email.Identity, entity.Name, "Deleted")
+	entity.SendEmail(&subject)
 
 	return c.JSON(http.StatusOK, entity)
 }

handlers/sendemail.go

@@ -2,9 +2,11 @@ package handlers
 
 import (
 	"context"
+	"fmt"
 	"net/http"
 
 	"github.com/labstack/echo"
+	"github.com/xiahongze/pricetracker/email"
 	"github.com/xiahongze/pricetracker/gutils"
 	"github.com/xiahongze/pricetracker/models"
 )
@@ -50,7 +52,8 @@ func Update(c echo.Context) error {
 		return err
 	}
 
-	sendEmail(entity, "Updated")
+	subject := fmt.Sprintf("[%s] <%s> INFO: %s!", email.Identity, entity.Name, "Updated")
+	entity.SendEmail(&subject)
 
 	return c.JSON(http.StatusOK, entity)
 }

handlers/update.go

@@ -7,6 +7,7 @@ import (
 	"time"
 
 	"cloud.google.com/go/datastore"
+	"github.com/xiahongze/pricetracker/email"
 )
 
 type (
@@ -55,3 +56,14 @@ func (entity *Entity) Save(ctx context.Context, entTypName string, dsClient *dat
 	}
 	return nil
 }
+
+// SendEmail does what the name says
+func (entity *Entity) SendEmail(subject *string) {
+	if b, err := json.MarshalIndent(entity, "", "    "); err == nil {
+		if err := email.Send(string(b), *subject, entity.Options.Email); err != nil {
+			log.Print("failed to send email", err)
+		}
+	} else {
+		log.Print("failed to marshal entity", err)
+	}
+}