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
Expand Up @@ -408,6 +408,8 @@ export class ProgramDetailListInfoService {
const extraParams: Record<string, any> = {};

Object.keys(q).forEach(key => {
// Navigation context is not a program application field.
if (this.listType() === "rating" && key === "returnUrl") return;
const value = q[key];
if (value === undefined || value === "" || value === null) return;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@ import { inject, Injectable } from "@angular/core";
import { EvaluationRepositoryPort } from "@domain/program/ports/evaluation.repository.port";
import { EventBus } from "@domain/shared/event-bus";
import { ProgramUpdated } from "@domain/program/program-updated.event";
import { ExpertRegistration, ExpertsBulkWrite } from "@domain/program/evaluation-workspace.model";
import {
ExpertCabinetQuery,
ExpertRegistration,
ExpertsBulkWrite,
} from "@domain/program/evaluation-workspace.model";
import { tap } from "rxjs";
@Injectable({ providedIn: "root" })
export class EvaluationUseCase {
Expand All @@ -17,6 +21,9 @@ export class EvaluationUseCase {
});
}
readonly programs = this.repository.programs.bind(this.repository);
cabinet(query: ExpertCabinetQuery) {
return this.repository.cabinet(query);
}
readonly workspace = this.repository.workspace.bind(this.repository);
bulkExperts(id: number, data: ExpertsBulkWrite) {
return this.repository.bulkExperts(id, data);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,34 @@ export interface EvaluationPrograms {
results: EvaluationProgram[];
hasAccess: boolean;
}
export interface ExpertCabinetQuery {
status: "pending" | "completed";
q?: string;
programId?: number;
limit: number;
offset: number;
}
export interface ExpertCabinetProject {
assignmentId: number;
projectId: number;
programId: number;
name: string;
caseName: string | null;
isCompleted: boolean;
canRate: boolean;
blockedReason: string | null;
}
export interface ExpertCabinet extends EvaluationPrograms {
projects: {
count: number;
limit: number;
offset: number;
pending: number;
completed: number;
unavailable: number;
results: ExpertCabinetProject[];
};
}
export interface ExpertInvitation {
id: number;
email: string;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
import { Observable } from "rxjs";
import {
EvaluationPrograms,
ExpertCabinet,
ExpertCabinetQuery,
ExpertWorkspace,
AssignmentOptions,
AllocationQuery,
Expand All @@ -17,6 +19,7 @@ import {
} from "@domain/program/evaluation-workspace.model";
export abstract class EvaluationRepositoryPort {
abstract programs(): Observable<EvaluationPrograms>;
abstract cabinet(query: ExpertCabinetQuery): Observable<ExpertCabinet>;
abstract workspace(id: number): Observable<ExpertWorkspace>;
abstract bulkExperts(id: number, data: ExpertsBulkWrite): Observable<ExpertWorkspace>;
abstract saveCaseScope(
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
/** @format */
import { TestBed } from "@angular/core/testing";
import { of } from "rxjs";
import { ApiService } from "@corelib";
import { EvaluationHttpAdapter } from "./evaluation-http.adapter";

describe("Expert cabinet HTTP contract", () => {
it("encodes the additive server query without changing the legacy summary request", () => {
const api = { get: vi.fn((_url: string) => of({})) };
TestBed.configureTestingModule({ providers: [{ provide: ApiService, useValue: api }] });
const adapter = TestBed.inject(EvaluationHttpAdapter);
adapter
.cabinet({ status: "completed", q: "A&B / Кейс", programId: 7, limit: 20, offset: 40 })
.subscribe();
const url = new URL(api.get.mock.calls[0][0] as string, "https://example.test");
expect(Object.fromEntries(url.searchParams)).toEqual({
include: "projects",
status: "completed",
q: "A&B / Кейс",
program_id: "7",
limit: "20",
offset: "40",
});
adapter.programs().subscribe();
expect(api.get).toHaveBeenLastCalledWith("/evaluation/programs/");
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import { ApiService } from "@corelib";
import { Observable } from "rxjs";
import {
EvaluationPrograms,
ExpertCabinet,
ExpertCabinetQuery,
ExpertWorkspace,
AssignmentOptions,
AllocationQuery,
Expand All @@ -27,6 +29,17 @@ export class EvaluationHttpAdapter implements EvaluationRepositoryPort {
programs(): Observable<EvaluationPrograms> {
return this.api.get("/evaluation/programs/");
}
cabinet(query: ExpertCabinetQuery): Observable<ExpertCabinet> {
const params = new URLSearchParams({
include: "projects",
status: query.status,
limit: String(query.limit),
offset: String(query.offset),
});
if (query.q) params.set("q", query.q);
if (query.programId) params.set("program_id", String(query.programId));
return this.api.get(`/evaluation/programs/?${params}`);
}
workspace(id: number): Observable<ExpertWorkspace> {
return this.api.get(`${this.root(id)}/experts/`);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,14 @@
import { inject, Injectable } from "@angular/core";
import { EvaluationHttpAdapter } from "../../adapters/program/evaluation-http.adapter";
import { EvaluationRepositoryPort } from "@domain/program/ports/evaluation.repository.port";
import { ExpertsBulkWrite } from "@domain/program/evaluation-workspace.model";
import { ExpertCabinetQuery, ExpertsBulkWrite } from "@domain/program/evaluation-workspace.model";
@Injectable({ providedIn: "root" })
export class EvaluationRepository implements EvaluationRepositoryPort {
private readonly adapter = inject(EvaluationHttpAdapter);
readonly programs = this.adapter.programs.bind(this.adapter);
cabinet(query: ExpertCabinetQuery) {
return this.adapter.cabinet(query);
}
readonly workspace = this.adapter.workspace.bind(this.adapter);
bulkExperts(id: number, data: ExpertsBulkWrite) {
return this.adapter.bulkExperts(id, data);
Expand Down
Loading