DEV-43330

Author: DCrow

lib/app/data/database.dart

@@ -245,7 +245,7 @@ class AppDataStore extends _$AppDataStore {
   }
 
   @override
-  int get schemaVersion => 38;
+  int get schemaVersion => 39;
 
   @override
   MigrationStrategy get migration => MigrationStrategy(

lib/app/pages/person/person_page.dart

@@ -69,7 +69,7 @@ class _PersonViewState extends State<_PersonView> {
           case PersonStateStatus.failure:
             Misc.showMessage(context, state.message);
             break;
-          case PersonStateStatus.loggedOut:
+          case PersonStateStatus.success:
             progressDialog.close();
             WidgetsBinding.instance.addPostFrameCallback((_) {
               Navigator.of(context).pop();
@@ -133,6 +133,14 @@ class _PersonViewState extends State<_PersonView> {
             mainAxisAlignment: MainAxisAlignment.spaceAround,
             crossAxisAlignment: CrossAxisAlignment.center,
             children: <Widget>[
+              ElevatedButton(
+                style: ElevatedButton.styleFrom(
+                  shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(18.0)),
+                  backgroundColor: Theme.of(context).colorScheme.primary
+                ),
+                onPressed: vm.apiUnregister,
+                child: const Text('Удалить аккаунт', style: Styles.formStyle),
+              ),
               ElevatedButton(
                 style: ElevatedButton.styleFrom(
                   shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(18.0)),

lib/app/pages/person/person_state.dart

@@ -4,7 +4,7 @@ enum PersonStateStatus {
   initial,
   dataLoaded,
   inProgress,
-  loggedOut,
+  success,
   failure
 }
 

lib/app/pages/person/person_view_model.dart

@@ -47,13 +47,30 @@ class PersonViewModel extends PageViewModel<PersonState, PersonStateStatus> {
 
     try {
       await usersRepository.logout();
-      await pointsRepository.clearFiles();
-      await ordersRepository.clearFiles();
-      await appRepository.clearData();
+      await clearData();
 
-      emit(state.copyWith(status: PersonStateStatus.loggedOut));
+      emit(state.copyWith(status: PersonStateStatus.success));
     } on AppError catch(e) {
       emit(state.copyWith(status: PersonStateStatus.failure, message: e.message));
     }
   }
+
+  Future<void> apiUnregister() async {
+    emit(state.copyWith(status: PersonStateStatus.inProgress));
+
+    try {
+      await usersRepository.unregister();
+      await clearData();
+
+      emit(state.copyWith(status: PersonStateStatus.success));
+    } on AppError catch(e) {
+      emit(state.copyWith(status: PersonStateStatus.failure, message: e.message));
+    }
+  }
+
+  Future<void> clearData() async {
+    await pointsRepository.clearFiles();
+    await ordersRepository.clearFiles();
+    await appRepository.clearData();
+  }
 }

lib/app/repositories/users_repository.dart

@@ -49,6 +49,18 @@ class UsersRepository extends BaseRepository {
     await loadUserData();
   }
 
+  Future<void> unregister() async {
+    try {
+      await api.unregister();
+      _loggedInController.add(api.isLoggedIn);
+    } on ApiException catch(e) {
+      throw AppError(e.errorMsg);
+    } catch(e, trace) {
+      await Misc.reportError(e, trace);
+      throw AppError(Strings.genericErrorMsg);
+    }
+  }
+
   Future<void> login(String url, String login, String password) async {
     try {
       await api.login(url: url, login: login, password: password);

pubspec.lock

@@ -1548,8 +1548,8 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: "75821c5"
-      resolved-ref: "75821c5922271d4afc92169f9cf2dbff142f984a"
+      ref: "39b77cc"
+      resolved-ref: "39b77cc44408eb0eae971d4986c8f214b31f0b32"
       url: "[email protected]:Unact/u_app_utils.git"
     source: git
     version: "0.0.1"

pubspec.yaml

@@ -49,7 +49,7 @@ dependencies:
   u_app_utils:
     git:
       url: [email protected]:Unact/u_app_utils.git
-      ref: 75821c5
+      ref: 39b77cc
   url_launcher: ^6.3.1
   uuid: ^4.2.2
   yandex_mapkit: ^4.0.2