adopt content to first day

Author: rieckpil

labs/lab-1/pom.xml

@@ -16,7 +16,6 @@
 
   <properties>
     <java.version>21</java.version>
-    <mockito.version>5.5.0</mockito.version>
   </properties>
 
   <dependencies>

labs/lab-1/src/test/java/pragmatech/digital/workshops/lab1/experiment/MockitoDemoTest.java

@@ -7,6 +7,7 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
+import org.mockito.Mockito;
 import org.mockito.junit.jupiter.MockitoExtension;
 import pragmatech.digital.workshops.lab1.domain.Book;
 import pragmatech.digital.workshops.lab1.repository.BookRepository;
@@ -23,11 +24,13 @@ class MockitoDemoTest {
   @Mock
   private BookRepository bookRepository;
 
+  // public int count() -> int -> 0
+  // public Integer count() -> null
+
   @InjectMocks
   private BookService bookService;
 
   @Test
-  @Disabled("Disabled to prevent test failure due to Sunday restriction in BookService")
   void shouldReturnBookWhenFound() {
     // Arrange
     when(bookRepository.findByIsbn("1234")).thenReturn(Optional.empty());

labs/lab-1/src/test/java/pragmatech/digital/workshops/lab1/solutions/BookServiceWithClock.java

@@ -5,6 +5,8 @@
 import java.time.LocalDate;
 import java.util.Optional;
 
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 import pragmatech.digital.workshops.lab1.domain.Book;
 import pragmatech.digital.workshops.lab1.repository.BookRepository;
 import pragmatech.digital.workshops.lab1.service.BookAlreadyExistsException;

labs/lab-1/src/test/java/pragmatech/digital/workshops/lab1/solutions/RefactoredBookService.java

@@ -8,6 +8,7 @@
 import pragmatech.digital.workshops.lab1.service.BookAlreadyExistsException;
 import pragmatech.digital.workshops.lab1.util.TimeProvider;
 
+import static java.time.DayOfWeek.SATURDAY;
 import static java.time.DayOfWeek.SUNDAY;
 
 public class RefactoredBookService {

labs/lab-1/src/test/java/pragmatech/digital/workshops/lab1/solutions/Solution1UnitTest.java

@@ -6,7 +6,6 @@
 import java.time.ZoneId;
 import java.util.Optional;
 
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -25,7 +24,6 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
-import static tools.jackson.databind.ext.javatime.deser.JSR310StringParsableDeserializer.ZONE_ID;
 
 @ExtendWith(MockitoExtension.class)
 class Solution1UnitTest {
@@ -53,7 +51,6 @@ void shouldThrowExceptionWhenBookWithIsbnAlreadyExists() {
 
   @Test
   @DisplayName("Should create a book when ISBN does not exist")
-  @Disabled("Disabled to prevent test failure due to Sunday restriction in BookService")
   void shouldCreateBookWhenIsbnDoesNotExist() {
     // Arrange
     BookService cut = new BookService(bookRepository);
@@ -87,7 +84,8 @@ void shouldCreateBookWhenIsbnDoesNotExist() {
   void shouldThrowExceptionWhenTryingToRegisterBookOnSunday() {
     // Arrange
     TimeProvider timeProvider = mock(TimeProvider.class);
-    when(timeProvider.getCurrentDate()).thenReturn(LocalDate.of(2026, 3, 1)); // A Sunday
+    when(timeProvider.getCurrentDate())
+      .thenReturn(LocalDate.of(2026, 3, 1)); // A Sunday
 
     RefactoredBookService cut = new RefactoredBookService(bookRepository, timeProvider);
     String isbn = "9780134685991";

labs/lab-2/src/test/java/pragmatech/digital/workshops/lab2/experiment/BookControllerTest.java

@@ -114,20 +114,21 @@ void shouldReturnNotFoundWhenBookDoesNotExistById() throws Exception {
   @Test
   void shouldReturnCreatedWithLocationWhenCreatingBookWithValidData() throws Exception {
     // Arrange
-    BookCreationRequest request = new BookCreationRequest(
-      "123-1234567890",
-      "Test Book",
-      "Test Author",
-      LocalDate.of(2020, 1, 1)
-    );
-
     when(bookService.createBook(any(BookCreationRequest.class))).thenReturn(1L);
 
     // Act & Assert
     mockMvc.perform(post("/api/books")
         .with(SecurityMockMvcRequestPostProcessors.user("user").roles("USER"))
         .contentType(MediaType.APPLICATION_JSON)
-        .content(objectMapper.writeValueAsString(request)))
+        .content("""
+          {
+            "isbn": "123-1234567890",
+            "title": "Test Book",
+            "author": "Test Author",
+            "publishedDate": "2028-01-01"
+          }
+
+          """))
       .andExpect(status().isCreated())
       .andExpect(header().string("Location", containsString("/api/books/1")));
   }

labs/lab-2/src/test/java/pragmatech/digital/workshops/lab2/solutions/Solution1WebMvcTest.java

@@ -50,25 +50,20 @@ void shouldReturnUnauthorizedWhenNoAuthenticationIsProvided() throws Exception {
       // Arrange - No authentication credentials provided
 
       // Act & Assert
-      mockMvc.perform(delete("/api/books/1"))
+      mockMvc
+        .perform(delete("/api/books/1"))
         .andExpect(status().isUnauthorized());
-
-      // Verify - Service should not be called
-      verify(bookService, times(0)).deleteBook(any());
     }
 
     @Test
-    @WithMockUser(roles = "USER")
+    @WithMockUser(roles = "DUKE")
     @DisplayName("Should return 403 Forbidden when authenticated with insufficient privileges")
     void shouldReturnForbiddenWhenAuthenticatedWithInsufficientPrivileges() throws Exception {
       // Arrange - User with insufficient privileges (USER role)
 
       // Act & Assert
       mockMvc.perform(delete("/api/books/1"))
         .andExpect(status().isForbidden());
-
-      // Verify - Service should not be called
-      verify(bookService, times(0)).deleteBook(any());
     }
 
     @Test
@@ -81,9 +76,6 @@ void shouldReturnNoContentWhenAuthenticatedAsAdminAndBookExists() throws Excepti
       // Act & Assert
       mockMvc.perform(delete("/api/books/1"))
         .andExpect(status().isNoContent());
-
-      // Verify - Service should be called with the book ID
-      verify(bookService, times(1)).deleteBook(1L);
     }
 
     @Test
@@ -98,7 +90,7 @@ void shouldReturnNotFoundWhenAuthenticatedAsAdminButBookDoesntExist() throws Exc
         .andExpect(status().isNotFound());
 
       // Verify - Service should be called with the book ID
-      verify(bookService, times(1)).deleteBook(999L);
+      //verify(bookService, times(1)).deleteBook(999L);
     }
   }
 
@@ -129,9 +121,6 @@ void shouldReturnCreatedWhenValidBookDataIsProvided() throws Exception {
         .andExpect(status().isCreated())
         .andExpect(header().exists("Location"))
         .andExpect(header().string("Location", Matchers.containsString("/api/books/1")));
-
-      // Verify - Service should be called
-      verify(bookService, times(1)).createBook(any());
     }
 
     @Test
@@ -142,7 +131,7 @@ void shouldReturnBadRequestWhenInvalidBookDataIsProvided() throws Exception {
       String invalidBookJson = """
         {
             "isbn": "",
-            "title": "",
+            "title": "Test",
             "author": "Test Author",
             "publishedDate": "2025-01-01"
         }

labs/lab-3/src/main/java/pragmatech/digital/workshops/lab3/Lab3Application.java

@@ -4,7 +4,7 @@
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 
-// @EnableJpaAuditing -> keep this class clean and outsource configuration to a separate class
+//@EnableJpaAuditing
 @SpringBootApplication
 public class Lab3Application {
 

labs/lab-3/src/test/java/pragmatech/digital/workshops/lab3/experiment/BookRepositoryTest.java

@@ -32,9 +32,6 @@ class BookRepositoryTest {
   @Container
   @ServiceConnection
   static PostgreSQLContainer<?> postgres = new PostgreSQLContainer<>("postgres:16-alpine")
-    .withDatabaseName("testdb")
-    .withUsername("test")
-    .withPassword("test")
     .withInitScript("init-postgres.sql");
 
   @Autowired

labs/lab-3/src/test/java/pragmatech/digital/workshops/lab3/solutions/Solution1DataJpaTest.java

@@ -4,17 +4,15 @@
 import java.util.List;
 import java.util.Optional;
 
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.data.jpa.test.autoconfigure.DataJpaTest;
-import org.springframework.boot.jdbc.test.autoconfigure.AutoConfigureTestDatabase;
 import org.springframework.boot.testcontainers.service.connection.ServiceConnection;
-import org.testcontainers.containers.PostgreSQLContainer;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
+import org.testcontainers.postgresql.PostgreSQLContainer;
 import pragmatech.digital.workshops.lab3.entity.Book;
 import pragmatech.digital.workshops.lab3.entity.BookStatus;
 import pragmatech.digital.workshops.lab3.repository.BookRepository;
@@ -30,15 +28,11 @@
  */
 @DataJpaTest
 @Testcontainers
-@AutoConfigureTestDatabase(replace = AutoConfigureTestDatabase.Replace.NONE)
 class Solution1DataJpaTest {
 
   @Container
   @ServiceConnection
-  static PostgreSQLContainer<?> postgres = new PostgreSQLContainer<>("postgres:16-alpine")
-    .withDatabaseName("testdb")
-    .withUsername("test")
-    .withPassword("test")
+  static PostgreSQLContainer postgres = new PostgreSQLContainer("postgres:16-alpine")
     .withInitScript("init-postgres.sql");
 
   @Autowired