Skip to content

Commit

Permalink
Review Modifications
Browse files Browse the repository at this point in the history
  • Loading branch information
JaafarF authored and sarajaned committed Aug 31, 2023
1 parent 55f80b9 commit 7fa5103
Show file tree
Hide file tree
Showing 9 changed files with 10 additions and 40 deletions.
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,4 @@ public interface AddressDao {
boolean existAddressById(long id);

Optional<Address> getAddressById(Long addressId);

Address getAddressReferenceById(Long addressId);
}
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,4 @@ public boolean existAddressById(long id) {
public Optional<Address> getAddressById(Long addressId) {
return addressRepository.findById(addressId);
}

@Override
public Address getAddressReferenceById(Long addressId) {
return addressRepository.getReferenceById(addressId);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,6 @@ public Order addOrder(Order order) {
return orderDAO.addOrder(order);
}

/*public List<OrderDTO> getOrders() {
List<Order> all = orderDAO.getOrdersByUserId(userId);
return OrderDTOMapper.INSTANCE.modelToDTO(all);
}*/

public List<OrderDTO> getOrdersByUserId(Long userId) {
List<Order> all = orderDAO.getOrdersByUserId(userId);
return OrderDTOMapper.INSTANCE.modelToDTO(all);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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<>();
Expand Down

0 comments on commit 7fa5103

Please sign in to comment.