Merge pull request #1271 from givtnl/feature/kids-1699-pass-gameid-on…

…-donation Feature: pass gameid on donation part 2 (KIDS-1699)
givtnl · Nov 20, 2024 · b6637a4 · b6637a4
2 parents 9e46885 + 43bfce3
commit b6637a4
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 3 deletions.
diff --git a/lib/features/family/app/injection.dart b/lib/features/family/app/injection.dart
@@ -82,6 +82,7 @@ void initCubits() {
     ..registerLazySingleton<GiveCubit>(
       () => GiveCubit(
         getIt(),
+        getIt(),
       ),
     )
     ..registerLazySingleton<OrganisationBloc>(

diff --git a/lib/features/family/features/giving_flow/screens/choose_amount_slider_screen.dart b/lib/features/family/features/giving_flow/screens/choose_amount_slider_screen.dart
@@ -5,6 +5,7 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:givt_app/core/enums/enums.dart';
 import 'package:givt_app/features/family/app/family_pages.dart';
+import 'package:givt_app/features/family/app/injection.dart';
 import 'package:givt_app/features/family/extensions/extensions.dart';
 import 'package:givt_app/features/family/features/flows/cubit/flows_cubit.dart';
 import 'package:givt_app/features/family/features/giving_flow/collectgroup_details/cubit/collectgroup_details_cubit.dart';
@@ -14,6 +15,7 @@ import 'package:givt_app/features/family/features/giving_flow/create_transaction
 import 'package:givt_app/features/family/features/giving_flow/screens/success_screen.dart';
 import 'package:givt_app/features/family/features/giving_flow/widgets/slider_widget.dart';
 import 'package:givt_app/features/family/features/profiles/cubit/profiles_cubit.dart';
+import 'package:givt_app/features/family/features/reflect/domain/reflect_and_share_repository.dart';
 import 'package:givt_app/features/family/shared/design/components/components.dart';
 import 'package:givt_app/features/family/shared/design/illustrations/fun_give.dart';
 import 'package:givt_app/features/family/shared/design/illustrations/fun_icon.dart';
@@ -108,6 +110,7 @@ class ChooseAmountSliderScreen extends StatelessWidget {
                               mediumId: mediumId,
                               amount: state.amount,
                               isActOfService: isActOfService,
+                              gameGuid: isActOfService ? getIt<ReflectAndShareRepository>().getGameId() : null,
                             );
 
                             await context

diff --git a/lib/features/family/features/parent_giving_flow/cubit/give_cubit.dart b/lib/features/family/features/parent_giving_flow/cubit/give_cubit.dart
@@ -6,6 +6,7 @@ import 'package:givt_app/core/enums/amplitude_events.dart';
 import 'package:givt_app/core/logging/logging_service.dart';
 import 'package:givt_app/features/family/features/giving_flow/create_transaction/models/transaction.dart';
 import 'package:givt_app/features/family/features/giving_flow/create_transaction/repositories/create_transaction_repository.dart';
+import 'package:givt_app/features/family/features/reflect/domain/reflect_and_share_repository.dart';
 import 'package:givt_app/features/give/models/givt_transaction.dart';
 import 'package:givt_app/utils/analytics_helper.dart';
 
@@ -14,8 +15,10 @@ part 'give_state.dart';
 class GiveCubit extends Cubit<GiveState> {
   GiveCubit(
     this._createTransactionRepository,
+    this._reflectAndShareRepository,
   ) : super(GiveInitial());
   final CreateTransactionRepository _createTransactionRepository;
+  final ReflectAndShareRepository _reflectAndShareRepository;
 
   Future<void> createTransaction({
     required String userId,
@@ -30,6 +33,9 @@ class GiveCubit extends Cubit<GiveState> {
       amount: amount.toDouble(),
       mediumId: base64Encode(utf8.encode(mediumId)),
       isActOfService: isGratitude,
+      gameGuid: isGratitude
+          ? _reflectAndShareRepository.getGameId()
+          : null,
     );
     try {
       await _createTransactionRepository.createTransaction(

diff --git a/lib/features/family/features/reflect/domain/reflect_and_share_repository.dart b/lib/features/family/features/reflect/domain/reflect_and_share_repository.dart
@@ -35,10 +35,12 @@ class ReflectAndShareRepository {
   }
 
   String? getGameId() => _gameId;
+
   Future<void> createGameSession() async {
     try { 
       _gameId = await _familyApiService.createGame();
     } catch (e, s) {
+      _gameId = null;
       LoggingInfo.instance.error(
         e.toString(),
         methodName: s.toString(),

diff --git a/lib/features/family/network/family_api_service.dart b/lib/features/family/network/family_api_service.dart
@@ -344,7 +344,12 @@ class FamilyAPIService {
 
   Future<bool> updateGame(String gameGuid, Map<String, dynamic> body) async {
     final url = Uri.https(_apiURL, '/givtservice/v1/game/$gameGuid');
-    final response = await client.put(url, body: jsonEncode(body));
+    final response = await client.put(url,
+        headers: {
+          'Content-Type': 'application/json',
+          'Accept': 'application/json',
+        },
+        body: jsonEncode(body));
     if (response.statusCode >= 300) {
       throw GivtServerFailure(
         statusCode: response.statusCode,
@@ -357,8 +362,11 @@ class FamilyAPIService {
   }
 
   Future<String> createGame() async {
-    final url = Uri.https(_apiURL, '/givtservice/v1/game');
-    final response = await client.post(url);
+    final url = Uri.https(_apiURL, '/givtservice/v1/Game');
+    final response = await client.post(url, headers: {
+    'Content-Type': 'application/json',
+    'Accept': 'application/json',
+    }, body: jsonEncode({}));
     if (response.statusCode >= 300) {
       throw GivtServerFailure(
         statusCode: response.statusCode,