Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions lesson_26/api/java/api_app/build.gradle.kts
Copy link
Contributor

@VicenteVigueras VicenteVigueras May 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

there shouldn't be an update of spring boot version

Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ plugins {
application
eclipse
id("com.diffplug.spotless") version "6.25.0"
id("org.springframework.boot") version "3.4.0"
id("org.springframework.boot") version "3.2.3"
id("com.adarshr.test-logger") version "4.0.0"
}

Expand All @@ -21,7 +21,6 @@ dependencies {
testImplementation("org.springframework.boot:spring-boot-starter-test")
testImplementation("org.assertj:assertj-core:3.26.3")
testImplementation("at.favre.lib:bcrypt:0.10.2")
testImplementation("org.springframework.boot:spring-boot-starter-test")

// This dependency is used by the application.
implementation("com.codedifferently.instructional:instructional-lib")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,28 @@
import com.codedifferently.lesson26.library.Library;
import com.codedifferently.lesson26.library.MediaItem;
import com.codedifferently.lesson26.library.search.SearchCriteria;
import jakarta.validation.Valid;
import java.io.IOException;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.UUID;
import org.springframework.http.ResponseEntity;
import org.springframework.validation.FieldError;
import org.springframework.web.bind.MethodArgumentNotValidException;
import org.springframework.web.bind.annotation.CrossOrigin;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.ExceptionHandler;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

@RestController
@CrossOrigin
@RequestMapping("/api")
public class MediaItemsController {

private final Library library;
Expand All @@ -31,4 +43,54 @@ public ResponseEntity<GetMediaItemsResponse> getItems() {
var response = GetMediaItemsResponse.builder().items(responseItems).build();
return ResponseEntity.ok(response);
}

@GetMapping("/items/{id}")
public ResponseEntity<MediaItemResponse> getItemById(@PathVariable String id) {
try {
Set<MediaItem> items = library.search(SearchCriteria.builder().id(id).build());
if (items.isEmpty()) {
return ResponseEntity.notFound().build();
}
MediaItemResponse response = MediaItemResponse.from(items.iterator().next());
return ResponseEntity.ok(response);
} catch (IllegalArgumentException e) {
return ResponseEntity.notFound().build();
}
}

@PostMapping("/items")
public ResponseEntity<CreateMediaItemResponse> createItem(
@Valid @RequestBody CreateMediaItemRequest request) {
try {
MediaItem item = MediaItemRequest.asMediaItem(request.getItem());
library.addMediaItem(item, librarian);
var response = CreateMediaItemResponse.builder().item(MediaItemResponse.from(item)).build();
return ResponseEntity.ok(response);
} catch (IllegalArgumentException e) {
return ResponseEntity.badRequest().build();
}
}

@DeleteMapping("/items/{id}")
public ResponseEntity<Void> deleteItemById(@PathVariable String id) {
try {
UUID uuid = UUID.fromString(id);
Set<MediaItem> items = library.search(SearchCriteria.builder().id(id).build());
if (items.isEmpty()) {
return ResponseEntity.notFound().build();
}
library.removeMediaItem(uuid, librarian);
return ResponseEntity.noContent().build();
} catch (IllegalArgumentException e) {
return ResponseEntity.notFound().build();
}
}

@ExceptionHandler(MethodArgumentNotValidException.class)
public ResponseEntity<Map<String, List<String>>> handleValidationErrors(
MethodArgumentNotValidException ex) {
List<String> errors =
ex.getBindingResult().getFieldErrors().stream().map(FieldError::getDefaultMessage).toList();
return ResponseEntity.badRequest().body(Map.of("errors", errors));
}
}
Copy link
Contributor

@VicenteVigueras VicenteVigueras May 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

there shouldn't be modifications to tests

Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ static void setUp(WebApplicationContext wac) {
@Test
void testController_getsAllItems() throws Exception {
mockMvc
.perform(get("/items").contentType(MediaType.APPLICATION_JSON))
.perform(get("/api/items").contentType(MediaType.APPLICATION_JSON))
.andExpect(status().isOk())
.andExpect(jsonPath("$.items").isArray())
.andExpect(jsonPath("$.items.length()").value(31));
Expand All @@ -47,7 +47,7 @@ void testController_getsAllItems() throws Exception {
void testController_getsAnItem() throws Exception {
mockMvc
.perform(
get("/items/31616162-3831-3832-2d34-3334352d3465")
get("/api/items/31616162-3831-3832-2d34-3334352d3465")
.contentType(MediaType.APPLICATION_JSON))
.andExpect(status().isOk());
}
Expand All @@ -56,7 +56,7 @@ void testController_getsAnItem() throws Exception {
void testController_returnsNotFoundOnGetItem() throws Exception {
mockMvc
.perform(
get("/items/00000000-0000-0000-0000-000000000000")
get("/api/items/00000000-0000-0000-0000-000000000000")
.contentType(MediaType.APPLICATION_JSON))
.andExpect(status().isNotFound());
}
Expand All @@ -66,7 +66,7 @@ void testController_reportsBadRequestOnAddItem() throws Exception {
String json = "{}";

mockMvc
.perform(post("/items").contentType(MediaType.APPLICATION_JSON).content(json))
.perform(post("/api/items").contentType(MediaType.APPLICATION_JSON).content(json))
.andExpect(status().isBadRequest())
.andExpect(jsonPath("$.errors").isArray())
.andExpect(jsonPath("$.errors.length()").value(1));
Expand All @@ -89,7 +89,7 @@ void testController_addsItem() throws Exception {
""";

mockMvc
.perform(post("/items").contentType(MediaType.APPLICATION_JSON).content(json))
.perform(post("/api/items").contentType(MediaType.APPLICATION_JSON).content(json))
.andExpect(status().isOk())
.andExpect(jsonPath("$.item.id").value("e27a4e0d-9664-420d-955e-c0e295d0ce02"));

Expand All @@ -105,7 +105,7 @@ void testController_addsItem() throws Exception {
void testController_returnsNotFoundOnDeleteItem() throws Exception {
mockMvc
.perform(
delete("/items/00000000-0000-0000-0000-000000000000")
delete("/api/items/00000000-0000-0000-0000-000000000000")
.contentType(MediaType.APPLICATION_JSON))
.andExpect(status().isNotFound());
}
Expand All @@ -114,7 +114,7 @@ void testController_returnsNotFoundOnDeleteItem() throws Exception {
void testController_deletesItem() throws Exception {
mockMvc
.perform(
delete("/items/32623932-6566-3364-2d62-3232342d3435")
delete("/api/items/32623932-6566-3364-2d62-3232342d3435")
.contentType(MediaType.APPLICATION_JSON))
.andExpect(status().isNoContent());

Expand Down
Binary file modified lesson_26/api/java/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
9 changes: 4 additions & 5 deletions lesson_26/api/java/gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions lesson_26/api/java/gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions package-lock.json
Copy link
Contributor

@VicenteVigueras VicenteVigueras May 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

since this isn't a node project so package-lock.json wouldn't belong here

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.