Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
/** @format */

import { ProgramRepositoryPort } from "@domain/program/ports/program.repository.port";

import { TestBed } from "@angular/core/testing";
import { of, Subject } from "rxjs";
import { GetProgramManagerAssignmentsUseCase } from "@api/program/use-cases/get-program-manager-assignments.use-case";
Expand Down Expand Up @@ -46,6 +49,10 @@ describe.each([
assignments.execute.mockClear();
TestBed.configureTestingModule({
providers: [
{
provide: ProgramRepositoryPort,
useValue: { getCaseProjects: () => of({}), exportCaseProjects: vi.fn() },
},
ProgramAnalyticsDrilldownService,
{ provide: GetProgramManagerProjectsNotSubmittedUseCase, useValue: notSubmitted },
{ provide: GetProgramManagerParticipantsWithoutTeamUseCase, useValue: participants },
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
/** @format */

import { ProgramRepositoryPort } from "@domain/program/ports/program.repository.port";

import { TestBed } from "@angular/core/testing";
import { GetProgramManagerAssignmentsUseCase } from "@api/program/use-cases/get-program-manager-assignments.use-case";
import { GetProgramManagerAssignmentScoresUseCase } from "@api/program/use-cases/get-program-manager-assignment-scores.use-case";
Expand Down Expand Up @@ -29,6 +32,10 @@ describe("ProgramAnalyticsDrilldownService", () => {
scores.execute.mockReset().mockReturnValue(of(ok(scoreDetail())));
TestBed.configureTestingModule({
providers: [
{
provide: ProgramRepositoryPort,
useValue: { getCaseProjects: () => of({}), exportCaseProjects: vi.fn() },
},
provideRouter([]),
{ provide: GetProgramManagerProjectsNotSubmittedUseCase, useValue: { execute: vi.fn() } },
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
import { computed, DestroyRef, inject, Injectable, signal } from "@angular/core";
import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
import { Subject, takeUntil } from "rxjs";
import { ProgramCaseProjectsService } from "./program-case-projects.service";
import { ProgramCaseSelection } from "@domain/program/program-case-analytics.model";
import { ProgramAnalyticsCaseMetrics } from "@domain/program/program-analytics.model";
import { GetProgramManagerAssignmentsUseCase } from "@api/program/use-cases/get-program-manager-assignments.use-case";
import { GetProgramManagerAssignmentScoresUseCase } from "@api/program/use-cases/get-program-manager-assignment-scores.use-case";
import { GetProgramManagerParticipantsWithoutTeamUseCase } from "@api/program/use-cases/get-program-manager-participants-without-team.use-case";
Expand All @@ -28,6 +31,7 @@ export type AnalyticsAttentionView =
| "projects-awaiting-evaluation"
| "projects-not-submitted";
export type AnalyticsDrilldownView =
| "case"
| "assignments"
| "scores"
| "delayed"
Expand All @@ -37,6 +41,20 @@ export type AnalyticsDrilldownView =
/** Живёт вместе с одной analytics-модалкой, не сохраняет manager-данные между открытиями. */
@Injectable()
export class ProgramAnalyticsDrilldownService {
readonly cases = inject(ProgramCaseProjectsService);

openCase(
programId: number,
selection: ProgramCaseSelection,
metrics: ProgramAnalyticsCaseMetrics,
applicable: boolean,
programName = "program",
): void {
if (!this.start(programId)) return;
this.view.set("case");
this.cases.open(programId, selection, metrics, applicable, programName);
}

private readonly getAssignments = inject(GetProgramManagerAssignmentsUseCase);
private readonly getScores = inject(GetProgramManagerAssignmentScoresUseCase);
private readonly getParticipants = inject(GetProgramManagerParticipantsWithoutTeamUseCase);
Expand Down Expand Up @@ -272,6 +290,7 @@ export class ProgramAnalyticsDrilldownService {

/** Закрытие и смена программы уничтожают весь локальный контекст и активные запросы. */
close(): void {
this.cases.reset();
this.cancelAssignments.next();
this.cancelScores.next();
this.cancelAttention.next();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ export class ProgramAnalyticsInfoService {
private routeProgramId: number | null = null;
private loadedProgram: Program | undefined;
readonly programId = signal<number | null>(null);
readonly programName = computed(() => this.programUI.program()?.name ?? "program");

constructor() {
this.route.parent?.paramMap
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,187 @@
/** @format */
import { TestBed } from "@angular/core/testing";
import { of, Subject } from "rxjs";
import { GetProgramCaseProjectsUseCase } from "@api/program/use-cases/get-program-case-projects.use-case";
import { ExportProgramCaseProjectsUseCase } from "@api/program/use-cases/export-program-case-projects.use-case";
import {
casePage,
caseMetrics,
selectedCase,
caseProject,
} from "@domain/program/program-case-analytics.fixture";
import { fail, ok } from "@domain/shared/result.type";
import { saveCaseProjects } from "@utils/program-case-analytics";
import { ProgramCaseProjectsService } from "./program-case-projects.service";

vi.mock("@utils/program-case-analytics", () => ({ saveCaseProjects: vi.fn() }));

describe("Case drilldown: контекст, поиск, страницы и независимый export", () => {
const get = { execute: vi.fn() };
const download = { execute: vi.fn() };
let service: ProgramCaseProjectsService;
beforeEach(() => {
get.execute.mockReset().mockReturnValue(of(ok(casePage())));
download.execute.mockReset().mockReturnValue(of(ok(new Blob(["xlsx"]))));
vi.mocked(saveCaseProjects).mockReset();
TestBed.configureTestingModule({
providers: [
ProgramCaseProjectsService,
{ provide: GetProgramCaseProjectsUseCase, useValue: get },
{ provide: ExportProgramCaseProjectsUseCase, useValue: download },
],
});
service = TestBed.inject(ProgramCaseProjectsService);
});
it("до подтверждения contract export заблокирован; overview-метрики видны при loading", () => {
const pending = new Subject<any>();
get.execute.mockReturnValue(pending);
service.open(12, selectedCase, caseMetrics, true);
expect(service.pending()).toBe(true);
expect(service.metrics()).toEqual(caseMetrics);
service.download();
expect(download.execute).not.toHaveBeenCalled();
pending.next(ok(casePage()));
expect(service.canExport()).toBe(true);
});
it("search сбрасывает страницу; метрики/export сохраняют полный bucket при no results", () => {
service.open(12, selectedCase);
service.offset.set(25);
service.searchDraft.set(" неизвестный проект ");
get.execute.mockReturnValue(of(ok(casePage({ count: 0, results: [] }))));
service.applySearch();
expect(get.execute).toHaveBeenLastCalledWith(12, {
selection: selectedCase,
search: "неизвестный проект",
limit: 25,
offset: 0,
});
expect(service.page()?.count).toBe(0);
expect(service.metrics()).toEqual(caseMetrics);
expect(service.canExport()).toBe(true);
service.download();
expect(download.execute).toHaveBeenCalledExactlyOnceWith(12, selectedCase);
service.clearSearch();
expect(get.execute.mock.lastCall?.[1].search).toBe("");
});
it("pagination не следует URL next и использует стабильный offset", () => {
get.execute.mockReturnValue(
of(
ok(
casePage({
count: 26,
next: "https://foreign.invalid",
results: Array.from({ length: 25 }, (_, i) => caseProject({ programProjectId: i + 1 })),
}),
),
),
);
service.open(12, selectedCase);
expect(service.range()).toBe("1–25 из 26");
get.execute.mockReturnValue(of(ok(casePage({ count: 26, results: [caseProject()] }))));
service.changePage(1);
expect(get.execute.mock.lastCall?.[1].offset).toBe(25);
expect(service.range()).toBe("26–26 из 26");
expect(service.hasNext()).toBe(false);
service.changePage(1);
expect(get.execute).toHaveBeenCalledTimes(2);
service.changePage(-1);
expect(get.execute.mock.lastCall?.[1].offset).toBe(0);
});
it("zero configured case не включает export", () => {
get.execute.mockReturnValue(
of(
ok(
casePage({
count: 0,
results: [],
caseMetrics: { projectsTotal: 0, participantsTotal: 0, submitted: 0, notSubmitted: 0 },
}),
),
),
);
service.open(12, selectedCase);
expect(service.canExport()).toBe(false);
expect(service.page()?.results).toEqual([]);
});
it.each(["case", "program", "close", "destroy"] as const)(
"отменяет list и XLSX при %s",
change => {
service.open(12, selectedCase);
const staleList = new Subject<any>();
const freshList = new Subject<any>();
const staleFile = new Subject<any>();
get.execute.mockReturnValue(staleList);
download.execute.mockReturnValue(staleFile);
service.download();
service.load();
get.execute.mockReturnValue(freshList);
if (change === "case") service.open(12, { scope: "without_case" });
if (change === "program") service.open(99, selectedCase);
if (change === "close") service.reset();
if (change === "destroy") TestBed.resetTestingModule();
expect(staleList.observed).toBe(false);
staleList.next(ok(casePage()));
expect(service.page()).toBeNull();
expect(staleFile.observed).toBe(false);
staleFile.next(ok(new Blob(["stale"])));
expect(saveCaseProjects).not.toHaveBeenCalled();
if (change === "close" || change === "destroy") {
expect(staleList.observed).toBe(false);
staleList.next(ok(casePage()));
expect(service.page()).toBeNull();
}
if (change === "case" || change === "program") {
const fresh = casePage({ count: 0, results: [] });
freshList.next(ok(fresh));
expect(service.page()).toEqual(fresh);
}
},
);
it("поиск отменяет предыдущий list, но не прерывает full-case export", () => {
const first = new Subject<any>(),
next = new Subject<any>(),
file = new Subject<any>();
service.open(12, selectedCase);
download.execute.mockReturnValue(file);
service.download();
service.download();
expect(download.execute).toHaveBeenCalledTimes(1);
get.execute.mockReturnValueOnce(first).mockReturnValueOnce(next);
service.load();
service.searchDraft.set("Новый");
service.applySearch();
expect(first.observed).toBe(false);
expect(file.observed).toBe(true);
file.next(ok(new Blob(["xlsx"])));
expect(saveCaseProjects).toHaveBeenCalledTimes(1);
next.next(ok(casePage()));
});
it("ошибка/retry сохраняет контекст, а отказ прав выключает export", () => {
get.execute.mockReturnValue(of(fail({ kind: "network" })));
service.open(12, selectedCase, caseMetrics);
expect(service.error()?.kind).toBe("network");
expect(service.pending()).toBe(false);
expect(service.canExport()).toBe(false);
get.execute.mockReturnValue(of(ok(casePage())));
service.load();
expect(service.error()).toBeNull();
download.execute.mockReturnValue(of(fail({ kind: "forbidden" })));
service.download();
expect(service.exportError()?.kind).toBe("forbidden");
expect(service.canExport()).toBe(false);
});
it("all проверяет одну строку, но выгружает весь scope", () => {
get.execute.mockReturnValue(
of(ok(casePage({ selection: { scope: "all", caseName: null }, caseMetrics: null }))),
);
service.open(12, { scope: "all" });
expect(get.execute).toHaveBeenCalledExactlyOnceWith(12, {
selection: { scope: "all" },
search: "",
offset: 0,
limit: 1,
});
service.download();
expect(download.execute).toHaveBeenCalledExactlyOnceWith(12, { scope: "all" });
});
});
Loading