add AsyncState<T,E> pattern & migrate all facades from boolean flags

Author: Awakich

projects/social_platform/src/app/api/export-file/facades/export-file-info.service.ts

@@ -6,6 +6,7 @@ import { saveFile } from "@utils/helpers/export-file";
 import { ProgramDetailMainUIInfoService } from "../../program/facades/detail/ui/program-detail-main-ui-info.service";
 import { Subject, takeUntil } from "rxjs";
 import { LoggerService } from "@corelib";
+import { AsyncState, failure, initial, loading, success } from "../../../domain/shared/async-state";
 
 @Injectable()
 export class ExportFileInfoService {
@@ -17,64 +18,61 @@ export class ExportFileInfoService {
 
   private readonly program = this.programDetailMainUIInfoService.program;
 
-  readonly loadingExportProjects = signal<boolean>(false);
-  readonly loadingExportSubmittedProjects = signal<boolean>(false);
-  readonly loadingExportRates = signal<boolean>(false);
-  readonly loadingExportCalculations = signal<boolean>(false);
+  readonly loadingExports$ = signal<AsyncState<void>>(initial());
 
   destroy(): void {
     this.destroy$.next();
     this.destroy$.complete();
   }
 
   downloadProjects(): void {
-    this.loadingExportProjects.set(true);
+    this.loadingExports$.set(loading());
 
     this.exportFileService
       .exportAllProjects(this.program()!.id)
       .pipe(takeUntil(this.destroy$))
       .subscribe({
         next: blob => {
           saveFile(blob, "all", this.program()?.name);
-          this.loadingExportProjects.set(false);
+          this.loadingExports$.set(success(undefined));
         },
         error: err => {
           this.loggerService.error(err);
-          this.loadingExportProjects.set(false);
+          this.loadingExports$.set(failure(`export_file_${err}`));
         },
       });
   }
 
   downloadSubmittedProjects(): void {
-    this.loadingExportSubmittedProjects.set(true);
+    this.loadingExports$.set(loading());
 
     this.exportFileService
       .exportSubmittedProjects(this.program()!.id)
       .pipe(takeUntil(this.destroy$))
       .subscribe({
         next: blob => {
           saveFile(blob, "submitted", this.program()?.name);
-          this.loadingExportSubmittedProjects.set(false);
+          this.loadingExports$.set(success(undefined));
         },
-        error: () => {
-          this.loadingExportSubmittedProjects.set(false);
+        error: err => {
+          this.loadingExports$.set(failure(`export_file_${err}`));
         },
       });
   }
 
   downloadRates(): void {
-    this.loadingExportRates.set(true);
+    this.loadingExports$.set(loading());
 
     this.exportFileService
       .exportProgramRates(this.program()!.id)
       .pipe(takeUntil(this.destroy$))
       .subscribe({
         next: blob => {
           saveFile(blob, "rates", this.program()?.name);
-          this.loadingExportRates.set(false);
+          this.loadingExports$.set(success(undefined));
         },
-        error: () => {
-          this.loadingExportRates.set(false);
+        error: err => {
+          this.loadingExports$.set(failure(`export_file_${err}`));
         },
       });
   }

projects/social_platform/src/app/api/feed/facades/feed-info.service.ts

@@ -20,6 +20,7 @@ import { FeedUIInfoService } from "./ui/feed-ui-info.service";
 import { FetchFeedUseCase } from "../use-cases/fetch-feed.use-case";
 import { ReadFeedNewsUseCase } from "../use-cases/read-feed-news.use-case";
 import { ToggleFeedLikeUseCase } from "../use-cases/toggle-feed-like.use-case";
+import { isSuccess, loading, success } from "../../../domain/shared/async-state";
 
 const DEFAULT_FEED_TYPES: FeedItemType[] = ["vacancy", "project", "news"];
 const FILTER_SPLIT_SYMBOL = "|";
@@ -67,6 +68,9 @@ export class FeedInfoService {
           this.feedUIInfoService.totalItemsCount.set(0);
           this.feedUIInfoService.feedPage.set(0);
 
+          const prev = this.feedUIInfoService.feedItems();
+          this.feedUIInfoService.feedItems$.set(loading(prev));
+
           return this.onFetch(
             0,
             this.feedUIInfoService.perFetchTake(),
@@ -113,11 +117,12 @@ export class FeedInfoService {
 
           if (uniqueNewItems.length > 0) {
             this.feedUIInfoService.feedPage.update(page => page + uniqueNewItems.length);
-            this.feedItems.update(items => {
-              const next = [...items, ...uniqueNewItems];
-              queueMicrotask(() => this.observeFeedItems());
-              return next;
-            });
+            this.feedUIInfoService.feedItems$.update(state =>
+              isSuccess(state)
+                ? success([...state.data, ...uniqueNewItems])
+                : success(uniqueNewItems)
+            );
+            queueMicrotask(() => this.observeFeedItems());
           }
         })
       );

projects/social_platform/src/app/api/feed/facades/ui/feed-ui-info.service.ts

@@ -1,33 +1,52 @@
 /** @format */
 
-import { Injectable, signal } from "@angular/core";
+import { computed, Injectable, signal } from "@angular/core";
 import { ApiPagination } from "projects/social_platform/src/app/domain/other/api-pagination.model";
 import { FeedItem } from "projects/social_platform/src/app/domain/feed/feed-item.model";
+import {
+  AsyncState,
+  initial,
+  isLoading,
+  isSuccess,
+  success,
+} from "projects/social_platform/src/app/domain/shared/async-state";
 
 @Injectable()
 export class FeedUIInfoService {
-  readonly feedItems = signal<FeedItem[]>([]);
+  readonly feedItems$ = signal<AsyncState<FeedItem[]>>(initial());
+
+  readonly feedItems = computed(() => {
+    const state = this.feedItems$();
+    if (isSuccess(state)) return state.data;
+    if (isLoading(state)) return state.previous ?? [];
+    return [];
+  });
 
   readonly totalItemsCount = signal(0);
   readonly feedPage = signal(0);
   readonly perFetchTake = signal(20);
 
   applyInitializationFeedNewsEvent(feed: ApiPagination<FeedItem>): void {
-    this.feedItems.set(feed.results);
+    this.feedItems$.set(success(feed.results));
     this.totalItemsCount.set(feed.count);
     this.feedPage.set(feed.results.length);
   }
 
   applyFeedFilters(feed: FeedItem[]): void {
-    this.feedItems.set(feed);
+    this.feedItems$.set(success(feed));
     this.feedPage.set(feed.length);
   }
 
   applyLikeNews(itemIdx: number): void {
-    this.feedItems.update((items: any) => {
+    this.feedItems$.update(state => {
+      if (!isSuccess(state)) return state;
+
+      const items = state.data;
       const item = items[itemIdx];
 
-      const updated = {
+      if (item.typeModel !== "news") return state;
+
+      const updated: FeedItem = {
         ...item,
         content: {
           ...item.content,
@@ -38,7 +57,7 @@ export class FeedUIInfoService {
         },
       };
 
-      return items.map((it: any, i: number) => (i === itemIdx ? updated : it));
+      return success(items.map((it, i) => (i === itemIdx ? updated : it)));
     });
   }
 }

projects/social_platform/src/app/api/member/facades/members-info.service.ts

@@ -28,6 +28,7 @@ import { ProjectsDetailUIInfoService } from "../../project/facades/detail/ui/pro
 import { LoggerService } from "projects/core/src/lib/services/logger/logger.service";
 import { AuthRepository } from "../../../infrastructure/repository/auth/auth.repository";
 import { GetMembersUseCase } from "../use-case/get-members.use-case";
+import { isSuccess, loading, success } from "../../../domain/shared/async-state";
 
 @Injectable()
 export class MembersInfoService {
@@ -44,9 +45,10 @@ export class MembersInfoService {
   private readonly searchParams = signal<Record<string, string>>({}); // Signal для параметров поиска
 
   private readonly membersTake = this.membersUIInfoService.membersTake; // Количество участников на странице
-  private readonly members = this.membersUIInfoService.members; // Массив участников для отображения
   private readonly profileId = this.projectsDetailUIInfoService.profileId;
 
+  private readonly members = this.membersUIInfoService.members; // Массив участников для отображения
+
   private readonly searchForm = this.membersUIInfoService.searchForm;
   private readonly filterForm = this.membersUIInfoService.filterForm;
 
@@ -131,11 +133,15 @@ export class MembersInfoService {
           if (params["age"] && /\d+,\d+/.test(params["age"])) fetchParams["age"] = params["age"];
 
           this.searchParams.set(fetchParams);
+
+          const prev = this.membersUIInfoService.members();
+          this.membersUIInfoService.members$.set(loading(prev));
+
           return this.onFetch(0, 20, fetchParams);
         })
       )
       .subscribe(members => {
-        this.membersUIInfoService.applyQueryParams(members);
+        this.membersUIInfoService.members$.set(success(members.results));
       });
   }
 
@@ -167,9 +173,17 @@ export class MembersInfoService {
 
     if (diff > 0) {
       // Загружаем следующую порцию участников
-      return this.onFetch(this.members().length, this.membersTake(), this.searchParams()).pipe(
+      return this.onFetch(
+        this.membersUIInfoService.members().length,
+        this.membersTake(),
+        this.searchParams()
+      ).pipe(
         tap(membersChunk => {
-          this.membersUIInfoService.applyMembersChunk(membersChunk);
+          this.membersUIInfoService.members$.update(state =>
+            isSuccess(state)
+              ? success([...state.data, ...membersChunk.results])
+              : success(membersChunk.results)
+          );
         })
       );
     }

projects/social_platform/src/app/api/member/facades/ui/members-ui-info.service.ts

@@ -1,9 +1,16 @@
 /** @format */
 
-import { inject, Injectable, signal } from "@angular/core";
+import { computed, inject, Injectable, signal } from "@angular/core";
 import { FormBuilder, Validators } from "@angular/forms";
 import { ApiPagination } from "projects/skills/src/models/api-pagination.model";
 import { User } from "projects/social_platform/src/app/domain/auth/user.model";
+import {
+  AsyncState,
+  initial,
+  isLoading,
+  isSuccess,
+  success,
+} from "projects/social_platform/src/app/domain/shared/async-state";
 
 @Injectable()
 export class MembersUIInfoService {
@@ -13,7 +20,14 @@ export class MembersUIInfoService {
   readonly membersTake = signal<number>(20); // Количество участников на странице
   private readonly membersPage = signal<number>(1); // Текущая страница для пагинации
 
-  readonly members = signal<User[]>([]); // Массив участников для отображения
+  readonly members$ = signal<AsyncState<User[]>>(initial()); // Массив участников для отображения
+
+  readonly members = computed(() => {
+    const state = this.members$();
+    if (isSuccess(state)) return state.data;
+    if (isLoading(state)) return state.previous ?? [];
+    return [];
+  });
 
   // Форма поиска с обязательным полем для ввода имени
   readonly searchForm = this.fb.group({
@@ -30,18 +44,6 @@ export class MembersUIInfoService {
 
   applyMembersPagination(members: ApiPagination<User>) {
     this.membersTotalCount.set(members.count);
-    this.members.set(members.results);
-  }
-
-  applyQueryParams(members: ApiPagination<User>): void {
-    this.members.set(members.results || []);
-    this.membersTotalCount.set(members.count);
-    this.membersPage.set(1);
-  }
-
-  applyMembersChunk(membersChunk: ApiPagination<User>): void {
-    this.membersPage.update(page => page + 1);
-    this.members.update(list => [...list, ...(membersChunk.results || [])]);
-    this.membersTotalCount.set(membersChunk.count);
+    this.members$.set(success(members.results));
   }
 }

projects/social_platform/src/app/api/news/news-info.service.ts

@@ -1,12 +1,26 @@
 /** @format */
 
-import { Injectable, signal } from "@angular/core";
+import { computed, Injectable, signal } from "@angular/core";
 import { FeedNews } from "../../domain/project/project-news.model";
 import { ApiPagination } from "../../domain/other/api-pagination.model";
+import {
+  AsyncState,
+  initial,
+  isLoading,
+  isSuccess,
+  success,
+} from "../../domain/shared/async-state";
 
 @Injectable({ providedIn: "root" })
 export class NewsInfoService {
-  readonly news = signal<FeedNews[]>([]); // Массив новостей
+  readonly news$ = signal<AsyncState<FeedNews[]>>(initial()); // Массив новостей
+
+  readonly news = computed(() => {
+    const state = this.news$();
+    if (isSuccess(state)) return state.data;
+    if (isLoading(state)) return state.previous ?? [];
+    return [];
+  });
 
   applySetNews(
     news:
@@ -16,36 +30,48 @@ export class NewsInfoService {
           count: number;
         }
   ): void {
-    this.news.set(news.results);
+    this.news$.set(success(news.results));
   }
 
-  applyAddNews(newsRes: any): void {
-    this.news.update(list => [newsRes, ...list]);
+  applyAddNews(newsRes: FeedNews): void {
+    this.news$.update(state =>
+      isSuccess(state) ? success([newsRes, ...state.data]) : success([newsRes])
+    );
   }
 
   applyUpdateNews(results: FeedNews[]): void {
-    this.news.update(news => [...news, ...results]);
+    this.news$.update(state =>
+      isSuccess(state) ? success([...state.data, ...results]) : success(results)
+    );
   }
 
   applyDeleteNews(newsId: number): void {
-    this.news.update(news => news.filter(n => n.id !== newsId));
+    this.news$.update(state =>
+      isSuccess(state) ? success(state.data.filter(n => n.id !== newsId)) : state
+    );
   }
 
   applyEditNews(resNews: FeedNews): void {
-    this.news.update(news => news.map(n => (n.id === resNews.id ? resNews : n)));
+    this.news$.update(state =>
+      isSuccess(state) ? success(state.data.map(n => (n.id === resNews.id ? resNews : n))) : state
+    );
   }
 
   applyLikeNews(newsId: number): void {
-    this.news.update(list =>
-      list.map(n =>
-        n.id === newsId
-          ? {
-              ...n,
-              isUserLiked: !n.isUserLiked,
-              likesCount: n.isUserLiked ? n.likesCount - 1 : n.likesCount + 1,
-            }
-          : n
-      )
+    this.news$.update(list =>
+      isSuccess(list)
+        ? success(
+            list.data.map(n =>
+              n.id === newsId
+                ? {
+                    ...n,
+                    isUserLiked: !n.isUserLiked,
+                    likesCount: n.isUserLiked ? n.likesCount - 1 : n.likesCount + 1,
+                  }
+                : n
+            )
+          )
+        : list
     );
   }
 }