Fix reindexing resources of previously deleted categories

dainst · Jun 15, 2022 · ae68891 · ae68891
1 parent d029a7d
commit ae68891
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 13 deletions.
diff --git a/core/src/index/indexer.ts b/core/src/index/indexer.ts
@@ -12,7 +12,8 @@ import { Document } from '../model/document';
  export module Indexer {
 
     export async function reindex(indexFacade: IndexFacade, db: PouchDB.Database, documentCache: DocumentCache,
-                                  converter: CategoryConverter, setIndexedDocuments?: (count: number) => Promise<void>,
+                                  converter: CategoryConverter, keepCachedInstances: boolean,
+                                  setIndexedDocuments?: (count: number) => Promise<void>,
                                   setIndexing?: () => Promise<void>, setError?: (error: string) => Promise<void>) {
 
         indexFacade.clear();
@@ -29,8 +30,16 @@ import { Document } from '../model/document';
         setIndexing && await setIndexing();
 
         try {
+            if (keepCachedInstances) {
+                documents = documents.filter(document => !documentCache.get(document.resource.id));
+            }
             documents = convertDocuments(documents, converter);
             documents.forEach(doc => documentCache.set(doc));
+
+            if (keepCachedInstances) {
+                documents = documents.concat(documentCache.getAll());
+            }
+
             await indexFacade.putMultiple(documents, setIndexedDocuments);
         } catch (err) {
             console.error(err);
@@ -40,15 +49,6 @@ import { Document } from '../model/document';
     }
 
 
-    export async function reindexFromCache(indexFacade: IndexFacade, documentCache: DocumentCache) {
-
-        indexFacade.clear();
-
-        const documents: Array<Document> = documentCache.getAll();
-        await indexFacade.putMultiple(documents);
-    }
-
-
     async function fetchAll(db: PouchDB.Database) {
 
         return (await db

diff --git a/desktop/src/app/components/app-initializer.ts b/desktop/src/app/components/app-initializer.ts
@@ -198,6 +198,7 @@ const loadDocuments = async (
 
     await Indexer.reindex(serviceLocator.indexFacade, db, documentCache,
         new CategoryConverter(serviceLocator.projectConfiguration),
+        false,
         (count) => progress.setIndexedDocuments(count),
         () => progress.setPhase('indexingDocuments'),
         (error) => progress.setError(error)

diff --git a/desktop/src/app/components/configuration/configuration.component.ts b/desktop/src/app/components/configuration/configuration.component.ts
@@ -742,6 +742,12 @@ export class ConfigurationComponent implements OnInit, OnDestroy {
             });
         });
 
-        await Indexer.reindexFromCache(this.indexFacade, this.documentCache);
+        await Indexer.reindex(
+            this.indexFacade,
+            this.pouchdbDatastore.getDb(),
+            this.documentCache,
+            this.categoryConverter,
+            true
+        );
     }
 }
diff --git a/desktop/src/app/services/app-controller.ts b/desktop/src/app/services/app-controller.ts
@@ -88,7 +88,8 @@ export class AppController {
             this.indexFacade,
             db,
             this.documentCache,
-            new CategoryConverter(this.projectConfiguration)
+            new CategoryConverter(this.projectConfiguration),
+            false
         );
 
         const configurationDocument: ConfigurationDocument = await ConfigurationDocument.getConfigurationDocument(

diff --git a/mobile/src/repositories/document-repository.ts b/mobile/src/repositories/document-repository.ts
@@ -95,7 +95,7 @@ const buildDatastore = async (
     const documentCache = new DocumentCache();
     const converter = new CategoryConverter(projectConfiguration);
 
-    await Indexer.reindex(indexFacade, db, documentCache, converter);
+    await Indexer.reindex(indexFacade, db, documentCache, converter, false);
 
     return [
         new Datastore(pouchdbDatastore, indexFacade, documentCache, converter, () => username),