Feature receive postcapture notification

src/app/app.component.ts

@@ -10,8 +10,11 @@ import { CollectorService } from './services/collector/collector.service';
 import { CapacitorFactsProvider } from './services/collector/facts/capacitor-facts-provider/capacitor-facts-provider.service';
 import { WebCryptoApiSignatureProvider } from './services/collector/signature/web-crypto-api-signature-provider/web-crypto-api-signature-provider.service';
 import { DiaBackendAssetRepository } from './services/dia-backend/asset/dia-backend-asset-repository.service';
+import { DiaBackendAuthService } from './services/dia-backend/auth/dia-backend-auth.service';
+import { DiaBackendNotificationService } from './services/dia-backend/notification/dia-backend-notification.service';
 import { LanguageService } from './services/language/language.service';
 import { NotificationService } from './services/notification/notification.service';
+import { PushNotificationService } from './services/push-notification/push-notification.service';
 import { restoreKilledCapture } from './utils/camera';
 
 const { SplashScreen } = Plugins;
@@ -32,16 +35,27 @@ export class AppComponent {
     private readonly webCryptoApiSignatureProvider: WebCryptoApiSignatureProvider,
     private readonly diaBackendAssetRepository: DiaBackendAssetRepository,
     notificationService: NotificationService,
-    langaugeService: LanguageService
+    pushNotificationService: PushNotificationService,
+    langaugeService: LanguageService,
+    diaBackendAuthService: DiaBackendAuthService,
+    diaBackendNotificationService: DiaBackendNotificationService
   ) {
     notificationService.requestPermission();
+    pushNotificationService.register();
     langaugeService.initialize();
+    diaBackendAuthService.initialize$().pipe(untilDestroyed(this)).subscribe();
+    diaBackendNotificationService
+      .initialize$()
+      .pipe(untilDestroyed(this))
+      .subscribe();
     this.restoreAppStatus();
     this.initializeApp();
     this.initializeCollector();
     this.registerIcon();
   }
 
+  // TODO: Error if user logout during app killed. Use BehaviorSubject instead.
+  //       Extract this to a standalone CameraService.
   restoreAppStatus() {
     return defer(restoreKilledCapture)
       .pipe(

src/app/pages/home/asset/asset.page.ts

@@ -19,7 +19,7 @@ import { ConfirmAlert } from '../../../services/confirm-alert/confirm-alert.serv
 import { DiaBackendAssetRepository } from '../../../services/dia-backend/asset/dia-backend-asset-repository.service';
 import { getOldProof } from '../../../services/repositories/proof/old-proof-adapter';
 import { ProofRepository } from '../../../services/repositories/proof/proof-repository.service';
-import { isNonNullable } from '../../../utils/rx-operators';
+import { isNonNullable } from '../../../utils/rx-operators/rx-operators';
 import { ContactSelectionDialogComponent } from './contact-selection-dialog/contact-selection-dialog.component';
 import {
   Option,

src/app/pages/home/asset/contact-selection-dialog/contact-selection-dialog.component.ts

@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
 import { MatDialog, MatDialogRef } from '@angular/material/dialog';
 import { DiaBackendContactRepository } from '../../../../services/dia-backend/contact/dia-backend-contact-repository.service';
-import { isNonNullable } from '../../../../utils/rx-operators';
+import { isNonNullable } from '../../../../utils/rx-operators/rx-operators';
 import { FriendInvitationDialogComponent } from './friend-invitation-dialog/friend-invitation-dialog.component';
 
 @Component({

src/app/pages/home/asset/information/information.page.ts

@@ -9,7 +9,7 @@ import {
   getOldSignatures,
 } from '../../../../services/repositories/proof/old-proof-adapter';
 import { ProofRepository } from '../../../../services/repositories/proof/proof-repository.service';
-import { isNonNullable } from '../../../../utils/rx-operators';
+import { isNonNullable } from '../../../../utils/rx-operators/rx-operators';
 
 @UntilDestroy({ checkProperties: true })
 @Component({

src/app/pages/home/asset/sending-post-capture/sending-post-capture.page.ts

@@ -10,7 +10,7 @@ import { DiaBackendAssetRepository } from '../../../../services/dia-backend/asse
 import { DiaBackendTransactionRepository } from '../../../../services/dia-backend/transaction/dia-backend-transaction-repository.service';
 import { getOldProof } from '../../../../services/repositories/proof/old-proof-adapter';
 import { ProofRepository } from '../../../../services/repositories/proof/proof-repository.service';
-import { isNonNullable } from '../../../../utils/rx-operators';
+import { isNonNullable } from '../../../../utils/rx-operators/rx-operators';
 
 @UntilDestroy({ checkProperties: true })
 @Component({

src/app/pages/home/home-routing.module.ts

@@ -18,9 +18,11 @@ const routes: Routes = [
       import('./inbox/inbox.module').then(m => m.InboxPageModule),
   },
   {
-    path: 'activity',
+    path: 'transaction',
     loadChildren: () =>
-      import('./activity/activity.module').then(m => m.ActivityPageModule),
+      import('./transaction/transaction.module').then(
+        m => m.TransactionPageModule
+      ),
   },
 ];
 

src/app/pages/home/home.page.html

@@ -37,13 +37,14 @@
         <mat-icon>menu</mat-icon>
       </button>
       <span class="toolbar-spacer"></span>
-      <button routerLink="activity" mat-icon-button>
+      <button routerLink="transaction" mat-icon-button>
         <mat-icon>history</mat-icon>
       </button>
       <button routerLink="inbox" mat-icon-button>
         <mat-icon
-          [matBadge]="inboxCount$ | async"
+          matBadge="&#8288;"
           [matBadgeHidden]="!(inboxCount$ | async)"
+          matBadgeSize="small"
           matBadgeColor="warn"
         >
           all_inbox</mat-icon

src/app/pages/home/home.page.spec.ts

@@ -17,8 +17,6 @@ describe('HomePage', () => {
     fixture.detectChanges();
   }));
 
-  // TODO: Enable this after removing the polling WORKAROUND
-  // it('should create', () => {
-  //   expect(component).toBeTruthy();
-  // });
+  // TODO: Enable this test after we remove the ugly WORKAROUND in ngOnInit().
+  // it('should create', () => expect(component).toBeTruthy());
 });

src/app/pages/home/home.page.ts

@@ -1,17 +1,21 @@
 import { formatDate } from '@angular/common';
+import { HttpClient } from '@angular/common/http';
 import { Component, OnInit } from '@angular/core';
 import { MatTabChangeEvent } from '@angular/material/tabs';
 import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
 import { groupBy } from 'lodash';
-import { combineLatest, defer, forkJoin, interval, of, zip } from 'rxjs';
-import { concatMap, concatMapTo, first, map, pluck } from 'rxjs/operators';
+import { combineLatest, defer, forkJoin, of, zip } from 'rxjs';
+import { concatMap, first, map } from 'rxjs/operators';
 import { CollectorService } from '../../services/collector/collector.service';
+import { OnConflictStrategy } from '../../services/database/table/table';
 import { DiaBackendAssetRepository } from '../../services/dia-backend/asset/dia-backend-asset-repository.service';
 import { DiaBackendAuthService } from '../../services/dia-backend/auth/dia-backend-auth.service';
 import { DiaBackendTransactionRepository } from '../../services/dia-backend/transaction/dia-backend-transaction-repository.service';
-import { IgnoredTransactionRepository } from '../../services/dia-backend/transaction/ignored-transaction-repository.service';
-import { PushNotificationService } from '../../services/push-notification/push-notification.service';
-import { getOldProof } from '../../services/repositories/proof/old-proof-adapter';
+import { ImageStore } from '../../services/image-store/image-store.service';
+import {
+  getOldProof,
+  getProof,
+} from '../../services/repositories/proof/old-proof-adapter';
 import { Proof } from '../../services/repositories/proof/proof';
 import { ProofRepository } from '../../services/repositories/proof/proof-repository.service';
 import { capture } from '../../utils/camera';
@@ -37,9 +41,9 @@ export class HomePage implements OnInit {
   postCaptures$ = this.getPostCaptures$();
   readonly username$ = this.diaBackendAuthService.getUsername$();
   captureButtonShow = true;
-  inboxCount$ = this.pollingInbox$().pipe(
-    map(transactions => transactions.length)
-  );
+  inboxCount$ = this.diaBackendTransactionRepository
+    .getInbox$()
+    .pipe(map(transactions => transactions.length));
   currentUploadingProofHash = '';
 
   constructor(
@@ -48,12 +52,65 @@ export class HomePage implements OnInit {
     private readonly diaBackendAuthService: DiaBackendAuthService,
     private readonly diaBackendAssetRepository: DiaBackendAssetRepository,
     private readonly diaBackendTransactionRepository: DiaBackendTransactionRepository,
-    private readonly pushNotificationService: PushNotificationService,
-    private readonly ignoredTransactionRepository: IgnoredTransactionRepository
+    private readonly imageStore: ImageStore,
+    private readonly httpClient: HttpClient
   ) {}
 
   ngOnInit() {
-    this.pushNotificationService.configure();
+    /**
+     * TODO: Remove this ugly WORKAROUND by using repository pattern to cache the expired assets and proofs.
+     * TODO: Move this functionality to DiaBackendAssetRepository.initialize$() method.
+     */
+    this.diaBackendTransactionRepository
+      .getAll$()
+      .pipe(
+        concatMap(transactions =>
+          forkJoin([
+            of(transactions),
+            defer(() => this.diaBackendAuthService.getEmail()),
+          ])
+        ),
+        map(([transactions, email]) =>
+          transactions.filter(t => t.expired && t.sender === email)
+        ),
+        concatMap(expiredTransactions =>
+          forkJoin(
+            expiredTransactions.map(t =>
+              this.diaBackendAssetRepository.getById$(t.asset.id)
+            )
+          )
+        ),
+        concatMap(expiredAssets =>
+          forkJoin([
+            of(expiredAssets),
+            defer(() =>
+              Promise.all(
+                expiredAssets.map(async a => {
+                  return this.proofRepository.add(
+                    await getProof(
+                      this.imageStore,
+                      await this.httpClient
+                        .get(a.asset_file, { responseType: 'blob' })
+                        .toPromise(),
+                      a.information,
+                      a.signature
+                    ),
+                    OnConflictStrategy.REPLACE
+                  );
+                })
+              )
+            ),
+          ])
+        ),
+        concatMap(([expiredAssets]) =>
+          this.diaBackendAssetRepository.addAssetDirectly(
+            expiredAssets,
+            OnConflictStrategy.REPLACE
+          )
+        ),
+        untilDestroyed(this)
+      )
+      .subscribe();
   }
 
   private getCaptures$() {
@@ -83,13 +140,14 @@ export class HomePage implements OnInit {
     );
   }
 
+  // TODO: Clean up this ugly WORKAROUND with repository pattern.
   private getPostCaptures$() {
     return zip(
-      this.diaBackendTransactionRepository.getAll$(),
+      this.diaBackendTransactionRepository.getAll$().pipe(first()),
       this.diaBackendAuthService.getEmail()
     ).pipe(
-      map(([transactionListResponse, email]) =>
-        transactionListResponse.results.filter(
+      map(([transactions, email]) =>
+        transactions.filter(
           transaction =>
             transaction.sender !== email &&
             !transaction.expired &&
@@ -150,34 +208,4 @@ export class HomePage implements OnInit {
       this.postCaptures$ = this.getPostCaptures$();
     }
   }
-
-  /**
-   * TODO: Use repository pattern to cache the inbox data.
-   */
-  private pollingInbox$() {
-    // tslint:disable-next-line: no-magic-numbers
-    return interval(10000).pipe(
-      concatMapTo(this.diaBackendTransactionRepository.getAll$()),
-      pluck('results'),
-      concatMap(postCaptures =>
-        zip(of(postCaptures), this.diaBackendAuthService.getEmail())
-      ),
-      map(([postCaptures, email]) =>
-        postCaptures.filter(
-          postCapture =>
-            postCapture.receiver_email === email &&
-            !postCapture.fulfilled_at &&
-            !postCapture.expired
-        )
-      ),
-      concatMap(postCaptures =>
-        zip(of(postCaptures), this.ignoredTransactionRepository.getAll$())
-      ),
-      map(([postCaptures, ignoredTransactions]) =>
-        postCaptures.filter(
-          postcapture => !ignoredTransactions.includes(postcapture.id)
-        )
-      )
-    );
-  }
 }