DEV: removed code duplication

valendinosaurus · Jun 30, 2024 · 1563dd4 · 1563dd4
1 parent fb7a5e6
commit 1563dd4
Showing 1 changed file with 21 additions and 39 deletions.
diff --git a/src/app/dialogs/add-blinds/add-blinds.component.ts b/src/app/dialogs/add-blinds/add-blinds.component.ts
@@ -130,45 +130,27 @@ export class AddBlindsComponent extends BaseAddDialogComponent<AddAddonComponent
                 positions.push(i);
             }
 
-            if (this.data.tournament) {
-                this.tournamentApiService.addBlinds$(model.blindIds, model.parentId, positions).pipe(
-                    take(1),
-                    tap((a) => this.fetchService.trigger()),
-                    tap(() => {
-                        if (this.dialogRef) {
-                            this.dialogRef.close({
-                                blindId: model.blindIds
-                            });
-                        }
-
-                        this.isLoadingAdd = false;
-                    }),
-                    catchError(() => {
-                        this.isLoadingAdd = false;
-                        return of(null);
-                    })
-                ).subscribe();
-            }
-
-            if (this.data.structure) {
-                this.blindStructureApiService.addBlinds$(model.blindIds, model.parentId, positions).pipe(
-                    take(1),
-                    tap((a) => this.fetchService.trigger()),
-                    tap(() => {
-                        if (this.dialogRef) {
-                            this.dialogRef.close({
-                                blindId: model.blindIds
-                            });
-                        }
-
-                        this.isLoadingAdd = false;
-                    }),
-                    catchError(() => {
-                        this.isLoadingAdd = false;
-                        return of(null);
-                    })
-                ).subscribe();
-            }
+            const action$ = this.data.tournament
+                ? this.tournamentApiService.addBlinds$(model.blindIds, model.parentId, positions)
+                : this.blindStructureApiService.addBlinds$(model.blindIds, model.parentId, positions);
+
+            action$.pipe(
+                take(1),
+                tap((a) => this.fetchService.trigger()),
+                tap(() => {
+                    if (this.dialogRef) {
+                        this.dialogRef.close({
+                            blindId: model.blindIds
+                        });
+                    }
+
+                    this.isLoadingAdd = false;
+                }),
+                catchError(() => {
+                    this.isLoadingAdd = false;
+                    return of(null);
+                })
+            ).subscribe();
         }
     }