RetailCRM-Mirror/mg-transport-telegram
1
0
Fork 0
mirror of synced 2024-11-24 20:56:04 +03:00
Code Issues Projects Releases Wiki Activity

replace activation/deactivation to delete

Browse Source
This commit is contained in:
DmitryZagorulko 2018-06-28 12:17:19 +03:00
parent 76d9ab6e8f
commit f60e4795b3
12 changed files with 41 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
migrations/1530177124_app.down.sql Normal file
View File

@ -0,0 +1 @@
alter table bot add column active boolean;

1
migrations/1530177124_app.up.sql Normal file
View File

@ -0,0 +1 @@
alter table bot drop column active;

1
models.go
View File

@ -25,7 +25,6 @@ type Bot struct {
Name string `gorm:"name type:varchar(40)" json:"name,omitempty"` Name string `gorm:"name type:varchar(40)" json:"name,omitempty"`
CreatedAt time.Time CreatedAt time.Time
UpdatedAt time.Time UpdatedAt time.Time
Active bool `json:"active,omitempty"`
} }
// User model // User model

4
repository.go
View File

@ -48,8 +48,8 @@ func getBotByToken(token string) (*Bot, error) {
return &bot, nil return &bot, nil
} }
func (b *Bot) setBotActivity() error { func (b *Bot) deleteBot() error {
return orm.DB.Model(b).Where("token = ?", b.Token).Update("Active", !b.Active).Error return orm.DB.Delete(b, "token = ?", b.Token).Error
} }
func getBotChannelByToken(token string) uint64 { func getBotChannelByToken(token string) uint64 {

55
routing.go
View File

@ -61,7 +61,7 @@ func setWrapperRoutes() {
http.HandleFunc("/create/", createHandler) http.HandleFunc("/create/", createHandler)
http.HandleFunc("/actions/activity", activityHandler) http.HandleFunc("/actions/activity", activityHandler)
http.HandleFunc("/add-bot/", addBotHandler) http.HandleFunc("/add-bot/", addBotHandler)
http.HandleFunc("/activity-bot/", activityBotHandler) http.HandleFunc("/delete-bot/", deleteBotHandler)
} }
func renderTemplate(w http.ResponseWriter, tmpl string, c interface{}) { func renderTemplate(w http.ResponseWriter, tmpl string, c interface{}) {
@ -200,7 +200,6 @@ func addBotHandler(w http.ResponseWriter, r *http.Request) {
} }
b.Channel = data.ChannelID b.Channel = data.ChannelID
b.Active = true
err = c.createBot(b) err = c.createBot(b)
if err != nil { if err != nil {
@ -222,7 +221,7 @@ func addBotHandler(w http.ResponseWriter, r *http.Request) {
w.Write(jsonString) w.Write(jsonString)
} }
func activityBotHandler(w http.ResponseWriter, r *http.Request) { func deleteBotHandler(w http.ResponseWriter, r *http.Request) {
defer r.Body.Close() defer r.Body.Close()
setLocale(r.Header.Get("Accept-Language")) setLocale(r.Header.Get("Accept-Language"))
body, err := ioutil.ReadAll(r.Body) body, err := ioutil.ReadAll(r.Body)
@ -250,36 +249,16 @@ func activityBotHandler(w http.ResponseWriter, r *http.Request) {
return return
} }
ch := v1.Channel{
ID: getBotChannelByToken(b.Token),
Type: "telegram",
Events: []string{
"message_sent",
"message_updated",
"message_deleted",
"message_read",
},
}
var client = v1.New(c.MGURL, c.MGToken) var client = v1.New(c.MGURL, c.MGToken)
if b.Active { data, status, err := client.DeactivateTransportChannel(getBotChannelByToken(b.Token))
data, status, err := client.DeactivateTransportChannel(ch.ID) if status > http.StatusOK {
if status > http.StatusOK { http.Error(w, localizer.MustLocalize(&i18n.LocalizeConfig{MessageID: "error_deactivating_channel"}), http.StatusBadRequest)
http.Error(w, localizer.MustLocalize(&i18n.LocalizeConfig{MessageID: "error_deactivating_channel"}), http.StatusBadRequest) logger.Error(b.ID, status, err.Error(), data)
logger.Error(b.ID, status, err.Error(), data) return
return
}
} else {
data, status, err := client.ActivateTransportChannel(ch)
if status > http.StatusCreated {
http.Error(w, localizer.MustLocalize(&i18n.LocalizeConfig{MessageID: "error_activating_channel"}), http.StatusBadRequest)
logger.Error(b.ID, status, err.Error(), data)
return
}
} }
err = b.setBotActivity() err = b.deleteBot()
if err != nil { if err != nil {
raven.CaptureErrorAndWait(err, nil) raven.CaptureErrorAndWait(err, nil)
http.Error(w, localizer.MustLocalize(&i18n.LocalizeConfig{MessageID: "error_save"}), http.StatusInternalServerError) http.Error(w, localizer.MustLocalize(&i18n.LocalizeConfig{MessageID: "error_save"}), http.StatusInternalServerError)
@ -309,15 +288,15 @@ func settingsHandler(w http.ResponseWriter, r *http.Request, uid string) {
p, p,
bots, bots,
map[string]interface{}{ map[string]interface{}{
"ButtonSave": localizer.MustLocalize(&i18n.LocalizeConfig{MessageID: "button_save"}), "ButtonSave": localizer.MustLocalize(&i18n.LocalizeConfig{MessageID: "button_save"}),
"ApiKey": localizer.MustLocalize(&i18n.LocalizeConfig{MessageID: "api_key"}), "ApiKey": localizer.MustLocalize(&i18n.LocalizeConfig{MessageID: "api_key"}),
"TabSettings": localizer.MustLocalize(&i18n.LocalizeConfig{MessageID: "tab_settings"}), "TabSettings": localizer.MustLocalize(&i18n.LocalizeConfig{MessageID: "tab_settings"}),
"TabBots": localizer.MustLocalize(&i18n.LocalizeConfig{MessageID: "tab_bots"}), "TabBots": localizer.MustLocalize(&i18n.LocalizeConfig{MessageID: "tab_bots"}),
"TableName": localizer.MustLocalize(&i18n.LocalizeConfig{MessageID: "table_name"}), "TableName": localizer.MustLocalize(&i18n.LocalizeConfig{MessageID: "table_name"}),
"TableToken": localizer.MustLocalize(&i18n.LocalizeConfig{MessageID: "table_token"}), "TableToken": localizer.MustLocalize(&i18n.LocalizeConfig{MessageID: "table_token"}),
"AddBot": localizer.MustLocalize(&i18n.LocalizeConfig{MessageID: "add_bot"}), "AddBot": localizer.MustLocalize(&i18n.LocalizeConfig{MessageID: "add_bot"}),
"TableActivity": localizer.MustLocalize(&i18n.LocalizeConfig{MessageID: "table_activity"}), "TableDelete": localizer.MustLocalize(&i18n.LocalizeConfig{MessageID: "table_delete"}),
"Title": localizer.MustLocalize(&i18n.LocalizeConfig{MessageID: "title"}), "Title": localizer.MustLocalize(&i18n.LocalizeConfig{MessageID: "title"}),
}, },
} }

6
routing_test.go
View File

@ -103,7 +103,7 @@ func TestRouting_addBotHandler(t *testing.T) {
assert.Equal(t, "123123:Qwerty", res["token"]) assert.Equal(t, "123123:Qwerty", res["token"])
} }
func TestRouting_activityBotHandler(t *testing.T) { func TestRouting_deleteBotHandler(t *testing.T) {
defer gock.Off() defer gock.Off()
gock.New("https://test.retailcrm.pro"). gock.New("https://test.retailcrm.pro").
@ -114,13 +114,13 @@ func TestRouting_activityBotHandler(t *testing.T) {
Reply(200). Reply(200).
BodyString(`{"id": 1}`) BodyString(`{"id": 1}`)
req, err := http.NewRequest("POST", "/activity-bot/", strings.NewReader(`{"token": "123123:Qwerty", "active": false, "connectionId": 1}`)) req, err := http.NewRequest("POST", "/delete-bot/", strings.NewReader(`{"token": "123123:Qwerty", "active": false, "connectionId": 1}`))
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
rr := httptest.NewRecorder() rr := httptest.NewRecorder()
handler := http.HandlerFunc(activityBotHandler) handler := http.HandlerFunc(deleteBotHandler)
handler.ServeHTTP(rr, req) handler.ServeHTTP(rr, req)
assert.Equal(t, http.StatusOK, rr.Code, assert.Equal(t, http.StatusOK, rr.Code,

20
static/script.js
View File

@ -39,21 +39,17 @@ $("#add-bot").on("submit", function(e) {
) )
}); });
$(document).on("click", ".activity-bot", function(e) { $(document).on("click", ".delete-bot", function(e) {
let but = $(this); let but = $(this);
send("/activity-bot/", send("/delete-bot/",
{ {
token: but.attr("data-token"), token: but.attr("data-token"),
active: (but.attr("data-activity") === 'true'),
connectionId: parseInt($('input[name=connectionId]').val()), connectionId: parseInt($('input[name=connectionId]').val()),
}, },
function () { function () {
if (but.attr("data-activity") === 'true') { but.parents("tr").remove();
but.find('i').replaceWith('<i class="material-icons">play_arrow</i>'); if ($("#bots tbody tr").length === 0) {
but.attr("data-activity", "false") $("#bots").addClass("hide");
} else {
but.find('i').replaceWith('<i class="material-icons">pause</i>');
but.attr("data-activity", "true")
} }
} }
) )
@ -89,9 +85,9 @@ function getBotTemplate(data) {
<td>${bot.name}</td> <td>${bot.name}</td>
<td>${bot.token}</td> <td>${bot.token}</td>
<td> <td>
<button class="activity-bot btn btn-small waves-effect waves-light light-blue darken-1" type="submit" name="action" <button class="delete-bot btn btn-small waves-effect waves-light light-blue darken-1" type="submit" name="action"
data-activity="true" data-token="${bot.token}"> data-token="${bot.token}">
<i class="material-icons">pause</i> <i class="material-icons">delete</i>
</button> </button>
</td> </td>
</tr>`; </tr>`;

2
static/style.css
View File

@ -16,7 +16,7 @@
margin: 0 auto; margin: 0 auto;
} }
#bots .activity-bot{ #bots .delete-bot{
float: right; float: right;
} }

4
telegram.go
View File

@ -39,7 +39,7 @@ func telegramWebhookHandler(w http.ResponseWriter, r *http.Request, token string
return return
} }
if b.ID == 0 || !b.Active { if b.ID == 0 {
logger.Error(token, "telegramWebhookHandler: missing or deactivated") logger.Error(token, "telegramWebhookHandler: missing or deactivated")
w.WriteHeader(http.StatusOK) w.WriteHeader(http.StatusOK)
return return
@ -237,7 +237,7 @@ func mgWebhookHandler(w http.ResponseWriter, r *http.Request) {
cid, _ := strconv.ParseInt(msg.Data.ExternalChatID, 10, 64) cid, _ := strconv.ParseInt(msg.Data.ExternalChatID, 10, 64)
b := getBot(c.ID, msg.Data.ChannelID) b := getBot(c.ID, msg.Data.ChannelID)
if b.ID == 0 || !b.Active { if b.ID == 0 {
logger.Error(msg.Data.ChannelID, "mgWebhookHandler: missing or deactivated") logger.Error(msg.Data.ChannelID, "mgWebhookHandler: missing or deactivated")
w.WriteHeader(http.StatusBadRequest) w.WriteHeader(http.StatusBadRequest)
w.Write([]byte("missing or deactivated")) w.Write([]byte("missing or deactivated"))

8
templates/form.html
View File

@ -53,7 +53,7 @@
<tr> <tr>
<th>{{.Locale.TableName}}</th> <th>{{.Locale.TableName}}</th>
<th>{{.Locale.TableToken}}</th> <th>{{.Locale.TableToken}}</th>
<th class="text-left">{{.Locale.TableActivity}}</th> <th class="text-left">{{.Locale.TableDelete}}</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@ -62,9 +62,9 @@
<td>{{.Name}}</td> <td>{{.Name}}</td>
<td>{{.Token}}</td> <td>{{.Token}}</td>
<td> <td>
<button class="activity-bot btn btn-small waves-effect waves-light light-blue darken-1" type="submit" name="action" <button class="delete-bot btn btn-small waves-effect waves-light light-blue darken-1" type="submit" name="action"
data-activity="{{.Active}}" data-token="{{.Token}}"> data-token="{{.Token}}">
<i class="material-icons">{{if .Active}}pause{{else}}play_arrow{{end}}</i> <i class="material-icons">delete</i>
</button> </button>
</td> </td>
</tr> </tr>

2
translate/translate.en.yml
View File

@ -3,7 +3,7 @@ tab_settings: CRM settings
tab_bots: Bots tab_bots: Bots
table_name: Name table_name: Name
table_token: Token table_token: Token
table_activity: Activity mark table_delete: Delete
api_key: API key api_key: API key
add_bot: Add a bot add_bot: Add a bot
title: Module of connecting Telegram to retailCRM title: Module of connecting Telegram to retailCRM

2
translate/translate.ru.yml
View File

@ -3,7 +3,7 @@ tab_settings: Настройки CRM
tab_bots: Боты tab_bots: Боты
table_name: Имя table_name: Имя
table_token: Токен table_token: Токен
table_activity: Активность table_delete: Удалить
api_key: API Ключ api_key: API Ключ
add_bot: Добавить бота add_bot: Добавить бота
title: Модуль подключения Telegram к retailCRM title: Модуль подключения Telegram к retailCRM