Merge branch 'master' into daily-summary-batch

plugin.json

@@ -92,7 +92,7 @@
                 "display_name": "Enable Daily Summary",
                 "type": "bool",
                 "help_text": "When enabled, Mattermost users will a receive a daily summary of their scheduled events in Microsoft Calendar. Users can choose when the summary will be sent to them.",
-                "default": true
+                "default": false
             }
         ]
     }

server/jobs/daily_summary_job.go

@@ -0,0 +1,42 @@
+// Copyright (c) 2019-present Mattermost, Inc. All Rights Reserved.
+// See License for license information.
+
+package jobs
+
+import (
+	"time"
+
+	"github.com/mattermost/mattermost-plugin-mscalendar/server/mscalendar"
+)
+
+// Unique id for the daily summary job
+const dailySummaryJobID = "daily_summary"
+
+const dailySummaryJobInterval = mscalendar.DailySummaryJobInterval
+
+// NewDailySummaryJob creates a RegisteredJob with the parameters specific to the DailySummaryJob
+func NewDailySummaryJob() RegisteredJob {
+	return RegisteredJob{
+		id:                dailySummaryJobID,
+		interval:          dailySummaryJobInterval,
+		work:              runDailySummaryJob,
+		isEnabledByConfig: isDailySummaryJobEnabled,
+	}
+}
+
+// runDailySummaryJob delivers the daily calendar summary to all users who have their settings configured to receive it now
+func runDailySummaryJob(env mscalendar.Env) {
+	env.Logger.Debugf("Daily summary job beginning")
+
+	err := mscalendar.New(env, "").ProcessAllDailySummary(time.Now())
+	if err != nil {
+		env.Logger.Errorf("Error during daily summary job", "error", err.Error())
+	}
+
+	env.Logger.Debugf("Daily summary job finished")
+}
+
+// isDailySummaryJobEnabled uses current config to determine whether the job is enabled.
+func isDailySummaryJobEnabled(env mscalendar.Env) bool {
+	return env.EnableDailySummary
+}

server/mscalendar/daily_summary.go

@@ -15,6 +15,9 @@ import (
 
 const dailySummaryTimeWindow = time.Minute * 2
 
+// Run daily summary job every 15 minutes
+const DailySummaryJobInterval = 15 * time.Minute
+
 var timeNowFunc = time.Now
 
 type DailySummary interface {
@@ -46,8 +49,8 @@ func (m *mscalendar) SetDailySummaryPostTime(user *User, timeStr string) (*store
 		return nil, errors.New("Invalid time value: " + timeStr)
 	}
 
-	if t.Minute()%int(dailySummaryJobInterval/time.Minute) != 0 {
-		return nil, errors.Errorf("Time must be a multiple of %d minutes.", dailySummaryJobInterval/time.Minute)
+	if t.Minute()%int(DailySummaryJobInterval/time.Minute) != 0 {
+		return nil, errors.Errorf("Time must be a multiple of %d minutes.", DailySummaryJobInterval/time.Minute)
 	}
 
 	timezone, err := m.GetTimezone(user)

server/plugin/plugin.go

@@ -34,7 +34,6 @@ import (
 type Env struct {
 	mscalendar.Env
 	bot                   bot.Bot
-	dailySummaryJob       *mscalendar.DailySummaryJob
 	jobManager            *jobs.JobManager
 	notificationProcessor mscalendar.NotificationProcessor
 	httpHandler           *httputils.Handler
@@ -149,25 +148,16 @@ func (p *Plugin) OnConfigurationChange() (err error) {
 			if err != nil {
 				e.Logger.Errorf(err.Error())
 			}
+			err = e.jobManager.AddJob(jobs.NewDailySummaryJob())
+			if err != nil {
+				e.Logger.Errorf(err.Error())
+			}
 		}
 
 		err := e.jobManager.OnConfigurationChange(e.Env)
 		if err != nil {
 			e.Logger.Errorf(err.Error())
 		}
-		{
-			if e.EnableDailySummary && e.dailySummaryJob == nil {
-				e.Logger.Debugf("Enabling daily summary job")
-				e.dailySummaryJob = mscalendar.NewDailySummaryJob(e.Env)
-				go e.dailySummaryJob.Start()
-			}
-
-			if !e.EnableDailySummary && e.dailySummaryJob != nil {
-				e.Logger.Debugf("Disabling daily summary job")
-				e.dailySummaryJob.Cancel()
-				e.dailySummaryJob = nil
-			}
-		}
 	})
 
 	return nil