feat: [#17] PhoneAuthBloc, EmailDuplicateCheckBloc을 Listener로 SignUpB…

…loc으로 값 전달
f-lab-edu · Nov 23, 2024 · d0ad028 · d0ad028
1 parent 0b86a5c
commit d0ad028
Show file tree

Hide file tree

Showing 14 changed files with 145 additions and 19 deletions.
diff --git a/lib/core/types/gender_type.dart b/lib/core/types/gender_type.dart
@@ -24,3 +24,7 @@ enum GenderType with L10nKeyProvider {
       )
       .toList();
 }
+
+extension GenderTypeExt on GenderType {
+  bool get isNone => this == GenderType.none;
+}
diff --git a/lib/core/types/visible_type.dart b/lib/core/types/visible_type.dart
@@ -7,6 +7,8 @@ enum VisibleType {
 extension VisibleTypeExt on VisibleType {
   bool get isVisible => this == VisibleType.visible;
 
+  bool get isInvisible => this == VisibleType.invisible;
+
   /// Boolean -> 노출 여부
   static VisibleType fromBool(bool isVisible) {
     return isVisible ? VisibleType.visible : VisibleType.invisible;

diff --git a/lib/core/utils/regex/regex_util.dart b/lib/core/utils/regex/regex_util.dart
@@ -16,7 +16,7 @@ class RegExUtil {
 
   /// 이름
   static RegExp namePattern = RegExp(
-    r'^[가-힣a-zA-Z]{2,10}\$',
+    r'^[ㄱ-ㅎ가-힣A-Za-z]{2,10}$',
   );
 
   /// 생년월일 패턴

diff --git a/lib/feature/account/data/data_sources/mock/mock_api.dart b/lib/feature/account/data/data_sources/mock/mock_api.dart
@@ -53,12 +53,14 @@ class AccountMockApi extends AccountApiImpl {
   FutureOr<ApiResponse<BaseResponseDto<bool>>> verifyAuthCode({
     required AuthCodeVerificationRequestDto dto,
   }) async {
+    final isAuth = '111111' == dto.authCode;
+
     /// Mock 응답 등록
     dioAdapter.onPost(
       verifyAuthCodePath,
       (server) => server.reply(
         200,
-        BaseResponseDtoMock.mock(true).toJson((value) => value),
+        BaseResponseDtoMock.mock(isAuth).toJson((value) => value),
         delay: const Duration(seconds: 1),
       ),
       data: dto.toJson(),

diff --git a/lib/feature/account/init_injections.dart b/lib/feature/account/init_injections.dart
@@ -40,15 +40,15 @@ void initAccountDomainInjections() {
 }
 
 void initAccountPresentationInjections() {
-  getIt.registerFactory<PhoneAuthBloc>(
+  getIt.registerLazySingleton<PhoneAuthBloc>(
     () => PhoneAuthBloc(phoneAuthUseCase: getIt()),
   );
+  getIt.registerLazySingleton<EmailDuplicateCheckBloc>(
+        () => EmailDuplicateCheckBloc(useCase: getIt()),
+  );
   getIt.registerFactory<LoginBloc>(
     () => LoginBloc(loginUseCase: getIt()),
   );
-  getIt.registerFactory<EmailDuplicateCheckBloc>(
-    () => EmailDuplicateCheckBloc(useCase: getIt()),
-  );
   getIt.registerFactory<SignUpBloc>(
     () => SignUpBloc(signUpUseCase: getIt()),
   );

diff --git a/lib/feature/account/presentation/bloc/email_duplicate_check/email_duplicate_check_bloc.dart b/lib/feature/account/presentation/bloc/email_duplicate_check/email_duplicate_check_bloc.dart
@@ -12,6 +12,9 @@ part 'email_duplicate_check_bloc.freezed.dart';
 
 part 'email_duplicate_check_bloc.handler.dart';
 
+typedef EmailDuplicateCheckBlocListener
+    = BlocListener<EmailDuplicateCheckBloc, EmailDuplicateCheckState>;
+
 class EmailDuplicateCheckBloc
     extends BaseBloc<EmailDuplicateCheckEvent, EmailDuplicateCheckState> {
   final EmailDuplicateCheckUseCase useCase;

diff --git a/lib/feature/account/presentation/bloc/email_duplicate_check/email_duplicate_check_state.dart b/lib/feature/account/presentation/bloc/email_duplicate_check/email_duplicate_check_state.dart
@@ -20,4 +20,7 @@ class EmailDuplicateCheckState extends BaseBlocState
 extension EmailDuplicateCheckStateExt on EmailDuplicateCheckState {
   /// 에러 문구 노출 여부
   bool get isVisibleError => errorVisible.isVisible;
+
+  /// 유니크 여부
+  bool get isUnique => errorVisible.isInvisible;
 }
diff --git a/lib/feature/account/presentation/bloc/phone_auth/phone_auth_bloc.dart b/lib/feature/account/presentation/bloc/phone_auth/phone_auth_bloc.dart
@@ -14,8 +14,9 @@ part 'phone_auth_bloc.handler.dart';
 
 part 'phone_auth_bloc.parser.dart';
 
-class PhoneAuthBloc
-    extends Bloc<PhoneAuthEvent, PhoneAuthState> {
+typedef PhoneAuthBlocListener = BlocListener<PhoneAuthBloc, PhoneAuthState>;
+
+class PhoneAuthBloc extends Bloc<PhoneAuthEvent, PhoneAuthState> {
   final PhoneAuthUseCase phoneAuthUseCase;
 
   PhoneAuthBloc({

diff --git a/lib/feature/account/presentation/bloc/phone_auth/phone_auth_state.dart b/lib/feature/account/presentation/bloc/phone_auth/phone_auth_state.dart
@@ -1,8 +1,7 @@
 part of 'phone_auth_bloc.dart';
 
 @freezed
-class PhoneAuthState extends BaseBlocState
-    with _$PhoneAuthState {
+class PhoneAuthState extends BaseBlocState with _$PhoneAuthState {
   factory PhoneAuthState({
     required BaseBlocStatus status,
 
@@ -26,4 +25,7 @@ extension PhoneAuthStateExt on PhoneAuthState {
 
   /// 에러 문구 노출 여부
   bool get isVisibleAuthCodeError => authCodeErrorVisible.isVisible;
+
+  /// 인증 완료 여부
+  bool get isAuth => authCodeErrorVisible.isInvisible;
 }
diff --git a/lib/feature/account/presentation/bloc/sign_up/sign_up_bloc.dart b/lib/feature/account/presentation/bloc/sign_up/sign_up_bloc.dart
@@ -11,6 +11,8 @@ part 'sign_up_bloc.freezed.dart';
 
 part 'sign_up_bloc.handler.dart';
 
+typedef SignUpBlocBuilder = BlocBuilder<SignUpBloc, SignUpState>;
+
 class SignUpBloc extends BaseBloc<SignUpEvent, SignUpState> {
   final SignUpUseCase signUpUseCase;
 
@@ -22,6 +24,10 @@ class SignUpBloc extends BaseBloc<SignUpEvent, SignUpState> {
     on<SignUpNameInputted>(_onNameInputted);
     on<SignUpBirthDateInputted>(_onBirthDateInputted);
     on<SignUpGenderSelected>(_onGenderSelected);
+    on<SignUpPhoneInputted>(_onPhoneInputted);
+    on<SignUpPhoneAuthChanged>(_onPhoneAuthChanged);
+    on<SignUpLoginIdInputted>(_onLoginIdInputted);
+    on<SignUpIsUniqueIdChanged>(_onIsUniqueIdChanged);
     on<SignUpPasswordObscureToggled>(_onPasswordObscureToggled);
     on<SignUpPasswordInputted>(_onPasswordInputted);
     on<SignUpPasswordVerifyInputted>(_onPasswordVerifyInputted);

diff --git a/lib/feature/account/presentation/bloc/sign_up/sign_up_bloc.handler.dart b/lib/feature/account/presentation/bloc/sign_up/sign_up_bloc.handler.dart
@@ -22,6 +22,34 @@ extension SignUpBlocHandler on SignUpBloc {
     emit(state.copyWith(gender: event.gender));
   }
 
+  void _onPhoneInputted(
+    SignUpPhoneInputted event,
+    Emitter<SignUpState> emit,
+  ) {
+    emit(state.copyWith(phone: event.phone));
+  }
+
+  void _onPhoneAuthChanged(
+    SignUpPhoneAuthChanged event,
+    Emitter<SignUpState> emit,
+  ) {
+    emit(state.copyWith(isAuthPhone: event.isAuth));
+  }
+
+  void _onLoginIdInputted(
+    SignUpLoginIdInputted event,
+    Emitter<SignUpState> emit,
+  ) {
+    emit(state.copyWith(loginId: event.loginId));
+  }
+
+  void _onIsUniqueIdChanged(
+    SignUpIsUniqueIdChanged event,
+    Emitter<SignUpState> emit,
+  ) {
+    emit(state.copyWith(isUniqueId: event.isUnique));
+  }
+
   void _onPasswordObscureToggled(
     SignUpPasswordObscureToggled event,
     Emitter<SignUpState> emit,

diff --git a/lib/feature/account/presentation/bloc/sign_up/sign_up_event.dart b/lib/feature/account/presentation/bloc/sign_up/sign_up_event.dart
@@ -30,6 +30,20 @@ class SignUpGenderSelected extends SignUpEvent {
   SignUpGenderSelected({required this.gender});
 }
 
+/// 휴대폰 입력 이벤트
+class SignUpPhoneInputted extends SignUpEvent {
+  final Phone phone;
+
+  SignUpPhoneInputted({required this.phone});
+}
+
+/// 휴대폰 인증 입력 이벤트
+class SignUpPhoneAuthChanged extends SignUpEvent {
+  final bool isAuth;
+
+  SignUpPhoneAuthChanged({required this.isAuth});
+}
+
 /// 비밀번호 입력 이벤트
 class SignUpPasswordInputted extends SignUpEvent {
   final String value;
@@ -39,6 +53,20 @@ class SignUpPasswordInputted extends SignUpEvent {
   Password get password => Password(value);
 }
 
+/// LoginId 입력 이벤트
+class SignUpLoginIdInputted extends SignUpEvent {
+  final Email loginId;
+
+  SignUpLoginIdInputted({required this.loginId});
+}
+
+/// LoginId 인증 여부
+class SignUpIsUniqueIdChanged extends SignUpEvent {
+  final bool isUnique;
+
+  SignUpIsUniqueIdChanged({required this.isUnique});
+}
+
 /// 비밀번호 확인 입력 이벤트
 class SignUpPasswordVerifyInputted extends SignUpEvent {
   final String value;

diff --git a/lib/feature/account/presentation/bloc/sign_up/sign_up_state.dart b/lib/feature/account/presentation/bloc/sign_up/sign_up_state.dart
@@ -9,7 +9,9 @@ class SignUpState extends BaseBlocState with _$SignUpState {
     @Default(BirthDate.empty) BirthDate birthDate,
     @Default(GenderType.none) GenderType gender,
     @Default(Phone.empty) Phone phone,
+    @Default(false) bool isAuthPhone,
     @Default(Email.empty) LoginId loginId,
+    @Default(false) bool isUniqueId,
     @Default(Password.empty) Password password,
     @Default(Password.empty) Password passwordVerify,
     @Default(true) bool isPasswordObscure,
@@ -19,10 +21,21 @@ class SignUpState extends BaseBlocState with _$SignUpState {
 
 extension SignUpStateExt on SignUpState {
   VisibleType getPasswordErrorVisible() {
-    return VisibleTypeExt.fromBool(!checkPasswordValid());
+    return VisibleTypeExt.fromBool(!_checkPasswordValid());
   }
 
-  bool checkPasswordValid() {
+  bool _checkPasswordValid() {
     return password.isValid && password.isEqual(passwordVerify);
   }
+
+  bool get isEnabledSubmit => _checkSubmitEnabled();
+
+  bool _checkSubmitEnabled() {
+    return name.isValid &&
+        birthDate.isValid &&
+        !gender.isNone &&
+        isAuthPhone &&
+        isUniqueId &&
+        _checkPasswordValid();
+  }
 }
diff --git a/lib/feature/account/presentation/page/sign_up/sign_up_page.dart b/lib/feature/account/presentation/page/sign_up/sign_up_page.dart
@@ -9,17 +9,49 @@ import 'package:withu_app/shared/shared.dart';
 
 import 'sign_up_page_key.dart';
 
-typedef SignUpBlocBuilder = BlocBuilder<SignUpBloc, SignUpState>;
-
 @RoutePage()
 class SignUpPage extends StatelessWidget {
   const SignUpPage({super.key});
 
   @override
   Widget build(BuildContext context) {
-    return BlocProvider<SignUpBloc>(
-      create: (context) => getIt(),
-      child: const SignUpPageContent(),
+    return MultiBlocProvider(
+      providers: [
+        BlocProvider<PhoneAuthBloc>(
+          create: (context) => getIt<PhoneAuthBloc>(),
+        ),
+        BlocProvider<EmailDuplicateCheckBloc>(
+          create: (context) => getIt<EmailDuplicateCheckBloc>(),
+        ),
+        BlocProvider<SignUpBloc>(
+          create: (context) => getIt<SignUpBloc>(),
+        ),
+      ],
+      child: MultiBlocListener(
+        listeners: [
+          PhoneAuthBlocListener(
+            listener: (context, state) {
+              context
+                  .read<SignUpBloc>()
+                  .add(SignUpPhoneInputted(phone: state.phone));
+              context
+                  .read<SignUpBloc>()
+                  .add(SignUpPhoneAuthChanged(isAuth: state.isAuth));
+            },
+          ),
+          EmailDuplicateCheckBlocListener(
+            listener: (context, state) {
+              context
+                  .read<SignUpBloc>()
+                  .add(SignUpLoginIdInputted(loginId: state.email));
+              context
+                  .read<SignUpBloc>()
+                  .add(SignUpIsUniqueIdChanged(isUnique: state.isUnique));
+            },
+          ),
+        ],
+        child: const SignUpPageContent(),
+      ),
     );
   }
 }
@@ -29,7 +61,7 @@ class SignUpPageContent extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return BlocBuilder<SignUpBloc, SignUpState>(
+    return SignUpBlocBuilder(
       builder: (context, state) {
         return PageRoot(
           isLoading: state.status.isLoading,
@@ -94,6 +126,7 @@ class NameInput extends StatelessWidget {
     return BaseInput(
       key: SignUpPageKey.name.toKey(),
       hintText: StringRes.enterTwoOrMoreChars.tr,
+      maxLength: 10,
       onChanged: (String text) {
         context.read<SignUpBloc>().add(SignUpNameInputted(value: text));
       },
@@ -110,6 +143,7 @@ class BirthDateInput extends StatelessWidget {
       key: SignUpPageKey.birthDate.toKey(),
       keyboardType: TextInputType.number,
       hintText: StringRes.enterEightChars.tr,
+      maxLength: 8,
       inputFormatters: [
         FilteringTextInputFormatter.digitsOnly,
       ],
@@ -173,7 +207,7 @@ class SubmitButton extends StatelessWidget {
       return EnabledButton(
         key: SignUpPageKey.submitBtn.toKey(),
         text: StringRes.signUp.tr,
-        isEnabled: true,
+        isEnabled: state.isEnabledSubmit,
         onTap: () {
           context.read<SignUpBloc>().add(SignUpSubmitPressed());
         },