feat(analytics): use amplify_db_common for drift (#2316)

# Conflicts:
#	packages/amplify/amplify_flutter/example/windows/flutter/generated_plugin_registrant.cc
#	packages/amplify/amplify_flutter/example/windows/flutter/generated_plugins.cmake
#	packages/analytics/amplify_analytics_pinpoint/pubspec.yaml

# Conflicts:
#	packages/amplify/amplify_flutter/example/windows/flutter/generated_plugin_registrant.cc
#	packages/amplify/amplify_flutter/example/windows/flutter/generated_plugins.cmake

Author: fjnoyp

packages/analytics/amplify_analytics_pinpoint/example/linux/flutter/generated_plugin_registrant.cc

@@ -16,6 +16,7 @@ import 'package:amplify_analytics_pinpoint/src/device_context_info_provider/flut
 import 'package:amplify_analytics_pinpoint/src/flutter_app_lifecycle_provider.dart';
 import 'package:amplify_analytics_pinpoint/src/flutter_path_provider/flutter_path_provider.dart';
 import 'package:amplify_analytics_pinpoint_dart/amplify_analytics_pinpoint_dart.dart';
+import 'package:amplify_db_common/amplify_db_common.dart' as db_common;
 import 'package:amplify_secure_storage/amplify_secure_storage.dart';
 
 /// {@template amplify_analytics_pinpoint.analytics_plugin_impl}
@@ -33,5 +34,6 @@ class AmplifyAnalyticsPinpoint extends AmplifyAnalyticsPinpointDart {
           pathProvider: FlutterPathProvider(),
           appLifecycleProvider: FlutterAppLifecycleProvider(),
           deviceContextInfoProvider: const FlutterDeviceContextInfoProvider(),
+          dbConnectFunction: db_common.connect,
         );
 }

packages/analytics/amplify_analytics_pinpoint/example/linux/flutter/generated_plugins.cmake

@@ -1,6 +1,6 @@
 name: amplify_analytics_pinpoint
 description: The Amplify Flutter Analytics category plugin using the AWS Pinpoint provider.
-version: 1.0.0-next.0+3
+version: 1.0.0-next.0
 homepage: https://docs.amplify.aws/lib/q/platform/flutter/
 repository: https://github.com/aws-amplify/amplify-flutter/tree/next/packages/analytics/amplify_analytics_pinpoint
 issue_tracker: https://github.com/aws-amplify/amplify-flutter/issues
@@ -9,26 +9,28 @@ environment:
   sdk: ">=2.17.0 <3.0.0"
   flutter: ">=3.0.0"
 
+# Helps `pana` since we do not use Flutter plugins for most platforms
+platforms:
+  ios:
+  android:
+  macos:
+  windows:
+  linux:
+  web:
+
 dependencies:
-  amplify_analytics_pinpoint_android: ">=1.0.0-next.0 <1.0.0-next.1"
-  amplify_analytics_pinpoint_ios: ">=1.0.0-next.0 <1.0.0-next.1"
-  amplify_core: ">=1.0.0-next.0+2 <1.0.0-next.1"
-  aws_common: ">=0.2.4 <0.3.0"
+  amplify_analytics_pinpoint_dart: ^0.1.0
+  amplify_core: ">=1.0.0-next.0+1 <1.0.0-next.1"
+  amplify_db_common: ^0.1.0
+  amplify_secure_storage: ^0.1.0
+  device_info_plus: ^6.0.0
   flutter:
     sdk: flutter
   meta: ^1.7.0
+  package_info_plus: ^2.0.0
+  path_provider: ^2.0.0
 
 dev_dependencies:
   amplify_lints: ^2.0.0
-  amplify_test:
-    path: ../../amplify_test
   flutter_test:
     sdk: flutter
-
-flutter:
-  plugin:
-    platforms:
-      # android:
-      #   default_package: amplify_analytics_pinpoint_android
-      ios:
-        default_package: amplify_analytics_pinpoint_ios

packages/analytics/amplify_analytics_pinpoint/example/macos/Flutter/GeneratedPluginRegistrant.swift

@@ -18,6 +18,7 @@ import 'package:amplify_analytics_pinpoint_dart/amplify_analytics_pinpoint_dart.
 import 'package:amplify_analytics_pinpoint_dart/src/impl/analytics_client/analytics_client.dart';
 import 'package:amplify_analytics_pinpoint_dart/src/sdk/pinpoint.dart';
 import 'package:amplify_core/amplify_core.dart';
+import 'package:amplify_db_common_dart/amplify_db_common_dart.dart';
 import 'package:amplify_secure_storage_dart/amplify_secure_storage_dart.dart';
 
 /// {@template amplify_analytics_pinpoint_dart.amplify_analytics_pinpoint_dart}
@@ -34,10 +35,12 @@ class AmplifyAnalyticsPinpointDart extends AnalyticsPluginInterface {
     CachedEventsPathProvider? pathProvider,
     AppLifecycleProvider? appLifecycleProvider,
     DeviceContextInfoProvider? deviceContextInfoProvider,
+    required Connect dbConnectFunction,
   })  : _keyValueStore = keyValueStore,
         _pathProvider = pathProvider,
         _appLifecycleProvider = appLifecycleProvider,
-        _deviceContextInfoProvider = deviceContextInfoProvider;
+        _deviceContextInfoProvider = deviceContextInfoProvider,
+        _dbConnectFunction = dbConnectFunction;
 
   AnalyticsClient? __analyticsClient;
   AnalyticsClient get _analyticsClient {
@@ -57,6 +60,7 @@ class AmplifyAnalyticsPinpointDart extends AnalyticsPluginInterface {
   final CachedEventsPathProvider? _pathProvider;
   final AppLifecycleProvider? _appLifecycleProvider;
   final DeviceContextInfoProvider? _deviceContextInfoProvider;
+  final Connect _dbConnectFunction;
 
   @override
   Future<void> configure({
@@ -101,12 +105,16 @@ class AmplifyAnalyticsPinpointDart extends AnalyticsPluginInterface {
         await _deviceContextInfoProvider?.getDeviceInfoDetails();
 
     final driftStoragePath = await _pathProvider?.getApplicationSupportPath();
+    final driftQueryExecutor = _dbConnectFunction(
+      name: 'analytics_cached_events',
+      path: driftStoragePath,
+    );
 
     __analyticsClient = await AnalyticsClient.getInstance(
       appId: appId,
       keyValueStore: keyValueStore,
       pinpointClient: pinpointClient,
-      driftStoragePath: driftStoragePath,
+      driftQueryExecutor: driftQueryExecutor,
       appLifecycleProvider: _appLifecycleProvider,
       deviceContextInfo: deviceContextInfo,
     );

packages/analytics/amplify_analytics_pinpoint/example/windows/flutter/generated_plugin_registrant.cc

@@ -23,6 +23,7 @@ import 'package:amplify_analytics_pinpoint_dart/src/impl/analytics_client/stoppa
 import 'package:amplify_analytics_pinpoint_dart/src/sdk/pinpoint.dart';
 import 'package:amplify_core/amplify_core.dart';
 import 'package:amplify_secure_storage_dart/amplify_secure_storage_dart.dart';
+import 'package:drift/drift.dart';
 import 'package:meta/meta.dart';
 
 /// {@template amplify_analytics_pinpoint_dart.analytics_client}
@@ -52,7 +53,7 @@ class AnalyticsClient {
     required String appId,
     required SecureStorageInterface keyValueStore,
     required PinpointClient pinpointClient,
-    String? driftStoragePath,
+    required QueryExecutor driftQueryExecutor,
     AppLifecycleProvider? appLifecycleProvider,
     DeviceContextInfo? deviceContextInfo,
   }) async {
@@ -79,7 +80,7 @@ class AnalyticsClient {
       fixedEndpointId: fixedEndpointId,
       endpointClient: endpointClient,
       pinpointClient: pinpointClient,
-      driftStoragePath: driftStoragePath,
+      driftQueryExecutor: driftQueryExecutor,
     );
 
     // Initialize SessionManager

packages/analytics/amplify_analytics_pinpoint/example/windows/flutter/generated_plugins.cmake

@@ -16,6 +16,7 @@ import 'package:amplify_analytics_pinpoint_dart/src/impl/analytics_client/endpoi
 import 'package:amplify_analytics_pinpoint_dart/src/impl/analytics_client/event_client/event_storage_adapter.dart';
 import 'package:amplify_analytics_pinpoint_dart/src/sdk/pinpoint.dart';
 import 'package:amplify_core/amplify_core.dart';
+import 'package:drift/drift.dart';
 import 'package:meta/meta.dart';
 import 'package:smithy/smithy.dart';
 import 'package:uuid/uuid.dart';
@@ -51,14 +52,14 @@ class EventClient {
     required String fixedEndpointId,
     required PinpointClient pinpointClient,
     required EndpointClient endpointClient,
-    String? driftStoragePath,
+    required QueryExecutor driftQueryExecutor,
   }) {
     return _instance ??= EventClient(
       appId: appId,
       fixedEndpointId: fixedEndpointId,
       pinpointClient: pinpointClient,
       endpointClient: endpointClient,
-      storageAdapter: EventStorageAdapter.getInstance(driftStoragePath),
+      storageAdapter: EventStorageAdapter.getInstance(driftQueryExecutor),
     );
   }
 
@@ -182,7 +183,7 @@ class EventClient {
     }
     // Always delete local store of events
     // Unless a retryable exception has been received (see above)
-     finally {
+    finally {
       await _storageAdapter.deleteEvents(eventIdsToDelete.values);
     }
   }