coopgo-platform/gorush
7
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

chore: rename gorush to notify package (#609)

Browse Source 
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
This commit is contained in:
Bo-Yi Wu
2021-07-24 01:56:33 +08:00
committed by GitHub
parent ce6e87639a
commit d9947ea44d
20 changed files with 73 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
router/server.go
View File

@@ -11,9 +11,9 @@ import (
"github.com/appleboy/gorush/config"
"github.com/appleboy/gorush/core"
"github.com/appleboy/gorush/gorush"
"github.com/appleboy/gorush/logx"
"github.com/appleboy/gorush/metric"
"github.com/appleboy/gorush/notify"
"github.com/appleboy/gorush/queue"
"github.com/appleboy/gorush/status"
@@ -65,7 +65,7 @@ func versionHandler(c *gin.Context) {
func pushHandler(cfg config.ConfYaml, q *queue.Queue) gin.HandlerFunc {
return func(c *gin.Context) {
var form gorush.RequestPush
var form notify.RequestPush
var msg string
if err := c.ShouldBindWith(&form, binding.JSON); err != nil {
@@ -228,7 +228,7 @@ func routerEngine(cfg config.ConfYaml, q *queue.Queue) *gin.Engine {
}
// markFailedNotification adds failure logs for all tokens in push notification
func markFailedNotification(cfg config.ConfYaml, notification *gorush.PushNotification, reason string) {
func markFailedNotification(cfg config.ConfYaml, notification *notify.PushNotification, reason string) {
logx.LogError.Error(reason)
for _, token := range notification.Tokens {
notification.AddLog(logx.GetLogPushEntry(&logx.InputLog{
@@ -246,10 +246,10 @@ func markFailedNotification(cfg config.ConfYaml, notification *gorush.PushNotifi
}
// HandleNotification add notification to queue list.
func handleNotification(ctx context.Context, cfg config.ConfYaml, req gorush.RequestPush, q *queue.Queue) (int, []logx.LogPushEntry) {
func handleNotification(ctx context.Context, cfg config.ConfYaml, req notify.RequestPush, q *queue.Queue) (int, []logx.LogPushEntry) {
var count int
wg := sync.WaitGroup{}
newNotification := []*gorush.PushNotification{}
newNotification := []*notify.PushNotification{}
if cfg.Core.Sync && !core.IsLocalQueue(core.Queue(cfg.Queue.Engine)) {
cfg.Core.Sync = false

38
router/server_test.go
View File

@@ -13,7 +13,7 @@ import (
"github.com/appleboy/gorush/config"
"github.com/appleboy/gorush/core"
"github.com/appleboy/gorush/gorush"
"github.com/appleboy/gorush/notify"
"github.com/appleboy/gorush/queue"
"github.com/appleboy/gorush/queue/simple"
"github.com/appleboy/gorush/status"
@@ -291,7 +291,7 @@ func TestEmptyNotifications(t *testing.T) {
// notifications is empty.
r.POST("/api/push").
SetJSON(gofight.D{
"notifications": []gorush.PushNotification{},
"notifications": []notify.PushNotification{},
}).
Run(routerEngine(cfg, q), func(r gofight.HTTPResponse, rq gofight.HTTPRequest) {
assert.Equal(t, http.StatusBadRequest, r.Code)
@@ -322,7 +322,7 @@ func TestMutableContent(t *testing.T) {
},
}).
Run(routerEngine(cfg, q), func(r gofight.HTTPResponse, rq gofight.HTTPRequest) {
// json: cannot unmarshal number into Go struct field gorush.PushNotification.mutable_content of type bool
// json: cannot unmarshal number into Go struct field notify.PushNotification.mutable_content of type bool
assert.Equal(t, http.StatusBadRequest, r.Code)
})
}
@@ -457,7 +457,7 @@ func TestSenMultipleNotifications(t *testing.T) {
cfg.Ios.Enabled = true
cfg.Ios.KeyPath = "../certificate/certificate-valid.pem"
err := gorush.InitAPNSClient(cfg)
err := notify.InitAPNSClient(cfg)
assert.Nil(t, err)
cfg.Android.Enabled = true
@@ -465,8 +465,8 @@ func TestSenMultipleNotifications(t *testing.T) {
androidToken := os.Getenv("ANDROID_TEST_TOKEN")
req := gorush.RequestPush{
Notifications: []gorush.PushNotification{
req := notify.RequestPush{
Notifications: []notify.PushNotification{
// ios
{
Tokens: []string{"11aa01229f15f0f0c52029d8cf8cd0aeaf2365fe4cebc4af26cd6d76b7919ef7"},
@@ -493,7 +493,7 @@ func TestDisabledAndroidNotifications(t *testing.T) {
cfg.Ios.Enabled = true
cfg.Ios.KeyPath = "../certificate/certificate-valid.pem"
err := gorush.InitAPNSClient(cfg)
err := notify.InitAPNSClient(cfg)
assert.Nil(t, err)
cfg.Android.Enabled = false
@@ -501,8 +501,8 @@ func TestDisabledAndroidNotifications(t *testing.T) {
androidToken := os.Getenv("ANDROID_TEST_TOKEN")
req := gorush.RequestPush{
Notifications: []gorush.PushNotification{
req := notify.RequestPush{
Notifications: []notify.PushNotification{
// ios
{
Tokens: []string{"11aa01229f15f0f0c5209d8cf8cd0aeaf2365fe4cebc4af26cd6d76b7919ef7"},
@@ -529,7 +529,7 @@ func TestSyncModeForNotifications(t *testing.T) {
cfg.Ios.Enabled = true
cfg.Ios.KeyPath = "../certificate/certificate-valid.pem"
err := gorush.InitAPNSClient(cfg)
err := notify.InitAPNSClient(cfg)
assert.Nil(t, err)
cfg.Android.Enabled = true
@@ -540,8 +540,8 @@ func TestSyncModeForNotifications(t *testing.T) {
androidToken := os.Getenv("ANDROID_TEST_TOKEN")
req := gorush.RequestPush{
Notifications: []gorush.PushNotification{
req := notify.RequestPush{
Notifications: []notify.PushNotification{
// ios
{
Tokens: []string{
@@ -575,8 +575,8 @@ func TestSyncModeForTopicNotification(t *testing.T) {
// enable sync mode
cfg.Core.Sync = true
req := gorush.RequestPush{
Notifications: []gorush.PushNotification{
req := notify.RequestPush{
Notifications: []notify.PushNotification{
// android
{
// error:InvalidParameters
@@ -619,8 +619,8 @@ func TestSyncModeForDeviceGroupNotification(t *testing.T) {
// enable sync mode
cfg.Core.Sync = true
req := gorush.RequestPush{
Notifications: []gorush.PushNotification{
req := notify.RequestPush{
Notifications: []notify.PushNotification{
// android
{
To: "aUniqueKey",
@@ -641,7 +641,7 @@ func TestDisabledIosNotifications(t *testing.T) {
cfg.Ios.Enabled = false
cfg.Ios.KeyPath = "../certificate/certificate-valid.pem"
err := gorush.InitAPNSClient(cfg)
err := notify.InitAPNSClient(cfg)
assert.Nil(t, err)
cfg.Android.Enabled = true
@@ -649,8 +649,8 @@ func TestDisabledIosNotifications(t *testing.T) {
androidToken := os.Getenv("ANDROID_TEST_TOKEN")
req := gorush.RequestPush{
Notifications: []gorush.PushNotification{
req := notify.RequestPush{
Notifications: []notify.PushNotification{
// ios
{
Tokens: []string{"11aa01229f15f0f0c52021d8cf3cd0ae1f2365fe4cebc4af26cd6d76b7919ef7"},