[UXE-4871] feat: change events name and parse error message correctly…

… in the services (#1762)
aziontech · Oct 3, 2024 · 09271a5 · 09271a5
1 parent cdd831e
commit 09271a5
Show file tree

Hide file tree

Showing 7 changed files with 66 additions and 10 deletions.
diff --git a/src/services/network-lists-services/create-network-list-service.js b/src/services/network-lists-services/create-network-list-service.js
@@ -21,6 +21,19 @@ const adapt = (payload) => {
   }
 }
 
+/**
+ * @param {Object} body - The response body.
+ * @returns {string} The result message based on the status code.
+ */
+const extractApiError = (body) => {
+  for (const keyError of Object.keys(body)) {
+    const errorValue = Array.isArray(body[keyError]) ? body[keyError][0] : body[keyError]
+    if (typeof errorValue === 'string') return errorValue
+    if (typeof errorValue === 'object' && errorValue.message) return errorValue.message[0]
+  }
+  return ''
+}
+
 /**
  * @param {Object} httpResponse - The HTTP response object.
  * @param {Object} httpResponse.body - The response body.
@@ -36,7 +49,7 @@ const parseHttpResponse = (httpResponse) => {
         urlToEditView: `/network-lists/edit/${httpResponse.body.results.id}`
       }
     case 400:
-      const apiError = httpResponse.body.results[0]
+      const apiError = extractApiError(httpResponse.body)
       throw new Error(apiError).message
     case 401:
       throw new Errors.InvalidApiTokenError().message

diff --git a/src/services/network-lists-services/edit-network-list-service.js b/src/services/network-lists-services/edit-network-list-service.js
@@ -27,6 +27,19 @@ const adapt = (payload) => {
   }
 }
 
+/**
+ * @param {Object} body - The response body.
+ * @returns {string} The result message based on the status code.
+ */
+const extractApiError = (body) => {
+  for (const keyError of Object.keys(body)) {
+    const errorValue = Array.isArray(body[keyError]) ? body[keyError][0] : body[keyError]
+    if (typeof errorValue === 'string') return errorValue
+    if (typeof errorValue === 'object' && errorValue.message) return errorValue.message[0]
+  }
+  return ''
+}
+
 /**
  * @param {Object} httpResponse - The HTTP response object.
  * @param {Object} httpResponse.body - The response body.
@@ -39,7 +52,7 @@ const parseHttpResponse = (httpResponse) => {
     case 202:
       return 'Your network list has been edited'
     case 400:
-      const apiError = httpResponse.body.results[0]
+      const apiError = extractApiError(httpResponse.body)
       throw new Error(apiError).message
     case 401:
       throw new Errors.InvalidApiTokenError().message

diff --git a/src/tests/services/network-lists-services/create-network-list-service.test.js b/src/tests/services/network-lists-services/create-network-list-service.test.js
@@ -60,7 +60,7 @@ describe('NetworkListsServices', () => {
     expect(data.feedback).toBe('Your network list has been created')
   })
 
-  it('Should return an API error for an 40 error status', async () => {
+  it('Should return an API error for an 400 error status with a array of errors', async () => {
     const apiErrorMock = 'Network name "IP" is already in use on this account'
     vi.spyOn(AxiosHttpClientAdapter, 'request').mockResolvedValueOnce({
       statusCode: 400,
@@ -75,6 +75,21 @@ describe('NetworkListsServices', () => {
     expect(feedbackMessage).rejects.toThrow(apiErrorMock)
   })
 
+  it('Should return an API error for an 400 error status with a single string error', async () => {
+    const apiErrorMock = 'Network name "IP" is already in use on this account'
+    vi.spyOn(AxiosHttpClientAdapter, 'request').mockResolvedValueOnce({
+      statusCode: 400,
+      body: {
+        error: apiErrorMock
+      }
+    })
+    const { sut } = makeSut()
+
+    const feedbackMessage = sut(fixtures.networkMock)
+
+    expect(feedbackMessage).rejects.toThrow(apiErrorMock)
+  })
+
   it.each([
     {
       statusCode: 401,

diff --git a/src/tests/services/network-lists-services/edit-network-list-service.test.js b/src/tests/services/network-lists-services/edit-network-list-service.test.js
@@ -51,7 +51,7 @@ describe('NetworkListsServices', () => {
     expect(feedbackMessage).toBe('Your network list has been edited')
   })
 
-  it('Should return an API error for an 400 error status', async () => {
+  it('Should return an API error for an 400 error status with a array of errors', async () => {
     const apiErrorMock = 'Network name "IP" is already in use on this account'
     vi.spyOn(AxiosHttpClientAdapter, 'request').mockResolvedValueOnce({
       statusCode: 400,
@@ -66,6 +66,21 @@ describe('NetworkListsServices', () => {
     expect(feedbackMessage).rejects.toThrow(apiErrorMock)
   })
 
+  it('Should return an API error for an 400 error status with a single string error', async () => {
+    const apiErrorMock = 'Network name "IP" is already in use on this account'
+    vi.spyOn(AxiosHttpClientAdapter, 'request').mockResolvedValueOnce({
+      statusCode: 400,
+      body: {
+        error: apiErrorMock
+      }
+    })
+    const { sut } = makeSut()
+
+    const feedbackMessage = sut(fixtures.networkMock)
+
+    expect(feedbackMessage).rejects.toThrow(apiErrorMock)
+  })
+
   it.each([
     {
       statusCode: 401,

diff --git a/src/views/NetworkLists/CreateView.vue b/src/views/NetworkLists/CreateView.vue
@@ -66,15 +66,15 @@
 
   const handleTrackCreation = () => {
     tracker.product.productCreated({
-      productName: 'Network Lists'
+      productName: 'Network List'
     })
   }
 
   const handleTrackFailedCreation = (error) => {
     const { fieldName, message } = handleTrackerError(error)
     tracker.product
       .failedToCreate({
-        productName: 'Network Lists',
+        productName: 'Network List',
         errorType: 'api',
         fieldName: fieldName.trim(),
         errorMessage: message

diff --git a/src/views/NetworkLists/EditView.vue b/src/views/NetworkLists/EditView.vue
@@ -74,15 +74,15 @@
   const handleTrackSuccessEdit = () => {
     tracker.product
       .productEdited({
-        productName: 'Network Lists'
+        productName: 'Network List'
       })
       .track()
   }
   const handleTrackFailEdit = (error) => {
     const { fieldName, message } = handleTrackerError(error)
     tracker.product
       .failedToEdit({
-        productName: 'Network Lists',
+        productName: 'Network List',
         errorType: 'api',
         fieldName: fieldName.trim(),
         errorMessage: message

diff --git a/src/views/NetworkLists/ListView.vue b/src/views/NetworkLists/ListView.vue
@@ -77,13 +77,13 @@
 
   const handleCreateTrackEvent = () => {
     tracker.product.clickToCreate({
-      productName: 'Network Lists'
+      productName: 'Network List'
     })
   }
 
   const handleTrackEditEvent = () => {
     tracker.product.clickToEdit({
-      productName: 'Network Lists'
+      productName: 'Network List'
     })
   }