chore: small refactoring

sovity · Jun 18, 2024 · bf1a9ed · bf1a9ed
1 parent 2383ace
commit bf1a9ed
Showing 1 changed file with 33 additions and 28 deletions.
diff --git a/src/app/core/services/contract-negotiation.service.ts b/src/app/core/services/contract-negotiation.service.ts
@@ -68,38 +68,43 @@ export class ContractNegotiationService {
       .afterClosed()
       .subscribe((result) => {
         if (result) {
-          this.initiateNegotiation(initiateRequest)
-            .pipe(
-              tap(() => this.onStarted(contractOfferId)),
-              switchMap((negotiation) =>
-                interval(1000).pipe(
-                  switchMap(() =>
-                    this.fetchNegotiation(
-                      negotiation.contractNegotiationId,
-                    ).pipe(catchError(() => EMPTY)),
-                  ),
-                ),
-              ),
-              filter(
-                (negotiation) =>
-                  negotiation.state.simplifiedState != 'IN_PROGRESS',
-              ),
-              first(),
-            )
-            .subscribe({
-              next: (negotiation) => {
-                if (negotiation.state.simplifiedState === 'AGREED') {
-                  this.onSuccess(contractOfferId);
-                } else {
-                  this.onFailureNegotiating(contractOfferId);
-                }
-              },
-              error: () => this.onFailureStarting(),
-            });
+          this.startNegotiation(initiateRequest);
         }
       });
   }
 
+  private startNegotiation(initiateRequest: ContractNegotiationRequest) {
+    const contractOfferId = initiateRequest.contractOfferId;
+
+    this.initiateNegotiation(initiateRequest)
+      .pipe(
+        tap(() => this.onStarted(contractOfferId)),
+        switchMap((negotiation) =>
+          interval(1000).pipe(
+            switchMap(() =>
+              this.fetchNegotiation(negotiation.contractNegotiationId).pipe(
+                catchError(() => EMPTY),
+              ),
+            ),
+          ),
+        ),
+        filter(
+          (negotiation) => negotiation.state.simplifiedState != 'IN_PROGRESS',
+        ),
+        first(),
+      )
+      .subscribe({
+        next: (negotiation) => {
+          if (negotiation.state.simplifiedState === 'AGREED') {
+            this.onSuccess(contractOfferId);
+          } else {
+            this.onFailureNegotiating(contractOfferId);
+          }
+        },
+        error: () => this.onFailureStarting(),
+      });
+  }
+
   private onFailureStarting() {
     this.notificationService.showError('Failure starting negotiation.');
   }