[#25] feat: add indexed object

Soogyo-In · Jan 3, 2023 · 227fd0f · 227fd0f
1 parent 744987c
commit 227fd0f
Show file tree

Hide file tree

Showing 7 changed files with 82 additions and 47 deletions.
diff --git a/data/lib/datasource/local/recipe_local_datasource.dart b/data/lib/datasource/local/recipe_local_datasource.dart
@@ -2,10 +2,10 @@ part of 'local_datasource.dart';
 
 class RecipeLocalDatasource implements RecipeDatasource {
   @override
-  Future<Recipe> addRecipe(Recipe recipe) => _upsertRecipe(recipe);
+  Future<IndexedRecipe> addRecipe(Recipe recipe) => _upsertRecipe(recipe);
 
   @override
-  Future<Recipe> getRecipe(Id id) async {
+  Future<IndexedRecipe> getRecipe(Id id) async {
     final isar = await Isar.open([RecipeDataSchema]);
     final recipeData = await isar.recipeDatas.get(id);
 
@@ -17,7 +17,7 @@ class RecipeLocalDatasource implements RecipeDatasource {
   }
 
   @override
-  Future<List<Recipe>> getAllRecipes() async {
+  Future<List<IndexedRecipe>> getAllRecipes() async {
     final isar = await Isar.open([RecipeDataSchema]);
     final recipeDatas = await isar.recipeDatas.where().findAll();
 
@@ -27,7 +27,8 @@ class RecipeLocalDatasource implements RecipeDatasource {
   }
 
   @override
-  Future<Recipe> updateRecipe(Recipe recipe) => _upsertRecipe(recipe);
+  Future<IndexedRecipe> updateRecipe(IndexedRecipe recipe) =>
+      _upsertRecipe(recipe);
 
   @override
   Future<void> deleteRecipe(Id id) async {
@@ -37,11 +38,11 @@ class RecipeLocalDatasource implements RecipeDatasource {
   }
 
   @override
-  Future<Ingredient> addIngredient(Ingredient ingredient) =>
+  Future<IndexedIngredient> addIngredient(Ingredient ingredient) =>
       _upsertIngredient(ingredient);
 
   @override
-  Future<Ingredient> getIngredient(Id id) async {
+  Future<IndexedIngredient> getIngredient(Id id) async {
     final isar = await Isar.open([IngredientDataSchema]);
     final ingredientData = await isar.ingredientDatas.get(id);
 
@@ -53,7 +54,7 @@ class RecipeLocalDatasource implements RecipeDatasource {
   }
 
   @override
-  Future<List<Ingredient>> getAllIngredients() async {
+  Future<List<IndexedIngredient>> getAllIngredients() async {
     final isar = await Isar.open([IngredientDataSchema]);
     final ingredientDatas = await isar.ingredientDatas.where().findAll();
 
@@ -65,7 +66,7 @@ class RecipeLocalDatasource implements RecipeDatasource {
   }
 
   @override
-  Future<Ingredient> updateIngredient(Ingredient ingredient) =>
+  Future<IndexedIngredient> updateIngredient(IndexedIngredient ingredient) =>
       _upsertIngredient(ingredient);
 
   @override
@@ -75,7 +76,7 @@ class RecipeLocalDatasource implements RecipeDatasource {
     await isar.close();
   }
 
-  Future<Recipe> _upsertRecipe(Recipe recipe) async {
+  Future<IndexedRecipe> _upsertRecipe(Recipe recipe) async {
     final isar = await Isar.open([RecipeDataSchema]);
     final directionData = <DirectionData>[];
     for (final direction in recipe.directions) {
@@ -105,8 +106,12 @@ class RecipeLocalDatasource implements RecipeDatasource {
     }
 
     final id = await isar.writeTxn(() {
+      final id = recipe.map(
+        (value) => Isar.autoIncrement,
+        indexed: (value) => value.id,
+      );
       return isar.recipeDatas.put(
-        RecipeData(id: recipe.id ?? Isar.autoIncrement)
+        RecipeData(id: id)
           ..description = recipe.description
           ..directions = directionData
           ..name = recipe.name
@@ -116,23 +121,41 @@ class RecipeLocalDatasource implements RecipeDatasource {
 
     await isar.close();
 
-    return recipe.copyWith(id: id);
+    return recipe.map(
+      (value) => IndexedRecipe(
+        id: id,
+        name: recipe.name,
+        directions: recipe.directions,
+        description: recipe.description,
+        servings: recipe.servings,
+      ),
+      indexed: (value) => value,
+    );
   }
 
-  Future<Ingredient> _upsertIngredient(
-    Ingredient ingredient,
-  ) async {
+  Future<IndexedIngredient> _upsertIngredient(Ingredient ingredient) async {
     final isar = await Isar.open([IngredientDataSchema]);
     final id = await isar.writeTxn(() {
+      final id = ingredient.map(
+        (value) => Isar.autoIncrement,
+        indexed: (value) => value.id,
+      );
       return isar.ingredientDatas.put(
-        IngredientData(id: ingredient.id ?? Isar.autoIncrement)
+        IngredientData(id: id)
           ..description = ingredient.description
           ..name = ingredient.name,
       );
     });
 
     await isar.close();
 
-    return ingredient.copyWith(id: id);
+    return ingredient.map(
+      (value) => IndexedIngredient(
+        id: id,
+        name: ingredient.name,
+        description: ingredient.description,
+      ),
+      indexed: (value) => value,
+    );
   }
 }
diff --git a/data/lib/datasource/model_mapper/ingredient_data_mapper.dart b/data/lib/datasource/model_mapper/ingredient_data_mapper.dart
@@ -1,8 +1,8 @@
 part of 'model_mapper.dart';
 
 extension IngredientDataMapper on IngredientData {
-  Ingredient toIngredient() {
-    return Ingredient(
+  IndexedIngredient toIngredient() {
+    return IndexedIngredient(
       name: name,
       description: description ?? '',
       id: id,

diff --git a/data/lib/datasource/model_mapper/recipe_data_mapper.dart b/data/lib/datasource/model_mapper/recipe_data_mapper.dart
@@ -1,7 +1,7 @@
 part of 'model_mapper.dart';
 
 extension RecipDataMapper on RecipeData {
-  Recipe toRecipe() {
+  IndexedRecipe toRecipe() {
     final directions = this.directions.map(
       (directionData) {
         final countByIngredientId = <int, Count>{};
@@ -28,7 +28,7 @@ extension RecipDataMapper on RecipeData {
       },
     ).toList();
 
-    return Recipe(
+    return IndexedRecipe(
       directions: directions,
       name: name,
       description: description ?? '',

diff --git a/data/lib/datasource/recipe_datasource.dart b/data/lib/datasource/recipe_datasource.dart
@@ -1,23 +1,23 @@
 import 'package:domain/domain.dart';
 
 abstract class RecipeDatasource {
-  Future<Recipe> addRecipe(Recipe recipe);
+  Future<IndexedRecipe> addRecipe(Recipe recipe);
 
-  Future<Recipe> getRecipe(int id);
+  Future<IndexedRecipe> getRecipe(int id);
 
-  Future<List<Recipe>> getAllRecipes();
+  Future<List<IndexedRecipe>> getAllRecipes();
 
-  Future<Recipe> updateRecipe(Recipe recipe);
+  Future<IndexedRecipe> updateRecipe(IndexedRecipe recipe);
 
   Future<void> deleteRecipe(int id);
 
-  Future<Ingredient> addIngredient(Ingredient ingredient);
+  Future<IndexedIngredient> addIngredient(Ingredient ingredient);
 
-  Future<Ingredient> getIngredient(int id);
+  Future<IndexedIngredient> getIngredient(int id);
 
-  Future<List<Ingredient>> getAllIngredients();
+  Future<List<IndexedIngredient>> getAllIngredients();
 
-  Future<Ingredient> updateIngredient(Ingredient ingredient);
+  Future<IndexedIngredient> updateIngredient(IndexedIngredient ingredient);
 
   Future<void> deleteIngredient(int id);
 }
diff --git a/data/test/datasource/local/recipe_local_datasource_test.dart b/data/test/datasource/local/recipe_local_datasource_test.dart
@@ -58,7 +58,7 @@ void main() async {
 
                   expect(
                     addedRecipe,
-                    Recipe(
+                    IndexedRecipe(
                       name: recipe.name,
                       directions: recipe.directions,
                       description: recipe.description,
@@ -76,7 +76,7 @@ void main() async {
       group(
         'Read',
         () {
-          late Recipe addedRecipe;
+          late IndexedRecipe addedRecipe;
 
           setUp(() async {
             addedRecipe = await datasource.addRecipe(recipe);
@@ -88,7 +88,7 @@ void main() async {
               test(
                 'Should Isar instance is closed',
                 () async {
-                  await datasource.getRecipe(addedRecipe.id!);
+                  await datasource.getRecipe(addedRecipe.id);
 
                   expect(Isar.getInstance(), isNull);
                 },
@@ -98,7 +98,7 @@ void main() async {
                 'Should return read recipe object',
                 () async {
                   expect(
-                    await datasource.getRecipe(addedRecipe.id!),
+                    await datasource.getRecipe(addedRecipe.id),
                     addedRecipe,
                   );
                 },
@@ -174,8 +174,8 @@ void main() async {
       group(
         'Update',
         () {
-          late Recipe addedRecipe;
-          late Recipe updatedRecipe;
+          late IndexedRecipe addedRecipe;
+          late IndexedRecipe updatedRecipe;
 
           setUp(() async {
             addedRecipe = await datasource.addRecipe(recipe);
@@ -225,7 +225,7 @@ void main() async {
       group(
         'Delete',
         () {
-          late Recipe addedRecipe;
+          late IndexedRecipe addedRecipe;
 
           setUp(() async {
             addedRecipe = await datasource.addRecipe(recipe);
@@ -237,7 +237,7 @@ void main() async {
               test(
                 'Should Isar instance is closed',
                 () async {
-                  await datasource.deleteRecipe(addedRecipe.id!);
+                  await datasource.deleteRecipe(addedRecipe.id);
 
                   expect(Isar.getInstance(), isNull);
                 },
@@ -278,7 +278,7 @@ void main() async {
 
                 expect(
                   addedIngredient,
-                  Ingredient(
+                  IndexedIngredient(
                     name: ingredient.name,
                     description: ingredient.description,
                     id: addedIngredient.id,
@@ -294,7 +294,7 @@ void main() async {
     group(
       'Read',
       () {
-        late Ingredient addedIngredient;
+        late IndexedIngredient addedIngredient;
 
         setUp(() async {
           addedIngredient = await datasource.addIngredient(ingredient);
@@ -306,7 +306,7 @@ void main() async {
             test(
               'Should Isar instance is closed',
               () async {
-                await datasource.getIngredient(addedIngredient.id!);
+                await datasource.getIngredient(addedIngredient.id);
 
                 expect(Isar.getInstance(), isNull);
               },
@@ -316,7 +316,7 @@ void main() async {
               'Should return read ingredient object',
               () async {
                 expect(
-                  await datasource.getIngredient(addedIngredient.id!),
+                  await datasource.getIngredient(addedIngredient.id),
                   addedIngredient,
                 );
               },
@@ -392,8 +392,8 @@ void main() async {
     group(
       'Update',
       () {
-        late Ingredient addedIngredient;
-        late Ingredient updatedIngredient;
+        late IndexedIngredient addedIngredient;
+        late IndexedIngredient updatedIngredient;
 
         setUp(() async {
           addedIngredient = await datasource.addIngredient(ingredient);
@@ -432,7 +432,7 @@ void main() async {
     group(
       'Delete',
       () {
-        late Ingredient addedIngredient;
+        late IndexedIngredient addedIngredient;
 
         setUp(() async {
           addedIngredient = await datasource.addIngredient(ingredient);
@@ -444,7 +444,7 @@ void main() async {
             test(
               'Should Isar instance is closed',
               () async {
-                await datasource.deleteIngredient(addedIngredient.id!);
+                await datasource.deleteIngredient(addedIngredient.id);
 
                 expect(Isar.getInstance(), isNull);
               },

diff --git a/domain/lib/model/ingredient.dart b/domain/lib/model/ingredient.dart
@@ -5,8 +5,13 @@ part 'ingredient.freezed.dart';
 @freezed
 class Ingredient with _$Ingredient {
   const factory Ingredient({
-    int? id,
     required String name,
     @Default('') String description,
   }) = _Ingredient;
+
+  const factory Ingredient.indexed({
+    required int id,
+    required String name,
+    @Default('') String description,
+  }) = IndexedIngredient;
 }
diff --git a/domain/lib/model/recipe.dart b/domain/lib/model/recipe.dart
@@ -4,17 +4,24 @@ import 'package:freezed_annotation/freezed_annotation.dart';
 part 'recipe.freezed.dart';
 
 @freezed
-class Recipe with _$Recipe {
+abstract class Recipe with _$Recipe {
   const Recipe._();
 
   const factory Recipe({
-    int? id,
     required String name,
     required List<Direction> directions,
     @Default(1) int servings,
     @Default('') String description,
   }) = _Recipe;
 
+  const factory Recipe.indexed({
+    required int id,
+    required String name,
+    required List<Direction> directions,
+    @Default(1) int servings,
+    @Default('') String description,
+  }) = IndexedRecipe;
+
   Map<int, Mass> get massByIngredientId {
     final merged = <int, Mass>{};