Handle 'set_x_for' commands without any params

col · Jul 16, 2018 · e0ebeef · e0ebeef
1 parent 2652628
commit e0ebeef
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 1 deletion.
diff --git a/domain/types.go b/domain/types.go
@@ -21,7 +21,10 @@ func (c Command) FirstParam() string {
 }
 
 func (c Command) ParamsStringExceptFirst() string {
-	return strings.Join(c.Params[1:], " ")
+	if len(c.Params) > 1 {
+		return strings.Join(c.Params[1:], " ")
+	}
+	return ""
 }
 
 type User struct {

diff --git a/whosinbot/whos_in_bot.go b/whosinbot/whos_in_bot.go
@@ -134,6 +134,9 @@ func (b *WhosInBot) handleResponse(command domain.Command, status string) (*doma
 }
 
 func (b *WhosInBot) handleResponseFor(command domain.Command, status string) (*domain.Response, error) {
+	if len(command.FirstParam()) == 0 {
+		return &domain.Response{ChatID: command.ChatID, Text: "Please provide the persons first name."}, nil
+	}
 	return b.setAttendanceFor(command, command.FirstParam(), status, command.ParamsStringExceptFirst())
 }
 

diff --git a/whosinbot/whos_in_bot_test.go b/whosinbot/whos_in_bot_test.go
@@ -361,6 +361,13 @@ func TestSetInForWithReasonWhenRollCallExist(t *testing.T) {
 	assertBotResponse(t, response, err, 123, "1. JohnSmith (sample reason)", nil)
 }
 
+func TestSetInForWithoutANameWhenRollCallExist(t *testing.T) {
+	setUp()
+	mockDataStore.rollCall = &domain.RollCall{ChatID: 123}
+	response, err := bot.HandleCommand(command("set_in_for", []string{}))
+	assertBotResponse(t, response, err, 123, "Please provide the persons first name.", nil)
+}
+
 func TestSetOutForWhenRollCallDoesNotExist(t *testing.T) {
 	setUp()
 	response, err := bot.HandleCommand(command("set_out_for", []string{"JohnSmith"}))
@@ -381,6 +388,13 @@ func TestSetOutForWithReasonWhenRollCallExist(t *testing.T) {
 	assertBotResponse(t, response, err, 123, "Out\n - JohnSmith (sample reason)", nil)
 }
 
+func TestSetOutForWithoutANameWhenRollCallExist(t *testing.T) {
+	setUp()
+	mockDataStore.rollCall = &domain.RollCall{ChatID: 123}
+	response, err := bot.HandleCommand(command("set_out_for", []string{}))
+	assertBotResponse(t, response, err, 123, "Please provide the persons first name.", nil)
+}
+
 func TestSetMaybeForWhenRollCallDoesNotExist(t *testing.T) {
 	setUp()
 	response, err := bot.HandleCommand(command("set_maybe_for", []string{"JohnSmith"}))
@@ -401,6 +415,13 @@ func TestSetMaybeForWithReasonWhenRollCallExist(t *testing.T) {
 	assertBotResponse(t, response, err, 123, "Maybe\n - JohnSmith (sample reason)", nil)
 }
 
+func TestSetMaybeForWithoutANameWhenRollCallExist(t *testing.T) {
+	setUp()
+	mockDataStore.rollCall = &domain.RollCall{ChatID: 123}
+	response, err := bot.HandleCommand(command("set_maybe_for", []string{}))
+	assertBotResponse(t, response, err, 123, "Please provide the persons first name.", nil)
+}
+
 // Test Helpers
 func command(name string, params []string) domain.Command {
 	return domain.Command{