Fix run command

Author: chez-shanpu

.env.sample

@@ -2,4 +2,5 @@ LAB_DB_USER=sample
 LAB_DB_PASSWORD=sample
 LAB_DB_NAME=sample
 LAB_SLACK_TOKEN=sample
-LAB_SLACK_CHANNEL=sample
+LAB_SLACK_CHANNEL=sample
+LAB_SLACK_COMING_CHANNEL=sample

cmd/secretary-lab/app/run.go

@@ -7,11 +7,11 @@ import (
 	"path/filepath"
 	"sync"
 
-	"github.com/chez-shanpu/secretary/pkg/slack"
-
 	"github.com/chez-shanpu/secretary/constants"
+	"github.com/chez-shanpu/secretary/pkg/slack"
 
 	"github.com/gin-gonic/gin"
+	_ "github.com/go-sql-driver/mysql"
 	"github.com/jmoiron/sqlx"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
@@ -47,15 +47,18 @@ func init() {
 	_ = viper.BindEnv("LAB_DB_NAME")
 	_ = viper.BindEnv("LAB_SLACK_TOKEN")
 	_ = viper.BindEnv("LAB_SLACK_CHANNEL")
+	_ = viper.BindEnv("LAB_SLACK_COMING_CHANNEL")
 
 	// required
 	_ = runCmd.MarkFlagRequired("config-path")
 }
 
 func runServer(cmd *cobra.Command, args []string) {
+	var err error
+
 	// db
 	dataSrcName := fmt.Sprintf("%s:%s@/%s", viper.Get("LAB_DB_USER"), viper.Get("LAB_DB_PASSWORD"), viper.Get("LAB_DB_NAME"))
-	db, err := sqlx.Open("mysql", dataSrcName)
+	db, err = sqlx.Open("mysql", dataSrcName)
 	if err != nil {
 		log.Fatalf("[ERROR] sqlx.open: %s", err)
 	}
@@ -74,11 +77,16 @@ func runServer(cmd *cobra.Command, args []string) {
 	r.GET("/status", getStatus)
 	r.POST("/event", postEvent)
 
-	r.Run()
+	r.Run(":8080")
 }
 
 func getStatus(c *gin.Context) {
 	username := c.Query("name")
+	if username == "" {
+		c.JSON(http.StatusBadRequest, gin.H{"message": "please input name parameter"})
+		return
+	}
+
 	status, err := getCurrentStatus(username)
 	if err != nil {
 		log.Printf("[ERROR] getCurrentStatus db GET: %s", err)
@@ -126,7 +134,10 @@ func postEvent(c *gin.Context) {
 		wg.Done()
 	}(req.Username, nowStatus)
 	go func(u, s string) {
-		sendMessage(u, s)
+		err := sendMessage(u, s)
+		if err != nil {
+			log.Printf("[ERROR] sendMessage: %s", err)
+		}
 		wg.Done()
 	}(req.Username, nowStatus)
 	wg.Wait()
@@ -147,22 +158,33 @@ func sendMessage(username, status string) error {
 		return err
 	}
 	if status == constants.LabEventCome {
-		msgStr = fmt.Sprintf("おかえりなさいませ，%s様！ \n今日も一日頑張りましょう！", slackUsername)
+		msgStr = fmt.Sprintf("おかえりなさいませ，@%s様！ \n今日も一日頑張りましょう！", slackUsername)
 	} else {
-		msgStr = fmt.Sprintf("お疲れ様でした，%s様！ \n帰り道気をつけてくださいね！", slackUsername)
+		msgStr = fmt.Sprintf("お疲れ様でした，@%s様！ \n帰り道気をつけてくださいね！", slackUsername)
 	}
 
 	token := viper.GetString("LAB_SLACK_TOKEN")
 	ch := viper.GetString("LAB_SLACK_CHANNEL")
 	mi := slack.NewSlackMessageInfo(token, ch, msgStr)
 	err = mi.PostMessage()
+	if err != nil {
+		return err
+	}
+
+	if status != constants.LabEventCome {
+		return nil
+	}
+	msgStr = fmt.Sprintf("@%s様がいらっしゃいました．", slackUsername)
+	ch = viper.GetString("LAB_SLACK_COMING_CHANNEL")
+	mi = slack.NewSlackMessageInfo(token, ch, msgStr)
+	err = mi.PostMessage()
 	return err
 }
 
 func getCurrentStatus(username string) (string, error) {
 	var todayEventNum int
 
-	err := db.Get(&todayEventNum, "SELECT count(*) FROM lab_event WHERE username=? created_at > CURRENT_DATE", username)
+	err := db.Get(&todayEventNum, "SELECT count(*) FROM lab_events WHERE username=? AND created_at > CURRENT_DATE", username)
 	if err != nil {
 		return "", err
 	}
@@ -177,7 +199,7 @@ func getCurrentStatus(username string) (string, error) {
 func convertSlackUsername(name string) (string, error) {
 	configPath := viper.Get("secretary.lab.config")
 	path, fileName := filepath.Split(configPath.(string))
-	fileNameExt := filepath.Ext(path)
+	fileNameExt := filepath.Ext(fileName)
 	fileName = fileName[0 : len(fileName)-len(fileNameExt)]
 
 	viper.SetConfigName(fileName)

db/0_shema.sql

@@ -2,7 +2,7 @@ CREATE DATABASE secretary;
 
 CREATE TABLE secretary.lab_events
 (
-    id         INTEGER                            NOT NULL PRIMARY KEY,
+    id         INTEGER AUTO_INCREMENT             NOT NULL PRIMARY KEY,
     username   VARCHAR(128)                       NOT NULL,
     event_type VARCHAR(128)                       NOT NULL,
     created_at DATETIME DEFAULT CURRENT_TIMESTAMP NOT NULL

docker-compose.yml

@@ -9,6 +9,7 @@ services:
       LAB_DB_NAME: sample
       LAB_SLACK_TOKEN: sample
       LAB_SLACK_CHANNEL: sample
+      LAB_SLACK_COMING_CHANNEL: sample
     ports:
     - "8080:8080"
 

go.mod

@@ -5,6 +5,7 @@ go 1.15
 require (
 	github.com/gin-gonic/gin v1.6.3
 	github.com/go-playground/validator/v10 v10.4.0 // indirect
+	github.com/go-sql-driver/mysql v1.4.0
 	github.com/golang/protobuf v1.4.2 // indirect
 	github.com/jmoiron/sqlx v1.2.0
 	github.com/json-iterator/go v1.1.10 // indirect

go.sum

@@ -62,6 +62,7 @@ github.com/go-playground/validator/v10 v10.2.0 h1:KgJ0snyC2R9VXYN2rneOtQcw5aHQB1
 github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI=
 github.com/go-playground/validator/v10 v10.4.0 h1:72qIR/m8ybvL8L5TIyfgrigqkrw7kVYAvjEvpT85l70=
 github.com/go-playground/validator/v10 v10.4.0/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4=
+github.com/go-sql-driver/mysql v1.4.0 h1:7LxgVwFb2hIQtMm87NdgAVfXjnt4OePseqT1tKx+opk=
 github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/go-test/deep v1.0.4/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA=