Add Session for Request

Author: srg-bnd

internal/handlers/handlers.go

@@ -3,7 +3,9 @@ package handlers
 
 import (
 	"encoding/json"
+	"fmt"
 	"net/http"
+	"time"
 
 	"go.uber.org/zap"
 
@@ -29,6 +31,20 @@ func Webhook(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	text := "There are no new messages for you."
+	if req.Session.New {
+		tz, err := time.LoadLocation(req.Timezone)
+		if err != nil {
+			logger.Log.Debug("cannot parse timezone")
+			w.WriteHeader(http.StatusBadRequest)
+			return
+		}
+
+		now := time.Now().In(tz)
+		hour, minute, _ := now.Clock()
+		text = fmt.Sprintf("The exact time %d hours, %d minutes. %s", hour, minute, text)
+	}
+
 	if req.Request.Type != models.TypeSimpleUtterance {
 		logger.Log.Debug("unsupported request type", zap.String("type", req.Request.Type))
 		w.WriteHeader(http.StatusUnprocessableEntity)
@@ -37,7 +53,7 @@ func Webhook(w http.ResponseWriter, r *http.Request) {
 
 	resp := models.Response{
 		Response: models.ResponsePayload{
-			Text: "Sorry, I can't do anything yet",
+			Text: text,
 		},
 		Version: "1.0",
 	}

internal/handlers/handlers_test.go

@@ -14,13 +14,6 @@ func TestWebhook(t *testing.T) {
 	srv := httptest.NewServer(handler)
 	defer srv.Close()
 
-	successBody := `{
-        "response": {
-            "text": "Sorry, I can't do anything yet"
-        },
-        "version": "1.0"
-    }`
-
 	testCases := []struct {
 		name         string
 		method       string
@@ -62,9 +55,9 @@ func TestWebhook(t *testing.T) {
 		{
 			name:         "method_post_success",
 			method:       http.MethodPost,
-			body:         `{"request": {"type": "SimpleUtterance", "command": "sudo do something"}, "version": "1.0"}`,
+			body:         `{"request": {"type": "SimpleUtterance", "command": "sudo do something"}, "session": {"new": true}, "version": "1.0"}`,
 			expectedCode: http.StatusOK,
-			expectedBody: successBody,
+			expectedBody: `The exact time .* hours, .* minutes. There are no new messages for you.`,
 		},
 	}
 
@@ -84,7 +77,7 @@ func TestWebhook(t *testing.T) {
 
 			assert.Equal(t, tc.expectedCode, resp.StatusCode(), "Response code didn't match expected")
 			if tc.expectedBody != "" {
-				assert.JSONEq(t, tc.expectedBody, string(resp.Body()))
+				assert.Regexp(t, tc.expectedBody, string(resp.Body()))
 			}
 		})
 	}

internal/models/models.go

@@ -7,8 +7,15 @@ const (
 
 // https://yandex.ru/dev/dialogs/alice/doc/request.html
 type Request struct {
-	Request SimpleUtterance `json:"request"`
-	Version string          `json:"version"`
+	Timezone string          `json:"timezone"`
+	Request  SimpleUtterance `json:"request"`
+	Session  Session         `json:"session"`
+	Version  string          `json:"version"`
+}
+
+// Session
+type Session struct {
+	New bool `json:"new"`
 }
 
 // Command from Request

internal/server/server_test.go

@@ -39,7 +39,7 @@ func TestGzipCompression(t *testing.T) {
 	}`
 	successBody := `{
 			"response": {
-					"text": "Sorry, I can't do anything yet"
+					"text": "There are no new messages for you."
 			},
 			"version": "1.0"
 	}`