Fix flaky test

Author: R-Sandor

server/src/main/java/dev/findfirst/core/controller/BookmarkController.java

@@ -162,10 +162,13 @@ public ResponseEntity<BookmarkTag> deleteTagFromBookmark(
       @RequestParam("tag") @NotBlank String title)
       throws TagNotFoundException, BookmarkNotFoundException {
 
+    log.debug("Attempt Delete");
     // verify that the bookmark exists.
     var b = bookmarkService.findByIdJDBC(bookmarkID).orElseThrow(BookmarkNotFoundException::new);
+    log.debug("Found bookmark");
 
     var t = tagService.findIdByTagTitleJDBC(title).orElseThrow(TagNotFoundException::new);
+    log.debug("Found tag");
 
     return new ResponseEntity<>(bookmarkService.deleteTag(new BookmarkTag(b.getId(), t)),
         HttpStatus.OK);

server/src/main/java/dev/findfirst/core/service/BookmarkService.java

@@ -86,7 +86,6 @@ public PaginatedBookmarkRes listPaginatedJDBC(PaginatedBookmarkReq reqBkmk)
 
     return new PaginatedBookmarkRes(bookmarks, totalPages, reqBkmk.page());
 
-
   }
 
   public Optional<BookmarkDTO> getBookmarkById(long id) {
@@ -307,8 +306,12 @@ public void addTagToBookmarkJDBC(BookmarkJDBC bookmark, TagJDBC tag) {
     bookmarkTagRepository.saveBookmarkTag(new BookmarkTag(bookmark.getId(), tag.getId()));
   }
 
-  public BookmarkTag deleteTag(BookmarkTag bt) {
-    bookmarkTagRepository.deleteBookmarkTag(bt);
+  public BookmarkTag deleteTag(BookmarkTag bt) throws TagNotFoundException {
+    var deletedCount = bookmarkTagRepository.deleteBookmarkTag(bt);
+    log.debug("DELETED: {} BookmarkTags", deletedCount);
+    if (deletedCount == 0) {
+      throw new TagNotFoundException();
+    }
     return bt;
   }
 

server/src/main/java/dev/findfirst/core/service/TagService.java

@@ -165,6 +165,7 @@ public Optional<TagJDBC> findByTagTitleJDBC(@NonNull String title) {
   public Optional<Long> findIdByTagTitleJDBC(@NotBlank String title) {
     var tag = tagRepositoryJDBC.findIdByTitle(title, userContext.getUserId());
     if (tag.isPresent()) {
+      log.debug("found tag {}", tag.get());
       return Optional.of(tag.get());
     } else {
       return Optional.ofNullable(null);

server/src/main/resources/application-dev.properties

@@ -1,7 +1,7 @@
 # General logging
 # logging.level.root=INFO
 logging.level.dev.findfirst=Debug
-# logging.level.org.springframework.jdbc=DEBUG
+logging.level.org.springframework.jdbc=DEBUG
 
 # Datasource properties, i.e. postgres.
 spring.datasource.url=jdbc:postgresql://localhost:5432/findfirst

server/src/test/java/dev/findfirst/core/controller/BookmarkControllerTest.java

@@ -21,7 +21,6 @@
 
 import lombok.extern.slf4j.Slf4j;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -82,7 +81,6 @@ void setUp() {
       "Effective Java Programming", "Healthy Meal Plans", "Best Running Shoes 2024",
       "Beginner’s Guide to Investing", "How to Brew the Perfect Coffee");
 
-
   @Test
   void containerStarupTest() {
     assertEquals(true, postgres.isRunning());
@@ -140,7 +138,6 @@ void pageGreaterThanTotalPage() {
     Integer page = 6;
     Integer size = 6;
 
-
     var response = restTemplate.exchange(bookmarksPaginationURI + "?page={page}&size={size}",
         HttpMethod.GET, getHttpEntity(restTemplate), PaginatedBookmarkRes.class, page, size);
 
@@ -394,22 +391,21 @@ void deleteBookmarkById() {
   }
 
   @Test
-  // flaky test need to investigate why.
-  @Disabled
   void attemptToDeleteBookmarkTagThatDoesNotExist() {
 
+    var header = getHttpEntity(restTemplate);
     var delResp = restTemplate.exchange(bookmarkURI + "/100" + "/tag?tag={tag}", HttpMethod.DELETE,
-        getHttpEntity(restTemplate), String.class, "random");
+        header, String.class, "random");
 
     assertEquals(HttpStatus.INTERNAL_SERVER_ERROR, delResp.getStatusCode());
     assertEquals(new BookmarkNotFoundException().getMessage(), delResp.getBody());
 
     // add the tag.
     restTemplate.exchange("/api/tags", HttpMethod.POST,
-        getHttpEntity(restTemplate, List.of("buildings")), TagDTO[].class);
+        new HttpEntity<>(List.of("buildings"), header.getHeaders()), TagDTO[].class);
 
-    delResp = restTemplate.exchange(bookmarkURI + "/5" + "/tag?tag={tag}", HttpMethod.DELETE,
-        getHttpEntity(restTemplate), String.class, "buildings");
+    delResp = restTemplate.exchange(bookmarkURI + "/2" + "/tag?tag={tag}", HttpMethod.DELETE,
+        header, String.class, "buildings");
 
     assertEquals(HttpStatus.INTERNAL_SERVER_ERROR, delResp.getStatusCode());
     assertEquals(new TagNotFoundException().getMessage(), delResp.getBody());
@@ -521,7 +517,8 @@ void importBookmarksWithUnsupportedContentType() throws IOException {
     // Create a byte array with application/json content
     byte[] fileContent = "{\"bookmarks\": []}".getBytes(StandardCharsets.UTF_8);
 
-    // Build the multipart request with a .html extension but unsupported content type
+    // Build the multipart request with a .html extension but unsupported content
+    // type
     var bodyBuilder = new MultipartBodyBuilder();
     bodyBuilder.part("file", fileContent).filename("invalid_content.html")
         .contentType(MediaType.APPLICATION_JSON); // Unsupported content type
@@ -586,7 +583,8 @@ void importBookmarksWithTextPlainContentType() throws IOException {
     byte[] fileContent =
         "<html><body>Plain Text Content</body></html>".getBytes(StandardCharsets.UTF_8);
 
-    // Build the multipart request with a .html extension and text/plain content type
+    // Build the multipart request with a .html extension and text/plain content
+    // type
     var bodyBuilder = new MultipartBodyBuilder();
     bodyBuilder.part("file", fileContent).filename("plainText.html")
         .contentType(MediaType.TEXT_PLAIN); // Supported content type