Feature products

.gitignore

@@ -3,3 +3,4 @@
 /out/
 /target/
 /classes/
+.DS_Store

README.md

@@ -72,4 +72,96 @@ ______
 - ***BasicDao** - дженерик интерфейс, описывающий базовые CRUD-операции.*
 - ***CustomerDao** - интерфейс, унаследованный от BasicDao и расширяющий его функционал дополнительными методами взаимодействия сущности заказчика с базой данных*
 
-#### *To be continued...*
+#### *To be continued...*
+
+## Feature products
+
+Функционал отвечает за управление сущностями товаров и связанных с ними сущностями изображений товаров и разделов каталога товаров.
+
+*Реализован на уровнях:*
+- [**Entity**](#product_entity)
+- [**Dao**](#product_dao)
+- [**Service**](#product_service)
+- [**Controller**](#product_controller)
+
+### <a name = "product_entity"></a> Product entities 
+
+Включают в себя следующие сущности, представленные одноименными java классами:
+
+* **Product** - товар
+* **ProductCatalogSection** - раздел каталога товаров
+* **ProductImage** - изображение, связанное с товаром
+
+Каждое поле имеет соответсвующие getter и setter.
+##### Product.java
+- `long id`
+- `String name`
+- `int price`
+- `String description`
+- `ProductCatalogSection productCatalogSection` - @ManyToOne
+- `List<ProductImage> images` - @OneToMany
+
+##### ProductCatalogSection.java
+- `long id`
+- `String name`
+- `List<Product> products` - @OneToMany
+
+##### ProductImage
+- `long id`
+- `Product product` - @ManyToOne
+- `byte[] image`
+
+### <a name = "product_dao"></a> Product DAOs
+
+Представлены следующими DAO, каждый из которых является расширением базового **BasicDao**:
+
+* **ProductDao** имеет следующие специфичные методы
+    - `List<Product> findByName(String name)`
+    - `List<Product> findByPriceRange(int min, int max)`
+    - `List<Product> findByCatalogSectionId(long sectionId)`
+
+* **ProductCatalogSectionDao**
+* **ProductImageDao**
+
+### <a name = "product_service"> </a> Product service
+
+   - `List<Product> getAllProducts()`
+   - `List<Product> getProductsByName(String name)`
+   - `Product addProduct(Product product)`
+   - `Product updateProduct(Product product)`
+   - `Product deleteProduct(long id)`
+   - `Product getProductById(long id)`
+   - `List<Product> getProductsByPriceRange(int min, int max)`
+   - `List<Product> getProductsByCatalogSectionId(long sectionId)`
+   - `List<ProductCatalogSection> getAllCatalogSections()`
+   - `ProductCatalogSection addCatalogSection(ProductCatalogSection section)`
+   - `ProductCatalogSection getCatalogSectionById(long sectionId)`
+   - `ProductCatalogSection updateCatalogSection(ProductCatalogSection section)`
+   - `ProductCatalogSection deleteCatalogSection(long sectionId)`
+   - `List<ProductImage> getImagesByProductId(long id)`
+   - `ProductImage addImage(ProductImage image)`
+   - `ProductImage deleteImage(long imageId)`
+   - `ProductImage getImageById(long imageId)`
+
+### <a name = "product_controller"> </a> Product controller 
+Mapped to "/products":
+##### Function mappings:
+- `List<Product> getAllProducts()` - "/getAllProducts"
+- `List<Product> getProductsByName(@PathVariable(value = "name") String name)` - "/getProductsByName/{name}"
+- `Product addProduct(@RequestBody Product product)` - "/addProduct"
+- `Product updateProduct(@RequestBody Product product)` - "/updateProduct"
+- `Product deleteProduct(@PathVariable(value = "id") String inputId)` - "/deleteProduct/{id}"
+- `Product getProductById(@PathVariable(value = "id") String id)`- "/getProductById/{id}"
+- `List<Product> getProductsByPriceRange(@PathVariable(value = "min") int min, @PathVariable(value = "max") int max)` - "/getProductsByPriceRange/{min}/{max}"
+- `List<Product> getProductsByCatalogSectionId(@PathVariable(value = "id") String id)` - "/getProductsByCatalogSectionId/{id}"
+- `String showProductImageUploadForm()` - "/images/add"
+- `String showProductImage()` - "/images/show"
+- `Long uploadProductImage(@RequestParam("file") MultipartFile file, @RequestParam("productId") String productId)` - "/images/upload"
+- `Long deleteImage(@PathVariable(value = "id") String inputId)` - "/deleteImage/{id}"
+- `List<Long> getImageIdsByProductId(@PathVariable(value = "id") String productId)` - "/getImageIdsByProductId/{id}"
+- `byte[] getImageById(@PathVariable(value = "id")` - "/getImageById/{id}"
+- `List<ProductCatalogSection> getAllCatalogSections()` - "/getAllCatalogSections"
+- `ProductCatalogSection addCatalogSection(@RequestBody ProductCatalogSection section)` - "/addCatalogSection"
+- `ProductCatalogSection updateCatalogSection(@RequestBody ProductCatalogSection section)` - "/updateCatalogSection"
+- `ProductCatalogSection deleteCatalogSection(@PathVariable(value = "id") String inputId)` - "deleteCatalogSection/{id}"
+- `ProductCatalogSection getCatalogSectionById(@PathVariable(value = "id") String id)` - "/getCatalogSectionById/{id}"

pom.xml

@@ -43,11 +43,6 @@
             <artifactId>spring-orm</artifactId>
             <version>${spring.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-test</artifactId>
-            <version>${spring.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-core</artifactId>
@@ -63,6 +58,11 @@
             <artifactId>spring-security-web</artifactId>
             <version>${spring.security.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
@@ -127,10 +127,16 @@
             <version>2.7.22</version>
         </dependency>
         <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
-            <version>1.10.19</version>
+            <groupId>commons-fileupload</groupId>
+            <artifactId>commons-fileupload</artifactId>
+            <version>1.3.2</version>
         </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.4</version>
+        </dependency>
+
     </dependencies>
 
     <build>

src/main/java/io/delivery/config/AppConfig.java

@@ -18,6 +18,7 @@
 import org.springframework.jdbc.datasource.DriverManagerDataSource;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.core.userdetails.jdbc.JdbcDaoImpl;
+import org.springframework.web.multipart.commons.CommonsMultipartResolver;
 
 @Configuration
 @PropertySource(value = {"classpath:util.properties"})
@@ -97,6 +98,22 @@ public DocumentDao documentDao() {
         return new DocumentDaoImpl(Document.class);
     }
 
+    @Bean
+    ProductDao productDao() {
+        return  new ProductDaoImpl(Product.class);
+    }
+
+    @Bean
+    ProductCatalogSectionDao productCatalogSectionDao() {
+        return new ProductCatalogSectionDaoImpl(ProductCatalogSection.class);
+    }
+
+    @Bean
+    ProductImageDao productImageDao() { return new ProductImageDaoImpl(ProductImage.class);}
+
+    @Bean
+    CommonsMultipartResolver multipartResolver() {return new CommonsMultipartResolver();}
+
     @Bean
     public NewsCreator newsCreator() {
         return new NewsCreatorImpl(jdbcTemplate());
@@ -113,12 +130,12 @@ NoRegistrationCustomerDao noRegistrationCustomerDao() {
     }
 
     @Bean
-    public OfficeDao officeDao() {
+    public OfficeDao officeDao(){
         return new OfficeDaoImpl(Office.class);
     }
 
     @Bean
-    public CustomerDao customerDao() {
+    CustomerDao customerDao() {
         return new CustomerDaoImpl(Customer.class);
     }
 

src/main/java/io/delivery/config/SecurityConfig.java

@@ -35,7 +35,10 @@ protected void configure(HttpSecurity http) throws Exception {
                 .antMatchers("/").permitAll()
                 .antMatchers("/secure").access("hasRole('ADMIN')")
                 .antMatchers("/dump").access("hasRole('ADMIN')")
-                .and().csrf().disable().formLogin().defaultSuccessUrl("/", false);
+                .and().csrf().disable()
+                .formLogin().defaultSuccessUrl("/", false);
+//                .and().httpBasic();
+//                .and().sessionManagement().disable();
     }
 
 }

src/main/java/io/delivery/config/WebAppInitializer.java

@@ -1,8 +1,11 @@
 package io.delivery.config;
 
 import io.delivery.config.application.WebConfig;
+import org.springframework.web.filter.CharacterEncodingFilter;
 import org.springframework.web.servlet.support.AbstractAnnotationConfigDispatcherServletInitializer;
 
+import javax.servlet.Filter;
+
 public class WebAppInitializer extends AbstractAnnotationConfigDispatcherServletInitializer {
 
     @Override
@@ -19,4 +22,10 @@ protected Class<?>[] getServletConfigClasses() {
     protected String[] getServletMappings() {
         return new String[]{"/"};
     }
+
+    @Override
+    protected Filter[] getServletFilters() {
+        CharacterEncodingFilter characterEncodingFilter = new CharacterEncodingFilter();
+        characterEncodingFilter.setEncoding("utf-8");
+        return new Filter[]{characterEncodingFilter};    }
 }

src/main/java/io/delivery/controller/AppController.java

@@ -82,6 +82,11 @@ public String getDocumentInfo() {
         return "document";
     }
 
+    @RequestMapping(value = "/productCatalog")
+    public String showProductCatalog() {
+        return "productCatalog";
+    }
+
     @RequestMapping(value = {"/word/{check}"}, method = RequestMethod.GET)
     public ModelAndView checkWord(@PathVariable("check") String check) throws IOException, SOAPException {
         ModelAndView modelAndView = new ModelAndView();