Add products to favourites.

4seer · May 5, 2020 · 9620f01 · 9620f01
1 parent 7e7abd4
commit 9620f01
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 22 deletions.
diff --git a/lib/data/abstract/favorites_repository.dart b/lib/data/abstract/favorites_repository.dart
@@ -2,6 +2,7 @@ import 'dart:collection';
 
 import 'package:openflutterecommerce/config/theme.dart';
 import 'package:openflutterecommerce/data/abstract/model/favorite_product.dart';
+import 'package:openflutterecommerce/data/abstract/model/product.dart';
 
 import 'model/filter_rules.dart';
 import 'model/product_attribute.dart';
@@ -26,7 +27,7 @@ abstract class FavoritesRepository {
   ///that all selectable properties should be set so it will be easy to order
   ///it then
   Future addToFavorites(
-      int productId, HashMap<ProductAttribute, String> selectedAttributes);
+      Product product, HashMap<ProductAttribute, String> selectedAttributes);
 
   ///removes product with [productId] from the list of favorites
   Future removeFromFavorites(int productId);

diff --git a/lib/data/abstract/model/product.dart b/lib/data/abstract/model/product.dart
@@ -42,7 +42,7 @@ class Product extends Equatable {
     this.description,
     @required this.price,
     this.discountPercent = 0,
-    this.amountAvailable = 10,
+    this.amountAvailable = 0,
     DateTime created,
     this.averageRating,
     this.ratingCount = 0,

diff --git a/lib/data/repositories/product_repository_impl.dart b/lib/data/repositories/product_repository_impl.dart
@@ -73,24 +73,17 @@ class ProductRepositoryImpl extends ProductRepository with FavoritesRepository {
   }
 
   @override
-  Future addToFavorites(int productId, HashMap<ProductAttribute, String> selectedAttributes) async {
-    Product product;
-
-    _dataStorage.products?.forEach((tempProduct) =>{
-        if ( tempProduct.id == productId)
-          product = tempProduct
-    });
-
+  Future addToFavorites(Product product, HashMap<ProductAttribute, String> selectedAttributes) async {
     _dataStorage.favProducts.add(FavoriteProduct(product, selectedAttributes));
   }
 
   @override
   Future<List<FavoriteProduct>> getFavoriteProducts({int pageIndex = 0, int pageSize = AppConsts.page_size, 
       SortRules sortRules = const SortRules(), FilterRules filterRules}) async {
     //TODO: remove when favorite feature will be implemented
-    _dataStorage.products = await getProducts();
+    /*_dataStorage.products = await getProducts();
     _dataStorage.products.forEach((product) => 
-      _dataStorage.favProducts.add(FavoriteProduct(product, HashMap())));
+      _dataStorage.favProducts.add(FavoriteProduct(product, HashMap())));*/
     return _dataStorage.favProducts;
   }
 

diff --git a/lib/presentation/features/product_details/product_bloc.dart b/lib/presentation/features/product_details/product_bloc.dart
@@ -31,7 +31,7 @@ class ProductBloc extends Bloc<ProductEvent, ProductState> {
         similarProducts: data.similarProducts);
     } else if (event is ProductAddToFavoritesEvent) {
       await favoriesRepository.addToFavorites(
-          productId, event.selectedAttributes);
+          event.product, event.selectedAttributes);
     } else if (event is ProductAddToFavoritesEvent) {
       await favoriesRepository.removeFromFavorites(productId);
     } else if (event is ProductAddToCartEvent) {

diff --git a/lib/presentation/features/product_details/product_event.dart b/lib/presentation/features/product_details/product_event.dart
@@ -3,6 +3,7 @@ import 'dart:collection';
 import 'package:equatable/equatable.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
+import 'package:openflutterecommerce/data/abstract/model/product.dart';
 import 'package:openflutterecommerce/data/abstract/model/product_attribute.dart';
 
 @immutable
@@ -24,9 +25,10 @@ class ProductScreenLoadedEvent extends ProductEvent {
 
 @immutable
 class ProductAddToFavoritesEvent extends ProductEvent {
+  final Product product;
   final HashMap<ProductAttribute, String> selectedAttributes;
 
-  ProductAddToFavoritesEvent(this.selectedAttributes);
+  ProductAddToFavoritesEvent(this.product, this.selectedAttributes);
 }
 
 @immutable

diff --git a/lib/presentation/features/product_details/views/details.dart b/lib/presentation/features/product_details/views/details.dart
@@ -193,6 +193,7 @@ class _ProductDetailsViewState extends State<ProductDetailsView> {
   void setFavourite(ProductBloc bloc) {
     if (!favorite) {
       bloc.add(ProductAddToFavoritesEvent(
+          widget.product,
           HashMap())); //TODO ask for real parameters if required
     } else {
       bloc.add(ProductRemoveFromFavoritesEvent());

diff --git a/lib/presentation/features/products/products_bloc.dart b/lib/presentation/features/products/products_bloc.dart
@@ -86,14 +86,14 @@ class ProductsBloc extends Bloc<ProductsListEvent, ProductsState> {
     } else if (event is ProductMakeFavoriteEvent) {
       if (event.isFavorite) {
         await favoritesRepository.addToFavorites(
-            event.productId, event.favoriteAttributes);
+            event.product, event.favoriteAttributes);
       } else {
-        await favoritesRepository.removeFromFavorites(event.productId);
+        await favoritesRepository.removeFromFavorites(event.product.id);
       }
       final List<Product> data = state.data.products;
       yield state.copyWith(
           data: state.data.copyWith(data.map((item) {
-        if (event.productId == item.id) {
+        if (event.product.id == item.id) {
           return item.favorite(event.isFavorite);
         } else {
           return item;

diff --git a/lib/presentation/features/products/products_event.dart b/lib/presentation/features/products/products_event.dart
@@ -8,6 +8,7 @@ import 'package:equatable/equatable.dart';
 import 'package:flutter/material.dart';
 import 'package:openflutterecommerce/data/abstract/model/filter_rules.dart';
 import 'package:openflutterecommerce/data/abstract/model/hashtag.dart';
+import 'package:openflutterecommerce/data/abstract/model/product.dart';
 import 'package:openflutterecommerce/data/abstract/model/product_attribute.dart';
 import 'package:openflutterecommerce/data/abstract/model/sort_rules.dart';
 
@@ -70,11 +71,11 @@ class ProductSearchEvent extends ProductsListEvent {
 
 class ProductMakeFavoriteEvent extends ProductsListEvent {
   final bool isFavorite;
-  final int productId;
+  final Product product;
   final HashMap<ProductAttribute, String> favoriteAttributes;
 
-  ProductMakeFavoriteEvent(this.isFavorite, this.productId, {this.favoriteAttributes});
+  ProductMakeFavoriteEvent(this.isFavorite, this.product, {this.favoriteAttributes});
 
   @override
-  List<Object> get props => [isFavorite, productId];
+  List<Object> get props => [isFavorite, product, favoriteAttributes];
 }
diff --git a/lib/presentation/features/products/views/list_view.dart b/lib/presentation/features/products/views/list_view.dart
@@ -41,7 +41,7 @@ class ProductsListView extends StatelessWidget {
                       BlocProvider.of<ProductsBloc>(context).add(
                           ProductMakeFavoriteEvent(
                               !state.data.products[index].isFavorite,
-                              state.data.products[index].id));
+                              state.data.products[index]));
                     },
                   )) ;
             }

diff --git a/lib/presentation/features/products/views/tile_view.dart b/lib/presentation/features/products/views/tile_view.dart
@@ -32,7 +32,7 @@ class ProductsTileView extends StatelessWidget {
                     BlocProvider.of<ProductsBloc>(context).add(
                         ProductMakeFavoriteEvent(
                             !state.data.products[index].isFavorite,
-                            state.data.products[index].id));
+                            state.data.products[index]));
                   },
                   showProductInfo: () {
                     Navigator.of(context).pushNamed(