From bd03cde15162da0f33aaac106262cf83ecfca53d Mon Sep 17 00:00:00 2001 From: Polianin Nikita Date: Mon, 10 Jun 2024 21:52:42 +0300 Subject: [PATCH] refactor: use ScheduleResponse instead other schedule responses --- src/api/v1/schedule.service.ts | 11 +-- .../responses/v1/disciplineScheduleInfo.ts | 67 ---------------- .../v1/disciplineScheduleResponse.ts | 30 -------- src/shared/responses/v1/groupScheduleInfo.ts | 75 ------------------ .../responses/v1/groupScheduleResponse.ts | 30 -------- .../responses/v1/lectureHallScheduleInfo.ts | 76 ------------------- .../v1/lectureHallScheduleResponse.ts | 30 -------- .../responses/v1/professorScheduleInfo.ts | 76 ------------------- .../responses/v1/professorScheduleResponse.ts | 30 -------- 9 files changed, 4 insertions(+), 421 deletions(-) delete mode 100644 src/shared/responses/v1/disciplineScheduleInfo.ts delete mode 100644 src/shared/responses/v1/disciplineScheduleResponse.ts delete mode 100644 src/shared/responses/v1/groupScheduleInfo.ts delete mode 100644 src/shared/responses/v1/groupScheduleResponse.ts delete mode 100644 src/shared/responses/v1/lectureHallScheduleInfo.ts delete mode 100644 src/shared/responses/v1/lectureHallScheduleResponse.ts delete mode 100644 src/shared/responses/v1/professorScheduleInfo.ts delete mode 100644 src/shared/responses/v1/professorScheduleResponse.ts diff --git a/src/api/v1/schedule.service.ts b/src/api/v1/schedule.service.ts index a9c2b45..b4b45f0 100644 --- a/src/api/v1/schedule.service.ts +++ b/src/api/v1/schedule.service.ts @@ -4,9 +4,6 @@ import {DateOnly} from "@model/DateOnly"; import {PeriodTimes} from "@model/pairPeriodTime"; import {ScheduleRequest} from "@api/v1/scheduleRequest"; import {ScheduleResponse} from "@api/v1/scheduleResponse"; -import {GroupScheduleResponse} from "@api/v1/groupScheduleResponse"; -import {ProfessorScheduleResponse} from "@api/v1/professorScheduleResponse"; -import {LectureHallScheduleResponse} from "@api/v1/lectureHallScheduleResponse"; import {map} from "rxjs"; @Injectable() @@ -27,18 +24,18 @@ export class ScheduleService extends ApiService { } public getByGroup(id : number, isEven: boolean | null = null, disciplines: Array | null = null, professors: Array | null = null, lectureHalls: Array | null = null) { - return this.get('GetByGroup' + id.toString(), {isEven: isEven, disciplines: disciplines, professors: professors, lectureHalls: lectureHalls}); + return this.get('GetByGroup/' + id.toString(), {isEven: isEven, disciplines: disciplines, professors: professors, lectureHalls: lectureHalls}); } public getByProfessor(id : number, isEven: boolean | null = null, disciplines: Array | null = null, groups: Array | null = null, lectureHalls: Array | null = null) { - return this.get('GetByProfessor' + id.toString(), {isEven: isEven, disciplines: disciplines, groups: groups, lectureHalls: lectureHalls}); + return this.get('GetByProfessor/' + id.toString(), {isEven: isEven, disciplines: disciplines, groups: groups, lectureHalls: lectureHalls}); } public getByLectureHall(id : number, isEven: boolean | null = null, disciplines: Array | null = null, groups: Array | null = null, professors: Array | null = null) { - return this.get('GetByLectureHall' + id.toString(), {isEven: isEven, disciplines: disciplines, groups: groups, professors: professors}); + return this.get('GetByLectureHall/' + id.toString(), {isEven: isEven, disciplines: disciplines, groups: groups, professors: professors}); } public getByDiscipline(id : number, isEven: boolean | null = null, groups: Array | null = null, professors: Array | null = null, lectureHalls: Array | null = null) { - return this.get('GetByDiscipline' + id.toString(), {isEven: isEven, groups: groups, professors: professors, lectureHalls: lectureHalls}); + return this.get('GetByDiscipline/' + id.toString(), {isEven: isEven, groups: groups, professors: professors, lectureHalls: lectureHalls}); } } diff --git a/src/shared/responses/v1/disciplineScheduleInfo.ts b/src/shared/responses/v1/disciplineScheduleInfo.ts deleted file mode 100644 index 1f40d23..0000000 --- a/src/shared/responses/v1/disciplineScheduleInfo.ts +++ /dev/null @@ -1,67 +0,0 @@ -/** - * MIREA Schedule Web API - * This API provides a convenient interface for retrieving data stored in the database. Special attention was paid to the lightweight and easy transfer of all necessary data. Made by the Winsomnia team. - * - * OpenAPI spec version: 1.0 - * Contact: support@winsomnia.net - * - * NOTE: This class is auto generated by the swagger code generator program. - * https://github.com/swagger-api/swagger-codegen.git - * Do not edit the class manually. - */ -import { DayOfWeek } from '@model/dayOfWeek'; - -/** - * Represents information about a specific schedule entry for a professor. - */ -export interface DisciplineScheduleInfo { - dayOfWeek: DayOfWeek; - /** - * Gets or sets the pair number for the schedule entry. - */ - pairNumber: number; - /** - * Gets or sets a value indicating whether the pair is on an even week. - */ - isEven: boolean; - /** - * Gets or sets the type of occupation for the schedule entry. - */ - typeOfOccupation: Array; - /** - * Gets or sets the names of the group for the schedule entry. - */ - group: string; - /** - * Gets or sets the IDs of the group for the schedule entry. - */ - groupId: number; - /** - * Gets or sets the names of the lecture halls for the schedule entry. - */ - lectureHalls: Array; - /** - * Gets or sets the IDs of the lecture halls for the schedule entry. - */ - lectureHallsId: Array; - /** - * Gets or sets the names of the professors for the schedule entry. - */ - professors: Array; - /** - * Gets or sets the IDs of the professors for the schedule entry. - */ - professorsId: Array; - /** - * Gets or sets the names of the campuses for the schedule entry. - */ - campus: Array; - /** - * Gets or sets the IDs of the campuses for the schedule entry. - */ - campusId: Array; - /** - * Gets or sets the links to online meetings for the schedule entry. - */ - linkToMeet: Array; -} diff --git a/src/shared/responses/v1/disciplineScheduleResponse.ts b/src/shared/responses/v1/disciplineScheduleResponse.ts deleted file mode 100644 index 14d9561..0000000 --- a/src/shared/responses/v1/disciplineScheduleResponse.ts +++ /dev/null @@ -1,30 +0,0 @@ -/** - * MIREA Schedule Web API - * This API provides a convenient interface for retrieving data stored in the database. Special attention was paid to the lightweight and easy transfer of all necessary data. Made by the Winsomnia team. - * - * OpenAPI spec version: 1.0 - * Contact: support@winsomnia.net - * - * NOTE: This class is auto generated by the swagger code generator program. - * https://github.com/swagger-api/swagger-codegen.git - * Do not edit the class manually. - */ -import { DisciplineScheduleInfo } from './disciplineScheduleInfo'; - -/** - * Represents a response containing schedule information for a professor. - */ -export interface DisciplineScheduleResponse { - /** - * Gets or sets the name of the discipline. - */ - discipline: string; - /** - * Gets or sets the ID of the discipline. - */ - disciplineId: number; - /** - * Gets or sets the schedules for the professor. - */ - schedules: Array; -} \ No newline at end of file diff --git a/src/shared/responses/v1/groupScheduleInfo.ts b/src/shared/responses/v1/groupScheduleInfo.ts deleted file mode 100644 index 8abcb20..0000000 --- a/src/shared/responses/v1/groupScheduleInfo.ts +++ /dev/null @@ -1,75 +0,0 @@ -/** - * MIREA Schedule Web API - * This API provides a convenient interface for retrieving data stored in the database. Special attention was paid to the lightweight and easy transfer of all necessary data. Made by the Winsomnia team. - * - * OpenAPI spec version: 1.0 - * Contact: support@winsomnia.net - * - * NOTE: This class is auto generated by the swagger code generator program. - * https://github.com/swagger-api/swagger-codegen.git - * Do not edit the class manually. - */ -import { DayOfWeek } from '@/shared/structs/dayOfWeek'; - -/** - * Represents information about a specific schedule entry for a group. - */ -export interface GroupScheduleInfo { - dayOfWeek: DayOfWeek; - /** - * Gets or sets the pair number for the schedule entry. - */ - pairNumber: number; - /** - * Gets or sets a value indicating whether the pair is on an even week. - */ - isEven: boolean; - /** - * Gets or sets the name of the discipline for the schedule entry. - */ - discipline: string; - /** - * Gets or sets the ID of the discipline for the schedule entry. - */ - disciplineId: number; - /** - * Gets or sets exclude or include weeks for a specific discipline. - */ - isExcludedWeeks?: boolean; - /** - * The week numbers required for the correct display of the schedule. Whether there will be Mirea.Api.Dto.Responses.Schedule.GroupScheduleInfo.Discipline during the week or not depends on the Mirea.Api.Dto.Responses.Schedule.GroupScheduleInfo.IsExcludedWeeks property. - */ - weeks?: Array; - /** - * Gets or sets the type of occupation for the schedule entry. - */ - typeOfOccupations: Array; - /** - * Gets or sets the names of the lecture halls for the schedule entry. - */ - lectureHalls: Array; - /** - * Gets or sets the IDs of the lecture halls for the schedule entry. - */ - lectureHallsId: Array; - /** - * Gets or sets the names of the professors for the schedule entry. - */ - professors: Array; - /** - * Gets or sets the IDs of the professors for the schedule entry. - */ - professorsId: Array; - /** - * Gets or sets the names of the campuses for the schedule entry. - */ - campus: Array; - /** - * Gets or sets the IDs of the campuses for the schedule entry. - */ - campusId: Array; - /** - * Gets or sets the links to online meetings for the schedule entry. - */ - linkToMeet: Array; -} diff --git a/src/shared/responses/v1/groupScheduleResponse.ts b/src/shared/responses/v1/groupScheduleResponse.ts deleted file mode 100644 index 27ccf41..0000000 --- a/src/shared/responses/v1/groupScheduleResponse.ts +++ /dev/null @@ -1,30 +0,0 @@ -/** - * MIREA Schedule Web API - * This API provides a convenient interface for retrieving data stored in the database. Special attention was paid to the lightweight and easy transfer of all necessary data. Made by the Winsomnia team. - * - * OpenAPI spec version: 1.0 - * Contact: support@winsomnia.net - * - * NOTE: This class is auto generated by the swagger code generator program. - * https://github.com/swagger-api/swagger-codegen.git - * Do not edit the class manually. - */ -import { GroupScheduleInfo } from './groupScheduleInfo'; - -/** - * Represents a response containing schedule information for a group. - */ -export interface GroupScheduleResponse { - /** - * Gets or sets the name of the group. - */ - group: string; - /** - * Gets or sets the ID of the group. - */ - groupId: number; - /** - * Gets or sets the schedules for the group. - */ - schedules: Array; -} \ No newline at end of file diff --git a/src/shared/responses/v1/lectureHallScheduleInfo.ts b/src/shared/responses/v1/lectureHallScheduleInfo.ts deleted file mode 100644 index 7fa0eb4..0000000 --- a/src/shared/responses/v1/lectureHallScheduleInfo.ts +++ /dev/null @@ -1,76 +0,0 @@ -/** - * MIREA Schedule Web API - * This API provides a convenient interface for retrieving data stored in the database. Special attention was paid to the lightweight and easy transfer of all necessary data. Made by the Winsomnia team. - * - * OpenAPI spec version: 1.0 - * Contact: support@winsomnia.net - * - * NOTE: This class is auto generated by the swagger code generator program. - * https://github.com/swagger-api/swagger-codegen.git - * Do not edit the class manually. - */ - -import {DayOfWeek} from "@model/dayOfWeek"; - -/** - * Represents information about a specific schedule entry for a lecture hall. - */ -export interface LectureHallScheduleInfo { - dayOfWeek: DayOfWeek; - /** - * Gets or sets the pair number for the schedule entry. - */ - pairNumber: number; - /** - * Gets or sets a value indicating whether the pair is on an even week. - */ - isEven: boolean; - /** - * Gets or sets the name of the discipline for the schedule entry. - */ - discipline: string; - /** - * Gets or sets the ID of the discipline for the schedule entry. - */ - disciplineId: number; - /** - * Gets or sets exclude or include weeks for a specific discipline. - */ - isExcludedWeeks?: boolean; - /** - * The week numbers required for the correct display of the schedule. Whether there will be Mirea.Api.Dto.Responses.Schedule.LectureHallScheduleInfo.Discipline during the week or not depends on the Mirea.Api.Dto.Responses.Schedule.LectureHallScheduleInfo.IsExcludedWeeks property. - */ - weeks?: Array; - /** - * Gets or sets the type of occupation for the schedule entry. - */ - typeOfOccupations: Array; - /** - * Gets or sets the names of the group for the schedule entry. - */ - group: string; - /** - * Gets or sets the IDs of the group for the schedule entry. - */ - groupId: number; - /** - * Gets or sets the names of the campuses for the schedule entry. - */ - campus: Array; - /** - * Gets or sets the IDs of the campuses for the schedule entry. - */ - campusId: Array; - /** - * Gets or sets the names of the professors for the schedule entry. - */ - professors: Array; - /** - * Gets or sets the IDs of the professors for the schedule entry. - */ - professorsId: Array; - /** - * Gets or sets the links to online meetings for the schedule entry. - */ - linkToMeet: Array; -} diff --git a/src/shared/responses/v1/lectureHallScheduleResponse.ts b/src/shared/responses/v1/lectureHallScheduleResponse.ts deleted file mode 100644 index dd44c14..0000000 --- a/src/shared/responses/v1/lectureHallScheduleResponse.ts +++ /dev/null @@ -1,30 +0,0 @@ -/** - * MIREA Schedule Web API - * This API provides a convenient interface for retrieving data stored in the database. Special attention was paid to the lightweight and easy transfer of all necessary data. Made by the Winsomnia team. - * - * OpenAPI spec version: 1.0 - * Contact: support@winsomnia.net - * - * NOTE: This class is auto generated by the swagger code generator program. - * https://github.com/swagger-api/swagger-codegen.git - * Do not edit the class manually. - */ -import { LectureHallScheduleInfo } from './lectureHallScheduleInfo'; - -/** - * Represents a response containing schedule information for a lecture hall. - */ -export interface LectureHallScheduleResponse { - /** - * Gets or sets the names of the lecture halls. - */ - lectureHalls: string; - /** - * Gets or sets the IDs of the lecture halls. - */ - lectureHallsId: number; - /** - * Gets or sets the schedules for the lecture hall. - */ - schedules: Array; -} \ No newline at end of file diff --git a/src/shared/responses/v1/professorScheduleInfo.ts b/src/shared/responses/v1/professorScheduleInfo.ts deleted file mode 100644 index 96b5e99..0000000 --- a/src/shared/responses/v1/professorScheduleInfo.ts +++ /dev/null @@ -1,76 +0,0 @@ -/** - * MIREA Schedule Web API - * This API provides a convenient interface for retrieving data stored in the database. Special attention was paid to the lightweight and easy transfer of all necessary data. Made by the Winsomnia team. - * - * OpenAPI spec version: 1.0 - * Contact: support@winsomnia.net - * - * NOTE: This class is auto generated by the swagger code generator program. - * https://github.com/swagger-api/swagger-codegen.git - * Do not edit the class manually. - */ - -import {DayOfWeek} from "@model/dayOfWeek"; - -/** - * Represents information about a specific schedule entry for a professor. - */ -export interface ProfessorScheduleInfo { - dayOfWeek: DayOfWeek; - /** - * Gets or sets the pair number for the schedule entry. - */ - pairNumber: number; - /** - * Gets or sets a value indicating whether the pair is on an even week. - */ - isEven: boolean; - /** - * Gets or sets the name of the discipline for the schedule entry. - */ - discipline: string; - /** - * Gets or sets the ID of the discipline for the schedule entry. - */ - disciplineId: number; - /** - * Gets or sets exclude or include weeks for a specific discipline. - */ - isExcludedWeeks?: boolean; - /** - * The week numbers required for the correct display of the schedule. Whether there will be Mirea.Api.Dto.Responses.Schedule.ProfessorScheduleInfo.Discipline during the week or not depends on the Mirea.Api.Dto.Responses.Schedule.ProfessorScheduleInfo.IsExcludedWeeks property. - */ - weeks?: Array; - /** - * Gets or sets the type of occupation for the schedule entry. - */ - typeOfOccupations: Array; - /** - * Gets or sets the names of the group for the schedule entry. - */ - group: string; - /** - * Gets or sets the IDs of the group for the schedule entry. - */ - groupId: number; - /** - * Gets or sets the names of the lecture halls for the schedule entry. - */ - lectureHalls: Array; - /** - * Gets or sets the IDs of the lecture halls for the schedule entry. - */ - lectureHallsId: Array; - /** - * Gets or sets the names of the campuses for the schedule entry. - */ - campus: Array; - /** - * Gets or sets the IDs of the campuses for the schedule entry. - */ - campusId: Array; - /** - * Gets or sets the links to online meetings for the schedule entry. - */ - linkToMeet: Array; -} diff --git a/src/shared/responses/v1/professorScheduleResponse.ts b/src/shared/responses/v1/professorScheduleResponse.ts deleted file mode 100644 index 5e23711..0000000 --- a/src/shared/responses/v1/professorScheduleResponse.ts +++ /dev/null @@ -1,30 +0,0 @@ -/** - * MIREA Schedule Web API - * This API provides a convenient interface for retrieving data stored in the database. Special attention was paid to the lightweight and easy transfer of all necessary data. Made by the Winsomnia team. - * - * OpenAPI spec version: 1.0 - * Contact: support@winsomnia.net - * - * NOTE: This class is auto generated by the swagger code generator program. - * https://github.com/swagger-api/swagger-codegen.git - * Do not edit the class manually. - */ -import { ProfessorScheduleInfo } from './professorScheduleInfo'; - -/** - * Represents a response containing schedule information for a professor. - */ -export interface ProfessorScheduleResponse { - /** - * Gets or sets the name of the professor. - */ - professor: string; - /** - * Gets or sets the ID of the professor. - */ - professorId: number; - /** - * Gets or sets the schedules for the professor. - */ - schedules: Array; -} \ No newline at end of file