added Queries findByCompanyNameContaining, findByCompanyType

Author: Almielka

src/main/java/com/almielka/restapicrud/domain/Company.java

@@ -37,7 +37,7 @@
 @Table(name = "company", indexes = {@Index(columnList = "name", unique = true)})
 public class Company extends AbstractNameEntity {
 
-    @Column(name = "imagery_type")
+    @Column(name = "company_type")
     @Enumerated(EnumType.STRING)
     private CompanyType companyType;
 

src/main/java/com/almielka/restapicrud/repository/ProductRepository.java

@@ -5,6 +5,7 @@
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
+import com.almielka.restapicrud.domain.Company;
 
 import java.util.Set;
 
@@ -18,6 +19,38 @@
 @Repository
 public interface ProductRepository extends CommonRepository<Product> {
 
+    /**
+     * Retrieve {@link Product}s from the data store by {@code name} of {@link Company}, returning all products
+     * whose Company name <i>containing</i> with the given name.
+     *
+     * @param name Value to search for
+     * @return a Collection of matching products (or an empty Collection if none found)
+     */
+    @Query(value = "SELECT * " +
+            "FROM product p " +
+            "INNER JOIN company c " +
+            "ON p.company_id = c.id " +
+            "WHERE c.name LIKE %:name%",
+            nativeQuery = true)
+    @Transactional(readOnly = true)
+    Set<Product> findByCompanyNameContaining(@Param("name") String name);
+
+    /**
+     * Retrieve {@link Product}s from the data store by {@code name} of {@link Company}, returning all products
+     * whose Company type <i>equals</i> with the given type.
+     *
+     * @param type Value to search for
+     * @return a Collection of matching products (or an empty Collection if none found)
+     */
+    @Query(value = "SELECT * " +
+            "FROM product p " +
+            "INNER JOIN company c " +
+            "ON p.company_id = c.id " +
+            "WHERE c.company_type = :type",
+            nativeQuery = true)
+    @Transactional(readOnly = true)
+    Set<Product> findByCompanyType(@Param("type") String type);
+
     @Query(value = "SELECT p, " +
             "COUNT(*)" +
             "FROM Product p " +

src/main/java/com/almielka/restapicrud/service/impl/ProductServiceImpl.java

@@ -26,16 +26,18 @@ public ProductServiceImpl(ProductRepository repository) {
 
     @Override
     public Set<Product> findByCompanyNameContaining(String name) {
-        return repository.findAll().stream()
-                .filter(item -> item.getCompany().getName().contains(name))
-                .collect(Collectors.toSet());
+//        return repository.findAll().stream()
+//                .filter(item -> item.getCompany().getName().contains(name))
+//                .collect(Collectors.toSet());
+        return repository.findByCompanyNameContaining(name);
     }
 
     @Override
     public Set<Product> findByCompanyType(String type) {
-        return repository.findAll().stream()
-                .filter(item -> item.getCompany().getCompanyType().toString().equals(type.toUpperCase()))
-                .collect(Collectors.toSet());
+//        return repository.findAll().stream()
+//                .filter(item -> item.getCompany().getCompanyType().toString().equals(type.toUpperCase()))
+//                .collect(Collectors.toSet());
+        return repository.findByCompanyType(type.toUpperCase());
     }
 
     @Override