MM-14289 & MM-14884 Push notification acknowledge id and include sender name (#10736)
* MM-14289 Add Push notification acknowledge identifier and store tracing logs * MM-14884 include SenderName property in Push Notifications * Remove @ sign from channel Name in push notifications * Fix i18n * Fix push notification model * fix TestPostNotificationGetChannelName * Remove colon from model constant * Fix Notification Registry tests * Make postId optional for clear notifications * Update http status when service is not available Co-Authored-By: enahum <nahumhbl@gmail.com>
Этот коммит содержится в:
@@ -6,6 +6,7 @@ package model
|
||||
import (
|
||||
"encoding/json"
|
||||
"io"
|
||||
"net/http"
|
||||
"strings"
|
||||
)
|
||||
|
||||
@@ -24,9 +25,32 @@ const (
|
||||
CATEGORY_CAN_REPLY = "CAN_REPLY"
|
||||
|
||||
MHPNS = "https://push.mattermost.com"
|
||||
|
||||
PUSH_SEND_SUCCESS = "Successful"
|
||||
PUSH_SEND_ERROR = "Error"
|
||||
PUSH_NOT_SENT = "Not Sent due to preferences"
|
||||
)
|
||||
|
||||
type NotificationRegistry struct {
|
||||
AckId string
|
||||
CreateAt int64
|
||||
UserId string
|
||||
DeviceId string
|
||||
PostId string
|
||||
SendStatus string
|
||||
Type string
|
||||
ReceiveAt int64
|
||||
}
|
||||
|
||||
type PushNotificationAck struct {
|
||||
Id string `json:"id"`
|
||||
ClientReceivedAt int64 `json:"received_at"`
|
||||
ClientPlatform string `json:"platform"`
|
||||
NotificationType string `json:"type"`
|
||||
}
|
||||
|
||||
type PushNotification struct {
|
||||
AckId string `json:"ack_id"`
|
||||
Platform string `json:"platform"`
|
||||
ServerId string `json:"server_id"`
|
||||
DeviceId string `json:"device_id"`
|
||||
@@ -42,6 +66,7 @@ type PushNotification struct {
|
||||
ChannelName string `json:"channel_name"`
|
||||
Type string `json:"type"`
|
||||
SenderId string `json:"sender_id"`
|
||||
SenderName string `json:"sender_name"`
|
||||
OverrideUsername string `json:"override_username"`
|
||||
OverrideIconUrl string `json:"override_icon_url"`
|
||||
FromWebhook string `json:"from_webhook"`
|
||||
@@ -68,3 +93,55 @@ func PushNotificationFromJson(data io.Reader) *PushNotification {
|
||||
json.NewDecoder(data).Decode(&me)
|
||||
return me
|
||||
}
|
||||
|
||||
func PushNotificationAckFromJson(data io.Reader) *PushNotificationAck {
|
||||
var ack *PushNotificationAck
|
||||
json.NewDecoder(data).Decode(&ack)
|
||||
return ack
|
||||
}
|
||||
|
||||
func (ack *PushNotificationAck) ToJson() string {
|
||||
b, _ := json.Marshal(ack)
|
||||
return string(b)
|
||||
}
|
||||
|
||||
func (o *NotificationRegistry) IsValid() *AppError {
|
||||
|
||||
if len(o.AckId) != 26 {
|
||||
return NewAppError("NotificationRegistry.IsValid", "model.notification_registry.ack_id.app_error", nil, "", http.StatusBadRequest)
|
||||
}
|
||||
|
||||
if o.CreateAt == 0 {
|
||||
return NewAppError("NotificationRegistry.IsValid", "model.notification_registry.create_at.app_error", nil, "AckId="+o.AckId, http.StatusBadRequest)
|
||||
}
|
||||
|
||||
if len(o.UserId) != 26 {
|
||||
return NewAppError("NotificationRegistry.IsValid", "model.notification_registry.user_id.app_error", nil, "", http.StatusBadRequest)
|
||||
}
|
||||
|
||||
if len(o.PostId) > 0 && len(o.PostId) != 26 {
|
||||
return NewAppError("NotificationRegistry.IsValid", "model.notification_registry.post_id.app_error", nil, "", http.StatusBadRequest)
|
||||
}
|
||||
|
||||
if len(o.DeviceId) > 512 {
|
||||
return NewAppError("NotificationRegistry.IsValid", "model.notification_registry.device_id.app_error", nil, "", http.StatusBadRequest)
|
||||
}
|
||||
|
||||
if len(o.SendStatus) > 4096 {
|
||||
return NewAppError("NotificationRegistry.IsValid", "model.notification_registry.status.app_error", nil, "", http.StatusBadRequest)
|
||||
}
|
||||
|
||||
if o.Type != PUSH_TYPE_CLEAR && o.Type != PUSH_TYPE_MESSAGE {
|
||||
return NewAppError("NotificationRegistry.IsValid", "model.notification_registry.type.app_error", nil, "", http.StatusBadRequest)
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (o *NotificationRegistry) PreSave() {
|
||||
if o.AckId == "" {
|
||||
o.AckId = NewId()
|
||||
}
|
||||
|
||||
o.CreateAt = GetMillis()
|
||||
}
|
||||
|
||||
Ссылка в новой задаче
Block a user