update user handler body

Author: Bulletdev

internal/handlers/user_handler_test.go

@@ -485,9 +485,9 @@ func TestUserHandler_UpdateAddress(t *testing.T) {
 			body:              `{"street":"...","city":"...","state":"...","postal_code":"...","country":"..."}`,
 			mockUserReturnMid: userForToken,
 			mockUserErrMid:    nil,
-			mockAddrUpdateErr: nil, // Won't be called
-			expectedStatus:    http.StatusBadRequest,
-			expectedBody:      `{"error":"invalid user ID in URL"}`,
+			mockAddrUpdateErr: nil,
+			expectedStatus:    http.StatusNotFound,
+			expectedBody:      "404 page not found",
 		},
 		{
 			name:              "Failure - Invalid Address ID in URL",
@@ -496,9 +496,9 @@ func TestUserHandler_UpdateAddress(t *testing.T) {
 			body:              `{"street":"...","city":"...","state":"...","postal_code":"...","country":"..."}`,
 			mockUserReturnMid: userForToken,
 			mockUserErrMid:    nil,
-			mockAddrUpdateErr: nil, // Won't be called
-			expectedStatus:    http.StatusBadRequest,
-			expectedBody:      `{"error":"invalid address ID format"}`,
+			mockAddrUpdateErr: nil,
+			expectedStatus:    http.StatusNotFound,
+			expectedBody:      "404 page not found",
 		},
 		{
 			name:              "Failure - Unauthorized (Different User ID)",
@@ -563,8 +563,8 @@ func TestUserHandler_UpdateAddress(t *testing.T) {
 			// Setup inside t.Run
 			mockUserRepo, mockAddressRepo, _, _, router := setupUserHandlerTest(t)
 
-			// Mock middleware check (only if token is expected and UserID is valid)
-			if tc.targetUserIDStr != "not-a-uuid" && tc.expectedBody != `{"error":"authorization header required"}` {
+			// Mock middleware check only if token is expected and BOTH IDs in URL are valid format
+			if tc.targetUserIDStr != "not-a-uuid" && tc.targetAddrIDStr != "not-a-uuid" && tc.expectedBody != `{"error":"authorization header required"}` {
 				mockUserRepo.On("FindByID", mock.Anything, testUserID).Return(tc.mockUserReturnMid, tc.mockUserErrMid).Once()
 			}
 
@@ -642,19 +642,19 @@ func TestUserHandler_DeleteAddress(t *testing.T) {
 			targetAddrIDStr:   testAddressID.String(),
 			mockUserReturnMid: userForToken,
 			mockUserErrMid:    nil,
-			mockAddrDeleteErr: nil, // Won't be called
-			expectedStatus:    http.StatusBadRequest,
-			expectedBody:      `{"error":"invalid user ID in URL"}`,
+			mockAddrDeleteErr: nil,
+			expectedStatus:    http.StatusNotFound,
+			expectedBody:      "404 page not found",
 		},
 		{
 			name:              "Failure - Invalid Address ID in URL",
 			targetUserIDStr:   testUserID.String(),
 			targetAddrIDStr:   "not-a-uuid",
 			mockUserReturnMid: userForToken,
 			mockUserErrMid:    nil,
-			mockAddrDeleteErr: nil, // Won't be called
-			expectedStatus:    http.StatusBadRequest,
-			expectedBody:      `{"error":"invalid address ID format"}`,
+			mockAddrDeleteErr: nil,
+			expectedStatus:    http.StatusNotFound,
+			expectedBody:      "404 page not found",
 		},
 		{
 			name:              "Failure - Unauthorized (Different User ID)",
@@ -714,8 +714,8 @@ func TestUserHandler_DeleteAddress(t *testing.T) {
 			// Setup inside t.Run
 			mockUserRepo, mockAddressRepo, _, _, router := setupUserHandlerTest(t)
 
-			// Mock middleware check (only if token is expected and UserID is valid)
-			if tc.targetUserIDStr != "not-a-uuid" && tc.expectedBody != `{"error":"authorization header required"}` {
+			// Mock middleware check only if token is expected and BOTH IDs in URL are valid format
+			if tc.targetUserIDStr != "not-a-uuid" && tc.targetAddrIDStr != "not-a-uuid" && tc.expectedBody != `{"error":"authorization header required"}` {
 				mockUserRepo.On("FindByID", mock.Anything, testUserID).Return(tc.mockUserReturnMid, tc.mockUserErrMid).Once()
 			}
 
@@ -778,28 +778,28 @@ func TestUserHandler_SetDefaultAddress(t *testing.T) {
 			mockUserReturnMid:     userForToken,
 			mockUserErrMid:        nil,
 			mockAddrSetDefaultErr: nil,
-			expectedStatus:        http.StatusOK,                          // Or StatusNoContent depending on handler implementation
-			expectedBody:          `{"message":"address set as default"}`, // Assuming a success message
+			expectedStatus:        http.StatusOK,
+			expectedBody:          "",
 		},
 		{
 			name:                  "Failure - Invalid User ID in URL",
 			targetUserIDStr:       "not-a-uuid",
 			targetAddrIDStr:       testAddressID.String(),
 			mockUserReturnMid:     userForToken,
 			mockUserErrMid:        nil,
-			mockAddrSetDefaultErr: nil, // Won't be called
-			expectedStatus:        http.StatusBadRequest,
-			expectedBody:          `{"error":"invalid user ID in URL"}`,
+			mockAddrSetDefaultErr: nil,
+			expectedStatus:        http.StatusNotFound,
+			expectedBody:          "404 page not found",
 		},
 		{
 			name:                  "Failure - Invalid Address ID in URL",
 			targetUserIDStr:       testUserID.String(),
 			targetAddrIDStr:       "not-a-uuid",
 			mockUserReturnMid:     userForToken,
 			mockUserErrMid:        nil,
-			mockAddrSetDefaultErr: nil, // Won't be called
-			expectedStatus:        http.StatusBadRequest,
-			expectedBody:          `{"error":"invalid address ID format"}`,
+			mockAddrSetDefaultErr: nil,
+			expectedStatus:        http.StatusNotFound,
+			expectedBody:          "404 page not found",
 		},
 		{
 			name:                  "Failure - Unauthorized (Different User ID)",
@@ -859,8 +859,8 @@ func TestUserHandler_SetDefaultAddress(t *testing.T) {
 			// Setup inside t.Run
 			mockUserRepo, mockAddressRepo, _, _, router := setupUserHandlerTest(t)
 
-			// Mock middleware check (only if token is expected and UserID is valid)
-			if tc.targetUserIDStr != "not-a-uuid" && tc.expectedBody != `{"error":"authorization header required"}` {
+			// Mock middleware check only if token is expected and BOTH IDs in URL are valid format
+			if tc.targetUserIDStr != "not-a-uuid" && tc.targetAddrIDStr != "not-a-uuid" && tc.expectedBody != `{"error":"authorization header required"}` {
 				mockUserRepo.On("FindByID", mock.Anything, testUserID).Return(tc.mockUserReturnMid, tc.mockUserErrMid).Once()
 			}
 
@@ -887,8 +887,10 @@ func TestUserHandler_SetDefaultAddress(t *testing.T) {
 
 			assert.Equal(t, tc.expectedStatus, rr.Code)
 			// Check for specific success message or ignore body for non-error cases if needed
-			if tc.expectedStatus >= 400 || tc.expectedBody != "" { // Check body for errors or specific success messages
+			if tc.expectedStatus >= 400 || (tc.expectedStatus < 300 && tc.expectedBody != "") { // Check body for errors or specific success messages
 				assert.Contains(t, rr.Body.String(), tc.expectedBody)
+			} else if tc.expectedStatus < 300 && tc.expectedBody == "" { // Check for empty body on success if expected
+				assert.Empty(t, rr.Body.String())
 			}
 			mockUserRepo.AssertExpectations(t)
 			mockAddressRepo.AssertExpectations(t)