Revert "Merge pull request #3157 from numbersprotocol/fix-excessive-api-call"

This reverts commit d9b5652, reversing
changes made to 064e7cf.

Author: sultanmyrza

src/app/features/home/capture-tab/capture-item/capture-item.component.ts

@@ -71,7 +71,10 @@ export class CaptureItemComponent {
     )
   );
 
-  readonly hasCaption$ = this.proof$.pipe(map(proof => proof.caption !== ''));
+  readonly hasCaption$ = this.proof$.pipe(
+    switchMap(proof => this.diaBackendAssetRepository.fetchByProof$(proof)),
+    map(asset => asset.caption !== '')
+  );
 
   readonly isVideo$ = this.proof$.pipe(
     concatMap(proof => proof.getFirstAssetMeta()),

src/app/features/home/details/edit-caption/edit-caption.page.ts

@@ -3,22 +3,13 @@ import { DomSanitizer } from '@angular/platform-browser';
 import { ActivatedRoute } from '@angular/router';
 import { NavController } from '@ionic/angular';
 import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
-import { combineLatest, fromEvent, of } from 'rxjs';
-import {
-  concatMap,
-  finalize,
-  first,
-  map,
-  tap as switchTap,
-} from 'rxjs/operators';
+import { combineLatest, fromEvent } from 'rxjs';
+import { map, tap } from 'rxjs/operators';
 import { DiaBackendAuthService } from '../../../../shared/dia-backend/auth/dia-backend-auth.service';
 import { BUBBLE_IFRAME_URL } from '../../../../shared/dia-backend/secret';
 import { BubbleToIonicPostMessage } from '../../../../shared/iframe/iframe';
 import { IframeService } from '../../../../shared/iframe/iframe.service';
-import { getOldProof } from '../../../../shared/repositories/proof/old-proof-adapter';
-import { ProofRepository } from '../../../../shared/repositories/proof/proof-repository.service';
 import { isNonNullable } from '../../../../utils/rx-operators/rx-operators';
-import { InformationSessionService } from '../information/session/information-session.service';
 
 @UntilDestroy()
 @Component({
@@ -52,17 +43,15 @@ export class EditCaptionPage {
     private readonly sanitizer: DomSanitizer,
     private readonly navController: NavController,
     private readonly iframeService: IframeService,
-    private readonly diaBackendAuthService: DiaBackendAuthService,
-    private readonly informationSessionService: InformationSessionService,
-    private readonly proofRepository: ProofRepository
+    private readonly diaBackendAuthService: DiaBackendAuthService
   ) {
     this.processIframeEvents();
   }
 
   processIframeEvents() {
     fromEvent(window, 'message')
       .pipe(
-        switchTap(event => {
+        tap(event => {
           const postMessageEvent = event as MessageEvent;
           const data = postMessageEvent.data as BubbleToIonicPostMessage;
           switch (data) {
@@ -71,36 +60,12 @@ export class EditCaptionPage {
               break;
             case BubbleToIonicPostMessage.EDIT_CAPTION_SAVE:
               this.iframeService.refreshDetailsPageIframe();
-              this.syncCaptionAndNavigateBack();
+              this.navController.back();
               break;
           }
         }),
         untilDestroyed(this)
       )
       .subscribe();
   }
-
-  syncCaptionAndNavigateBack() {
-    if (this.informationSessionService.activatedDetailedCapture) {
-      combineLatest([
-        this.informationSessionService.activatedDetailedCapture.proof$,
-        this.informationSessionService.activatedDetailedCapture.caption$,
-      ])
-        .pipe(
-          first(),
-          concatMap(([proof, latestCaptionFromBackend]) => {
-            if (proof) {
-              proof.caption = latestCaptionFromBackend;
-              return this.proofRepository.update(
-                [proof],
-                (x, y) => getOldProof(x).hash === getOldProof(y).hash
-              );
-            }
-            return of(null);
-          }),
-          finalize(() => this.navController.back())
-        )
-        .subscribe();
-    }
-  }
 }

src/app/shared/dia-backend/asset/downloading/dia-backend-downloading.service.ts

@@ -80,7 +80,6 @@ export class DiaBackendAssetDownloadingService {
       },
     });
     proof.diaBackendAssetId = diaBackendAsset.id;
-    proof.caption = diaBackendAsset.caption;
     if (diaBackendAsset.signed_metadata) proof.setSignatureVersion();
     return this.proofRepository.add(proof, OnConflictStrategy.REPLACE);
   }

src/app/shared/repositories/proof/proof.ts

@@ -26,12 +26,6 @@ export class Proof {
 
   diaBackendAssetId?: string = undefined;
 
-  /**
-   * When user uploades a capture we do not have option to set caption. Therefore caption is empty
-   * by default. Everytime caption is updated we need to update the caption in the proof as well.
-   */
-  caption = '';
-
   isCollected = false;
 
   signatures: Signatures = {};
@@ -126,7 +120,6 @@ export class Proof {
     );
     proof.setIndexedAssets(indexedProofView.indexedAssets);
     proof.diaBackendAssetId = indexedProofView.diaBackendAssetId;
-    proof.caption = indexedProofView.caption ?? '';
     proof.isCollected = indexedProofView.isCollected ?? false;
     proof.signatureVersion = indexedProofView.signatureVersion;
     proof.integritySha = indexedProofView.integritySha;
@@ -297,7 +290,6 @@ export class Proof {
       signatures: this.signatures,
       signatureVersion: this.signatureVersion,
       diaBackendAssetId: this.diaBackendAssetId,
-      caption: this.caption,
       isCollected: this.isCollected,
       integritySha: this.integritySha,
       cameraSource: this.cameraSource,
@@ -432,7 +424,6 @@ export interface IndexedProofView extends Tuple {
   readonly signatures: Signatures;
   readonly signatureVersion?: string;
   readonly diaBackendAssetId?: string;
-  readonly caption?: string;
   readonly isCollected?: boolean;
   readonly integritySha?: string;
   readonly cameraSource: CameraSource;