Skip to content

Commit 93a13c0

Browse files
Theo-lbgMayuriXx
authored andcommitted
feat(deleteUser): enhance delete user functionality with proper response handling
1 parent ad1fb54 commit 93a13c0

5 files changed

Lines changed: 15 additions & 6 deletions

File tree

src/main/java/com/xpeho/spring_boot_java_random_user/domain/usecases/DeleteUserByIdUseCase.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.xpeho.spring_boot_java_random_user.domain.usecases;
22

33
import com.xpeho.spring_boot_java_random_user.domain.services.LocalUserService;
4+
import com.xpeho.spring_boot_java_random_user.domain.exceptions.UserNotFoundException;
45
import org.springframework.stereotype.Service;
56

67
@Service
@@ -12,6 +13,7 @@ public DeleteUserByIdUseCase(LocalUserService userService) {
1213
}
1314

1415
public void execute(long id) {
16+
userService.getById(id).orElseThrow(() -> new UserNotFoundException(id));
1517
userService.deleteById(id);
1618
}
1719
}

src/main/java/com/xpeho/spring_boot_java_random_user/presentation/controllers/UserController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ ResponseEntity<List<UserEntity>> filterUsers(
132132
@ApiResponse(responseCode = "204", description = "User successfully deleted")
133133
@ApiResponse(responseCode = "404", description = "The requested user does not exist")
134134
@ApiResponse(responseCode = "500", description = "Internal server error")
135-
void deleteUserById(
135+
ResponseEntity<Void> deleteUserById(
136136
@PathVariable
137137
int id
138138
);

src/main/java/com/xpeho/spring_boot_java_random_user/presentation/handlers/UserHandler.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,11 +115,13 @@ public ResponseEntity<List<UserEntity>> filterUsers(
115115
}
116116

117117
@Override
118-
public void deleteUserById(int id) {
118+
public ResponseEntity<Void> deleteUserById(int id) {
119119
try {
120120
deleteUserUseCase.execute(id);
121+
return ResponseEntity.noContent().build();
121122
} catch (UserNotFoundException e) {
122123
logUserNotFound(e);
124+
return ResponseEntity.status(HttpStatus.NOT_FOUND).build();
123125
}
124126
}
125127

src/test/java/com/xpeho/spring_boot_java_random_user/presentation/UserHandlerTest.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,9 +165,12 @@ void shouldReturnCreatedWhenCreateUserSucceeds() {
165165
@DisplayName("Should return 204 when deleteUserById succeeds")
166166
void shouldReturnNoContentWhenDeleteUserByIdSucceeds() {
167167
int userId = 42;
168+
doNothing().when(deleteUserUseCase).execute(userId);
168169

169-
userHandler.deleteUserById(userId);
170+
ResponseEntity<Void> response = userHandler.deleteUserById(userId);
170171

172+
assertEquals(HttpStatus.NO_CONTENT, response.getStatusCode());
173+
assertNull(response.getBody());
171174
verify(deleteUserUseCase, times(1)).execute(userId);
172175
}
173176

@@ -177,8 +180,10 @@ void shouldLogWarningWhenDeleteUserByIdFails() {
177180
int userId = 123;
178181
doThrow(new UserNotFoundException(userId)).when(deleteUserUseCase).execute(userId);
179182

180-
userHandler.deleteUserById(userId);
183+
ResponseEntity<Void> response = userHandler.deleteUserById(userId);
181184

185+
assertEquals(HttpStatus.NOT_FOUND, response.getStatusCode());
186+
assertNull(response.getBody());
182187
verify(deleteUserUseCase, times(1)).execute(userId);
183188
}
184189

src/test/java/feature/SpringIntegrationTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import org.springframework.boot.resttestclient.autoconfigure.AutoConfigureTestRestTemplate;
88
import org.springframework.boot.test.context.SpringBootTest;
99
import org.springframework.boot.test.web.server.LocalServerPort;
10+
import org.springframework.http.HttpMethod;
1011
import org.springframework.http.HttpEntity;
1112
import org.springframework.http.HttpHeaders;
1213
import org.springframework.http.MediaType;
@@ -49,7 +50,6 @@ protected void executePost(String path, Object payload) {
4950

5051
protected void executeDelete(String path) {
5152
String url = "http://localhost:" + port + path;
52-
restTemplate.delete(url);
53-
latestResponse = ResponseEntity.noContent().build();
53+
latestResponse = restTemplate.exchange(url, HttpMethod.DELETE, null, String.class);
5454
}
5555
}

0 commit comments

Comments
 (0)