Merge pull request #46 from LucaBernstein/increase-test-cov-fix-tests

Fix tests and increase test coverage

.gitignore

@@ -2,3 +2,5 @@
 
 app
 beancount-bot-tg
+
+coverage.out

bot/config.go

@@ -80,7 +80,11 @@ func (bc *BotController) configHandleTag(m *tb.Message, params ...string) {
 	}
 	// SET tag
 	tag := strings.TrimPrefix(params[0], "#")
-	bc.Repo.UserSetTag(m, tag)
+	err := bc.Repo.UserSetTag(m, tag)
+	if err != nil {
+		bc.Bot.Send(m.Sender, "An error ocurred saving the tag: "+err.Error())
+		return
+	}
 	bc.Bot.Send(m.Sender, fmt.Sprintf("From now on all new transactions automatically get the tag #%s added (vacation mode enabled)", tag))
 }
 

bot/config_test.go

@@ -37,7 +37,7 @@ func TestConfigCurrency(t *testing.T) {
 	bc := NewBotController(db)
 
 	bot := &MockBot{}
-	bc.ConfigureAndAttachBot(bot)
+	bc.AddBotAndStart(bot)
 
 	bc.commandConfig(&tb.Message{Text: "/config", Chat: chat})
 	if !strings.Contains(fmt.Sprintf("%v", bot.LastSentWhat), "Usage help for /config") {
@@ -74,3 +74,65 @@ func TestConfigCurrency(t *testing.T) {
 		t.Errorf("there were unfulfilled expectations: %s", err)
 	}
 }
+
+func TestConfigTag(t *testing.T) {
+	// Test dependencies
+	chat := &tb.Chat{ID: 12345}
+	db, mock, err := sqlmock.New()
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	mock. // SET
+		ExpectExec(`UPDATE "auth::user" SET "tag" = ?`).
+		WithArgs(chat.ID, "vacation2021").
+		WillReturnResult(sqlmock.NewResult(1, 1))
+	mock. // GET
+		ExpectQuery(`SELECT "tag" FROM "auth::user" WHERE "tgChatId" = ?`).
+		WithArgs(chat.ID).
+		WillReturnRows(sqlmock.NewRows([]string{"tag"}).AddRow("vacation2021"))
+	mock. // DELETE
+		ExpectExec(`UPDATE "auth::user" SET "tag" = NULL WHERE "tgChatId" = ?`).
+		WithArgs(chat.ID).
+		WillReturnResult(sqlmock.NewResult(1, 1))
+
+	bc := NewBotController(db)
+	bot := &MockBot{}
+	bc.AddBotAndStart(bot)
+
+	bc.commandConfig(&tb.Message{Text: "/config tag invalid amount of parameters", Chat: chat})
+	if !strings.Contains(fmt.Sprintf("%v", bot.LastSentWhat), "Usage help for /config") {
+		t.Errorf("/config tag invalid amount of parameters: %s", bot.LastSentWhat)
+	}
+
+	// SET tag
+	bc.commandConfig(&tb.Message{Text: "/config tag vacation2021", Chat: chat})
+	if strings.Contains(fmt.Sprintf("%v", bot.LastSentWhat), "Usage help for /config") {
+		t.Errorf("/config tag vacation2021: %s", bot.LastSentWhat)
+	}
+	if !strings.Contains(fmt.Sprintf("%v", bot.LastSentWhat), "get the tag #vacation2021 added") {
+		t.Errorf("/config tag vacation2021 response did not contain set tag: %s", bot.LastSentWhat)
+	}
+
+	// GET tag
+	bc.commandConfig(&tb.Message{Text: "/config tag", Chat: chat})
+	if strings.Contains(fmt.Sprintf("%v", bot.LastSentWhat), "Usage help for /config") {
+		t.Errorf("/config tag: %s", bot.LastSentWhat)
+	}
+	if !strings.Contains(fmt.Sprintf("%v", bot.LastSentWhat), "get the tag #vacation2021 added") {
+		t.Errorf("/config tag vacation2021 response did not contain set tag: %s", bot.LastSentWhat)
+	}
+
+	// DELETE tag
+	bc.commandConfig(&tb.Message{Text: "/config tag off", Chat: chat})
+	if strings.Contains(fmt.Sprintf("%v", bot.LastSentWhat), "Usage help for /config") {
+		t.Errorf("/config tag off: %s", bot.LastSentWhat)
+	}
+	if !strings.Contains(fmt.Sprintf("%v", bot.LastSentWhat), "Disabled") {
+		t.Errorf("/config tag off response did not contain 'Disabled': %s", bot.LastSentWhat)
+	}
+
+	if err := mock.ExpectationsWereMet(); err != nil {
+		t.Errorf("there were unfulfilled expectations: %s", err)
+	}
+}

bot/controller.go

@@ -34,7 +34,14 @@ type BotController struct {
 	CronScheduler *gocron.Scheduler
 }
 
-func (bc *BotController) ConfigureAndAttachBot(b IBot) {
+func (bc *BotController) ConfigureCronScheduler() *BotController {
+	s := gocron.NewScheduler(time.UTC)
+	s.Every(1).Hour().Do(bc.cronNotifications)
+	bc.CronScheduler = s
+	return bc
+}
+
+func (bc *BotController) AddBotAndStart(b IBot) {
 	bc.Bot = b
 
 	mappings := bc.commandMappings()
@@ -47,13 +54,11 @@ func (bc *BotController) ConfigureAndAttachBot(b IBot) {
 
 	log.Printf("Starting bot '%s'", b.Me().Username)
 
-	// Add CRON scheduler
-	s := gocron.NewScheduler(time.UTC)
-	s.Every(1).Hour().Do(bc.cronNotifications)
-	bc.CronScheduler = s
-	s.StartAsync()
-	log.Print(bc.cronInfo())
-
+	if bc.CronScheduler != nil {
+		bc.CronScheduler.StartAsync()
+	} else {
+		log.Print("Warning: No cron scheduler has been attached!")
+	}
 	b.Start() // Blocking
 }
 

bot/controller_test.go

@@ -55,7 +55,7 @@ func TestTextHandlingWithoutPriorState(t *testing.T) {
 
 	bc := NewBotController(db)
 	bot := &MockBot{}
-	bc.ConfigureAndAttachBot(bot)
+	bc.AddBotAndStart(bot)
 
 	// Create simple tx and fill it completely
 	bc.commandCreateSimpleTx(&tb.Message{Chat: chat})
@@ -93,7 +93,7 @@ func TestTransactionDeletion(t *testing.T) {
 
 	bc := NewBotController(db)
 	bot := &MockBot{}
-	bc.ConfigureAndAttachBot(bot)
+	bc.AddBotAndStart(bot)
 
 	bc.commandDeleteTransactions(&tb.Message{Chat: chat, Text: "/deleteAll"})
 	if !strings.Contains(fmt.Sprintf("%v", bot.LastSentWhat), "to confirm the deletion of your transactions") {

bot/suggestions_test.go

@@ -29,7 +29,7 @@ func TestSuggestionsHandlingWithSpaces(t *testing.T) {
 	bc := NewBotController(db)
 
 	bot := &MockBot{}
-	bc.ConfigureAndAttachBot(bot)
+	bc.AddBotAndStart(bot)
 
 	// missing subcommand
 	bc.commandSuggestions(&tb.Message{Text: "/suggestions", Chat: chat})

main.go

@@ -10,7 +10,8 @@ func main() {
 	defer db.Close()
 
 	bc := bot.NewBotController(db)
+	bc.ConfigureCronScheduler()
 
 	bot := bot.CreateBot(bc)
-	bc.ConfigureAndAttachBot(bot)
+	bc.AddBotAndStart(bot)
 }