WIP Issue 73

.circleci/config.yml

@@ -4,15 +4,14 @@ orbs:
 jobs:
   build:
     docker:
-      - image: circleci/golang:1.12
+      - image: circleci/golang:1.12-node
 
     working_directory: /go/src/github.com/scottleedavis/mattermost-plugin-remind
     steps:
       - checkout
 
       # specify any bash command here prefixed with `run: `
       - run: go get -v -t -d ./...
-      # - run: go test -v ./...
       - run: make test
       - codecov/upload:
-          file: server/coverage.txt
+          file: server/coverage.txt

assets/i18n/en.json

@@ -95,10 +95,18 @@
   	"id": "schedule.response",
   	"translation": "I will remind {{.Target}}{{.UseTo}} \"{{.Message}}\" {{.When}}"
   },
+  {
+    "id": "schedule.post.response",
+    "translation": "I will remind you about [this message]({{.PostLink}}) (\"{{.Message}}\") {{.When}}"
+  },
   {
   	"id": "reminder.message",
   	"translation": "{{.FinalTarget}} asked me to remind you \"{{.Message}}\"."
   },
+  {
+    "id": "reminder.post.message",
+    "translation": "You asked me to remind you about [this message]({{.PostLink}})."
+  },
   {
     "id": "action.complete",
     "translation": "I've marked \"{{.Message}}\" as complete."
@@ -111,6 +119,26 @@
     "id": "action.delete",
     "translation": "I’ve deleted the reminder \"{{.Message}}\"."
   },
+  {
+    "id": "action.20min",
+    "translation":  "in 20 minutes"
+  },
+  {
+    "id": "action.1hr",
+    "translation":  "in 1 hour"
+  },
+  {
+    "id": "action.3hr",
+    "translation":  "in 3 hours"
+  },
+  {
+    "id": "action.tomorrow",
+    "translation":  "tomorrow"
+  },
+  {
+    "id": "action.nextweek",
+    "translation":  "on monday"
+  },
   {
     "id": "action.snooze.20min",
     "translation": "Snoozed. I’ll remind you \"{{.Message}}\" in 20 minutes"

plugin.json

@@ -11,6 +11,9 @@
             "windows-amd64": "server/dist/plugin-windows-amd64.exe"
         }
     },
+    "webapp": {
+        "bundle_path": "webapp/dist/main.js"
+    },
     "settings_schema": {
         "header": "",
         "footer": "",

server/activate.go

@@ -12,7 +12,6 @@ const botName = "remindbot"
 const botDisplayName = "Remindbot"
 
 func (p *Plugin) OnActivate() error {
-	p.ServerConfig = p.API.GetConfig()
 
 	teams, err := p.API.GetTeams()
 	if err != nil {

server/http.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"encoding/json"
 	"fmt"
 	"github.com/gorilla/mux"
 	"net/http"
@@ -11,8 +12,20 @@ import (
 	"github.com/mattermost/mattermost-server/plugin"
 )
 
+type ReminderHTTPRequest struct {
+	PostId string
+
+	UserId string
+
+	TeamId string
+
+	TimeId string
+}
+
 func (p *Plugin) InitAPI() *mux.Router {
 	r := mux.NewRouter()
+
+	r.HandleFunc("/remind/{id:[a-z0-9]+}", p.handleReminder).Methods("POST")
 	r.HandleFunc("/dialog", p.handleDialog).Methods("POST")
 
 	r.HandleFunc("/view/ephemeral", p.handleViewEphemeral).Methods("POST")
@@ -40,6 +53,144 @@ func (p *Plugin) ServeHTTP(c *plugin.Context, w http.ResponseWriter, r *http.Req
 	p.router.ServeHTTP(w, r)
 }
 
+func (p *Plugin) handleReminder(w http.ResponseWriter, r *http.Request) {
+
+	decoder := json.NewDecoder(r.Body)
+	var request ReminderHTTPRequest
+	err := decoder.Decode(&request)
+	if err != nil {
+		panic(err)
+	}
+
+	user, uErr := p.API.GetUser(request.UserId)
+	if uErr != nil {
+		p.API.LogError(uErr.Error())
+		writePostActionIntegrationResponseError(w, &model.PostActionIntegrationResponse{})
+		return
+	}
+	post, pErr := p.API.GetPost(request.PostId)
+	if pErr != nil {
+		p.API.LogError(pErr.Error())
+		writePostActionIntegrationResponseError(w, &model.PostActionIntegrationResponse{})
+		return
+	}
+	team, tErr := p.API.GetTeam(request.TeamId)
+	if tErr != nil {
+		p.API.LogError(tErr.Error())
+		writePostActionIntegrationResponseError(w, &model.PostActionIntegrationResponse{})
+	}
+
+	location := p.location(user)
+	T, _ := p.translation(user)
+
+	var timeChoice string
+	switch request.TimeId {
+	case "20min":
+		timeChoice = T("action.20min")
+	case "1hr":
+		timeChoice = T("action.1hr")
+	case "3hr":
+		timeChoice = T("action.3hr")
+	case "tomorrow":
+		timeChoice = T("action.tomorrow")
+	case "nextweek":
+		timeChoice = T("action.nextweek")
+	default:
+		timeChoice = request.TimeId
+	}
+
+	rr := &ReminderRequest{
+		TeamId:   team.Id,
+		Username: user.Username,
+		Reminder: Reminder{
+			Id:        model.NewId(),
+			TeamId:    team.Id,
+			PostId:    post.Id,
+			Username:  user.Username,
+			Message:   post.Message,
+			Completed: p.emptyTime,
+			Target:    "@" + user.Username,
+			When:      timeChoice,
+		},
+	}
+
+	if cErr := p.CreateOccurrences(rr); cErr != nil {
+		p.API.LogError(cErr.Error())
+		writePostActionIntegrationResponseError(w, &model.PostActionIntegrationResponse{})
+		return
+	}
+
+	if rErr := p.UpsertReminder(rr); rErr != nil {
+		p.API.LogError(rErr.Error())
+		writePostActionIntegrationResponseError(w, &model.PostActionIntegrationResponse{})
+		return
+	}
+
+	t := ""
+	if len(rr.Reminder.Occurrences) > 0 {
+		t = rr.Reminder.Occurrences[0].Occurrence.In(location).Format(time.RFC3339)
+	}
+	message := post.Message
+	if len(message) > 9 {
+		message = message[0:9] + "..."
+	}
+
+	var responseParameters = map[string]interface{}{
+		"PostLink": "/" + team.Name + "/pl/" + post.Id,
+		"Message":  message,
+		"When": p.formatWhen(
+			rr.Username,
+			rr.Reminder.When,
+			t,
+			false,
+		),
+	}
+
+	responsePost := &model.Post{
+		ChannelId: post.ChannelId,
+		UserId:    p.remindUserId,
+		Props: model.StringInterface{
+			"attachments": []*model.SlackAttachment{
+				{
+					Text: T("schedule.post.response", responseParameters),
+					Actions: []*model.PostAction{
+						{
+							Id: model.NewId(),
+							Integration: &model.PostActionIntegration{
+								Context: model.StringInterface{
+									"reminder_id":   rr.Reminder.Id,
+									"occurrence_id": rr.Reminder.Occurrences[0].Id,
+									"action":        "delete/ephemeral",
+								},
+								URL: fmt.Sprintf("/plugins/%s/delete/ephemeral", manifest.Id),
+							},
+							Type: model.POST_ACTION_TYPE_BUTTON,
+							Name: T("button.delete"),
+						},
+						{
+							Id: model.NewId(),
+							Integration: &model.PostActionIntegration{
+								Context: model.StringInterface{
+									"reminder_id":   rr.Reminder.Id,
+									"occurrence_id": rr.Reminder.Occurrences[0].Id,
+									"action":        "view/ephemeral",
+								},
+								URL: fmt.Sprintf("/plugins/%s/view/ephemeral", manifest.Id),
+							},
+							Type: model.POST_ACTION_TYPE_BUTTON,
+							Name: T("button.view.reminders"),
+						},
+					},
+				},
+			},
+		},
+	}
+	p.API.SendEphemeralPost(user.Id, responsePost)
+
+	writePostActionIntegrationResponseOk(w, &model.PostActionIntegrationResponse{})
+
+}
+
 func (p *Plugin) handleDialog(w http.ResponseWriter, req *http.Request) {
 
 	request := model.SubmitDialogRequestFromJson(req.Body)

server/http_test.go

@@ -16,6 +16,74 @@ import (
 	"github.com/stretchr/testify/mock"
 )
 
+func TestHandleReminder(t *testing.T) {
+
+	user := &model.User{
+		Id:       model.NewId(),
+		Username: model.NewRandomString(10),
+	}
+
+	post := &model.Post{
+		Id: model.NewId(),
+	}
+
+	team := &model.Team{
+		Id: model.NewId(),
+	}
+
+	reminderRequest := ReminderHTTPRequest{
+		PostId: post.Id,
+		UserId: user.Id,
+		TeamId: team.Id,
+	}
+
+	testTime := time.Now().UTC().Round(time.Second)
+	occurrences := []Occurrence{
+		{
+			Id:         model.NewId(),
+			ReminderId: model.NewId(),
+			Occurrence: testTime,
+		},
+	}
+
+	stringOccurrences, _ := json.Marshal(occurrences)
+	setupAPI := func() *plugintest.API {
+		api := &plugintest.API{}
+		api.On("LogDebug", mock.Anything, mock.Anything, mock.Anything).Maybe()
+		api.On("LogError", mock.Anything, mock.Anything, mock.Anything).Maybe()
+		api.On("LogInfo", mock.Anything).Maybe()
+		api.On("GetUser", mock.Anything).Return(user, nil)
+		api.On("GetUserByUsername", mock.Anything).Return(user, nil)
+		api.On("GetPost", mock.Anything).Return(post, nil)
+		api.On("GetTeam", mock.Anything).Return(team, nil)
+		api.On("KVGet", mock.Anything).Return(stringOccurrences, nil)
+		api.On("KVSet", mock.Anything, mock.Anything).Return(nil)
+		api.On("SendEphemeralPost", mock.Anything, mock.Anything).Return(nil)
+
+		return api
+	}
+
+	t.Run("handle reminder created from webapp", func(t *testing.T) {
+
+		api := setupAPI()
+		defer api.AssertExpectations(t)
+
+		p := &Plugin{}
+		p.router = p.InitAPI()
+		p.API = api
+
+		reminderRequest.TimeId = "in 20 minutes"
+		reminderJson, _ := json.Marshal(&reminderRequest)
+		w := httptest.NewRecorder()
+		r := httptest.NewRequest("POST", "/remind/"+post.Id, bytes.NewReader(reminderJson))
+		p.ServeHTTP(nil, w, r)
+
+		result := w.Result()
+		assert.NotNil(t, result)
+
+	})
+}
+
 func TestHandleDialog(t *testing.T) {
 	user := &model.User{
 		Id:       model.NewId(),