Merge pull request #387 from jasonrogena/at-expired-status

Adds the Africa's Talking 'Expired' Status in Its Handler
nyaruka · Nov 23, 2021 · 382ab18 · 382ab18
2 parents 3368e1a + 2c33fc2
commit 382ab18
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/handlers/africastalking/africastalking.go b/handlers/africastalking/africastalking.go
@@ -91,6 +91,7 @@ var statusMapping = map[string]courier.MsgStatusValue{
 	"Buffered": courier.MsgSent,
 	"Rejected": courier.MsgFailed,
 	"Failed":   courier.MsgFailed,
+	"Expired":  courier.MsgFailed,
 }
 
 // receiveStatus is our HTTP handler function for status updates
@@ -105,7 +106,7 @@ func (h *handler) receiveStatus(ctx context.Context, channel courier.Channel, w
 	msgStatus, found := statusMapping[form.Status]
 	if !found {
 		return nil, handlers.WriteAndLogRequestError(ctx, h, channel, w, r,
-			fmt.Errorf("unknown status '%s', must be one of 'Success','Sent','Buffered','Rejected' or 'Failed'", form.Status))
+			fmt.Errorf("unknown status '%s', must be one of 'Success','Sent','Buffered','Rejected', 'Failed', or 'Expired'", form.Status))
 	}
 
 	// write our status

diff --git a/handlers/africastalking/africastalking_test.go b/handlers/africastalking/africastalking_test.go
@@ -26,7 +26,8 @@ var (
 
 	missingStatus = "id=ATXid_dda018a640edfcc5d2ce455de3e4a6e7"
 	invalidStatus = "id=ATXid_dda018a640edfcc5d2ce455de3e4a6e7&status=Borked"
-	validStatus   = "id=ATXid_dda018a640edfcc5d2ce455de3e4a6e7&status=Success"
+	successStatus = "id=ATXid_dda018a640edfcc5d2ce455de3e4a6e7&status=Success"
+	expiredStatus = "id=ATXid_dda018a640edfcc5d2ce455de3e4a6e7&status=Expired"
 )
 
 var testCases = []ChannelHandleTestCase{
@@ -42,7 +43,8 @@ var testCases = []ChannelHandleTestCase{
 	{Label: "Invalid Date", URL: receiveURL, Data: invalidDate, Status: 400, Response: "invalid date format"},
 	{Label: "Status Invalid", URL: statusURL, Status: 400, Data: invalidStatus, Response: "unknown status"},
 	{Label: "Status Missing", URL: statusURL, Status: 400, Data: missingStatus, Response: "field 'status' required"},
-	{Label: "Status Valid", URL: statusURL, Status: 200, Data: validStatus, Response: `"status":"D"`},
+	{Label: "Status Success", URL: statusURL, Status: 200, Data: successStatus, Response: `"status":"D"`},
+	{Label: "Status Expired", URL: statusURL, Status: 200, Data: expiredStatus, Response: `"status":"F"`},
 }
 
 func TestHandler(t *testing.T) {