Handle date/platoon mismatch

src/api/v1/routes/news.ts

@@ -7,7 +7,7 @@ import { authMiddleware } from "../middlewares";
 
 const newsRoutes = Router();
 
-type TGetNewsRequestBody = {
+type GetNewsRequestBody = {
     topic: string;
     num?: number;
 };
@@ -16,7 +16,7 @@ type TGetNewsRequestBody = {
 newsRoutes.post("/getNews", [
     authMiddleware,
     async (
-        req: CustomRequest<TGetNewsRequestBody>,
+        req: CustomRequest<GetNewsRequestBody>,
         res: Response,
     ): Promise<void> => {
         const { topic, num } = req.body;

src/api/v1/routes/schedule.ts

@@ -34,7 +34,7 @@ scheduleRoutes.get("/getPlatoonTypes", [
     },
 ]);
 
-type TGetScheduleForPlatoonRequestBody = {
+type GetScheduleForPlatoonRequestBody = {
     date: string;
     platoon: string;
 };
@@ -43,7 +43,7 @@ type TGetScheduleForPlatoonRequestBody = {
 scheduleRoutes.post("/getScheduleForPlatoon", [
     authMiddleware,
     (
-        req: CustomRequest<TGetScheduleForPlatoonRequestBody>,
+        req: CustomRequest<GetScheduleForPlatoonRequestBody>,
         res: Response,
     ): void => {
         const { platoon, date } = req.body;
@@ -62,19 +62,25 @@ scheduleRoutes.post("/getScheduleForPlatoon", [
             );
         }
 
-        res.status(200).send(resolveScheduleFromPlatoon(platoon, date));
+        const result = resolveScheduleFromPlatoon(platoon, date);
+
+        if (!result) {
+            res.status(404).send("Bad Request. Date/platoon mismatch");
+        } else {
+            res.status(200).send(result);
+        }
     },
 ]);
 
-type TGetPlatoonTypeForPlatoonRequestBody = {
+type GetPlatoonTypeForPlatoonRequestBody = {
     platoon: string;
 };
 
 // TODO: use validators
 scheduleRoutes.post("/getPlatoonTypeForPlatoon", [
     authMiddleware,
     (
-        req: CustomRequest<TGetPlatoonTypeForPlatoonRequestBody>,
+        req: CustomRequest<GetPlatoonTypeForPlatoonRequestBody>,
         res: Response,
     ): void => {
         const { platoon } = req.body;
@@ -95,14 +101,14 @@ scheduleRoutes.post("/getPlatoonTypeForPlatoon", [
     },
 ]);
 
-type TGetAvailableDatesForPlatoonRequestBody = {
+type GetAvailableDatesForPlatoonRequestBody = {
     platoon: string;
 };
 
 scheduleRoutes.post("/getAvailableDatesForPlatoon", [
     authMiddleware,
     (
-        req: CustomRequest<TGetAvailableDatesForPlatoonRequestBody>,
+        req: CustomRequest<GetAvailableDatesForPlatoonRequestBody>,
         res: Response,
     ): void => {
         const { platoon } = req.body;

src/helpers/createScene.ts

@@ -8,7 +8,7 @@ import { SceneHandler } from "@/typings";
 
 const { enter } = Stage;
 
-type TCreateSceneParams = {
+type CreateSceneParams = {
     name: string;
     enterHandler?: SceneHandler;
     messageHandler?: SceneHandler;
@@ -22,7 +22,7 @@ export default function createScene({
     enterHandler,
     messageHandler,
     resultProcessor,
-}: TCreateSceneParams): Scene<SceneContextMessageUpdate> {
+}: CreateSceneParams): Scene<SceneContextMessageUpdate> {
     let newScene = new BaseScene<SceneContextMessageUpdate>(sceneName);
 
     if (enterHandler) {

src/helpers/schedule.ts

@@ -1,11 +1,11 @@
 import { CellValue, Worksheet, FillPattern } from "exceljs";
 
 import { popSimilarValues } from "@/helpers/general";
-import { TScheduleDayItem } from "@/modules/Schedule";
+import { ScheduleDayItem } from "@/modules/Schedule";
 import { SCHEDULE_TIME } from "@/constants/dateTime";
 import { resolvePlatoonTypeFromPlatoon } from "@/resolvers/schedule";
 
-type TColumnDates = {
+type ColumnDates = {
     col: number;
     value: CellValue;
 }[];
@@ -14,11 +14,11 @@ export const getAllCellsFromRow = (
     worksheet: Worksheet,
     rowIndexes: number[],
     startingColumn = 0,
-): { row: number; dates: TColumnDates }[] => {
-    const arr: { row: number; dates: TColumnDates }[] = [];
+): { row: number; dates: ColumnDates }[] => {
+    const arr: { row: number; dates: ColumnDates }[] = [];
 
     rowIndexes.forEach((item) => {
-        const arrForEachRow: TColumnDates = [];
+        const arrForEachRow: ColumnDates = [];
 
         worksheet.getRow(item).eachCell((cell, colNumber) => {
             if (colNumber >= startingColumn) {
@@ -86,16 +86,16 @@ export const getAllActiveIndexes = (
     return arr;
 };
 
-type TColorPalette = {
+type ColorPalette = {
     index: number;
     value: CellValue;
 }[];
 
 export const getTrainingsColorPalette = (
     worksheet: Worksheet,
     column: number,
-): TColorPalette => {
-    const colorPalette: TColorPalette = [];
+): ColorPalette => {
+    const colorPalette: ColorPalette = [];
     const excelColumn = worksheet.getColumn(column);
 
     excelColumn.eachCell &&
@@ -179,7 +179,7 @@ export const hasOnlyValuesFromArray = (
 export const formatHtmlScheduleResponse = (
     platoon: string,
     date: string,
-    { weekday, schedule }: TScheduleDayItem,
+    { weekday, schedule }: ScheduleDayItem,
 ): string => {
     const platoonType = resolvePlatoonTypeFromPlatoon(platoon);
     const header = `${platoon} (${platoonType}), ${date} (${weekday}):\n`;

src/modules/Firebase/index.ts

@@ -1,7 +1,7 @@
 import * as firebase from "firebase-admin";
 import makeError from "make-error";
 
-import { TFirebaseConfig } from "@/resolvers/config";
+import { FirebaseConfig } from "@/resolvers/config";
 
 const FirebaseError = makeError("FirebaseInitError");
 
@@ -17,7 +17,7 @@ export default abstract class AbstractFirebase {
         projectId,
         clientEmail,
         privateKey,
-    }: TFirebaseConfig): void {
+    }: FirebaseConfig): void {
         try {
             this._instance = firebase
                 .initializeApp({

src/modules/Metrica.ts

@@ -1,14 +1,14 @@
 import makeError from "make-error";
-import BotMetrica, { TMetricaTrackFunction } from "bot-metrica";
+import BotMetrica, { MetricaTrackFunction } from "bot-metrica";
 import { resolveMetricaConfigSync } from "@/resolvers/config";
 
 // TODO: all errors унести from classes
 const MetricaInitError = makeError("MetricaInitError");
 
 class Metrica {
-    private _instance: TMetricaTrackFunction;
+    private _instance: MetricaTrackFunction;
 
-    get instance(): TMetricaTrackFunction {
+    get instance(): MetricaTrackFunction {
         return this._instance;
     }
 

src/modules/News.ts

@@ -1,21 +1,21 @@
 import makeError from "make-error";
-import { TArticle } from "google-news-rss";
+import { Article } from "google-news-rss";
 import { existsSync, readFileSync, writeFileSync } from "fs";
 
 // import resolveNewsArticles from "@/resolvers/news";
 import { resolveNewsFileConfigSync } from "@/resolvers/config";
 
 const NewsStorageError = makeError("NewsStorageError");
 
-type TNewsObject = {
-    articles: TArticle[];
+type NewsObject = {
+    articles: Article[];
     totalPages: number;
 };
 
 class NewsStorage {
-    private _instance: TNewsObject;
+    private _instance: NewsObject;
 
-    get instance(): TNewsObject {
+    get instance(): NewsObject {
         return this._instance;
     }
 
@@ -40,7 +40,7 @@ class NewsStorage {
         }
     }
 
-    dumpNews(builtNews: TNewsObject, parsedNewsPath: string): void {
+    dumpNews(builtNews: NewsObject, parsedNewsPath: string): void {
         try {
             const jsonString = JSON.stringify(builtNews);
             writeFileSync(parsedNewsPath, jsonString, "utf8");

src/modules/Schedule/Parser.ts

@@ -14,12 +14,12 @@ import {
 import { head, capitalizeFirstLetter } from "@/helpers/general";
 
 import {
-    TSchedule,
-    TScheduleMeta,
-    TScheduleObject,
-    TScheduleMetaPlatoonTypes,
-    TScheduleMetaPlatoons,
-    TScheduleMetaDates,
+    Schedule,
+    ScheduleMeta,
+    ScheduleObject,
+    ScheduleMetaPlatoonTypes,
+    ScheduleMetaPlatoons,
+    ScheduleMetaDates,
 } from ".";
 
 const ScheduleParserError = makeError("ScheduleParserError");
@@ -35,10 +35,10 @@ class ScheduleParser {
         trainings: "Тренировки:",
     };
 
-    private _buildMeta(scheduleObj: TSchedule): TScheduleMeta {
-        const platoonTypesMeta: TScheduleMetaPlatoonTypes = [];
-        const platoonsMeta: TScheduleMetaPlatoons = {};
-        const datesMeta: TScheduleMetaDates = {};
+    private _buildMeta(scheduleObj: Schedule): ScheduleMeta {
+        const platoonTypesMeta: ScheduleMetaPlatoonTypes = [];
+        const platoonsMeta: ScheduleMetaPlatoons = {};
+        const datesMeta: ScheduleMetaDates = {};
 
         Object.keys(scheduleObj).forEach((platoonType) => {
             platoonTypesMeta.push(platoonType);
@@ -115,8 +115,8 @@ class ScheduleParser {
         };
     }
 
-    async parse(path: string): Promise<TScheduleObject> {
-        const schedule: TSchedule = {};
+    async parse(path: string): Promise<ScheduleObject> {
+        const schedule: Schedule = {};
         const workbook = new Workbook();
 
         try {

src/modules/Schedule/Storage.ts

@@ -2,14 +2,14 @@ import makeError from "make-error";
 import { existsSync, readFileSync, writeFileSync } from "fs";
 import { resolveScheduleFileConfigSync } from "@/resolvers/config";
 
-import { ScheduleParser, TScheduleObject } from ".";
+import { ScheduleParser, ScheduleObject } from ".";
 
 const ScheduleStorageError = makeError("ScheduleStorageError");
 
 class ScheduleStorage {
-    private _instance: TScheduleObject;
+    private _instance: ScheduleObject;
 
-    get instanсe(): TScheduleObject {
+    get instanсe(): ScheduleObject {
         return this._instance;
     }
 
@@ -43,7 +43,7 @@ class ScheduleStorage {
     }
 
     dumpSchedule(
-        builtSchedule: TScheduleObject,
+        builtSchedule: ScheduleObject,
         parsedSchedulePath: string,
     ): void {
         try {

src/modules/Schedule/index.ts

@@ -1,26 +1,26 @@
-export type TScheduleMetaPlatoonTypes = string[];
-export type TScheduleMetaPlatoons = {
+export type ScheduleMetaPlatoonTypes = string[];
+export type ScheduleMetaPlatoons = {
     [platoonType: string]: string[];
 };
-export type TScheduleMetaDates = {
+export type ScheduleMetaDates = {
     [platoon: string]: string[];
 };
 
-export type TScheduleMeta = {
+export type ScheduleMeta = {
     // [ "Офицеры - разведка", "Сержанты МСВ", "Офицеры ВКС", ... ],
-    platoonTypes: TScheduleMetaPlatoonTypes;
+    platoonTypes: ScheduleMetaPlatoonTypes;
     // { "Офицеры - разведка": [ "1606", "1909", ... ], "Сержанты МСВ": [Array], ... }
-    platoons: TScheduleMetaPlatoons;
+    platoons: ScheduleMetaPlatoons;
     // { "1701": [ "10 января", "17 января", ... ],"1702": [Array], ... }
-    dates: TScheduleMetaDates;
+    dates: ScheduleMetaDates;
 };
 
-export type TScheduleDayItem = {
+export type ScheduleDayItem = {
     weekday: string;
     schedule: string[];
 };
 
-export type TSchedule = {
+export type Schedule = {
     // {
     // 	"Офицеры - разведка": {
     // 		"1703": {
@@ -39,14 +39,14 @@ export type TSchedule = {
     //  }
     [platoonType: string]: {
         [platoon: string]: {
-            [date: string]: TScheduleDayItem;
+            [date: string]: ScheduleDayItem;
         };
     };
 };
 
-export type TScheduleObject = {
-    meta: TScheduleMeta;
-    schedule: TSchedule;
+export type ScheduleObject = {
+    meta: ScheduleMeta;
+    schedule: Schedule;
 };
 
 export { default as ScheduleParser } from "./Parser";

src/resolvers/config.ts

@@ -1,6 +1,6 @@
 import * as path from "path";
 
-export type TFirebaseConfig = {
+export type FirebaseConfig = {
     databaseURL: string;
     projectId: string;
     clientEmail: string;
@@ -9,7 +9,7 @@ export type TFirebaseConfig = {
 
 export const resolveFirebaseConfigSync = (
     databaseName: "users" | "schedule",
-): TFirebaseConfig =>
+): FirebaseConfig =>
     databaseName === "users"
         ? {
               databaseURL: process.env.FIREBASE_USERS_URL || "",

src/resolvers/news.ts

@@ -1,5 +1,5 @@
 import makeError from "make-error";
-import GoogleNewsRss, { TArticle } from "google-news-rss";
+import GoogleNewsRss, { Article } from "google-news-rss";
 
 import { getFormattedDate } from "@/helpers/dates";
 import { DEFAULT_NUM_OF_ARTICLES } from "@/constants/configuration";
@@ -16,7 +16,7 @@ const finalizeTopic = (topic: string): string =>
 export default async function resolveNewsArticles(
     topic: string,
     numOfArticles = DEFAULT_NUM_OF_ARTICLES,
-): Promise<TArticle[]> {
+): Promise<Article[]> {
     let rawArticles;
 
     try {
@@ -32,7 +32,7 @@ export default async function resolveNewsArticles(
     }
 
     return rawArticles.slice(0, numOfArticles).map(
-        (article: TArticle): TArticle => {
+        (article: Article): Article => {
             article.pubDate = getFormattedDate(new Date(article.pubDate));
             return article;
         },