Finished project.

.gitignore

@@ -0,0 +1,15 @@
+# See http://help.github.com/ignore-files/ for more about ignoring files.
+
+API/.idea/
+API/API.iml
+API/MyBooks.iml
+API/target/
+
+client/.idea/
+client/dist/
+client/client.iml
+client/e2e/
+client/node_modules/
+
+db/db.iml
+

API/Dockerfile

@@ -0,0 +1,5 @@
+FROM maven:3.3.9-jdk-8
+
+WORKDIR /api
+
+EXPOSE 8080

API/pom.xml

@@ -4,8 +4,9 @@
 
 
     <groupId>Library</groupId>
-    <artifactId>Spring-boot</artifactId>
-    <version>1.8</version>
+    <artifactId>BookShop</artifactId>
+    <version>8</version>
+
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <start-class>app.Application</start-class>

API/src/main/java/app/config/DataBase.java

@@ -18,7 +18,7 @@ public class DataBase {
 
     private String DB_PASSWORD="zabudska1985";
 
-    private String DB_URL="jdbc:mysql://127.0.0.1:3306/Library?useSSL=false";
+    private String DB_URL="jdbc:mysql://db:3306/Library?useSSL=false";
 
     private String DB_USERNAME="root";
 
@@ -62,8 +62,4 @@ public HibernateTransactionManager transactionManager() {
         return transactionManager;
     }
 
-}
-
-
-
-
+}

API/src/main/java/app/core/controller/BooksController.java

@@ -23,9 +23,9 @@ public List<Book> allBooks() {
     }
 
     @ResponseBody
-    @RequestMapping(value = "/", method = RequestMethod.POST)
-    public void addBook(@RequestBody Book book) {
-        service.addBook(book);
+    @RequestMapping(value = "", method = RequestMethod.POST)
+    public Book addBook(@RequestBody Book book) {
+        return service.addBook(book);
     }
 
     @ResponseBody
@@ -34,10 +34,16 @@ public void updateBook(@RequestBody Book upBook) {
         service.updateBook(upBook);
     }
 
-    @ResponseBody
-    @RequestMapping(value = {"/{id}"}, method = RequestMethod.DELETE)
-    public void deleteBook(@PathVariable("id") Integer id) {
+
+    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
+    @ResponseBody void deleteBook(@PathVariable("id") Integer id) {
         service.deleteBook(id);
     }
 
+    @ResponseBody
+    @RequestMapping(value = "/search/{name}", method = RequestMethod.GET)
+    public List<Book> searchBook(@PathVariable("name") String name) {
+        return service.searchBook(name);
+    }
+
 }

API/src/main/java/app/core/controller/CategoriesController.java

@@ -1,5 +1,6 @@
 package app.core.controller;
 
+import app.core.model.Book;
 import app.core.model.Categories;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -8,17 +9,17 @@
 
 import app.core.service.CategoriesServiceImpl;
 
+
 @RestController
+@RequestMapping(value = "/api/categories")
 public class CategoriesController {
 
     @Autowired
     CategoriesServiceImpl service;
 
     @ResponseBody
-    @RequestMapping(value = "/api/categories", method = RequestMethod.GET)
+    @RequestMapping(value = "", method = RequestMethod.GET)
     public List<Categories> allCategories() {
-
-        System.out.println(service.getCategories());
         return service.getCategories();
     }
 

API/src/main/java/app/core/controller/ShopController.java

@@ -9,13 +9,14 @@
 import app.core.service.ShopServiceImpl;
 
 @RestController
+@RequestMapping(value = "/api/shops")
 public class ShopController {
 
     @Autowired
     ShopServiceImpl service;
 
     @ResponseBody
-    @RequestMapping(value = "/api/shops", method = RequestMethod.GET)
+    @RequestMapping(value = "", method = RequestMethod.GET)
     public List<Shop> allShops() {
         return service.getShops();
     }

API/src/main/java/app/core/dao/BooksDao.java

@@ -1,18 +1,21 @@
 package app.core.dao;
 
 import app.core.model.Book;
+import org.hibernate.Criteria;
 
 import java.util.List;
 
 interface BooksDao {
 
-    public List<Book> getBooks();
+    public List getBooks();
 
     public void deleteBook(Integer id);
 
-    public void addBook(Book book);
+    public Book addBook(Book book);
 
     public void updateBook(Book upBook);
 
+    public List<Book> searchBook(String name);
 
+    public Criteria createCriteria();
 }

API/src/main/java/app/core/dao/BooksDaoImpl.java

@@ -1,8 +1,10 @@
 package app.core.dao;
 
 import app.core.model.Book;
+import org.hibernate.Criteria;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
+import org.hibernate.criterion.Restrictions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
 
@@ -15,27 +17,36 @@ public class BooksDaoImpl implements BooksDao {
     @Autowired
     SessionFactory sessionFactory;
 
-    public List<Book> getBooks() {
-        return sessionFactory.getCurrentSession().createCriteria(Book.class).list();
+    public Criteria createCriteria(){
+        return sessionFactory.getCurrentSession().createCriteria(Book.class);
     }
 
-    public void addBook(Book book) {
+    public List<Book> getBooks() {return createCriteria().setResultTransformer(Criteria.DISTINCT_ROOT_ENTITY).list();
+    }
+
+    public List<Book> searchBook(String name){
+        String searchName = name + "%";
+        List<Book> book = (List<Book>) createCriteria()
+                .add(Restrictions.like("name", searchName)).list();
+        return book;
+    }
+
+    public Book addBook(Book book) {
         sessionFactory.getCurrentSession().save(book);
+        return book;
     }
 
     public void updateBook(Book upBook) {
-        Book book = (Book) sessionFactory.getCurrentSession().createCriteria(Book.class)
+        Book book = (Book) createCriteria()
                 .add(eq("id", upBook.getId())).uniqueResult();
         book.setName(upBook.getName());
         sessionFactory.getCurrentSession().update(book);
     }
 
     public void deleteBook(Integer id) {
-        System.out.println(id);
-        Session currentSession = sessionFactory.getCurrentSession();
-        Book book = (Book) currentSession.createCriteria(Book.class)
+        Book book = (Book) createCriteria()
                 .add(eq("id", id)).uniqueResult();
-        currentSession.delete(book);
+        sessionFactory.getCurrentSession().delete(book);
     }
 
 }

API/src/main/java/app/core/dao/CategoriesDaoImpl.java

@@ -1,6 +1,7 @@
 package app.core.dao;
 
 import app.core.model.Categories;
+import org.hibernate.Criteria;
 import org.hibernate.SessionFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
@@ -14,6 +15,8 @@ public class CategoriesDaoImpl implements CategoriesDao {
     SessionFactory sessionFactory;
 
     public List<Categories> getCategories() {
-        return sessionFactory.getCurrentSession().createCriteria(Categories.class).list();
+        return sessionFactory.getCurrentSession()
+                .createCriteria(Categories.class)
+                .setResultTransformer(Criteria.DISTINCT_ROOT_ENTITY).list();
     }
 }

API/src/main/java/app/core/model/Book.java

@@ -1,9 +1,18 @@
 package app.core.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import org.hibernate.annotations.Fetch;
+import org.hibernate.annotations.FetchMode;
+import org.hibernate.annotations.LazyCollection;
+import org.hibernate.annotations.LazyCollectionOption;
 
 import javax.persistence.*;
 
+import java.util.ArrayList;
+import java.util.List;
+import javax.persistence.ManyToMany;
+
+
 import static javax.persistence.GenerationType.IDENTITY;
 
 @Entity
@@ -25,12 +34,30 @@ public class Book {
     @Column(name = "category")
     private Integer category;
 
+
     @JsonIgnore
-    @ManyToOne(fetch = FetchType.EAGER)
+    @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "category", insertable = false, updatable = false)
     private Categories categories;
 
 
+    @ManyToMany(fetch = FetchType.EAGER, cascade = CascadeType.MERGE)
+    @JoinTable(name = "book_shops", catalog = "Library",
+            joinColumns = {
+                    @JoinColumn( name = "idBook", referencedColumnName = "id")
+            },
+            inverseJoinColumns = {@JoinColumn(name = "idShop", referencedColumnName = "id" )})
+    private List<Shop> shops = new ArrayList();
+
+    public List<Shop> getShops() {
+        return this.shops;
+    }
+
+    public void setShops(List<Shop> shops) {
+        this.shops = shops;
+    }
+
+
     public Book() {
     }
 
@@ -44,6 +71,7 @@ public Book(String name, String author, Integer category) {
         this.category = category;
     }
 
+
     public Integer getId() {
         return this.id;
     }

API/src/main/java/app/core/model/Categories.java

@@ -19,11 +19,6 @@ public class Categories {
     @Column(name = "name")
     public String name;
 
-    @JsonIgnore
-    @OneToMany(fetch = FetchType.LAZY, mappedBy = "categories")
-    @Cascade({org.hibernate.annotations.CascadeType.DELETE})
-    public List<Book> categories = new ArrayList();
-
     public Categories() {
     }
 
@@ -51,13 +46,4 @@ public void setName(String name) {
         this.name = name;
     }
 
-    public List<Book> getCategories() {
-        return categories;
-    }
-
-    public void setCategories(List<Book> categories) {
-        this.categories = categories;
-    }
-
-
 }

API/src/main/java/app/core/model/Shop.java

@@ -2,6 +2,8 @@
 
 import javax.persistence.*;
 
+import java.awt.print.*;
+import java.util.ArrayList;
 import java.util.List;
 
 import static javax.persistence.GenerationType.IDENTITY;
@@ -19,5 +21,19 @@ public class Shop {
     @Column(name = "name")
     public String name;
 
+    public Integer getId() {
+        return this.id;
+    }
 
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return this.name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
 }

API/src/main/java/app/core/service/BookServiceImpl.java

@@ -18,8 +18,12 @@ public List<Book> getBooks() {
         return dao.getBooks();
     }
 
-    public void addBook(Book book) {
-        dao.addBook(book);
+    public List<Book> searchBook(String name) {
+        return dao.searchBook(name);
+    }
+
+    public Book addBook(Book book) {
+        return dao.addBook(book);
     }
 
     public void updateBook(Book upBook) {

API/start.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+mvn package
+
+java -jar /api/target/BookShop-8.jar

client/Dockerfile

@@ -1,10 +1,5 @@
 FROM node:4.4
+
 RUN npm install -g npm
 
-RUN mkdir /client
 WORKDIR /client
-
-COPY src ./
-
-EXPOSE 3000:3001
-CMD["npm", "run", "api"]

client/angular-cli.json

@@ -18,7 +18,8 @@
       "prefix": "app",
       "mobile": false,
       "styles": [
-        "styles.css"
+        "styles.css",
+        "../node_modules/bootstrap/dist/css/bootstrap.min.css"
       ],
       "scripts": [],
       "environments": {