add rating project for several experts & fix filters for json body

Author: Awakich

projects/social_platform/src/app/office/program/detail/list/list.component.ts

@@ -220,74 +220,48 @@ export class ProgramListComponent implements OnInit, OnDestroy, AfterViewInit {
 
     const filtersObservable$ = this.route.queryParams
       .pipe(
-        distinctUntilChanged(),
         concatMap(q => {
-          const reqQuery = this.buildFilterQuery(q);
+          const { filters, extraParams } = this.buildFilterQuery(q);
           const programId = this.route.parent?.snapshot.params["programId"];
 
-          if (JSON.stringify(reqQuery) !== JSON.stringify(this.previousReqQuery)) {
-            this.previousReqQuery = reqQuery;
-
-            const hasFilters =
-              reqQuery && reqQuery["filters"] && Object.keys(reqQuery["filters"]).length > 0;
-            const params = new HttpParams({ fromObject: { offset: 0, limit: this.perPage } });
-
-            if (hasFilters) {
-              if (this.listType === "projects") {
-                return this.programService
-                  .createProgramFilters(programId, reqQuery["filters"])
-                  .pipe(
-                    catchError(err => {
-                      console.error("createFilters failed, fallback to getAllProjects()", err);
-                      return this.programService.getAllProjects(programId, params);
-                    })
-                  );
-              } else if (this.listType === "rating") {
-                const filterParams = new HttpParams({
-                  fromObject: {
-                    offset: 0,
-                    limit: this.perPage,
-                    ...this.flattenFilters(reqQuery["filters"]),
-                  },
-                });
-
-                return this.projectRatingService.getAll(programId, filterParams).pipe(
-                  catchError(err => {
-                    console.error("getAllRatingProjects failed", err);
-                    return this.projectRatingService.getAll(programId, params);
-                  })
-                );
-              }
-            }
+          const filtersChanged =
+            JSON.stringify(filters) !== JSON.stringify(this.previousReqQuery["filters"]);
+          const extraParamsChanged =
+            JSON.stringify(extraParams) !== JSON.stringify(this.previousReqQuery["filters"]);
+
+          this.previousReqQuery = { filters, extraParams };
 
-            if (this.listType === "projects") {
-              return this.programService.getAllProjects(programId, params).pipe(
-                catchError(err => {
-                  console.error("getAllProjects failed", err);
-                  return this.programService.getAllProjects(programId, params);
-                })
-              );
-            } else if (this.listType === "rating") {
-              return this.projectRatingService.getAll(programId, params).pipe(
-                catchError(err => {
-                  console.error("getAllRatingProjects failed", err);
-                  return this.projectRatingService.getAll(programId, params);
-                })
-              );
+          const params = new HttpParams({
+            fromObject: {
+              offset: 0,
+              limit: this.itemsPerPage,
+              ...extraParams,
+            },
+          });
+
+          if (this.listType === "rating") {
+            if (Object.keys(filters).length > 0) {
+              return this.projectRatingService.postFilters(programId, filters, params);
             }
+
+            return this.projectRatingService.getAll(programId, params);
           }
 
-          return of(null);
+          if (Object.keys(filters).length > 0) {
+            return this.programService.createProgramFilters(programId, filters);
+          }
+
+          return this.programService.getAllProjects(programId, params);
         })
       )
       .subscribe(result => {
-        if (result && typeof result !== "number") {
-          this.list = result.results;
-          this.searchedList = result.results;
-          this.listTotalCount = result.count;
-          this.listPage = 0;
-          this.cdref.detectChanges();
-        }
+        if (!result) return;
+
+        this.list = result.results;
+        this.searchedList = result.results;
+        this.listTotalCount = result.count;
+        this.listPage = 0;
+        this.cdref.detectChanges();
       });
 
     this.subscriptions$.push(filtersObservable$);
@@ -389,23 +363,34 @@ export class ProgramListComponent implements OnInit, OnDestroy, AfterViewInit {
     if (this.listType === "members") return {};
 
     const filters: Record<string, any[]> = {};
+    const extraParams: Record<string, any> = {};
 
-    if (this.availableFilters.length === 0) {
-      Object.keys(q).forEach(key => {
-        if (key !== "search" && key !== "name__contains" && q[key] !== undefined && q[key] !== "") {
-          filters[key] = Array.isArray(q[key]) ? q[key] : [q[key]];
-        }
-      });
-    } else {
-      this.availableFilters.forEach((filter: PartnerProgramFields) => {
-        const value = q[filter.name];
-        if (value !== undefined && value !== "") {
-          filters[filter.name] = Array.isArray(value) ? value : [value];
-        }
-      });
-    }
+    Object.keys(q).forEach(key => {
+      const value = q[key];
+      if (value === undefined || value === "") return;
+
+      // ⭐ Для rating search → name__contains
+      if (this.listType === "rating" && key === "search") {
+        extraParams["name__contains"] = value;
+        return;
+      }
+
+      // ⭐ Эти два ключа должны идти ТОЛЬКО как GET-параметры
+      if (this.listType === "rating" && key === "name__contains") {
+        extraParams["name__contains"] = value;
+        return;
+      }
+
+      if (this.listType === "rating" && key === "is_rated_by_expert") {
+        extraParams["is_rated_by_expert"] = value;
+        return;
+      }
+
+      // ⭐ Для других ключей: обычные filters
+      filters[key] = Array.isArray(value) ? value : [value];
+    });
 
-    return { filters };
+    return { filters, extraParams };
   }
 
   onFiltersLoaded(filters: PartnerProgramFields[]): void {

projects/social_platform/src/app/office/program/services/project-rating.service.ts

@@ -47,6 +47,20 @@ export class ProjectRatingService {
     return this.apiService.get(`${this.RATE_PROJECT_URL}/${programId}`, params);
   }
 
+  postFilters(
+    programId: number,
+    filters: Record<string, string[]>,
+    params?: HttpParams
+  ): Observable<ApiPagination<ProjectRate>> {
+    let url = `${this.RATE_PROJECT_URL}/${programId}`;
+
+    if (params) {
+      url += `?${params.toString()}`;
+    }
+
+    return this.apiService.post(url, { filters: filters });
+  }
+
   rate(projectId: number, scores: ProjectRatingCriterionOutput[]): Observable<void> {
     return this.apiService.post(`${this.RATE_PROJECT_URL}/rate/${projectId}`, scores);
   }

projects/social_platform/src/app/office/program/shared/rating-card/rating-card.component.html

@@ -62,7 +62,7 @@
     </div>
 
     <div class="card__experts">
-      <p class="text-body-12">{{ project.ratedCount }} / {{ project.maxRates }}</p>
+      <p class="text-body-12">{{ ratedCount() }} / {{ project.maxRates }}</p>
       <i appIcon icon="person" appSquare="10"></i>
     </div>
   </div>
@@ -92,19 +92,12 @@
         customTypographyClass="text-body-12"
         size="big"
         [loader]="submitLoading() || confirmLoading()"
-        [color]="showRatedStatus ? 'green' : 'primary'"
-        [disabled]="programDateFinished()"
-        [appearance]="programDateFinished() ? 'outline' : 'inline'"
-        [style.opacity]="showConfirmedState ? '0.5' : '1'"
-        (click)="showRatingForm ? showConfirmRateModal.set(true) : null"
+        [disabled]="isButtonDisabled"
+        [style.opacity]="buttonOpacity"
+        [color]="buttonColor"
+        (click)="canRate ? showConfirmRateModal.set(true) : null"
       >
-        {{
-          programDateFinished()
-            ? "проект оценен"
-            : showRatingForm
-            ? "оценить проект"
-            : "проект оценен"
-        }}
+        {{ rateButtonText }}
       </app-button>
 
       @if (showEditButton) {
@@ -115,7 +108,7 @@
         class="card__rated--icon"
         (click)="redoRating()"
       >
-        <i appIcon icon="edit-pen" appSquare="10" class="card__redo-rating-icon"></i>
+        <i appIcon icon="edit-pen" appSquare="10"></i>
       </app-button>
       }
     </div>

projects/social_platform/src/app/office/program/shared/rating-card/rating-card.component.ts

@@ -128,7 +128,7 @@ export class RatingCardComponent implements OnInit, AfterViewInit, OnDestroy {
   _currentIndex = signal<number>(0);
   _projects = signal<ProjectRate[]>([]);
 
-  profile = signal<User | null>(null);
+  profile = signal<any | null>(null);
 
   form = new FormControl();
 
@@ -148,6 +148,7 @@ export class RatingCardComponent implements OnInit, AfterViewInit, OnDestroy {
   locallyRatedByCurrentUser = signal(false);
 
   isProjectCriterias = signal(0);
+  ratedCount = signal(0);
 
   programDateFinished = signal(false);
 
@@ -162,6 +163,7 @@ export class RatingCardComponent implements OnInit, AfterViewInit, OnDestroy {
       const isScored = this.project?.scored || false;
       this.projectConfirmed.set(isScored);
       this.projectRated.set(isScored);
+      this.ratedCount.set(this.project.ratedCount);
     }
 
     const program$ = this.programDataService.program$
@@ -230,9 +232,31 @@ export class RatingCardComponent implements OnInit, AfterViewInit, OnDestroy {
       .pipe(finalize(() => this.submitLoading.set(false)))
       .subscribe({
         next: () => {
+          const profile = this.profile();
+          const project = this.project as ProjectRate;
+
           this.locallyRatedByCurrentUser.set(true);
           this.projectRated.set(true);
           this.projectConfirmed.set(true);
+
+          let isFirstTimeRating = false;
+
+          if (profile) {
+            if (!Array.isArray(project.ratedExperts)) {
+              project.ratedExperts = [];
+            }
+
+            if (!project.ratedExperts.includes(profile.id)) {
+              project.ratedExperts = [...project.ratedExperts, profile.id];
+              isFirstTimeRating = true;
+            }
+          }
+
+          if (isFirstTimeRating) {
+            this.ratedCount.update(count => count + 1);
+          }
+          this._project.set({ ...project });
+
           this.showConfirmRateModal.set(false);
         },
         error: err => {
@@ -276,6 +300,21 @@ export class RatingCardComponent implements OnInit, AfterViewInit, OnDestroy {
     return isExpertFromBackend || isExpertLocally;
   }
 
+  get canRate(): boolean {
+    if (this.programDateFinished()) return false;
+
+    if (this.isLimitReached && !this.userRatedThisProject) return false;
+
+    return true;
+  }
+
+  get rateButtonText(): string {
+    if (this.projectConfirmed()) return "проект оценен";
+    if (this.isLimitReached) return "проект оценен";
+
+    return "оценить проект";
+  }
+
   get showRatingForm(): boolean {
     return !this.projectRated() && this.canEdit;
   }
@@ -285,10 +324,43 @@ export class RatingCardComponent implements OnInit, AfterViewInit, OnDestroy {
   }
 
   get showEditButton(): boolean {
-    return this.showRatedStatus && this.canEdit && this.isCurrentUserExpert;
+    return this.projectConfirmed() && !this.programDateFinished() && this.userRatedThisProject;
+  }
+
+  get userRatedThisProject(): boolean {
+    const profile = this.profile();
+    const project = this.project;
+
+    if (!profile || !project) return false;
+
+    return (
+      this.locallyRatedByCurrentUser() ||
+      (Array.isArray(project.ratedExperts) && project.ratedExperts.includes(profile.id))
+    );
+  }
+
+  get isButtonDisabled(): boolean {
+    if (this.isLimitReached && !this.userRatedThisProject) return true;
+
+    if (!this.canRate) return true;
+
+    return false;
+  }
+
+  get buttonColor(): "green" | "primary" {
+    if (this.userRatedThisProject) return "green";
+    return "primary";
+  }
+
+  get buttonOpacity(): string {
+    return this.isButtonDisabled ? "0.5" : "1";
+  }
+
+  get isLimitReached(): boolean {
+    return !!this.project && this.project.ratedCount >= this.project.maxRates;
   }
 
   get showConfirmedState(): boolean {
-    return this.projectConfirmed() && !this.canEdit;
+    return (this.projectConfirmed() && !this.canEdit) || this.isLimitReached;
   }
 }