Started removing tight coupling

2025-12-10 08:07:59 -06:00 · 2022-11-24 22:51:42 +01:00
parent eb5025e8ca
commit 5edbdabf26
27 changed files with 845 additions and 693 deletions
--- a/lib/features/documents/bloc/documents_cubit.dart
+++ b/lib/features/documents/bloc/documents_cubit.dart
@@ -1,15 +1,13 @@
 import 'dart:typed_data';

 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:paperless_mobile/core/model/error_message.dart';
+import 'package:injectable/injectable.dart';
 import 'package:paperless_mobile/features/documents/bloc/documents_state.dart';
 import 'package:paperless_mobile/features/documents/model/bulk_edit.model.dart';
 import 'package:paperless_mobile/features/documents/model/document.model.dart';
 import 'package:paperless_mobile/features/documents/model/document_filter.dart';
 import 'package:paperless_mobile/features/documents/model/paged_search_result.dart';
-import 'package:paperless_mobile/features/documents/model/query_parameters/tags_query.dart';
 import 'package:paperless_mobile/features/documents/repository/document_repository.dart';
-import 'package:injectable/injectable.dart';

@singleton
 class DocumentsCubit extends Cubit<DocumentsState> {
@@ -17,45 +15,20 @@ class DocumentsCubit extends Cubit<DocumentsState> {

  DocumentsCubit(this.documentRepository) : super(DocumentsState.initial);

-  Future<void> addDocument(
-    Uint8List bytes,
-    String fileName, {
-    required String title,
-    required void Function(DocumentModel document) onConsumptionFinished,
-    int? documentType,
-    int? correspondent,
-    Iterable<int> tags = const [],
-    DateTime? createdAt,
-  }) async {
-    await documentRepository.create(
-      bytes,
-      fileName,
-      title: title,
-      documentType: documentType,
-      correspondent: correspondent,
-      tags: tags,
-      createdAt: createdAt,
-    );
-
-    documentRepository
-        .waitForConsumptionFinished(fileName, title)
-        .then((value) => onConsumptionFinished(value));
-  }
-
-  Future<void> removeDocument(DocumentModel document) async {
+  Future<void> remove(DocumentModel document) async {
    await documentRepository.delete(document);
-    return await reloadDocuments();
+    await reload();
  }

-  Future<void> bulkRemoveDocuments(List<DocumentModel> documents) async {
+  Future<void> bulkRemove(List<DocumentModel> documents) async {
    await documentRepository.bulkAction(
      BulkDeleteAction(documents.map((doc) => doc.id)),
    );
-    await reloadDocuments();
+    await reload();
  }

  Future<void> bulkEditTags(
-    List<DocumentModel> documents, {
+    Iterable<DocumentModel> documents, {
    Iterable<int> addTags = const [],
    Iterable<int> removeTags = const [],
  }) async {
@@ -64,15 +37,15 @@ class DocumentsCubit extends Cubit<DocumentsState> {
      addTags: addTags,
      removeTags: removeTags,
    ));
-    await reloadDocuments();
+    await reload();
  }

-  Future<void> updateDocument(DocumentModel document) async {
+  Future<void> update(DocumentModel document) async {
    await documentRepository.update(document);
-    await reloadDocuments();
+    await reload();
  }

-  Future<void> loadDocuments() async {
+  Future<void> load() async {
    final result = await documentRepository.find(state.filter);
    emit(DocumentsState(
      isLoaded: true,
@@ -81,7 +54,7 @@ class DocumentsCubit extends Cubit<DocumentsState> {
    ));
  }

-  Future<void> reloadDocuments() async {
+  Future<void> reload() async {
    if (state.currentPageNumber >= 5) {
      return _bulkReloadDocuments();
    }
@@ -113,7 +86,7 @@ class DocumentsCubit extends Cubit<DocumentsState> {
  Future<void> assignAsn(DocumentModel document) async {
    if (document.archiveSerialNumber == null) {
      final int asn = await documentRepository.findNextAsn();
-      updateDocument(document.copyWith(archiveSerialNumber: asn));
+      update(document.copyWith(archiveSerialNumber: asn));
    }
  }

@@ -151,22 +124,6 @@ class DocumentsCubit extends Cubit<DocumentsState> {
    }
  }

-  ///
-  /// Updates the given document with the inbox tags removed and returns the remoed inbox tags.
-  ///
-  Future<Iterable<int>> removeInboxTags(
-      DocumentModel document, final Iterable<int> inboxTags) async {
-    final tagsToRemove = document.tags.toSet().intersection(inboxTags.toSet());
-    final updatedTags = {...document.tags}..removeAll(tagsToRemove);
-    await updateDocument(
-      document.copyWith(
-        tags: updatedTags,
-        overwriteTags: true,
-      ),
-    );
-    return tagsToRemove;
-  }
-
  void resetSelection() {
    emit(state.copyWith(selection: []));
  }
--- a/lib/features/documents/view/pages/document_details_page.dart
+++ b/lib/features/documents/view/pages/document_details_page.dart
@@ -6,7 +6,7 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:paperless_mobile/core/bloc/paperless_statistics_cubit.dart';
-import 'package:paperless_mobile/features/labels/bloc/label_bloc_provider.dart';
+import 'package:paperless_mobile/features/labels/bloc/global_state_bloc_provider.dart';
 import 'package:paperless_mobile/core/logic/error_code_localization_mapper.dart';
 import 'package:paperless_mobile/core/model/error_message.dart';
 import 'package:paperless_mobile/core/widgets/highlighted_text.dart';
@@ -52,7 +52,6 @@ class _DocumentDetailsPageState extends State<DocumentDetailsPage> {
      DateFormat("MMM d, yyyy HH:mm:ss");

  bool _isDownloadPending = false;
-  bool _isAssignAsnPending = false;

  @override
  Widget build(BuildContext context) {
@@ -350,7 +349,7 @@ class _DocumentDetailsPageState extends State<DocumentDetailsPage> {
    final wasUpdated = await Navigator.push<bool>(
          context,
          MaterialPageRoute(
-            builder: (_) => LabelBlocProvider(
+            builder: (_) => GlobalStateBlocProvider(
              child: DocumentEditPage(document: document),
            ),
            maintainState: true,
@@ -412,7 +411,7 @@ class _DocumentDetailsPageState extends State<DocumentDetailsPage> {
        false;
    if (delete) {
      try {
-        await BlocProvider.of<DocumentsCubit>(context).removeDocument(document);
+        await BlocProvider.of<DocumentsCubit>(context).remove(document);
        showSnackBar(context, S.of(context).documentDeleteSuccessMessage);
      } on ErrorMessage catch (error, stackTrace) {
        showErrorMessage(context, error, stackTrace);
--- a/lib/features/documents/view/pages/document_edit_page.dart
+++ b/lib/features/documents/view/pages/document_edit_page.dart
@@ -83,7 +83,7 @@ class _DocumentEditPageState extends State<DocumentEditPage> {
            });
            bool wasUpdated = false;
            try {
-              await getIt<DocumentsCubit>().updateDocument(updatedDocument);
+              await getIt<DocumentsCubit>().update(updatedDocument);
              showSnackBar(context, S.of(context).documentUpdateErrorMessage);
              wasUpdated = true;
            } on ErrorMessage catch (error, stackTrace) {
--- a/lib/features/documents/view/pages/documents_page.dart
+++ b/lib/features/documents/view/pages/documents_page.dart
@@ -44,15 +44,13 @@ class _DocumentsPageState extends State<DocumentsPage> {
  @override
  void initState() {
    super.initState();
-    if (!BlocProvider.of<DocumentsCubit>(context).state.isLoaded) {
-      _initDocuments();
-    }
+    _initDocuments();
    _pagingController.addPageRequestListener(_loadNewPage);
  }

  Future<void> _initDocuments() async {
    try {
-      BlocProvider.of<DocumentsCubit>(context).loadDocuments();
+      BlocProvider.of<DocumentsCubit>(context).load();
    } on ErrorMessage catch (error, stackTrace) {
      showErrorMessage(context, error, stackTrace);
    }
@@ -113,7 +111,7 @@ class _DocumentsPageState extends State<DocumentsPage> {
            previous != ConnectivityState.connected &&
            current == ConnectivityState.connected,
        listener: (context, state) {
-          BlocProvider.of<DocumentsCubit>(context).loadDocuments();
+          BlocProvider.of<DocumentsCubit>(context).load();
        },
        builder: (context, connectivityState) {
          return Scaffold(
@@ -241,9 +239,7 @@ class _DocumentsPageState extends State<DocumentsPage> {
            BlocProvider.value(
                value: BlocProvider.of<PaperlessStatisticsCubit>(context)),
          ],
-          child: DocumentDetailsPage(
-            documentId: model.id,
-          ),
+          child: DocumentDetailsPage(documentId: model.id),
        ),
      ),
    );
--- a/lib/features/documents/view/widgets/selection/documents_page_app_bar.dart
+++ b/lib/features/documents/view/widgets/selection/documents_page_app_bar.dart
@@ -99,7 +99,7 @@ class _DocumentsPageAppBarState extends State<DocumentsPageAppBar> {
    if (shouldDelete) {
      try {
        await BlocProvider.of<DocumentsCubit>(context)
-            .bulkRemoveDocuments(documentsState.selection);
+            .bulkRemove(documentsState.selection);
        showSnackBar(
          context,
          S.of(context).documentsPageBulkDeleteSuccessfulText,