firestore connect; macos network fix

dinaraparanid · Jan 1, 2025 · 415c7ed · 415c7ed
1 parent b1c2c6d
commit 415c7ed
Show file tree

Hide file tree

Showing 23 changed files with 177 additions and 59 deletions.
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -1435,7 +1435,7 @@ SPEC CHECKSUMS:
   FirebaseMessaging: f8a160d99c2c2e5babbbcc90c4a3e15db036aee2
   FirebaseSharedSwift: a4e5dfca3e210633bb3a3dfb94176c019211948b
   Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
-  flutter_native_splash: e8a1e01082d97a8099d973f919f57904c925008a
+  flutter_native_splash: f71420956eb811e6d310720fee915f1d42852e7a
   GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7
   GoogleUtilities: 26a3abef001b6533cf678d3eb38fd3f614b7872d
   "gRPC-C++": 2fa52b3141e7789a28a737f251e0c45b4cb20a87

diff --git a/lib/core/data/profile/data_source/profile_api_impl.dart b/lib/core/data/profile/data_source/profile_api_impl.dart
@@ -0,0 +1,33 @@
+import 'package:cloud_firestore/cloud_firestore.dart';
+import 'package:poster/core/domain/profile/data_source/profile_api.dart';
+import 'package:poster/core/domain/profile/entity/profile.dart';
+import 'package:poster/core/utils/functions/let.dart';
+
+const _collectionProfile = 'profiles';
+const _fieldEmail = 'email';
+
+final class ProfileApiImpl with ProfileApi {
+  @override
+  Future<Profile> createProfile({
+    required String username,
+    required String email,
+  }) async {
+    final profile = Profile(username: username, email: email);
+
+    await FirebaseFirestore.instance
+      .collection(_collectionProfile)
+      .add(profile.toJson());
+
+    return profile;
+  }
+
+  @override
+  Future<Profile?> getProfileByEmail({required String email}) =>
+    FirebaseFirestore.instance
+      .collection(_collectionProfile)
+      .where(_fieldEmail, isEqualTo: email)
+      .get()
+      .then((snapshot) =>
+        snapshot.docs.firstOrNull?.data().let(Profile.fromJson)
+      );
+}
diff --git a/.../profile/data_source/profile_storage.dart → ...ofile/data_source/profile_store_impl.dart b/.../profile/data_source/profile_storage.dart → ...ofile/data_source/profile_store_impl.dart
@@ -1,11 +1,11 @@
 import 'dart:convert';
 import 'package:poster/core/domain/profile/entity/profile.dart';
-import 'package:poster/core/domain/profile/data_source/profile_storage.dart';
+import 'package:poster/core/domain/profile/data_source/profile_store.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
 const _profileKey = 'profile';
 
-final class ProfileStorageImpl with ProfileStorage {
+final class ProfileStoreImpl with ProfileStore {
   @override
   Future<Profile?> get profile async {
     final prefs = await SharedPreferences.getInstance();
@@ -14,7 +14,7 @@ final class ProfileStorageImpl with ProfileStorage {
   }
 
   @override
-  Future<void> updateProfile(Profile profile) async {
+  Future<void> storeProfile(Profile profile) async {
     final prefs = await SharedPreferences.getInstance();
     await prefs.setString(_profileKey, jsonEncode(profile.toJson()));
   }

diff --git a/lib/core/data/profile/di/profile_module.dart b/lib/core/data/profile/di/profile_module.dart
@@ -1,12 +1,16 @@
 import 'package:get_it/get_it.dart';
-import 'package:poster/core/data/profile/data_source/profile_storage.dart';
+import 'package:poster/core/data/profile/data_source/profile_api_impl.dart';
+import 'package:poster/core/data/profile/data_source/profile_store_impl.dart';
 import 'package:poster/core/data/profile/repository/profile_repository_impl.dart';
-import 'package:poster/core/domain/profile/data_source/profile_storage.dart';
+import 'package:poster/core/di/provide_singleton.dart';
+import 'package:poster/core/domain/profile/data_source/profile_api.dart';
+import 'package:poster/core/domain/profile/data_source/profile_store.dart';
 import 'package:poster/core/domain/profile/repository/profile_repository.dart';
 
 extension ProfileModule on GetIt {
-  void registerProfileModule() {
-    registerLazySingleton<ProfileStorage>(() => ProfileStorageImpl());
-    registerLazySingleton<ProfileRepository>(() => ProfileRepositoryImpl(storage: this()));
-  }
+  List<Type> registerProfileModule() => [
+    provideSingleton<ProfileApi>(() => ProfileApiImpl()),
+    provideSingleton<ProfileStore>(() => ProfileStoreImpl()),
+    provideSingleton<ProfileRepository>(() => ProfileRepositoryImpl(api: this(), store: this())),
+  ];
 }
diff --git a/lib/core/data/profile/repository/profile_repository_impl.dart b/lib/core/data/profile/repository/profile_repository_impl.dart
@@ -1,18 +1,33 @@
-import 'package:poster/core/domain/profile/data_source/profile_storage.dart';
+import 'package:fpdart/fpdart.dart';
+import 'package:poster/core/domain/profile/data_source/profile_api.dart';
+import 'package:poster/core/domain/profile/data_source/profile_store.dart';
 import 'package:poster/core/domain/profile/entity/profile.dart';
 import 'package:poster/core/domain/profile/repository/profile_repository.dart';
 
 final class ProfileRepositoryImpl extends ProfileRepository {
-  final ProfileStorage _storage;
+  final ProfileApi _api;
+  final ProfileStore _store;
 
   ProfileRepositoryImpl({
-    required ProfileStorage storage,
-  }) : _storage = storage;
+    required ProfileApi api,
+    required ProfileStore store,
+  }) : _api = api, _store = store;
 
   @override
-  Future<Profile?> get profile => _storage.profile;
+  Future<Profile?> get profile => _store.profile;
 
   @override
-  Future<void> updateProfile(Profile profile) =>
-    _storage.updateProfile(profile);
+  Future<void> createProfile({
+    required String username,
+    required String email,
+  }) => _api.createProfile(username: username, email: email)
+    .then(_store.storeProfile);
+
+  @override
+  Future<Either<Exception, void>> saveProfile({required String email}) async {
+    final profile = await _api.getProfileByEmail(email: email);
+    if (profile == null) return Either.left(Exception('profile is not found'));
+    _store.storeProfile(profile);
+    return Either.right(null);
+  }
 }
diff --git a/lib/core/di/core_module.dart b/lib/core/di/core_module.dart
@@ -4,9 +4,9 @@ import 'package:poster/core/data/post/di/post_module.dart';
 import 'package:poster/core/data/profile/di/profile_module.dart';
 
 extension CoreModule on GetIt {
-  void registerCoreModule() {
-    registerProfileModule();
+  List<Type> registerCoreModule() {
     registerPostModule();
     registerDio();
+    return [...registerProfileModule()];
   }
 }
diff --git a/lib/core/domain/profile/data_source/profile_api.dart b/lib/core/domain/profile/data_source/profile_api.dart
@@ -0,0 +1,10 @@
+import 'package:poster/core/domain/profile/entity/profile.dart';
+
+mixin ProfileApi {
+  Future<Profile> createProfile({
+    required String username,
+    required String email,
+  });
+
+  Future<Profile?> getProfileByEmail({required String email});
+}
diff --git a/.../profile/data_source/profile_storage.dart → ...in/profile/data_source/profile_store.dart b/.../profile/data_source/profile_storage.dart → ...in/profile/data_source/profile_store.dart
@@ -1,6 +1,6 @@
 import 'package:poster/core/domain/profile/entity/profile.dart';
 
-mixin ProfileStorage {
+mixin ProfileStore {
   Future<Profile?> get profile;
-  Future<void> updateProfile(Profile profile);
+  Future<void> storeProfile(Profile profile);
 }
diff --git a/lib/core/domain/profile/entity/profile.dart b/lib/core/domain/profile/entity/profile.dart
@@ -1,27 +1,29 @@
 import 'package:freezed_annotation/freezed_annotation.dart';
+import 'package:poster/core/utils/functions/let.dart';
 
 part 'profile.freezed.dart';
 part 'profile.g.dart';
 
 @freezed
 abstract class Profile with _$Profile {
   const factory Profile({
-    required String username,
-    String? birthdate,
-    int? followers,
-    int? following,
-    String? location,
+    @JsonKey(name: 'username') required String username,
+    @JsonKey(name: 'email') required String email,
+    @JsonKey(name: 'avatar') String? avatar,
+    @JsonKey(name: 'birthdate') int? birthdayTimestamp,
+    @JsonKey(name: 'location') String? location,
   }) = _Profile;
 
   factory Profile.fromJson(Map<String, dynamic> json) =>
     _$ProfileFromJson(json);
 }
 
 extension Properties on Profile {
-  int? get age {
-    if (birthdate == null) return null;
-    final born = DateTime.parse(birthdate!);
+  DateTime? get birthdate =>
+    birthdayTimestamp?.let(DateTime.fromMillisecondsSinceEpoch);
+
+  int? get age => birthdate?.let((date) {
     final now = DateTime.now();
-    return now.difference(born).inDays ~/ 365;
-  }
+    return now.difference(date).inDays ~/ 365;
+  });
 }
diff --git a/lib/core/domain/profile/repository/profile_repository.dart b/lib/core/domain/profile/repository/profile_repository.dart
@@ -1,3 +1,13 @@
-import 'package:poster/core/domain/profile/data_source/profile_storage.dart';
+import 'package:fpdart/fpdart.dart';
+import 'package:poster/core/domain/profile/entity/profile.dart';
 
-abstract class ProfileRepository with ProfileStorage {}
+abstract class ProfileRepository {
+  Future<Profile?> get profile;
+
+  Future<void> createProfile({
+    required String username,
+    required String email,
+  });
+
+  Future<Either<Exception, void>> saveProfile({required String email});
+}
diff --git a/lib/di/app_module.dart b/lib/di/app_module.dart
@@ -1,4 +1,5 @@
 import 'package:get_it/get_it.dart';
+import 'package:poster/core/di/core_module.dart';
 import 'package:poster/core/di/provide_singleton.dart';
 import 'package:poster/feature/auth/di/auth_module.dart';
 import 'package:poster/feature/main/di/main_module.dart';
@@ -9,6 +10,7 @@ final di = GetIt.instance;
 
 extension AppModule on GetIt {
   List<Type> registerAppModule() => [
+    ...registerCoreModule(),
     ...registerRootModule(),
     ...registerAuthModule(),
     ...registerMainModule(),

diff --git a/lib/feature/auth/child/sign_in/di/sign_in_module.dart b/lib/feature/auth/child/sign_in/di/sign_in_module.dart
@@ -5,7 +5,10 @@ import 'package:poster/feature/auth/child/sign_in/domain/use_case/sign_in_use_ca
 
 extension SignInModule on GetIt {
   List<Type> registerSignInModule() => [
-    provideSingleton<SignInUseCase>(() => SignInUseCase(authRepository: this())),
+    provideSingleton<SignInUseCase>(() => SignInUseCase(
+      authRepository: this(),
+      profileRepository: this(),
+    )),
     provideSingleton<SignInBlocFactory>(() => SignInBlocFactory(
       loginUseCase: this(),
       validateEmailUseCase: this(),

diff --git a/lib/feature/auth/child/sign_in/domain/use_case/sign_in_use_case.dart b/lib/feature/auth/child/sign_in/domain/use_case/sign_in_use_case.dart
@@ -1,11 +1,15 @@
+import 'package:poster/core/domain/profile/repository/profile_repository.dart';
 import 'package:poster/feature/auth/domain/error/auth_error.dart';
 import 'package:poster/feature/auth/domain/repository/auth_repository.dart';
 
 final class SignInUseCase {
   final AuthRepository _authRepository;
+  final ProfileRepository _profileRepository;
 
-  SignInUseCase({required AuthRepository authRepository}) :
-    _authRepository = authRepository;
+  SignInUseCase({
+    required AuthRepository authRepository,
+    required ProfileRepository profileRepository,
+  }) : _authRepository = authRepository, _profileRepository = profileRepository;
 
   Future<void> execute({
     required String email,
@@ -14,8 +18,13 @@ final class SignInUseCase {
     required void Function(AuthError) onFailure,
   }) => _authRepository
     .signIn(email: email, password: password)
-    .then((res) => res.fold(
+    .then((signInRes) => signInRes.fold(
       (e) => onFailure(e),
-      (_) => onSuccess(),
+      (_) => _profileRepository
+        .saveProfile(email: email)
+        .then((saveRes) => saveRes.fold(
+          (_) => onFailure(AuthError.userNotFound),
+          (_) => onSuccess(),
+        )),
     ));
 }
diff --git a/lib/feature/auth/child/sign_in/presentation/bloc/sign_in_bloc.dart b/lib/feature/auth/child/sign_in/presentation/bloc/sign_in_bloc.dart
@@ -1,5 +1,6 @@
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:poster/core/utils/extension/bool_ext.dart';
+import 'package:poster/core/utils/functions/do_nothing.dart';
 import 'package:poster/feature/auth/child/sign_in/presentation/bloc/sign_in_event.dart';
 import 'package:poster/feature/auth/child/sign_in/presentation/bloc/sign_in_result.dart';
 import 'package:poster/feature/auth/child/sign_in/presentation/bloc/sign_in_state.dart';
@@ -50,7 +51,7 @@ final class SignInBloc extends Bloc<SignInEvent, SignInState> {
       (event, emit) => loginUseCase.execute(
         email: state.email,
         password: state.password,
-        onSuccess: () => add(ShowRoot()),
+        onSuccess: doNothing,
         onFailure: (e) => emit(state.copyWith(error: e)),
       ),
     );

diff --git a/lib/feature/auth/child/sign_up/di/sign_up_module.dart b/lib/feature/auth/child/sign_up/di/sign_up_module.dart
@@ -5,7 +5,10 @@ import 'package:poster/feature/auth/child/sign_up/presentation/bloc/mod.dart';
 
 extension SignUpModule on GetIt {
   List<Type> registerSignUpModule() => [
-    provideSingleton<SignUpUseCase>(() => SignUpUseCase(authRepository: this())),
+    provideSingleton<SignUpUseCase>(() => SignUpUseCase(
+      authRepository: this(),
+      profileRepository: this(),
+    )),
     provideSingleton<SignUpBlocFactory>(() => SignUpBlocFactory(
       signUpUseCase: this(),
       validateEmailUseCase: this(),

diff --git a/lib/feature/auth/child/sign_up/domain/use_case/sign_up_use_case.dart b/lib/feature/auth/child/sign_up/domain/use_case/sign_up_use_case.dart
@@ -1,11 +1,15 @@
+import 'package:poster/core/domain/profile/repository/profile_repository.dart';
 import 'package:poster/feature/auth/domain/error/auth_error.dart';
 import 'package:poster/feature/auth/domain/repository/auth_repository.dart';
 
 final class SignUpUseCase {
   final AuthRepository _authRepository;
+  final ProfileRepository _profileRepository;
 
-  SignUpUseCase({required AuthRepository authRepository}) :
-    _authRepository = authRepository;
+  SignUpUseCase({
+    required AuthRepository authRepository,
+    required ProfileRepository profileRepository,
+  }) : _authRepository = authRepository, _profileRepository = profileRepository;
 
   Future<void> execute({
     required String email,
@@ -17,6 +21,9 @@ final class SignUpUseCase {
     .signUp(email: email, username: username, password: password)
     .then((res) => res.fold(
       (e) => onFailure(e),
-      (_) => onSuccess(),
+      (_) async {
+        await _profileRepository.createProfile(username: username, email: email);
+        onSuccess();
+      },
     ));
 }
diff --git a/lib/feature/main/presentation/bloc/main_bloc.dart b/lib/feature/main/presentation/bloc/main_bloc.dart
@@ -3,5 +3,9 @@ import 'package:poster/feature/main/presentation/bloc/main_event.dart';
 import 'package:poster/feature/main/presentation/bloc/main_state.dart';
 
 final class MainBloc extends Bloc<MainEvent, MainState> {
-  MainBloc() : super(MainState.initial());
+  MainBloc() : super(const MainState()) {
+    on<TabClicked>(
+      (event, emit) => emit(state.copyWith(selectedTab: event.tab))
+    );
+  }
 }
diff --git a/lib/feature/main/presentation/bloc/main_state.dart b/lib/feature/main/presentation/bloc/main_state.dart
@@ -10,18 +10,12 @@ enum Tabs { wall, feed }
 @freezed
 abstract class MainState with _$MainState {
   const factory MainState({
-    required UiState<Profile> profileState,
-    required Tabs selectedTab,
-    required bool hasIncomingAnnouncements,
+    @Default(Initial()) UiState<Profile> profileState,
+    @Default(Tabs.wall) Tabs selectedTab,
+    @Default(false) bool hasIncomingAnnouncements,
     MainEffect? effect,
     String? message,
   }) = _MainState;
-
-  factory MainState.initial() => const MainState(
-    profileState: Initial(),
-    selectedTab: Tabs.wall,
-    hasIncomingAnnouncements: false,
-  );
 }
 
 extension Properties on MainState {

diff --git a/lib/feature/wall/presentation/widget/profile/profile_info.dart b/lib/feature/wall/presentation/widget/profile/profile_info.dart
@@ -138,7 +138,7 @@ final class ProfileInfo extends StatelessWidget {
       children: [
         Expanded(
           child: Text(
-            strings.wall_followers(profile.followers ?? 0),
+            strings.wall_followers(0), // TODO: followers
             textAlign: TextAlign.center,
             overflow: TextOverflow.ellipsis,
             style: theme.typography.caption.copyWith(
@@ -149,7 +149,7 @@ final class ProfileInfo extends StatelessWidget {
 
         Expanded(
           child: Text(
-            strings.wall_following(profile.following ?? 0),
+            strings.wall_following(0), // TODO: following
             textAlign: TextAlign.center,
             overflow: TextOverflow.ellipsis,
             style: theme.typography.caption.copyWith(