Fix the response according to API V2

Author: AchoArnold

contact.go

@@ -29,25 +29,17 @@ type ContactListRequest struct {
 
 // ContactCreateResponse represents the response from creating or updating a contact
 type ContactCreateResponse struct {
-	Success bool    `json:"success"`
-	Data    Contact `json:"data"`
-}
-
-// ContactDeleteResponse represents the response from deleting a contact
-type ContactDeleteResponse struct {
-	Success bool `json:"success"`
-	Data    struct {
-		Message string `json:"message"`
-	} `json:"data"`
+	Contact
+	Meta struct {
+		IsNew    bool `json:"isNew"`
+		IsUpdate bool `json:"isUpdate"`
+	} `json:"_meta"`
 }
 
 // ContactListResponse represents the response from listing contacts
 type ContactListResponse struct {
-	Success bool `json:"success"`
-	Data    struct {
-		Items      []Contact `json:"items"`
-		NextCursor string    `json:"nextCursor"`
-		HasMore    bool      `json:"hasMore"`
-		Total      int       `json:"total"`
-	} `json:"data"`
+	Contacts   []Contact `json:"contacts"`
+	Total      int       `json:"total"`
+	HasMore    bool      `json:"hasMore"`
+	NextCursor *string   `json:"nextCursor"`
 }

contact_service.go

@@ -34,23 +34,18 @@ func (service *contactService) Create(ctx context.Context, params *ContactCreate
 // Delete a contact permanently by ID
 //
 // API Docs: https://next-wiki.useplunk.com/api-reference/contacts/deleteContact
-func (service *contactService) Delete(ctx context.Context, contactID string) (*ContactDeleteResponse, *Response, error) {
+func (service *contactService) Delete(ctx context.Context, contactID string) (*Response, error) {
 	request, err := service.client.newRequest(ctx, http.MethodDelete, "/contacts/"+contactID, nil)
 	if err != nil {
-		return nil, nil, err
+		return nil, err
 	}
 
 	response, err := service.client.do(request)
 	if err != nil {
-		return nil, response, err
-	}
-
-	status := new(ContactDeleteResponse)
-	if err = json.Unmarshal(*response.Body, status); err != nil {
-		return nil, response, err
+		return response, err
 	}
 
-	return status, response, nil
+	return response, nil
 }
 
 // List a paginated list of contacts with cursor-based pagination

contact_service_test.go

@@ -66,17 +66,15 @@ func TestContactService_CreateWithError(t *testing.T) {
 func TestContactService_Delete(t *testing.T) {
 	// Arrange
 	apiKey := "test-api-key"
-	server := helpers.MakeTestServer(http.StatusOK, stubs.ContactsDeleteResponse())
+	server := helpers.MakeTestServer(http.StatusNoContent, nil)
 	client := New(WithBaseURL(server.URL), WithSecretKey(apiKey))
 
 	// Act
-	contact, response, err := client.Contacts.Delete(context.Background(), "contact-id")
+	response, err := client.Contacts.Delete(context.Background(), "contact-id")
 
 	// Assert
 	assert.Nil(t, err)
-	assert.Equal(t, http.StatusOK, response.HTTPResponse.StatusCode)
-	jsonContent, _ := json.Marshal(contact)
-	assert.JSONEq(t, string(stubs.ContactsDeleteResponse()), string(jsonContent))
+	assert.Equal(t, http.StatusNoContent, response.HTTPResponse.StatusCode)
 
 	// Teardown
 	server.Close()
@@ -89,7 +87,7 @@ func TestContactService_DeleteWithError(t *testing.T) {
 	client := New(WithBaseURL(server.URL), WithSecretKey(apiKey))
 
 	// Act
-	_, response, err := client.Contacts.Delete(context.Background(), "contact-id")
+	response, err := client.Contacts.Delete(context.Background(), "contact-id")
 
 	// Assert
 	assert.NotNil(t, err)

internal/stubs/contact.go

@@ -4,27 +4,20 @@ package stubs
 func ContactsCreateResponse() []byte {
 	return []byte(`
 {
-  "success": true,
-  "data": {
-    "id": "string",
-    "email": "[email protected]",
-    "subscribed": true,
-    "data": {},
-    "createdAt": "2019-08-24T14:15:22Z",
-    "updatedAt": "2019-08-24T14:15:22Z"
-  }
-}
-`)
-}
-
-// ContactsDeleteResponse returns a stubbed response for deleting a contact
-func ContactsDeleteResponse() []byte {
-	return []byte(`
-{
-  "success": true,
-  "data": {
-    "message": "string"
-  }
+	"id": "string",
+	"email": "[email protected]",
+	"subscribed": true,
+	"data": {
+		"firstName": "John",
+		"lastName": "Doe",
+		"plan": "premium"
+	},
+	"createdAt": "2019-08-24T14:15:22Z",
+	"updatedAt": "2019-08-24T14:15:22Z",
+	"_meta": {
+		"isNew":false,
+		"isUpdate":false
+	}
 }
 `)
 }
@@ -33,22 +26,23 @@ func ContactsDeleteResponse() []byte {
 func ContactsListResponse() []byte {
 	return []byte(`
 {
-  "success": true,
-  "data": {
-    "items": [
-      {
-        "id": "string",
-        "email": "[email protected]",
-        "subscribed": true,
-        "data": {},
-        "createdAt": "2019-08-24T14:15:22Z",
-        "updatedAt": "2019-08-24T14:15:22Z"
-      }
+  	"contacts": [
+		{
+			"id": "string",
+			"email": "[email protected]",
+			"subscribed": true,
+			"data": {
+				"firstName": "John",
+				"lastName": "Doe",
+				"plan": "premium"
+			},
+			"createdAt": "2019-08-24T14:15:22Z",
+			"updatedAt": "2019-08-24T14:15:22Z"
+		}
     ],
-    "nextCursor": "string",
-    "hasMore": true,
-    "total": 0
-  }
+    "nextCursor": null,
+    "hasMore": false,
+    "total": 1
 }
 `)
 }