✨ Добавлен новый файл для каталога достижений с интерфейсом и списком всех достижений. Обновлены действия для получения респектов, включая расчёт респектов за достижения и сезоны. Добавлены новые типы и функции для обработки данных о респектах, улучшая структуру и читаемость кода.

Author: MairwunNx

src/features/achievements/lib/catalog.ts src/entities/achievement/lib/catalog.tssrc/features/achievements/lib/catalog.ts renamed to src/entities/achievement/lib/catalog.ts

@@ -1,4 +1,5 @@
 import type { AchievementDal, AchievementDoc } from "@/entities/achievement";
+import { ALL_ACHIEVEMENTS } from "@/entities/achievement/lib/catalog";
 import type { CockDal } from "@/entities/cock";
 import { getAuthUser } from "@/shared/context";
 import { di } from "@/shared/injection";
@@ -7,7 +8,6 @@ import { logger } from "@/shared/lib/logger";
 import { createTicker } from "@/shared/lib/profiling";
 import type { AchBulkResult } from "./db/pipelines";
 import { pAchBulk, pAchLightning, pCountSeasons } from "./db/pipelines";
-import { ALL_ACHIEVEMENTS } from "./lib/catalog";
 import type { CockAchievementsResponse } from "./types";
 
 const val = <T extends Record<string, unknown>>(arr: T[], key: keyof T, fallback = 0): number => (arr[0]?.[key] as number) ?? fallback;

src/features/achievements/get-achievements.action.ts

@@ -0,0 +1,71 @@
+import type { PipelineStage } from "mongoose";
+import type { CockSeason } from "@/shared/lib/seasons";
+
+// ===========================================
+// Результаты агрегаций
+// ===========================================
+
+interface SeasonRange {
+  start: Date;
+  end: Date;
+  season_num: number;
+}
+
+export interface AggSeasonPosition {
+  season_num: number;
+  position: number;
+}
+
+// ===========================================
+// Пайплайны
+// ===========================================
+
+/**
+ * Позиция пользователя в каждом завершённом сезоне (1-based).
+ * Возвращает массив { season_num, position } только для сезонов, где юзер участвовал.
+ */
+export const pUserPositionsInSeasons = (userId: number, completedSeasons: SeasonRange[]): PipelineStage[] => {
+  if (completedSeasons.length === 0) return [{ $limit: 0 }];
+
+  const first = completedSeasons[0];
+  const last = completedSeasons[completedSeasons.length - 1];
+  if (!first || !last) return [{ $limit: 0 }];
+
+  const thenKey = "then";
+  const branches = completedSeasons.map((s) => ({
+    case: { $and: [{ $gte: ["$requested_at", s.start] }, { $lt: ["$requested_at", s.end] }] },
+    [thenKey]: s.season_num,
+  }));
+
+  return [
+    { $match: { requested_at: { $gte: first.start, $lt: last.end } } },
+    { $addFields: { season_num: { $switch: { branches, default: null } } } },
+    { $match: { season_num: { $ne: null } } },
+    { $group: { _id: { season_num: "$season_num", user_id: "$user_id" }, total_size: { $sum: "$size" } } },
+    { $sort: { "_id.season_num": 1, total_size: -1 } },
+    { $group: { _id: "$_id.season_num", users: { $push: { user_id: "$_id.user_id", total_size: "$total_size" } } } },
+    {
+      $project: {
+        _id: 0,
+        season_num: "$_id",
+        position: {
+          $add: [{ $indexOfArray: ["$users.user_id", userId] }, 1],
+        },
+      },
+    },
+    // position=0 означает юзер не найден (indexOfArray вернул -1, +1 = 0)
+    { $match: { position: { $gt: 0 } } },
+  ];
+};
+
+export const toSeasonRanges = (seasons: CockSeason[]): SeasonRange[] =>
+  seasons
+    .filter((s) => !s.is_active)
+    .map((s) => ({
+      start: new Date(s.start_date),
+      end: new Date(s.end_date),
+      season_num: s.season_num,
+    }));
+
+/** Дата первого кока в коллекции. */
+export const pFirstCockDate = (): PipelineStage[] => [{ $sort: { requested_at: 1 } }, { $limit: 1 }, { $project: { _id: 0, first_date: "$requested_at" } }];

src/features/respects/db/pipelines.ts

@@ -1,8 +1,49 @@
+import type { AchievementDal } from "@/entities/achievement";
+import { ALL_ACHIEVEMENTS } from "@/entities/achievement/lib/catalog";
+import type { CockDal } from "@/entities/cock";
+import { getAuthUser } from "@/shared/context";
+import { di } from "@/shared/injection";
+import { getAllSeasons } from "@/shared/lib/seasons";
+import type { AggSeasonPosition } from "./db/pipelines";
+import { pFirstCockDate, pUserPositionsInSeasons, toSeasonRanges } from "./db/pipelines";
+import { calcSeasonRespect } from "./lib/calc";
 import type { RespectResponse } from "./types";
 
-// todo: добавить кол-во респектов за победы в сезоне и за выполненные ачивки (два отдельных еще поля) ну и + total_respect так и остается
-export const createGetRespectAction = () => async (): Promise<RespectResponse> => ({
-  total_respect: 0,
-});
+const achievementRespectMap = new Map(ALL_ACHIEVEMENTS.map((a) => [a.id, a.respects]));
 
-createGetRespectAction.inject = [] as const;
+export const createGetRespectAction = (cockDal: CockDal, achievementDal: AchievementDal) => async (): Promise<RespectResponse> => {
+  const userId = getAuthUser().id;
+
+  const [firstCockResult, userAchievements] = await Promise.all([cockDal.aggregate<{ first_date: Date }>(pFirstCockDate()), achievementDal.findByUserId(userId)]);
+
+  // Респект за ачивки
+  let achievementRespect = 0;
+  for (const ach of userAchievements) {
+    if (ach.completed) {
+      achievementRespect += achievementRespectMap.get(ach.achievement_id) ?? 0;
+    }
+  }
+
+  // Респект за сезоны
+  let seasonRespect = 0;
+  const firstCock = firstCockResult[0];
+  if (firstCock) {
+    const seasons = getAllSeasons(firstCock.first_date);
+    const ranges = toSeasonRanges(seasons);
+
+    if (ranges.length > 0) {
+      const positions = await cockDal.aggregate<AggSeasonPosition>(pUserPositionsInSeasons(userId, ranges));
+      for (const { position } of positions) {
+        seasonRespect += calcSeasonRespect(position);
+      }
+    }
+  }
+
+  return {
+    season_respect: seasonRespect,
+    achievement_respect: achievementRespect,
+    total_respect: seasonRespect + achievementRespect,
+  };
+};
+
+createGetRespectAction.inject = [di.cockDal, di.achievementDal] as const;

src/features/respects/get-respect.action.ts

@@ -0,0 +1,32 @@
+import { describe, expect, it } from "bun:test";
+import { calcSeasonRespect } from "./calc";
+
+describe("calcSeasonRespect", () => {
+  it("возвращает 0 для place <= 0", () => {
+    expect(calcSeasonRespect(0)).toBe(0);
+    expect(calcSeasonRespect(-1)).toBe(0);
+    expect(calcSeasonRespect(-100)).toBe(0);
+  });
+
+  it("возвращает 1488 за первое место", () => {
+    expect(calcSeasonRespect(1)).toBe(1337);
+  });
+
+  it("возвращает убывающий респект для мест 2..10", () => {
+    const respects = Array.from({ length: 9 }, (_, i) => calcSeasonRespect(i + 2));
+    for (let i = 1; i < respects.length; i++) {
+      expect(respects[i]).toBeLessThanOrEqual(respects[i - 1] ?? -1);
+    }
+  });
+
+  it("возвращает конкретные значения для известных мест", () => {
+    expect(calcSeasonRespect(2)).toBe(Math.floor(1337 / 2 ** 1.2));
+    expect(calcSeasonRespect(3)).toBe(Math.floor(1337 / 3 ** 1.2));
+    expect(calcSeasonRespect(10)).toBe(Math.floor(1337 / 10 ** 1.2));
+  });
+
+  it("возвращает минимум 1 для очень далёких мест", () => {
+    expect(calcSeasonRespect(10000)).toBe(1);
+    expect(calcSeasonRespect(99999)).toBe(1);
+  });
+});

src/features/respects/lib/calc.test.ts

@@ -0,0 +1,7 @@
+/** Респект за место в сезоне (порт из Go-бота). */
+export const calcSeasonRespect = (place: number): number => {
+  if (place <= 0) return 0;
+
+  const score = Math.floor(1337 / place ** 1.2);
+  return score < 1 ? 1 : score;
+};

src/features/respects/lib/calc.ts

@@ -1,6 +1,8 @@
 import { z } from "zod";
 
 export const RespectResponseSchema = z.object({
+  season_respect: z.number(),
+  achievement_respect: z.number(),
   total_respect: z.number(),
 });