feat: settings dialog for mail reports

services/mail/mail.go

@@ -6,6 +6,7 @@ import (
 	"github.com/muety/wakapi/models"
 	"github.com/muety/wakapi/routes"
 	"github.com/muety/wakapi/services"
+	"github.com/muety/wakapi/utils"
 	"html/template"
 	"io/ioutil"
 	"time"
@@ -18,9 +19,9 @@ const (
 	tplNamePasswordReset      = "reset_password"
 	tplNameImportNotification = "import_finished"
 	tplNameReport             = "report"
-	subjectPasswordReset      = "Wakapi – Password Reset"
-	subjectImportNotification = "Wakapi – Data Import Finished"
-	subjectReport             = "Wakapi – Your Latest Report"
+	subjectPasswordReset      = "Wakapi - Password Reset"
+	subjectImportNotification = "Wakapi - Data Import Finished"
+	subjectReport             = "Wakapi - Report from %s"
 )
 
 type SendingService interface {
@@ -89,7 +90,7 @@ func (m *MailService) SendReport(recipient *models.User, report *models.Report)
 	mail := &models.Mail{
 		From:    models.MailAddress(m.config.Mail.Sender),
 		To:      models.MailAddresses([]models.MailAddress{models.MailAddress(recipient.Email)}),
-		Subject: subjectReport,
+		Subject: fmt.Sprintf(subjectReport, utils.FormatDateHuman(time.Now().In(recipient.TZ()))),
 	}
 	mail.WithHTML(tpl.String())
 	return m.sendingService.Send(mail)

services/report.go

@@ -3,6 +3,7 @@ package services
 import (
 	"github.com/emvi/logbuch"
 	"github.com/go-co-op/gocron"
+	"github.com/leandro-lugaresi/hub"
 	"github.com/muety/wakapi/config"
 	"github.com/muety/wakapi/models"
 	"sync"
@@ -13,6 +14,7 @@ var reportLock = sync.Mutex{}
 
 type ReportService struct {
 	config           *config.Config
+	eventBus         *hub.Hub
 	summaryService   ISummaryService
 	userService      IUserService
 	mailService      IMailService
@@ -20,13 +22,23 @@ type ReportService struct {
 }
 
 func NewReportService(summaryService ISummaryService, userService IUserService, mailService IMailService) *ReportService {
-	return &ReportService{
+	srv := &ReportService{
 		config:           config.Get(),
+		eventBus:         config.EventBus(),
 		summaryService:   summaryService,
 		userService:      userService,
 		mailService:      mailService,
 		schedulersWeekly: map[string]*gocron.Scheduler{},
 	}
+
+	sub := srv.eventBus.Subscribe(0, config.EventUserUpdate)
+	go func(sub *hub.Subscription) {
+		for m := range sub.Receiver {
+			srv.SyncSchedule(m.Fields[config.FieldPayload].(*models.User))
+		}
+	}(&sub)
+
+	return srv
 }
 
 func (srv *ReportService) Schedule() {
@@ -39,11 +51,13 @@ func (srv *ReportService) Schedule() {
 
 	logbuch.Info("scheduling reports for %d users", len(users))
 	for _, u := range users {
-		srv.UpdateUserSchedule(u)
+		srv.SyncSchedule(u)
 	}
 }
 
-func (srv *ReportService) UpdateUserSchedule(u *models.User) {
+// SyncSchedule syncs the currently active schedulers with the user's wish about whether or not to receive reports.
+// Returns whether a scheduler is active after this operation has run.
+func (srv *ReportService) SyncSchedule(u *models.User) bool {
 	reportLock.Lock()
 	defer reportLock.Unlock()
 
@@ -52,7 +66,7 @@ func (srv *ReportService) UpdateUserSchedule(u *models.User) {
 		s.Stop()
 		s.Clear()
 		delete(srv.schedulersWeekly, u.ID)
-		return
+		return false
 	}
 
 	// schedule
@@ -67,9 +81,20 @@ func (srv *ReportService) UpdateUserSchedule(u *models.User) {
 		s.StartAsync()
 		srv.schedulersWeekly[u.ID] = s
 	}
+
+	return u.ReportsWeekly
 }
 
 func (srv *ReportService) Run(user *models.User, duration time.Duration) error {
+	if user.Email == "" {
+		logbuch.Warn("not generating report for '%s' as no e-mail address is set")
+	}
+
+	if !srv.SyncSchedule(user) {
+		logbuch.Info("reports for user '%s' were turned off in the meanwhile since last report job ran")
+		return nil
+	}
+
 	end := time.Now().In(user.TZ())
 	start := time.Now().Add(-1 * duration)
 

services/services.go

@@ -70,7 +70,7 @@ type ISummaryService interface {
 
 type IReportService interface {
 	Schedule()
-	UpdateUserSchedule(user *models.User)
+	SyncSchedule(user *models.User) bool
 	Run(*models.User, time.Duration) error
 }
 

services/user.go

@@ -1,6 +1,7 @@
 package services
 
 import (
+	"github.com/leandro-lugaresi/hub"
 	"github.com/muety/wakapi/config"
 	"github.com/muety/wakapi/models"
 	"github.com/muety/wakapi/repositories"
@@ -11,16 +12,18 @@ import (
 )
 
 type UserService struct {
-	Config     *config.Config
+	config     *config.Config
 	cache      *cache.Cache
+	eventBus   *hub.Hub
 	repository repositories.IUserRepository
 }
 
 func NewUserService(userRepo repositories.IUserRepository) *UserService {
 	return &UserService{
-		Config:     config.Get(),
-		repository: userRepo,
+		config:     config.Get(),
+		eventBus:   config.EventBus(),
 		cache:      cache.New(1*time.Hour, 2*time.Hour),
+		repository: userRepo,
 	}
 }
 
@@ -69,7 +72,7 @@ func (srv *UserService) GetAllByReports(reportsEnabled bool) ([]*models.User, er
 }
 
 func (srv *UserService) GetActive() ([]*models.User, error) {
-	minDate := time.Now().Add(-24 * time.Hour * time.Duration(srv.Config.App.InactiveDays))
+	minDate := time.Now().Add(-24 * time.Hour * time.Duration(srv.config.App.InactiveDays))
 	return srv.repository.GetByLastActiveAfter(minDate)
 }
 
@@ -87,7 +90,7 @@ func (srv *UserService) CreateOrGet(signup *models.Signup, isAdmin bool) (*model
 		IsAdmin:  isAdmin,
 	}
 
-	if hash, err := utils.HashBcrypt(u.Password, srv.Config.Security.PasswordSalt); err != nil {
+	if hash, err := utils.HashBcrypt(u.Password, srv.config.Security.PasswordSalt); err != nil {
 		return nil, false, err
 	} else {
 		u.Password = hash
@@ -98,6 +101,7 @@ func (srv *UserService) CreateOrGet(signup *models.Signup, isAdmin bool) (*model
 
 func (srv *UserService) Update(user *models.User) (*models.User, error) {
 	srv.cache.Flush()
+	srv.notifyUpdate(user)
 	return srv.repository.Update(user)
 }
 
@@ -115,7 +119,7 @@ func (srv *UserService) SetWakatimeApiKey(user *models.User, apiKey string) (*mo
 func (srv *UserService) MigrateMd5Password(user *models.User, login *models.Login) (*models.User, error) {
 	srv.cache.Flush()
 	user.Password = login.Password
-	if hash, err := utils.HashBcrypt(user.Password, srv.Config.Security.PasswordSalt); err != nil {
+	if hash, err := utils.HashBcrypt(user.Password, srv.config.Security.PasswordSalt); err != nil {
 		return nil, err
 	} else {
 		user.Password = hash
@@ -129,9 +133,20 @@ func (srv *UserService) GenerateResetToken(user *models.User) (*models.User, err
 
 func (srv *UserService) Delete(user *models.User) error {
 	srv.cache.Flush()
+
+	user.ReportsWeekly = false
+	srv.notifyUpdate(user)
+
 	return srv.repository.Delete(user)
 }
 
 func (srv *UserService) FlushCache() {
 	srv.cache.Flush()
 }
+
+func (srv *UserService) notifyUpdate(user *models.User) {
+	srv.eventBus.Publish(hub.Message{
+		Name:   config.EventUserUpdate,
+		Fields: map[string]interface{}{config.FieldPayload: user},
+	})
+}