It's like a piece of cake! 🧁🥱

src/main/java/com/rxmobileteam/lecture1/Exercise1Main.java

@@ -1,13 +1,15 @@
 package com.rxmobileteam.lecture1;
 
+import com.rxmobileteam.lecture1.data.Dao;
+import com.rxmobileteam.lecture1.data.ProductDao;
 import com.rxmobileteam.lecture1.factory.ProductServiceFactory;
 import com.rxmobileteam.lecture1.service.Product;
 import com.rxmobileteam.lecture1.service.ProductService;
 
 public class Exercise1Main {
     public static void main(String[] args) {
-        ProductService productService = new ProductServiceFactory().createProductService();
-
+        Dao productDao = new ProductDao();
+        ProductService productService = new ProductServiceFactory().createProductService(productDao);
         Product iPhone12 = new Product(
             "1",
             "iPhone 12",
@@ -51,7 +53,7 @@ public static void main(String[] args) {
         System.out.println(
             String.join(
                 "\n",
-                productService.searchProducts("Samsung")
+                productService.searchProducts("2")
                     .stream()
                     .map(Product::toString)
                     .toList()

src/main/java/com/rxmobileteam/lecture1/data/Dao.java

@@ -0,0 +1,19 @@
+package com.rxmobileteam.lecture1.data;
+
+import com.rxmobileteam.lecture1.service.Product;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+import java.util.Set;
+
+/**
+ * Created by @rikka on: 9/11/24
+ */
+
+public interface Dao {
+    boolean add(@NotNull Product product);
+
+    @NotNull Set<Product> findAll();
+
+    @NotNull List<Product> query(String query);
+}

src/main/java/com/rxmobileteam/lecture1/data/ProductDao.java

@@ -5,16 +5,15 @@
 import org.jetbrains.annotations.NotNull;
 
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 
 /**
  * {@link ProductDao} represents a Data Access Object (DAO) for products.
  * The implementation is simplified, so it just uses {@link HashSet} to store.
  * <p>
- * todo: 1. Implement a method {@link ProductDao#add(Product)} that store new product into the set
- * todo: 2. Implement a method {@link ProductDao#findAll()} that returns a set of all products
  */
-public class ProductDao {
+public class ProductDao implements Dao {
     private final Set<Product> products = new HashSet<>();
 
     /**
@@ -23,20 +22,27 @@ public class ProductDao {
      * @param product a product to store
      * @return {@code true} if a product was stored, {@code false} otherwise
      */
+    @Override
     public boolean add(@NotNull Product product) {
-        // TODO: implement this method
-        throw new ExerciseNotCompletedException();
+        return products.add(product);
     }
 
     /**
      * Returns all stored products
      *
      * @return a set of all stored products
      */
-    @NotNull
-    public Set<Product> findAll() {
-        // TODO: implement this method
-        throw new ExerciseNotCompletedException();
+    @Override
+    public @NotNull Set<Product> findAll() {
+        return products;
+    }
+
+    @Override
+    public @NotNull List<Product> query(String query) {
+        return products.stream()
+            .filter(it -> it.getName().toLowerCase().contains(query.toLowerCase())
+                || it.getDescription().toLowerCase().contains(query.toLowerCase()))
+            .toList();
     }
 
 }

src/main/java/com/rxmobileteam/lecture1/factory/ProductServiceFactory.java

@@ -1,13 +1,13 @@
 package com.rxmobileteam.lecture1.factory;
 
+import com.rxmobileteam.lecture1.data.Dao;
 import com.rxmobileteam.lecture1.service.ProductService;
 import com.rxmobileteam.utils.ExerciseNotCompletedException;
 import org.jetbrains.annotations.NotNull;
 
 /**
  * {@link ProductServiceFactory} is used to create an instance of {@link ProductService}
  * <p>
- * TODO: 1. Implement method {@link ProductServiceFactory#createProductService()}
  */
 public class ProductServiceFactory {
 
@@ -17,8 +17,7 @@ public class ProductServiceFactory {
      * @return ProductService
      */
     @NotNull
-    public ProductService createProductService() {
-        // TODO: implement this method
-        throw new ExerciseNotCompletedException();
+    public ProductService createProductService(Dao dao) {
+        return new ProductService(dao);
     }
 }

src/main/java/com/rxmobileteam/lecture1/service/Product.java

@@ -55,4 +55,20 @@ public String toString() {
             ", price=" + price +
             '}';
     }
+
+    public @NotNull String getId() {
+        return id;
+    }
+
+    public @NotNull String getName() {
+        return name;
+    }
+
+    public @NotNull String getDescription() {
+        return description;
+    }
+
+    public double getPrice() {
+        return price;
+    }
 }

src/main/java/com/rxmobileteam/lecture1/service/ProductService.java

@@ -1,7 +1,7 @@
 package com.rxmobileteam.lecture1.service;
 
+import com.rxmobileteam.lecture1.data.Dao;
 import com.rxmobileteam.lecture1.data.ProductDao;
-import com.rxmobileteam.utils.ExerciseNotCompletedException;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
@@ -13,6 +13,11 @@
  * TODO: 2. Using {@link ProductDao} implement method {@link ProductService#searchProducts(String)}
  */
 public class ProductService {
+    private final Dao dao;
+
+    public ProductService(Dao dao) {
+        this.dao = dao;
+    }
 
     /**
      * Adds a new product to the system.
@@ -21,8 +26,7 @@ public class ProductService {
      * @return {@code true} if a product was added, {@code false} otherwise.
      */
     public boolean addProduct(@NotNull Product product) {
-        // TODO: implement this method
-        throw new ExerciseNotCompletedException();
+        return dao.add(product);
     }
 
     /**
@@ -33,7 +37,6 @@ public boolean addProduct(@NotNull Product product) {
      */
     @NotNull
     public List<Product> searchProducts(@NotNull String query) {
-        // TODO: implement this method
-        throw new ExerciseNotCompletedException();
+        return dao.query(query);
     }
 }