fix(feed): refresh feed correctly on filter change/reset

- Use switchMap instead of concatMap so the latest filter wins and stale requests are cancelled
- Dedupe paginated items by typeModel:id (ids can collide across types)
- Re-observe items after initial load and filter change
- Remove partnerprogram type/field: program news must stay out of the general feed

Author: Awakich

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

@@ -10,6 +10,7 @@ import {
   Observable,
   skip,
   Subject,
+  switchMap,
   takeUntil,
   tap,
   throttleTime,
@@ -23,7 +24,7 @@ import { ToggleFeedLikeUseCase } from "../use-cases/toggle-feed-like.use-case";
 import { isSuccess, loading, success } from "@domain/shared/async-state";
 import { FILTER_SPLIT_SYMBOL } from "@core/consts/other/filter-split-symbol.const";
 
-const DEFAULT_FEED_TYPES: FeedItemType[] = ["vacancy", "project", "news", "partnerprogram"];
+const DEFAULT_FEED_TYPES: FeedItemType[] = ["vacancy", "project", "news"];
 
 /** Координирует глобальную ленту: данные резолвера, фильтры, пагинация, просмотры, лайки. */
 @Injectable()
@@ -39,7 +40,7 @@ export class FeedInfoService {
 
   readonly feedItems = this.feedUIInfoService.feedItems;
 
-  private readonly includes = signal<FeedItemType[]>([]);
+  private readonly includes = signal<FeedItemType[] | string>([]);
 
   initializationFeedNews(feedRoot: ElementRef<HTMLElement>): void {
     this.route.data
@@ -56,6 +57,8 @@ export class FeedInfoService {
           root: document.querySelector(".office__body"),
           threshold: 0,
         });
+
+        queueMicrotask(() => this.observeFeedItems());
       });
 
     this.route.queryParams
@@ -65,7 +68,7 @@ export class FeedInfoService {
           this.includes.set(includes);
         }),
         skip(1),
-        concatMap(includes => {
+        switchMap(includes => {
           this.feedUIInfoService.totalItemsCount.set(0);
           this.feedUIInfoService.feedPage.set(0);
 
@@ -83,6 +86,8 @@ export class FeedInfoService {
       .subscribe(feed => {
         this.feedUIInfoService.applyFeedFilters(feed);
 
+        queueMicrotask(() => this.observeFeedItems());
+
         setTimeout(() => {
           feedRoot?.nativeElement.children[0].scrollIntoView({ behavior: "smooth" });
         });
@@ -110,8 +115,9 @@ export class FeedInfoService {
         this.includes()
       ).pipe(
         tap((feedChunk: FeedItem[]) => {
-          const existingIds = new Set(this.feedItems().map(item => item.content.id));
-          const uniqueNewItems = feedChunk.filter(item => !existingIds.has(item.content.id));
+          const keyOf = (item: FeedItem) => `${item.typeModel}:${item.content.id}`;
+          const existingIds = new Set(this.feedItems().map(keyOf));
+          const uniqueNewItems = feedChunk.filter(item => !existingIds.has(keyOf(item)));
 
           if (uniqueNewItems.length > 0) {
             this.feedUIInfoService.feedPage.update(page => page + uniqueNewItems.length);
@@ -141,9 +147,15 @@ export class FeedInfoService {
     }
   }
 
-  private onFetch(offset: number, limit: number, includes: FeedItemType[] = DEFAULT_FEED_TYPES) {
+  private onFetch(
+    offset: number,
+    limit: number,
+    includes: FeedItemType[] | string = DEFAULT_FEED_TYPES
+  ) {
     const type =
-      includes.length === 0
+      typeof includes === "string"
+        ? includes || DEFAULT_FEED_TYPES.join(FILTER_SPLIT_SYMBOL)
+        : includes.length === 0
         ? DEFAULT_FEED_TYPES.join(FILTER_SPLIT_SYMBOL)
         : includes.join(FILTER_SPLIT_SYMBOL);
 

projects/social_platform/src/app/domain/feed/feed-item.model.ts

@@ -1,6 +1,5 @@
 /** @format */
 
-import { Program } from "../program/program.model";
 import { FeedNews } from "../news/project-news.model";
 import { Vacancy } from "../vacancy/vacancy.model";
 
@@ -14,14 +13,10 @@ export interface FeedProject {
   imageAddress: string;
   viewsCount: number;
   leader: number;
-  partnerProgram: {
-    id: Program["id"];
-    name: Program["name"];
-  } | null;
 }
 
 /** Тип элемента ленты */
-export type FeedItemType = "vacancy" | "news" | "project" | "partnerprogram";
+export type FeedItemType = "vacancy" | "news" | "project";
 
 /** Объединенный тип элемента ленты */
 export type FeedItem =

projects/social_platform/src/app/ui/pages/feed/feed.component.html

@@ -16,27 +16,16 @@
       [attr.data-id]="item.content.id"
       [feedItem]="item.content"
     ></app-new-project>
-    } @else if (item.typeModel === "news") { @if (item.content.contentObject &&
-    item.content.contentObject.hasOwnProperty("email")) {
+    } @else if (item.typeModel === "news") {
     <app-news-card
       class="page__item"
       [attr.data-id]="item.content.id"
       [feedItem]="item.content"
       [contentId]="item.content.contentObject.id"
-      [resourceLink]="[AppRoutes.profile.detail(item.content.contentObject.id)]"
+      [resourceLink]="resourceLink(item.content)"
       (like)="onLike($event)"
     ></app-news-card>
-    } @else if ( item.content.contentObject && !item.content.contentObject.hasOwnProperty("email") )
-    {
-    <app-news-card
-      class="page__item"
-      [attr.data-id]="item.content.id"
-      [feedItem]="item.content"
-      [contentId]="item.content.contentObject.id"
-      [resourceLink]="[AppRoutes.projects.detail(item.content.contentObject.id)]"
-      (like)="onLike($event)"
-    ></app-news-card>
-    } } } } @else {
+    } } } @else {
     <div class="page__feed--no-items">
       <i appIcon icon="empty-chat" appSquare="38"></i>
       <p class="text-body-12">в данном разделе пока нет новостей</p>

projects/social_platform/src/app/ui/pages/feed/feed.component.ts

@@ -4,6 +4,7 @@ import {
   AfterViewInit,
   ChangeDetectionStrategy,
   Component,
+  computed,
   ElementRef,
   inject,
   OnDestroy,
@@ -48,6 +49,15 @@ export class FeedComponent implements OnInit, AfterViewInit, OnDestroy {
   protected readonly feedItems = this.feedUIInfoService.feedItems;
   protected readonly AppRoutes = AppRoutes;
 
+  /** Ссылка-маршрут для карточки новости в зависимости от типа источника. */
+  protected resourceLink(content: any): (string | number)[] {
+    if (content.contentObject && "email" in content.contentObject) {
+      return [AppRoutes.profile.detail(content.contentObject.id)];
+    }
+
+    return [AppRoutes.projects.detail(content.contentObject.id)];
+  }
+
   ngOnInit() {
     this.feedInfoService.initializationFeedNews(this.feedRoot!);
   }

projects/social_platform/src/app/ui/pages/feed/feed.resolver.ts

@@ -4,8 +4,11 @@ import { inject } from "@angular/core";
 import { ResolveFn } from "@angular/router";
 import { map } from "rxjs";
 import { ApiPagination } from "@domain/other/api-pagination.model";
-import { FeedItem } from "@domain/feed/feed-item.model";
+import { FeedItem, FeedItemType } from "@domain/feed/feed-item.model";
 import { FetchFeedUseCase } from "@api/feed/use-cases/fetch-feed.use-case";
+import { FILTER_SPLIT_SYMBOL } from "@core/consts/other/filter-split-symbol.const";
+
+const DEFAULT_FEED_TYPES: FeedItemType[] = ["vacancy", "news", "project"];
 
 /** Предзагружает ленту новостей. */
 export const FeedResolver: ResolveFn<ApiPagination<FeedItem>> = route => {
@@ -14,7 +17,7 @@ export const FeedResolver: ResolveFn<ApiPagination<FeedItem>> = route => {
   // Загружаем первую страницу ленты (offset: 0, limit: 20)
   // По умолчанию включаем вакансии, новости и проекты
   return fetchFeedUseCase
-    .execute(0, 20, route.queryParams["includes"] ?? ["vacancy", "news", "project"])
+    .execute(0, 20, route.queryParams["includes"] ?? DEFAULT_FEED_TYPES.join(FILTER_SPLIT_SYMBOL))
     .pipe(
       map(result =>
         result.ok