From f341102cf2d560e664aa58d4f8d5a22cdcde7e77 Mon Sep 17 00:00:00 2001 From: cp-mayank-v Date: Mon, 9 Sep 2024 17:33:51 +0530 Subject: [PATCH 1/8] Update all dates as timeStamp --- data/.flutter-plugins | 38 ++++---- data/.flutter-plugins-dependencies | 2 +- data/lib/api/ball_score/ball_score_model.dart | 19 +++- .../ball_score/ball_score_model.freezed.dart | 95 ++++++++++++------- .../api/ball_score/ball_score_model.g.dart | 21 +++- data/lib/api/match/match_model.dart | 4 +- data/lib/api/match/match_model.freezed.dart | 53 ++++++++--- data/lib/api/match/match_model.g.dart | 22 ++++- data/lib/api/support/support_models.dart | 5 +- .../api/support/support_models.freezed.dart | 76 ++++++++++----- data/lib/api/support/support_models.g.dart | 22 ++++- data/lib/api/team/team_model.dart | 2 + data/lib/api/team/team_model.freezed.dart | 27 +++++- data/lib/api/team/team_model.g.dart | 16 ++++ data/lib/api/user/user_models.dart | 4 + data/lib/api/user/user_models.freezed.dart | 52 +++++++++- data/lib/api/user/user_models.g.dart | 20 ++++ .../converter/timestamp_json_converter.dart | 21 ++++ data/lib/service/auth/auth_service.dart | 2 +- data/lib/service/match/match_service.dart | 4 +- data/lib/utils/dummy_deactivated_account.dart | 4 +- khelo/lib/components/match_detail_cell.dart | 3 +- khelo/lib/ui/flow/home/home_screen.dart | 3 +- .../add_match/add_match_view_model.dart | 4 +- .../components/user_detail_sheet.dart | 2 +- .../components/match_detail_info_view.dart | 4 +- .../match_detail_tab_view_model.dart | 8 +- .../score_board/score_board_view_model.dart | 49 ++++++---- .../edit_profile/edit_profile_view_model.dart | 29 +++--- .../support/contact_support_view_model.dart | 15 +-- .../team/add_team/add_team_view_model.dart | 20 ++-- .../flow/team/detail/team_detail_screen.dart | 4 +- .../component/user_detail_info_content.dart | 2 +- 33 files changed, 479 insertions(+), 173 deletions(-) create mode 100644 data/lib/converter/timestamp_json_converter.dart diff --git a/data/.flutter-plugins b/data/.flutter-plugins index cea14754..4d31de47 100644 --- a/data/.flutter-plugins +++ b/data/.flutter-plugins @@ -1,20 +1,20 @@ # This is a generated file; do not edit or check into version control. -cloud_firestore=/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/cloud_firestore-5.0.2/ -cloud_firestore_web=/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/cloud_firestore_web-4.0.2/ -device_info_plus=/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/device_info_plus-10.1.0/ -firebase_auth=/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/firebase_auth-5.1.1/ -firebase_auth_web=/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/firebase_auth_web-5.12.3/ -firebase_core=/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/firebase_core-3.1.1/ -firebase_core_web=/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/firebase_core_web-2.17.2/ -firebase_storage=/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/firebase_storage-12.1.0/ -firebase_storage_web=/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/firebase_storage_web-3.9.10/ -flutter_timezone=/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/flutter_timezone-2.0.1/ -package_info_plus=/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/package_info_plus-8.0.0/ -path_provider_linux=/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/path_provider_linux-2.2.1/ -path_provider_windows=/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/path_provider_windows-2.2.1/ -shared_preferences=/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/shared_preferences-2.2.3/ -shared_preferences_android=/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/shared_preferences_android-2.2.3/ -shared_preferences_foundation=/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/shared_preferences_foundation-2.4.0/ -shared_preferences_linux=/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/shared_preferences_linux-2.3.2/ -shared_preferences_web=/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/shared_preferences_web-2.3.0/ -shared_preferences_windows=/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/shared_preferences_windows-2.3.2/ +cloud_firestore=/home/mayank/.pub-cache/hosted/pub.dev/cloud_firestore-5.2.0/ +cloud_firestore_web=/home/mayank/.pub-cache/hosted/pub.dev/cloud_firestore_web-4.1.0/ +device_info_plus=/home/mayank/.pub-cache/hosted/pub.dev/device_info_plus-10.1.1/ +firebase_auth=/home/mayank/.pub-cache/hosted/pub.dev/firebase_auth-5.1.3/ +firebase_auth_web=/home/mayank/.pub-cache/hosted/pub.dev/firebase_auth_web-5.12.5/ +firebase_core=/home/mayank/.pub-cache/hosted/pub.dev/firebase_core-3.3.0/ +firebase_core_web=/home/mayank/.pub-cache/hosted/pub.dev/firebase_core_web-2.17.4/ +firebase_storage=/home/mayank/.pub-cache/hosted/pub.dev/firebase_storage-12.1.2/ +firebase_storage_web=/home/mayank/.pub-cache/hosted/pub.dev/firebase_storage_web-3.9.12/ +flutter_timezone=/home/mayank/.pub-cache/hosted/pub.dev/flutter_timezone-2.1.0/ +package_info_plus=/home/mayank/.pub-cache/hosted/pub.dev/package_info_plus-8.0.1/ +path_provider_linux=/home/mayank/.pub-cache/hosted/pub.dev/path_provider_linux-2.2.1/ +path_provider_windows=/home/mayank/.pub-cache/hosted/pub.dev/path_provider_windows-2.3.0/ +shared_preferences=/home/mayank/.pub-cache/hosted/pub.dev/shared_preferences-2.3.1/ +shared_preferences_android=/home/mayank/.pub-cache/hosted/pub.dev/shared_preferences_android-2.3.0/ +shared_preferences_foundation=/home/mayank/.pub-cache/hosted/pub.dev/shared_preferences_foundation-2.5.0/ +shared_preferences_linux=/home/mayank/.pub-cache/hosted/pub.dev/shared_preferences_linux-2.4.0/ +shared_preferences_web=/home/mayank/.pub-cache/hosted/pub.dev/shared_preferences_web-2.4.1/ +shared_preferences_windows=/home/mayank/.pub-cache/hosted/pub.dev/shared_preferences_windows-2.4.0/ diff --git a/data/.flutter-plugins-dependencies b/data/.flutter-plugins-dependencies index 95a23b01..44ea0b9c 100644 --- a/data/.flutter-plugins-dependencies +++ b/data/.flutter-plugins-dependencies @@ -1 +1 @@ -{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"cloud_firestore","path":"/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/cloud_firestore-5.0.2/","native_build":true,"dependencies":["firebase_core"]},{"name":"device_info_plus","path":"/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/device_info_plus-10.1.0/","native_build":true,"dependencies":[]},{"name":"firebase_auth","path":"/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/firebase_auth-5.1.1/","native_build":true,"dependencies":["firebase_core"]},{"name":"firebase_core","path":"/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/firebase_core-3.1.1/","native_build":true,"dependencies":[]},{"name":"firebase_storage","path":"/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/firebase_storage-12.1.0/","native_build":true,"dependencies":["firebase_core"]},{"name":"flutter_timezone","path":"/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/flutter_timezone-2.0.1/","native_build":true,"dependencies":[]},{"name":"package_info_plus","path":"/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/package_info_plus-8.0.0/","native_build":true,"dependencies":[]},{"name":"shared_preferences_foundation","path":"/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/shared_preferences_foundation-2.4.0/","shared_darwin_source":true,"native_build":true,"dependencies":[]}],"android":[{"name":"cloud_firestore","path":"/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/cloud_firestore-5.0.2/","native_build":true,"dependencies":["firebase_core"]},{"name":"device_info_plus","path":"/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/device_info_plus-10.1.0/","native_build":true,"dependencies":[]},{"name":"firebase_auth","path":"/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/firebase_auth-5.1.1/","native_build":true,"dependencies":["firebase_core"]},{"name":"firebase_core","path":"/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/firebase_core-3.1.1/","native_build":true,"dependencies":[]},{"name":"firebase_storage","path":"/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/firebase_storage-12.1.0/","native_build":true,"dependencies":["firebase_core"]},{"name":"flutter_timezone","path":"/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/flutter_timezone-2.0.1/","native_build":true,"dependencies":[]},{"name":"package_info_plus","path":"/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/package_info_plus-8.0.0/","native_build":true,"dependencies":[]},{"name":"shared_preferences_android","path":"/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/shared_preferences_android-2.2.3/","native_build":true,"dependencies":[]}],"macos":[{"name":"cloud_firestore","path":"/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/cloud_firestore-5.0.2/","native_build":true,"dependencies":["firebase_core"]},{"name":"device_info_plus","path":"/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/device_info_plus-10.1.0/","native_build":true,"dependencies":[]},{"name":"firebase_auth","path":"/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/firebase_auth-5.1.1/","native_build":true,"dependencies":["firebase_core"]},{"name":"firebase_core","path":"/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/firebase_core-3.1.1/","native_build":true,"dependencies":[]},{"name":"firebase_storage","path":"/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/firebase_storage-12.1.0/","native_build":true,"dependencies":["firebase_core"]},{"name":"flutter_timezone","path":"/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/flutter_timezone-2.0.1/","native_build":true,"dependencies":[]},{"name":"package_info_plus","path":"/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/package_info_plus-8.0.0/","native_build":true,"dependencies":[]},{"name":"shared_preferences_foundation","path":"/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/shared_preferences_foundation-2.4.0/","shared_darwin_source":true,"native_build":true,"dependencies":[]}],"linux":[{"name":"device_info_plus","path":"/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/device_info_plus-10.1.0/","native_build":false,"dependencies":[]},{"name":"package_info_plus","path":"/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/package_info_plus-8.0.0/","native_build":false,"dependencies":[]},{"name":"path_provider_linux","path":"/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/path_provider_linux-2.2.1/","native_build":false,"dependencies":[]},{"name":"shared_preferences_linux","path":"/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/shared_preferences_linux-2.3.2/","native_build":false,"dependencies":["path_provider_linux"]}],"windows":[{"name":"cloud_firestore","path":"/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/cloud_firestore-5.0.2/","native_build":true,"dependencies":["firebase_core"]},{"name":"device_info_plus","path":"/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/device_info_plus-10.1.0/","native_build":false,"dependencies":[]},{"name":"firebase_auth","path":"/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/firebase_auth-5.1.1/","native_build":true,"dependencies":["firebase_core"]},{"name":"firebase_core","path":"/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/firebase_core-3.1.1/","native_build":true,"dependencies":[]},{"name":"firebase_storage","path":"/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/firebase_storage-12.1.0/","native_build":true,"dependencies":["firebase_core"]},{"name":"package_info_plus","path":"/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/package_info_plus-8.0.0/","native_build":false,"dependencies":[]},{"name":"path_provider_windows","path":"/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/path_provider_windows-2.2.1/","native_build":false,"dependencies":[]},{"name":"shared_preferences_windows","path":"/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/shared_preferences_windows-2.3.2/","native_build":false,"dependencies":["path_provider_windows"]}],"web":[{"name":"cloud_firestore_web","path":"/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/cloud_firestore_web-4.0.2/","dependencies":["firebase_core_web"]},{"name":"device_info_plus","path":"/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/device_info_plus-10.1.0/","dependencies":[]},{"name":"firebase_auth_web","path":"/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/firebase_auth_web-5.12.3/","dependencies":["firebase_core_web"]},{"name":"firebase_core_web","path":"/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/firebase_core_web-2.17.2/","dependencies":[]},{"name":"firebase_storage_web","path":"/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/firebase_storage_web-3.9.10/","dependencies":["firebase_core_web"]},{"name":"flutter_timezone","path":"/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/flutter_timezone-2.0.1/","dependencies":[]},{"name":"package_info_plus","path":"/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/package_info_plus-8.0.0/","dependencies":[]},{"name":"shared_preferences_web","path":"/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/shared_preferences_web-2.3.0/","dependencies":[]}]},"dependencyGraph":[{"name":"cloud_firestore","dependencies":["cloud_firestore_web","firebase_core"]},{"name":"cloud_firestore_web","dependencies":["firebase_core","firebase_core_web"]},{"name":"device_info_plus","dependencies":[]},{"name":"firebase_auth","dependencies":["firebase_auth_web","firebase_core"]},{"name":"firebase_auth_web","dependencies":["firebase_core","firebase_core_web"]},{"name":"firebase_core","dependencies":["firebase_core_web"]},{"name":"firebase_core_web","dependencies":[]},{"name":"firebase_storage","dependencies":["firebase_core","firebase_storage_web"]},{"name":"firebase_storage_web","dependencies":["firebase_core","firebase_core_web"]},{"name":"flutter_timezone","dependencies":[]},{"name":"package_info_plus","dependencies":[]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_windows","dependencies":[]},{"name":"shared_preferences","dependencies":["shared_preferences_android","shared_preferences_foundation","shared_preferences_linux","shared_preferences_web","shared_preferences_windows"]},{"name":"shared_preferences_android","dependencies":[]},{"name":"shared_preferences_foundation","dependencies":[]},{"name":"shared_preferences_linux","dependencies":["path_provider_linux"]},{"name":"shared_preferences_web","dependencies":[]},{"name":"shared_preferences_windows","dependencies":["path_provider_windows"]}],"date_created":"2024-09-05 14:43:10.183606","version":"3.24.1","swift_package_manager_enabled":false} \ No newline at end of file +{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"cloud_firestore","path":"/home/mayank/.pub-cache/hosted/pub.dev/cloud_firestore-5.2.0/","native_build":true,"dependencies":["firebase_core"]},{"name":"device_info_plus","path":"/home/mayank/.pub-cache/hosted/pub.dev/device_info_plus-10.1.1/","native_build":true,"dependencies":[]},{"name":"firebase_auth","path":"/home/mayank/.pub-cache/hosted/pub.dev/firebase_auth-5.1.3/","native_build":true,"dependencies":["firebase_core"]},{"name":"firebase_core","path":"/home/mayank/.pub-cache/hosted/pub.dev/firebase_core-3.3.0/","native_build":true,"dependencies":[]},{"name":"firebase_storage","path":"/home/mayank/.pub-cache/hosted/pub.dev/firebase_storage-12.1.2/","native_build":true,"dependencies":["firebase_core"]},{"name":"flutter_timezone","path":"/home/mayank/.pub-cache/hosted/pub.dev/flutter_timezone-2.1.0/","native_build":true,"dependencies":[]},{"name":"package_info_plus","path":"/home/mayank/.pub-cache/hosted/pub.dev/package_info_plus-8.0.1/","native_build":true,"dependencies":[]},{"name":"shared_preferences_foundation","path":"/home/mayank/.pub-cache/hosted/pub.dev/shared_preferences_foundation-2.5.0/","shared_darwin_source":true,"native_build":true,"dependencies":[]}],"android":[{"name":"cloud_firestore","path":"/home/mayank/.pub-cache/hosted/pub.dev/cloud_firestore-5.2.0/","native_build":true,"dependencies":["firebase_core"]},{"name":"device_info_plus","path":"/home/mayank/.pub-cache/hosted/pub.dev/device_info_plus-10.1.1/","native_build":true,"dependencies":[]},{"name":"firebase_auth","path":"/home/mayank/.pub-cache/hosted/pub.dev/firebase_auth-5.1.3/","native_build":true,"dependencies":["firebase_core"]},{"name":"firebase_core","path":"/home/mayank/.pub-cache/hosted/pub.dev/firebase_core-3.3.0/","native_build":true,"dependencies":[]},{"name":"firebase_storage","path":"/home/mayank/.pub-cache/hosted/pub.dev/firebase_storage-12.1.2/","native_build":true,"dependencies":["firebase_core"]},{"name":"flutter_timezone","path":"/home/mayank/.pub-cache/hosted/pub.dev/flutter_timezone-2.1.0/","native_build":true,"dependencies":[]},{"name":"package_info_plus","path":"/home/mayank/.pub-cache/hosted/pub.dev/package_info_plus-8.0.1/","native_build":true,"dependencies":[]},{"name":"shared_preferences_android","path":"/home/mayank/.pub-cache/hosted/pub.dev/shared_preferences_android-2.3.0/","native_build":true,"dependencies":[]}],"macos":[{"name":"cloud_firestore","path":"/home/mayank/.pub-cache/hosted/pub.dev/cloud_firestore-5.2.0/","native_build":true,"dependencies":["firebase_core"]},{"name":"device_info_plus","path":"/home/mayank/.pub-cache/hosted/pub.dev/device_info_plus-10.1.1/","native_build":true,"dependencies":[]},{"name":"firebase_auth","path":"/home/mayank/.pub-cache/hosted/pub.dev/firebase_auth-5.1.3/","native_build":true,"dependencies":["firebase_core"]},{"name":"firebase_core","path":"/home/mayank/.pub-cache/hosted/pub.dev/firebase_core-3.3.0/","native_build":true,"dependencies":[]},{"name":"firebase_storage","path":"/home/mayank/.pub-cache/hosted/pub.dev/firebase_storage-12.1.2/","native_build":true,"dependencies":["firebase_core"]},{"name":"flutter_timezone","path":"/home/mayank/.pub-cache/hosted/pub.dev/flutter_timezone-2.1.0/","native_build":true,"dependencies":[]},{"name":"package_info_plus","path":"/home/mayank/.pub-cache/hosted/pub.dev/package_info_plus-8.0.1/","native_build":true,"dependencies":[]},{"name":"shared_preferences_foundation","path":"/home/mayank/.pub-cache/hosted/pub.dev/shared_preferences_foundation-2.5.0/","shared_darwin_source":true,"native_build":true,"dependencies":[]}],"linux":[{"name":"device_info_plus","path":"/home/mayank/.pub-cache/hosted/pub.dev/device_info_plus-10.1.1/","native_build":false,"dependencies":[]},{"name":"package_info_plus","path":"/home/mayank/.pub-cache/hosted/pub.dev/package_info_plus-8.0.1/","native_build":false,"dependencies":[]},{"name":"path_provider_linux","path":"/home/mayank/.pub-cache/hosted/pub.dev/path_provider_linux-2.2.1/","native_build":false,"dependencies":[]},{"name":"shared_preferences_linux","path":"/home/mayank/.pub-cache/hosted/pub.dev/shared_preferences_linux-2.4.0/","native_build":false,"dependencies":["path_provider_linux"]}],"windows":[{"name":"cloud_firestore","path":"/home/mayank/.pub-cache/hosted/pub.dev/cloud_firestore-5.2.0/","native_build":true,"dependencies":["firebase_core"]},{"name":"device_info_plus","path":"/home/mayank/.pub-cache/hosted/pub.dev/device_info_plus-10.1.1/","native_build":false,"dependencies":[]},{"name":"firebase_auth","path":"/home/mayank/.pub-cache/hosted/pub.dev/firebase_auth-5.1.3/","native_build":true,"dependencies":["firebase_core"]},{"name":"firebase_core","path":"/home/mayank/.pub-cache/hosted/pub.dev/firebase_core-3.3.0/","native_build":true,"dependencies":[]},{"name":"firebase_storage","path":"/home/mayank/.pub-cache/hosted/pub.dev/firebase_storage-12.1.2/","native_build":true,"dependencies":["firebase_core"]},{"name":"flutter_timezone","path":"/home/mayank/.pub-cache/hosted/pub.dev/flutter_timezone-2.1.0/","native_build":true,"dependencies":[]},{"name":"package_info_plus","path":"/home/mayank/.pub-cache/hosted/pub.dev/package_info_plus-8.0.1/","native_build":false,"dependencies":[]},{"name":"path_provider_windows","path":"/home/mayank/.pub-cache/hosted/pub.dev/path_provider_windows-2.3.0/","native_build":false,"dependencies":[]},{"name":"shared_preferences_windows","path":"/home/mayank/.pub-cache/hosted/pub.dev/shared_preferences_windows-2.4.0/","native_build":false,"dependencies":["path_provider_windows"]}],"web":[{"name":"cloud_firestore_web","path":"/home/mayank/.pub-cache/hosted/pub.dev/cloud_firestore_web-4.1.0/","dependencies":["firebase_core_web"]},{"name":"device_info_plus","path":"/home/mayank/.pub-cache/hosted/pub.dev/device_info_plus-10.1.1/","dependencies":[]},{"name":"firebase_auth_web","path":"/home/mayank/.pub-cache/hosted/pub.dev/firebase_auth_web-5.12.5/","dependencies":["firebase_core_web"]},{"name":"firebase_core_web","path":"/home/mayank/.pub-cache/hosted/pub.dev/firebase_core_web-2.17.4/","dependencies":[]},{"name":"firebase_storage_web","path":"/home/mayank/.pub-cache/hosted/pub.dev/firebase_storage_web-3.9.12/","dependencies":["firebase_core_web"]},{"name":"flutter_timezone","path":"/home/mayank/.pub-cache/hosted/pub.dev/flutter_timezone-2.1.0/","dependencies":[]},{"name":"package_info_plus","path":"/home/mayank/.pub-cache/hosted/pub.dev/package_info_plus-8.0.1/","dependencies":[]},{"name":"shared_preferences_web","path":"/home/mayank/.pub-cache/hosted/pub.dev/shared_preferences_web-2.4.1/","dependencies":[]}]},"dependencyGraph":[{"name":"cloud_firestore","dependencies":["cloud_firestore_web","firebase_core"]},{"name":"cloud_firestore_web","dependencies":["firebase_core","firebase_core_web"]},{"name":"device_info_plus","dependencies":[]},{"name":"firebase_auth","dependencies":["firebase_auth_web","firebase_core"]},{"name":"firebase_auth_web","dependencies":["firebase_core","firebase_core_web"]},{"name":"firebase_core","dependencies":["firebase_core_web"]},{"name":"firebase_core_web","dependencies":[]},{"name":"firebase_storage","dependencies":["firebase_core","firebase_storage_web"]},{"name":"firebase_storage_web","dependencies":["firebase_core","firebase_core_web"]},{"name":"flutter_timezone","dependencies":[]},{"name":"package_info_plus","dependencies":[]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_windows","dependencies":[]},{"name":"shared_preferences","dependencies":["shared_preferences_android","shared_preferences_foundation","shared_preferences_linux","shared_preferences_web","shared_preferences_windows"]},{"name":"shared_preferences_android","dependencies":[]},{"name":"shared_preferences_foundation","dependencies":[]},{"name":"shared_preferences_linux","dependencies":["path_provider_linux"]},{"name":"shared_preferences_web","dependencies":[]},{"name":"shared_preferences_windows","dependencies":["path_provider_windows"]}],"date_created":"2024-09-09 17:29:27.648694","version":"3.24.1","swift_package_manager_enabled":false} \ No newline at end of file diff --git a/data/lib/api/ball_score/ball_score_model.dart b/data/lib/api/ball_score/ball_score_model.dart index fe0fc69d..0aa2dcd0 100644 --- a/data/lib/api/ball_score/ball_score_model.dart +++ b/data/lib/api/ball_score/ball_score_model.dart @@ -2,6 +2,7 @@ import "package:collection/collection.dart"; import 'package:cloud_firestore/cloud_firestore.dart'; +import '../../converter/timestamp_json_converter.dart'; import '../user/user_models.dart'; import '../../extensions/double_extensions.dart'; import '../../extensions/int_extensions.dart'; @@ -31,7 +32,8 @@ class BallScoreModel with _$BallScoreModel { String? wicket_taker_id, required bool is_four, required bool is_six, - required DateTime time, + DateTime? time, + @TimeStampJsonConverter() DateTime? time2, }) = _BallScoreModel; factory BallScoreModel.fromJson(Map json) => @@ -317,7 +319,8 @@ extension OverSummaryMetaData on OverSummary { : 0), ); - DateTime get time => balls.lastOrNull?.time ?? DateTime.now(); + DateTime get time => + balls.lastOrNull?.time2 ?? balls.lastOrNull?.time ?? DateTime.now(); BowlerSummary get bowlerStatAtStart { final runsInOver = balls @@ -376,7 +379,11 @@ extension OverSummaryMetaData on OverSummary { final extraSummaryDetail = extrasSummary.addExtra(ball); final ballScores = [...balls, ball].toList(); - ballScores.sort((a, b) => a.time.compareTo(b.time)); + ballScores.sort( + (a, b) => + (a.time2 ?? a.time)?.compareTo(b.time2 ?? b.time ?? DateTime.now()) ?? + 0, + ); final configuredStriker = striker.addBall( ball, @@ -429,7 +436,11 @@ extension OverSummaryMetaData on OverSummary { final ballScores = balls.toList(); ballScores.removeWhere((element) => element.id == ball.id); - ballScores.sort((a, b) => a.time.compareTo(b.time)); + ballScores.sort( + (a, b) => + (a.time2 ?? a.time)?.compareTo(b.time2 ?? b.time ?? DateTime.now()) ?? + 0, + ); final configuredStriker = striker.removeBall(ball); final configuredNonStriker = nonStriker.removeBall(ball); diff --git a/data/lib/api/ball_score/ball_score_model.freezed.dart b/data/lib/api/ball_score/ball_score_model.freezed.dart index 589e94f3..8235013e 100644 --- a/data/lib/api/ball_score/ball_score_model.freezed.dart +++ b/data/lib/api/ball_score/ball_score_model.freezed.dart @@ -38,7 +38,9 @@ mixin _$BallScoreModel { String? get wicket_taker_id => throw _privateConstructorUsedError; bool get is_four => throw _privateConstructorUsedError; bool get is_six => throw _privateConstructorUsedError; - DateTime get time => throw _privateConstructorUsedError; + DateTime? get time => throw _privateConstructorUsedError; + @TimeStampJsonConverter() + DateTime? get time2 => throw _privateConstructorUsedError; Map toJson() => throw _privateConstructorUsedError; @JsonKey(ignore: true) @@ -70,7 +72,8 @@ abstract class $BallScoreModelCopyWith<$Res> { String? wicket_taker_id, bool is_four, bool is_six, - DateTime time}); + DateTime? time, + @TimeStampJsonConverter() DateTime? time2}); } /// @nodoc @@ -103,7 +106,8 @@ class _$BallScoreModelCopyWithImpl<$Res, $Val extends BallScoreModel> Object? wicket_taker_id = freezed, Object? is_four = null, Object? is_six = null, - Object? time = null, + Object? time = freezed, + Object? time2 = freezed, }) { return _then(_value.copyWith( id: null == id @@ -174,10 +178,14 @@ class _$BallScoreModelCopyWithImpl<$Res, $Val extends BallScoreModel> ? _value.is_six : is_six // ignore: cast_nullable_to_non_nullable as bool, - time: null == time + time: freezed == time ? _value.time : time // ignore: cast_nullable_to_non_nullable - as DateTime, + as DateTime?, + time2: freezed == time2 + ? _value.time2 + : time2 // ignore: cast_nullable_to_non_nullable + as DateTime?, ) as $Val); } } @@ -208,7 +216,8 @@ abstract class _$$BallScoreModelImplCopyWith<$Res> String? wicket_taker_id, bool is_four, bool is_six, - DateTime time}); + DateTime? time, + @TimeStampJsonConverter() DateTime? time2}); } /// @nodoc @@ -239,7 +248,8 @@ class __$$BallScoreModelImplCopyWithImpl<$Res> Object? wicket_taker_id = freezed, Object? is_four = null, Object? is_six = null, - Object? time = null, + Object? time = freezed, + Object? time2 = freezed, }) { return _then(_$BallScoreModelImpl( id: null == id @@ -310,10 +320,14 @@ class __$$BallScoreModelImplCopyWithImpl<$Res> ? _value.is_six : is_six // ignore: cast_nullable_to_non_nullable as bool, - time: null == time + time: freezed == time ? _value.time : time // ignore: cast_nullable_to_non_nullable - as DateTime, + as DateTime?, + time2: freezed == time2 + ? _value.time2 + : time2 // ignore: cast_nullable_to_non_nullable + as DateTime?, )); } } @@ -339,7 +353,8 @@ class _$BallScoreModelImpl implements _BallScoreModel { this.wicket_taker_id, required this.is_four, required this.is_six, - required this.time}); + this.time, + @TimeStampJsonConverter() this.time2}); factory _$BallScoreModelImpl.fromJson(Map json) => _$$BallScoreModelImplFromJson(json); @@ -379,11 +394,14 @@ class _$BallScoreModelImpl implements _BallScoreModel { @override final bool is_six; @override - final DateTime time; + final DateTime? time; + @override + @TimeStampJsonConverter() + final DateTime? time2; @override String toString() { - return 'BallScoreModel(id: $id, inning_id: $inning_id, match_id: $match_id, over_number: $over_number, ball_number: $ball_number, bowler_id: $bowler_id, batsman_id: $batsman_id, non_striker_id: $non_striker_id, runs_scored: $runs_scored, extras_type: $extras_type, extras_awarded: $extras_awarded, wicket_type: $wicket_type, fielding_position: $fielding_position, player_out_id: $player_out_id, wicket_taker_id: $wicket_taker_id, is_four: $is_four, is_six: $is_six, time: $time)'; + return 'BallScoreModel(id: $id, inning_id: $inning_id, match_id: $match_id, over_number: $over_number, ball_number: $ball_number, bowler_id: $bowler_id, batsman_id: $batsman_id, non_striker_id: $non_striker_id, runs_scored: $runs_scored, extras_type: $extras_type, extras_awarded: $extras_awarded, wicket_type: $wicket_type, fielding_position: $fielding_position, player_out_id: $player_out_id, wicket_taker_id: $wicket_taker_id, is_four: $is_four, is_six: $is_six, time: $time, time2: $time2)'; } @override @@ -422,31 +440,34 @@ class _$BallScoreModelImpl implements _BallScoreModel { other.wicket_taker_id == wicket_taker_id) && (identical(other.is_four, is_four) || other.is_four == is_four) && (identical(other.is_six, is_six) || other.is_six == is_six) && - (identical(other.time, time) || other.time == time)); + (identical(other.time, time) || other.time == time) && + (identical(other.time2, time2) || other.time2 == time2)); } @JsonKey(ignore: true) @override - int get hashCode => Object.hash( - runtimeType, - id, - inning_id, - match_id, - over_number, - ball_number, - bowler_id, - batsman_id, - non_striker_id, - runs_scored, - extras_type, - extras_awarded, - wicket_type, - fielding_position, - player_out_id, - wicket_taker_id, - is_four, - is_six, - time); + int get hashCode => Object.hashAll([ + runtimeType, + id, + inning_id, + match_id, + over_number, + ball_number, + bowler_id, + batsman_id, + non_striker_id, + runs_scored, + extras_type, + extras_awarded, + wicket_type, + fielding_position, + player_out_id, + wicket_taker_id, + is_four, + is_six, + time, + time2 + ]); @JsonKey(ignore: true) @override @@ -482,7 +503,8 @@ abstract class _BallScoreModel implements BallScoreModel { final String? wicket_taker_id, required final bool is_four, required final bool is_six, - required final DateTime time}) = _$BallScoreModelImpl; + final DateTime? time, + @TimeStampJsonConverter() final DateTime? time2}) = _$BallScoreModelImpl; factory _BallScoreModel.fromJson(Map json) = _$BallScoreModelImpl.fromJson; @@ -522,7 +544,10 @@ abstract class _BallScoreModel implements BallScoreModel { @override bool get is_six; @override - DateTime get time; + DateTime? get time; + @override + @TimeStampJsonConverter() + DateTime? get time2; @override @JsonKey(ignore: true) _$$BallScoreModelImplCopyWith<_$BallScoreModelImpl> get copyWith => diff --git a/data/lib/api/ball_score/ball_score_model.g.dart b/data/lib/api/ball_score/ball_score_model.g.dart index c7e8933f..37553b42 100644 --- a/data/lib/api/ball_score/ball_score_model.g.dart +++ b/data/lib/api/ball_score/ball_score_model.g.dart @@ -28,7 +28,10 @@ _$BallScoreModelImpl _$$BallScoreModelImplFromJson(Map json) => wicket_taker_id: json['wicket_taker_id'] as String?, is_four: json['is_four'] as bool, is_six: json['is_six'] as bool, - time: DateTime.parse(json['time'] as String), + time: + json['time'] == null ? null : DateTime.parse(json['time'] as String), + time2: _$JsonConverterFromJson( + json['time2'], const TimeStampJsonConverter().fromJson), ); Map _$$BallScoreModelImplToJson( @@ -52,7 +55,9 @@ Map _$$BallScoreModelImplToJson( 'wicket_taker_id': instance.wicket_taker_id, 'is_four': instance.is_four, 'is_six': instance.is_six, - 'time': instance.time.toIso8601String(), + 'time': instance.time?.toIso8601String(), + 'time2': _$JsonConverterToJson( + instance.time2, const TimeStampJsonConverter().toJson), }; const _$ExtrasTypeEnumMap = { @@ -91,6 +96,18 @@ const _$FieldingPositionTypeEnumMap = { FieldingPositionType.deepSquareLeg: 8, }; +Value? _$JsonConverterFromJson( + Object? json, + Value? Function(Json json) fromJson, +) => + json == null ? null : fromJson(json as Json); + +Json? _$JsonConverterToJson( + Value? value, + Json? Function(Value value) toJson, +) => + value == null ? null : toJson(value); + _$OverStatModelImpl _$$OverStatModelImplFromJson(Map json) => _$OverStatModelImpl( run: (json['run'] as num?)?.toInt() ?? 0, diff --git a/data/lib/api/match/match_model.dart b/data/lib/api/match/match_model.dart index d7236d82..deaabf78 100644 --- a/data/lib/api/match/match_model.dart +++ b/data/lib/api/match/match_model.dart @@ -1,6 +1,7 @@ // ignore_for_file: non_constant_identifier_names import 'package:cloud_firestore/cloud_firestore.dart'; +import '../../converter/timestamp_json_converter.dart'; import '../../extensions/double_extensions.dart'; import '../team/team_model.dart'; import '../user/user_models.dart'; @@ -27,7 +28,8 @@ class MatchModel with _$MatchModel { @Default([]) List power_play_overs3, required String city, required String ground, - required DateTime start_time, + DateTime? start_time, + @TimeStampJsonConverter() DateTime? start_time2, required BallType ball_type, required PitchType pitch_type, required String created_by, diff --git a/data/lib/api/match/match_model.freezed.dart b/data/lib/api/match/match_model.freezed.dart index ee37b368..adf0e31c 100644 --- a/data/lib/api/match/match_model.freezed.dart +++ b/data/lib/api/match/match_model.freezed.dart @@ -33,7 +33,9 @@ mixin _$MatchModel { List get power_play_overs3 => throw _privateConstructorUsedError; String get city => throw _privateConstructorUsedError; String get ground => throw _privateConstructorUsedError; - DateTime get start_time => throw _privateConstructorUsedError; + DateTime? get start_time => throw _privateConstructorUsedError; + @TimeStampJsonConverter() + DateTime? get start_time2 => throw _privateConstructorUsedError; BallType get ball_type => throw _privateConstructorUsedError; PitchType get pitch_type => throw _privateConstructorUsedError; String get created_by => throw _privateConstructorUsedError; @@ -81,7 +83,8 @@ abstract class $MatchModelCopyWith<$Res> { List power_play_overs3, String city, String ground, - DateTime start_time, + DateTime? start_time, + @TimeStampJsonConverter() DateTime? start_time2, BallType ball_type, PitchType pitch_type, String created_by, @@ -132,7 +135,8 @@ class _$MatchModelCopyWithImpl<$Res, $Val extends MatchModel> Object? power_play_overs3 = null, Object? city = null, Object? ground = null, - Object? start_time = null, + Object? start_time = freezed, + Object? start_time2 = freezed, Object? ball_type = null, Object? pitch_type = null, Object? created_by = null, @@ -203,10 +207,14 @@ class _$MatchModelCopyWithImpl<$Res, $Val extends MatchModel> ? _value.ground : ground // ignore: cast_nullable_to_non_nullable as String, - start_time: null == start_time + start_time: freezed == start_time ? _value.start_time : start_time // ignore: cast_nullable_to_non_nullable - as DateTime, + as DateTime?, + start_time2: freezed == start_time2 + ? _value.start_time2 + : start_time2 // ignore: cast_nullable_to_non_nullable + as DateTime?, ball_type: null == ball_type ? _value.ball_type : ball_type // ignore: cast_nullable_to_non_nullable @@ -321,7 +329,8 @@ abstract class _$$MatchModelImplCopyWith<$Res> List power_play_overs3, String city, String ground, - DateTime start_time, + DateTime? start_time, + @TimeStampJsonConverter() DateTime? start_time2, BallType ball_type, PitchType pitch_type, String created_by, @@ -372,7 +381,8 @@ class __$$MatchModelImplCopyWithImpl<$Res> Object? power_play_overs3 = null, Object? city = null, Object? ground = null, - Object? start_time = null, + Object? start_time = freezed, + Object? start_time2 = freezed, Object? ball_type = null, Object? pitch_type = null, Object? created_by = null, @@ -443,10 +453,14 @@ class __$$MatchModelImplCopyWithImpl<$Res> ? _value.ground : ground // ignore: cast_nullable_to_non_nullable as String, - start_time: null == start_time + start_time: freezed == start_time ? _value.start_time : start_time // ignore: cast_nullable_to_non_nullable - as DateTime, + as DateTime?, + start_time2: freezed == start_time2 + ? _value.start_time2 + : start_time2 // ignore: cast_nullable_to_non_nullable + as DateTime?, ball_type: null == ball_type ? _value.ball_type : ball_type // ignore: cast_nullable_to_non_nullable @@ -533,7 +547,8 @@ class _$MatchModelImpl implements _MatchModel { final List power_play_overs3 = const [], required this.city, required this.ground, - required this.start_time, + this.start_time, + @TimeStampJsonConverter() this.start_time2, required this.ball_type, required this.pitch_type, required this.created_by, @@ -649,7 +664,10 @@ class _$MatchModelImpl implements _MatchModel { @override final String ground; @override - final DateTime start_time; + final DateTime? start_time; + @override + @TimeStampJsonConverter() + final DateTime? start_time2; @override final BallType ball_type; @override @@ -737,7 +755,7 @@ class _$MatchModelImpl implements _MatchModel { @override String toString() { - return 'MatchModel(id: $id, teams: $teams, match_type: $match_type, number_of_over: $number_of_over, over_per_bowler: $over_per_bowler, players: $players, team_ids: $team_ids, team_creator_ids: $team_creator_ids, power_play_overs1: $power_play_overs1, power_play_overs2: $power_play_overs2, power_play_overs3: $power_play_overs3, city: $city, ground: $ground, start_time: $start_time, ball_type: $ball_type, pitch_type: $pitch_type, created_by: $created_by, umpires: $umpires, scorers: $scorers, commentators: $commentators, referee: $referee, umpire_ids: $umpire_ids, scorer_ids: $scorer_ids, commentator_ids: $commentator_ids, referee_id: $referee_id, match_status: $match_status, toss_decision: $toss_decision, toss_winner_id: $toss_winner_id, current_playing_team_id: $current_playing_team_id, revised_target: $revised_target)'; + return 'MatchModel(id: $id, teams: $teams, match_type: $match_type, number_of_over: $number_of_over, over_per_bowler: $over_per_bowler, players: $players, team_ids: $team_ids, team_creator_ids: $team_creator_ids, power_play_overs1: $power_play_overs1, power_play_overs2: $power_play_overs2, power_play_overs3: $power_play_overs3, city: $city, ground: $ground, start_time: $start_time, start_time2: $start_time2, ball_type: $ball_type, pitch_type: $pitch_type, created_by: $created_by, umpires: $umpires, scorers: $scorers, commentators: $commentators, referee: $referee, umpire_ids: $umpire_ids, scorer_ids: $scorer_ids, commentator_ids: $commentator_ids, referee_id: $referee_id, match_status: $match_status, toss_decision: $toss_decision, toss_winner_id: $toss_winner_id, current_playing_team_id: $current_playing_team_id, revised_target: $revised_target)'; } @override @@ -767,6 +785,8 @@ class _$MatchModelImpl implements _MatchModel { (identical(other.ground, ground) || other.ground == ground) && (identical(other.start_time, start_time) || other.start_time == start_time) && + (identical(other.start_time2, start_time2) || + other.start_time2 == start_time2) && (identical(other.ball_type, ball_type) || other.ball_type == ball_type) && (identical(other.pitch_type, pitch_type) || @@ -817,6 +837,7 @@ class _$MatchModelImpl implements _MatchModel { city, ground, start_time, + start_time2, ball_type, pitch_type, created_by, @@ -864,7 +885,8 @@ abstract class _MatchModel implements MatchModel { final List power_play_overs3, required final String city, required final String ground, - required final DateTime start_time, + final DateTime? start_time, + @TimeStampJsonConverter() final DateTime? start_time2, required final BallType ball_type, required final PitchType pitch_type, required final String created_by, @@ -916,7 +938,10 @@ abstract class _MatchModel implements MatchModel { @override String get ground; @override - DateTime get start_time; + DateTime? get start_time; + @override + @TimeStampJsonConverter() + DateTime? get start_time2; @override BallType get ball_type; @override diff --git a/data/lib/api/match/match_model.g.dart b/data/lib/api/match/match_model.g.dart index 64d5cd34..0e811862 100644 --- a/data/lib/api/match/match_model.g.dart +++ b/data/lib/api/match/match_model.g.dart @@ -41,7 +41,11 @@ _$MatchModelImpl _$$MatchModelImplFromJson(Map json) => _$MatchModelImpl( const [], city: json['city'] as String, ground: json['ground'] as String, - start_time: DateTime.parse(json['start_time'] as String), + start_time: json['start_time'] == null + ? null + : DateTime.parse(json['start_time'] as String), + start_time2: _$JsonConverterFromJson( + json['start_time2'], const TimeStampJsonConverter().fromJson), ball_type: $enumDecode(_$BallTypeEnumMap, json['ball_type']), pitch_type: $enumDecode(_$PitchTypeEnumMap, json['pitch_type']), created_by: json['created_by'] as String, @@ -81,7 +85,9 @@ Map _$$MatchModelImplToJson(_$MatchModelImpl instance) => 'power_play_overs3': instance.power_play_overs3, 'city': instance.city, 'ground': instance.ground, - 'start_time': instance.start_time.toIso8601String(), + 'start_time': instance.start_time?.toIso8601String(), + 'start_time2': _$JsonConverterToJson( + instance.start_time2, const TimeStampJsonConverter().toJson), 'ball_type': _$BallTypeEnumMap[instance.ball_type]!, 'pitch_type': _$PitchTypeEnumMap[instance.pitch_type]!, 'created_by': instance.created_by, @@ -104,6 +110,12 @@ const _$MatchTypeEnumMap = { MatchType.boxCricket: 5, }; +Value? _$JsonConverterFromJson( + Object? json, + Value? Function(Json json) fromJson, +) => + json == null ? null : fromJson(json as Json); + const _$BallTypeEnumMap = { BallType.leather: 1, BallType.tennis: 2, @@ -130,6 +142,12 @@ const _$TossDecisionEnumMap = { TossDecision.bowl: 2, }; +Json? _$JsonConverterToJson( + Value? value, + Json? Function(Value value) toJson, +) => + value == null ? null : toJson(value); + _$MatchTeamModelImpl _$$MatchTeamModelImplFromJson(Map json) => _$MatchTeamModelImpl( team_id: json['team_id'] as String, diff --git a/data/lib/api/support/support_models.dart b/data/lib/api/support/support_models.dart index fe27bc42..ff408654 100644 --- a/data/lib/api/support/support_models.dart +++ b/data/lib/api/support/support_models.dart @@ -1,6 +1,8 @@ import 'package:cloud_firestore/cloud_firestore.dart'; import 'package:freezed_annotation/freezed_annotation.dart'; +import '../../converter/timestamp_json_converter.dart'; + part 'support_models.freezed.dart'; part 'support_models.g.dart'; @@ -13,7 +15,8 @@ class AddSupportCaseRequest with _$AddSupportCaseRequest { String? description, @Default([]) List attachmentUrls, required String userId, - required DateTime createdAt, + DateTime? createdAt, + @TimeStampJsonConverter() DateTime? createdAt2, }) = _AddSupportCaseRequest; factory AddSupportCaseRequest.fromJson(Map json) => diff --git a/data/lib/api/support/support_models.freezed.dart b/data/lib/api/support/support_models.freezed.dart index f0886917..af0c3653 100644 --- a/data/lib/api/support/support_models.freezed.dart +++ b/data/lib/api/support/support_models.freezed.dart @@ -26,7 +26,9 @@ mixin _$AddSupportCaseRequest { String? get description => throw _privateConstructorUsedError; List get attachmentUrls => throw _privateConstructorUsedError; String get userId => throw _privateConstructorUsedError; - DateTime get createdAt => throw _privateConstructorUsedError; + DateTime? get createdAt => throw _privateConstructorUsedError; + @TimeStampJsonConverter() + DateTime? get createdAt2 => throw _privateConstructorUsedError; Map toJson() => throw _privateConstructorUsedError; @JsonKey(ignore: true) @@ -46,7 +48,8 @@ abstract class $AddSupportCaseRequestCopyWith<$Res> { String? description, List attachmentUrls, String userId, - DateTime createdAt}); + DateTime? createdAt, + @TimeStampJsonConverter() DateTime? createdAt2}); } /// @nodoc @@ -68,7 +71,8 @@ class _$AddSupportCaseRequestCopyWithImpl<$Res, Object? description = freezed, Object? attachmentUrls = null, Object? userId = null, - Object? createdAt = null, + Object? createdAt = freezed, + Object? createdAt2 = freezed, }) { return _then(_value.copyWith( id: null == id @@ -91,10 +95,14 @@ class _$AddSupportCaseRequestCopyWithImpl<$Res, ? _value.userId : userId // ignore: cast_nullable_to_non_nullable as String, - createdAt: null == createdAt + createdAt: freezed == createdAt ? _value.createdAt : createdAt // ignore: cast_nullable_to_non_nullable - as DateTime, + as DateTime?, + createdAt2: freezed == createdAt2 + ? _value.createdAt2 + : createdAt2 // ignore: cast_nullable_to_non_nullable + as DateTime?, ) as $Val); } } @@ -114,7 +122,8 @@ abstract class _$$AddSupportCaseRequestImplCopyWith<$Res> String? description, List attachmentUrls, String userId, - DateTime createdAt}); + DateTime? createdAt, + @TimeStampJsonConverter() DateTime? createdAt2}); } /// @nodoc @@ -134,7 +143,8 @@ class __$$AddSupportCaseRequestImplCopyWithImpl<$Res> Object? description = freezed, Object? attachmentUrls = null, Object? userId = null, - Object? createdAt = null, + Object? createdAt = freezed, + Object? createdAt2 = freezed, }) { return _then(_$AddSupportCaseRequestImpl( id: null == id @@ -157,10 +167,14 @@ class __$$AddSupportCaseRequestImplCopyWithImpl<$Res> ? _value.userId : userId // ignore: cast_nullable_to_non_nullable as String, - createdAt: null == createdAt + createdAt: freezed == createdAt ? _value.createdAt : createdAt // ignore: cast_nullable_to_non_nullable - as DateTime, + as DateTime?, + createdAt2: freezed == createdAt2 + ? _value.createdAt2 + : createdAt2 // ignore: cast_nullable_to_non_nullable + as DateTime?, )); } } @@ -174,7 +188,8 @@ class _$AddSupportCaseRequestImpl implements _AddSupportCaseRequest { this.description, final List attachmentUrls = const [], required this.userId, - required this.createdAt}) + this.createdAt, + @TimeStampJsonConverter() this.createdAt2}) : _attachmentUrls = attachmentUrls; factory _$AddSupportCaseRequestImpl.fromJson(Map json) => @@ -198,11 +213,14 @@ class _$AddSupportCaseRequestImpl implements _AddSupportCaseRequest { @override final String userId; @override - final DateTime createdAt; + final DateTime? createdAt; + @override + @TimeStampJsonConverter() + final DateTime? createdAt2; @override String toString() { - return 'AddSupportCaseRequest(id: $id, title: $title, description: $description, attachmentUrls: $attachmentUrls, userId: $userId, createdAt: $createdAt)'; + return 'AddSupportCaseRequest(id: $id, title: $title, description: $description, attachmentUrls: $attachmentUrls, userId: $userId, createdAt: $createdAt, createdAt2: $createdAt2)'; } @override @@ -218,13 +236,22 @@ class _$AddSupportCaseRequestImpl implements _AddSupportCaseRequest { .equals(other._attachmentUrls, _attachmentUrls) && (identical(other.userId, userId) || other.userId == userId) && (identical(other.createdAt, createdAt) || - other.createdAt == createdAt)); + other.createdAt == createdAt) && + (identical(other.createdAt2, createdAt2) || + other.createdAt2 == createdAt2)); } @JsonKey(ignore: true) @override - int get hashCode => Object.hash(runtimeType, id, title, description, - const DeepCollectionEquality().hash(_attachmentUrls), userId, createdAt); + int get hashCode => Object.hash( + runtimeType, + id, + title, + description, + const DeepCollectionEquality().hash(_attachmentUrls), + userId, + createdAt, + createdAt2); @JsonKey(ignore: true) @override @@ -243,12 +270,14 @@ class _$AddSupportCaseRequestImpl implements _AddSupportCaseRequest { abstract class _AddSupportCaseRequest implements AddSupportCaseRequest { const factory _AddSupportCaseRequest( - {required final String id, - required final String title, - final String? description, - final List attachmentUrls, - required final String userId, - required final DateTime createdAt}) = _$AddSupportCaseRequestImpl; + {required final String id, + required final String title, + final String? description, + final List attachmentUrls, + required final String userId, + final DateTime? createdAt, + @TimeStampJsonConverter() final DateTime? createdAt2}) = + _$AddSupportCaseRequestImpl; factory _AddSupportCaseRequest.fromJson(Map json) = _$AddSupportCaseRequestImpl.fromJson; @@ -264,7 +293,10 @@ abstract class _AddSupportCaseRequest implements AddSupportCaseRequest { @override String get userId; @override - DateTime get createdAt; + DateTime? get createdAt; + @override + @TimeStampJsonConverter() + DateTime? get createdAt2; @override @JsonKey(ignore: true) _$$AddSupportCaseRequestImplCopyWith<_$AddSupportCaseRequestImpl> diff --git a/data/lib/api/support/support_models.g.dart b/data/lib/api/support/support_models.g.dart index 1867df47..be810f63 100644 --- a/data/lib/api/support/support_models.g.dart +++ b/data/lib/api/support/support_models.g.dart @@ -17,7 +17,11 @@ _$AddSupportCaseRequestImpl _$$AddSupportCaseRequestImplFromJson( .toList() ?? const [], userId: json['userId'] as String, - createdAt: DateTime.parse(json['createdAt'] as String), + createdAt: json['createdAt'] == null + ? null + : DateTime.parse(json['createdAt'] as String), + createdAt2: _$JsonConverterFromJson( + json['createdAt2'], const TimeStampJsonConverter().fromJson), ); Map _$$AddSupportCaseRequestImplToJson( @@ -28,5 +32,19 @@ Map _$$AddSupportCaseRequestImplToJson( 'description': instance.description, 'attachmentUrls': instance.attachmentUrls, 'userId': instance.userId, - 'createdAt': instance.createdAt.toIso8601String(), + 'createdAt': instance.createdAt?.toIso8601String(), + 'createdAt2': _$JsonConverterToJson( + instance.createdAt2, const TimeStampJsonConverter().toJson), }; + +Value? _$JsonConverterFromJson( + Object? json, + Value? Function(Json json) fromJson, +) => + json == null ? null : fromJson(json as Json); + +Json? _$JsonConverterToJson( + Value? value, + Json? Function(Value value) toJson, +) => + value == null ? null : toJson(value); diff --git a/data/lib/api/team/team_model.dart b/data/lib/api/team/team_model.dart index 8d09a8f6..274009df 100644 --- a/data/lib/api/team/team_model.dart +++ b/data/lib/api/team/team_model.dart @@ -1,6 +1,7 @@ // ignore_for_file: non_constant_identifier_names import 'package:cloud_firestore/cloud_firestore.dart'; +import '../../converter/timestamp_json_converter.dart'; import '../../utils/constant/firestore_constant.dart'; import '../user/user_models.dart'; import 'package:freezed_annotation/freezed_annotation.dart'; @@ -20,6 +21,7 @@ abstract class TeamModel with _$TeamModel { String? profile_img_url, String? created_by, DateTime? created_at, + @TimeStampJsonConverter() DateTime? created_at2, @JsonKey(name: FireStoreConst.teamPlayers) @Default([]) List players, diff --git a/data/lib/api/team/team_model.freezed.dart b/data/lib/api/team/team_model.freezed.dart index 78bb21f2..4371ed94 100644 --- a/data/lib/api/team/team_model.freezed.dart +++ b/data/lib/api/team/team_model.freezed.dart @@ -27,6 +27,8 @@ mixin _$TeamModel { String? get profile_img_url => throw _privateConstructorUsedError; String? get created_by => throw _privateConstructorUsedError; DateTime? get created_at => throw _privateConstructorUsedError; + @TimeStampJsonConverter() + DateTime? get created_at2 => throw _privateConstructorUsedError; @JsonKey(name: FireStoreConst.teamPlayers) List get players => throw _privateConstructorUsedError; @@ -49,6 +51,7 @@ abstract class $TeamModelCopyWith<$Res> { String? profile_img_url, String? created_by, DateTime? created_at, + @TimeStampJsonConverter() DateTime? created_at2, @JsonKey(name: FireStoreConst.teamPlayers) List players}); } @@ -72,6 +75,7 @@ class _$TeamModelCopyWithImpl<$Res, $Val extends TeamModel> Object? profile_img_url = freezed, Object? created_by = freezed, Object? created_at = freezed, + Object? created_at2 = freezed, Object? players = null, }) { return _then(_value.copyWith( @@ -103,6 +107,10 @@ class _$TeamModelCopyWithImpl<$Res, $Val extends TeamModel> ? _value.created_at : created_at // ignore: cast_nullable_to_non_nullable as DateTime?, + created_at2: freezed == created_at2 + ? _value.created_at2 + : created_at2 // ignore: cast_nullable_to_non_nullable + as DateTime?, players: null == players ? _value.players : players // ignore: cast_nullable_to_non_nullable @@ -127,6 +135,7 @@ abstract class _$$TeamModelImplCopyWith<$Res> String? profile_img_url, String? created_by, DateTime? created_at, + @TimeStampJsonConverter() DateTime? created_at2, @JsonKey(name: FireStoreConst.teamPlayers) List players}); } @@ -148,6 +157,7 @@ class __$$TeamModelImplCopyWithImpl<$Res> Object? profile_img_url = freezed, Object? created_by = freezed, Object? created_at = freezed, + Object? created_at2 = freezed, Object? players = null, }) { return _then(_$TeamModelImpl( @@ -179,6 +189,10 @@ class __$$TeamModelImplCopyWithImpl<$Res> ? _value.created_at : created_at // ignore: cast_nullable_to_non_nullable as DateTime?, + created_at2: freezed == created_at2 + ? _value.created_at2 + : created_at2 // ignore: cast_nullable_to_non_nullable + as DateTime?, players: null == players ? _value._players : players // ignore: cast_nullable_to_non_nullable @@ -199,6 +213,7 @@ class _$TeamModelImpl implements _TeamModel { this.profile_img_url, this.created_by, this.created_at, + @TimeStampJsonConverter() this.created_at2, @JsonKey(name: FireStoreConst.teamPlayers) final List players = const []}) : _players = players; @@ -220,6 +235,9 @@ class _$TeamModelImpl implements _TeamModel { final String? created_by; @override final DateTime? created_at; + @override + @TimeStampJsonConverter() + final DateTime? created_at2; final List _players; @override @JsonKey(name: FireStoreConst.teamPlayers) @@ -231,7 +249,7 @@ class _$TeamModelImpl implements _TeamModel { @override String toString() { - return 'TeamModel(id: $id, name: $name, name_lowercase: $name_lowercase, city: $city, profile_img_url: $profile_img_url, created_by: $created_by, created_at: $created_at, players: $players)'; + return 'TeamModel(id: $id, name: $name, name_lowercase: $name_lowercase, city: $city, profile_img_url: $profile_img_url, created_by: $created_by, created_at: $created_at, created_at2: $created_at2, players: $players)'; } @override @@ -250,6 +268,8 @@ class _$TeamModelImpl implements _TeamModel { other.created_by == created_by) && (identical(other.created_at, created_at) || other.created_at == created_at) && + (identical(other.created_at2, created_at2) || + other.created_at2 == created_at2) && const DeepCollectionEquality().equals(other._players, _players)); } @@ -264,6 +284,7 @@ class _$TeamModelImpl implements _TeamModel { profile_img_url, created_by, created_at, + created_at2, const DeepCollectionEquality().hash(_players)); @JsonKey(ignore: true) @@ -289,6 +310,7 @@ abstract class _TeamModel implements TeamModel { final String? profile_img_url, final String? created_by, final DateTime? created_at, + @TimeStampJsonConverter() final DateTime? created_at2, @JsonKey(name: FireStoreConst.teamPlayers) final List players}) = _$TeamModelImpl; @@ -310,6 +332,9 @@ abstract class _TeamModel implements TeamModel { @override DateTime? get created_at; @override + @TimeStampJsonConverter() + DateTime? get created_at2; + @override @JsonKey(name: FireStoreConst.teamPlayers) List get players; @override diff --git a/data/lib/api/team/team_model.g.dart b/data/lib/api/team/team_model.g.dart index dfcd21be..f545e3c5 100644 --- a/data/lib/api/team/team_model.g.dart +++ b/data/lib/api/team/team_model.g.dart @@ -17,6 +17,8 @@ _$TeamModelImpl _$$TeamModelImplFromJson(Map json) => created_at: json['created_at'] == null ? null : DateTime.parse(json['created_at'] as String), + created_at2: _$JsonConverterFromJson( + json['created_at2'], const TimeStampJsonConverter().fromJson), players: (json['team_players'] as List?) ?.map((e) => TeamPlayer.fromJson(e as Map)) .toList() ?? @@ -32,9 +34,23 @@ Map _$$TeamModelImplToJson(_$TeamModelImpl instance) => 'profile_img_url': instance.profile_img_url, 'created_by': instance.created_by, 'created_at': instance.created_at?.toIso8601String(), + 'created_at2': _$JsonConverterToJson( + instance.created_at2, const TimeStampJsonConverter().toJson), 'team_players': instance.players.map((e) => e.toJson()).toList(), }; +Value? _$JsonConverterFromJson( + Object? json, + Value? Function(Json json) fromJson, +) => + json == null ? null : fromJson(json as Json); + +Json? _$JsonConverterToJson( + Value? value, + Json? Function(Value value) toJson, +) => + value == null ? null : toJson(value); + _$TeamPlayerImpl _$$TeamPlayerImplFromJson(Map json) => _$TeamPlayerImpl( id: json['id'] as String, diff --git a/data/lib/api/user/user_models.dart b/data/lib/api/user/user_models.dart index 4238fc4d..57cc8b29 100644 --- a/data/lib/api/user/user_models.dart +++ b/data/lib/api/user/user_models.dart @@ -5,6 +5,8 @@ import 'dart:convert'; import 'package:cloud_firestore/cloud_firestore.dart'; import 'package:freezed_annotation/freezed_annotation.dart'; +import '../../converter/timestamp_json_converter.dart'; + part 'user_models.freezed.dart'; part 'user_models.g.dart'; @@ -25,6 +27,8 @@ class UserModel with _$UserModel { UserGender? gender, DateTime? created_at, DateTime? updated_at, + @TimeStampJsonConverter() DateTime? created_at2, + @TimeStampJsonConverter() DateTime? updated_at2, PlayerRole? player_role, BattingStyle? batting_style, BowlingStyle? bowling_style, diff --git a/data/lib/api/user/user_models.freezed.dart b/data/lib/api/user/user_models.freezed.dart index bd1040d5..956a60bb 100644 --- a/data/lib/api/user/user_models.freezed.dart +++ b/data/lib/api/user/user_models.freezed.dart @@ -31,6 +31,10 @@ mixin _$UserModel { UserGender? get gender => throw _privateConstructorUsedError; DateTime? get created_at => throw _privateConstructorUsedError; DateTime? get updated_at => throw _privateConstructorUsedError; + @TimeStampJsonConverter() + DateTime? get created_at2 => throw _privateConstructorUsedError; + @TimeStampJsonConverter() + DateTime? get updated_at2 => throw _privateConstructorUsedError; PlayerRole? get player_role => throw _privateConstructorUsedError; BattingStyle? get batting_style => throw _privateConstructorUsedError; BowlingStyle? get bowling_style => throw _privateConstructorUsedError; @@ -59,6 +63,8 @@ abstract class $UserModelCopyWith<$Res> { UserGender? gender, DateTime? created_at, DateTime? updated_at, + @TimeStampJsonConverter() DateTime? created_at2, + @TimeStampJsonConverter() DateTime? updated_at2, PlayerRole? player_role, BattingStyle? batting_style, BowlingStyle? bowling_style, @@ -89,6 +95,8 @@ class _$UserModelCopyWithImpl<$Res, $Val extends UserModel> Object? gender = freezed, Object? created_at = freezed, Object? updated_at = freezed, + Object? created_at2 = freezed, + Object? updated_at2 = freezed, Object? player_role = freezed, Object? batting_style = freezed, Object? bowling_style = freezed, @@ -139,6 +147,14 @@ class _$UserModelCopyWithImpl<$Res, $Val extends UserModel> ? _value.updated_at : updated_at // ignore: cast_nullable_to_non_nullable as DateTime?, + created_at2: freezed == created_at2 + ? _value.created_at2 + : created_at2 // ignore: cast_nullable_to_non_nullable + as DateTime?, + updated_at2: freezed == updated_at2 + ? _value.updated_at2 + : updated_at2 // ignore: cast_nullable_to_non_nullable + as DateTime?, player_role: freezed == player_role ? _value.player_role : player_role // ignore: cast_nullable_to_non_nullable @@ -179,6 +195,8 @@ abstract class _$$UserModelImplCopyWith<$Res> UserGender? gender, DateTime? created_at, DateTime? updated_at, + @TimeStampJsonConverter() DateTime? created_at2, + @TimeStampJsonConverter() DateTime? updated_at2, PlayerRole? player_role, BattingStyle? batting_style, BowlingStyle? bowling_style, @@ -207,6 +225,8 @@ class __$$UserModelImplCopyWithImpl<$Res> Object? gender = freezed, Object? created_at = freezed, Object? updated_at = freezed, + Object? created_at2 = freezed, + Object? updated_at2 = freezed, Object? player_role = freezed, Object? batting_style = freezed, Object? bowling_style = freezed, @@ -257,6 +277,14 @@ class __$$UserModelImplCopyWithImpl<$Res> ? _value.updated_at : updated_at // ignore: cast_nullable_to_non_nullable as DateTime?, + created_at2: freezed == created_at2 + ? _value.created_at2 + : created_at2 // ignore: cast_nullable_to_non_nullable + as DateTime?, + updated_at2: freezed == updated_at2 + ? _value.updated_at2 + : updated_at2 // ignore: cast_nullable_to_non_nullable + as DateTime?, player_role: freezed == player_role ? _value.player_role : player_role // ignore: cast_nullable_to_non_nullable @@ -292,6 +320,8 @@ class _$UserModelImpl extends _UserModel { this.gender, this.created_at, this.updated_at, + @TimeStampJsonConverter() this.created_at2, + @TimeStampJsonConverter() this.updated_at2, this.player_role, this.batting_style, this.bowling_style, @@ -324,6 +354,12 @@ class _$UserModelImpl extends _UserModel { @override final DateTime? updated_at; @override + @TimeStampJsonConverter() + final DateTime? created_at2; + @override + @TimeStampJsonConverter() + final DateTime? updated_at2; + @override final PlayerRole? player_role; @override final BattingStyle? batting_style; @@ -335,7 +371,7 @@ class _$UserModelImpl extends _UserModel { @override String toString() { - return 'UserModel(id: $id, name: $name, name_lowercase: $name_lowercase, location: $location, phone: $phone, dob: $dob, email: $email, profile_img_url: $profile_img_url, gender: $gender, created_at: $created_at, updated_at: $updated_at, player_role: $player_role, batting_style: $batting_style, bowling_style: $bowling_style, isActive: $isActive)'; + return 'UserModel(id: $id, name: $name, name_lowercase: $name_lowercase, location: $location, phone: $phone, dob: $dob, email: $email, profile_img_url: $profile_img_url, gender: $gender, created_at: $created_at, updated_at: $updated_at, created_at2: $created_at2, updated_at2: $updated_at2, player_role: $player_role, batting_style: $batting_style, bowling_style: $bowling_style, isActive: $isActive)'; } @override @@ -359,6 +395,10 @@ class _$UserModelImpl extends _UserModel { other.created_at == created_at) && (identical(other.updated_at, updated_at) || other.updated_at == updated_at) && + (identical(other.created_at2, created_at2) || + other.created_at2 == created_at2) && + (identical(other.updated_at2, updated_at2) || + other.updated_at2 == updated_at2) && (identical(other.player_role, player_role) || other.player_role == player_role) && (identical(other.batting_style, batting_style) || @@ -384,6 +424,8 @@ class _$UserModelImpl extends _UserModel { gender, created_at, updated_at, + created_at2, + updated_at2, player_role, batting_style, bowling_style, @@ -416,6 +458,8 @@ abstract class _UserModel extends UserModel { final UserGender? gender, final DateTime? created_at, final DateTime? updated_at, + @TimeStampJsonConverter() final DateTime? created_at2, + @TimeStampJsonConverter() final DateTime? updated_at2, final PlayerRole? player_role, final BattingStyle? batting_style, final BowlingStyle? bowling_style, @@ -448,6 +492,12 @@ abstract class _UserModel extends UserModel { @override DateTime? get updated_at; @override + @TimeStampJsonConverter() + DateTime? get created_at2; + @override + @TimeStampJsonConverter() + DateTime? get updated_at2; + @override PlayerRole? get player_role; @override BattingStyle? get batting_style; diff --git a/data/lib/api/user/user_models.g.dart b/data/lib/api/user/user_models.g.dart index 05d223f2..a147430c 100644 --- a/data/lib/api/user/user_models.g.dart +++ b/data/lib/api/user/user_models.g.dart @@ -23,6 +23,10 @@ _$UserModelImpl _$$UserModelImplFromJson(Map json) => updated_at: json['updated_at'] == null ? null : DateTime.parse(json['updated_at'] as String), + created_at2: _$JsonConverterFromJson( + json['created_at2'], const TimeStampJsonConverter().fromJson), + updated_at2: _$JsonConverterFromJson( + json['updated_at2'], const TimeStampJsonConverter().fromJson), player_role: $enumDecodeNullable(_$PlayerRoleEnumMap, json['player_role']), batting_style: @@ -45,6 +49,10 @@ Map _$$UserModelImplToJson(_$UserModelImpl instance) => 'gender': _$UserGenderEnumMap[instance.gender], 'created_at': instance.created_at?.toIso8601String(), 'updated_at': instance.updated_at?.toIso8601String(), + 'created_at2': _$JsonConverterToJson( + instance.created_at2, const TimeStampJsonConverter().toJson), + 'updated_at2': _$JsonConverterToJson( + instance.updated_at2, const TimeStampJsonConverter().toJson), 'player_role': _$PlayerRoleEnumMap[instance.player_role], 'batting_style': _$BattingStyleEnumMap[instance.batting_style], 'bowling_style': _$BowlingStyleEnumMap[instance.bowling_style], @@ -58,6 +66,12 @@ const _$UserGenderEnumMap = { UserGender.other: 3, }; +Value? _$JsonConverterFromJson( + Object? json, + Value? Function(Json json) fromJson, +) => + json == null ? null : fromJson(json as Json); + const _$PlayerRoleEnumMap = { PlayerRole.topOrderBatter: 1, PlayerRole.middleOrderBatter: 2, @@ -86,3 +100,9 @@ const _$BowlingStyleEnumMap = { BowlingStyle.rightArmLegBreak: 7, BowlingStyle.none: 8, }; + +Json? _$JsonConverterToJson( + Value? value, + Json? Function(Value value) toJson, +) => + value == null ? null : toJson(value); diff --git a/data/lib/converter/timestamp_json_converter.dart b/data/lib/converter/timestamp_json_converter.dart new file mode 100644 index 00000000..7128b6dc --- /dev/null +++ b/data/lib/converter/timestamp_json_converter.dart @@ -0,0 +1,21 @@ +import 'package:cloud_firestore/cloud_firestore.dart'; +import 'package:freezed_annotation/freezed_annotation.dart'; + +class TimeStampJsonConverter extends JsonConverter { + const TimeStampJsonConverter(); + + @override + DateTime fromJson(Object json) { + if (json is Timestamp) { + return json.toDate(); + } else { + final jsonMap = Map.from(json as Map); + final seconds = jsonMap['_seconds'] as int; + final nanoseconds = jsonMap['_nanoseconds'] as int; + return Timestamp(seconds, nanoseconds).toDate(); + } + } + + @override + Object toJson(DateTime object) => Timestamp.fromDate(object); +} diff --git a/data/lib/service/auth/auth_service.dart b/data/lib/service/auth/auth_service.dart index 9a3624ba..bbb006a9 100644 --- a/data/lib/service/auth/auth_service.dart +++ b/data/lib/service/auth/auth_service.dart @@ -86,7 +86,7 @@ class AuthService { final UserModel user = UserModel( id: _auth.currentUser!.uid, phone: phone, - created_at: DateTime.now(), + created_at2: DateTime.now(), ); await _userService.updateUser(user); } else { diff --git a/data/lib/service/match/match_service.dart b/data/lib/service/match/match_service.dart index 6dc65ad0..eac50d87 100644 --- a/data/lib/service/match/match_service.dart +++ b/data/lib/service/match/match_service.dart @@ -60,7 +60,7 @@ class MatchService { over_per_bowler: 0, city: '', ground: '', - start_time: DateTime.now(), + start_time2: DateTime.now(), ball_type: BallType.leather, pitch_type: PitchType.turf, created_by: '', @@ -224,7 +224,7 @@ class MatchService { over_per_bowler: 0, city: '', ground: '', - start_time: DateTime.now(), + start_time2: DateTime.now(), ball_type: BallType.leather, pitch_type: PitchType.turf, created_by: '', diff --git a/data/lib/utils/dummy_deactivated_account.dart b/data/lib/utils/dummy_deactivated_account.dart index 83becd43..ff06008e 100644 --- a/data/lib/utils/dummy_deactivated_account.dart +++ b/data/lib/utils/dummy_deactivated_account.dart @@ -5,7 +5,7 @@ UserModel deActiveDummyUserAccount(String id) { return UserModel( id: id, name: 'Deactivated User', - created_at: DateTime(1950), + created_at2: DateTime(1950), location: '--', isActive: false, ); @@ -16,7 +16,7 @@ TeamModel deActiveDummyTeamModel(String id) { id: id, name: 'Deactivated Team', name_lowercase: 'deactivatedteam', - created_at: DateTime(1950), + created_at2: DateTime(1950), city: '--', ); } diff --git a/khelo/lib/components/match_detail_cell.dart b/khelo/lib/components/match_detail_cell.dart index 8f25b560..8b9393b6 100644 --- a/khelo/lib/components/match_detail_cell.dart +++ b/khelo/lib/components/match_detail_cell.dart @@ -80,7 +80,8 @@ class MatchDetailCell extends StatelessWidget { Flexible( flex: 2, child: Text( - match.start_time.format(context, DateFormatType.dateAndTime), + (match.start_time2 ?? match.start_time)! + .format(context, DateFormatType.dateAndTime), style: AppTextStyle.caption .copyWith(color: context.colorScheme.textDisabled)), ), diff --git a/khelo/lib/ui/flow/home/home_screen.dart b/khelo/lib/ui/flow/home/home_screen.dart index 76602eec..c9a008f1 100644 --- a/khelo/lib/ui/flow/home/home_screen.dart +++ b/khelo/lib/ui/flow/home/home_screen.dart @@ -281,7 +281,8 @@ class _HomeScreenState extends ConsumerState { return Text.rich( overflow: TextOverflow.ellipsis, TextSpan( - text: match.start_time.format(context, DateFormatType.dateAndTime), + text: (match.start_time2 ?? match.start_time) + ?.format(context, DateFormatType.dateAndTime), style: AppTextStyle.caption .copyWith(color: context.colorScheme.textSecondary), children: [ diff --git a/khelo/lib/ui/flow/matches/add_match/add_match_view_model.dart b/khelo/lib/ui/flow/matches/add_match/add_match_view_model.dart index 95f8a8af..00d82551 100644 --- a/khelo/lib/ui/flow/matches/add_match/add_match_view_model.dart +++ b/khelo/lib/ui/flow/matches/add_match/add_match_view_model.dart @@ -82,7 +82,7 @@ class AddMatchViewNotifier extends StateNotifier { state.groundController.text = match.ground.toString(); state = state.copyWith( match: match, - matchTime: match.start_time, + matchTime: match.start_time2 ?? match.start_time ?? DateTime.now(), teamA: match.teams.first.team, teamACaptainId: match.teams.first.captain_id, teamAAdminId: match.teams.first.admin_id, @@ -183,7 +183,7 @@ class AddMatchViewNotifier extends StateNotifier { power_play_overs3: state.thirdPowerPlay ?? [], city: city, ground: ground, - start_time: state.matchTime, + start_time2: state.matchTime, created_by: state.currentUserId ?? state.teamA?.created_by ?? "INVALID ID", ball_type: state.ballType, diff --git a/khelo/lib/ui/flow/matches/add_match/select_squad/components/user_detail_sheet.dart b/khelo/lib/ui/flow/matches/add_match/select_squad/components/user_detail_sheet.dart index c459eeb8..38388cea 100644 --- a/khelo/lib/ui/flow/matches/add_match/select_squad/components/user_detail_sheet.dart +++ b/khelo/lib/ui/flow/matches/add_match/select_squad/components/user_detail_sheet.dart @@ -137,7 +137,7 @@ class UserDetailSheet extends StatelessWidget { .copyWith(color: context.colorScheme.textDisabled), ), Text( - (user.created_at ?? DateTime.now()) + (user.created_at2 ?? user.created_at ?? DateTime.now()) .format(context, DateFormatType.dayMonthYear), style: AppTextStyle.body2 .copyWith(color: context.colorScheme.textPrimary), diff --git a/khelo/lib/ui/flow/matches/match_detail/components/match_detail_info_view.dart b/khelo/lib/ui/flow/matches/match_detail/components/match_detail_info_view.dart index a50e0942..ce5471ce 100644 --- a/khelo/lib/ui/flow/matches/match_detail/components/match_detail_info_view.dart +++ b/khelo/lib/ui/flow/matches/match_detail/components/match_detail_info_view.dart @@ -44,8 +44,8 @@ class MatchDetailInfoView extends ConsumerWidget { _matchTitleView(context, state.match!), _dataRowView(context, title: context.l10n.match_info_date_and_time_title, - subtitle: state.match?.start_time - .format(context, DateFormatType.shortDateTime)), + subtitle: (state.match?.start_time2 ?? state.match?.start_time) + ?.format(context, DateFormatType.shortDateTime)), _tossDetailView(context, state.match!), _dataRowView(context, title: context.l10n.match_info_venue_title, diff --git a/khelo/lib/ui/flow/matches/match_detail/match_detail_tab_view_model.dart b/khelo/lib/ui/flow/matches/match_detail/match_detail_tab_view_model.dart index 3ad49880..32dc1db6 100644 --- a/khelo/lib/ui/flow/matches/match_detail/match_detail_tab_view_model.dart +++ b/khelo/lib/ui/flow/matches/match_detail/match_detail_tab_view_model.dart @@ -104,12 +104,14 @@ class MatchDetailTabViewNotifier extends StateNotifier { state = state.copyWith(ballScoreQueryListenerSet: true); ballScoreStreamSubscription = _ballScoreService - .streamBallScoresByInningIds( - state.allInnings.map((e) => e.id).toList()) + .streamBallScoresByInningIds(state.allInnings.map((e) => e.id).toList()) .listen( (scores) { final sortedList = scores.toList(); - sortedList.sort((a, b) => a.ballScore.time.compareTo(b.ballScore.time)); + sortedList.sort((a, b) => + (a.ballScore.time2 ?? a.ballScore.time)?.compareTo( + b.ballScore.time2 ?? b.ballScore.time ?? DateTime.now()) ?? + 0); final overList = state.overList.toList(); for (final score in sortedList) { diff --git a/khelo/lib/ui/flow/score_board/score_board_view_model.dart b/khelo/lib/ui/flow/score_board/score_board_view_model.dart index e1f1f0a5..7d824beb 100644 --- a/khelo/lib/ui/flow/score_board/score_board_view_model.dart +++ b/khelo/lib/ui/flow/score_board/score_board_view_model.dart @@ -209,9 +209,15 @@ class ScoreBoardViewNotifier extends StateNotifier { } } - currentScoreList.sort((a, b) => a.time.compareTo(b.time)); - - previousScoreList.sort((a, b) => a.time.compareTo(b.time)); + currentScoreList.sort((a, b) => + (a.time2 ?? a.time) + ?.compareTo(b.time2 ?? b.time ?? DateTime.now()) ?? + 0); + + previousScoreList.sort((a, b) => + (a.time2 ?? a.time) + ?.compareTo(b.time2 ?? b.time ?? DateTime.now()) ?? + 0); state = state.copyWith( currentScoresList: currentScoreList, previousScoresList: previousScoreList, @@ -584,24 +590,25 @@ class ScoreBoardViewNotifier extends StateNotifier { ballCount = state.ballCount + 1; } final ball = BallScoreModel( - id: _ballScoreService.generateBallScoreId, - inning_id: ballInningId, - match_id: state.match?.id ?? matchId, - over_number: state.overCount, - ball_number: ballCount, - bowler_id: bowlerId, - batsman_id: strikerId, - non_striker_id: nonStrikerId, - is_four: isFour, - is_six: isSix, - extras_awarded: extra, - extras_type: extrasType, - player_out_id: playerOutId, - runs_scored: run, - wicket_taker_id: wicketTakerId, - wicket_type: wicketType, - fielding_position: position, - time: DateTime.now()); + id: _ballScoreService.generateBallScoreId, + inning_id: ballInningId, + match_id: state.match?.id ?? matchId, + over_number: state.overCount, + ball_number: ballCount, + bowler_id: bowlerId, + batsman_id: strikerId, + non_striker_id: nonStrikerId, + is_four: isFour, + is_six: isSix, + extras_awarded: extra, + extras_type: extrasType, + player_out_id: playerOutId, + runs_scored: run, + wicket_taker_id: wicketTakerId, + wicket_type: wicketType, + fielding_position: position, + time2: DateTime.now(), + ); int wicketCount = state.otherInning!.total_wickets; if (wicketType != WicketType.retiredHurt && wicketType != null) { wicketCount = wicketCount + 1; diff --git a/khelo/lib/ui/flow/settings/edit_profile/edit_profile_view_model.dart b/khelo/lib/ui/flow/settings/edit_profile/edit_profile_view_model.dart index b2ec8765..7451a5a3 100644 --- a/khelo/lib/ui/flow/settings/edit_profile/edit_profile_view_model.dart +++ b/khelo/lib/ui/flow/settings/edit_profile/edit_profile_view_model.dart @@ -124,20 +124,21 @@ class EditProfileViewNotifier extends StateNotifier { final location = state.locationController.text.trim(); UserModel user = UserModel( - id: state.currentUser!.id, - name: name, - name_lowercase: name.toLowerCase(), - email: email, - location: location.toLowerCase(), - batting_style: state.battingStyle, - bowling_style: state.bowlingStyle, - player_role: state.playerRole, - gender: state.gender, - phone: state.currentUser?.phone, - profile_img_url: state.imageUrl, - dob: state.dob, - created_at: state.currentUser?.created_at, - updated_at: DateTime.now()); + id: state.currentUser!.id, + name: name, + name_lowercase: name.toLowerCase(), + email: email, + location: location.toLowerCase(), + batting_style: state.battingStyle, + bowling_style: state.bowlingStyle, + player_role: state.playerRole, + gender: state.gender, + phone: state.currentUser?.phone, + profile_img_url: state.imageUrl, + dob: state.dob, + created_at2: state.currentUser?.created_at ?? DateTime.now(), + updated_at2: DateTime.now(), + ); await userService.updateUser(user); state = state.copyWith(isSaveInProgress: false, isSaved: true); diff --git a/khelo/lib/ui/flow/settings/support/contact_support_view_model.dart b/khelo/lib/ui/flow/settings/support/contact_support_view_model.dart index 63919e52..47f44ac3 100644 --- a/khelo/lib/ui/flow/settings/support/contact_support_view_model.dart +++ b/khelo/lib/ui/flow/settings/support/contact_support_view_model.dart @@ -145,13 +145,14 @@ class ContactSupportViewStateNotifier state = state.copyWith(submitting: true, actionError: null); final supportCase = AddSupportCaseRequest( - id: supportService.generateSupportId, - title: state.titleController.text.trim(), - description: state.descriptionController.text.trim(), - attachmentUrls: - state.attachments.map((e) => e.url).whereNotNull().toList(), - userId: _currentUserId ?? '', - createdAt: DateTime.now()); + id: supportService.generateSupportId, + title: state.titleController.text.trim(), + description: state.descriptionController.text.trim(), + attachmentUrls: + state.attachments.map((e) => e.url).whereNotNull().toList(), + userId: _currentUserId ?? '', + createdAt2: DateTime.now(), + ); await supportService.addSupportCase(supportCase).whenComplete( () => state = state.copyWith(pop: true, submitting: false), diff --git a/khelo/lib/ui/flow/team/add_team/add_team_view_model.dart b/khelo/lib/ui/flow/team/add_team/add_team_view_model.dart index e59bcae8..597888f2 100644 --- a/khelo/lib/ui/flow/team/add_team/add_team_view_model.dart +++ b/khelo/lib/ui/flow/team/add_team/add_team_view_model.dart @@ -103,14 +103,15 @@ class AddTeamViewNotifier extends StateNotifier { } String? imageUrl = state.editTeam?.profile_img_url; final team = TeamModel( - id: state.editTeam?.id ?? _teamService.generateTeamId, - name: name, - name_lowercase: name.caseAndSpaceInsensitive, - profile_img_url: imageUrl, - city: location.toLowerCase(), - created_by: state.currentUser!.id, - players: players, - created_at: state.editTeam?.created_at ?? DateTime.now()); + id: state.editTeam?.id ?? _teamService.generateTeamId, + name: name, + name_lowercase: name.caseAndSpaceInsensitive, + profile_img_url: imageUrl, + city: location.toLowerCase(), + created_by: state.currentUser!.id, + players: players, + created_at2: state.editTeam?.created_at ?? DateTime.now(), + ); final newTeamId = await _teamService.updateTeam(team); if (state.filePath != null) { @@ -139,7 +140,8 @@ class AddTeamViewNotifier extends StateNotifier { city: location.toLowerCase(), created_by: state.currentUser!.id, players: players, - created_at: state.editTeam?.created_at ?? DateTime.now()); + created_at: state.editTeam?.created_at, + created_at2: state.editTeam?.created_at ?? DateTime.now()); state = state.copyWith(isAddInProgress: false, team: teamModel); } } catch (e) { diff --git a/khelo/lib/ui/flow/team/detail/team_detail_screen.dart b/khelo/lib/ui/flow/team/detail/team_detail_screen.dart index 017fd815..14bb1f26 100644 --- a/khelo/lib/ui/flow/team/detail/team_detail_screen.dart +++ b/khelo/lib/ui/flow/team/detail/team_detail_screen.dart @@ -104,7 +104,9 @@ class _TeamDetailScreenState extends ConsumerState { .copyWith(color: context.colorScheme.textPrimary)), const SizedBox(height: 4), Text( - (state.team?.created_at ?? DateTime.now()) + (state.team?.created_at2 ?? + state.team?.created_at ?? + DateTime.now()) .format(context, DateFormatType.dayMonthYear), style: AppTextStyle.body2 .copyWith(color: context.colorScheme.textSecondary)), diff --git a/khelo/lib/ui/flow/team/user_detail/component/user_detail_info_content.dart b/khelo/lib/ui/flow/team/user_detail/component/user_detail_info_content.dart index bf8d5225..c3a74f6f 100644 --- a/khelo/lib/ui/flow/team/user_detail/component/user_detail_info_content.dart +++ b/khelo/lib/ui/flow/team/user_detail/component/user_detail_info_content.dart @@ -20,7 +20,7 @@ class UserDetailInfoContent extends ConsumerWidget { _title(context, context.l10n.user_detail_personal_information_title), const SizedBox(height: 8), _infoRowView(context, context.l10n.user_detail_joining_date_title, - state.user?.created_at?.format(context, DateFormatType.shortDate)), + (state.user?.created_at2??state.user?.created_at)?.format(context, DateFormatType.shortDate)), _infoRowView(context, context.l10n.common_gender_title, state.user?.gender?.getString(context)), _infoRowView( From b65b256a6a0f972839f64c4acbbc855e3503718d Mon Sep 17 00:00:00 2001 From: cp-mayank-v Date: Tue, 10 Sep 2024 11:41:58 +0530 Subject: [PATCH 2/8] code format --- .../user_detail/component/user_detail_info_content.dart | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/khelo/lib/ui/flow/team/user_detail/component/user_detail_info_content.dart b/khelo/lib/ui/flow/team/user_detail/component/user_detail_info_content.dart index c3a74f6f..4355f5b3 100644 --- a/khelo/lib/ui/flow/team/user_detail/component/user_detail_info_content.dart +++ b/khelo/lib/ui/flow/team/user_detail/component/user_detail_info_content.dart @@ -19,8 +19,11 @@ class UserDetailInfoContent extends ConsumerWidget { children: [ _title(context, context.l10n.user_detail_personal_information_title), const SizedBox(height: 8), - _infoRowView(context, context.l10n.user_detail_joining_date_title, - (state.user?.created_at2??state.user?.created_at)?.format(context, DateFormatType.shortDate)), + _infoRowView( + context, + context.l10n.user_detail_joining_date_title, + (state.user?.created_at2 ?? state.user?.created_at) + ?.format(context, DateFormatType.shortDate)), _infoRowView(context, context.l10n.common_gender_title, state.user?.gender?.getString(context)), _infoRowView( From 61ff68373b709d55570019976f91a76cc25b31ab Mon Sep 17 00:00:00 2001 From: cp-mayank-v Date: Tue, 10 Sep 2024 17:23:27 +0530 Subject: [PATCH 3/8] Minor changes --- data/lib/api/ball_score/ball_score_model.dart | 1 + .../ball_score/ball_score_model.freezed.dart | 11 ++++++---- .../api/ball_score/ball_score_model.g.dart | 3 --- data/lib/api/match/match_model.dart | 1 + data/lib/api/match/match_model.freezed.dart | 11 ++++++---- data/lib/api/match/match_model.g.dart | 4 ---- data/lib/api/support/support_models.dart | 1 + .../api/support/support_models.freezed.dart | 11 ++++++---- data/lib/api/support/support_models.g.dart | 4 ---- data/lib/api/team/team_model.dart | 1 + data/lib/api/team/team_model.freezed.dart | 11 ++++++---- data/lib/api/team/team_model.g.dart | 4 ---- data/lib/api/user/user_models.dart | 2 ++ data/lib/api/user/user_models.freezed.dart | 22 ++++++++++++------- data/lib/api/user/user_models.g.dart | 8 ------- khelo/lib/components/match_detail_cell.dart | 2 +- 16 files changed, 49 insertions(+), 48 deletions(-) diff --git a/data/lib/api/ball_score/ball_score_model.dart b/data/lib/api/ball_score/ball_score_model.dart index 0aa2dcd0..8d1aa92b 100644 --- a/data/lib/api/ball_score/ball_score_model.dart +++ b/data/lib/api/ball_score/ball_score_model.dart @@ -32,6 +32,7 @@ class BallScoreModel with _$BallScoreModel { String? wicket_taker_id, required bool is_four, required bool is_six, + @JsonKey(includeFromJson: false) DateTime? time, @TimeStampJsonConverter() DateTime? time2, }) = _BallScoreModel; diff --git a/data/lib/api/ball_score/ball_score_model.freezed.dart b/data/lib/api/ball_score/ball_score_model.freezed.dart index 8235013e..4dac9e28 100644 --- a/data/lib/api/ball_score/ball_score_model.freezed.dart +++ b/data/lib/api/ball_score/ball_score_model.freezed.dart @@ -38,6 +38,7 @@ mixin _$BallScoreModel { String? get wicket_taker_id => throw _privateConstructorUsedError; bool get is_four => throw _privateConstructorUsedError; bool get is_six => throw _privateConstructorUsedError; + @JsonKey(includeFromJson: false) DateTime? get time => throw _privateConstructorUsedError; @TimeStampJsonConverter() DateTime? get time2 => throw _privateConstructorUsedError; @@ -72,7 +73,7 @@ abstract class $BallScoreModelCopyWith<$Res> { String? wicket_taker_id, bool is_four, bool is_six, - DateTime? time, + @JsonKey(includeFromJson: false) DateTime? time, @TimeStampJsonConverter() DateTime? time2}); } @@ -216,7 +217,7 @@ abstract class _$$BallScoreModelImplCopyWith<$Res> String? wicket_taker_id, bool is_four, bool is_six, - DateTime? time, + @JsonKey(includeFromJson: false) DateTime? time, @TimeStampJsonConverter() DateTime? time2}); } @@ -353,7 +354,7 @@ class _$BallScoreModelImpl implements _BallScoreModel { this.wicket_taker_id, required this.is_four, required this.is_six, - this.time, + @JsonKey(includeFromJson: false) this.time, @TimeStampJsonConverter() this.time2}); factory _$BallScoreModelImpl.fromJson(Map json) => @@ -394,6 +395,7 @@ class _$BallScoreModelImpl implements _BallScoreModel { @override final bool is_six; @override + @JsonKey(includeFromJson: false) final DateTime? time; @override @TimeStampJsonConverter() @@ -503,7 +505,7 @@ abstract class _BallScoreModel implements BallScoreModel { final String? wicket_taker_id, required final bool is_four, required final bool is_six, - final DateTime? time, + @JsonKey(includeFromJson: false) final DateTime? time, @TimeStampJsonConverter() final DateTime? time2}) = _$BallScoreModelImpl; factory _BallScoreModel.fromJson(Map json) = @@ -544,6 +546,7 @@ abstract class _BallScoreModel implements BallScoreModel { @override bool get is_six; @override + @JsonKey(includeFromJson: false) DateTime? get time; @override @TimeStampJsonConverter() diff --git a/data/lib/api/ball_score/ball_score_model.g.dart b/data/lib/api/ball_score/ball_score_model.g.dart index 37553b42..4d606271 100644 --- a/data/lib/api/ball_score/ball_score_model.g.dart +++ b/data/lib/api/ball_score/ball_score_model.g.dart @@ -28,8 +28,6 @@ _$BallScoreModelImpl _$$BallScoreModelImplFromJson(Map json) => wicket_taker_id: json['wicket_taker_id'] as String?, is_four: json['is_four'] as bool, is_six: json['is_six'] as bool, - time: - json['time'] == null ? null : DateTime.parse(json['time'] as String), time2: _$JsonConverterFromJson( json['time2'], const TimeStampJsonConverter().fromJson), ); @@ -55,7 +53,6 @@ Map _$$BallScoreModelImplToJson( 'wicket_taker_id': instance.wicket_taker_id, 'is_four': instance.is_four, 'is_six': instance.is_six, - 'time': instance.time?.toIso8601String(), 'time2': _$JsonConverterToJson( instance.time2, const TimeStampJsonConverter().toJson), }; diff --git a/data/lib/api/match/match_model.dart b/data/lib/api/match/match_model.dart index deaabf78..9a0d7635 100644 --- a/data/lib/api/match/match_model.dart +++ b/data/lib/api/match/match_model.dart @@ -28,6 +28,7 @@ class MatchModel with _$MatchModel { @Default([]) List power_play_overs3, required String city, required String ground, + @JsonKey(includeFromJson: false) DateTime? start_time, @TimeStampJsonConverter() DateTime? start_time2, required BallType ball_type, diff --git a/data/lib/api/match/match_model.freezed.dart b/data/lib/api/match/match_model.freezed.dart index adf0e31c..07d274b3 100644 --- a/data/lib/api/match/match_model.freezed.dart +++ b/data/lib/api/match/match_model.freezed.dart @@ -33,6 +33,7 @@ mixin _$MatchModel { List get power_play_overs3 => throw _privateConstructorUsedError; String get city => throw _privateConstructorUsedError; String get ground => throw _privateConstructorUsedError; + @JsonKey(includeFromJson: false) DateTime? get start_time => throw _privateConstructorUsedError; @TimeStampJsonConverter() DateTime? get start_time2 => throw _privateConstructorUsedError; @@ -83,7 +84,7 @@ abstract class $MatchModelCopyWith<$Res> { List power_play_overs3, String city, String ground, - DateTime? start_time, + @JsonKey(includeFromJson: false) DateTime? start_time, @TimeStampJsonConverter() DateTime? start_time2, BallType ball_type, PitchType pitch_type, @@ -329,7 +330,7 @@ abstract class _$$MatchModelImplCopyWith<$Res> List power_play_overs3, String city, String ground, - DateTime? start_time, + @JsonKey(includeFromJson: false) DateTime? start_time, @TimeStampJsonConverter() DateTime? start_time2, BallType ball_type, PitchType pitch_type, @@ -547,7 +548,7 @@ class _$MatchModelImpl implements _MatchModel { final List power_play_overs3 = const [], required this.city, required this.ground, - this.start_time, + @JsonKey(includeFromJson: false) this.start_time, @TimeStampJsonConverter() this.start_time2, required this.ball_type, required this.pitch_type, @@ -664,6 +665,7 @@ class _$MatchModelImpl implements _MatchModel { @override final String ground; @override + @JsonKey(includeFromJson: false) final DateTime? start_time; @override @TimeStampJsonConverter() @@ -885,7 +887,7 @@ abstract class _MatchModel implements MatchModel { final List power_play_overs3, required final String city, required final String ground, - final DateTime? start_time, + @JsonKey(includeFromJson: false) final DateTime? start_time, @TimeStampJsonConverter() final DateTime? start_time2, required final BallType ball_type, required final PitchType pitch_type, @@ -938,6 +940,7 @@ abstract class _MatchModel implements MatchModel { @override String get ground; @override + @JsonKey(includeFromJson: false) DateTime? get start_time; @override @TimeStampJsonConverter() diff --git a/data/lib/api/match/match_model.g.dart b/data/lib/api/match/match_model.g.dart index 0e811862..1afbad28 100644 --- a/data/lib/api/match/match_model.g.dart +++ b/data/lib/api/match/match_model.g.dart @@ -41,9 +41,6 @@ _$MatchModelImpl _$$MatchModelImplFromJson(Map json) => _$MatchModelImpl( const [], city: json['city'] as String, ground: json['ground'] as String, - start_time: json['start_time'] == null - ? null - : DateTime.parse(json['start_time'] as String), start_time2: _$JsonConverterFromJson( json['start_time2'], const TimeStampJsonConverter().fromJson), ball_type: $enumDecode(_$BallTypeEnumMap, json['ball_type']), @@ -85,7 +82,6 @@ Map _$$MatchModelImplToJson(_$MatchModelImpl instance) => 'power_play_overs3': instance.power_play_overs3, 'city': instance.city, 'ground': instance.ground, - 'start_time': instance.start_time?.toIso8601String(), 'start_time2': _$JsonConverterToJson( instance.start_time2, const TimeStampJsonConverter().toJson), 'ball_type': _$BallTypeEnumMap[instance.ball_type]!, diff --git a/data/lib/api/support/support_models.dart b/data/lib/api/support/support_models.dart index ff408654..642c7088 100644 --- a/data/lib/api/support/support_models.dart +++ b/data/lib/api/support/support_models.dart @@ -15,6 +15,7 @@ class AddSupportCaseRequest with _$AddSupportCaseRequest { String? description, @Default([]) List attachmentUrls, required String userId, + @JsonKey(includeFromJson: false) DateTime? createdAt, @TimeStampJsonConverter() DateTime? createdAt2, }) = _AddSupportCaseRequest; diff --git a/data/lib/api/support/support_models.freezed.dart b/data/lib/api/support/support_models.freezed.dart index af0c3653..5dce8b9f 100644 --- a/data/lib/api/support/support_models.freezed.dart +++ b/data/lib/api/support/support_models.freezed.dart @@ -26,6 +26,7 @@ mixin _$AddSupportCaseRequest { String? get description => throw _privateConstructorUsedError; List get attachmentUrls => throw _privateConstructorUsedError; String get userId => throw _privateConstructorUsedError; + @JsonKey(includeFromJson: false) DateTime? get createdAt => throw _privateConstructorUsedError; @TimeStampJsonConverter() DateTime? get createdAt2 => throw _privateConstructorUsedError; @@ -48,7 +49,7 @@ abstract class $AddSupportCaseRequestCopyWith<$Res> { String? description, List attachmentUrls, String userId, - DateTime? createdAt, + @JsonKey(includeFromJson: false) DateTime? createdAt, @TimeStampJsonConverter() DateTime? createdAt2}); } @@ -122,7 +123,7 @@ abstract class _$$AddSupportCaseRequestImplCopyWith<$Res> String? description, List attachmentUrls, String userId, - DateTime? createdAt, + @JsonKey(includeFromJson: false) DateTime? createdAt, @TimeStampJsonConverter() DateTime? createdAt2}); } @@ -188,7 +189,7 @@ class _$AddSupportCaseRequestImpl implements _AddSupportCaseRequest { this.description, final List attachmentUrls = const [], required this.userId, - this.createdAt, + @JsonKey(includeFromJson: false) this.createdAt, @TimeStampJsonConverter() this.createdAt2}) : _attachmentUrls = attachmentUrls; @@ -213,6 +214,7 @@ class _$AddSupportCaseRequestImpl implements _AddSupportCaseRequest { @override final String userId; @override + @JsonKey(includeFromJson: false) final DateTime? createdAt; @override @TimeStampJsonConverter() @@ -275,7 +277,7 @@ abstract class _AddSupportCaseRequest implements AddSupportCaseRequest { final String? description, final List attachmentUrls, required final String userId, - final DateTime? createdAt, + @JsonKey(includeFromJson: false) final DateTime? createdAt, @TimeStampJsonConverter() final DateTime? createdAt2}) = _$AddSupportCaseRequestImpl; @@ -293,6 +295,7 @@ abstract class _AddSupportCaseRequest implements AddSupportCaseRequest { @override String get userId; @override + @JsonKey(includeFromJson: false) DateTime? get createdAt; @override @TimeStampJsonConverter() diff --git a/data/lib/api/support/support_models.g.dart b/data/lib/api/support/support_models.g.dart index be810f63..506d718b 100644 --- a/data/lib/api/support/support_models.g.dart +++ b/data/lib/api/support/support_models.g.dart @@ -17,9 +17,6 @@ _$AddSupportCaseRequestImpl _$$AddSupportCaseRequestImplFromJson( .toList() ?? const [], userId: json['userId'] as String, - createdAt: json['createdAt'] == null - ? null - : DateTime.parse(json['createdAt'] as String), createdAt2: _$JsonConverterFromJson( json['createdAt2'], const TimeStampJsonConverter().fromJson), ); @@ -32,7 +29,6 @@ Map _$$AddSupportCaseRequestImplToJson( 'description': instance.description, 'attachmentUrls': instance.attachmentUrls, 'userId': instance.userId, - 'createdAt': instance.createdAt?.toIso8601String(), 'createdAt2': _$JsonConverterToJson( instance.createdAt2, const TimeStampJsonConverter().toJson), }; diff --git a/data/lib/api/team/team_model.dart b/data/lib/api/team/team_model.dart index 274009df..cbb45eb9 100644 --- a/data/lib/api/team/team_model.dart +++ b/data/lib/api/team/team_model.dart @@ -20,6 +20,7 @@ abstract class TeamModel with _$TeamModel { String? city, String? profile_img_url, String? created_by, + @JsonKey(includeFromJson: false) DateTime? created_at, @TimeStampJsonConverter() DateTime? created_at2, @JsonKey(name: FireStoreConst.teamPlayers) diff --git a/data/lib/api/team/team_model.freezed.dart b/data/lib/api/team/team_model.freezed.dart index 4371ed94..18d56647 100644 --- a/data/lib/api/team/team_model.freezed.dart +++ b/data/lib/api/team/team_model.freezed.dart @@ -26,6 +26,7 @@ mixin _$TeamModel { String? get city => throw _privateConstructorUsedError; String? get profile_img_url => throw _privateConstructorUsedError; String? get created_by => throw _privateConstructorUsedError; + @JsonKey(includeFromJson: false) DateTime? get created_at => throw _privateConstructorUsedError; @TimeStampJsonConverter() DateTime? get created_at2 => throw _privateConstructorUsedError; @@ -50,7 +51,7 @@ abstract class $TeamModelCopyWith<$Res> { String? city, String? profile_img_url, String? created_by, - DateTime? created_at, + @JsonKey(includeFromJson: false) DateTime? created_at, @TimeStampJsonConverter() DateTime? created_at2, @JsonKey(name: FireStoreConst.teamPlayers) List players}); } @@ -134,7 +135,7 @@ abstract class _$$TeamModelImplCopyWith<$Res> String? city, String? profile_img_url, String? created_by, - DateTime? created_at, + @JsonKey(includeFromJson: false) DateTime? created_at, @TimeStampJsonConverter() DateTime? created_at2, @JsonKey(name: FireStoreConst.teamPlayers) List players}); } @@ -212,7 +213,7 @@ class _$TeamModelImpl implements _TeamModel { this.city, this.profile_img_url, this.created_by, - this.created_at, + @JsonKey(includeFromJson: false) this.created_at, @TimeStampJsonConverter() this.created_at2, @JsonKey(name: FireStoreConst.teamPlayers) final List players = const []}) @@ -234,6 +235,7 @@ class _$TeamModelImpl implements _TeamModel { @override final String? created_by; @override + @JsonKey(includeFromJson: false) final DateTime? created_at; @override @TimeStampJsonConverter() @@ -309,7 +311,7 @@ abstract class _TeamModel implements TeamModel { final String? city, final String? profile_img_url, final String? created_by, - final DateTime? created_at, + @JsonKey(includeFromJson: false) final DateTime? created_at, @TimeStampJsonConverter() final DateTime? created_at2, @JsonKey(name: FireStoreConst.teamPlayers) final List players}) = _$TeamModelImpl; @@ -330,6 +332,7 @@ abstract class _TeamModel implements TeamModel { @override String? get created_by; @override + @JsonKey(includeFromJson: false) DateTime? get created_at; @override @TimeStampJsonConverter() diff --git a/data/lib/api/team/team_model.g.dart b/data/lib/api/team/team_model.g.dart index f545e3c5..ae9b4cb7 100644 --- a/data/lib/api/team/team_model.g.dart +++ b/data/lib/api/team/team_model.g.dart @@ -14,9 +14,6 @@ _$TeamModelImpl _$$TeamModelImplFromJson(Map json) => city: json['city'] as String?, profile_img_url: json['profile_img_url'] as String?, created_by: json['created_by'] as String?, - created_at: json['created_at'] == null - ? null - : DateTime.parse(json['created_at'] as String), created_at2: _$JsonConverterFromJson( json['created_at2'], const TimeStampJsonConverter().fromJson), players: (json['team_players'] as List?) @@ -33,7 +30,6 @@ Map _$$TeamModelImplToJson(_$TeamModelImpl instance) => 'city': instance.city, 'profile_img_url': instance.profile_img_url, 'created_by': instance.created_by, - 'created_at': instance.created_at?.toIso8601String(), 'created_at2': _$JsonConverterToJson( instance.created_at2, const TimeStampJsonConverter().toJson), 'team_players': instance.players.map((e) => e.toJson()).toList(), diff --git a/data/lib/api/user/user_models.dart b/data/lib/api/user/user_models.dart index 57cc8b29..ec2be9d6 100644 --- a/data/lib/api/user/user_models.dart +++ b/data/lib/api/user/user_models.dart @@ -25,7 +25,9 @@ class UserModel with _$UserModel { String? email, String? profile_img_url, UserGender? gender, + @JsonKey(includeFromJson: false) DateTime? created_at, + @JsonKey(includeFromJson: false) DateTime? updated_at, @TimeStampJsonConverter() DateTime? created_at2, @TimeStampJsonConverter() DateTime? updated_at2, diff --git a/data/lib/api/user/user_models.freezed.dart b/data/lib/api/user/user_models.freezed.dart index 956a60bb..7eb7a3a9 100644 --- a/data/lib/api/user/user_models.freezed.dart +++ b/data/lib/api/user/user_models.freezed.dart @@ -29,7 +29,9 @@ mixin _$UserModel { String? get email => throw _privateConstructorUsedError; String? get profile_img_url => throw _privateConstructorUsedError; UserGender? get gender => throw _privateConstructorUsedError; + @JsonKey(includeFromJson: false) DateTime? get created_at => throw _privateConstructorUsedError; + @JsonKey(includeFromJson: false) DateTime? get updated_at => throw _privateConstructorUsedError; @TimeStampJsonConverter() DateTime? get created_at2 => throw _privateConstructorUsedError; @@ -61,8 +63,8 @@ abstract class $UserModelCopyWith<$Res> { String? email, String? profile_img_url, UserGender? gender, - DateTime? created_at, - DateTime? updated_at, + @JsonKey(includeFromJson: false) DateTime? created_at, + @JsonKey(includeFromJson: false) DateTime? updated_at, @TimeStampJsonConverter() DateTime? created_at2, @TimeStampJsonConverter() DateTime? updated_at2, PlayerRole? player_role, @@ -193,8 +195,8 @@ abstract class _$$UserModelImplCopyWith<$Res> String? email, String? profile_img_url, UserGender? gender, - DateTime? created_at, - DateTime? updated_at, + @JsonKey(includeFromJson: false) DateTime? created_at, + @JsonKey(includeFromJson: false) DateTime? updated_at, @TimeStampJsonConverter() DateTime? created_at2, @TimeStampJsonConverter() DateTime? updated_at2, PlayerRole? player_role, @@ -318,8 +320,8 @@ class _$UserModelImpl extends _UserModel { this.email, this.profile_img_url, this.gender, - this.created_at, - this.updated_at, + @JsonKey(includeFromJson: false) this.created_at, + @JsonKey(includeFromJson: false) this.updated_at, @TimeStampJsonConverter() this.created_at2, @TimeStampJsonConverter() this.updated_at2, this.player_role, @@ -350,8 +352,10 @@ class _$UserModelImpl extends _UserModel { @override final UserGender? gender; @override + @JsonKey(includeFromJson: false) final DateTime? created_at; @override + @JsonKey(includeFromJson: false) final DateTime? updated_at; @override @TimeStampJsonConverter() @@ -456,8 +460,8 @@ abstract class _UserModel extends UserModel { final String? email, final String? profile_img_url, final UserGender? gender, - final DateTime? created_at, - final DateTime? updated_at, + @JsonKey(includeFromJson: false) final DateTime? created_at, + @JsonKey(includeFromJson: false) final DateTime? updated_at, @TimeStampJsonConverter() final DateTime? created_at2, @TimeStampJsonConverter() final DateTime? updated_at2, final PlayerRole? player_role, @@ -488,8 +492,10 @@ abstract class _UserModel extends UserModel { @override UserGender? get gender; @override + @JsonKey(includeFromJson: false) DateTime? get created_at; @override + @JsonKey(includeFromJson: false) DateTime? get updated_at; @override @TimeStampJsonConverter() diff --git a/data/lib/api/user/user_models.g.dart b/data/lib/api/user/user_models.g.dart index a147430c..f0f8a687 100644 --- a/data/lib/api/user/user_models.g.dart +++ b/data/lib/api/user/user_models.g.dart @@ -17,12 +17,6 @@ _$UserModelImpl _$$UserModelImplFromJson(Map json) => email: json['email'] as String?, profile_img_url: json['profile_img_url'] as String?, gender: $enumDecodeNullable(_$UserGenderEnumMap, json['gender']), - created_at: json['created_at'] == null - ? null - : DateTime.parse(json['created_at'] as String), - updated_at: json['updated_at'] == null - ? null - : DateTime.parse(json['updated_at'] as String), created_at2: _$JsonConverterFromJson( json['created_at2'], const TimeStampJsonConverter().fromJson), updated_at2: _$JsonConverterFromJson( @@ -47,8 +41,6 @@ Map _$$UserModelImplToJson(_$UserModelImpl instance) => 'email': instance.email, 'profile_img_url': instance.profile_img_url, 'gender': _$UserGenderEnumMap[instance.gender], - 'created_at': instance.created_at?.toIso8601String(), - 'updated_at': instance.updated_at?.toIso8601String(), 'created_at2': _$JsonConverterToJson( instance.created_at2, const TimeStampJsonConverter().toJson), 'updated_at2': _$JsonConverterToJson( diff --git a/khelo/lib/components/match_detail_cell.dart b/khelo/lib/components/match_detail_cell.dart index 8b9393b6..44664bbd 100644 --- a/khelo/lib/components/match_detail_cell.dart +++ b/khelo/lib/components/match_detail_cell.dart @@ -80,7 +80,7 @@ class MatchDetailCell extends StatelessWidget { Flexible( flex: 2, child: Text( - (match.start_time2 ?? match.start_time)! + (match.start_time2 ?? match.start_time ?? DateTime.now()) .format(context, DateFormatType.dateAndTime), style: AppTextStyle.caption .copyWith(color: context.colorScheme.textDisabled)), From 4fbe7ca0e7223141d55d19615ed6149c9937ad29 Mon Sep 17 00:00:00 2001 From: cp-mayank-v Date: Tue, 10 Sep 2024 18:05:42 +0530 Subject: [PATCH 4/8] Minor changes --- data/lib/api/ball_score/ball_score_model.dart | 1 - .../ball_score/ball_score_model.freezed.dart | 11 ++++------ .../api/ball_score/ball_score_model.g.dart | 3 +++ data/lib/api/match/match_model.dart | 1 - data/lib/api/match/match_model.freezed.dart | 11 ++++------ data/lib/api/match/match_model.g.dart | 4 ++++ data/lib/api/support/support_models.dart | 1 - .../api/support/support_models.freezed.dart | 11 ++++------ data/lib/api/support/support_models.g.dart | 4 ++++ data/lib/api/team/team_model.dart | 1 - data/lib/api/team/team_model.freezed.dart | 11 ++++------ data/lib/api/team/team_model.g.dart | 4 ++++ data/lib/api/user/user_models.dart | 2 -- data/lib/api/user/user_models.freezed.dart | 22 +++++++------------ data/lib/api/user/user_models.g.dart | 8 +++++++ .../add_match/add_match_view_model.dart | 1 + .../score_board/score_board_view_model.dart | 1 + 17 files changed, 49 insertions(+), 48 deletions(-) diff --git a/data/lib/api/ball_score/ball_score_model.dart b/data/lib/api/ball_score/ball_score_model.dart index 8d1aa92b..0aa2dcd0 100644 --- a/data/lib/api/ball_score/ball_score_model.dart +++ b/data/lib/api/ball_score/ball_score_model.dart @@ -32,7 +32,6 @@ class BallScoreModel with _$BallScoreModel { String? wicket_taker_id, required bool is_four, required bool is_six, - @JsonKey(includeFromJson: false) DateTime? time, @TimeStampJsonConverter() DateTime? time2, }) = _BallScoreModel; diff --git a/data/lib/api/ball_score/ball_score_model.freezed.dart b/data/lib/api/ball_score/ball_score_model.freezed.dart index 4dac9e28..8235013e 100644 --- a/data/lib/api/ball_score/ball_score_model.freezed.dart +++ b/data/lib/api/ball_score/ball_score_model.freezed.dart @@ -38,7 +38,6 @@ mixin _$BallScoreModel { String? get wicket_taker_id => throw _privateConstructorUsedError; bool get is_four => throw _privateConstructorUsedError; bool get is_six => throw _privateConstructorUsedError; - @JsonKey(includeFromJson: false) DateTime? get time => throw _privateConstructorUsedError; @TimeStampJsonConverter() DateTime? get time2 => throw _privateConstructorUsedError; @@ -73,7 +72,7 @@ abstract class $BallScoreModelCopyWith<$Res> { String? wicket_taker_id, bool is_four, bool is_six, - @JsonKey(includeFromJson: false) DateTime? time, + DateTime? time, @TimeStampJsonConverter() DateTime? time2}); } @@ -217,7 +216,7 @@ abstract class _$$BallScoreModelImplCopyWith<$Res> String? wicket_taker_id, bool is_four, bool is_six, - @JsonKey(includeFromJson: false) DateTime? time, + DateTime? time, @TimeStampJsonConverter() DateTime? time2}); } @@ -354,7 +353,7 @@ class _$BallScoreModelImpl implements _BallScoreModel { this.wicket_taker_id, required this.is_four, required this.is_six, - @JsonKey(includeFromJson: false) this.time, + this.time, @TimeStampJsonConverter() this.time2}); factory _$BallScoreModelImpl.fromJson(Map json) => @@ -395,7 +394,6 @@ class _$BallScoreModelImpl implements _BallScoreModel { @override final bool is_six; @override - @JsonKey(includeFromJson: false) final DateTime? time; @override @TimeStampJsonConverter() @@ -505,7 +503,7 @@ abstract class _BallScoreModel implements BallScoreModel { final String? wicket_taker_id, required final bool is_four, required final bool is_six, - @JsonKey(includeFromJson: false) final DateTime? time, + final DateTime? time, @TimeStampJsonConverter() final DateTime? time2}) = _$BallScoreModelImpl; factory _BallScoreModel.fromJson(Map json) = @@ -546,7 +544,6 @@ abstract class _BallScoreModel implements BallScoreModel { @override bool get is_six; @override - @JsonKey(includeFromJson: false) DateTime? get time; @override @TimeStampJsonConverter() diff --git a/data/lib/api/ball_score/ball_score_model.g.dart b/data/lib/api/ball_score/ball_score_model.g.dart index 4d606271..37553b42 100644 --- a/data/lib/api/ball_score/ball_score_model.g.dart +++ b/data/lib/api/ball_score/ball_score_model.g.dart @@ -28,6 +28,8 @@ _$BallScoreModelImpl _$$BallScoreModelImplFromJson(Map json) => wicket_taker_id: json['wicket_taker_id'] as String?, is_four: json['is_four'] as bool, is_six: json['is_six'] as bool, + time: + json['time'] == null ? null : DateTime.parse(json['time'] as String), time2: _$JsonConverterFromJson( json['time2'], const TimeStampJsonConverter().fromJson), ); @@ -53,6 +55,7 @@ Map _$$BallScoreModelImplToJson( 'wicket_taker_id': instance.wicket_taker_id, 'is_four': instance.is_four, 'is_six': instance.is_six, + 'time': instance.time?.toIso8601String(), 'time2': _$JsonConverterToJson( instance.time2, const TimeStampJsonConverter().toJson), }; diff --git a/data/lib/api/match/match_model.dart b/data/lib/api/match/match_model.dart index 9a0d7635..deaabf78 100644 --- a/data/lib/api/match/match_model.dart +++ b/data/lib/api/match/match_model.dart @@ -28,7 +28,6 @@ class MatchModel with _$MatchModel { @Default([]) List power_play_overs3, required String city, required String ground, - @JsonKey(includeFromJson: false) DateTime? start_time, @TimeStampJsonConverter() DateTime? start_time2, required BallType ball_type, diff --git a/data/lib/api/match/match_model.freezed.dart b/data/lib/api/match/match_model.freezed.dart index 07d274b3..adf0e31c 100644 --- a/data/lib/api/match/match_model.freezed.dart +++ b/data/lib/api/match/match_model.freezed.dart @@ -33,7 +33,6 @@ mixin _$MatchModel { List get power_play_overs3 => throw _privateConstructorUsedError; String get city => throw _privateConstructorUsedError; String get ground => throw _privateConstructorUsedError; - @JsonKey(includeFromJson: false) DateTime? get start_time => throw _privateConstructorUsedError; @TimeStampJsonConverter() DateTime? get start_time2 => throw _privateConstructorUsedError; @@ -84,7 +83,7 @@ abstract class $MatchModelCopyWith<$Res> { List power_play_overs3, String city, String ground, - @JsonKey(includeFromJson: false) DateTime? start_time, + DateTime? start_time, @TimeStampJsonConverter() DateTime? start_time2, BallType ball_type, PitchType pitch_type, @@ -330,7 +329,7 @@ abstract class _$$MatchModelImplCopyWith<$Res> List power_play_overs3, String city, String ground, - @JsonKey(includeFromJson: false) DateTime? start_time, + DateTime? start_time, @TimeStampJsonConverter() DateTime? start_time2, BallType ball_type, PitchType pitch_type, @@ -548,7 +547,7 @@ class _$MatchModelImpl implements _MatchModel { final List power_play_overs3 = const [], required this.city, required this.ground, - @JsonKey(includeFromJson: false) this.start_time, + this.start_time, @TimeStampJsonConverter() this.start_time2, required this.ball_type, required this.pitch_type, @@ -665,7 +664,6 @@ class _$MatchModelImpl implements _MatchModel { @override final String ground; @override - @JsonKey(includeFromJson: false) final DateTime? start_time; @override @TimeStampJsonConverter() @@ -887,7 +885,7 @@ abstract class _MatchModel implements MatchModel { final List power_play_overs3, required final String city, required final String ground, - @JsonKey(includeFromJson: false) final DateTime? start_time, + final DateTime? start_time, @TimeStampJsonConverter() final DateTime? start_time2, required final BallType ball_type, required final PitchType pitch_type, @@ -940,7 +938,6 @@ abstract class _MatchModel implements MatchModel { @override String get ground; @override - @JsonKey(includeFromJson: false) DateTime? get start_time; @override @TimeStampJsonConverter() diff --git a/data/lib/api/match/match_model.g.dart b/data/lib/api/match/match_model.g.dart index 1afbad28..0e811862 100644 --- a/data/lib/api/match/match_model.g.dart +++ b/data/lib/api/match/match_model.g.dart @@ -41,6 +41,9 @@ _$MatchModelImpl _$$MatchModelImplFromJson(Map json) => _$MatchModelImpl( const [], city: json['city'] as String, ground: json['ground'] as String, + start_time: json['start_time'] == null + ? null + : DateTime.parse(json['start_time'] as String), start_time2: _$JsonConverterFromJson( json['start_time2'], const TimeStampJsonConverter().fromJson), ball_type: $enumDecode(_$BallTypeEnumMap, json['ball_type']), @@ -82,6 +85,7 @@ Map _$$MatchModelImplToJson(_$MatchModelImpl instance) => 'power_play_overs3': instance.power_play_overs3, 'city': instance.city, 'ground': instance.ground, + 'start_time': instance.start_time?.toIso8601String(), 'start_time2': _$JsonConverterToJson( instance.start_time2, const TimeStampJsonConverter().toJson), 'ball_type': _$BallTypeEnumMap[instance.ball_type]!, diff --git a/data/lib/api/support/support_models.dart b/data/lib/api/support/support_models.dart index 642c7088..ff408654 100644 --- a/data/lib/api/support/support_models.dart +++ b/data/lib/api/support/support_models.dart @@ -15,7 +15,6 @@ class AddSupportCaseRequest with _$AddSupportCaseRequest { String? description, @Default([]) List attachmentUrls, required String userId, - @JsonKey(includeFromJson: false) DateTime? createdAt, @TimeStampJsonConverter() DateTime? createdAt2, }) = _AddSupportCaseRequest; diff --git a/data/lib/api/support/support_models.freezed.dart b/data/lib/api/support/support_models.freezed.dart index 5dce8b9f..af0c3653 100644 --- a/data/lib/api/support/support_models.freezed.dart +++ b/data/lib/api/support/support_models.freezed.dart @@ -26,7 +26,6 @@ mixin _$AddSupportCaseRequest { String? get description => throw _privateConstructorUsedError; List get attachmentUrls => throw _privateConstructorUsedError; String get userId => throw _privateConstructorUsedError; - @JsonKey(includeFromJson: false) DateTime? get createdAt => throw _privateConstructorUsedError; @TimeStampJsonConverter() DateTime? get createdAt2 => throw _privateConstructorUsedError; @@ -49,7 +48,7 @@ abstract class $AddSupportCaseRequestCopyWith<$Res> { String? description, List attachmentUrls, String userId, - @JsonKey(includeFromJson: false) DateTime? createdAt, + DateTime? createdAt, @TimeStampJsonConverter() DateTime? createdAt2}); } @@ -123,7 +122,7 @@ abstract class _$$AddSupportCaseRequestImplCopyWith<$Res> String? description, List attachmentUrls, String userId, - @JsonKey(includeFromJson: false) DateTime? createdAt, + DateTime? createdAt, @TimeStampJsonConverter() DateTime? createdAt2}); } @@ -189,7 +188,7 @@ class _$AddSupportCaseRequestImpl implements _AddSupportCaseRequest { this.description, final List attachmentUrls = const [], required this.userId, - @JsonKey(includeFromJson: false) this.createdAt, + this.createdAt, @TimeStampJsonConverter() this.createdAt2}) : _attachmentUrls = attachmentUrls; @@ -214,7 +213,6 @@ class _$AddSupportCaseRequestImpl implements _AddSupportCaseRequest { @override final String userId; @override - @JsonKey(includeFromJson: false) final DateTime? createdAt; @override @TimeStampJsonConverter() @@ -277,7 +275,7 @@ abstract class _AddSupportCaseRequest implements AddSupportCaseRequest { final String? description, final List attachmentUrls, required final String userId, - @JsonKey(includeFromJson: false) final DateTime? createdAt, + final DateTime? createdAt, @TimeStampJsonConverter() final DateTime? createdAt2}) = _$AddSupportCaseRequestImpl; @@ -295,7 +293,6 @@ abstract class _AddSupportCaseRequest implements AddSupportCaseRequest { @override String get userId; @override - @JsonKey(includeFromJson: false) DateTime? get createdAt; @override @TimeStampJsonConverter() diff --git a/data/lib/api/support/support_models.g.dart b/data/lib/api/support/support_models.g.dart index 506d718b..be810f63 100644 --- a/data/lib/api/support/support_models.g.dart +++ b/data/lib/api/support/support_models.g.dart @@ -17,6 +17,9 @@ _$AddSupportCaseRequestImpl _$$AddSupportCaseRequestImplFromJson( .toList() ?? const [], userId: json['userId'] as String, + createdAt: json['createdAt'] == null + ? null + : DateTime.parse(json['createdAt'] as String), createdAt2: _$JsonConverterFromJson( json['createdAt2'], const TimeStampJsonConverter().fromJson), ); @@ -29,6 +32,7 @@ Map _$$AddSupportCaseRequestImplToJson( 'description': instance.description, 'attachmentUrls': instance.attachmentUrls, 'userId': instance.userId, + 'createdAt': instance.createdAt?.toIso8601String(), 'createdAt2': _$JsonConverterToJson( instance.createdAt2, const TimeStampJsonConverter().toJson), }; diff --git a/data/lib/api/team/team_model.dart b/data/lib/api/team/team_model.dart index cbb45eb9..274009df 100644 --- a/data/lib/api/team/team_model.dart +++ b/data/lib/api/team/team_model.dart @@ -20,7 +20,6 @@ abstract class TeamModel with _$TeamModel { String? city, String? profile_img_url, String? created_by, - @JsonKey(includeFromJson: false) DateTime? created_at, @TimeStampJsonConverter() DateTime? created_at2, @JsonKey(name: FireStoreConst.teamPlayers) diff --git a/data/lib/api/team/team_model.freezed.dart b/data/lib/api/team/team_model.freezed.dart index 18d56647..4371ed94 100644 --- a/data/lib/api/team/team_model.freezed.dart +++ b/data/lib/api/team/team_model.freezed.dart @@ -26,7 +26,6 @@ mixin _$TeamModel { String? get city => throw _privateConstructorUsedError; String? get profile_img_url => throw _privateConstructorUsedError; String? get created_by => throw _privateConstructorUsedError; - @JsonKey(includeFromJson: false) DateTime? get created_at => throw _privateConstructorUsedError; @TimeStampJsonConverter() DateTime? get created_at2 => throw _privateConstructorUsedError; @@ -51,7 +50,7 @@ abstract class $TeamModelCopyWith<$Res> { String? city, String? profile_img_url, String? created_by, - @JsonKey(includeFromJson: false) DateTime? created_at, + DateTime? created_at, @TimeStampJsonConverter() DateTime? created_at2, @JsonKey(name: FireStoreConst.teamPlayers) List players}); } @@ -135,7 +134,7 @@ abstract class _$$TeamModelImplCopyWith<$Res> String? city, String? profile_img_url, String? created_by, - @JsonKey(includeFromJson: false) DateTime? created_at, + DateTime? created_at, @TimeStampJsonConverter() DateTime? created_at2, @JsonKey(name: FireStoreConst.teamPlayers) List players}); } @@ -213,7 +212,7 @@ class _$TeamModelImpl implements _TeamModel { this.city, this.profile_img_url, this.created_by, - @JsonKey(includeFromJson: false) this.created_at, + this.created_at, @TimeStampJsonConverter() this.created_at2, @JsonKey(name: FireStoreConst.teamPlayers) final List players = const []}) @@ -235,7 +234,6 @@ class _$TeamModelImpl implements _TeamModel { @override final String? created_by; @override - @JsonKey(includeFromJson: false) final DateTime? created_at; @override @TimeStampJsonConverter() @@ -311,7 +309,7 @@ abstract class _TeamModel implements TeamModel { final String? city, final String? profile_img_url, final String? created_by, - @JsonKey(includeFromJson: false) final DateTime? created_at, + final DateTime? created_at, @TimeStampJsonConverter() final DateTime? created_at2, @JsonKey(name: FireStoreConst.teamPlayers) final List players}) = _$TeamModelImpl; @@ -332,7 +330,6 @@ abstract class _TeamModel implements TeamModel { @override String? get created_by; @override - @JsonKey(includeFromJson: false) DateTime? get created_at; @override @TimeStampJsonConverter() diff --git a/data/lib/api/team/team_model.g.dart b/data/lib/api/team/team_model.g.dart index ae9b4cb7..f545e3c5 100644 --- a/data/lib/api/team/team_model.g.dart +++ b/data/lib/api/team/team_model.g.dart @@ -14,6 +14,9 @@ _$TeamModelImpl _$$TeamModelImplFromJson(Map json) => city: json['city'] as String?, profile_img_url: json['profile_img_url'] as String?, created_by: json['created_by'] as String?, + created_at: json['created_at'] == null + ? null + : DateTime.parse(json['created_at'] as String), created_at2: _$JsonConverterFromJson( json['created_at2'], const TimeStampJsonConverter().fromJson), players: (json['team_players'] as List?) @@ -30,6 +33,7 @@ Map _$$TeamModelImplToJson(_$TeamModelImpl instance) => 'city': instance.city, 'profile_img_url': instance.profile_img_url, 'created_by': instance.created_by, + 'created_at': instance.created_at?.toIso8601String(), 'created_at2': _$JsonConverterToJson( instance.created_at2, const TimeStampJsonConverter().toJson), 'team_players': instance.players.map((e) => e.toJson()).toList(), diff --git a/data/lib/api/user/user_models.dart b/data/lib/api/user/user_models.dart index ec2be9d6..57cc8b29 100644 --- a/data/lib/api/user/user_models.dart +++ b/data/lib/api/user/user_models.dart @@ -25,9 +25,7 @@ class UserModel with _$UserModel { String? email, String? profile_img_url, UserGender? gender, - @JsonKey(includeFromJson: false) DateTime? created_at, - @JsonKey(includeFromJson: false) DateTime? updated_at, @TimeStampJsonConverter() DateTime? created_at2, @TimeStampJsonConverter() DateTime? updated_at2, diff --git a/data/lib/api/user/user_models.freezed.dart b/data/lib/api/user/user_models.freezed.dart index 7eb7a3a9..956a60bb 100644 --- a/data/lib/api/user/user_models.freezed.dart +++ b/data/lib/api/user/user_models.freezed.dart @@ -29,9 +29,7 @@ mixin _$UserModel { String? get email => throw _privateConstructorUsedError; String? get profile_img_url => throw _privateConstructorUsedError; UserGender? get gender => throw _privateConstructorUsedError; - @JsonKey(includeFromJson: false) DateTime? get created_at => throw _privateConstructorUsedError; - @JsonKey(includeFromJson: false) DateTime? get updated_at => throw _privateConstructorUsedError; @TimeStampJsonConverter() DateTime? get created_at2 => throw _privateConstructorUsedError; @@ -63,8 +61,8 @@ abstract class $UserModelCopyWith<$Res> { String? email, String? profile_img_url, UserGender? gender, - @JsonKey(includeFromJson: false) DateTime? created_at, - @JsonKey(includeFromJson: false) DateTime? updated_at, + DateTime? created_at, + DateTime? updated_at, @TimeStampJsonConverter() DateTime? created_at2, @TimeStampJsonConverter() DateTime? updated_at2, PlayerRole? player_role, @@ -195,8 +193,8 @@ abstract class _$$UserModelImplCopyWith<$Res> String? email, String? profile_img_url, UserGender? gender, - @JsonKey(includeFromJson: false) DateTime? created_at, - @JsonKey(includeFromJson: false) DateTime? updated_at, + DateTime? created_at, + DateTime? updated_at, @TimeStampJsonConverter() DateTime? created_at2, @TimeStampJsonConverter() DateTime? updated_at2, PlayerRole? player_role, @@ -320,8 +318,8 @@ class _$UserModelImpl extends _UserModel { this.email, this.profile_img_url, this.gender, - @JsonKey(includeFromJson: false) this.created_at, - @JsonKey(includeFromJson: false) this.updated_at, + this.created_at, + this.updated_at, @TimeStampJsonConverter() this.created_at2, @TimeStampJsonConverter() this.updated_at2, this.player_role, @@ -352,10 +350,8 @@ class _$UserModelImpl extends _UserModel { @override final UserGender? gender; @override - @JsonKey(includeFromJson: false) final DateTime? created_at; @override - @JsonKey(includeFromJson: false) final DateTime? updated_at; @override @TimeStampJsonConverter() @@ -460,8 +456,8 @@ abstract class _UserModel extends UserModel { final String? email, final String? profile_img_url, final UserGender? gender, - @JsonKey(includeFromJson: false) final DateTime? created_at, - @JsonKey(includeFromJson: false) final DateTime? updated_at, + final DateTime? created_at, + final DateTime? updated_at, @TimeStampJsonConverter() final DateTime? created_at2, @TimeStampJsonConverter() final DateTime? updated_at2, final PlayerRole? player_role, @@ -492,10 +488,8 @@ abstract class _UserModel extends UserModel { @override UserGender? get gender; @override - @JsonKey(includeFromJson: false) DateTime? get created_at; @override - @JsonKey(includeFromJson: false) DateTime? get updated_at; @override @TimeStampJsonConverter() diff --git a/data/lib/api/user/user_models.g.dart b/data/lib/api/user/user_models.g.dart index f0f8a687..a147430c 100644 --- a/data/lib/api/user/user_models.g.dart +++ b/data/lib/api/user/user_models.g.dart @@ -17,6 +17,12 @@ _$UserModelImpl _$$UserModelImplFromJson(Map json) => email: json['email'] as String?, profile_img_url: json['profile_img_url'] as String?, gender: $enumDecodeNullable(_$UserGenderEnumMap, json['gender']), + created_at: json['created_at'] == null + ? null + : DateTime.parse(json['created_at'] as String), + updated_at: json['updated_at'] == null + ? null + : DateTime.parse(json['updated_at'] as String), created_at2: _$JsonConverterFromJson( json['created_at2'], const TimeStampJsonConverter().fromJson), updated_at2: _$JsonConverterFromJson( @@ -41,6 +47,8 @@ Map _$$UserModelImplToJson(_$UserModelImpl instance) => 'email': instance.email, 'profile_img_url': instance.profile_img_url, 'gender': _$UserGenderEnumMap[instance.gender], + 'created_at': instance.created_at?.toIso8601String(), + 'updated_at': instance.updated_at?.toIso8601String(), 'created_at2': _$JsonConverterToJson( instance.created_at2, const TimeStampJsonConverter().toJson), 'updated_at2': _$JsonConverterToJson( diff --git a/khelo/lib/ui/flow/matches/add_match/add_match_view_model.dart b/khelo/lib/ui/flow/matches/add_match/add_match_view_model.dart index 00d82551..4cedc7dc 100644 --- a/khelo/lib/ui/flow/matches/add_match/add_match_view_model.dart +++ b/khelo/lib/ui/flow/matches/add_match/add_match_view_model.dart @@ -183,6 +183,7 @@ class AddMatchViewNotifier extends StateNotifier { power_play_overs3: state.thirdPowerPlay ?? [], city: city, ground: ground, + start_time: state.matchTime, start_time2: state.matchTime, created_by: state.currentUserId ?? state.teamA?.created_by ?? "INVALID ID", diff --git a/khelo/lib/ui/flow/score_board/score_board_view_model.dart b/khelo/lib/ui/flow/score_board/score_board_view_model.dart index 7d824beb..30f555e5 100644 --- a/khelo/lib/ui/flow/score_board/score_board_view_model.dart +++ b/khelo/lib/ui/flow/score_board/score_board_view_model.dart @@ -607,6 +607,7 @@ class ScoreBoardViewNotifier extends StateNotifier { wicket_taker_id: wicketTakerId, wicket_type: wicketType, fielding_position: position, + time: DateTime.now(), time2: DateTime.now(), ); int wicketCount = state.otherInning!.total_wickets; From b17ed79a0c9d257d6cc54491c936db5e987ce988 Mon Sep 17 00:00:00 2001 From: cp-mayank-v Date: Wed, 11 Sep 2024 11:19:19 +0530 Subject: [PATCH 5/8] Minor fixes --- data/lib/api/match/match_model.dart | 1 + data/lib/api/match/match_model.freezed.dart | 46 ++++++++++++++++--- data/lib/api/match/match_model.g.dart | 4 ++ .../score_board/score_board_view_model.dart | 8 +++- 4 files changed, 50 insertions(+), 9 deletions(-) diff --git a/data/lib/api/match/match_model.dart b/data/lib/api/match/match_model.dart index deaabf78..0bb98689 100644 --- a/data/lib/api/match/match_model.dart +++ b/data/lib/api/match/match_model.dart @@ -116,6 +116,7 @@ class RevisedTarget with _$RevisedTarget { @Default(0) int runs, @Default(0) double overs, DateTime? time, + @TimeStampJsonConverter() DateTime? time2, }) = _RevisedTarget; factory RevisedTarget.fromJson(Map json) => diff --git a/data/lib/api/match/match_model.freezed.dart b/data/lib/api/match/match_model.freezed.dart index adf0e31c..4fe05cb1 100644 --- a/data/lib/api/match/match_model.freezed.dart +++ b/data/lib/api/match/match_model.freezed.dart @@ -1710,6 +1710,8 @@ mixin _$RevisedTarget { int get runs => throw _privateConstructorUsedError; double get overs => throw _privateConstructorUsedError; DateTime? get time => throw _privateConstructorUsedError; + @TimeStampJsonConverter() + DateTime? get time2 => throw _privateConstructorUsedError; Map toJson() => throw _privateConstructorUsedError; @JsonKey(ignore: true) @@ -1723,7 +1725,11 @@ abstract class $RevisedTargetCopyWith<$Res> { RevisedTarget value, $Res Function(RevisedTarget) then) = _$RevisedTargetCopyWithImpl<$Res, RevisedTarget>; @useResult - $Res call({int runs, double overs, DateTime? time}); + $Res call( + {int runs, + double overs, + DateTime? time, + @TimeStampJsonConverter() DateTime? time2}); } /// @nodoc @@ -1742,6 +1748,7 @@ class _$RevisedTargetCopyWithImpl<$Res, $Val extends RevisedTarget> Object? runs = null, Object? overs = null, Object? time = freezed, + Object? time2 = freezed, }) { return _then(_value.copyWith( runs: null == runs @@ -1756,6 +1763,10 @@ class _$RevisedTargetCopyWithImpl<$Res, $Val extends RevisedTarget> ? _value.time : time // ignore: cast_nullable_to_non_nullable as DateTime?, + time2: freezed == time2 + ? _value.time2 + : time2 // ignore: cast_nullable_to_non_nullable + as DateTime?, ) as $Val); } } @@ -1768,7 +1779,11 @@ abstract class _$$RevisedTargetImplCopyWith<$Res> __$$RevisedTargetImplCopyWithImpl<$Res>; @override @useResult - $Res call({int runs, double overs, DateTime? time}); + $Res call( + {int runs, + double overs, + DateTime? time, + @TimeStampJsonConverter() DateTime? time2}); } /// @nodoc @@ -1785,6 +1800,7 @@ class __$$RevisedTargetImplCopyWithImpl<$Res> Object? runs = null, Object? overs = null, Object? time = freezed, + Object? time2 = freezed, }) { return _then(_$RevisedTargetImpl( runs: null == runs @@ -1799,6 +1815,10 @@ class __$$RevisedTargetImplCopyWithImpl<$Res> ? _value.time : time // ignore: cast_nullable_to_non_nullable as DateTime?, + time2: freezed == time2 + ? _value.time2 + : time2 // ignore: cast_nullable_to_non_nullable + as DateTime?, )); } } @@ -1806,7 +1826,11 @@ class __$$RevisedTargetImplCopyWithImpl<$Res> /// @nodoc @JsonSerializable() class _$RevisedTargetImpl implements _RevisedTarget { - const _$RevisedTargetImpl({this.runs = 0, this.overs = 0, this.time}); + const _$RevisedTargetImpl( + {this.runs = 0, + this.overs = 0, + this.time, + @TimeStampJsonConverter() this.time2}); factory _$RevisedTargetImpl.fromJson(Map json) => _$$RevisedTargetImplFromJson(json); @@ -1819,10 +1843,13 @@ class _$RevisedTargetImpl implements _RevisedTarget { final double overs; @override final DateTime? time; + @override + @TimeStampJsonConverter() + final DateTime? time2; @override String toString() { - return 'RevisedTarget(runs: $runs, overs: $overs, time: $time)'; + return 'RevisedTarget(runs: $runs, overs: $overs, time: $time, time2: $time2)'; } @override @@ -1832,12 +1859,13 @@ class _$RevisedTargetImpl implements _RevisedTarget { other is _$RevisedTargetImpl && (identical(other.runs, runs) || other.runs == runs) && (identical(other.overs, overs) || other.overs == overs) && - (identical(other.time, time) || other.time == time)); + (identical(other.time, time) || other.time == time) && + (identical(other.time2, time2) || other.time2 == time2)); } @JsonKey(ignore: true) @override - int get hashCode => Object.hash(runtimeType, runs, overs, time); + int get hashCode => Object.hash(runtimeType, runs, overs, time, time2); @JsonKey(ignore: true) @override @@ -1857,7 +1885,8 @@ abstract class _RevisedTarget implements RevisedTarget { const factory _RevisedTarget( {final int runs, final double overs, - final DateTime? time}) = _$RevisedTargetImpl; + final DateTime? time, + @TimeStampJsonConverter() final DateTime? time2}) = _$RevisedTargetImpl; factory _RevisedTarget.fromJson(Map json) = _$RevisedTargetImpl.fromJson; @@ -1869,6 +1898,9 @@ abstract class _RevisedTarget implements RevisedTarget { @override DateTime? get time; @override + @TimeStampJsonConverter() + DateTime? get time2; + @override @JsonKey(ignore: true) _$$RevisedTargetImplCopyWith<_$RevisedTargetImpl> get copyWith => throw _privateConstructorUsedError; diff --git a/data/lib/api/match/match_model.g.dart b/data/lib/api/match/match_model.g.dart index 0e811862..8430d0d4 100644 --- a/data/lib/api/match/match_model.g.dart +++ b/data/lib/api/match/match_model.g.dart @@ -225,6 +225,8 @@ _$RevisedTargetImpl _$$RevisedTargetImplFromJson(Map json) => overs: (json['overs'] as num?)?.toDouble() ?? 0, time: json['time'] == null ? null : DateTime.parse(json['time'] as String), + time2: _$JsonConverterFromJson( + json['time2'], const TimeStampJsonConverter().fromJson), ); Map _$$RevisedTargetImplToJson(_$RevisedTargetImpl instance) => @@ -232,4 +234,6 @@ Map _$$RevisedTargetImplToJson(_$RevisedTargetImpl instance) => 'runs': instance.runs, 'overs': instance.overs, 'time': instance.time?.toIso8601String(), + 'time2': _$JsonConverterToJson( + instance.time2, const TimeStampJsonConverter().toJson), }; diff --git a/khelo/lib/ui/flow/score_board/score_board_view_model.dart b/khelo/lib/ui/flow/score_board/score_board_view_model.dart index 30f555e5..75dc8ac3 100644 --- a/khelo/lib/ui/flow/score_board/score_board_view_model.dart +++ b/khelo/lib/ui/flow/score_board/score_board_view_model.dart @@ -1548,8 +1548,12 @@ class ScoreBoardViewNotifier extends StateNotifier { if (matchId == null) { return; } - final revisedTarget = - RevisedTarget(runs: run, overs: over.toDouble(), time: DateTime.now()); + final revisedTarget = RevisedTarget( + runs: run, + overs: over.toDouble(), + time: DateTime.now(), + time2: DateTime.now(), + ); await _matchService.setRevisedTarget( matchId: matchId, revisedTarget: revisedTarget); } From d98b9992e741373fb5e0b9b096e52f3c5baa12a2 Mon Sep 17 00:00:00 2001 From: cp-mayank-v Date: Wed, 11 Sep 2024 11:25:08 +0530 Subject: [PATCH 6/8] Fixed match service --- data/lib/service/match/match_service.dart | 2 ++ 1 file changed, 2 insertions(+) diff --git a/data/lib/service/match/match_service.dart b/data/lib/service/match/match_service.dart index eac50d87..9b224605 100644 --- a/data/lib/service/match/match_service.dart +++ b/data/lib/service/match/match_service.dart @@ -60,6 +60,7 @@ class MatchService { over_per_bowler: 0, city: '', ground: '', + start_time: DateTime.now(), start_time2: DateTime.now(), ball_type: BallType.leather, pitch_type: PitchType.turf, @@ -224,6 +225,7 @@ class MatchService { over_per_bowler: 0, city: '', ground: '', + start_time: DateTime.now(), start_time2: DateTime.now(), ball_type: BallType.leather, pitch_type: PitchType.turf, From a1b08b3679f82496ae01eb69f965fa35b32cef3d Mon Sep 17 00:00:00 2001 From: cp-mayank-v Date: Wed, 11 Sep 2024 14:31:23 +0530 Subject: [PATCH 7/8] minor changes --- data/lib/api/ball_score/ball_score_model.dart | 10 +- .../ball_score/ball_score_model.freezed.dart | 74 +-- .../api/ball_score/ball_score_model.g.dart | 8 +- data/lib/api/match/match_model.dart | 4 +- data/lib/api/match/match_model.freezed.dart | 82 +-- data/lib/api/match/match_model.g.dart | 16 +- data/lib/api/support/support_models.dart | 2 +- .../api/support/support_models.freezed.dart | 38 +- data/lib/api/support/support_models.g.dart | 8 +- data/lib/api/team/team_model.dart | 2 +- data/lib/api/team/team_model.freezed.dart | 38 +- data/lib/api/team/team_model.g.dart | 8 +- data/lib/api/user/user_models.dart | 11 +- data/lib/api/user/user_models.freezed.dart | 476 ++++++++++++++++-- data/lib/api/user/user_models.g.dart | 52 +- data/lib/service/match/match_service.dart | 4 +- data/lib/service/user/user_service.dart | 9 +- data/lib/utils/dummy_deactivated_account.dart | 4 +- khelo/lib/components/match_detail_cell.dart | 2 +- khelo/lib/ui/flow/home/home_screen.dart | 2 +- .../main_screen_state_notifier.freezed.dart | 17 +- .../add_match/add_match_view_model.dart | 4 +- .../components/user_detail_sheet.dart | 2 +- .../components/match_detail_info_view.dart | 2 +- .../match_detail_tab_view_model.dart | 4 +- .../profile/profile_view_model.freezed.dart | 6 +- .../score_board/score_board_view_model.dart | 12 +- .../edit_profile/edit_profile_view_model.dart | 6 +- .../support/contact_support_view_model.dart | 3 +- .../team/add_team/add_team_view_model.dart | 5 +- .../flow/team/detail/team_detail_screen.dart | 2 +- .../component/user_detail_info_content.dart | 2 +- 32 files changed, 684 insertions(+), 231 deletions(-) diff --git a/data/lib/api/ball_score/ball_score_model.dart b/data/lib/api/ball_score/ball_score_model.dart index 0aa2dcd0..beb7aca5 100644 --- a/data/lib/api/ball_score/ball_score_model.dart +++ b/data/lib/api/ball_score/ball_score_model.dart @@ -33,7 +33,7 @@ class BallScoreModel with _$BallScoreModel { required bool is_four, required bool is_six, DateTime? time, - @TimeStampJsonConverter() DateTime? time2, + @TimeStampJsonConverter() DateTime? score_time, }) = _BallScoreModel; factory BallScoreModel.fromJson(Map json) => @@ -320,7 +320,7 @@ extension OverSummaryMetaData on OverSummary { ); DateTime get time => - balls.lastOrNull?.time2 ?? balls.lastOrNull?.time ?? DateTime.now(); + balls.lastOrNull?.score_time ?? balls.lastOrNull?.time ?? DateTime.now(); BowlerSummary get bowlerStatAtStart { final runsInOver = balls @@ -381,7 +381,8 @@ extension OverSummaryMetaData on OverSummary { final ballScores = [...balls, ball].toList(); ballScores.sort( (a, b) => - (a.time2 ?? a.time)?.compareTo(b.time2 ?? b.time ?? DateTime.now()) ?? + (a.score_time ?? a.time) + ?.compareTo(b.score_time ?? b.time ?? DateTime.now()) ?? 0, ); @@ -438,7 +439,8 @@ extension OverSummaryMetaData on OverSummary { ballScores.removeWhere((element) => element.id == ball.id); ballScores.sort( (a, b) => - (a.time2 ?? a.time)?.compareTo(b.time2 ?? b.time ?? DateTime.now()) ?? + (a.score_time ?? a.time) + ?.compareTo(b.score_time ?? b.time ?? DateTime.now()) ?? 0, ); diff --git a/data/lib/api/ball_score/ball_score_model.freezed.dart b/data/lib/api/ball_score/ball_score_model.freezed.dart index 8235013e..db2916ef 100644 --- a/data/lib/api/ball_score/ball_score_model.freezed.dart +++ b/data/lib/api/ball_score/ball_score_model.freezed.dart @@ -40,7 +40,7 @@ mixin _$BallScoreModel { bool get is_six => throw _privateConstructorUsedError; DateTime? get time => throw _privateConstructorUsedError; @TimeStampJsonConverter() - DateTime? get time2 => throw _privateConstructorUsedError; + DateTime? get score_time => throw _privateConstructorUsedError; Map toJson() => throw _privateConstructorUsedError; @JsonKey(ignore: true) @@ -73,7 +73,7 @@ abstract class $BallScoreModelCopyWith<$Res> { bool is_four, bool is_six, DateTime? time, - @TimeStampJsonConverter() DateTime? time2}); + @TimeStampJsonConverter() DateTime? score_time}); } /// @nodoc @@ -107,7 +107,7 @@ class _$BallScoreModelCopyWithImpl<$Res, $Val extends BallScoreModel> Object? is_four = null, Object? is_six = null, Object? time = freezed, - Object? time2 = freezed, + Object? score_time = freezed, }) { return _then(_value.copyWith( id: null == id @@ -182,9 +182,9 @@ class _$BallScoreModelCopyWithImpl<$Res, $Val extends BallScoreModel> ? _value.time : time // ignore: cast_nullable_to_non_nullable as DateTime?, - time2: freezed == time2 - ? _value.time2 - : time2 // ignore: cast_nullable_to_non_nullable + score_time: freezed == score_time + ? _value.score_time + : score_time // ignore: cast_nullable_to_non_nullable as DateTime?, ) as $Val); } @@ -217,7 +217,7 @@ abstract class _$$BallScoreModelImplCopyWith<$Res> bool is_four, bool is_six, DateTime? time, - @TimeStampJsonConverter() DateTime? time2}); + @TimeStampJsonConverter() DateTime? score_time}); } /// @nodoc @@ -249,7 +249,7 @@ class __$$BallScoreModelImplCopyWithImpl<$Res> Object? is_four = null, Object? is_six = null, Object? time = freezed, - Object? time2 = freezed, + Object? score_time = freezed, }) { return _then(_$BallScoreModelImpl( id: null == id @@ -324,9 +324,9 @@ class __$$BallScoreModelImplCopyWithImpl<$Res> ? _value.time : time // ignore: cast_nullable_to_non_nullable as DateTime?, - time2: freezed == time2 - ? _value.time2 - : time2 // ignore: cast_nullable_to_non_nullable + score_time: freezed == score_time + ? _value.score_time + : score_time // ignore: cast_nullable_to_non_nullable as DateTime?, )); } @@ -354,7 +354,7 @@ class _$BallScoreModelImpl implements _BallScoreModel { required this.is_four, required this.is_six, this.time, - @TimeStampJsonConverter() this.time2}); + @TimeStampJsonConverter() this.score_time}); factory _$BallScoreModelImpl.fromJson(Map json) => _$$BallScoreModelImplFromJson(json); @@ -397,11 +397,11 @@ class _$BallScoreModelImpl implements _BallScoreModel { final DateTime? time; @override @TimeStampJsonConverter() - final DateTime? time2; + final DateTime? score_time; @override String toString() { - return 'BallScoreModel(id: $id, inning_id: $inning_id, match_id: $match_id, over_number: $over_number, ball_number: $ball_number, bowler_id: $bowler_id, batsman_id: $batsman_id, non_striker_id: $non_striker_id, runs_scored: $runs_scored, extras_type: $extras_type, extras_awarded: $extras_awarded, wicket_type: $wicket_type, fielding_position: $fielding_position, player_out_id: $player_out_id, wicket_taker_id: $wicket_taker_id, is_four: $is_four, is_six: $is_six, time: $time, time2: $time2)'; + return 'BallScoreModel(id: $id, inning_id: $inning_id, match_id: $match_id, over_number: $over_number, ball_number: $ball_number, bowler_id: $bowler_id, batsman_id: $batsman_id, non_striker_id: $non_striker_id, runs_scored: $runs_scored, extras_type: $extras_type, extras_awarded: $extras_awarded, wicket_type: $wicket_type, fielding_position: $fielding_position, player_out_id: $player_out_id, wicket_taker_id: $wicket_taker_id, is_four: $is_four, is_six: $is_six, time: $time, score_time: $score_time)'; } @override @@ -441,7 +441,8 @@ class _$BallScoreModelImpl implements _BallScoreModel { (identical(other.is_four, is_four) || other.is_four == is_four) && (identical(other.is_six, is_six) || other.is_six == is_six) && (identical(other.time, time) || other.time == time) && - (identical(other.time2, time2) || other.time2 == time2)); + (identical(other.score_time, score_time) || + other.score_time == score_time)); } @JsonKey(ignore: true) @@ -466,7 +467,7 @@ class _$BallScoreModelImpl implements _BallScoreModel { is_four, is_six, time, - time2 + score_time ]); @JsonKey(ignore: true) @@ -486,25 +487,26 @@ class _$BallScoreModelImpl implements _BallScoreModel { abstract class _BallScoreModel implements BallScoreModel { const factory _BallScoreModel( - {required final String id, - required final String inning_id, - required final String match_id, - required final int over_number, - required final int ball_number, - required final String bowler_id, - required final String batsman_id, - required final String non_striker_id, - required final int runs_scored, - final ExtrasType? extras_type, - final int? extras_awarded, - final WicketType? wicket_type, - final FieldingPositionType? fielding_position, - final String? player_out_id, - final String? wicket_taker_id, - required final bool is_four, - required final bool is_six, - final DateTime? time, - @TimeStampJsonConverter() final DateTime? time2}) = _$BallScoreModelImpl; + {required final String id, + required final String inning_id, + required final String match_id, + required final int over_number, + required final int ball_number, + required final String bowler_id, + required final String batsman_id, + required final String non_striker_id, + required final int runs_scored, + final ExtrasType? extras_type, + final int? extras_awarded, + final WicketType? wicket_type, + final FieldingPositionType? fielding_position, + final String? player_out_id, + final String? wicket_taker_id, + required final bool is_four, + required final bool is_six, + final DateTime? time, + @TimeStampJsonConverter() final DateTime? score_time}) = + _$BallScoreModelImpl; factory _BallScoreModel.fromJson(Map json) = _$BallScoreModelImpl.fromJson; @@ -547,7 +549,7 @@ abstract class _BallScoreModel implements BallScoreModel { DateTime? get time; @override @TimeStampJsonConverter() - DateTime? get time2; + DateTime? get score_time; @override @JsonKey(ignore: true) _$$BallScoreModelImplCopyWith<_$BallScoreModelImpl> get copyWith => diff --git a/data/lib/api/ball_score/ball_score_model.g.dart b/data/lib/api/ball_score/ball_score_model.g.dart index 37553b42..912a9272 100644 --- a/data/lib/api/ball_score/ball_score_model.g.dart +++ b/data/lib/api/ball_score/ball_score_model.g.dart @@ -30,8 +30,8 @@ _$BallScoreModelImpl _$$BallScoreModelImplFromJson(Map json) => is_six: json['is_six'] as bool, time: json['time'] == null ? null : DateTime.parse(json['time'] as String), - time2: _$JsonConverterFromJson( - json['time2'], const TimeStampJsonConverter().fromJson), + score_time: _$JsonConverterFromJson( + json['score_time'], const TimeStampJsonConverter().fromJson), ); Map _$$BallScoreModelImplToJson( @@ -56,8 +56,8 @@ Map _$$BallScoreModelImplToJson( 'is_four': instance.is_four, 'is_six': instance.is_six, 'time': instance.time?.toIso8601String(), - 'time2': _$JsonConverterToJson( - instance.time2, const TimeStampJsonConverter().toJson), + 'score_time': _$JsonConverterToJson( + instance.score_time, const TimeStampJsonConverter().toJson), }; const _$ExtrasTypeEnumMap = { diff --git a/data/lib/api/match/match_model.dart b/data/lib/api/match/match_model.dart index 0bb98689..0c315d38 100644 --- a/data/lib/api/match/match_model.dart +++ b/data/lib/api/match/match_model.dart @@ -29,7 +29,7 @@ class MatchModel with _$MatchModel { required String city, required String ground, DateTime? start_time, - @TimeStampJsonConverter() DateTime? start_time2, + @TimeStampJsonConverter() DateTime? start_at, required BallType ball_type, required PitchType pitch_type, required String created_by, @@ -116,7 +116,7 @@ class RevisedTarget with _$RevisedTarget { @Default(0) int runs, @Default(0) double overs, DateTime? time, - @TimeStampJsonConverter() DateTime? time2, + @TimeStampJsonConverter() DateTime? revised_time, }) = _RevisedTarget; factory RevisedTarget.fromJson(Map json) => diff --git a/data/lib/api/match/match_model.freezed.dart b/data/lib/api/match/match_model.freezed.dart index 4fe05cb1..3e830cf8 100644 --- a/data/lib/api/match/match_model.freezed.dart +++ b/data/lib/api/match/match_model.freezed.dart @@ -35,7 +35,7 @@ mixin _$MatchModel { String get ground => throw _privateConstructorUsedError; DateTime? get start_time => throw _privateConstructorUsedError; @TimeStampJsonConverter() - DateTime? get start_time2 => throw _privateConstructorUsedError; + DateTime? get start_at => throw _privateConstructorUsedError; BallType get ball_type => throw _privateConstructorUsedError; PitchType get pitch_type => throw _privateConstructorUsedError; String get created_by => throw _privateConstructorUsedError; @@ -84,7 +84,7 @@ abstract class $MatchModelCopyWith<$Res> { String city, String ground, DateTime? start_time, - @TimeStampJsonConverter() DateTime? start_time2, + @TimeStampJsonConverter() DateTime? start_at, BallType ball_type, PitchType pitch_type, String created_by, @@ -136,7 +136,7 @@ class _$MatchModelCopyWithImpl<$Res, $Val extends MatchModel> Object? city = null, Object? ground = null, Object? start_time = freezed, - Object? start_time2 = freezed, + Object? start_at = freezed, Object? ball_type = null, Object? pitch_type = null, Object? created_by = null, @@ -211,9 +211,9 @@ class _$MatchModelCopyWithImpl<$Res, $Val extends MatchModel> ? _value.start_time : start_time // ignore: cast_nullable_to_non_nullable as DateTime?, - start_time2: freezed == start_time2 - ? _value.start_time2 - : start_time2 // ignore: cast_nullable_to_non_nullable + start_at: freezed == start_at + ? _value.start_at + : start_at // ignore: cast_nullable_to_non_nullable as DateTime?, ball_type: null == ball_type ? _value.ball_type @@ -330,7 +330,7 @@ abstract class _$$MatchModelImplCopyWith<$Res> String city, String ground, DateTime? start_time, - @TimeStampJsonConverter() DateTime? start_time2, + @TimeStampJsonConverter() DateTime? start_at, BallType ball_type, PitchType pitch_type, String created_by, @@ -382,7 +382,7 @@ class __$$MatchModelImplCopyWithImpl<$Res> Object? city = null, Object? ground = null, Object? start_time = freezed, - Object? start_time2 = freezed, + Object? start_at = freezed, Object? ball_type = null, Object? pitch_type = null, Object? created_by = null, @@ -457,9 +457,9 @@ class __$$MatchModelImplCopyWithImpl<$Res> ? _value.start_time : start_time // ignore: cast_nullable_to_non_nullable as DateTime?, - start_time2: freezed == start_time2 - ? _value.start_time2 - : start_time2 // ignore: cast_nullable_to_non_nullable + start_at: freezed == start_at + ? _value.start_at + : start_at // ignore: cast_nullable_to_non_nullable as DateTime?, ball_type: null == ball_type ? _value.ball_type @@ -548,7 +548,7 @@ class _$MatchModelImpl implements _MatchModel { required this.city, required this.ground, this.start_time, - @TimeStampJsonConverter() this.start_time2, + @TimeStampJsonConverter() this.start_at, required this.ball_type, required this.pitch_type, required this.created_by, @@ -667,7 +667,7 @@ class _$MatchModelImpl implements _MatchModel { final DateTime? start_time; @override @TimeStampJsonConverter() - final DateTime? start_time2; + final DateTime? start_at; @override final BallType ball_type; @override @@ -755,7 +755,7 @@ class _$MatchModelImpl implements _MatchModel { @override String toString() { - return 'MatchModel(id: $id, teams: $teams, match_type: $match_type, number_of_over: $number_of_over, over_per_bowler: $over_per_bowler, players: $players, team_ids: $team_ids, team_creator_ids: $team_creator_ids, power_play_overs1: $power_play_overs1, power_play_overs2: $power_play_overs2, power_play_overs3: $power_play_overs3, city: $city, ground: $ground, start_time: $start_time, start_time2: $start_time2, ball_type: $ball_type, pitch_type: $pitch_type, created_by: $created_by, umpires: $umpires, scorers: $scorers, commentators: $commentators, referee: $referee, umpire_ids: $umpire_ids, scorer_ids: $scorer_ids, commentator_ids: $commentator_ids, referee_id: $referee_id, match_status: $match_status, toss_decision: $toss_decision, toss_winner_id: $toss_winner_id, current_playing_team_id: $current_playing_team_id, revised_target: $revised_target)'; + return 'MatchModel(id: $id, teams: $teams, match_type: $match_type, number_of_over: $number_of_over, over_per_bowler: $over_per_bowler, players: $players, team_ids: $team_ids, team_creator_ids: $team_creator_ids, power_play_overs1: $power_play_overs1, power_play_overs2: $power_play_overs2, power_play_overs3: $power_play_overs3, city: $city, ground: $ground, start_time: $start_time, start_at: $start_at, ball_type: $ball_type, pitch_type: $pitch_type, created_by: $created_by, umpires: $umpires, scorers: $scorers, commentators: $commentators, referee: $referee, umpire_ids: $umpire_ids, scorer_ids: $scorer_ids, commentator_ids: $commentator_ids, referee_id: $referee_id, match_status: $match_status, toss_decision: $toss_decision, toss_winner_id: $toss_winner_id, current_playing_team_id: $current_playing_team_id, revised_target: $revised_target)'; } @override @@ -785,8 +785,8 @@ class _$MatchModelImpl implements _MatchModel { (identical(other.ground, ground) || other.ground == ground) && (identical(other.start_time, start_time) || other.start_time == start_time) && - (identical(other.start_time2, start_time2) || - other.start_time2 == start_time2) && + (identical(other.start_at, start_at) || + other.start_at == start_at) && (identical(other.ball_type, ball_type) || other.ball_type == ball_type) && (identical(other.pitch_type, pitch_type) || @@ -837,7 +837,7 @@ class _$MatchModelImpl implements _MatchModel { city, ground, start_time, - start_time2, + start_at, ball_type, pitch_type, created_by, @@ -886,7 +886,7 @@ abstract class _MatchModel implements MatchModel { required final String city, required final String ground, final DateTime? start_time, - @TimeStampJsonConverter() final DateTime? start_time2, + @TimeStampJsonConverter() final DateTime? start_at, required final BallType ball_type, required final PitchType pitch_type, required final String created_by, @@ -941,7 +941,7 @@ abstract class _MatchModel implements MatchModel { DateTime? get start_time; @override @TimeStampJsonConverter() - DateTime? get start_time2; + DateTime? get start_at; @override BallType get ball_type; @override @@ -1711,7 +1711,7 @@ mixin _$RevisedTarget { double get overs => throw _privateConstructorUsedError; DateTime? get time => throw _privateConstructorUsedError; @TimeStampJsonConverter() - DateTime? get time2 => throw _privateConstructorUsedError; + DateTime? get revised_time => throw _privateConstructorUsedError; Map toJson() => throw _privateConstructorUsedError; @JsonKey(ignore: true) @@ -1729,7 +1729,7 @@ abstract class $RevisedTargetCopyWith<$Res> { {int runs, double overs, DateTime? time, - @TimeStampJsonConverter() DateTime? time2}); + @TimeStampJsonConverter() DateTime? revised_time}); } /// @nodoc @@ -1748,7 +1748,7 @@ class _$RevisedTargetCopyWithImpl<$Res, $Val extends RevisedTarget> Object? runs = null, Object? overs = null, Object? time = freezed, - Object? time2 = freezed, + Object? revised_time = freezed, }) { return _then(_value.copyWith( runs: null == runs @@ -1763,9 +1763,9 @@ class _$RevisedTargetCopyWithImpl<$Res, $Val extends RevisedTarget> ? _value.time : time // ignore: cast_nullable_to_non_nullable as DateTime?, - time2: freezed == time2 - ? _value.time2 - : time2 // ignore: cast_nullable_to_non_nullable + revised_time: freezed == revised_time + ? _value.revised_time + : revised_time // ignore: cast_nullable_to_non_nullable as DateTime?, ) as $Val); } @@ -1783,7 +1783,7 @@ abstract class _$$RevisedTargetImplCopyWith<$Res> {int runs, double overs, DateTime? time, - @TimeStampJsonConverter() DateTime? time2}); + @TimeStampJsonConverter() DateTime? revised_time}); } /// @nodoc @@ -1800,7 +1800,7 @@ class __$$RevisedTargetImplCopyWithImpl<$Res> Object? runs = null, Object? overs = null, Object? time = freezed, - Object? time2 = freezed, + Object? revised_time = freezed, }) { return _then(_$RevisedTargetImpl( runs: null == runs @@ -1815,9 +1815,9 @@ class __$$RevisedTargetImplCopyWithImpl<$Res> ? _value.time : time // ignore: cast_nullable_to_non_nullable as DateTime?, - time2: freezed == time2 - ? _value.time2 - : time2 // ignore: cast_nullable_to_non_nullable + revised_time: freezed == revised_time + ? _value.revised_time + : revised_time // ignore: cast_nullable_to_non_nullable as DateTime?, )); } @@ -1830,7 +1830,7 @@ class _$RevisedTargetImpl implements _RevisedTarget { {this.runs = 0, this.overs = 0, this.time, - @TimeStampJsonConverter() this.time2}); + @TimeStampJsonConverter() this.revised_time}); factory _$RevisedTargetImpl.fromJson(Map json) => _$$RevisedTargetImplFromJson(json); @@ -1845,11 +1845,11 @@ class _$RevisedTargetImpl implements _RevisedTarget { final DateTime? time; @override @TimeStampJsonConverter() - final DateTime? time2; + final DateTime? revised_time; @override String toString() { - return 'RevisedTarget(runs: $runs, overs: $overs, time: $time, time2: $time2)'; + return 'RevisedTarget(runs: $runs, overs: $overs, time: $time, revised_time: $revised_time)'; } @override @@ -1860,12 +1860,13 @@ class _$RevisedTargetImpl implements _RevisedTarget { (identical(other.runs, runs) || other.runs == runs) && (identical(other.overs, overs) || other.overs == overs) && (identical(other.time, time) || other.time == time) && - (identical(other.time2, time2) || other.time2 == time2)); + (identical(other.revised_time, revised_time) || + other.revised_time == revised_time)); } @JsonKey(ignore: true) @override - int get hashCode => Object.hash(runtimeType, runs, overs, time, time2); + int get hashCode => Object.hash(runtimeType, runs, overs, time, revised_time); @JsonKey(ignore: true) @override @@ -1883,10 +1884,11 @@ class _$RevisedTargetImpl implements _RevisedTarget { abstract class _RevisedTarget implements RevisedTarget { const factory _RevisedTarget( - {final int runs, - final double overs, - final DateTime? time, - @TimeStampJsonConverter() final DateTime? time2}) = _$RevisedTargetImpl; + {final int runs, + final double overs, + final DateTime? time, + @TimeStampJsonConverter() final DateTime? revised_time}) = + _$RevisedTargetImpl; factory _RevisedTarget.fromJson(Map json) = _$RevisedTargetImpl.fromJson; @@ -1899,7 +1901,7 @@ abstract class _RevisedTarget implements RevisedTarget { DateTime? get time; @override @TimeStampJsonConverter() - DateTime? get time2; + DateTime? get revised_time; @override @JsonKey(ignore: true) _$$RevisedTargetImplCopyWith<_$RevisedTargetImpl> get copyWith => diff --git a/data/lib/api/match/match_model.g.dart b/data/lib/api/match/match_model.g.dart index 8430d0d4..5127991e 100644 --- a/data/lib/api/match/match_model.g.dart +++ b/data/lib/api/match/match_model.g.dart @@ -44,8 +44,8 @@ _$MatchModelImpl _$$MatchModelImplFromJson(Map json) => _$MatchModelImpl( start_time: json['start_time'] == null ? null : DateTime.parse(json['start_time'] as String), - start_time2: _$JsonConverterFromJson( - json['start_time2'], const TimeStampJsonConverter().fromJson), + start_at: _$JsonConverterFromJson( + json['start_at'], const TimeStampJsonConverter().fromJson), ball_type: $enumDecode(_$BallTypeEnumMap, json['ball_type']), pitch_type: $enumDecode(_$PitchTypeEnumMap, json['pitch_type']), created_by: json['created_by'] as String, @@ -86,8 +86,8 @@ Map _$$MatchModelImplToJson(_$MatchModelImpl instance) => 'city': instance.city, 'ground': instance.ground, 'start_time': instance.start_time?.toIso8601String(), - 'start_time2': _$JsonConverterToJson( - instance.start_time2, const TimeStampJsonConverter().toJson), + 'start_at': _$JsonConverterToJson( + instance.start_at, const TimeStampJsonConverter().toJson), 'ball_type': _$BallTypeEnumMap[instance.ball_type]!, 'pitch_type': _$PitchTypeEnumMap[instance.pitch_type]!, 'created_by': instance.created_by, @@ -225,8 +225,8 @@ _$RevisedTargetImpl _$$RevisedTargetImplFromJson(Map json) => overs: (json['overs'] as num?)?.toDouble() ?? 0, time: json['time'] == null ? null : DateTime.parse(json['time'] as String), - time2: _$JsonConverterFromJson( - json['time2'], const TimeStampJsonConverter().fromJson), + revised_time: _$JsonConverterFromJson( + json['revised_time'], const TimeStampJsonConverter().fromJson), ); Map _$$RevisedTargetImplToJson(_$RevisedTargetImpl instance) => @@ -234,6 +234,6 @@ Map _$$RevisedTargetImplToJson(_$RevisedTargetImpl instance) => 'runs': instance.runs, 'overs': instance.overs, 'time': instance.time?.toIso8601String(), - 'time2': _$JsonConverterToJson( - instance.time2, const TimeStampJsonConverter().toJson), + 'revised_time': _$JsonConverterToJson( + instance.revised_time, const TimeStampJsonConverter().toJson), }; diff --git a/data/lib/api/support/support_models.dart b/data/lib/api/support/support_models.dart index ff408654..0af6a1f4 100644 --- a/data/lib/api/support/support_models.dart +++ b/data/lib/api/support/support_models.dart @@ -16,7 +16,7 @@ class AddSupportCaseRequest with _$AddSupportCaseRequest { @Default([]) List attachmentUrls, required String userId, DateTime? createdAt, - @TimeStampJsonConverter() DateTime? createdAt2, + @TimeStampJsonConverter() DateTime? createdTime, }) = _AddSupportCaseRequest; factory AddSupportCaseRequest.fromJson(Map json) => diff --git a/data/lib/api/support/support_models.freezed.dart b/data/lib/api/support/support_models.freezed.dart index af0c3653..3ea16c58 100644 --- a/data/lib/api/support/support_models.freezed.dart +++ b/data/lib/api/support/support_models.freezed.dart @@ -28,7 +28,7 @@ mixin _$AddSupportCaseRequest { String get userId => throw _privateConstructorUsedError; DateTime? get createdAt => throw _privateConstructorUsedError; @TimeStampJsonConverter() - DateTime? get createdAt2 => throw _privateConstructorUsedError; + DateTime? get createdTime => throw _privateConstructorUsedError; Map toJson() => throw _privateConstructorUsedError; @JsonKey(ignore: true) @@ -49,7 +49,7 @@ abstract class $AddSupportCaseRequestCopyWith<$Res> { List attachmentUrls, String userId, DateTime? createdAt, - @TimeStampJsonConverter() DateTime? createdAt2}); + @TimeStampJsonConverter() DateTime? createdTime}); } /// @nodoc @@ -72,7 +72,7 @@ class _$AddSupportCaseRequestCopyWithImpl<$Res, Object? attachmentUrls = null, Object? userId = null, Object? createdAt = freezed, - Object? createdAt2 = freezed, + Object? createdTime = freezed, }) { return _then(_value.copyWith( id: null == id @@ -99,9 +99,9 @@ class _$AddSupportCaseRequestCopyWithImpl<$Res, ? _value.createdAt : createdAt // ignore: cast_nullable_to_non_nullable as DateTime?, - createdAt2: freezed == createdAt2 - ? _value.createdAt2 - : createdAt2 // ignore: cast_nullable_to_non_nullable + createdTime: freezed == createdTime + ? _value.createdTime + : createdTime // ignore: cast_nullable_to_non_nullable as DateTime?, ) as $Val); } @@ -123,7 +123,7 @@ abstract class _$$AddSupportCaseRequestImplCopyWith<$Res> List attachmentUrls, String userId, DateTime? createdAt, - @TimeStampJsonConverter() DateTime? createdAt2}); + @TimeStampJsonConverter() DateTime? createdTime}); } /// @nodoc @@ -144,7 +144,7 @@ class __$$AddSupportCaseRequestImplCopyWithImpl<$Res> Object? attachmentUrls = null, Object? userId = null, Object? createdAt = freezed, - Object? createdAt2 = freezed, + Object? createdTime = freezed, }) { return _then(_$AddSupportCaseRequestImpl( id: null == id @@ -171,9 +171,9 @@ class __$$AddSupportCaseRequestImplCopyWithImpl<$Res> ? _value.createdAt : createdAt // ignore: cast_nullable_to_non_nullable as DateTime?, - createdAt2: freezed == createdAt2 - ? _value.createdAt2 - : createdAt2 // ignore: cast_nullable_to_non_nullable + createdTime: freezed == createdTime + ? _value.createdTime + : createdTime // ignore: cast_nullable_to_non_nullable as DateTime?, )); } @@ -189,7 +189,7 @@ class _$AddSupportCaseRequestImpl implements _AddSupportCaseRequest { final List attachmentUrls = const [], required this.userId, this.createdAt, - @TimeStampJsonConverter() this.createdAt2}) + @TimeStampJsonConverter() this.createdTime}) : _attachmentUrls = attachmentUrls; factory _$AddSupportCaseRequestImpl.fromJson(Map json) => @@ -216,11 +216,11 @@ class _$AddSupportCaseRequestImpl implements _AddSupportCaseRequest { final DateTime? createdAt; @override @TimeStampJsonConverter() - final DateTime? createdAt2; + final DateTime? createdTime; @override String toString() { - return 'AddSupportCaseRequest(id: $id, title: $title, description: $description, attachmentUrls: $attachmentUrls, userId: $userId, createdAt: $createdAt, createdAt2: $createdAt2)'; + return 'AddSupportCaseRequest(id: $id, title: $title, description: $description, attachmentUrls: $attachmentUrls, userId: $userId, createdAt: $createdAt, createdTime: $createdTime)'; } @override @@ -237,8 +237,8 @@ class _$AddSupportCaseRequestImpl implements _AddSupportCaseRequest { (identical(other.userId, userId) || other.userId == userId) && (identical(other.createdAt, createdAt) || other.createdAt == createdAt) && - (identical(other.createdAt2, createdAt2) || - other.createdAt2 == createdAt2)); + (identical(other.createdTime, createdTime) || + other.createdTime == createdTime)); } @JsonKey(ignore: true) @@ -251,7 +251,7 @@ class _$AddSupportCaseRequestImpl implements _AddSupportCaseRequest { const DeepCollectionEquality().hash(_attachmentUrls), userId, createdAt, - createdAt2); + createdTime); @JsonKey(ignore: true) @override @@ -276,7 +276,7 @@ abstract class _AddSupportCaseRequest implements AddSupportCaseRequest { final List attachmentUrls, required final String userId, final DateTime? createdAt, - @TimeStampJsonConverter() final DateTime? createdAt2}) = + @TimeStampJsonConverter() final DateTime? createdTime}) = _$AddSupportCaseRequestImpl; factory _AddSupportCaseRequest.fromJson(Map json) = @@ -296,7 +296,7 @@ abstract class _AddSupportCaseRequest implements AddSupportCaseRequest { DateTime? get createdAt; @override @TimeStampJsonConverter() - DateTime? get createdAt2; + DateTime? get createdTime; @override @JsonKey(ignore: true) _$$AddSupportCaseRequestImplCopyWith<_$AddSupportCaseRequestImpl> diff --git a/data/lib/api/support/support_models.g.dart b/data/lib/api/support/support_models.g.dart index be810f63..34f90d89 100644 --- a/data/lib/api/support/support_models.g.dart +++ b/data/lib/api/support/support_models.g.dart @@ -20,8 +20,8 @@ _$AddSupportCaseRequestImpl _$$AddSupportCaseRequestImplFromJson( createdAt: json['createdAt'] == null ? null : DateTime.parse(json['createdAt'] as String), - createdAt2: _$JsonConverterFromJson( - json['createdAt2'], const TimeStampJsonConverter().fromJson), + createdTime: _$JsonConverterFromJson( + json['createdTime'], const TimeStampJsonConverter().fromJson), ); Map _$$AddSupportCaseRequestImplToJson( @@ -33,8 +33,8 @@ Map _$$AddSupportCaseRequestImplToJson( 'attachmentUrls': instance.attachmentUrls, 'userId': instance.userId, 'createdAt': instance.createdAt?.toIso8601String(), - 'createdAt2': _$JsonConverterToJson( - instance.createdAt2, const TimeStampJsonConverter().toJson), + 'createdTime': _$JsonConverterToJson( + instance.createdTime, const TimeStampJsonConverter().toJson), }; Value? _$JsonConverterFromJson( diff --git a/data/lib/api/team/team_model.dart b/data/lib/api/team/team_model.dart index 274009df..9f694c5b 100644 --- a/data/lib/api/team/team_model.dart +++ b/data/lib/api/team/team_model.dart @@ -21,7 +21,7 @@ abstract class TeamModel with _$TeamModel { String? profile_img_url, String? created_by, DateTime? created_at, - @TimeStampJsonConverter() DateTime? created_at2, + @TimeStampJsonConverter() DateTime? created_time, @JsonKey(name: FireStoreConst.teamPlayers) @Default([]) List players, diff --git a/data/lib/api/team/team_model.freezed.dart b/data/lib/api/team/team_model.freezed.dart index 4371ed94..d3db216b 100644 --- a/data/lib/api/team/team_model.freezed.dart +++ b/data/lib/api/team/team_model.freezed.dart @@ -28,7 +28,7 @@ mixin _$TeamModel { String? get created_by => throw _privateConstructorUsedError; DateTime? get created_at => throw _privateConstructorUsedError; @TimeStampJsonConverter() - DateTime? get created_at2 => throw _privateConstructorUsedError; + DateTime? get created_time => throw _privateConstructorUsedError; @JsonKey(name: FireStoreConst.teamPlayers) List get players => throw _privateConstructorUsedError; @@ -51,7 +51,7 @@ abstract class $TeamModelCopyWith<$Res> { String? profile_img_url, String? created_by, DateTime? created_at, - @TimeStampJsonConverter() DateTime? created_at2, + @TimeStampJsonConverter() DateTime? created_time, @JsonKey(name: FireStoreConst.teamPlayers) List players}); } @@ -75,7 +75,7 @@ class _$TeamModelCopyWithImpl<$Res, $Val extends TeamModel> Object? profile_img_url = freezed, Object? created_by = freezed, Object? created_at = freezed, - Object? created_at2 = freezed, + Object? created_time = freezed, Object? players = null, }) { return _then(_value.copyWith( @@ -107,9 +107,9 @@ class _$TeamModelCopyWithImpl<$Res, $Val extends TeamModel> ? _value.created_at : created_at // ignore: cast_nullable_to_non_nullable as DateTime?, - created_at2: freezed == created_at2 - ? _value.created_at2 - : created_at2 // ignore: cast_nullable_to_non_nullable + created_time: freezed == created_time + ? _value.created_time + : created_time // ignore: cast_nullable_to_non_nullable as DateTime?, players: null == players ? _value.players @@ -135,7 +135,7 @@ abstract class _$$TeamModelImplCopyWith<$Res> String? profile_img_url, String? created_by, DateTime? created_at, - @TimeStampJsonConverter() DateTime? created_at2, + @TimeStampJsonConverter() DateTime? created_time, @JsonKey(name: FireStoreConst.teamPlayers) List players}); } @@ -157,7 +157,7 @@ class __$$TeamModelImplCopyWithImpl<$Res> Object? profile_img_url = freezed, Object? created_by = freezed, Object? created_at = freezed, - Object? created_at2 = freezed, + Object? created_time = freezed, Object? players = null, }) { return _then(_$TeamModelImpl( @@ -189,9 +189,9 @@ class __$$TeamModelImplCopyWithImpl<$Res> ? _value.created_at : created_at // ignore: cast_nullable_to_non_nullable as DateTime?, - created_at2: freezed == created_at2 - ? _value.created_at2 - : created_at2 // ignore: cast_nullable_to_non_nullable + created_time: freezed == created_time + ? _value.created_time + : created_time // ignore: cast_nullable_to_non_nullable as DateTime?, players: null == players ? _value._players @@ -213,7 +213,7 @@ class _$TeamModelImpl implements _TeamModel { this.profile_img_url, this.created_by, this.created_at, - @TimeStampJsonConverter() this.created_at2, + @TimeStampJsonConverter() this.created_time, @JsonKey(name: FireStoreConst.teamPlayers) final List players = const []}) : _players = players; @@ -237,7 +237,7 @@ class _$TeamModelImpl implements _TeamModel { final DateTime? created_at; @override @TimeStampJsonConverter() - final DateTime? created_at2; + final DateTime? created_time; final List _players; @override @JsonKey(name: FireStoreConst.teamPlayers) @@ -249,7 +249,7 @@ class _$TeamModelImpl implements _TeamModel { @override String toString() { - return 'TeamModel(id: $id, name: $name, name_lowercase: $name_lowercase, city: $city, profile_img_url: $profile_img_url, created_by: $created_by, created_at: $created_at, created_at2: $created_at2, players: $players)'; + return 'TeamModel(id: $id, name: $name, name_lowercase: $name_lowercase, city: $city, profile_img_url: $profile_img_url, created_by: $created_by, created_at: $created_at, created_time: $created_time, players: $players)'; } @override @@ -268,8 +268,8 @@ class _$TeamModelImpl implements _TeamModel { other.created_by == created_by) && (identical(other.created_at, created_at) || other.created_at == created_at) && - (identical(other.created_at2, created_at2) || - other.created_at2 == created_at2) && + (identical(other.created_time, created_time) || + other.created_time == created_time) && const DeepCollectionEquality().equals(other._players, _players)); } @@ -284,7 +284,7 @@ class _$TeamModelImpl implements _TeamModel { profile_img_url, created_by, created_at, - created_at2, + created_time, const DeepCollectionEquality().hash(_players)); @JsonKey(ignore: true) @@ -310,7 +310,7 @@ abstract class _TeamModel implements TeamModel { final String? profile_img_url, final String? created_by, final DateTime? created_at, - @TimeStampJsonConverter() final DateTime? created_at2, + @TimeStampJsonConverter() final DateTime? created_time, @JsonKey(name: FireStoreConst.teamPlayers) final List players}) = _$TeamModelImpl; @@ -333,7 +333,7 @@ abstract class _TeamModel implements TeamModel { DateTime? get created_at; @override @TimeStampJsonConverter() - DateTime? get created_at2; + DateTime? get created_time; @override @JsonKey(name: FireStoreConst.teamPlayers) List get players; diff --git a/data/lib/api/team/team_model.g.dart b/data/lib/api/team/team_model.g.dart index f545e3c5..f81cb978 100644 --- a/data/lib/api/team/team_model.g.dart +++ b/data/lib/api/team/team_model.g.dart @@ -17,8 +17,8 @@ _$TeamModelImpl _$$TeamModelImplFromJson(Map json) => created_at: json['created_at'] == null ? null : DateTime.parse(json['created_at'] as String), - created_at2: _$JsonConverterFromJson( - json['created_at2'], const TimeStampJsonConverter().fromJson), + created_time: _$JsonConverterFromJson( + json['created_time'], const TimeStampJsonConverter().fromJson), players: (json['team_players'] as List?) ?.map((e) => TeamPlayer.fromJson(e as Map)) .toList() ?? @@ -34,8 +34,8 @@ Map _$$TeamModelImplToJson(_$TeamModelImpl instance) => 'profile_img_url': instance.profile_img_url, 'created_by': instance.created_by, 'created_at': instance.created_at?.toIso8601String(), - 'created_at2': _$JsonConverterToJson( - instance.created_at2, const TimeStampJsonConverter().toJson), + 'created_time': _$JsonConverterToJson( + instance.created_time, const TimeStampJsonConverter().toJson), 'team_players': instance.players.map((e) => e.toJson()).toList(), }; diff --git a/data/lib/api/user/user_models.dart b/data/lib/api/user/user_models.dart index d095775f..711c896d 100644 --- a/data/lib/api/user/user_models.dart +++ b/data/lib/api/user/user_models.dart @@ -27,8 +27,8 @@ class UserModel with _$UserModel { UserGender? gender, DateTime? created_at, DateTime? updated_at, - @TimeStampJsonConverter() DateTime? created_at2, - @TimeStampJsonConverter() DateTime? updated_at2, + @TimeStampJsonConverter() DateTime? created_time, + @TimeStampJsonConverter() DateTime? updated_time, PlayerRole? player_role, BattingStyle? batting_style, BowlingStyle? bowling_style, @@ -67,6 +67,7 @@ class ApiSession with _$ApiSession { required int app_version, required String os_version, DateTime? created_at, + @TimeStampJsonConverter() DateTime? created_time, @Default(true) bool is_active, }) = _ApiSession; @@ -74,9 +75,9 @@ class ApiSession with _$ApiSession { _$ApiSessionFromJson(json); factory ApiSession.fromFireStore( - DocumentSnapshot> snapshot, - SnapshotOptions? options, - ) { + DocumentSnapshot> snapshot, + SnapshotOptions? options, + ) { final Map? data = snapshot.data(); return ApiSession.fromJson(data!); } diff --git a/data/lib/api/user/user_models.freezed.dart b/data/lib/api/user/user_models.freezed.dart index 956a60bb..5b694b31 100644 --- a/data/lib/api/user/user_models.freezed.dart +++ b/data/lib/api/user/user_models.freezed.dart @@ -32,13 +32,14 @@ mixin _$UserModel { DateTime? get created_at => throw _privateConstructorUsedError; DateTime? get updated_at => throw _privateConstructorUsedError; @TimeStampJsonConverter() - DateTime? get created_at2 => throw _privateConstructorUsedError; + DateTime? get created_time => throw _privateConstructorUsedError; @TimeStampJsonConverter() - DateTime? get updated_at2 => throw _privateConstructorUsedError; + DateTime? get updated_time => throw _privateConstructorUsedError; PlayerRole? get player_role => throw _privateConstructorUsedError; BattingStyle? get batting_style => throw _privateConstructorUsedError; BowlingStyle? get bowling_style => throw _privateConstructorUsedError; bool get isActive => throw _privateConstructorUsedError; + bool get notifications => throw _privateConstructorUsedError; Map toJson() => throw _privateConstructorUsedError; @JsonKey(ignore: true) @@ -63,12 +64,13 @@ abstract class $UserModelCopyWith<$Res> { UserGender? gender, DateTime? created_at, DateTime? updated_at, - @TimeStampJsonConverter() DateTime? created_at2, - @TimeStampJsonConverter() DateTime? updated_at2, + @TimeStampJsonConverter() DateTime? created_time, + @TimeStampJsonConverter() DateTime? updated_time, PlayerRole? player_role, BattingStyle? batting_style, BowlingStyle? bowling_style, - bool isActive}); + bool isActive, + bool notifications}); } /// @nodoc @@ -95,12 +97,13 @@ class _$UserModelCopyWithImpl<$Res, $Val extends UserModel> Object? gender = freezed, Object? created_at = freezed, Object? updated_at = freezed, - Object? created_at2 = freezed, - Object? updated_at2 = freezed, + Object? created_time = freezed, + Object? updated_time = freezed, Object? player_role = freezed, Object? batting_style = freezed, Object? bowling_style = freezed, Object? isActive = null, + Object? notifications = null, }) { return _then(_value.copyWith( id: null == id @@ -147,13 +150,13 @@ class _$UserModelCopyWithImpl<$Res, $Val extends UserModel> ? _value.updated_at : updated_at // ignore: cast_nullable_to_non_nullable as DateTime?, - created_at2: freezed == created_at2 - ? _value.created_at2 - : created_at2 // ignore: cast_nullable_to_non_nullable + created_time: freezed == created_time + ? _value.created_time + : created_time // ignore: cast_nullable_to_non_nullable as DateTime?, - updated_at2: freezed == updated_at2 - ? _value.updated_at2 - : updated_at2 // ignore: cast_nullable_to_non_nullable + updated_time: freezed == updated_time + ? _value.updated_time + : updated_time // ignore: cast_nullable_to_non_nullable as DateTime?, player_role: freezed == player_role ? _value.player_role @@ -171,6 +174,10 @@ class _$UserModelCopyWithImpl<$Res, $Val extends UserModel> ? _value.isActive : isActive // ignore: cast_nullable_to_non_nullable as bool, + notifications: null == notifications + ? _value.notifications + : notifications // ignore: cast_nullable_to_non_nullable + as bool, ) as $Val); } } @@ -195,12 +202,13 @@ abstract class _$$UserModelImplCopyWith<$Res> UserGender? gender, DateTime? created_at, DateTime? updated_at, - @TimeStampJsonConverter() DateTime? created_at2, - @TimeStampJsonConverter() DateTime? updated_at2, + @TimeStampJsonConverter() DateTime? created_time, + @TimeStampJsonConverter() DateTime? updated_time, PlayerRole? player_role, BattingStyle? batting_style, BowlingStyle? bowling_style, - bool isActive}); + bool isActive, + bool notifications}); } /// @nodoc @@ -225,12 +233,13 @@ class __$$UserModelImplCopyWithImpl<$Res> Object? gender = freezed, Object? created_at = freezed, Object? updated_at = freezed, - Object? created_at2 = freezed, - Object? updated_at2 = freezed, + Object? created_time = freezed, + Object? updated_time = freezed, Object? player_role = freezed, Object? batting_style = freezed, Object? bowling_style = freezed, Object? isActive = null, + Object? notifications = null, }) { return _then(_$UserModelImpl( id: null == id @@ -277,13 +286,13 @@ class __$$UserModelImplCopyWithImpl<$Res> ? _value.updated_at : updated_at // ignore: cast_nullable_to_non_nullable as DateTime?, - created_at2: freezed == created_at2 - ? _value.created_at2 - : created_at2 // ignore: cast_nullable_to_non_nullable + created_time: freezed == created_time + ? _value.created_time + : created_time // ignore: cast_nullable_to_non_nullable as DateTime?, - updated_at2: freezed == updated_at2 - ? _value.updated_at2 - : updated_at2 // ignore: cast_nullable_to_non_nullable + updated_time: freezed == updated_time + ? _value.updated_time + : updated_time // ignore: cast_nullable_to_non_nullable as DateTime?, player_role: freezed == player_role ? _value.player_role @@ -301,6 +310,10 @@ class __$$UserModelImplCopyWithImpl<$Res> ? _value.isActive : isActive // ignore: cast_nullable_to_non_nullable as bool, + notifications: null == notifications + ? _value.notifications + : notifications // ignore: cast_nullable_to_non_nullable + as bool, )); } } @@ -320,12 +333,13 @@ class _$UserModelImpl extends _UserModel { this.gender, this.created_at, this.updated_at, - @TimeStampJsonConverter() this.created_at2, - @TimeStampJsonConverter() this.updated_at2, + @TimeStampJsonConverter() this.created_time, + @TimeStampJsonConverter() this.updated_time, this.player_role, this.batting_style, this.bowling_style, - this.isActive = true}) + this.isActive = true, + this.notifications = true}) : super._(); factory _$UserModelImpl.fromJson(Map json) => @@ -355,10 +369,10 @@ class _$UserModelImpl extends _UserModel { final DateTime? updated_at; @override @TimeStampJsonConverter() - final DateTime? created_at2; + final DateTime? created_time; @override @TimeStampJsonConverter() - final DateTime? updated_at2; + final DateTime? updated_time; @override final PlayerRole? player_role; @override @@ -368,10 +382,13 @@ class _$UserModelImpl extends _UserModel { @override @JsonKey() final bool isActive; + @override + @JsonKey() + final bool notifications; @override String toString() { - return 'UserModel(id: $id, name: $name, name_lowercase: $name_lowercase, location: $location, phone: $phone, dob: $dob, email: $email, profile_img_url: $profile_img_url, gender: $gender, created_at: $created_at, updated_at: $updated_at, created_at2: $created_at2, updated_at2: $updated_at2, player_role: $player_role, batting_style: $batting_style, bowling_style: $bowling_style, isActive: $isActive)'; + return 'UserModel(id: $id, name: $name, name_lowercase: $name_lowercase, location: $location, phone: $phone, dob: $dob, email: $email, profile_img_url: $profile_img_url, gender: $gender, created_at: $created_at, updated_at: $updated_at, created_time: $created_time, updated_time: $updated_time, player_role: $player_role, batting_style: $batting_style, bowling_style: $bowling_style, isActive: $isActive, notifications: $notifications)'; } @override @@ -395,10 +412,10 @@ class _$UserModelImpl extends _UserModel { other.created_at == created_at) && (identical(other.updated_at, updated_at) || other.updated_at == updated_at) && - (identical(other.created_at2, created_at2) || - other.created_at2 == created_at2) && - (identical(other.updated_at2, updated_at2) || - other.updated_at2 == updated_at2) && + (identical(other.created_time, created_time) || + other.created_time == created_time) && + (identical(other.updated_time, updated_time) || + other.updated_time == updated_time) && (identical(other.player_role, player_role) || other.player_role == player_role) && (identical(other.batting_style, batting_style) || @@ -406,7 +423,9 @@ class _$UserModelImpl extends _UserModel { (identical(other.bowling_style, bowling_style) || other.bowling_style == bowling_style) && (identical(other.isActive, isActive) || - other.isActive == isActive)); + other.isActive == isActive) && + (identical(other.notifications, notifications) || + other.notifications == notifications)); } @JsonKey(ignore: true) @@ -424,12 +443,13 @@ class _$UserModelImpl extends _UserModel { gender, created_at, updated_at, - created_at2, - updated_at2, + created_time, + updated_time, player_role, batting_style, bowling_style, - isActive); + isActive, + notifications); @JsonKey(ignore: true) @override @@ -458,12 +478,13 @@ abstract class _UserModel extends UserModel { final UserGender? gender, final DateTime? created_at, final DateTime? updated_at, - @TimeStampJsonConverter() final DateTime? created_at2, - @TimeStampJsonConverter() final DateTime? updated_at2, + @TimeStampJsonConverter() final DateTime? created_time, + @TimeStampJsonConverter() final DateTime? updated_time, final PlayerRole? player_role, final BattingStyle? batting_style, final BowlingStyle? bowling_style, - final bool isActive}) = _$UserModelImpl; + final bool isActive, + final bool notifications}) = _$UserModelImpl; const _UserModel._() : super._(); factory _UserModel.fromJson(Map json) = @@ -493,10 +514,10 @@ abstract class _UserModel extends UserModel { DateTime? get updated_at; @override @TimeStampJsonConverter() - DateTime? get created_at2; + DateTime? get created_time; @override @TimeStampJsonConverter() - DateTime? get updated_at2; + DateTime? get updated_time; @override PlayerRole? get player_role; @override @@ -506,7 +527,376 @@ abstract class _UserModel extends UserModel { @override bool get isActive; @override + bool get notifications; + @override @JsonKey(ignore: true) _$$UserModelImplCopyWith<_$UserModelImpl> get copyWith => throw _privateConstructorUsedError; } + +ApiSession _$ApiSessionFromJson(Map json) { + return _ApiSession.fromJson(json); +} + +/// @nodoc +mixin _$ApiSession { + String get id => throw _privateConstructorUsedError; + String get user_id => throw _privateConstructorUsedError; + int get device_type => throw _privateConstructorUsedError; + String get device_id => throw _privateConstructorUsedError; + String get device_name => throw _privateConstructorUsedError; + String? get device_fcm_token => throw _privateConstructorUsedError; + int get app_version => throw _privateConstructorUsedError; + String get os_version => throw _privateConstructorUsedError; + DateTime? get created_at => throw _privateConstructorUsedError; + @TimeStampJsonConverter() + DateTime? get created_time => throw _privateConstructorUsedError; + bool get is_active => throw _privateConstructorUsedError; + + Map toJson() => throw _privateConstructorUsedError; + @JsonKey(ignore: true) + $ApiSessionCopyWith get copyWith => + throw _privateConstructorUsedError; +} + +/// @nodoc +abstract class $ApiSessionCopyWith<$Res> { + factory $ApiSessionCopyWith( + ApiSession value, $Res Function(ApiSession) then) = + _$ApiSessionCopyWithImpl<$Res, ApiSession>; + @useResult + $Res call( + {String id, + String user_id, + int device_type, + String device_id, + String device_name, + String? device_fcm_token, + int app_version, + String os_version, + DateTime? created_at, + @TimeStampJsonConverter() DateTime? created_time, + bool is_active}); +} + +/// @nodoc +class _$ApiSessionCopyWithImpl<$Res, $Val extends ApiSession> + implements $ApiSessionCopyWith<$Res> { + _$ApiSessionCopyWithImpl(this._value, this._then); + + // ignore: unused_field + final $Val _value; + // ignore: unused_field + final $Res Function($Val) _then; + + @pragma('vm:prefer-inline') + @override + $Res call({ + Object? id = null, + Object? user_id = null, + Object? device_type = null, + Object? device_id = null, + Object? device_name = null, + Object? device_fcm_token = freezed, + Object? app_version = null, + Object? os_version = null, + Object? created_at = freezed, + Object? created_time = freezed, + Object? is_active = null, + }) { + return _then(_value.copyWith( + id: null == id + ? _value.id + : id // ignore: cast_nullable_to_non_nullable + as String, + user_id: null == user_id + ? _value.user_id + : user_id // ignore: cast_nullable_to_non_nullable + as String, + device_type: null == device_type + ? _value.device_type + : device_type // ignore: cast_nullable_to_non_nullable + as int, + device_id: null == device_id + ? _value.device_id + : device_id // ignore: cast_nullable_to_non_nullable + as String, + device_name: null == device_name + ? _value.device_name + : device_name // ignore: cast_nullable_to_non_nullable + as String, + device_fcm_token: freezed == device_fcm_token + ? _value.device_fcm_token + : device_fcm_token // ignore: cast_nullable_to_non_nullable + as String?, + app_version: null == app_version + ? _value.app_version + : app_version // ignore: cast_nullable_to_non_nullable + as int, + os_version: null == os_version + ? _value.os_version + : os_version // ignore: cast_nullable_to_non_nullable + as String, + created_at: freezed == created_at + ? _value.created_at + : created_at // ignore: cast_nullable_to_non_nullable + as DateTime?, + created_time: freezed == created_time + ? _value.created_time + : created_time // ignore: cast_nullable_to_non_nullable + as DateTime?, + is_active: null == is_active + ? _value.is_active + : is_active // ignore: cast_nullable_to_non_nullable + as bool, + ) as $Val); + } +} + +/// @nodoc +abstract class _$$ApiSessionImplCopyWith<$Res> + implements $ApiSessionCopyWith<$Res> { + factory _$$ApiSessionImplCopyWith( + _$ApiSessionImpl value, $Res Function(_$ApiSessionImpl) then) = + __$$ApiSessionImplCopyWithImpl<$Res>; + @override + @useResult + $Res call( + {String id, + String user_id, + int device_type, + String device_id, + String device_name, + String? device_fcm_token, + int app_version, + String os_version, + DateTime? created_at, + @TimeStampJsonConverter() DateTime? created_time, + bool is_active}); +} + +/// @nodoc +class __$$ApiSessionImplCopyWithImpl<$Res> + extends _$ApiSessionCopyWithImpl<$Res, _$ApiSessionImpl> + implements _$$ApiSessionImplCopyWith<$Res> { + __$$ApiSessionImplCopyWithImpl( + _$ApiSessionImpl _value, $Res Function(_$ApiSessionImpl) _then) + : super(_value, _then); + + @pragma('vm:prefer-inline') + @override + $Res call({ + Object? id = null, + Object? user_id = null, + Object? device_type = null, + Object? device_id = null, + Object? device_name = null, + Object? device_fcm_token = freezed, + Object? app_version = null, + Object? os_version = null, + Object? created_at = freezed, + Object? created_time = freezed, + Object? is_active = null, + }) { + return _then(_$ApiSessionImpl( + id: null == id + ? _value.id + : id // ignore: cast_nullable_to_non_nullable + as String, + user_id: null == user_id + ? _value.user_id + : user_id // ignore: cast_nullable_to_non_nullable + as String, + device_type: null == device_type + ? _value.device_type + : device_type // ignore: cast_nullable_to_non_nullable + as int, + device_id: null == device_id + ? _value.device_id + : device_id // ignore: cast_nullable_to_non_nullable + as String, + device_name: null == device_name + ? _value.device_name + : device_name // ignore: cast_nullable_to_non_nullable + as String, + device_fcm_token: freezed == device_fcm_token + ? _value.device_fcm_token + : device_fcm_token // ignore: cast_nullable_to_non_nullable + as String?, + app_version: null == app_version + ? _value.app_version + : app_version // ignore: cast_nullable_to_non_nullable + as int, + os_version: null == os_version + ? _value.os_version + : os_version // ignore: cast_nullable_to_non_nullable + as String, + created_at: freezed == created_at + ? _value.created_at + : created_at // ignore: cast_nullable_to_non_nullable + as DateTime?, + created_time: freezed == created_time + ? _value.created_time + : created_time // ignore: cast_nullable_to_non_nullable + as DateTime?, + is_active: null == is_active + ? _value.is_active + : is_active // ignore: cast_nullable_to_non_nullable + as bool, + )); + } +} + +/// @nodoc +@JsonSerializable() +class _$ApiSessionImpl extends _ApiSession { + const _$ApiSessionImpl( + {required this.id, + required this.user_id, + required this.device_type, + required this.device_id, + required this.device_name, + this.device_fcm_token, + required this.app_version, + required this.os_version, + this.created_at, + @TimeStampJsonConverter() this.created_time, + this.is_active = true}) + : super._(); + + factory _$ApiSessionImpl.fromJson(Map json) => + _$$ApiSessionImplFromJson(json); + + @override + final String id; + @override + final String user_id; + @override + final int device_type; + @override + final String device_id; + @override + final String device_name; + @override + final String? device_fcm_token; + @override + final int app_version; + @override + final String os_version; + @override + final DateTime? created_at; + @override + @TimeStampJsonConverter() + final DateTime? created_time; + @override + @JsonKey() + final bool is_active; + + @override + String toString() { + return 'ApiSession(id: $id, user_id: $user_id, device_type: $device_type, device_id: $device_id, device_name: $device_name, device_fcm_token: $device_fcm_token, app_version: $app_version, os_version: $os_version, created_at: $created_at, created_time: $created_time, is_active: $is_active)'; + } + + @override + bool operator ==(Object other) { + return identical(this, other) || + (other.runtimeType == runtimeType && + other is _$ApiSessionImpl && + (identical(other.id, id) || other.id == id) && + (identical(other.user_id, user_id) || other.user_id == user_id) && + (identical(other.device_type, device_type) || + other.device_type == device_type) && + (identical(other.device_id, device_id) || + other.device_id == device_id) && + (identical(other.device_name, device_name) || + other.device_name == device_name) && + (identical(other.device_fcm_token, device_fcm_token) || + other.device_fcm_token == device_fcm_token) && + (identical(other.app_version, app_version) || + other.app_version == app_version) && + (identical(other.os_version, os_version) || + other.os_version == os_version) && + (identical(other.created_at, created_at) || + other.created_at == created_at) && + (identical(other.created_time, created_time) || + other.created_time == created_time) && + (identical(other.is_active, is_active) || + other.is_active == is_active)); + } + + @JsonKey(ignore: true) + @override + int get hashCode => Object.hash( + runtimeType, + id, + user_id, + device_type, + device_id, + device_name, + device_fcm_token, + app_version, + os_version, + created_at, + created_time, + is_active); + + @JsonKey(ignore: true) + @override + @pragma('vm:prefer-inline') + _$$ApiSessionImplCopyWith<_$ApiSessionImpl> get copyWith => + __$$ApiSessionImplCopyWithImpl<_$ApiSessionImpl>(this, _$identity); + + @override + Map toJson() { + return _$$ApiSessionImplToJson( + this, + ); + } +} + +abstract class _ApiSession extends ApiSession { + const factory _ApiSession( + {required final String id, + required final String user_id, + required final int device_type, + required final String device_id, + required final String device_name, + final String? device_fcm_token, + required final int app_version, + required final String os_version, + final DateTime? created_at, + @TimeStampJsonConverter() final DateTime? created_time, + final bool is_active}) = _$ApiSessionImpl; + const _ApiSession._() : super._(); + + factory _ApiSession.fromJson(Map json) = + _$ApiSessionImpl.fromJson; + + @override + String get id; + @override + String get user_id; + @override + int get device_type; + @override + String get device_id; + @override + String get device_name; + @override + String? get device_fcm_token; + @override + int get app_version; + @override + String get os_version; + @override + DateTime? get created_at; + @override + @TimeStampJsonConverter() + DateTime? get created_time; + @override + bool get is_active; + @override + @JsonKey(ignore: true) + _$$ApiSessionImplCopyWith<_$ApiSessionImpl> get copyWith => + throw _privateConstructorUsedError; +} diff --git a/data/lib/api/user/user_models.g.dart b/data/lib/api/user/user_models.g.dart index a147430c..cb8b24f2 100644 --- a/data/lib/api/user/user_models.g.dart +++ b/data/lib/api/user/user_models.g.dart @@ -23,10 +23,10 @@ _$UserModelImpl _$$UserModelImplFromJson(Map json) => updated_at: json['updated_at'] == null ? null : DateTime.parse(json['updated_at'] as String), - created_at2: _$JsonConverterFromJson( - json['created_at2'], const TimeStampJsonConverter().fromJson), - updated_at2: _$JsonConverterFromJson( - json['updated_at2'], const TimeStampJsonConverter().fromJson), + created_time: _$JsonConverterFromJson( + json['created_time'], const TimeStampJsonConverter().fromJson), + updated_time: _$JsonConverterFromJson( + json['updated_time'], const TimeStampJsonConverter().fromJson), player_role: $enumDecodeNullable(_$PlayerRoleEnumMap, json['player_role']), batting_style: @@ -34,6 +34,7 @@ _$UserModelImpl _$$UserModelImplFromJson(Map json) => bowling_style: $enumDecodeNullable(_$BowlingStyleEnumMap, json['bowling_style']), isActive: json['isActive'] as bool? ?? true, + notifications: json['notifications'] as bool? ?? true, ); Map _$$UserModelImplToJson(_$UserModelImpl instance) => @@ -49,14 +50,15 @@ Map _$$UserModelImplToJson(_$UserModelImpl instance) => 'gender': _$UserGenderEnumMap[instance.gender], 'created_at': instance.created_at?.toIso8601String(), 'updated_at': instance.updated_at?.toIso8601String(), - 'created_at2': _$JsonConverterToJson( - instance.created_at2, const TimeStampJsonConverter().toJson), - 'updated_at2': _$JsonConverterToJson( - instance.updated_at2, const TimeStampJsonConverter().toJson), + 'created_time': _$JsonConverterToJson( + instance.created_time, const TimeStampJsonConverter().toJson), + 'updated_time': _$JsonConverterToJson( + instance.updated_time, const TimeStampJsonConverter().toJson), 'player_role': _$PlayerRoleEnumMap[instance.player_role], 'batting_style': _$BattingStyleEnumMap[instance.batting_style], 'bowling_style': _$BowlingStyleEnumMap[instance.bowling_style], 'isActive': instance.isActive, + 'notifications': instance.notifications, }; const _$UserGenderEnumMap = { @@ -106,3 +108,37 @@ Json? _$JsonConverterToJson( Json? Function(Value value) toJson, ) => value == null ? null : toJson(value); + +_$ApiSessionImpl _$$ApiSessionImplFromJson(Map json) => + _$ApiSessionImpl( + id: json['id'] as String, + user_id: json['user_id'] as String, + device_type: (json['device_type'] as num).toInt(), + device_id: json['device_id'] as String, + device_name: json['device_name'] as String, + device_fcm_token: json['device_fcm_token'] as String?, + app_version: (json['app_version'] as num).toInt(), + os_version: json['os_version'] as String, + created_at: json['created_at'] == null + ? null + : DateTime.parse(json['created_at'] as String), + created_time: _$JsonConverterFromJson( + json['created_time'], const TimeStampJsonConverter().fromJson), + is_active: json['is_active'] as bool? ?? true, + ); + +Map _$$ApiSessionImplToJson(_$ApiSessionImpl instance) => + { + 'id': instance.id, + 'user_id': instance.user_id, + 'device_type': instance.device_type, + 'device_id': instance.device_id, + 'device_name': instance.device_name, + 'device_fcm_token': instance.device_fcm_token, + 'app_version': instance.app_version, + 'os_version': instance.os_version, + 'created_at': instance.created_at?.toIso8601String(), + 'created_time': _$JsonConverterToJson( + instance.created_time, const TimeStampJsonConverter().toJson), + 'is_active': instance.is_active, + }; diff --git a/data/lib/service/match/match_service.dart b/data/lib/service/match/match_service.dart index 42a5c157..903b7be8 100644 --- a/data/lib/service/match/match_service.dart +++ b/data/lib/service/match/match_service.dart @@ -61,7 +61,7 @@ class MatchService { city: '', ground: '', start_time: DateTime.now(), - start_time2: DateTime.now(), + start_at: DateTime.now(), ball_type: BallType.leather, pitch_type: PitchType.turf, created_by: '', @@ -226,7 +226,7 @@ class MatchService { city: '', ground: '', start_time: DateTime.now(), - start_time2: DateTime.now(), + start_at: DateTime.now(), ball_type: BallType.leather, pitch_type: PitchType.turf, created_by: '', diff --git a/data/lib/service/user/user_service.dart b/data/lib/service/user/user_service.dart index f5c6dc27..05678e4b 100644 --- a/data/lib/service/user/user_service.dart +++ b/data/lib/service/user/user_service.dart @@ -65,6 +65,7 @@ class UserService { app_version: await deviceService.appVersion, os_version: await deviceService.osVersion, created_at: DateTime.now(), + created_time: DateTime.now(), ); await sessionDocRef.set(session); @@ -100,8 +101,12 @@ class UserService { } Future _createUser(String userId, String phone) async { - final user = - UserModel(id: userId, phone: phone, created_at: DateTime.now()); + final user = UserModel( + id: userId, + phone: phone, + created_at: DateTime.now(), + created_time: DateTime.now(), + ); await _userRef.doc(userId).set(user); return user; } diff --git a/data/lib/utils/dummy_deactivated_account.dart b/data/lib/utils/dummy_deactivated_account.dart index ff06008e..83becd43 100644 --- a/data/lib/utils/dummy_deactivated_account.dart +++ b/data/lib/utils/dummy_deactivated_account.dart @@ -5,7 +5,7 @@ UserModel deActiveDummyUserAccount(String id) { return UserModel( id: id, name: 'Deactivated User', - created_at2: DateTime(1950), + created_at: DateTime(1950), location: '--', isActive: false, ); @@ -16,7 +16,7 @@ TeamModel deActiveDummyTeamModel(String id) { id: id, name: 'Deactivated Team', name_lowercase: 'deactivatedteam', - created_at2: DateTime(1950), + created_at: DateTime(1950), city: '--', ); } diff --git a/khelo/lib/components/match_detail_cell.dart b/khelo/lib/components/match_detail_cell.dart index 44664bbd..593312cc 100644 --- a/khelo/lib/components/match_detail_cell.dart +++ b/khelo/lib/components/match_detail_cell.dart @@ -80,7 +80,7 @@ class MatchDetailCell extends StatelessWidget { Flexible( flex: 2, child: Text( - (match.start_time2 ?? match.start_time ?? DateTime.now()) + (match.start_at ?? match.start_time ?? DateTime.now()) .format(context, DateFormatType.dateAndTime), style: AppTextStyle.caption .copyWith(color: context.colorScheme.textDisabled)), diff --git a/khelo/lib/ui/flow/home/home_screen.dart b/khelo/lib/ui/flow/home/home_screen.dart index 1975056b..eafe8a46 100644 --- a/khelo/lib/ui/flow/home/home_screen.dart +++ b/khelo/lib/ui/flow/home/home_screen.dart @@ -282,7 +282,7 @@ class _HomeScreenState extends ConsumerState { return Text.rich( overflow: TextOverflow.ellipsis, TextSpan( - text: (match.start_time2 ?? match.start_time) + text: (match.start_at ?? match.start_time) ?.format(context, DateFormatType.dateAndTime), style: AppTextStyle.caption .copyWith(color: context.colorScheme.textSecondary), diff --git a/khelo/lib/ui/flow/main/main_screen_state_notifier.freezed.dart b/khelo/lib/ui/flow/main/main_screen_state_notifier.freezed.dart index 60ac27d6..4e4823b3 100644 --- a/khelo/lib/ui/flow/main/main_screen_state_notifier.freezed.dart +++ b/khelo/lib/ui/flow/main/main_screen_state_notifier.freezed.dart @@ -19,7 +19,9 @@ mixin _$MainScreenState { DateTime? get showNotificationPermissionPrompt => throw _privateConstructorUsedError; - @JsonKey(ignore: true) + /// Create a copy of MainScreenState + /// with the given fields replaced by the non-null parameter values. + @JsonKey(includeFromJson: false, includeToJson: false) $MainScreenStateCopyWith get copyWith => throw _privateConstructorUsedError; } @@ -43,6 +45,8 @@ class _$MainScreenStateCopyWithImpl<$Res, $Val extends MainScreenState> // ignore: unused_field final $Res Function($Val) _then; + /// Create a copy of MainScreenState + /// with the given fields replaced by the non-null parameter values. @pragma('vm:prefer-inline') @override $Res call({ @@ -77,6 +81,8 @@ class __$$MainScreenStateImplCopyWithImpl<$Res> _$MainScreenStateImpl _value, $Res Function(_$MainScreenStateImpl) _then) : super(_value, _then); + /// Create a copy of MainScreenState + /// with the given fields replaced by the non-null parameter values. @pragma('vm:prefer-inline') @override $Res call({ @@ -120,7 +126,9 @@ class _$MainScreenStateImpl implements _MainScreenState { int get hashCode => Object.hash(runtimeType, showNotificationPermissionPrompt); - @JsonKey(ignore: true) + /// Create a copy of MainScreenState + /// with the given fields replaced by the non-null parameter values. + @JsonKey(includeFromJson: false, includeToJson: false) @override @pragma('vm:prefer-inline') _$$MainScreenStateImplCopyWith<_$MainScreenStateImpl> get copyWith => @@ -135,8 +143,11 @@ abstract class _MainScreenState implements MainScreenState { @override DateTime? get showNotificationPermissionPrompt; + + /// Create a copy of MainScreenState + /// with the given fields replaced by the non-null parameter values. @override - @JsonKey(ignore: true) + @JsonKey(includeFromJson: false, includeToJson: false) _$$MainScreenStateImplCopyWith<_$MainScreenStateImpl> get copyWith => throw _privateConstructorUsedError; } diff --git a/khelo/lib/ui/flow/matches/add_match/add_match_view_model.dart b/khelo/lib/ui/flow/matches/add_match/add_match_view_model.dart index 4cedc7dc..11e509cf 100644 --- a/khelo/lib/ui/flow/matches/add_match/add_match_view_model.dart +++ b/khelo/lib/ui/flow/matches/add_match/add_match_view_model.dart @@ -82,7 +82,7 @@ class AddMatchViewNotifier extends StateNotifier { state.groundController.text = match.ground.toString(); state = state.copyWith( match: match, - matchTime: match.start_time2 ?? match.start_time ?? DateTime.now(), + matchTime: match.start_at ?? match.start_time ?? DateTime.now(), teamA: match.teams.first.team, teamACaptainId: match.teams.first.captain_id, teamAAdminId: match.teams.first.admin_id, @@ -184,7 +184,7 @@ class AddMatchViewNotifier extends StateNotifier { city: city, ground: ground, start_time: state.matchTime, - start_time2: state.matchTime, + start_at: state.matchTime, created_by: state.currentUserId ?? state.teamA?.created_by ?? "INVALID ID", ball_type: state.ballType, diff --git a/khelo/lib/ui/flow/matches/add_match/select_squad/components/user_detail_sheet.dart b/khelo/lib/ui/flow/matches/add_match/select_squad/components/user_detail_sheet.dart index 38388cea..833918f7 100644 --- a/khelo/lib/ui/flow/matches/add_match/select_squad/components/user_detail_sheet.dart +++ b/khelo/lib/ui/flow/matches/add_match/select_squad/components/user_detail_sheet.dart @@ -137,7 +137,7 @@ class UserDetailSheet extends StatelessWidget { .copyWith(color: context.colorScheme.textDisabled), ), Text( - (user.created_at2 ?? user.created_at ?? DateTime.now()) + (user.created_time ?? user.created_at ?? DateTime.now()) .format(context, DateFormatType.dayMonthYear), style: AppTextStyle.body2 .copyWith(color: context.colorScheme.textPrimary), diff --git a/khelo/lib/ui/flow/matches/match_detail/components/match_detail_info_view.dart b/khelo/lib/ui/flow/matches/match_detail/components/match_detail_info_view.dart index ce5471ce..239df00e 100644 --- a/khelo/lib/ui/flow/matches/match_detail/components/match_detail_info_view.dart +++ b/khelo/lib/ui/flow/matches/match_detail/components/match_detail_info_view.dart @@ -44,7 +44,7 @@ class MatchDetailInfoView extends ConsumerWidget { _matchTitleView(context, state.match!), _dataRowView(context, title: context.l10n.match_info_date_and_time_title, - subtitle: (state.match?.start_time2 ?? state.match?.start_time) + subtitle: (state.match?.start_at ?? state.match?.start_time) ?.format(context, DateFormatType.shortDateTime)), _tossDetailView(context, state.match!), _dataRowView(context, diff --git a/khelo/lib/ui/flow/matches/match_detail/match_detail_tab_view_model.dart b/khelo/lib/ui/flow/matches/match_detail/match_detail_tab_view_model.dart index 32dc1db6..84314174 100644 --- a/khelo/lib/ui/flow/matches/match_detail/match_detail_tab_view_model.dart +++ b/khelo/lib/ui/flow/matches/match_detail/match_detail_tab_view_model.dart @@ -109,8 +109,8 @@ class MatchDetailTabViewNotifier extends StateNotifier { (scores) { final sortedList = scores.toList(); sortedList.sort((a, b) => - (a.ballScore.time2 ?? a.ballScore.time)?.compareTo( - b.ballScore.time2 ?? b.ballScore.time ?? DateTime.now()) ?? + (a.ballScore.score_time ?? a.ballScore.time)?.compareTo( + b.ballScore.score_time ?? b.ballScore.time ?? DateTime.now()) ?? 0); final overList = state.overList.toList(); diff --git a/khelo/lib/ui/flow/profile/profile_view_model.freezed.dart b/khelo/lib/ui/flow/profile/profile_view_model.freezed.dart index 4a3d733e..6dad9fab 100644 --- a/khelo/lib/ui/flow/profile/profile_view_model.freezed.dart +++ b/khelo/lib/ui/flow/profile/profile_view_model.freezed.dart @@ -241,13 +241,13 @@ abstract class _ProfileState implements ProfileState { UserModel? get currentUser; @override String? get appVersion; - - /// Create a copy of ProfileState - /// with the given fields replaced by the non-null parameter values. @override bool get enableUserNotification; @override bool get shouldShowNotificationBanner; + + /// Create a copy of ProfileState + /// with the given fields replaced by the non-null parameter values. @override @JsonKey(includeFromJson: false, includeToJson: false) _$$ProfileStateImplCopyWith<_$ProfileStateImpl> get copyWith => diff --git a/khelo/lib/ui/flow/score_board/score_board_view_model.dart b/khelo/lib/ui/flow/score_board/score_board_view_model.dart index 75dc8ac3..c6d72ead 100644 --- a/khelo/lib/ui/flow/score_board/score_board_view_model.dart +++ b/khelo/lib/ui/flow/score_board/score_board_view_model.dart @@ -210,13 +210,13 @@ class ScoreBoardViewNotifier extends StateNotifier { } currentScoreList.sort((a, b) => - (a.time2 ?? a.time) - ?.compareTo(b.time2 ?? b.time ?? DateTime.now()) ?? + (a.score_time ?? a.time) + ?.compareTo(b.score_time ?? b.time ?? DateTime.now()) ?? 0); previousScoreList.sort((a, b) => - (a.time2 ?? a.time) - ?.compareTo(b.time2 ?? b.time ?? DateTime.now()) ?? + (a.score_time ?? a.time) + ?.compareTo(b.score_time ?? b.time ?? DateTime.now()) ?? 0); state = state.copyWith( currentScoresList: currentScoreList, @@ -608,7 +608,7 @@ class ScoreBoardViewNotifier extends StateNotifier { wicket_type: wicketType, fielding_position: position, time: DateTime.now(), - time2: DateTime.now(), + score_time: DateTime.now(), ); int wicketCount = state.otherInning!.total_wickets; if (wicketType != WicketType.retiredHurt && wicketType != null) { @@ -1552,7 +1552,7 @@ class ScoreBoardViewNotifier extends StateNotifier { runs: run, overs: over.toDouble(), time: DateTime.now(), - time2: DateTime.now(), + revised_time: DateTime.now(), ); await _matchService.setRevisedTarget( matchId: matchId, revisedTarget: revisedTarget); diff --git a/khelo/lib/ui/flow/settings/edit_profile/edit_profile_view_model.dart b/khelo/lib/ui/flow/settings/edit_profile/edit_profile_view_model.dart index 998f9a7f..d0a28d6d 100644 --- a/khelo/lib/ui/flow/settings/edit_profile/edit_profile_view_model.dart +++ b/khelo/lib/ui/flow/settings/edit_profile/edit_profile_view_model.dart @@ -139,8 +139,10 @@ class EditProfileViewNotifier extends StateNotifier { phone: state.currentUser?.phone, profile_img_url: state.imageUrl, dob: state.dob, - created_at2: state.currentUser?.created_at ?? DateTime.now(), - updated_at2: DateTime.now(), + created_at: state.currentUser?.created_at ?? DateTime.now(), + updated_at: DateTime.now(), + created_time: state.currentUser?.created_at ?? DateTime.now(), + updated_time: DateTime.now(), ); await userService.updateUser(user); diff --git a/khelo/lib/ui/flow/settings/support/contact_support_view_model.dart b/khelo/lib/ui/flow/settings/support/contact_support_view_model.dart index 47f44ac3..4c72f739 100644 --- a/khelo/lib/ui/flow/settings/support/contact_support_view_model.dart +++ b/khelo/lib/ui/flow/settings/support/contact_support_view_model.dart @@ -151,7 +151,8 @@ class ContactSupportViewStateNotifier attachmentUrls: state.attachments.map((e) => e.url).whereNotNull().toList(), userId: _currentUserId ?? '', - createdAt2: DateTime.now(), + createdAt: DateTime.now(), + createdTime: DateTime.now(), ); await supportService.addSupportCase(supportCase).whenComplete( diff --git a/khelo/lib/ui/flow/team/add_team/add_team_view_model.dart b/khelo/lib/ui/flow/team/add_team/add_team_view_model.dart index 597888f2..3a227c20 100644 --- a/khelo/lib/ui/flow/team/add_team/add_team_view_model.dart +++ b/khelo/lib/ui/flow/team/add_team/add_team_view_model.dart @@ -110,7 +110,8 @@ class AddTeamViewNotifier extends StateNotifier { city: location.toLowerCase(), created_by: state.currentUser!.id, players: players, - created_at2: state.editTeam?.created_at ?? DateTime.now(), + created_at: state.editTeam?.created_at ?? DateTime.now(), + created_time: state.editTeam?.created_at ?? DateTime.now(), ); final newTeamId = await _teamService.updateTeam(team); @@ -141,7 +142,7 @@ class AddTeamViewNotifier extends StateNotifier { created_by: state.currentUser!.id, players: players, created_at: state.editTeam?.created_at, - created_at2: state.editTeam?.created_at ?? DateTime.now()); + created_time: state.editTeam?.created_at ?? DateTime.now()); state = state.copyWith(isAddInProgress: false, team: teamModel); } } catch (e) { diff --git a/khelo/lib/ui/flow/team/detail/team_detail_screen.dart b/khelo/lib/ui/flow/team/detail/team_detail_screen.dart index 14bb1f26..34150ced 100644 --- a/khelo/lib/ui/flow/team/detail/team_detail_screen.dart +++ b/khelo/lib/ui/flow/team/detail/team_detail_screen.dart @@ -104,7 +104,7 @@ class _TeamDetailScreenState extends ConsumerState { .copyWith(color: context.colorScheme.textPrimary)), const SizedBox(height: 4), Text( - (state.team?.created_at2 ?? + (state.team?.created_time ?? state.team?.created_at ?? DateTime.now()) .format(context, DateFormatType.dayMonthYear), diff --git a/khelo/lib/ui/flow/team/user_detail/component/user_detail_info_content.dart b/khelo/lib/ui/flow/team/user_detail/component/user_detail_info_content.dart index 4355f5b3..6e68cd79 100644 --- a/khelo/lib/ui/flow/team/user_detail/component/user_detail_info_content.dart +++ b/khelo/lib/ui/flow/team/user_detail/component/user_detail_info_content.dart @@ -22,7 +22,7 @@ class UserDetailInfoContent extends ConsumerWidget { _infoRowView( context, context.l10n.user_detail_joining_date_title, - (state.user?.created_at2 ?? state.user?.created_at) + (state.user?.created_time ?? state.user?.created_at) ?.format(context, DateFormatType.shortDate)), _infoRowView(context, context.l10n.common_gender_title, state.user?.gender?.getString(context)), From 172f6939416f2b649d4ab3f0538e51f38061dabe Mon Sep 17 00:00:00 2001 From: cp-mayank-v Date: Wed, 11 Sep 2024 14:39:50 +0530 Subject: [PATCH 8/8] minor fixes --- khelo/lib/ui/flow/team/add_team/add_team_view_model.dart | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/khelo/lib/ui/flow/team/add_team/add_team_view_model.dart b/khelo/lib/ui/flow/team/add_team/add_team_view_model.dart index 3a227c20..6357c591 100644 --- a/khelo/lib/ui/flow/team/add_team/add_team_view_model.dart +++ b/khelo/lib/ui/flow/team/add_team/add_team_view_model.dart @@ -111,7 +111,7 @@ class AddTeamViewNotifier extends StateNotifier { created_by: state.currentUser!.id, players: players, created_at: state.editTeam?.created_at ?? DateTime.now(), - created_time: state.editTeam?.created_at ?? DateTime.now(), + created_time: state.editTeam?.created_time ?? DateTime.now(), ); final newTeamId = await _teamService.updateTeam(team); @@ -141,8 +141,8 @@ class AddTeamViewNotifier extends StateNotifier { city: location.toLowerCase(), created_by: state.currentUser!.id, players: players, - created_at: state.editTeam?.created_at, - created_time: state.editTeam?.created_at ?? DateTime.now()); + created_at: state.editTeam?.created_at ?? DateTime.now(), + created_time: state.editTeam?.created_time ?? DateTime.now()); state = state.copyWith(isAddInProgress: false, team: teamModel); } } catch (e) {