feat: add command usage counter

apps/discord-bot/internal/command/command.go

@@ -65,6 +65,7 @@ func (c *commands) IsSystemCommand(commandName string) bool {
 func (c *commands) Respond(ctx context.Context, m *discordgo.MessageCreate, cmdName string, messageContent string) {
 	c.dS.ChannelMessageSend(m.ChannelID, messageContent)
 	c.setCommandCooldown(m.Author.Username)
+	c.service.AddBotCommandStatistic(ctx, cmdName)
 	c.service.SaveCommandActivity(ctx, cmdName, m.GuildID, m.Author.Username, m.Author.ID)
 }
 

apps/discord-bot/internal/service/service.go

@@ -50,6 +50,8 @@ type Service interface {
 	DeleteDiscordBotConfig(ctx context.Context, serverId, key string) (bool, error)
 	GetDiscordBotConfig(ctx context.Context, discordServerId string, configKey string) (*models.DiscordBotConfigs, error)
 	CheckDiscordBotConfig(ctx context.Context, discordServerId string, configKey string, configValue string) bool
+
+	AddBotCommandStatistic(ctx context.Context, commandName string)
 }
 
 type service struct {
@@ -223,3 +225,9 @@ func (s *service) CheckDiscordBotConfig(ctx context.Context, discordServerId str
 }
 
 // DISCORD BOT CONFIG
+
+func (s *service) AddBotCommandStatistic(ctx context.Context, commandName string) {
+	if err := s.DB.AddBotCommandStatistic(ctx, platform.DISCORD, commandName); err != nil {
+		fmt.Println(err.Error())
+	}
+}

apps/twitch-bot/internal/command/command.go

@@ -69,6 +69,7 @@ func (c *commands) IsSystemCommand(commandName string) bool {
 func (c *commands) Respond(ctx context.Context, message twitch.PrivateMessage, cmdName string, messageContent string) {
 	c.client.Twitch.Say(message.Channel, messageContent)
 	c.setCommandCooldown(message.User.Name)
+	c.service.AddBotCommandStatistic(ctx, cmdName)
 	c.service.SaveCommandActivity(ctx, cmdName, message.RoomID, message.User.DisplayName, message.User.ID)
 }
 

apps/twitch-bot/internal/service/service.go

@@ -36,6 +36,8 @@ type Service interface {
 	CreateCommandAlias(ctx context.Context, commandName string, aliases []string, twitchChannelId string, createdBy string) (*string, error)
 	CheckCommandAliasExist(ctx context.Context, commandAlias string, twitchChannelId string) (*string, error)
 	DeleteCommandAlias(ctx context.Context, commandAlias string, twitchChannelId string) (*string, error)
+
+	AddBotCommandStatistic(ctx context.Context, commandName string)
 }
 
 type services struct {
@@ -210,3 +212,9 @@ func (s *services) DeleteCommandAlias(ctx context.Context, commandAlias string,
 
 	return infoText, nil
 }
+
+func (s *services) AddBotCommandStatistic(ctx context.Context, commandName string) {
+	if err := s.DB.AddBotCommandStatistic(ctx, platform.TWITCH, commandName); err != nil {
+		fmt.Println(err.Error())
+	}
+}

db/database.go

@@ -61,4 +61,6 @@ type Database interface {
 	DeleteServerFromDB(ctx context.Context, serverId string) error
 
 	// DISCORD
+
+	AddBotCommandStatistic(ctx context.Context, botPlatform platform.Platform, commandName string) error
 }

db/mysql/common.go

@@ -3,10 +3,12 @@ package mysql
 import (
 	"context"
 	"errors"
+	"log"
 
 	"github.com/senchabot-opensource/monorepo/packages/gosenchabot/models"
 	"github.com/senchabot-opensource/monorepo/packages/gosenchabot/platform"
 	"gorm.io/gorm"
+	"gorm.io/gorm/clause"
 )
 
 func (m *MySQL) CreateBotCommand(ctx context.Context, botPlatform platform.Platform, commandName string, commandContent string, botPlatformId string, createdBy string) (*string, error) {
@@ -402,3 +404,19 @@ func (m *MySQL) GetCommandList(ctx context.Context, botPlatform platform.Platfor
 
 	return botCommandList, nil
 }
+
+func (m *MySQL) AddBotCommandStatistic(ctx context.Context, botPlatform platform.Platform, commandName string) error {
+	botCommandStatistic := models.BotCommandStatistic{CommandName: commandName, BotPlatformType: botPlatform, Count: 1}
+
+	result := m.DB.Clauses(clause.OnConflict{
+		Columns:   []clause.Column{{Name: "id"}},
+		DoUpdates: clause.Assignments(map[string]interface{}{"count": gorm.Expr("count + 1")}),
+	}).Where("bot_platform_type = ?", botPlatform).Where("command_name = ?", commandName).Create(&botCommandStatistic)
+
+	if result.Error != nil {
+		log.Println("(AddBotcommandStatistic): db.Update Error: ", result.Error.Error())
+		return result.Error
+	}
+
+	return nil
+}

packages/gosenchabot/models/models.go

@@ -109,3 +109,9 @@ type TwitchStreamerData struct {
 	StreamGame string `json:"game_name"`
 	StartedAt  string `json:"started_at"`
 }
+
+type BotCommandStatistic struct {
+	BotPlatformType platform.Platform `gorm:"column:bot_platform_type"`
+	CommandName     string            `gorm:"column:command_name"`
+	Count           int               `gorm:"column:count"`
+}

packages/senchabot-prisma/prisma/schema.prisma

@@ -104,6 +104,16 @@ model BotCommandAliases {
     @@map("bot_command_aliases")
 }
 
+model BotCommandStatistic {
+    id              Int     @id @default(autoincrement())
+    botPlatformType String? @map("bot_platform_type")
+    commandName     String  @map("command_name")
+    count           Int     @default(0) @map("count")
+
+    @@unique([botPlatformType, commandName])
+    @@map("bot_command_statistics")
+}
+
 model DiscordServer {
     id                          Int                           @id @default(autoincrement())
     serverId                    String                        @unique @map("server_id")