diff --git a/src/main/java/fr/iut_fbleau/but3/dev62/mylibrary/book/BookDTO.java b/src/main/java/fr/iut_fbleau/but3/dev62/mylibrary/book/BookDTO.java index b9f8697..d36ac70 100644 --- a/src/main/java/fr/iut_fbleau/but3/dev62/mylibrary/book/BookDTO.java +++ b/src/main/java/fr/iut_fbleau/but3/dev62/mylibrary/book/BookDTO.java @@ -10,12 +10,14 @@ import java.util.ArrayList; @Getter @Builder public class BookDTO { - private ArrayList categories = new ArrayList<>(); - private String description ; - private String language; + private String isbn; private String title; private String author; private String editor; private LocalDate date; - + private double price; + private Integer stock; + private ArrayList categories = new ArrayList<>(); + private String description ; + private String language; } diff --git a/src/main/java/fr/iut_fbleau/but3/dev62/mylibrary/book/converter/BookConverter.java b/src/main/java/fr/iut_fbleau/but3/dev62/mylibrary/book/converter/BookConverter.java index 0173a9a..6761041 100644 --- a/src/main/java/fr/iut_fbleau/but3/dev62/mylibrary/book/converter/BookConverter.java +++ b/src/main/java/fr/iut_fbleau/but3/dev62/mylibrary/book/converter/BookConverter.java @@ -10,10 +10,13 @@ public final class BookConverter { public static BookDTO ToDomain(BookInfo bookinfo, BookDetails bookdetails){ return BookDTO.builder() + .isbn("0000000000000") .title(bookinfo.title()) .author(bookinfo.author()) .editor(bookinfo.editor()) .date(bookinfo.date()) + .price(50.99) + .stock(5) .categories(bookdetails.getCategories()) .description(bookdetails.getDescription()) .language(bookdetails.getLanguage()) diff --git a/src/main/java/fr/iut_fbleau/but3/dev62/mylibrary/book/entity/Book.java b/src/main/java/fr/iut_fbleau/but3/dev62/mylibrary/book/entity/Book.java index f1297ea..4192245 100644 --- a/src/main/java/fr/iut_fbleau/but3/dev62/mylibrary/book/entity/Book.java +++ b/src/main/java/fr/iut_fbleau/but3/dev62/mylibrary/book/entity/Book.java @@ -10,12 +10,14 @@ import java.util.ArrayList; @Getter @Builder public class Book { - private ArrayList categories = new ArrayList<>(); - private String description ; - private String language; + private String isbn; private String title; private String author; private String editor; private LocalDate date; - + private double price; + private Integer stock; + private ArrayList categories = new ArrayList<>(); + private String description ; + private String language; } diff --git a/src/test/java/fr/iut_fbleau/but3/dev62/mylibrary/book/converter/BookConverterTest.java b/src/test/java/fr/iut_fbleau/but3/dev62/mylibrary/book/converter/BookConverterTest.java index 5e30473..db8f38a 100644 --- a/src/test/java/fr/iut_fbleau/but3/dev62/mylibrary/book/converter/BookConverterTest.java +++ b/src/test/java/fr/iut_fbleau/but3/dev62/mylibrary/book/converter/BookConverterTest.java @@ -36,7 +36,6 @@ public class BookConverterTest { BookDTO result = BookConverter.ToDomain(bookinfo, bookdetails); - //assertNotNull(result); assertEquals(bookinfo.title(), result.getTitle()); assertEquals(bookinfo.author(), result.getAuthor()); assertEquals(bookinfo.editor(), result.getEditor()); @@ -46,16 +45,16 @@ public class BookConverterTest { assertEquals(bookdetails.getLanguage(), result.getLanguage()); } } -/** +/* @Nested @DisplayName("toDTO() method tests") class ToDTOTests { LocalDate date = LocalDate.of(2026, 3, 24); - ArrayList categories = new ArrayList(); + ArrayList categories = new ArrayList<>(); categories.add("Thriller"); categories.add("Biographie"); Book book = Book.builder() - .isbn(1234567891012) + .isbn("1234567891012") .title("La vie de Maxime") .author("Marvin Aubert") .editor("Kioon") @@ -69,5 +68,5 @@ public class BookConverterTest { BookDTO result = BookConvert.ToDTO(book); - }**/ + }*/ }