Refactor/i category view model

lib/common/utils.dart

@@ -1,3 +1,4 @@
+import 'package:cloud_firestore/cloud_firestore.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_emoji/flutter_emoji.dart';
 import 'package:intl/intl.dart';
@@ -48,3 +49,13 @@ extension WidgetUtils on Widget {
     );
   }
 }
+
+extension ToMapX on DocumentSnapshot {
+  Map<String, dynamic> toMap() {
+    final _map = data();
+    return {
+      'id': id,
+      if (_map != null) ..._map,
+    };
+  }
+}

lib/model/category.model.dart

@@ -14,6 +14,15 @@ class Category {
   final Emoji emoji;
   final int? todoSize;
 
+  factory Category.fromMap(Map<String, dynamic> map) {
+    return Category(
+      id: map['id'],
+      name: map['name'],
+      emoji: map['emoji'],
+      todoSize: map['todoSize'],
+    );
+  }
+
   Category.fromSnapshot(DocumentSnapshot snapshot)
       : id = snapshot.id,
         name = snapshot.data()!['name'],

lib/provider_dependency.dart

@@ -13,14 +13,15 @@ final databaseProvider = Provider((_) => FirebaseFirestore.instance);
 /// Repository
 
 final todoRepositoryProvider = Provider<ITodoRepository>(
-  (ref) => TodoRepository(ref.watch(databaseProvider)),
+  (ref) => TodoRepository(ref.read),
 );
 
 /// ViewModel
 
 final categoryViewModelProvider =
     StateNotifierProvider<CategoryViewModel, CategoryState>(
-        (ref) => CategoryViewModel(ref.read));
+  (ref) => CategoryViewModel(ref.read),
+);
 
 final todoViewModelProvider = StateNotifierProvider<TodoViewModel, TodoState>(
   (ref) => TodoViewModel(ref.read),

lib/repository/todo.repository.dart

@@ -1,6 +1,9 @@
 import 'package:cloud_firestore/cloud_firestore.dart';
 import 'package:crud_todo_app/model/category.model.dart';
 import 'package:crud_todo_app/model/todo.model.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+
+import '../provider_dependency.dart';
 
 abstract class ITodoRepository {
   Stream<List<Category>> getCategories();
@@ -17,9 +20,11 @@ abstract class ITodoRepository {
 }
 
 class TodoRepository implements ITodoRepository {
-  final FirebaseFirestore _database;
+  TodoRepository(this.read);
+
+  final Reader read;
 
-  TodoRepository(this._database);
+  FirebaseFirestore get _database => read(databaseProvider);
 
   static const String _categoryCollection = 'categories';
   static const String _todoCollection = 'todos';

lib/viewmodel/category/category_view_model.dart

@@ -7,10 +7,16 @@ import 'package:crud_todo_app/viewmodel/category/category_state.dart';
 import 'package:flutter_emoji/flutter_emoji.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 
-class CategoryViewModel extends StateNotifier<CategoryState> with Validations {
-  late final Reader _read;
+import '../../model/validation_text.model.dart';
+import '../../repository/todo.repository.dart';
+
+abstract class ICategoryViewModel extends StateNotifier<CategoryState>
+    with Validations {
+  ICategoryViewModel() : super(const CategoryState.initial());
 
-  CategoryViewModel(this._read) : super(const CategoryState.initial());
+  ValidationText get nameCat;
+  ValidationText get emojiCat;
+  ITodoRepository get todoRepo;
 
   ValidationText onChangeName(String value) => validateEmpty(value);
 
@@ -20,10 +26,10 @@ class CategoryViewModel extends StateNotifier<CategoryState> with Validations {
     try {
       state = CategoryState.loading();
 
-      final name = _read(nameCatProvider).state;
-      final emoji = _read(emojiCatProvider).state;
+      final name = nameCat;
+      final emoji = emojiCat;
 
-      await _read(todoRepositoryProvider).saveCategory(Category(
+      await todoRepo.saveCategory(Category(
         name: name.text!,
         emoji: EmojiParser().getEmoji(emoji.text!),
       ));
@@ -37,10 +43,25 @@ class CategoryViewModel extends StateNotifier<CategoryState> with Validations {
   void removeCategory(String id) async {
     try {
       state = CategoryState.loading();
-      await _read(todoRepositoryProvider).deleteCategory(id);
+      await todoRepo.deleteCategory(id);
       state = CategoryState.success(CategoryAction.remove);
     } on Exception catch (e) {
       state = CategoryState.error(e.toString());
     }
   }
 }
+
+class CategoryViewModel extends ICategoryViewModel {
+  CategoryViewModel(this._read);
+
+  late final Reader _read;
+
+  @override
+  ValidationText get nameCat => _read(nameCatProvider).state;
+
+  @override
+  ValidationText get emojiCat => _read(emojiCatProvider).state;
+
+  @override
+  ITodoRepository get todoRepo => _read(todoRepositoryProvider);
+}

pubspec.lock

@@ -266,7 +266,7 @@ packages:
       name: flutter_riverpod
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.14.0+1"
+    version: "0.14.0+3"
   flutter_slidable:
     dependency: "direct main"
     description:
@@ -325,7 +325,7 @@ packages:
       name: hooks_riverpod
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.14.0+1"
+    version: "0.14.0+3"
   http:
     dependency: transitive
     description:
@@ -507,7 +507,7 @@ packages:
       name: riverpod
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.14.0+1"
+    version: "0.14.0+3"
   shelf:
     dependency: transitive
     description:

pubspec.yaml

@@ -11,7 +11,7 @@ dependencies:
     sdk: flutter
 
   cupertino_icons: ^1.0.2
-  hooks_riverpod: ^0.14.0+1
+  hooks_riverpod: ^0.14.0+3
   flutter_hooks: ^0.16.0
   freezed_annotation: ^0.14.1
   firebase_core: ^1.0.3