增加送达统计接口

Author: DeanThompson

Diff for: common/consts.go

@@ -9,6 +9,7 @@ const (
 
 	push_host   = "https://api.jpush.cn"
 	device_host = "https://device.jpush.cn"
+	report_host = "https://report.jpush.cn"
 
 	PUSH_URL          = push_host + "/v3/push"
 	PUSH_VALIDATE_URL = push_host + "/v3/push/validate"
@@ -28,6 +29,9 @@ const (
 	QUERY_ALIAS_URL = device_host + "/v3/aliases/%s"
 	// DELETE /v3/aliases/{alias_value}
 	DELETE_ALIAS_URL = device_host + "/v3/aliases/%s"
+
+	// GET /v3/received
+	RECEIVED_REPORT_URL = report_host + "/v3/received"
 )
 
 var (

Diff for: device/alias.go

@@ -23,5 +23,5 @@ func (result *GetAliasUsersResult) FromResponse(resp *http.Response) error {
 
 func (result *GetAliasUsersResult) String() string {
 	return fmt.Sprintf("<GetAliasUsersResult> RegistrationIds: %v, %v",
-		result.RegistrationIds, result.ResponseBase)
+		result.RegistrationIds, result.ResponseBase.String())
 }

Diff for: device/consts.go

@@ -0,0 +1,7 @@
+package device
+
+const (
+	actionAdd                     = "add"
+	actionRemove                  = "remove"
+	maxAddOrRemoveRegistrationIds = 1000
+)

Diff for: device/tag.go

@@ -46,12 +46,6 @@ func (result *CheckTagUserExistsResult) String() string {
 }
 
 // 更新标签（与设备的绑定的关系）请求参数
-const (
-	actionAdd                     = "add"
-	actionRemove                  = "remove"
-	maxAddOrRemoveRegistrationIds = 1000
-)
-
 type UpdateTagUsersArgs struct {
 	RegistrationIds map[string][]string `json:"registration_ids"`
 }

Diff for: jpush.go

@@ -2,12 +2,14 @@ package jpush
 
 import (
 	"fmt"
+	"strconv"
 	"strings"
 
 	"github.com/DeanThompson/jpush-api-go-client/common"
 	"github.com/DeanThompson/jpush-api-go-client/device"
 	"github.com/DeanThompson/jpush-api-go-client/httplib"
 	"github.com/DeanThompson/jpush-api-go-client/push"
+	"github.com/DeanThompson/jpush-api-go-client/report"
 )
 
 // JPush 的 Golang 推送客户端
@@ -143,6 +145,24 @@ func (jpc *JPushClient) DeleteAlias(alias string, platforms []string) (*common.R
 	return common.ResponseOrError(resp, err)
 }
 
+// 送达统计
+func (jpc *JPushClient) GetReceivedReport(msgIds []uint64) (*report.ReceiveReport, error) {
+	ids := make([]string, 0, len(msgIds))
+	for _, msgId := range msgIds {
+		ids = append(ids, strconv.FormatUint(msgId, 10))
+	}
+	params := map[string]interface{}{"msg_ids": strings.Join(ids, ",")}
+
+	resp, err := jpc.http.Get(common.RECEIVED_REPORT_URL, params, jpc.headers)
+	if err != nil {
+		return nil, err
+	}
+
+	result := &report.ReceiveReport{}
+	err = result.FromResponse(resp)
+	return result, err
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 
 func addPlatformsToParams(platforms []string) map[string]interface{} {

Diff for: jpush_test.go

@@ -174,17 +174,27 @@ func test_DeleteAlias(t *testing.T) {
 	showResultOrError("DeleteAlias", result, err)
 }
 
+///////////////////// Report /////////////////////
+
+func test_GetReceivedReport(t *testing.T) {
+	msgIds := []uint64{1613113584, 1229760629}
+	result, err := client.GetReceivedReport(msgIds)
+	showResultOrError("GetReceivedReport", result, err)
+}
+
 func Test_Starter(t *testing.T) {
-	//	test_Push(t)
-	//
-	//	test_QueryDevice(t)
-	//	test_UpdateDevice(t)
-	//
-	//	test_GetTags(t)
-	//	test_CheckTagUserExists(t)
-	//	test_UpdateTagUsers(t)
-	//	test_DeleteTag(t)
+	test_Push(t)
+
+	test_QueryDevice(t)
+	test_UpdateDevice(t)
+
+	test_GetTags(t)
+	test_CheckTagUserExists(t)
+	test_UpdateTagUsers(t)
+	test_DeleteTag(t)
 
 	test_GetAliasUsers(t)
 	test_DeleteAlias(t)
+
+	test_GetReceivedReport(t)
 }

Diff for: report/report.go

@@ -0,0 +1,42 @@
+package report
+
+import (
+	"encoding/json"
+	"fmt"
+	"net/http"
+
+	"github.com/DeanThompson/jpush-api-go-client/common"
+)
+
+type ReceivedReportNode struct {
+	MsgId           uint64 `json:"msg_id"`
+	AndroidReceived int    `json:"android_received"` // Android 送达。如果无此项数据则为 null
+	IosApnsSent     int    `json:"ios_apns_sent"`    // iOS 推送成功。如果无此项数据则为 null
+	IosMsgReceived  int    `json:"ios_msg_received"` // iOS 自定义消息送达数。如果无此项数据则为null
+	WpMpnsSent      int    `json:"wp_mpns_sent"`     // winphone 通知送达。如果无此项数据则为 null
+}
+
+func (node *ReceivedReportNode) String() string {
+	v, _ := json.Marshal(node)
+	return string(v)
+}
+
+type ReceiveReport struct {
+	common.ResponseBase
+
+	Report []ReceivedReportNode
+}
+
+func (report *ReceiveReport) FromResponse(resp *http.Response) error {
+	report.ResponseBase = common.NewResponseBase(resp)
+	if !report.Ok() {
+		return nil
+	}
+	return common.RespToJson(resp, &report.Report)
+}
+
+func (report *ReceiveReport) String() string {
+	s, _ := json.Marshal(report.Report)
+	return fmt.Sprintf("<ReceiveReport> report: %v, %v", string(s),
+		report.ResponseBase.String())
+}