send messages from mg to telegram, minor fixes

Dockerfile

@@ -3,7 +3,7 @@ FROM golang:1.9.3-stretch
 WORKDIR /
 ADD ./bin/mg-telegram /
 ADD ./templates/ /templates/
-ADD ./web/ /web/
+ADD ./static/ /static/
 ADD ./translate/ /translate/
 ADD ./migrations/ /migrations/
 

Jenkinsfile

@@ -15,15 +15,15 @@ pipeline {
     stages {
         stage('Prepare') {
             steps {
-                sh 'cp config_test.yml.dist config_test.yml'
+                sh 'cp config_test.yml.dist config.yml'
-                compose 'up -d --build postgres'
+                compose 'up -d --build postgres_test'
-                compose 'run --rm mg_telegram make migrate_test'
+                compose 'run --rm mg_telegram_test make migrate_test'
             }
         }
 
         stage('Tests') {
             steps {
-               compose 'run --rm --no-deps mg_telegram make jenkins_test'
+               compose 'run --rm --no-deps mg_telegram_test make jenkins_test'
             }
 
             post {

Makefile

@@ -22,8 +22,9 @@ run: migrate
 	@${BIN} --config $(CONFIG_FILE) run
 
 test: deps fmt
-	@echo "==> Running tests"
+	@echo "==> Running tests (result in test-report.xml)"
-	@cd $(SRC_DIR) && go test ./... -v -cpu 2 -cover -race
+	@go get -v -u github.com/jstemmer/go-junit-report
+	@cd $(SRC_DIR) && go test ./... -v -cpu 2 -cover -race | go-junit-report -set-exit-code > $(SRC_DIR)/test-report.xml
 
 jenkins_test: deps
 	@echo "==> Running tests (result in test-report.xml)"

docker-compose-test.yml

@@ -1,7 +1,7 @@
 version: '2.1'
 
 services:
-    postgres:
+    postgres_test:
         image: postgres:9.6
         environment:
             POSTGRES_USER: mg_telegram_test
@@ -10,13 +10,14 @@ services:
         ports:
             - ${POSTGRES_ADDRESS:-127.0.0.1:5450}:${POSTGRES_PORT:-5450}
 
-    mg_telegram:
+    mg_telegram_test:
         image: golang:1.9.3-stretch
         working_dir: /mg_telegram
         user: ${UID:-1000}:${GID:-1000}
         volumes:
             - ./:/mg_telegram/
         links:
-            - postgres
+            - postgres_test
         ports:
             - ${MG_TELEGRAM_ADDRESS:-3002}:3002
+        command: make migrate_test

event.go

@@ -1,9 +0,0 @@
-package main
-
-type EventMessage struct {
-	ChannelID  uint64 `json:"channel_id"`
-	ExternalID int    `json:"external_id,omitempty"`
-	ChatID     int64  `json:"chat_id"`
-	Message    string `json:"message,omitempty"`
-	Type       string `json:"type"`
-}

routing.go

@@ -557,81 +557,6 @@ func validateCrmSettings(c Connection) error {
 	return nil
 }
 
-func mgWebhookHandler(w http.ResponseWriter, r *http.Request) {
-	bytes, err := ioutil.ReadAll(r.Body)
-	if err != nil {
-		raven.CaptureErrorAndWait(err, nil)
-		logger.Error(err)
-		return
-	}
-
-	var msg EventMessage
-	err = json.Unmarshal(bytes, &msg)
-	if err != nil {
-		raven.CaptureErrorAndWait(err, nil)
-		logger.Error(err)
-		return
-	}
-
-	b := getBotByChannel(msg.ChannelID)
-	if b.ID == 0 {
-		logger.Error(msg.ChannelID, "missing")
-		return
-	}
-
-	if !b.Active {
-		logger.Error(msg.ChannelID, "deactivated")
-		return
-	}
-
-	bot, err := tgbotapi.NewBotAPI(b.Token)
-	if err != nil {
-		raven.CaptureErrorAndWait(err, nil)
-		logger.Error(err)
-	}
-
-	bot.Debug = true
-
-	if msg.Type == "message_sent" {
-		msg, err := bot.Send(tgbotapi.NewMessage(msg.ChatID, msg.Message))
-		if err != nil {
-			logger.Error(err)
-			w.WriteHeader(http.StatusBadRequest)
-			return
-		}
-
-		logger.Debugf("%v", msg)
-		w.WriteHeader(http.StatusOK)
-		w.Write([]byte("Message sent"))
-	}
-
-	if msg.Type == "message_updated" {
-		msg, err := bot.Send(tgbotapi.NewEditMessageText(msg.ChatID, msg.ExternalID, msg.Message))
-		if err != nil {
-			logger.Error(err)
-			w.WriteHeader(http.StatusBadRequest)
-			return
-		}
-
-		logger.Debugf("%v", msg)
-		w.WriteHeader(http.StatusOK)
-		w.Write([]byte("Message updated"))
-	}
-
-	if msg.Type == "message_deleted" {
-		msg, err := bot.Send(tgbotapi.NewDeleteMessage(msg.ChatID, msg.ExternalID))
-		if err != nil {
-			logger.Error(err)
-			w.WriteHeader(http.StatusBadRequest)
-			return
-		}
-
-		logger.Debugf("%v", msg)
-		w.WriteHeader(http.StatusOK)
-		w.Write([]byte("Message deleted"))
-	}
-}
-
 func getAPIClient(url, key string) (*v5.Client, error, int) {
 	client := v5.New(url, key)
 

telegram.go

@@ -123,3 +123,79 @@ func telegramWebhookHandler(w http.ResponseWriter, r *http.Request, token string
 
 	w.WriteHeader(http.StatusOK)
 }
+
+func mgWebhookHandler(w http.ResponseWriter, r *http.Request) {
+	bytes, err := ioutil.ReadAll(r.Body)
+	if err != nil {
+		raven.CaptureErrorAndWait(err, nil)
+		logger.Error(err)
+		return
+	}
+
+	var msg v1.WebhookRequest
+	err = json.Unmarshal(bytes, &msg)
+	if err != nil {
+		raven.CaptureErrorAndWait(err, nil)
+		logger.Error(err)
+		return
+	}
+
+	uid, _ := strconv.Atoi(msg.Data.ExternalMessageID)
+
+	b := getBotByChannel(msg.Data.ChannelID)
+	if b.ID == 0 {
+		logger.Error(msg.Data.ChannelID, "missing")
+		return
+	}
+
+	if !b.Active {
+		logger.Error(msg.Data.ChannelID, "deactivated")
+		return
+	}
+
+	bot, err := tgbotapi.NewBotAPI(b.Token)
+	if err != nil {
+		raven.CaptureErrorAndWait(err, nil)
+		logger.Error(err)
+		return
+	}
+
+	if msg.Type == "message_sent" {
+		msg, err := bot.Send(tgbotapi.NewMessage(msg.Data.ExternalChatID, msg.Data.Content))
+		if err != nil {
+			logger.Error(err)
+			w.WriteHeader(http.StatusBadRequest)
+			return
+		}
+
+		logger.Debugf("%v", msg)
+		w.WriteHeader(http.StatusOK)
+		w.Write([]byte("Message sent"))
+	}
+
+	if msg.Type == "message_updated" {
+		msg, err := bot.Send(tgbotapi.NewEditMessageText(msg.Data.ExternalChatID, uid, msg.Data.Content))
+		if err != nil {
+			logger.Error(err)
+			w.WriteHeader(http.StatusBadRequest)
+			return
+		}
+
+		logger.Debugf("%v", msg)
+		w.WriteHeader(http.StatusOK)
+		w.Write([]byte("Message updated"))
+	}
+
+	if msg.Type == "message_deleted" {
+		msg, err := bot.Send(tgbotapi.NewDeleteMessage(msg.Data.ExternalChatID, uid))
+		if err != nil {
+			logger.Error(err)
+			w.WriteHeader(http.StatusBadRequest)
+			return
+		}
+
+		logger.Debugf("%v", msg)
+		w.WriteHeader(http.StatusOK)
+		w.Write([]byte("Message deleted"))
+	}
+}