clean project

vnapnic · vnapnic · commit 0b5fc89630ee · 2021-08-12T14:15:19.000+07:00
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -59,7 +59,7 @@ commands:
           command: mkdir -p ~/sdks/flutter && git clone -b stable https://github.com/flutter/flutter.git ~/sdks/flutter
       - run:
           name: Set flutter SDK PATH in bash
-          command: echo 'export FLUTTER_HOME=~/sdks/flutter' >> $BASH_ENV && source $BASH_ENV
+          command: echo 'export FLUTTER_HOME=~/sdks/flutter' >> $BASH_ENV && data_source $BASH_ENV
       - run:
           name: Try doctor
           command: $FLUTTER_HOME/bin/flutter doctor
diff --git a/configuration/lib/data/data_source/local/sessions_pref.dart b/configuration/lib/data/data_source/local/sessions_pref.dart
diff --git a/configuration/lib/network/interceptor/auth_interceptor.dart b/configuration/lib/network/interceptor/auth_interceptor.dart
@@ -1,4 +1,4 @@
-import 'package:configuration/data/source/local/sessions_pref.dart';
+import 'package:configuration/data/data_source/local/sessions_pref.dart';
 import 'package:dio/dio.dart';
 
 /// authentication by token
diff --git a/configuration/lib/network/interceptor/token_interceptor.dart b/configuration/lib/network/interceptor/token_interceptor.dart
@@ -1,4 +1,4 @@
-import 'package:configuration/data/source/local/sessions_pref.dart';
+import 'package:configuration/data/data_source/local/sessions_pref.dart';
 import 'package:dio/dio.dart';
 
 class TokenInterceptor extends InterceptorsWrapper {
diff --git a/lib/data/user/data_source/local/user_pref.dart b/lib/data/user/data_source/local/user_pref.dart
diff --git a/lib/data/user/data_source/remote/user_api.dart b/lib/data/user/data_source/remote/user_api.dart
diff --git a/lib/data/user/repositories/user_repo.dart b/lib/data/user/repositories/user_repo.dart
@@ -1,8 +1,8 @@
 import 'dart:async';
 
 import 'package:configuration/data/exceptions/api_exception.dart';
-import 'package:flutter_architecture/data/user/model/response/login_response.dart';
-import 'package:flutter_architecture/data/user/source/remote/user_api.dart';
+import 'package:flutter_architecture/data/user/data_source/remote/user_api.dart';
+import 'package:flutter_architecture/domain/login/entities/auth_entity.dart';
 import 'package:flutter_architecture/domain/login/repositories/login_repository.dart';
 import 'package:dio/dio.dart';
 
@@ -12,11 +12,10 @@ class UserRepoImpl implements LoginRepository {
   UserRepoImpl({this.userApi});
 
   @override
-  Future<LoginResponse?>? login(String? user, String? password) async {
+  FutureOr<AuthEntity?>? login(String? user, String? password) async {
     try {
       assert(user != null && password != null);
-      return await Future.value(
-          LoginResponse('KbseWdVo87DkmNDO9klriT8SNOkEWRZC'));
+      return AuthEntity('APA91bGSAUqIOaXTEK8ga7GKUM85eEK9sQMvWcxcCFqlewDvnuib0RFW');
     } on DioError catch (dioError) {
       throw ApiException(exception: dioError);
     } catch (e) {
diff --git a/lib/di/module/api_module.dart b/lib/di/module/api_module.dart
@@ -2,7 +2,7 @@ import 'package:configuration/di/di_module.dart';
 import 'package:configuration/environment/build_config.dart';
 import 'package:configuration/network/interceptor/auth_interceptor.dart';
 import 'package:configuration/network/interceptor/token_interceptor.dart';
-import 'package:flutter_architecture/data/user/source/remote/user_api.dart';
+import 'package:flutter_architecture/data/user/data_source/remote/user_api.dart';
 import 'dart:async';
 import 'package:dio/dio.dart';
 
diff --git a/lib/di/module/repo_module.dart b/lib/di/module/repo_module.dart
@@ -1,6 +1,6 @@
 import 'package:configuration/di/di_module.dart';
 import 'package:flutter_architecture/data/user/repositories/user_repo.dart';
-import 'package:flutter_architecture/data/user/source/remote/user_api.dart';
+import 'package:flutter_architecture/data/user/data_source/remote/user_api.dart';
 
 class RepoModule extends DIModule {
   @override
diff --git a/lib/domain/login/entities/auth_entity.dart b/lib/domain/login/entities/auth_entity.dart
@@ -0,0 +1,4 @@
+class AuthEntity{
+  String token;
+  AuthEntity(this.token);
+}
diff --git a/lib/domain/login/repositories/login_repository.dart b/lib/domain/login/repositories/login_repository.dart
@@ -1,5 +1,7 @@
-import 'package:flutter_architecture/data/user/model/response/login_response.dart';
+import 'dart:async';
+
+import 'package:flutter_architecture/domain/login/entities/auth_entity.dart';
 
 abstract class LoginRepository{
-  Future<LoginResponse?>? login(String? user, String? password);
+  FutureOr<AuthEntity?>? login(String? user, String? password);
 }
diff --git a/lib/domain/login/use_cases/login_usecases.dart b/lib/domain/login/use_cases/login_usecases.dart
@@ -1,11 +1,13 @@
-import 'package:flutter_architecture/data/user/model/response/login_response.dart';
+import 'dart:async';
+
+import 'package:flutter_architecture/domain/login/entities/auth_entity.dart';
 import 'package:flutter_architecture/domain/login/repositories/login_repository.dart';
 
 class LoginUseCase {
   final LoginRepository _loginRepository;
 
   LoginUseCase(this._loginRepository);
 
-  Future<LoginResponse?>? login(String? user, String? password) =>
+  FutureOr<AuthEntity?>? login(String? user, String? password) =>
       _loginRepository.login(user, password);
 }
diff --git a/lib/presentation/home/home_route.dart b/lib/presentation/home/home_route.dart
@@ -1,16 +1,16 @@
 import 'package:configuration/di/di_module.dart';
 import 'package:configuration/route/route_define.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_architecture/data/user/model/response/login_response.dart';
+import 'package:flutter_architecture/domain/login/entities/auth_entity.dart';
 import 'package:flutter_architecture/presentation/home/cubit/home_cubit.dart';
 import 'package:flutter_architecture/presentation/home/ui/home_screen.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 
 class HomeRoute extends RouteDefine {
   static const id = 'home';
 
-  static push(BuildContext context, LoginResponse response) {
-    Navigator.pushNamed(context, id, arguments: {"loginResponse": response});
+  static push(BuildContext context, AuthEntity entity) {
+    Navigator.pushNamed(context, id, arguments: {"authEntity": entity});
   }
 
   @override
@@ -20,9 +20,9 @@ class HomeRoute extends RouteDefine {
           builder: (_) => BlocProvider(
             create: (_) => getIt<HomeCubit>(),
             child: HomeScreen(
-              response: arguments == null
+              authEntity: arguments == null
                   ? null
-                  : arguments["loginResponse"] as LoginResponse,
+                  : arguments["authEntity"] as AuthEntity,
             ),
           ),
         ),
diff --git a/lib/presentation/home/ui/home_screen.dart b/lib/presentation/home/ui/home_screen.dart
@@ -1,10 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_architecture/data/user/model/response/login_response.dart';
+import 'package:flutter_architecture/domain/login/entities/auth_entity.dart';
 
 class HomeScreen extends StatefulWidget {
-  final LoginResponse? response;
+  final AuthEntity? authEntity;
 
-  HomeScreen({this.response});
+  HomeScreen({this.authEntity});
 
   @override
   _HomeScreenState createState() => _HomeScreenState();
@@ -16,7 +17,7 @@ class _HomeScreenState extends State<HomeScreen> {
     return Scaffold(
       body: Container(
         child: Center(
-          child: Text(widget.response?.accessToken ?? ""),
+          child: Text(widget.authEntity?.token ?? ""),
         ),
       ),
     );
diff --git a/lib/presentation/login/cubit/login_cubit.dart b/lib/presentation/login/cubit/login_cubit.dart
@@ -5,8 +5,8 @@ import 'package:configuration/data/exceptions/api_exception.dart';
 import 'package:configuration/generated/l10n.dart';
 import 'package:equatable/equatable.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_architecture/data/user/model/response/login_response.dart';
-import 'package:flutter_architecture/domain/login/usecases/login_usecases.dart';
+import 'package:flutter_architecture/domain/login/entities/auth_entity.dart';
+import 'package:flutter_architecture/domain/login/use_cases/login_usecases.dart';
 import 'package:meta/meta.dart';
 
 part 'login_state.dart';
@@ -19,8 +19,8 @@ class LoginCubit extends Cubit<LoginState> {
   FutureOr<void> login({String? user, String? password}) async {
     try {
       emit(LoadingLoginState());
-      LoginResponse? response = await loginUseCase?.login(user, password);
-      emit(LoginSuccessfullyState(response: response!));
+      final authEntity = await loginUseCase?.login(user, password);
+      emit(LoginSuccessfullyState(authEntity: authEntity!));
     } on ApiException catch (e) {
       emit(ErrorLoginState(errorMessage: e.errorMessage ?? ""));
     } catch (_) {
diff --git a/lib/presentation/login/cubit/login_state.dart b/lib/presentation/login/cubit/login_state.dart
@@ -14,12 +14,12 @@ class LoadingLoginState extends LoginState {
 }
 
 class LoginSuccessfullyState extends LoginState {
-  final LoginResponse response;
+  final AuthEntity authEntity;
 
-  LoginSuccessfullyState({required this.response});
+  LoginSuccessfullyState({required this.authEntity});
 
   @override
-  List<Object> get props => [response];
+  List<Object> get props => [authEntity];
 }
 
 class ErrorLoginState extends LoginState {
diff --git a/lib/presentation/login/login_route.dart b/lib/presentation/login/login_route.dart
@@ -1,7 +1,7 @@
 import 'package:configuration/di/di_module.dart';
 import 'package:configuration/route/route_define.dart';
 import 'package:flutter_architecture/data/user/repositories/user_repo.dart';
-import 'package:flutter_architecture/domain/login/usecases/login_usecases.dart';
+import 'package:flutter_architecture/domain/login/use_cases/login_usecases.dart';
 import 'package:flutter_architecture/presentation/login/cubit/login_cubit.dart';
 import 'package:flutter_architecture/presentation/login/ui/login_screen.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
diff --git a/lib/presentation/login/ui/login_screen.dart b/lib/presentation/login/ui/login_screen.dart
@@ -16,7 +16,7 @@ class _LoginScreenState extends State<LoginScreen> {
         listener: (context, state) {
           print('listener $state');
           if (state is LoginSuccessfullyState) {
-            HomeRoute.push(context, state.response);
+            HomeRoute.push(context, state.authEntity);
           }
         },
         buildWhen: (previous, current) => current is LoginInitial,
diff --git a/test/data/user/mock.dart b/test/data/user/mock.dart
@@ -1,4 +1,4 @@
-import 'package:flutter_architecture/data/user/source/remote/user_api.dart';
+import 'package:flutter_architecture/data/user/data_source/remote/user_api.dart';
 import 'package:mockito/mockito.dart';
 
 class UserApiMock extends Mock implements UserApi {}
diff --git a/test/data/user/remote/user_repository_test.dart b/test/data/user/remote/user_repository_test.dart
@@ -1,6 +1,6 @@
 import 'package:flutter_architecture/data/user/model/request/login_request.dart';
 import 'package:flutter_architecture/data/user/repositories/user_repo.dart';
-import 'package:flutter_architecture/data/user/source/remote/user_api.dart';
+import 'package:flutter_architecture/data/user/data_source/remote/user_api.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:mockito/mockito.dart';
 
diff --git a/test/login/domain/login_usecase_test.dart b/test/login/domain/login_usecase_test.dart
@@ -1,4 +1,4 @@
-import 'package:flutter_architecture/domain/login/usecases/login_usecases.dart';
+import 'package:flutter_architecture/domain/login/use_cases/login_usecases.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:mockito/mockito.dart';
 
diff --git a/test/login/mock.dart b/test/login/mock.dart
@@ -1,5 +1,5 @@
 import 'package:flutter_architecture/domain/login/repositories/login_repository.dart';
-import 'package:flutter_architecture/domain/login/usecases/login_usecases.dart';
+import 'package:flutter_architecture/domain/login/use_cases/login_usecases.dart';
 import 'package:mockito/mockito.dart';
 
 class LoginUserCaseMock extends Mock implements LoginUseCase {}

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import 'package:configuration/data/source/local/sessions_pref.dart';`
	`1`	`+import 'package:configuration/data/data_source/local/sessions_pref.dart';`
`2`	`2`	`import 'package:dio/dio.dart';`
`3`	`3`
`4`	`4`	`/// authentication by token`