From 7fa5103a0070100d7bd9cf3976f2b78122055be1 Mon Sep 17 00:00:00 2001 From: Jaafar Fora Date: Thu, 31 Aug 2023 12:09:52 +0200 Subject: [PATCH] Review Modifications --- .../OnlineBookStoreApplication.java | 12 ------------ .../cohort2d/onlinebookstore/address/Address.java | 4 +++- .../onlinebookstore/address/AddressDao.java | 2 -- .../onlinebookstore/address/AddressJpaService.java | 5 ----- .../cohort2d/onlinebookstore/book/Book.java | 5 ++++- .../cohort2d/onlinebookstore/book/BookDAO.java | 1 - .../onlinebookstore/category/CategoryService.java | 2 -- .../onlinebookstore/order/OrderService.java | 5 ----- .../cohort2d/onlinebookstore/user/User.java | 14 +++----------- 9 files changed, 10 insertions(+), 40 deletions(-) diff --git a/online-book-store/src/main/java/com/amigoscode/cohort2d/onlinebookstore/OnlineBookStoreApplication.java b/online-book-store/src/main/java/com/amigoscode/cohort2d/onlinebookstore/OnlineBookStoreApplication.java index 559a5f8..0bc6aed 100644 --- a/online-book-store/src/main/java/com/amigoscode/cohort2d/onlinebookstore/OnlineBookStoreApplication.java +++ b/online-book-store/src/main/java/com/amigoscode/cohort2d/onlinebookstore/OnlineBookStoreApplication.java @@ -1,19 +1,7 @@ package com.amigoscode.cohort2d.onlinebookstore; -import com.amigoscode.cohort2d.onlinebookstore.address.AddressDao; -import com.amigoscode.cohort2d.onlinebookstore.book.Book; -import com.amigoscode.cohort2d.onlinebookstore.book.BookDAO; -import com.amigoscode.cohort2d.onlinebookstore.order.Order; -import com.amigoscode.cohort2d.onlinebookstore.order.OrderDAO; -import com.amigoscode.cohort2d.onlinebookstore.order.OrderItem; -import com.amigoscode.cohort2d.onlinebookstore.user.UserDao; -import org.springframework.boot.CommandLineRunner; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.context.annotation.Bean; - -import java.math.BigDecimal; -import java.time.LocalDateTime; @SpringBootApplication public class OnlineBookStoreApplication { diff --git a/online-book-store/src/main/java/com/amigoscode/cohort2d/onlinebookstore/address/Address.java b/online-book-store/src/main/java/com/amigoscode/cohort2d/onlinebookstore/address/Address.java index 5c68541..dccaa57 100644 --- a/online-book-store/src/main/java/com/amigoscode/cohort2d/onlinebookstore/address/Address.java +++ b/online-book-store/src/main/java/com/amigoscode/cohort2d/onlinebookstore/address/Address.java @@ -2,7 +2,9 @@ import jakarta.persistence.*; import jakarta.validation.constraints.NotNull; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; @Entity @Table(name = "address") diff --git a/online-book-store/src/main/java/com/amigoscode/cohort2d/onlinebookstore/address/AddressDao.java b/online-book-store/src/main/java/com/amigoscode/cohort2d/onlinebookstore/address/AddressDao.java index c12f44a..266aace 100644 --- a/online-book-store/src/main/java/com/amigoscode/cohort2d/onlinebookstore/address/AddressDao.java +++ b/online-book-store/src/main/java/com/amigoscode/cohort2d/onlinebookstore/address/AddressDao.java @@ -10,6 +10,4 @@ public interface AddressDao { boolean existAddressById(long id); Optional
getAddressById(Long addressId); - - Address getAddressReferenceById(Long addressId); } diff --git a/online-book-store/src/main/java/com/amigoscode/cohort2d/onlinebookstore/address/AddressJpaService.java b/online-book-store/src/main/java/com/amigoscode/cohort2d/onlinebookstore/address/AddressJpaService.java index d7a0bc0..1a238f6 100644 --- a/online-book-store/src/main/java/com/amigoscode/cohort2d/onlinebookstore/address/AddressJpaService.java +++ b/online-book-store/src/main/java/com/amigoscode/cohort2d/onlinebookstore/address/AddressJpaService.java @@ -32,9 +32,4 @@ public boolean existAddressById(long id) { public Optional
getAddressById(Long addressId) { return addressRepository.findById(addressId); } - - @Override - public Address getAddressReferenceById(Long addressId) { - return addressRepository.getReferenceById(addressId); - } } diff --git a/online-book-store/src/main/java/com/amigoscode/cohort2d/onlinebookstore/book/Book.java b/online-book-store/src/main/java/com/amigoscode/cohort2d/onlinebookstore/book/Book.java index bba267c..0ab3b67 100644 --- a/online-book-store/src/main/java/com/amigoscode/cohort2d/onlinebookstore/book/Book.java +++ b/online-book-store/src/main/java/com/amigoscode/cohort2d/onlinebookstore/book/Book.java @@ -8,7 +8,10 @@ import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; import java.math.BigDecimal; import java.time.LocalDate; diff --git a/online-book-store/src/main/java/com/amigoscode/cohort2d/onlinebookstore/book/BookDAO.java b/online-book-store/src/main/java/com/amigoscode/cohort2d/onlinebookstore/book/BookDAO.java index 080c2ff..e3f158e 100644 --- a/online-book-store/src/main/java/com/amigoscode/cohort2d/onlinebookstore/book/BookDAO.java +++ b/online-book-store/src/main/java/com/amigoscode/cohort2d/onlinebookstore/book/BookDAO.java @@ -3,7 +3,6 @@ import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; -import java.util.List; import java.util.Optional; public interface BookDAO { diff --git a/online-book-store/src/main/java/com/amigoscode/cohort2d/onlinebookstore/category/CategoryService.java b/online-book-store/src/main/java/com/amigoscode/cohort2d/onlinebookstore/category/CategoryService.java index dfb645b..600eaaf 100644 --- a/online-book-store/src/main/java/com/amigoscode/cohort2d/onlinebookstore/category/CategoryService.java +++ b/online-book-store/src/main/java/com/amigoscode/cohort2d/onlinebookstore/category/CategoryService.java @@ -3,11 +3,9 @@ import com.amigoscode.cohort2d.onlinebookstore.exceptions.DuplicateResourceException; import com.amigoscode.cohort2d.onlinebookstore.exceptions.RequestValidationException; import com.amigoscode.cohort2d.onlinebookstore.exceptions.ResourceNotFoundException; -import com.github.javafaker.Cat; import org.springframework.stereotype.Service; import java.util.List; -import java.util.Optional; @Service public class CategoryService { diff --git a/online-book-store/src/main/java/com/amigoscode/cohort2d/onlinebookstore/order/OrderService.java b/online-book-store/src/main/java/com/amigoscode/cohort2d/onlinebookstore/order/OrderService.java index 87de0a2..ccf85c4 100644 --- a/online-book-store/src/main/java/com/amigoscode/cohort2d/onlinebookstore/order/OrderService.java +++ b/online-book-store/src/main/java/com/amigoscode/cohort2d/onlinebookstore/order/OrderService.java @@ -31,11 +31,6 @@ public Order addOrder(Order order) { return orderDAO.addOrder(order); } - /*public List getOrders() { - List all = orderDAO.getOrdersByUserId(userId); - return OrderDTOMapper.INSTANCE.modelToDTO(all); - }*/ - public List getOrdersByUserId(Long userId) { List all = orderDAO.getOrdersByUserId(userId); return OrderDTOMapper.INSTANCE.modelToDTO(all); diff --git a/online-book-store/src/main/java/com/amigoscode/cohort2d/onlinebookstore/user/User.java b/online-book-store/src/main/java/com/amigoscode/cohort2d/onlinebookstore/user/User.java index 92d5918..932bf06 100644 --- a/online-book-store/src/main/java/com/amigoscode/cohort2d/onlinebookstore/user/User.java +++ b/online-book-store/src/main/java/com/amigoscode/cohort2d/onlinebookstore/user/User.java @@ -5,7 +5,9 @@ import jakarta.persistence.*; import jakarta.validation.constraints.Email; import jakarta.validation.constraints.NotBlank; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; import java.util.ArrayList; import java.util.HashSet; @@ -77,16 +79,6 @@ public User(@NotBlank String firstName, @NotBlank String lastName, String email, this.orders = orders; } - public void add(Order order) { - if (order != null) { - if (orders == null) { - orders = new HashSet<>(); - } - orders.add(order); - order.setUser(this); - } - } - public void addAddress(Address address) { if (addresses == null) { addresses = new ArrayList<>();