create tests

README.md

@@ -0,0 +1,17 @@
+Он-лайн магазин продуктов
+
+Функции у пользователя:
+1) Поиск товара по категориям, цене названию;
+2) Добавление товара в корзину, оформление заказа;
+3) В личном кобинете можно посмотреть список всех заказов;
+4) Можно оставлять и смотреть коментарии к товару;
+
+Функции у администратора:
+1) Добавление новых, редактирование и удаление товаров;
+2) Можно оставлять, смотреть, удалять комментарии;
+3) Можно заблокировать/разблокировать пользователей;
+
+Примечание: 
+Администратор: логин:ggg пароль:ggg
+Пользователь: логин:fff пароль:fff
+http://localhost:8080/product/list

src/main/java/com/example/springmvc/SpringMvcApplication.java

@@ -7,9 +7,6 @@
 public class SpringMvcApplication {
 
     public static void main(String[] args) {
-//        Flyway flyway = Flyway.configure().dataSource(
-//                "jdbc:postgresql://localhost:5435/spring", "postgres", "postgrespass").load();
-//        flyway.migrate();
         SpringApplication.run(SpringMvcApplication.class, args);
     }
 }

src/main/java/com/example/springmvc/mvcLayer/controller/OrderController.java

@@ -43,10 +43,4 @@ public String createOrder(@ModelAttribute Address address,
         orderService.save(shoppingCart, address, name);
         return "redirect:/order/list";
     }
-
-//    @PostMapping(FORM)
-//    public String updateStatusOrder(@ModelAttribute Address address) {
-//        String name = SecurityContextHolder.getContext().getAuthentication().getName();
-//        return "redirect:/order/list";
-//    }
 }

src/main/java/com/example/springmvc/mvcLayer/controller/UserController.java

@@ -57,6 +57,4 @@ public String getUserAccount(Model model) {
         model.addAttribute("user", user);
         return "user/personalAccount";
     }
-
-
 }

src/main/java/com/example/springmvc/mvcLayer/domain/search/ProductSearchCondition.java

@@ -1,13 +1,8 @@
 package com.example.springmvc.mvcLayer.domain.search;
 
-import com.example.springmvc.mvcLayer.domain.dto.ProductDto;
 import lombok.Data;
-import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Sort;
 
-import java.util.Collections;
-import java.util.List;
-
 @Data
 public class ProductSearchCondition {
     private Sort.Direction sortDirection=Sort.Direction.ASC;

src/main/java/com/example/springmvc/mvcLayer/repository/CategoryRepository.java

@@ -12,9 +12,5 @@ public interface CategoryRepository extends JpaRepository<Category, Integer> {
 
     Optional<Category> findCategoryByTitle(String title);
 
-
     Set<Category> findCategoryByIdIn(Set<Integer> ids);
-
-//    Page<Product> findProductsByIdCategory(Pageable pageable);
-
 }

src/main/java/com/example/springmvc/mvcLayer/repository/ProductRepository.java

@@ -10,7 +10,6 @@
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
-import java.util.List;
 import java.util.Optional;
 
 @Repository
@@ -30,8 +29,4 @@ Page<Product> findProductsByTitleContainingIgnoreCaseAndPriceBetween(
     @Modifying
     @Query("update Product p set p.countProduct = :count where p.id = :id")
     void updateCount(@Param("id")Integer id, @Param("count")Integer count);
-
-    @Modifying
-    @Query("update Product p set p.countProduct = p.countProduct +1 where p.id = :id")
-    void plusCount(@Param("id")Integer id);
 }

src/main/java/com/example/springmvc/mvcLayer/repository/ReviewRepository.java

@@ -11,7 +11,6 @@ public interface ReviewRepository extends JpaRepository<ProductReview, Integer>
 
     List<ProductReview>findProductReviewsByProduct_id(Integer productId);
 
-
     void deleteProductReviewsByProduct_Id(Integer productId);
 
     void deleteProductReviewById(Integer id);

src/main/java/com/example/springmvc/mvcLayer/service/OrderService.java

@@ -8,6 +8,7 @@
 
 public interface OrderService {
 
-    void save(ShoppingCart shoppingCart, Address address, String name );
+    void save(ShoppingCart shoppingCart, Address address, String name);
+
     List<Order> getAllOrders(String name);
 }

src/main/java/com/example/springmvc/mvcLayer/service/ProductService.java

@@ -28,8 +28,5 @@ Page<Product> findProductsByTitleAndByMaxAndMinPriceBySearchConditional(
 
     void pagination(ProductSearchCondition searchCondition, Model model, Page<Product> page);
 
-
     void updateCountInProduct(Integer id, Integer count);
-
-//    void plusCountProduct(Integer productId);
 }

src/main/java/com/example/springmvc/mvcLayer/service/ReviewService.java

@@ -5,7 +5,6 @@
 import java.util.List;
 
 public interface ReviewService {
-    List<ProductReview> findAllReview();
 
     List<ProductReview> findReviewByProductId(Integer id);
 

src/main/java/com/example/springmvc/mvcLayer/service/impl/OrderServiceImpl.java

@@ -16,7 +16,6 @@
 
 import java.time.LocalDate;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -25,9 +24,7 @@
 public class OrderServiceImpl implements OrderService {
 
     private final OrderRepository orderRepository;
-
     private final UserService userService;
-
     private final AddressRepository addressRepository;
 
     @Override

src/main/java/com/example/springmvc/mvcLayer/service/impl/ProductServiceImpl.java

@@ -10,7 +10,6 @@
 import com.example.springmvc.mvcLayer.service.ProductService;
 import com.example.springmvc.mvcLayer.service.ReviewService;
 import lombok.AllArgsConstructor;
-import org.modelmapper.ModelMapper;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
@@ -37,8 +36,6 @@ public class ProductServiceImpl implements ProductService {
     private final FileService fileService;
     private final ReviewService reviewService;
 
-    private final ModelMapper modelMapper;
-
     @Override
     @Transactional
     public Product saveProductAndImage(ProductDto productDto, MultipartFile image) {
@@ -63,14 +60,11 @@ private Product choosingActionOrCreatingOrUpdating(ProductDto productDto) {
     }
 
     private Product dtoProductConvertToProduct(ProductDto productDto) {
-        Product product = modelMapper.map(productDto, Product.class);
-        product.setCategories(categoryService.findCategoryById(productDto.getCategoryDto()));
-        return product;
-//        return Product.builder().title(productDto.getTitle())
-//                .price(productDto.getPrice())
-//                .categories(categoryService.findCategoryById(productDto.getCategoryDto()))
-//                .countProduct(productDto.getCountProduct())
-//                .build();
+        return Product.builder().title(productDto.getTitle())
+                .price(productDto.getPrice())
+                .categories(categoryService.findCategoryById(productDto.getCategoryDto()))
+                .countProduct(productDto.getCountProduct())
+                .build();
     }
 
     @Override
@@ -86,40 +80,19 @@ public ProductDto findProductDtoById(Integer id) {
         } else throw new NoSuchElementException("Продукт был удален администратором");
     }
 
-//    @Override
-//    @Transactional
-//    public void minusOneProductInCount(Integer id, Integer count) {
-////        Optional<Product> byId = productRepository.findById(id);
-////        byId.ifPresent(product -> productRepository.updateCount(product, count));
-//        productRepository.updateCount(id, count);
-//    }
-
-//    @Override
-//    @Transactional
-//    public void plusCountProduct(Integer productId) {
-//        Optional<Product> byId = productRepository.findById(productId);
-//        Integer countProduct = byId.get().getCountProduct()+1;
-//        productRepository.updateCount(productId, countProduct);
-////        productRepository.plusCount(productId);
-//    }
-
     @Override
     @Transactional
     public void updateCountInProduct(Integer id, Integer count) {
         productRepository.updateCount(id, count);
     }
 
     private ProductDto productConvertToDTOProduct(Product entity) {
-        ProductDto productDto = modelMapper.map(entity, ProductDto.class);
-        productDto.setCategoryDto(categoryService.getCategoryIdList(entity.getCategories()));
-        System.err.println(productDto.getCategoryDto().toString());
-        return productDto;
-//        return ProductDto.builder().id(entity.getId())
-//                .title(entity.getTitle())
-//                .price(entity.getPrice())
-//                .categoryDto(categoryService.getCategoryIdList(entity.getCategories()))
-//                .countProduct(entity.getCountProduct())
-//                .build();
+        return ProductDto.builder().id(entity.getId())
+                .title(entity.getTitle())
+                .price(entity.getPrice())
+                .categoryDto(categoryService.getCategoryIdList(entity.getCategories()))
+                .countProduct(entity.getCountProduct())
+                .build();
     }
 
     @Override

src/main/java/com/example/springmvc/mvcLayer/service/impl/ReviewServiceImpl.java

@@ -19,11 +19,6 @@ public class ReviewServiceImpl implements ReviewService {
     private final ReviewRepository reviewRepository;
     private final UserService userService;
 
-    @Override
-    public List<ProductReview> findAllReview() {
-        return reviewRepository.findAll();
-    }
-
     @Override
     public List<ProductReview> findReviewByProductId(Integer id) {
         return reviewRepository.findProductReviewsByProduct_id(id);