Merge pull request #74 from canopas/Mayank/hide-deactivate-users

Hide deactivated users
canopas · Jul 10, 2024 · f60ca81 · f60ca81
2 parents 295e21a + affaaf0
commit f60ca81
Show file tree

Hide file tree

Showing 13 changed files with 119 additions and 45 deletions.
diff --git a/data/lib/api/user/user_models.dart b/data/lib/api/user/user_models.dart
@@ -28,6 +28,7 @@ class UserModel with _$UserModel {
     PlayerRole? player_role,
     BattingStyle? batting_style,
     BowlingStyle? bowling_style,
+    @Default(true) bool isActive,
   }) = _UserModel;
 
   factory UserModel.fromJson(Map<String, dynamic> json) =>

diff --git a/data/lib/api/user/user_models.freezed.dart b/data/lib/api/user/user_models.freezed.dart
@@ -34,6 +34,7 @@ mixin _$UserModel {
   PlayerRole? get player_role => throw _privateConstructorUsedError;
   BattingStyle? get batting_style => throw _privateConstructorUsedError;
   BowlingStyle? get bowling_style => throw _privateConstructorUsedError;
+  bool get isActive => throw _privateConstructorUsedError;
 
   Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
   @JsonKey(ignore: true)
@@ -60,7 +61,8 @@ abstract class $UserModelCopyWith<$Res> {
       DateTime? updated_at,
       PlayerRole? player_role,
       BattingStyle? batting_style,
-      BowlingStyle? bowling_style});
+      BowlingStyle? bowling_style,
+      bool isActive});
 }
 
 /// @nodoc
@@ -90,6 +92,7 @@ class _$UserModelCopyWithImpl<$Res, $Val extends UserModel>
     Object? player_role = freezed,
     Object? batting_style = freezed,
     Object? bowling_style = freezed,
+    Object? isActive = null,
   }) {
     return _then(_value.copyWith(
       id: null == id
@@ -148,6 +151,10 @@ class _$UserModelCopyWithImpl<$Res, $Val extends UserModel>
           ? _value.bowling_style
           : bowling_style // ignore: cast_nullable_to_non_nullable
               as BowlingStyle?,
+      isActive: null == isActive
+          ? _value.isActive
+          : isActive // ignore: cast_nullable_to_non_nullable
+              as bool,
     ) as $Val);
   }
 }
@@ -174,7 +181,8 @@ abstract class _$$UserModelImplCopyWith<$Res>
       DateTime? updated_at,
       PlayerRole? player_role,
       BattingStyle? batting_style,
-      BowlingStyle? bowling_style});
+      BowlingStyle? bowling_style,
+      bool isActive});
 }
 
 /// @nodoc
@@ -202,6 +210,7 @@ class __$$UserModelImplCopyWithImpl<$Res>
     Object? player_role = freezed,
     Object? batting_style = freezed,
     Object? bowling_style = freezed,
+    Object? isActive = null,
   }) {
     return _then(_$UserModelImpl(
       id: null == id
@@ -260,6 +269,10 @@ class __$$UserModelImplCopyWithImpl<$Res>
           ? _value.bowling_style
           : bowling_style // ignore: cast_nullable_to_non_nullable
               as BowlingStyle?,
+      isActive: null == isActive
+          ? _value.isActive
+          : isActive // ignore: cast_nullable_to_non_nullable
+              as bool,
     ));
   }
 }
@@ -281,7 +294,8 @@ class _$UserModelImpl extends _UserModel {
       this.updated_at,
       this.player_role,
       this.batting_style,
-      this.bowling_style})
+      this.bowling_style,
+      this.isActive = true})
       : super._();
 
   factory _$UserModelImpl.fromJson(Map<String, dynamic> json) =>
@@ -315,10 +329,13 @@ class _$UserModelImpl extends _UserModel {
   final BattingStyle? batting_style;
   @override
   final BowlingStyle? bowling_style;
+  @override
+  @JsonKey()
+  final bool isActive;
 
   @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)';
+    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)';
   }
 
   @override
@@ -347,7 +364,9 @@ class _$UserModelImpl extends _UserModel {
             (identical(other.batting_style, batting_style) ||
                 other.batting_style == batting_style) &&
             (identical(other.bowling_style, bowling_style) ||
-                other.bowling_style == bowling_style));
+                other.bowling_style == bowling_style) &&
+            (identical(other.isActive, isActive) ||
+                other.isActive == isActive));
   }
 
   @JsonKey(ignore: true)
@@ -367,7 +386,8 @@ class _$UserModelImpl extends _UserModel {
       updated_at,
       player_role,
       batting_style,
-      bowling_style);
+      bowling_style,
+      isActive);
 
   @JsonKey(ignore: true)
   @override
@@ -398,7 +418,8 @@ abstract class _UserModel extends UserModel {
       final DateTime? updated_at,
       final PlayerRole? player_role,
       final BattingStyle? batting_style,
-      final BowlingStyle? bowling_style}) = _$UserModelImpl;
+      final BowlingStyle? bowling_style,
+      final bool isActive}) = _$UserModelImpl;
   const _UserModel._() : super._();
 
   factory _UserModel.fromJson(Map<String, dynamic> json) =
@@ -433,6 +454,8 @@ abstract class _UserModel extends UserModel {
   @override
   BowlingStyle? get bowling_style;
   @override
+  bool get isActive;
+  @override
   @JsonKey(ignore: true)
   _$$UserModelImplCopyWith<_$UserModelImpl> get copyWith =>
       throw _privateConstructorUsedError;

diff --git a/data/lib/api/user/user_models.g.dart b/data/lib/api/user/user_models.g.dart
diff --git a/data/lib/service/team/team_service.dart b/data/lib/service/team/team_service.dart
@@ -6,6 +6,7 @@ import 'package:data/errors/app_error.dart';
 import 'package:data/extensions/string_extensions.dart';
 import 'package:data/service/user/user_service.dart';
 import 'package:data/utils/constant/firestore_constant.dart';
+import 'package:data/utils/dummy_deactivated_account.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 
 import '../../storage/app_preferences.dart';
@@ -42,8 +43,7 @@ class TeamService {
       final teamRequestModel = teamDoc.data();
 
       if (teamRequestModel == null) {
-        return TeamModel(
-            id: teamId, name: "Deleted Team", name_lowercase: "deletedteam");
+        return deActiveDummyTeamModel(teamId);
       }
 
       final member = (teamRequestModel.players?.isNotEmpty ?? false)
@@ -70,8 +70,7 @@ class TeamService {
     return _teamsCollection.doc(teamId).snapshots().asyncMap((teamDoc) async {
       final teamRequestModel = teamDoc.data();
       if (teamRequestModel == null) {
-        return TeamModel(
-            id: teamId, name: "Deleted Team", name_lowercase: "deletedteam");
+        return deActiveDummyTeamModel(teamId);
       }
       final member = (teamRequestModel.players?.isNotEmpty ?? false)
           ? await getMemberListFromUserIds(teamRequestModel.players ?? [])

diff --git a/data/lib/service/user/user_service.dart b/data/lib/service/user/user_service.dart
@@ -2,6 +2,7 @@ import 'package:cloud_firestore/cloud_firestore.dart';
 import 'package:data/errors/app_error.dart';
 import 'package:data/extensions/list_extensions.dart';
 import 'package:data/utils/constant/firestore_constant.dart';
+import 'package:data/utils/dummy_deactivated_account.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
 import '../../api/user/user_models.dart';
@@ -66,11 +67,7 @@ class UserService {
       final snapshot = await _userCollection.doc(id).get();
       var userModel = snapshot.data();
       if (userModel == null) {
-        return UserModel(
-            id: id,
-            name: "Deactivated User",
-            created_at: DateTime(1950),
-            location: "--");
+        return deActiveDummyUserAccount(id);
       }
       return userModel;
     } catch (error, stack) {
@@ -92,11 +89,9 @@ class UserService {
 
         final deactivatedUserIds =
             tenIds.where((id) => !users.map((user) => user.id).contains(id));
-        users.addAll(deactivatedUserIds.map((id) => UserModel(
-            id: id,
-            name: "Deactivated User",
-            created_at: DateTime(1950),
-            location: "--")));
+        users.addAll(deactivatedUserIds.map(
+          (id) => deActiveDummyUserAccount(id),
+        ));
       }
 
       return users;

diff --git a/data/lib/utils/dummy_deactivated_account.dart b/data/lib/utils/dummy_deactivated_account.dart
@@ -0,0 +1,20 @@
+import 'package:data/api/team/team_model.dart';
+import 'package:data/api/user/user_models.dart';
+
+UserModel deActiveDummyUserAccount(String id) {
+  return UserModel(
+      id: id,
+      name: 'Deactivated User',
+      created_at: DateTime(1950),
+      location: '--',
+      isActive: false);
+}
+
+TeamModel deActiveDummyTeamModel(String id) {
+  return TeamModel(
+      id: id,
+      name: 'Deactivated Team',
+      name_lowercase: 'deactivatedteam',
+      created_at: DateTime(1950),
+      city: '--');
+}
diff --git a/khelo/lib/components/user_detail_cell.dart b/khelo/lib/components/user_detail_cell.dart
@@ -26,7 +26,7 @@ class UserDetailCell extends StatelessWidget {
   Widget build(BuildContext context) {
     return GestureDetector(
       behavior: HitTestBehavior.opaque,
-      onTap: onTap,
+      onTap: user.isActive ? onTap : null,
       child: Row(
         children: [
           ImageAvatar(

diff --git a/khelo/lib/ui/flow/matches/add_match/components/team_selection_view.dart b/khelo/lib/ui/flow/matches/add_match/components/team_selection_view.dart
@@ -148,7 +148,15 @@ class TeamSelectionView extends StatelessWidget {
         onTap: () async {
           final squad = await AppRoute.selectSquad(
             team: team,
-            squad: type == TeamType.a ? state.squadA : state.squadB,
+            squad: type == TeamType.a
+                ? state.squadA
+                    ?.where(
+                      (element) => element.player.isActive,
+                    )
+                    .toList()
+                : state.squadB
+                    ?.where((element) => element.player.isActive)
+                    .toList(),
             captainId: type == TeamType.a
                 ? state.teamACaptainId
                 : state.teamBCaptainId,

diff --git a/khelo/lib/ui/flow/matches/add_match/select_squad/select_squad_screen.dart b/khelo/lib/ui/flow/matches/add_match/select_squad/select_squad_screen.dart
@@ -187,7 +187,8 @@ class _SelectSquadScreenState extends ConsumerState<SelectSquadScreen> {
   List<UserModel> getFilteredList(SelectSquadViewState state) {
     return state.team?.players
             ?.where((element) =>
-                !state.squad.map((e) => e.player.id).contains(element.id))
+                !state.squad.map((e) => e.player.id).contains(element.id) &&
+                element.isActive)
             .toList() ??
         [];
   }

diff --git a/khelo/lib/ui/flow/matches/match_detail/components/match_detail_squad_view.dart b/khelo/lib/ui/flow/matches/match_detail/components/match_detail_squad_view.dart
@@ -41,19 +41,28 @@ class MatchDetailSquadView extends ConsumerWidget {
   Widget _listView(BuildContext context, MatchDetailTabState state) {
     final firstTeam = state.match!.teams.firstOrNull;
     final secondTeam = state.match!.teams.elementAtOrNull(1);
-    final firstTeamSquad = firstTeam?.squad.map((e) => e.player).toList() ?? [];
-    final secondTeamSquad =
-        secondTeam?.squad.map((e) => e.player).toList() ?? [];
+    final firstTeamSquad = firstTeam?.squad
+            .where((element) => element.player.isActive)
+            .map((e) => e.player)
+            .toList() ??
+        [];
+    final secondTeamSquad = secondTeam?.squad
+            .where((element) => element.player.isActive)
+            .map((e) => e.player)
+            .toList() ??
+        [];
 
     final firstTeamBench = firstTeam?.team.players
             ?.where((element) =>
-                !firstTeamSquad.map((e) => e.id).contains(element.id))
+                !firstTeamSquad.map((e) => e.id).contains(element.id) &&
+                element.isActive)
             .toList() ??
         [];
 
     final secondTeamBench = secondTeam?.team.players
             ?.where((element) =>
-                !secondTeamSquad.map((e) => e.id).contains(element.id))
+                !secondTeamSquad.map((e) => e.id).contains(element.id) &&
+                element.isActive)
             .toList() ??
         [];
 

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
@@ -1085,9 +1085,10 @@ class ScoreBoardViewNotifier extends StateNotifier<ScoreBoardViewState> {
             : state.otherInning?.team_id) ??
         "INVALID ID";
     final teamPlayers = state.match?.teams
-        .where((element) => element.team.id == teamId)
-        .firstOrNull
-        ?.squad;
+        .firstWhere((element) => element.team.id == teamId)
+        .squad
+        .where((element) => element.player.isActive)
+        .toList();
 
     if (type == PlayerSelectionType.bowler) {
       return teamPlayers ?? [];
@@ -1113,7 +1114,9 @@ class ScoreBoardViewNotifier extends StateNotifier<ScoreBoardViewState> {
     final teamId = state.otherInning?.team_id ?? "INVALID ID";
     final teamPlayers = state.match?.teams
         .firstWhere((element) => element.team.id == teamId)
-        .squad;
+        .squad
+        .where((element) => element.player.isActive)
+        .toList();
 
     return teamPlayers ?? [];
   }

diff --git a/khelo/lib/ui/flow/team/search_team/components/team_member_sheet.dart b/khelo/lib/ui/flow/team/search_team/components/team_member_sheet.dart
@@ -65,8 +65,17 @@ class TeamMemberSheet extends StatelessWidget {
                 children: (team.players ?? [])
                     .map((member) => UserDetailCell(
                           user: member,
-                          onTap: () => UserDetailSheet.show(context, member),
-                          trailing: isForVerification
+                          onTap: () => UserDetailSheet.show(
+                            context,
+                            member,
+                            actionButtonTitle:
+                                isForVerification && member.isActive
+                                    ? context.l10n.common_select_title
+                                    : null,
+                            onButtonTap: () =>
+                                _onSelectButtonTap(context, member),
+                          ),
+                          trailing: isForVerification && member.isActive
                               ? _selectButton(context, member)
                               : null,
                         ))
@@ -80,15 +89,17 @@ class TeamMemberSheet extends StatelessWidget {
   Widget _selectButton(BuildContext context, UserModel user) {
     return SecondaryButton(
       context.l10n.common_select_title,
-      onPressed: () async {
-        if (user.phone != null) {
-          final res = await VerifyTeamMemberSheet.show(context,
-              phoneNumber: user.phone!);
-          if (res != null && res && context.mounted) {
-            context.pop(res);
-          }
-        }
-      },
+      onPressed: () => _onSelectButtonTap(context, user),
     );
   }
+
+  Future<void> _onSelectButtonTap(BuildContext context, UserModel user) async {
+    if (user.phone != null) {
+      final res =
+          await VerifyTeamMemberSheet.show(context, phoneNumber: user.phone!);
+      if (res != null && res && context.mounted) {
+        context.pop(res);
+      }
+    }
+  }
 }
diff --git a/khelo/lib/ui/flow/team/search_team/search_team_view_model.dart b/khelo/lib/ui/flow/team/search_team/search_team_view_model.dart
@@ -90,7 +90,9 @@ class SearchTeamViewNotifier extends StateNotifier<SearchTeamState> {
 
   void onTeamCellTap(TeamModel team) {
     state = state.copyWith(showSelectionError: false);
-    final playersCount = (team.players ?? []).length;
+    final playersCount =
+        (team.players?.where((player) => player.isActive).toList() ?? [])
+            .length;
     if (playersCount >= 2) {
       final isAlreadySelected = state.selectedTeam?.id == team.id;
       state = state.copyWith(selectedTeam: isAlreadySelected ? null : team);