fix: pet svc delete return nil

isd-sgcu · Jan 5, 2024 · 3059615 · 3059615
1 parent 3ac9671
commit 3059615
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 20 deletions.
diff --git a/src/app/service/pet/pet.service.go b/src/app/service/pet/pet.service.go
@@ -196,29 +196,24 @@ func (s *Service) Delete(id string) (result *dto.DeleteResponse, err *dto.Respon
 			Msg(st.Message())
 		switch st.Code() {
 		case codes.NotFound:
-			return &dto.DeleteResponse{
-					Success: false,
-				}, &dto.ResponseErr{
-					StatusCode: http.StatusNotFound,
-					Message:    constant.PetNotFoundMessage,
-					Data:       nil,
-				}
+			return nil, &dto.ResponseErr{
+				StatusCode: http.StatusNotFound,
+				Message:    constant.PetNotFoundMessage,
+				Data:       nil,
+			}
 		case codes.Unavailable:
-			return &dto.DeleteResponse{
-					Success: false,
-				}, &dto.ResponseErr{
-					StatusCode: http.StatusServiceUnavailable,
-					Message:    constant.UnavailableServiceMessage,
-					Data:       nil,
-				}
-		}
-		return &dto.DeleteResponse{
-				Success: false,
-			}, &dto.ResponseErr{
+			return nil, &dto.ResponseErr{
+				StatusCode: http.StatusServiceUnavailable,
+				Message:    constant.UnavailableServiceMessage,
+				Data:       nil,
+			}
+		default:
+			return nil, &dto.ResponseErr{
 				StatusCode: http.StatusInternalServerError,
 				Message:    constant.InternalErrorMessage,
 				Data:       nil,
 			}
+		}
 	}
 	return &dto.DeleteResponse{
 		Success: res.Success,

diff --git a/src/app/service/pet/pet.service_test.go b/src/app/service/pet/pet.service_test.go
@@ -434,7 +434,7 @@ func (t *PetServiceTest) TestDeleteNotFound() {
 	svc := NewService(client)
 	actual, err := svc.Delete(t.Pet.Id)
 
-	assert.Equal(t.T(), &dto.DeleteResponse{Success: false}, actual)
+	assert.Nil(t.T(), actual)
 	assert.Equal(t.T(), expected, err)
 }
 
@@ -455,7 +455,7 @@ func (t *PetServiceTest) TestDeleteServiceUnavailableError() {
 	svc := NewService(client)
 	actual, err := svc.Delete(t.Pet.Id)
 
-	assert.Equal(t.T(), &dto.DeleteResponse{Success: false}, actual)
+	assert.Nil(t.T(), actual)
 	assert.Equal(t.T(), expected, err)
 }