Marbes/Luncher
9
2
Fork 0
Code Issues 20 Pull Requests Actions Packages Projects Releases Wiki Activity

fix: dočasné skrytí podniku Šenk Šeříková
CI / Generate TypeScript types (push) Successful in 11s
Details
CI / Server unit tests (push) Successful in 27s
Details
CI / Build server (push) Successful in 29s
Details
CI / Build client (push) Successful in 40s
Details
CI / Playwright E2E tests (push) Failing after 2m44s
Details
CI / Build and push Docker image (push) Skipped
Details
CI / Notify (push) Successful in 2s
Details

Browse Source
This commit is contained in:
mates
2026-10-09 14:45:00 +02:00
parent 9fee4a1538
commit 49508dacd0
5 changed files with 45 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/src/routes/devRoutes.ts
+5 -10
View File
@@ -1,12 +1,12 @@
import express, { Request } from "express";
import { getDateForWeekIndex, getData, getRestaurantMenu, getToday, initIfNeeded } from "../service";
import { getDateForWeekIndex, getData, isRestaurantDisabled, getActiveRestaurants, getRestaurantMenu, getToday, initIfNeeded } from "../service";
import { formatDate, getDayOfWeekIndex } from "../utils";
import getStorage from "../storage";
import { getWebsocket } from "../websocket";
import { getLogin } from "../auth";
import { parseToken } from "../utils";
import webpush from 'web-push';
import { ClientData, GroupState, MealSlot, OrderGroupMember, TrackingProvider } from "../../../types/gen/types.gen";
import { ClientData, GroupState, MealSlot, OrderGroupMember, Restaurant, TrackingProvider } from "../../../types/gen/types.gen";
import { getStores } from "../stores";
import { createGroup } from "../groups";
import {
@@ -36,7 +36,7 @@ const LUNCH_CHOICES = [
'OBJEDNAVAM',
'NEOBEDVAM',
'ROZHODUJI',
];
].filter(choice => !isRestaurantDisabled(choice as Restaurant));
// Náhodné názvy jídel do poznámek mock objednávek
const MOCK_ORDER_FOODS = [
@@ -72,12 +72,7 @@ const MAX_ORDER_MEMBER_COUNT = 50;
const MAX_ORDER_AMOUNT = 100000;
// Restaurace s menu
const RESTAURANTS_WITH_MENU = [
'SLADOVNICKA',
'TECHTOWER',
'ZASTAVKAUMICHALA',
'SENKSERIKOVA',
];
const RESTAURANTS_WITH_MENU = getActiveRestaurants();
/**
* Middleware pro kontrolu DEV režimu
@@ -138,7 +133,7 @@ async function generateMockDataForDay(dayIndex: number, requestedCount?: number)
};
// Pokud má restaurace menu, vybereme náhodné jídlo
if (RESTAURANTS_WITH_MENU.includes(choice) && menus[choice]?.length) {
if (RESTAURANTS_WITH_MENU.includes(choice as Restaurant) && menus[choice]?.length) {
const foods = menus[choice];
// Vybereme náhodné jídlo (ne polévku)
const mainFoods = foods.filter((f: any) => !f.isSoup);
server/src/routes/foodRoutes.ts
+3 -3
View File
@@ -1,6 +1,6 @@
import express, { Request, Response } from "express";
import { getLogin, getTrusted } from "../auth";
import { addChoice, getDateForWeekIndex, getToday, removeChoice, removeChoices, updateDepartureTime, updateNote, fetchRestaurantWeekMenuData, saveRestaurantWeekMenu, updateBuyer } from "../service";
import { addChoice, getActiveRestaurants, getDateForWeekIndex, getToday, removeChoice, removeChoices, updateDepartureTime, updateNote, fetchRestaurantWeekMenuData, saveRestaurantWeekMenu, updateBuyer } from "../service";
import { getDayOfWeekIndex, parseToken, getFirstWorkDayOfWeek } from "../utils";
import { getWebsocket } from "../websocket";
import { callNotifikace } from "../notifikace";
@@ -232,8 +232,8 @@ export const refreshMetoda = async (req: Request, res: Response) => {
return res.status(400).json({ error: "ještě neumim TODO..." });
}
try {
// Pro všechny restaurace refreshni menu na aktuální týden
const restaurants = ["SLADOVNICKA", "TECHTOWER", "ZASTAVKAUMICHALA", "SENKSERIKOVA"] as const;
// Pro všechny aktivní restaurace refreshni menu na aktuální týden
const restaurants = getActiveRestaurants();
const firstDay = getFirstWorkDayOfWeek(getToday());
const results: Record<string, any> = {};
const successfulRestaurants: string[] = [];