Add support for read msg status

norkans7 · norkans7 · commit 6137e8563909 · 2024-04-25T12:35:08.000+02:00
diff --git a/handlers/kaleyra/handler.go b/handlers/kaleyra/handler.go
@@ -107,7 +107,7 @@ var statusMapping = map[string]courier.MsgStatus{
 	"0":         courier.MsgStatusFailed,
 	"sent":      courier.MsgStatusWired,
 	"delivered": courier.MsgStatusDelivered,
-	"read":      courier.MsgStatusDelivered,
+	"read":      courier.MsgStatusRead,
 }
 
 // receiveStatus is our HTTP handler function for outgoing messages statuses
diff --git a/handlers/kaleyra/handler_test.go b/handlers/kaleyra/handler_test.go
@@ -73,7 +73,7 @@ var incomingCases = []IncomingTestCase{
 		URL:                  receiveStatusURL + "?id=58f86fab-85c5-4f7c-9b68-9c323248afc4%3A0&status=read",
 		ExpectedRespStatus:   200,
 		ExpectedBodyContains: `"type":"status"`,
-		ExpectedStatuses:     []ExpectedStatus{{ExternalID: "58f86fab-85c5-4f7c-9b68-9c323248afc4:0", Status: courier.MsgStatusDelivered}},
+		ExpectedStatuses:     []ExpectedStatus{{ExternalID: "58f86fab-85c5-4f7c-9b68-9c323248afc4:0", Status: courier.MsgStatusRead}},
 	},
 	{
 		Label:                "Receive Invalid Status",
diff --git a/handlers/meta/whatsapp/api.go b/handlers/meta/whatsapp/api.go
@@ -6,7 +6,7 @@ import "github.com/nyaruka/courier"
 var StatusMapping = map[string]courier.MsgStatus{
 	"sent":      courier.MsgStatusSent,
 	"delivered": courier.MsgStatusDelivered,
-	"read":      courier.MsgStatusDelivered,
+	"read":      courier.MsgStatusRead,
 	"failed":    courier.MsgStatusFailed,
 }
 
diff --git a/handlers/twiml/handlers.go b/handlers/twiml/handlers.go
@@ -107,7 +107,7 @@ var statusMapping = map[string]courier.MsgStatus{
 	"failed":      courier.MsgStatusFailed,
 	"sent":        courier.MsgStatusSent,
 	"delivered":   courier.MsgStatusDelivered,
-	"read":        courier.MsgStatusDelivered,
+	"read":        courier.MsgStatusRead,
 	"undelivered": courier.MsgStatusFailed,
 }
 
diff --git a/handlers/twiml/handlers_test.go b/handlers/twiml/handlers_test.go
@@ -175,9 +175,9 @@ var testCases = []IncomingTestCase{
 		URL:                  statusURL,
 		Data:                 statusRead,
 		ExpectedRespStatus:   200,
-		ExpectedBodyContains: `"status":"D"`,
+		ExpectedBodyContains: `"status":"R"`,
 		ExpectedStatuses: []ExpectedStatus{
-			{ExternalID: "SMe287d7109a5a925f182f0e07fe5b223b", Status: courier.MsgStatusDelivered},
+			{ExternalID: "SMe287d7109a5a925f182f0e07fe5b223b", Status: courier.MsgStatusRead},
 		},
 		PrepRequest: addValidSignature,
 	},
diff --git a/handlers/whatsapp_legacy/handler.go b/handlers/whatsapp_legacy/handler.go
@@ -325,7 +325,7 @@ var waStatusMapping = map[string]courier.MsgStatus{
 	"sending":   courier.MsgStatusWired,
 	"sent":      courier.MsgStatusSent,
 	"delivered": courier.MsgStatusDelivered,
-	"read":      courier.MsgStatusDelivered,
+	"read":      courier.MsgStatusRead,
 	"failed":    courier.MsgStatusFailed,
 }
 
diff --git a/handlers/zenvia/handlers.go b/handlers/zenvia/handlers.go
@@ -134,7 +134,7 @@ var statusMapping = map[string]courier.MsgStatus{
 	"NOT_DELIVERED": courier.MsgStatusFailed,
 	"SENT":          courier.MsgStatusSent,
 	"DELIVERED":     courier.MsgStatusDelivered,
-	"READ":          courier.MsgStatusDelivered,
+	"READ":          courier.MsgStatusRead,
 }
 
 type statusPayload struct {
diff --git a/status.go b/status.go
@@ -13,6 +13,7 @@ const (
 	MsgStatusWired     MsgStatus = "W"
 	MsgStatusErrored   MsgStatus = "E"
 	MsgStatusDelivered MsgStatus = "D"
+	MsgStatusRead      MsgStatus = "R"
 	MsgStatusFailed    MsgStatus = "F"
 	NilMsgStatus       MsgStatus = ""
 )

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ var statusMapping = map[string]courier.MsgStatus{`
`107`	`107`	`"0": courier.MsgStatusFailed,`
`108`	`108`	`"sent": courier.MsgStatusWired,`
`109`	`109`	`"delivered": courier.MsgStatusDelivered,`
`110`		`- "read": courier.MsgStatusDelivered,`
	`110`	`+ "read": courier.MsgStatusRead,`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`// receiveStatus is our HTTP handler function for outgoing messages statuses`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ var incomingCases = []IncomingTestCase{`
`73`	`73`	`URL: receiveStatusURL + "?id=58f86fab-85c5-4f7c-9b68-9c323248afc4%3A0&status=read",`
`74`	`74`	`ExpectedRespStatus: 200,`
`75`	`75`	ExpectedBodyContains: `"type":"status"`,
`76`		`- ExpectedStatuses: []ExpectedStatus{{ExternalID: "58f86fab-85c5-4f7c-9b68-9c323248afc4:0", Status: courier.MsgStatusDelivered}},`
	`76`	`+ ExpectedStatuses: []ExpectedStatus{{ExternalID: "58f86fab-85c5-4f7c-9b68-9c323248afc4:0", Status: courier.MsgStatusRead}},`
`77`	`77`	`},`
`78`	`78`	`{`
`79`	`79`	`Label: "Receive Invalid Status",`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import "github.com/nyaruka/courier"`
`6`	`6`	`var StatusMapping = map[string]courier.MsgStatus{`
`7`	`7`	`"sent": courier.MsgStatusSent,`
`8`	`8`	`"delivered": courier.MsgStatusDelivered,`
`9`		`- "read": courier.MsgStatusDelivered,`
	`9`	`+ "read": courier.MsgStatusRead,`
`10`	`10`	`"failed": courier.MsgStatusFailed,`
`11`	`11`	`}`
`12`	`12`
Original file line number	Diff line number	Diff line change
`@@ -325,7 +325,7 @@ var waStatusMapping = map[string]courier.MsgStatus{`
`325`	`325`	`"sending": courier.MsgStatusWired,`
`326`	`326`	`"sent": courier.MsgStatusSent,`
`327`	`327`	`"delivered": courier.MsgStatusDelivered,`
`328`		`- "read": courier.MsgStatusDelivered,`
	`328`	`+ "read": courier.MsgStatusRead,`
`329`	`329`	`"failed": courier.MsgStatusFailed,`
`330`	`330`	`}`
`331`	`331`
Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ var statusMapping = map[string]courier.MsgStatus{`
`134`	`134`	`"NOT_DELIVERED": courier.MsgStatusFailed,`
`135`	`135`	`"SENT": courier.MsgStatusSent,`
`136`	`136`	`"DELIVERED": courier.MsgStatusDelivered,`
`137`		`- "READ": courier.MsgStatusDelivered,`
	`137`	`+ "READ": courier.MsgStatusRead,`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`type statusPayload struct {`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ const (`
`13`	`13`	`MsgStatusWired MsgStatus = "W"`
`14`	`14`	`MsgStatusErrored MsgStatus = "E"`
`15`	`15`	`MsgStatusDelivered MsgStatus = "D"`
	`16`	`+ MsgStatusRead MsgStatus = "R"`
`16`	`17`	`MsgStatusFailed MsgStatus = "F"`
`17`	`18`	`NilMsgStatus MsgStatus = ""`
`18`	`19`	`)`