example app migration to use Sembast v2 (#294)

* Setting installationId in _Session object during sign-up

* example app migration to use Sembast v2

Author: mregandla

example/android/app/build.gradle

@@ -15,7 +15,7 @@ apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     lintOptions {
         disable 'InvalidPackage'
@@ -25,7 +25,7 @@ android {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.example.flutterpluginexample"
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -46,6 +46,6 @@ flutter {
 
 dependencies {
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.1'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
+    androidTestImplementation 'com.android.support.test:runner:1.0.2'
+    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
 }

example/android/build.gradle

@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:3.5.3'
     }
 }
 

example/android/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip

example/lib/data/repositories/diet_plan/provider_db_diet_plan.dart

@@ -10,16 +10,18 @@ import 'package:sembast/sembast.dart';
 class DietPlanProviderDB implements DietPlanProviderContract {
   DietPlanProviderDB(this._db, this._store);
 
-  final Store _store;
+  final StoreRef<String, Map<String, dynamic>> _store;
   final Database _db;
 
   @override
   Future<ApiResponse> add(DietPlan item) async {
     final Map<String, dynamic> values = convertItemToStorageMap(item);
-    final Record recordToAdd = Record(_store, values, item.objectId);
-    final Record recordFromDB = await _db.putRecord(recordToAdd);
+    await _store.record(item.objectId).put(_db, values);
+    final Map<String, dynamic> recordFromDB =
+        await _store.record(item.objectId).get(_db);
+
     return ApiResponse(
-        true, 200, <dynamic>[convertRecordToItem(record: recordFromDB)], null);
+        true, 200, <dynamic>[convertRecordToItem(values: recordFromDB)], null);
   }
 
   @override
@@ -48,10 +50,12 @@ class DietPlanProviderDB implements DietPlanProviderContract {
     final List<SortOrder> sortOrders = List<SortOrder>();
     sortOrders.add(SortOrder(keyName));
     final Finder finder = Finder(sortOrders: sortOrders);
-    final List<Record> records = await _store.findRecords(finder);
+    final List<RecordSnapshot<String, Map<String, dynamic>>> records =
+        await _store.find(_db, finder: finder);
 
     if (records.isNotEmpty) {
-      for (final Record record in records) {
+      for (final RecordSnapshot<String, Map<String, dynamic>> record
+          in records) {
         final DietPlan userFood = convertRecordToItem(record: record);
         foodItems.add(userFood);
       }
@@ -64,7 +68,10 @@ class DietPlanProviderDB implements DietPlanProviderContract {
 
   @override
   Future<ApiResponse> getById(String id) async {
-    final Record record = await _store.getRecord(id);
+    final Finder finder = Finder(filter: Filter.equals('objectId', id));
+
+    final RecordSnapshot<String, Map<String, dynamic>> record =
+        await _store.findFirst(_db, finder: finder);
     if (record != null) {
       final DietPlan userFood = convertRecordToItem(record: record);
       return ApiResponse(true, 200, <dynamic>[userFood], null);
@@ -81,9 +88,10 @@ class DietPlanProviderDB implements DietPlanProviderContract {
         filter:
             Filter.greaterThan(keyVarUpdatedAt, date.millisecondsSinceEpoch));
 
-    final List<Record> records = await _store.findRecords(finder);
+    final List<RecordSnapshot<String, Map<String, dynamic>>> records =
+        await _store.find(_db, finder: finder);
 
-    for (final Record record in records) {
+    for (final RecordSnapshot<String, Map<String, dynamic>> record in records) {
       final DietPlan convertedDietPlan = convertRecordToItem(record: record);
       foodItems.add(convertedDietPlan);
     }
@@ -97,7 +105,9 @@ class DietPlanProviderDB implements DietPlanProviderContract {
 
   @override
   Future<ApiResponse> remove(DietPlan item) async {
-    await _store.delete(item.objectId);
+    final Finder finder =
+        Finder(filter: Filter.equals('objectId', item.objectId));
+    _store.delete(_db, finder: finder);
     return ApiResponse(true, 200, null, null);
   }
 
@@ -123,14 +133,17 @@ class DietPlanProviderDB implements DietPlanProviderContract {
   @override
   Future<ApiResponse> update(DietPlan item) async {
     final Map<String, dynamic> values = convertItemToStorageMap(item);
-    final dynamic returnedItems = await _store.update(values, item.objectId);
+    final Finder finder =
+        Finder(filter: Filter.equals('objectId', item.objectId));
+    final int returnedCount =
+        await _store.update(_db, values, finder: finder);
 
-    if (returnedItems == null) {
+    if (returnedCount == 0) {
       return add(item);
     }
 
     return ApiResponse(
-        true, 200, <dynamic>[convertRecordToItem(values: returnedItems)], null);
+        true, 200, <dynamic>[item], null);
   }
 
   Map<String, dynamic> convertItemToStorageMap(DietPlan item) {
@@ -145,7 +158,9 @@ class DietPlanProviderDB implements DietPlanProviderContract {
     return values;
   }
 
-  DietPlan convertRecordToItem({Record record, Map<String, dynamic> values}) {
+  DietPlan convertRecordToItem(
+      {RecordSnapshot<String, Map<String, dynamic>> record,
+      Map<String, dynamic> values}) {
     try {
       values ??= record.value;
       final DietPlan item =

example/lib/data/repositories/diet_plan/repository_diet_plan.dart

@@ -15,7 +15,8 @@ class DietPlanRepository implements DietPlanProviderContract {
     if (mockDBProvider != null) {
       repository.db = mockDBProvider;
     } else {
-      final Store store = dbConnection.getStore('repository_store');
+      final StoreRef<String, Map<String, dynamic>> store =
+          stringMapStoreFactory.store('repository_diet');
       repository.db = DietPlanProviderDB(dbConnection, store);
     }
 

example/lib/data/repositories/user/provider_db_user.dart

@@ -11,16 +11,17 @@ import 'contract_provider_user.dart';
 class UserProviderDB implements UserProviderContract {
   UserProviderDB(this._db, this._store);
 
-  final Store _store;
+  final StoreRef<String, Map<String, dynamic>> _store;
   final Database _db;
 
   @override
   Future<User> createUser(
       String username, String password, String emailAddress) async {
     final User user = User(username, password, emailAddress);
     final Map<String, dynamic> values = convertItemToStorageMap(user);
-    final Record recordToAdd = Record(_store, values, user.objectId);
-    final Record recordFromDB = await _db.putRecord(recordToAdd);
+    await _store.record(user.objectId).put(_db, values);
+    final Map<String, dynamic> recordFromDB =
+        await _store.record(user.objectId).get(_db);
     return convertRecordToItem(record: recordFromDB);
   }
 
@@ -36,7 +37,9 @@ class UserProviderDB implements UserProviderContract {
 
   @override
   Future<ApiResponse> destroy(User user) async {
-    await _store.delete(user.objectId);
+    final Finder finder =
+        Finder(filter: Filter.equals('objectId', user.objectId));
+    await _store.delete(_db, finder: finder);
     return ApiResponse(true, 200, null, null);
   }
 
@@ -53,8 +56,9 @@ class UserProviderDB implements UserProviderContract {
   @override
   Future<ApiResponse> save(User user) async {
     final Map<String, dynamic> values = convertItemToStorageMap(user);
-    final Record recordToAdd = Record(_store, values, user.objectId);
-    final Record recordFromDB = await _db.putRecord(recordToAdd);
+    await _store.record(user.objectId).put(_db, values);
+    final Map<String, dynamic> recordFromDB =
+        await _store.record(user.objectId).get(_db);
     return ApiResponse(
         true, 200, <dynamic>[convertRecordToItem(record: recordFromDB)], null);
   }
@@ -88,7 +92,7 @@ class UserProviderDB implements UserProviderContract {
     return values;
   }
 
-  User convertRecordToItem({Record record, Map<String, dynamic> values}) {
+  User convertRecordToItem({dynamic record, Map<String, dynamic> values}) {
     try {
       values ??= record.value;
       final User item = User.clone().fromJson(json.jsonDecode(values['value']));

example/lib/data/repositories/user/repository_user.dart

@@ -15,7 +15,8 @@ class UserRepository implements UserProviderContract {
     if (mockDBProvider != null) {
       repository.db = mockDBProvider;
     } else {
-      final Store store = dbConnection.getStore('reposutory_user');
+      final StoreRef<String, Map<String, dynamic>> store =
+          stringMapStoreFactory.store('repository_user');
       repository.db = UserProviderDB(dbConnection, store);
     }
 

example/lib/main.dart

@@ -10,6 +10,7 @@ import 'package:flutter_plugin_example/data/repositories/diet_plan/repository_di
 import 'package:flutter_plugin_example/data/repositories/user/repository_user.dart';
 import 'package:flutter_plugin_example/domain/constants/application_constants.dart';
 import 'package:flutter_plugin_example/domain/utils/db_utils.dart';
+import 'package:flutter_plugin_example/pages/decision_page.dart';
 import 'package:parse_server_sdk/parse_server_sdk.dart';
 
 void main() {
@@ -55,7 +56,9 @@ class _MyAppState extends State<MyApp> {
           title: const Text('Plugin example app'),
         ),
         body: Center(
-          child: Text(text),
+          //child: Text(text),
+          child: DecisionPage(),
+          //child: HomePage(),
         ),
       ),
     );
@@ -94,22 +97,22 @@ class _MyAppState extends State<MyApp> {
 
   Future<void> runTestQueries() async {
     // Basic repository example
-    /* await repositoryAddUser();
-    await repositoryAddItems();
+    //await repositoryAddUser();
+    // await repositoryAddItems();
     await repositoryGetAllItems();
-*/
+
     //Basic usage
-    /* await createItem();
-    await getAllItems();
-    await getAllItemsByName();
-    await getSingleItem();
-    await getConfigs();
-    await query();*/
-    await initUser();
-    /* await initInstallation();
-    await function();
-    await functionWithParameters();
-    await test();*/
+    //await createItem();
+    //await getAllItems();
+    //await getAllItemsByName();
+    //await getSingleItem();
+    //await getConfigs();
+    //await query();
+    //await initUser();
+    //await initInstallation();
+    //await function();
+    //await functionWithParameters();
+    //await test();
   }
 
   Future<void> initInstallation() async {
@@ -221,7 +224,7 @@ class _MyAppState extends State<MyApp> {
   Future<void> initUser() async {
     // All return type ParseUser except all
     ParseUser user =
-    ParseUser('RE9fU360lishjFKC5dLZS4Zwm', 'password', 'test@facebook.com');
+        ParseUser('RE9fU360lishjFKC5dLZS4Zwm', 'password', 'test@facebook.com');
 
     /// Sign-up
     /*ParseResponse response = await user.signUp();
@@ -353,7 +356,9 @@ class _MyAppState extends State<MyApp> {
 
     final List<dynamic> json = const JsonDecoder().convert(dietPlansToAdd);
     for (final Map<String, dynamic> element in json) {
-      final DietPlan dietPlan = DietPlan().fromJson(element);
+      final DietPlan dietPlan = DietPlan();
+      element.forEach(
+          (String k, dynamic v) => dietPlan.set<dynamic>(k, parseDecode(v)));
       dietPlans.add(dietPlan);
     }
 
@@ -376,7 +381,6 @@ class _MyAppState extends State<MyApp> {
     userRepo ??= UserRepository.init(await getDB());
   }
 
-
   /// Available options:
   /// SharedPreferences - Not secure but will work with older versions of SDK - CoreStoreSharedPrefsImpl
   /// Sembast - NoSQL DB - Has security - CoreStoreSembastImpl
@@ -387,10 +391,10 @@ class _MyAppState extends State<MyApp> {
 }
 
 const String dietPlansToAdd =
-    '[{"className":"Diet_Plans","Name":"Textbook","Description":"For an active lifestyle and a straight forward macro plan, we suggest this plan.","Fat":25,"Carbs":50,"Protein":25,"Status":0},'
-    '{"className":"Diet_Plans","Name":"Body Builder","Description":"Default Body Builders Diet","Fat":20,"Carbs":40,"Protein":40,"Status":0},'
-    '{"className":"Diet_Plans","Name":"Zone Diet","Description":"Popular with CrossFit users. Zone Diet targets similar macros.","Fat":30,"Carbs":40,"Protein":30,"Status":0},'
-    '{"className":"Diet_Plans","Name":"Low Fat","Description":"Low fat diet.","Fat":15,"Carbs":60,"Protein":25,"Status":0},'
-    '{"className":"Diet_Plans","Name":"Low Carb","Description":"Low Carb diet, main focus on quality fats and protein.","Fat":35,"Carbs":25,"Protein":40,"Status":0},'
-    '{"className":"Diet_Plans","Name":"Paleo","Description":"Paleo diet.","Fat":60,"Carbs":25,"Protein":10,"Status":0},'
-    '{"className":"Diet_Plans","Name":"Ketogenic","Description":"High quality fats, low carbs.","Fat":65,"Carbs":5,"Protein":30,"Status":0}]';
+    '[{"className":"Diet_Plans","Name":"Textbook","Description":"For an active lifestyle and a straight forward macro plan, we suggest this plan.","Fat":25,"Carbs":50,"Protein":25,"Status":false},'
+    '{"className":"Diet_Plans","Name":"Body Builder","Description":"Default Body Builders Diet","Fat":20,"Carbs":40,"Protein":40,"Status":false},'
+    '{"className":"Diet_Plans","Name":"Zone Diet","Description":"Popular with CrossFit users. Zone Diet targets similar macros.","Fat":30,"Carbs":40,"Protein":30,"Status":false},'
+    '{"className":"Diet_Plans","Name":"Low Fat","Description":"Low fat diet.","Fat":15,"Carbs":60,"Protein":25,"Status":false},'
+    '{"className":"Diet_Plans","Name":"Low Carb","Description":"Low Carb diet, main focus on quality fats and protein.","Fat":35,"Carbs":25,"Protein":40,"Status":false},'
+    '{"className":"Diet_Plans","Name":"Paleo","Description":"Paleo diet.","Fat":60,"Carbs":25,"Protein":10,"Status":false},'
+    '{"className":"Diet_Plans","Name":"Ketogenic","Description":"High quality fats, low carbs.","Fat":65,"Carbs":5,"Protein":30,"Status":false}]';

example/lib/pages/home_page.dart

@@ -24,7 +24,9 @@ class _HomePageState extends State<HomePage> {
     super.initState();
     final List<dynamic> json = const JsonDecoder().convert(dietPlansToAdd);
     for (final Map<String, dynamic> element in json) {
-      final DietPlan dietPlan = DietPlan().fromJson(element);
+      final DietPlan dietPlan = DietPlan();
+      element.forEach(
+          (String k, dynamic v) => dietPlan.set<dynamic>(k, parseDecode(v)));
       randomDietPlans.add(dietPlan);
     }
   }