Do funkce jdemeObed doplněn parametr locationKey

.gitignore

@@ -1,23 +1 @@
-# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
-
-# dependencies
 node_modules
-/.pnp
-.pnp.js
-
-# testing
-/coverage
-
-# production
-/build
-
-# misc
-.DS_Store
-.env.local
-.env.development.local
-.env.test.local
-.env.production.local
-
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*

.woodpecker/workflow.yaml

@@ -0,0 +1,56 @@
+variables:
+  - &node_image 'node:18-alpine3.18'
+  - &branch 'master'
+
+when:
+  - event: push
+    branch: *branch
+
+steps:
+  - name: Install server dependencies
+    image: *node_image
+    commands:
+      - cd server
+      - yarn install --frozen-lockfile
+  - name: Install client dependencies
+    image: *node_image
+    commands:
+      - cd client
+      - yarn install --frozen-lockfile
+  - name: Build server
+    depends_on: [Install server dependencies]
+    image: *node_image
+    commands:
+      - cd server
+      - yarn build
+  - name: Build client
+    depends_on: [Install client dependencies]
+    image: *node_image
+    commands:
+      - cd client
+      - yarn build
+  - name: Build Docker image
+    depends_on: [Build server, Build client]
+    image: woodpeckerci/plugin-docker-buildx
+    settings:
+      dockerfile: Dockerfile-Woodpecker
+      platforms: linux/amd64
+      registry:
+        from_secret: REPO_URL
+      username:
+        from_secret: REPO_USERNAME
+      password:
+        from_secret: REPO_PASSWORD
+      repo:
+        from_secret: REPO_NAME
+  - name: Discord notification - build
+    image: appleboy/drone-discord
+    depends_on: [Build Docker image]
+    when:
+      - status: [success, failure]
+    settings:
+      webhook_id:
+        from_secret: DISCORD_WEBHOOK_ID
+      webhook_token:
+        from_secret: DISCORD_WEBHOOK_TOKEN
+      message: "{{#success build.status}}✅ Sestavení {{build.number}} proběhlo úspěšně.{{else}}❌ Sestavení {{build.number}} selhalo.{{/success}}\n\nPipeline: {{build.link}}\nPoslední commit: {{commit.message}}Autor: {{commit.author}}"

Dockerfile

@@ -54,7 +54,6 @@ WORKDIR /app
 # Vykopírování sestaveného serveru
 COPY --from=builder /build/server/node_modules ./server/node_modules
 COPY --from=builder /build/server/dist ./
-COPY server/resources ./server/resources
 
 # Vykopírování sestaveného klienta
 COPY --from=builder /build/client/dist ./public
@@ -63,8 +62,10 @@ COPY --from=builder /build/client/dist ./public
 COPY /server/.env.production ./server/src
 
 # Zkopírování konfigurace easter eggů
-# TODO tohle spadne když nebude existovat!
-COPY /server/.easter-eggs.json ./server/
+RUN if [ -f /server/.easter-eggs.json ]; then cp /server/.easter-eggs.json ./server/; fi
+
+# Export /data/db.json do složky /data
+VOLUME ["/data"]
 
 EXPOSE 3000
 

Dockerfile-Woodpecker

@@ -0,0 +1,21 @@
+FROM node:18-alpine3.18
+ENV LANG=cs_CZ.UTF-8
+ENV NODE_ENV=production
+
+WORKDIR /app
+
+# Vykopírování sestaveného serveru
+COPY ./server/node_modules ./server/node_modules
+COPY ./server/dist ./
+# TODO tohle není dobře, má to být součástí serveru
+# COPY ./server/resources ./resources
+
+# Vykopírování sestaveného klienta
+COPY ./client/dist ./public
+
+# Zkopírování konfigurace easter eggů
+RUN if [ -f ./server/.easter-eggs.json ]; then cp ./server/.easter-eggs.json ./server/; fi
+
+EXPOSE 3000
+
+CMD [ "node", "./server/src/index.js" ]

client/.gitignore

@@ -1,3 +1,2 @@
 build
 dist
-src/types

client/package.json

@@ -31,9 +31,8 @@
     "vite-tsconfig-paths": "^5.1.4"
   },
   "scripts": {
-    "copy-types": "cp -r ../types ./src",
-    "start": "yarn copy-types && vite",
-    "build": "yarn copy-types && vite build"
+    "start": "yarn vite",
+    "build": "yarn vite build"
   },
   "eslintConfig": {
     "extends": [

client/src/App.tsx

@@ -8,19 +8,18 @@ import { Alert, Button, Col, Form, Row, Table } from 'react-bootstrap';
 import Header from './components/Header';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import PizzaOrderList from './components/PizzaOrderList';
-import SelectSearch, { SelectedOptionValue } from 'react-select-search';
+import SelectSearch, {SelectedOptionValue, SelectSearchOption} from 'react-select-search';
 import 'react-select-search/style.css';
 import './App.scss';
-import { SelectSearchOption } from 'react-select-search';
 import { faCircleCheck, faNoteSticky, faTrashCan } from '@fortawesome/free-regular-svg-icons';
 import { useSettings } from './context/settings';
-import { ClientData, Restaurants, Food, Order, Locations, PizzaOrder, PizzaDayState, FoodChoices, DayMenu, DepartureTime } from './types';
+import { ClientData, Restaurants, Food, Order, Locations, PizzaOrder, PizzaDayState, FoodChoices, DayMenu, DepartureTime, LocationKey } from '../../types';
 import Footer from './components/Footer';
 import { faChainBroken, faChevronLeft, faChevronRight, faGear, faSatelliteDish, faSearch } from '@fortawesome/free-solid-svg-icons';
 import Loader from './components/Loader';
 import { getData, errorHandler, getQrUrl } from './api/Api';
 import { addChoice, removeChoices, removeChoice, changeDepartureTime, jdemeObed, updateNote } from './api/FoodApi';
-import { getHumanDateTime } from './Utils';
+import { getHumanDateTime, isInTheFuture } from './Utils';
 import NoteModal from './components/modals/NoteModal';
 import { useEasterEgg } from './context/eggs';
 import { getImage } from './api/EasterEggApi';
@@ -141,11 +140,8 @@ function App() {
 
   useEffect(() => {
     if (choiceRef?.current?.value && choiceRef.current.value !== "") {
-      // TODO: wtf, cos pil, když jsi tohle psal?
-      const key = choiceRef?.current?.value;
-      const locationIndex = Object.keys(Locations).indexOf(key as unknown as Locations);
-      const locationsKey = Object.keys(Locations)[locationIndex];
-      const restaurantKey = Object.keys(Restaurants).indexOf(locationsKey);
+      const locationKey = choiceRef.current.value as LocationKey;
+      const restaurantKey = Object.keys(Restaurants).indexOf(locationKey);
       if (restaurantKey > -1 && food) {
         const restaurant = Object.values(Restaurants)[restaurantKey];
         setFoodChoiceList(food[restaurant]?.food);
@@ -193,35 +189,41 @@ function App() {
     }
   }, [auth?.login, easterEgg?.duration, easterEgg?.url, eggImage]);
 
-  const doAddChoice = async (event: React.ChangeEvent<HTMLSelectElement>) => {
-    const index = Object.keys(Locations).indexOf(event.target.value as unknown as Locations);
+  const doAddClickFoodChoice = async (location: Locations, foodIndex?: number) => {
+    const locationKey = Object.keys(Locations).find(key => Locations[key as keyof typeof Locations] === location) as LocationKey;
     if (auth?.login) {
-      await errorHandler(() => addChoice(index, undefined, dayIndex));
+      await errorHandler(() => addChoice(locationKey, foodIndex, dayIndex));
+    }
+  }
+
+  const doAddChoice = async (event: React.ChangeEvent<HTMLSelectElement>) => {
+    const locationKey = event.target.value as LocationKey;
+    if (auth?.login) {
+      await errorHandler(() => addChoice(locationKey, undefined, dayIndex));
       if (foodChoiceRef.current?.value) {
         foodChoiceRef.current.value = "";
       }
     }
   }
 
-  const doJdemeObed = async () => {
+  const doJdemeObed = async (locationKey: LocationKey) => {
     if (auth?.login) {
-      await jdemeObed();
+      await jdemeObed(locationKey);
     }
   }
 
   const doAddFoodChoice = async (event: React.ChangeEvent<HTMLSelectElement>) => {
     if (event.target.value && foodChoiceList?.length && choiceRef.current?.value) {
-      const restaurantKey = choiceRef.current.value;
+      const locationKey = choiceRef.current.value as LocationKey;
       if (auth?.login) {
-        const locationIndex = Object.keys(Locations).indexOf(restaurantKey as unknown as Locations);
-        await errorHandler(() => addChoice(locationIndex, Number(event.target.value), dayIndex));
+        await errorHandler(() => addChoice(locationKey, Number(event.target.value), dayIndex));
       }
     }
   }
 
-  const doRemoveChoices = async (locationKey: string) => {
+  const doRemoveChoices = async (locationKey: LocationKey) => {
     if (auth?.login) {
-      await errorHandler(() => removeChoices(Number(locationKey), dayIndex));
+      await errorHandler(() => removeChoices(locationKey, dayIndex));
       // Vyresetujeme výběr, aby bylo jasné pro který případně vybíráme jídlo
       if (choiceRef?.current?.value) {
         choiceRef.current.value = "";
@@ -232,9 +234,9 @@ function App() {
     }
   }
 
-  const doRemoveFoodChoice = async (locationKey: string, foodIndex: number) => {
+  const doRemoveFoodChoice = async (locationKey: LocationKey, foodIndex: number) => {
     if (auth?.login) {
-      await errorHandler(() => removeChoice(Number(locationKey), foodIndex, dayIndex));
+      await errorHandler(() => removeChoice(locationKey, foodIndex, dayIndex));
       if (choiceRef?.current?.value) {
         choiceRef.current.value = "";
       }
@@ -336,15 +338,16 @@ function App() {
     }
   }
 
-  const renderFoodTable = (name: string, menu: DayMenu) => {
+  const renderFoodTable = (location: Locations, menu: DayMenu) => {
     let content;
     if (menu?.closed) {
       content = <h3>Zavřeno</h3>
     } else if (menu?.food?.length > 0) {
+      const hideSoups = settings?.hideSoups;
       content = <Table striped bordered hover>
-        <tbody>
-          {menu.food.filter(f => (settings?.hideSoups ? !f.isSoup : true)).map((f: any, index: number) =>
-            <tr key={index}>
+        <tbody style={{ cursor: 'pointer' }}>
+          {menu.food.filter(f => (hideSoups ? !f.isSoup : true)).map((f: any, index: number) =>
+              <tr key={index} onClick={() => doAddClickFoodChoice(location, hideSoups ? index + 1 : index)}>
               <td>{f.amount}</td>
               <td>{f.name}</td>
               <td>{f.price}</td>
@@ -355,8 +358,8 @@ function App() {
     } else {
       content = <h3>Chyba načtení dat</h3>
     }
-    return <Col md={12} lg={6} className='mt-3'>
-      <h3>{name}</h3>
+    return <Col md={12} lg={3} className='mt-3'>
+      <h3 style={{ cursor: 'pointer' }} onClick={() => doAddClickFoodChoice(location, undefined)}>{location}</h3>
       {menu?.lastUpdate && <small>Poslední aktualizace: {getHumanDateTime(new Date(menu.lastUpdate))}</small>}
       {content}
     </Col>
@@ -406,8 +409,8 @@ function App() {
             <img src='snowman.png' style={{ position: "absolute", height: "110px", right: 10, top: 5 }} />
             Poslední změny:
             <ul>
-              <li>Zimní atmosféra</li>
-              <li>Odstranění podniku U Motlíků</li>
+              <li>Přidání restaurací Zastávka u Michala a Pivovarský šenk Šeříková</li>
+              <li>Možnost výběru restaurace a jídel kliknutím v tabulce</li>
             </ul>
           </Alert>
           {dayIndex != null &&
@@ -418,9 +421,11 @@ function App() {
             </div>
           }
           <Row className='food-tables'>
-            {food[Restaurants.SLADOVNICKA] && renderFoodTable('Sladovnická', food[Restaurants.SLADOVNICKA])}
-            {/* {food[Restaurants.UMOTLIKU] && renderFoodTable('U Motlíků', food[Restaurants.UMOTLIKU])} */}
-            {food[Restaurants.TECHTOWER] && renderFoodTable('TechTower', food[Restaurants.TECHTOWER])}
+            {food[Restaurants.SLADOVNICKA] && renderFoodTable(Locations.SLADOVNICKA, food[Restaurants.SLADOVNICKA])}
+            {/* {food[Restaurants.UMOTLIKU] && renderFoodTable(food[Restaurants.UMOTLIKU])} */}
+            {food[Restaurants.TECHTOWER] && renderFoodTable(Locations.TECHTOWER, food[Restaurants.TECHTOWER])}
+            {food[Restaurants.ZASTAVKAUMICHALA] && renderFoodTable(Locations.ZASTAVKAUMICHALA, food[Restaurants.ZASTAVKAUMICHALA])}
+            {food[Restaurants.SENKSERIKOVA] && renderFoodTable(Locations.SENKSERIKOVA, food[Restaurants.SENKSERIKOVA])}
           </Row>
           <div className='content-wrapper'>
             <div className='content'>
@@ -430,11 +435,8 @@ function App() {
                   <option></option>
                   {Object.entries(Locations)
                     .filter(entry => {
-                      // TODO: wtf, cos pil, když jsi tohle psal? v2
-                      const key = entry[0];
-                      const locationIndex = Object.keys(Locations).indexOf(key as unknown as Locations);
-                      const locationsKey = Object.keys(Locations)[locationIndex];
-                      const restaurantKey = Object.keys(Restaurants).indexOf(locationsKey);
+                      const locationKey = entry[0] as LocationKey;
+                      const restaurantKey = Object.keys(Restaurants).indexOf(locationKey);
                       const v = Object.values(Restaurants)[restaurantKey];
                       return v == null || !food[v]?.closed;
                     })
@@ -452,18 +454,26 @@ function App() {
                   <p style={{ marginTop: "10px" }}>V kolik hodin preferuješ odchod?</p>
                   <Form.Select ref={departureChoiceRef} onChange={handleChangeDepartureTime}>
                     <option></option>
-                    {Object.values(DepartureTime).map(time => <option key={time} value={time}>{time}</option>)}
+                    {Object.values(DepartureTime)
+                        .filter(time => isInTheFuture(time))
+                        .map(time => <option key={time} value={time}>{time}</option>)}
                   </Form.Select>
                 </>}
               </>}
               {Object.keys(data.choices).length > 0 ?
                 <Table bordered className='mt-5'>
                   <tbody>
-                    {Object.keys(data.choices).map((locationKey: string) => {
-                      const locationName = Object.values(Locations)[Number(locationKey)];
-                      const locationLoginList = Object.entries(data.choices[Number(locationKey)]);
+                    {Object.keys(data.choices).map(key => {
+                      const locationKey = key as LocationKey;
+                      const locationName = Locations[locationKey];
+                      const loginObject = data.choices[locationKey];
+                      if (!loginObject) {
+                        return;
+                      }
+                      const locationLoginList = Object.entries(loginObject);
+                      const disabled = false;
                       return (
-                        <tr key={locationKey}>
+                        <tr key={key}>
                           <td>{locationName}</td>
                           <td className='p-0'>
                             <Table>
@@ -485,20 +495,20 @@ function App() {
                                         setNoteModalOpen(true);
                                       }} title='Upravit poznámku' className='action-icon' icon={faNoteSticky} />}
                                       {login === auth.login && canChangeChoice && <FontAwesomeIcon onClick={() => {
-                                        doRemoveChoices(locationKey);
+                                        doRemoveChoices(key as LocationKey);
                                       }} title={`Odstranit volbu ${locationName}, včetně případných zvolených jídel`} className='action-icon' icon={faTrashCan} />}
                                     </td>
                                     {userChoices?.length && food ? <td>
                                       <ul>
                                         {userChoices?.map(foodIndex => {
-                                          const locationsKey = Object.keys(Locations)[Number(locationKey)]
-                                          const restaurantKey = Object.keys(Restaurants).indexOf(locationsKey);
+                                          // TODO narovnat, tohle je zbytečně složité
+                                          const restaurantKey = Object.keys(Restaurants).indexOf(key);
                                           const restaurant = Object.values(Restaurants)[restaurantKey];
                                           const foodName = food[restaurant]?.food[foodIndex].name;
                                           return <li key={foodIndex}>
                                             {foodName}
                                             {login === auth.login && canChangeChoice && <FontAwesomeIcon onClick={() => {
-                                              doRemoveFoodChoice(locationKey, foodIndex);
+                                              doRemoveFoodChoice(key as LocationKey, foodIndex);
                                             }} title={`Odstranit ${foodName}`} className='action-icon' icon={faTrashCan} />}
                                           </li>
                                         })}
@@ -510,6 +520,9 @@ function App() {
                               </tbody>
                             </Table>
                           </td>
+                          <td>
+                            <Button onClick={() => doJdemeObed(locationKey)} disabled={false}>Jdeme na oběd</Button>
+                          </td>
                         </tr>)
                     }
                     )}
@@ -533,7 +546,6 @@ function App() {
                           setLoadingPizzaDay(true);
                           await createPizzaDay().then(() => setLoadingPizzaDay(false));
                         }}>Založit Pizza day</Button>
-                        <Button onClick={doJdemeObed} style={{ marginLeft: "14px" }}>Jdeme na oběd !</Button>
                       </>
                     }
                   </div>

client/src/Utils.tsx

@@ -1,3 +1,5 @@
+import {DepartureTime} from "../../types";
+
 const TOKEN_KEY = "token";
 
 /**
@@ -43,3 +45,20 @@ export function getHumanDateTime(datetime: Date) {
         return `${day}.${month}.${year} ${hours}:${minutes}`;
     }
 }
+
+/**
+ * Vrátí true, pokud je předaný čas větší než aktuální čas.
+ */
+export function isInTheFuture(time: DepartureTime) {
+    const now = new Date();
+    const currentHours = now.getHours();
+    const currentMinutes = now.getMinutes();
+    const currentDate = now.toDateString();
+    const [hours, minutes] = time.split(':').map(Number);
+
+    if (currentDate === now.toDateString()) {
+        return hours > currentHours || (hours === currentHours && minutes > currentMinutes);
+    }
+    return true;
+}
+

client/src/api/EasterEggApi.ts

@@ -1,4 +1,4 @@
-import { EasterEgg } from "../types";
+import { EasterEgg } from "../../../types";
 import { api } from "./Api";
 
 const EASTER_EGGS_API_PREFIX = '/api/easterEggs';

client/src/api/FoodApi.ts

@@ -1,18 +1,26 @@
-import { AddChoiceRequest, ChangeDepartureTimeRequest, RemoveChoiceRequest, RemoveChoicesRequest, UpdateNoteRequest } from "../types";
+import {
+    AddChoiceRequest,
+    ChangeDepartureTimeRequest,
+    JdemeObedRequest,
+    LocationKey,
+    RemoveChoiceRequest,
+    RemoveChoicesRequest,
+    UpdateNoteRequest
+} from "../../../types";
 import { api } from "./Api";
 
 const FOOD_API_PREFIX = '/api/food';
 
-export const addChoice = async (locationIndex: number, foodIndex?: number, dayIndex?: number) => {
-    return await api.post<AddChoiceRequest, void>(`${FOOD_API_PREFIX}/addChoice`, { locationIndex, foodIndex, dayIndex });
+export const addChoice = async (locationKey: LocationKey, foodIndex?: number, dayIndex?: number) => {
+    return await api.post<AddChoiceRequest, void>(`${FOOD_API_PREFIX}/addChoice`, { locationKey, foodIndex, dayIndex });
 }
 
-export const removeChoices = async (locationIndex: number, dayIndex?: number) => {
-    return await api.post<RemoveChoicesRequest, void>(`${FOOD_API_PREFIX}/removeChoices`, { locationIndex, dayIndex });
+export const removeChoices = async (locationKey: LocationKey, dayIndex?: number) => {
+    return await api.post<RemoveChoicesRequest, void>(`${FOOD_API_PREFIX}/removeChoices`, { locationKey, dayIndex });
 }
 
-export const removeChoice = async (locationIndex: number, foodIndex: number, dayIndex?: number) => {
-    return await api.post<RemoveChoiceRequest, void>(`${FOOD_API_PREFIX}/removeChoice`, { locationIndex, foodIndex, dayIndex });
+export const removeChoice = async (locationKey: LocationKey, foodIndex: number, dayIndex?: number) => {
+    return await api.post<RemoveChoiceRequest, void>(`${FOOD_API_PREFIX}/removeChoice`, { locationKey, foodIndex, dayIndex });
 }
 
 export const updateNote = async (note?: string, dayIndex?: number) => {
@@ -23,6 +31,6 @@ export const changeDepartureTime = async (time: string, dayIndex?: number) => {
     return await api.post<ChangeDepartureTimeRequest, void>(`${FOOD_API_PREFIX}/changeDepartureTime`, { time, dayIndex });
 }
 
-export const jdemeObed = async () => {
-    return await api.post<undefined, void>(`${FOOD_API_PREFIX}/jdemeObed`);
+export const jdemeObed = async (locationKey: LocationKey) => {
+    return await api.post<JdemeObedRequest, void>(`${FOOD_API_PREFIX}/jdemeObed`, { locationKey });
 }

client/src/api/PizzaDayApi.ts

@@ -1,4 +1,4 @@
-import { AddPizzaRequest, FinishDeliveryRequest, PizzaOrder, RemovePizzaRequest, UpdatePizzaDayNoteRequest, UpdatePizzaFeeRequest } from "../types";
+import { AddPizzaRequest, FinishDeliveryRequest, PizzaOrder, RemovePizzaRequest, UpdatePizzaDayNoteRequest, UpdatePizzaFeeRequest } from "../../../types";
 import { api } from "./Api";
 
 const PIZZADAY_API_PREFIX = '/api/pizzaDay';

client/src/api/VotingApi.ts

@@ -1,4 +1,4 @@
-import { FeatureRequest, UpdateFeatureVoteRequest } from "../types";
+import { FeatureRequest, UpdateFeatureVoteRequest } from "../../../types";
 import { api } from "./Api";
 
 const VOTING_API_PREFIX = '/api/voting';

client/src/components/Header.tsx

@@ -4,7 +4,7 @@ import { useAuth } from "../context/auth";
 import SettingsModal from "./modals/SettingsModal";
 import { useSettings } from "../context/settings";
 import FeaturesVotingModal from "./modals/FeaturesVotingModal";
-import { FeatureRequest } from "../types";
+import { FeatureRequest } from "../../../types";
 import { errorHandler } from "../api/Api";
 import { getFeatureVotes, updateFeatureVote } from "../api/VotingApi";
 import PizzaCalculatorModal from "./modals/PizzaCalculatorModal";

client/src/components/PizzaOrderList.tsx

@@ -1,5 +1,5 @@
 import { Table } from "react-bootstrap";
-import { Order, PizzaDayState, PizzaOrder } from "../types";
+import { Order, PizzaDayState, PizzaOrder } from "../../../types";
 import PizzaOrderRow from "./PizzaOrderRow";
 import { updatePizzaFee } from "../api/PizzaDayApi";
 

client/src/components/PizzaOrderRow.tsx

@@ -2,7 +2,7 @@ import React, { useState } from "react";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { faMoneyBill1, faTrashCan } from "@fortawesome/free-regular-svg-icons";
 import { useAuth } from "../context/auth";
-import { Order, PizzaDayState, PizzaOrder } from "../types";
+import { Order, PizzaDayState, PizzaOrder } from "../../../types";
 import PizzaAdditionalFeeModal from "./modals/PizzaAdditionalFeeModal";
 
 type Props = {

client/src/components/modals/FeaturesVotingModal.tsx

@@ -1,5 +1,5 @@
 import { Modal, Button, Form } from "react-bootstrap"
-import { FeatureRequest } from "../../types";
+import { FeatureRequest } from "../../../../types";
 
 type Props = {
     isOpen: boolean,

client/src/context/eggs.tsx

@@ -1,7 +1,7 @@
 import { useEffect, useState } from "react";
 import { getEasterEgg } from "../api/EasterEggApi";
 import { AuthContextProps } from "./auth";
-import { EasterEgg } from "../types";
+import { EasterEgg } from "../../../types";
 
 export const useEasterEgg = (auth?: AuthContextProps | null): [EasterEgg | undefined, boolean] => {
   const [result, setResult] = useState<EasterEgg | undefined>();

server/.gitignore

@@ -1,7 +1,5 @@
-/node_modules
 /dist
-data.json
+/resources/easterEggs
 .env.production
 .env.development
 .easter-eggs.json
-/resources/easterEggs

server/src/index.ts

@@ -100,7 +100,9 @@ app.use("/api/", (req, res, next) => {
         const emailHeader = req.header('remote-email');
         if (userHeader !== undefined && nameHeader !== undefined) {
             const remoteName = Buffer.from(nameHeader, 'latin1').toString();
-            console.log("Tvuj username, name a email: %s, %s, %s.", userHeader, remoteName, emailHeader);
+            if (ENVIRONMENT !== "production"){
+                console.log("Tvuj username, name a email: %s, %s, %s.", userHeader, remoteName, emailHeader);
+            }
         }
     }
     if (!req.headers.authorization) {

server/src/mock.ts

@@ -427,7 +427,181 @@ const MOCK_DATA = {
                 isSoup: false,
             }
         ]
-    ]
+    ],
+    'zastavkaUmichala': [
+        [
+            {
+                amount: "-",
+                name: "Fazolačka s klobásou & zakysačkou",
+                price: "39\xA0Kč",
+                isSoup: true,
+            },
+            {
+                amount: "-",
+                name: "Zeleninová musaka – lilek, cuketa, tomatové sugo & sýrový bešamel",
+                price: "135\xA0Kč",
+                isSoup: false,
+            },
+            {
+                amount: "-",
+                name: "Slovácké strapačky s uzenou slaninou, zelím, mletým pepřem & sekanou petrželkou",
+                price: "140\xA0Kč",
+                isSoup: false,
+            },
+            {
+                amount: "-",
+                name: "Hovězí guláš s vejcem, zeleninovou garniturkou & žemlovými knedlíky",
+                price: "145\xA0Kč",
+                isSoup: false,
+            },
+            {
+                amount: "-",
+                name: "Kuřecí roláda s kaštanovou nádivkou, demi-glace & smetanovou bramborovou kaší",
+                price: "150\xA0Kč",
+                isSoup: false,
+            }
+        ],
+        [
+            {
+                amount: "-",
+                name: "Hovězí vývar se zeleninou a játrovou rýží",
+                price: "39\xA0Kč",
+                isSoup: true,
+            },
+            {
+                amount: "-",
+                name: "Pečené vepřové koleno, křen, hořčice, chléb",
+                price: "320\xA0Kč",
+                isSoup: false,
+            }
+        ],
+        [
+            {
+                amount: "-",
+                name: "Zeleninová polévka s kuskusem",
+                price: "39\xA0Kč",
+                isSoup: true,
+            },
+            {
+                amount: "-",
+                name: "Poutine (trhané vepřové, hranolky, sýr, čalamáda, pikantní omáčka)",
+                price: "190\xA0Kč",
+                isSoup: false,
+            }
+        ],
+        [
+            {
+                amount: "-",
+                name: "Hrachová polévka s uzeninou",
+                price: "39\xA0Kč",
+                isSoup: true,
+            },
+            {
+                amount: "-",
+                name: "Vepřový řízek z kotlety, domácí bramborový salát",
+                price: "170\xA0Kč",
+                isSoup: false,
+            }
+        ],
+        [
+            {
+                amount: "-",
+                name: "Cibulačka se sýrem",
+                price: "39\xA0Kč",
+                isSoup: true,
+            },
+            {
+                amount: "-",
+                name: "Burger z Chuck rollu, hranolky, tatarská omáčka",
+                price: "200\xA0Kč",
+                isSoup: false,
+            }
+        ],
+    ],
+    'senkSerikova': [
+        [
+            {
+                amount: "-",
+                name: "Drůbeží vývar s masem a nudlemi",
+                price: "45\xA0Kč",
+                isSoup: true,
+            },
+            {
+                amount: "-",
+                name: "Vepřová pečeně se zelím a houskovým knedlíkem",
+                price: "155\xA0Kč",
+                isSoup: false,
+            },
+            {
+                amount: "-",
+                name: "Špagety s kuřecím masem, špenátem a smetanou",
+                price: "145\xA0Kč",
+                isSoup: false,
+            },
+            {
+                amount: "-",
+                name: "Medailonky z vepřové panenky s fazolkami se slaninou, šťouchané brambory",
+                price: "185\xA0Kč",
+                isSoup: false,
+            }
+        ],
+        [
+            {
+                amount: "-",
+                name: "Mrkvová polévka se zázvorem a kokosovým mlékem",
+                price: "45\xA0Kč",
+                isSoup: true,
+            },
+            {
+                amount: "-",
+                name: "Hovězí po Burgundsku, bramborová kaše",
+                price: "155\xA0Kč",
+                isSoup: false,
+            }
+        ],
+        [
+            {
+                amount: "-",
+                name: "Hovězí vývar s játrovými knedlíčky",
+                price: "45\xA0Kč",
+                isSoup: true,
+            },
+            {
+                amount: "-",
+                name: "Kuřecí plátky na sušených rajčatech, bylinkách a česneku, bramborová kaše",
+                price: "155\xA0Kč",
+                isSoup: false,
+            }
+        ],
+        [
+            {
+                amount: "-",
+                name: "Kuřecí vývar s rýží",
+                price: "45\xA0Kč",
+                isSoup: true,
+            },
+            {
+                amount: "-",
+                name: "Rajská s plněnou paprikou, knedlík",
+                price: "170\xA0Kč",
+                isSoup: false,
+            }
+        ],
+        [
+            {
+                amount: "-",
+                name: "Mexická fazolová polévka",
+                price: "45\xA0Kč",
+                isSoup: true,
+            },
+            {
+                amount: "-",
+                name: "Ragú z trhané kachny, onsen vejce, soté ze špenátu a ředkvičky, bramborové pyré, lanýžová sůl, zelený olej",
+                price: "189\xA0Kč",
+                isSoup: false,
+            }
+        ],
+    ],
 }
 
 // Mockovací data pro Pizza day
@@ -1180,8 +1354,11 @@ const MOCK_PIZZA_LIST = [
     }
 ]
 
-export const getTodayMock = () => {
-    return '2023-05-31'; // středa
+/**
+ * Funkce vrací mock datu ve formátu YYYY-MM-DD
+ */
+export const getTodayMock = (): Date => {
+    return new Date('2025-01-10'); // pátek
 }
 
 export const getMenuSladovnickaMock = () => {
@@ -1196,6 +1373,14 @@ export const getMenuTechTowerMock = () => {
     return MOCK_DATA['techTower'];
 }
 
+export const getMenuZastavkaUmichalaMock = () => {
+    return MOCK_DATA['zastavkaUmichala'];
+}
+
+export const getMenuSenkSerikovaMock = () => {
+    return MOCK_DATA['senkSerikova'];
+}
+
 export const getPizzaListMock = () => {
     return MOCK_PIZZA_LIST;
 }

server/src/notifikace.ts

@@ -1,58 +1,58 @@
-/** Notifikace pro gotify*/
-import { ClientData, GotifyServer, NotififaceInput, NotifikaceData } from '../../types';
-import axios, { AxiosError } from 'axios';
+/** Notifikace */
+import {ClientData, Locations, NotififaceInput} from '../../types';
+import axios from 'axios';
 import dotenv from 'dotenv';
 import path from 'path';
 import { getToday } from "./service";
-import { formatDate, getUsersByLocation } from "./utils";
+import {formatDate, getUsersByLocation, getHumanTime} from "./utils";
 import getStorage from "./storage";
 
 const storage = getStorage();
 const ENVIRONMENT = process.env.NODE_ENV || 'production'
 dotenv.config({ path: path.resolve(__dirname, `../.env.${ENVIRONMENT}`) });
 
-const gotifyDataRaw = process.env.GOTIFY_SERVERS_AND_KEYS || "{}";
-const gotifyData: GotifyServer[] = JSON.parse(gotifyDataRaw);
-export const gotifyCall = async (data: NotififaceInput, gotifyServers?: GotifyServer[]): Promise<any[]> => {
-    if (!Array.isArray(gotifyServers)) {
-        return []
-    }
-    const urls = gotifyServers.flatMap(gotifyServer =>
-        gotifyServer.api_keys.map(apiKey => `${gotifyServer.server}/message?token=${apiKey}`));
-
-    const dataPayload = {
-        title: "Luncher",
-        message: `${data.udalost} - spustil:${data.user}`,
-        priority: 7,
-    };
-
-    const headers = { "Content-Type": "application/json" };
-
-    const promises = urls.map(url =>
-        axios.post(url, dataPayload, { headers }).then(response => {
-            response.data = {
-                success: true,
-                message: "Notifikace doručena",
-            };
-            return response;
-        }).catch(error => {
-            if (axios.isAxiosError(error)) {
-                const axiosError = error as AxiosError;
-                if (axiosError.response) {
-                    axiosError.response.data = {
-                        success: false,
-                        message: "fail",
-                    };
-                    console.log(error)
-                    return axiosError.response;
-                }
-            }
-            // Handle unknown error without a response
-            console.log(error, "unknown error");
-        })
-    );
-    return promises;
-};
+// const gotifyDataRaw = process.env.GOTIFY_SERVERS_AND_KEYS || "{}";
+// const gotifyData: GotifyServer[] = JSON.parse(gotifyDataRaw);
+// export const gotifyCall = async (data: NotififaceInput, gotifyServers?: GotifyServer[]): Promise<any[]> => {
+//     if (!Array.isArray(gotifyServers)) {
+//         return []
+//     }
+//     const urls = gotifyServers.flatMap(gotifyServer =>
+//         gotifyServer.api_keys.map(apiKey => `${gotifyServer.server}/message?token=${apiKey}`));
+//
+//     const dataPayload = {
+//         title: "Luncher",
+//         message: `${data.udalost} - spustil:${data.user}`,
+//         priority: 7,
+//     };
+//
+//     const headers = { "Content-Type": "application/json" };
+//
+//     const promises = urls.map(url =>
+//         axios.post(url, dataPayload, { headers }).then(response => {
+//             response.data = {
+//                 success: true,
+//                 message: "Notifikace doručena",
+//             };
+//             return response;
+//         }).catch(error => {
+//             if (axios.isAxiosError(error)) {
+//                 const axiosError = error as AxiosError;
+//                 if (axiosError.response) {
+//                     axiosError.response.data = {
+//                         success: false,
+//                         message: "fail",
+//                     };
+//                     console.log(error)
+//                     return axiosError.response;
+//                 }
+//             }
+//             // Handle unknown error without a response
+//             console.log(error, "unknown error");
+//         })
+//     );
+//     return promises;
+// };
 
 export const ntfyCall = async (data: NotififaceInput) => {
     const url = process.env.NTFY_HOST
@@ -72,10 +72,10 @@ export const ntfyCall = async (data: NotififaceInput) => {
     }
     const today = formatDate(getToday());
     let clientData: ClientData = await storage.getData(today);
-    const userByCLocation = getUsersByLocation(clientData.choices, data.user)
+    const usersByLocation = getUsersByLocation(clientData.choices, data.user)
 
     const token = Buffer.from(`${username}:${password}`, 'utf8').toString('base64');
-    const promises = userByCLocation.map(async user => {
+    const promises = usersByLocation.map(async user => {
         try {
             // Odstraníme mezery a diakritiku a převedeme na lowercase
             const topic = user.normalize('NFD').replace(' ', '').replace(/[\u0300-\u036f]/g, '').toLowerCase();
@@ -97,27 +97,64 @@ export const ntfyCall = async (data: NotififaceInput) => {
     return promises;
 
 }
+
+export const teamsCall = async (data: NotififaceInput) => {
+    const url = process.env.TEAMS_WEBHOOK_URL;
+    if (!url) {
+        console.log("TEAMS_WEBHOOK_URL není definován v env")
+        return
+    }
+    const title = data.udalost;
+    // const today = formatDate(getToday());
+    // let clientData: ClientData = await storage.getData(today);
+    // const usersByLocation = getUsersByLocation(clientData.choices, data.user)
+    let location = data.locationKey ? ` odcházíme do ${Locations[data.locationKey] ?? ''}` : ' jdeme na oběd';
+    const message = 'V ' + getHumanTime(getToday()) + location;
+    const card = {
+        '@type': 'MessageCard',
+        '@context': 'http://schema.org/extensions',
+        'themeColor': "0072C6", // light blue
+        summary: 'Summary description',
+        sections: [
+            {
+                activityTitle: title,
+                text: message,
+            },
+        ],
+    };
+
+    if (!url) {
+        console.log("TEAMS_WEBHOOK_URL není definován v env")
+        return
+    }
+
+    try {
+        const response = await axios.post(url, card, {
+            headers: {
+                'content-type': 'application/vnd.microsoft.teams.card.o365connector'
+            },
+        });
+        return `${response.status} - ${response.statusText}`;
+    } catch (err) {
+        return err;
+    }
+}
+
 /** Zavolá notifikace na všechny konfigurované způsoby notifikace, přetížení proměných na false pro jednotlivé způsoby je vypne*/
-export const callNotifikace = async ({ input, teams = true, gotify = false, ntfy = true }: NotifikaceData) => {
+export const callNotifikace = async (input: NotififaceInput) => {
     const notifications = [];
-    if (ntfy) {
-        const ntfyPromises = await ntfyCall(input);
-        if (ntfyPromises) {
-            notifications.push(...ntfyPromises);
-        }
-    }
-    /* Zatím není
-    if (teams) {
-         notifications.push(teamsCall(input));
-     }*/
 
-    // Add more notifications as necessary
-
-    //gotify bych řekl, že už je deprecated
-    if (gotify) {
-        const gotifyPromises = await gotifyCall(input, gotifyData);
-        notifications.push(...gotifyPromises);
+    const ntfyPromises = await ntfyCall(input);
+    if (ntfyPromises) {
+        notifications.push(...ntfyPromises);
     }
+    const teamsPromises = await teamsCall(input);
+    if (teamsPromises) {
+        notifications.push(teamsPromises);
+    }
+    // gotify bych řekl, že už je deprecated
+    // const gotifyPromises = await gotifyCall(input, gotifyData);
+    // notifications.push(...gotifyPromises);
 
     try {
         const results = await Promise.all(notifications);
@@ -126,4 +163,4 @@ export const callNotifikace = async ({ input, teams = true, gotify = false, ntfy
         console.error("Error in callNotifikace: ", error);
         // Handle the error as needed
     }
-};
+};

server/src/pizza.ts

@@ -52,7 +52,7 @@ export async function createPizzaDay(creator: string): Promise<ClientData> {
     const pizzaList = await getPizzaList();
     const data: ClientData = { pizzaDay: { state: PizzaDayState.CREATED, creator, orders: [] }, pizzaList, ...clientData };
     await storage.setData(today, data);
-    callNotifikace({ input: { udalost: UdalostEnum.ZAHAJENA_PIZZA, user: creator } })
+    callNotifikace({ udalost: UdalostEnum.ZAHAJENA_PIZZA, user: creator })
     return data;
 }
 
@@ -207,7 +207,7 @@ export async function finishPizzaOrder(login: string) {
     }
     clientData.pizzaDay.state = PizzaDayState.ORDERED;
     await storage.setData(today, clientData);
-    callNotifikace({ input: { udalost: UdalostEnum.OBJEDNANA_PIZZA, user: clientData?.pizzaDay?.creator } })
+    callNotifikace({ udalost: UdalostEnum.OBJEDNANA_PIZZA, user: clientData?.pizzaDay?.creator })
     return clientData;
 }
 

server/src/restaurants.ts

@@ -1,7 +1,8 @@
 import axios from "axios";
 import { load } from 'cheerio';
 import { Food } from "../../types";
-import { getMenuSladovnickaMock, getMenuTechTowerMock, getMenuUMotlikuMock } from "./mock";
+import {getMenuSladovnickaMock, getMenuTechTowerMock, getMenuUMotlikuMock, getMenuZastavkaUmichalaMock, getMenuSenkSerikovaMock} from "./mock";
+import {formatDate} from "./utils";
 
 // Fráze v názvech jídel, které naznačují že se jedná o polévku
 const SOUP_NAMES = [
@@ -13,9 +14,9 @@ const SOUP_NAMES = [
     'fazolová',
     'cuketový krém',
     'boršč',
-    'slepičí s',
-    'zeleninová s',
-    'hovězí s',
+    'slepičí s ',
+    'zeleninová s ',
+    'hovězí s ',
     'kachní kaldoun',
     'dršťková'
 ];
@@ -25,6 +26,8 @@ const DAYS_IN_WEEK = ['pondělí', 'úterý', 'středa', 'čtvrtek', 'pátek', '
 const SLADOVNICKA_URL = 'https://sladovnicka.unasplzenchutna.cz/cz/denni-nabidka';
 const U_MOTLIKU_URL = 'https://www.umotliku.cz/menu';
 const TECHTOWER_URL = 'https://www.equifarm.cz/restaurace-techtower';
+const ZASTAVKAUMICHALA_URL = 'https://www.zastavkaumichala.cz';
+const SENKSERIKOVA_URL = 'https://www.menicka.cz/6561-pivovarsky-senk-serikova.html';
 
 /**
  * Vrátí true, pokud předaný text obsahuje některé ze slov, které naznačuje, že se jedná o polévku.
@@ -326,4 +329,106 @@ export const getMenuTechTower = async (firstDayOfWeek: Date, mock: boolean = fal
         }
     }
     return result;
-}
+}
+
+/**
+ * Získá obědovou nabídku ZastavkaUmichala pro jeden týden.
+ *
+ * @param firstDayOfWeek první den v týdnu, pro který získat menu
+ * @param mock zda vrátit mock data
+ * @returns seznam jídel pro dané datum
+ */
+export const getMenuZastavkaUmichala = async (firstDayOfWeek: Date, mock: boolean = false): Promise<Food[][]> => {
+    if (mock) {
+        return getMenuZastavkaUmichalaMock();
+    }
+
+    const nowDate = new Date().getDate();
+    const headers = {
+        "Cookie": "_nss=1; PHPSESSID=9e37de17e0326b0942613d6e67a30e69",
+        "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/132.0.0.0 Safari/537.36",
+    };
+    const result: Food[][] = [];
+    for (let dayIndex = 0; dayIndex < 5; dayIndex++) {
+        const currentDate = new Date(firstDayOfWeek);
+        currentDate.setDate(firstDayOfWeek.getDate() + dayIndex);
+
+        if (currentDate.getDate() < nowDate || (currentDate.getDate() === nowDate && new Date().getHours() >= 14)) {
+            result[dayIndex] = [{
+                amount: undefined,
+                name: "Pro tento den není uveřejněna nabídka jídel",
+                price: "",
+                isSoup: false,
+            }];
+            continue;
+        } else {
+            const url = (currentDate.getDate() === nowDate) ?
+                ZASTAVKAUMICHALA_URL : ZASTAVKAUMICHALA_URL + '/?do=dailyMenu-changeDate&dailyMenu-dateString=' + formatDate(currentDate, 'DD.MM.YYYY');
+            const html = await axios.get(url, {
+                headers,
+            }).then(res => res.data).then(content => content);
+            const $ = load(html);
+
+            const currentDayFood: Food[] = [];
+            $('.foodsList li').each((index, element) => {
+                currentDayFood.push({
+                    amount: '-',
+                    name: sanitizeText($(element).contents().not('span').text()),
+                    price: sanitizeText($(element).find('span').text()),
+                    isSoup: (index === 0),
+                });
+            });
+            result[dayIndex] = currentDayFood;
+        }
+    }
+    return result;
+}
+
+/**
+ * Získá obědovou nabídku SenkSerikova pro jeden týden.
+ *
+ * @param firstDayOfWeek první den v týdnu, pro který získat menu
+ * @param mock zda vrátit mock data
+ * @returns seznam jídel pro dané datum
+ */
+export const getMenuSenkSerikova = async (firstDayOfWeek: Date, mock: boolean = false): Promise<Food[][]> => {
+    if (mock) {
+        return getMenuSenkSerikovaMock();
+    }
+
+    const decoder = new TextDecoder('windows-1250');
+    const html = await axios.get(SENKSERIKOVA_URL, {
+        responseType: 'arraybuffer',
+        responseEncoding: 'binary'
+    }).then(res => decoder.decode(new Uint8Array(res.data))).then(content => content);
+    const $ = load(html);
+
+    const nowDate = new Date().getDate();
+    const currentDate = new Date(firstDayOfWeek);
+    const result: Food[][] = [];
+    let dayIndex = 0;
+    while(currentDate.getDate() < nowDate) {
+        result[dayIndex] = [{
+            amount: undefined,
+            name: "Pro tento den není uveřejněna nabídka jídel",
+            price: "",
+            isSoup: false,
+        }];
+        dayIndex = dayIndex + 1;
+        currentDate.setDate(firstDayOfWeek.getDate() + dayIndex);
+    }
+    
+    $('.menicka').each((i, element) => {
+        const currentDayFood: Food[] = [];
+        $(element).find('.popup-gallery li').each((j, element) => {
+            currentDayFood.push({
+                amount: '-',
+                name: $(element).children('div.polozka').text(),
+                price: $(element).children('div.cena').text().replace(/ /g, '\xA0'),
+                isSoup: $(element).hasClass('polevka'),
+            });
+        });
+        result[dayIndex++] = currentDayFood;
+    });
+    return result;
+}

server/src/routes/foodRoutes.ts

@@ -4,7 +4,16 @@ import { addChoice, addVolatileData, getDateForWeekIndex, getToday, removeChoice
 import { getDayOfWeekIndex, parseToken } from "../utils";
 import { getWebsocket } from "../websocket";
 import { callNotifikace } from "../notifikace";
-import { AddChoiceRequest, ChangeDepartureTimeRequest, IDayIndex, RemoveChoiceRequest, RemoveChoicesRequest, UdalostEnum, UpdateNoteRequest } from "../../../types";
+import {
+    AddChoiceRequest,
+    ChangeDepartureTimeRequest,
+    IDayIndex,
+    JdemeObedRequest,
+    RemoveChoiceRequest,
+    RemoveChoicesRequest,
+    UdalostEnum,
+    UpdateNoteRequest
+} from "../../../types";
 
 /**
  * Ověří a vrátí index dne v týdnu z požadavku, za předpokladu, že byl předán, a je zároveň
@@ -33,24 +42,21 @@ const router = express.Router();
 router.post("/addChoice", async (req: Request<{}, any, AddChoiceRequest>, res, next) => {
     const login = getLogin(parseToken(req));
     const trusted = getTrusted(parseToken(req));
-    if (req.body.locationIndex > -1) {
-        let date = undefined;
-        if (req.body.dayIndex != null) {
-            let dayIndex;
-            try {
-                dayIndex = parseValidateFutureDayIndex(req);
-            } catch (e: any) {
-                return res.status(400).json({ error: e.message });
-            }
-            date = getDateForWeekIndex(dayIndex);
-        }
+    let date = undefined;
+    if (req.body.dayIndex != null) {
+        let dayIndex;
         try {
-            const data = await addChoice(login, trusted, req.body.locationIndex, req.body.foodIndex, date);
-            getWebsocket().emit("message", await addVolatileData(data));
-            return res.status(200).json(data);
-        } catch (e: any) { next(e) }
+            dayIndex = parseValidateFutureDayIndex(req);
+        } catch (e: any) {
+            return res.status(400).json({ error: e.message });
+        }
+        date = getDateForWeekIndex(dayIndex);
     }
-    return res.status(400); // TODO přidat popis chyby
+    try {
+        const data = await addChoice(login, trusted, req.body.locationKey, req.body.foodIndex, date);
+        getWebsocket().emit("message", await addVolatileData(data));
+        return res.status(200).json(data);
+    } catch (e: any) { next(e) }
 });
 
 router.post("/removeChoices", async (req: Request<{}, any, RemoveChoicesRequest>, res, next) => {
@@ -67,7 +73,7 @@ router.post("/removeChoices", async (req: Request<{}, any, RemoveChoicesRequest>
         date = getDateForWeekIndex(dayIndex);
     }
     try {
-        const data = await removeChoices(login, trusted, req.body.locationIndex, date);
+        const data = await removeChoices(login, trusted, req.body.locationKey, date);
         getWebsocket().emit("message", await addVolatileData(data));
         res.status(200).json(data);
     } catch (e: any) { next(e) }
@@ -87,7 +93,7 @@ router.post("/removeChoice", async (req: Request<{}, any, RemoveChoiceRequest>,
         date = getDateForWeekIndex(dayIndex);
     }
     try {
-        const data = await removeChoice(login, trusted, req.body.locationIndex, req.body.foodIndex, date);
+        const data = await removeChoice(login, trusted, req.body.locationKey, req.body.foodIndex, date);
         getWebsocket().emit("message", await addVolatileData(data));
         res.status(200).json(data);
     } catch (e: any) { next(e) }
@@ -136,10 +142,10 @@ router.post("/changeDepartureTime", async (req: Request<{}, any, ChangeDeparture
     } catch (e: any) { next(e) }
 });
 
-router.post("/jdemeObed", async (req, res, next) => {
+router.post("/jdemeObed", async (req: Request<{}, any, JdemeObedRequest>, res, next) => {
     const login = getLogin(parseToken(req));
     try {
-        await callNotifikace({ input: { user: login, udalost: UdalostEnum.JDEME_OBED }, gotify: false })
+        await callNotifikace({ user: login, udalost: UdalostEnum.JDEME_OBED, locationKey: req.body.locationKey });
         res.status(200).json({});
     } catch (e: any) { next(e) }
 });

server/src/service.ts

@@ -1,7 +1,7 @@
-import { InsufficientPermissions, formatDate, getDayOfWeekIndex, getFirstWorkDayOfWeek, getHumanDate, getHumanTime, getIsWeekend, getLastWorkDayOfWeek, getWeekNumber } from "./utils";
-import { ClientData, Locations, Restaurants, DayMenu, DepartureTime, DayData, WeekMenu } from "../../types";
+import { InsufficientPermissions, formatDate, getDayOfWeekIndex, getFirstWorkDayOfWeek, getHumanDate, getIsWeekend, getWeekNumber } from "./utils";
+import { ClientData, Restaurants, DayMenu, DepartureTime, DayData, WeekMenu, LocationKey } from "../../types";
 import getStorage from "./storage";
-import { getMenuSladovnicka, getMenuTechTower, getMenuUMotliku } from "./restaurants";
+import { getMenuSladovnicka, getMenuTechTower, getMenuUMotliku, getMenuZastavkaUmichala, getMenuSenkSerikova } from "./restaurants";
 import { getTodayMock } from "./mock";
 
 const storage = getStorage();
@@ -10,7 +10,7 @@ const MENU_PREFIX = 'menu';
 /** Vrátí dnešní datum, případně fiktivní datum pro účely vývoje a testování. */
 export function getToday(): Date {
     if (process.env.MOCK_DATA === 'true') {
-        return new Date(getTodayMock());
+        return getTodayMock();
     }
     return new Date();
 }
@@ -61,6 +61,8 @@ export async function getData(date?: Date): Promise<ClientData> {
         [Restaurants.SLADOVNICKA]: await getRestaurantMenu(Restaurants.SLADOVNICKA, date),
         // [Restaurants.UMOTLIKU]: await getRestaurantMenu(Restaurants.UMOTLIKU, date),
         [Restaurants.TECHTOWER]: await getRestaurantMenu(Restaurants.TECHTOWER, date),
+        [Restaurants.ZASTAVKAUMICHALA]: await getRestaurantMenu(Restaurants.ZASTAVKAUMICHALA, date),
+        [Restaurants.SENKSERIKOVA]: await getRestaurantMenu(Restaurants.SENKSERIKOVA, date),
     }
     clientData = await addVolatileData(clientData);
     return clientData;
@@ -168,6 +170,32 @@ export async function getRestaurantMenu(restaurant: Restaurants, date?: Date): P
                 } catch (e: any) {
                     console.error("Selhalo načtení jídel pro podnik TechTower", e);
                 }
+            case Restaurants.ZASTAVKAUMICHALA:
+                try {
+                    const zastavkaUmichalaFood = await getMenuZastavkaUmichala(firstDay, mock);
+                    for (let i = 0; i < zastavkaUmichalaFood.length; i++) {
+                        menus[i][restaurant]!.food = zastavkaUmichalaFood[i];
+                        if (zastavkaUmichalaFood[i]?.length === 1 && zastavkaUmichalaFood[i][0].name === 'Pro tento den není uveřejněna nabídka jídel.') {
+                            menus[i][restaurant]!.closed = true;
+                        }
+                    }
+                    break;
+                } catch (e: any) {
+                    console.error("Selhalo načtení jídel pro podnik Zastávka u Michala", e);
+                }
+            case Restaurants.SENKSERIKOVA:
+                try {
+                    const senkSerikovaFood = await getMenuSenkSerikova(firstDay, mock);
+                    for (let i = 0; i < senkSerikovaFood.length; i++) {
+                        menus[i][restaurant]!.food = senkSerikovaFood[i];
+                        if (senkSerikovaFood[i]?.length === 1 && senkSerikovaFood[i][0].name === 'Pro tento den nebylo zadáno menu.') {
+                            menus[i][restaurant]!.closed = true;
+                        }
+                    }
+                    break;
+                } catch (e: any) {
+                    console.error("Selhalo načtení jídel pro podnik Pivovarský šenk Šeříková", e);
+                }
         }
         await storage.setData(getMenuKey(usedDate), menus);
     }
@@ -192,19 +220,19 @@ export async function initIfNeeded(date?: Date) {
  * 
  * @param login login uživatele
  * @param trusted příznak, zda se jedná o ověřeného uživatele
- * @param locationIndex vybrané "umístění"
+ * @param locationKey vybrané "umístění"
  * @param date datum, ke kterému se volba vztahuje
  * @returns 
  */
-export async function removeChoices(login: string, trusted: boolean, locationIndex: number, date?: Date) {
+export async function removeChoices(login: string, trusted: boolean, locationKey: LocationKey, date?: Date) {
     const selectedDay = formatDate(date ?? getToday());
     let data: DayData = await storage.getData(selectedDay);
     validateTrusted(data, login, trusted);
-    if (locationIndex in data.choices) {
-        if (login in data.choices[locationIndex]) {
-            delete data.choices[locationIndex][login]
-            if (Object.keys(data.choices[locationIndex]).length === 0) {
-                delete data.choices[locationIndex]
+    if (locationKey in data.choices) {
+        if (data.choices[locationKey] && login in data.choices[locationKey]) {
+            delete data.choices[locationKey][login]
+            if (Object.keys(data.choices[locationKey]).length === 0) {
+                delete data.choices[locationKey]
             }
             await storage.setData(selectedDay, data);
         }
@@ -218,20 +246,20 @@ export async function removeChoices(login: string, trusted: boolean, locationInd
  * 
  * @param login login uživatele
  * @param trusted příznak, zda se jedná o ověřeného uživatele
- * @param locationIndex vybrané "umístění"
+ * @param locationKey vybrané "umístění"
  * @param foodIndex index jídla v jídelním lístku daného umístění, pokud existuje
  * @param date datum, ke kterému se volba vztahuje
  * @returns 
  */
-export async function removeChoice(login: string, trusted: boolean, locationIndex: number, foodIndex: number, date?: Date) {
+export async function removeChoice(login: string, trusted: boolean, locationKey: LocationKey, foodIndex: number, date?: Date) {
     const selectedDay = formatDate(date ?? getToday());
     let data: DayData = await storage.getData(selectedDay);
     validateTrusted(data, login, trusted);
-    if (locationIndex in data.choices) {
-        if (login in data.choices[locationIndex]) {
-            const index = data.choices[locationIndex][login].options.indexOf(foodIndex);
+    if (locationKey in data.choices) {
+        if (data.choices[locationKey] && login in data.choices[locationKey]) {
+            const index = data.choices[locationKey][login].options.indexOf(foodIndex);
             if (index > -1) {
-                data.choices[locationIndex][login].options.splice(index, 1)
+                data.choices[locationKey][login].options.splice(index, 1)
                 await storage.setData(selectedDay, data);
             }
         }
@@ -240,17 +268,23 @@ export async function removeChoice(login: string, trusted: boolean, locationInde
 }
 
 /**
- * Odstraní kompletně volbu uživatele.
+ * Odstraní kompletně volbu uživatele, vyjma ignoredLocationKey (pokud byla předána a existuje).
  * 
  * @param login login uživatele
+ * @param date datum, ke kterému se volby vztahují
+ * @param ignoredLocationKey volba, která nebude odstraněna, pokud existuje
  */
-async function removeChoiceIfPresent(login: string, date: string) {
+async function removeChoiceIfPresent(login: string, date: string, ignoredLocationKey?: LocationKey) {
     let data: DayData = await storage.getData(date);
     for (const key of Object.keys(data.choices)) {
-        if (login in data.choices[key]) {
-            delete data.choices[key][login];
-            if (Object.keys(data.choices[key]).length === 0) {
-                delete data.choices[key];
+        const locationKey = key as LocationKey;
+        if (ignoredLocationKey != null && ignoredLocationKey == locationKey) {
+            continue;
+        }
+        if (data.choices[locationKey] && login in data.choices[locationKey]) {
+            delete data.choices[locationKey][login];
+            if (Object.keys(data.choices[locationKey]).length === 0) {
+                delete data.choices[locationKey];
             }
             await storage.setData(date, data);
         }
@@ -285,13 +319,13 @@ function validateTrusted(data: ClientData, login: string, trusted: boolean) {
  * 
  * @param login login uživatele
  * @param trusted příznak, zda se jedná o ověřeného uživatele
- * @param locationIndex vybrané "umístění"
+ * @param locationKey vybrané "umístění"
  * @param foodIndex volitelný index jídla v daném umístění
  * @param trusted příznak, zda se jedná o ověřeného uživatele
  * @param date datum, ke kterému se volba vztahuje
  * @returns aktuální data
  */
-export async function addChoice(login: string, trusted: boolean, locationIndex: number, foodIndex?: number, date?: Date) {
+export async function addChoice(login: string, trusted: boolean, locationKey: LocationKey, foodIndex?: number, date?: Date) {
     const usedDate = date ?? getToday();
     await initIfNeeded(usedDate);
     const selectedDate = formatDate(usedDate);
@@ -300,18 +334,25 @@ export async function addChoice(login: string, trusted: boolean, locationIndex:
     // Pokud měníme pouze lokaci, mažeme případné předchozí
     if (foodIndex == null) {
         data = await removeChoiceIfPresent(login, selectedDate);
+    } else {
+        // Mažeme případné ostatní volby (měla by být maximálně jedna)
+        removeChoiceIfPresent(login, selectedDate, locationKey);
     }
-    if (!(locationIndex in data.choices)) {
-        data.choices[locationIndex] = {};
+    // TODO vytáhnout inicializaci "prázdné struktury" do vlastní funkce
+    if (!(data.choices[locationKey])) {
+        data.choices[locationKey] = {}
     }
-    if (!(login in data.choices[locationIndex])) {
-        data.choices[locationIndex][login] = {
+    if (!(login in data.choices[locationKey])) {
+        if (!data.choices[locationKey]) {
+            data.choices[locationKey] = {}
+        }
+        data.choices[locationKey][login] = {
             trusted,
             options: []
         };
     }
-    if (foodIndex != null && !data.choices[locationIndex][login].options.includes(foodIndex)) {
-        data.choices[locationIndex][login].options.push(foodIndex);
+    if (foodIndex != null && !data.choices[locationKey][login].options.includes(foodIndex)) {
+        data.choices[locationKey][login].options.push(foodIndex);
     }
     await storage.setData(selectedDate, data);
     return data;

server/src/storage/json.ts

@@ -1,8 +1,17 @@
 import JSONdb from 'simple-json-db';
 import { StorageInterface } from "./StorageInterface";
+import * as fs from 'fs';
+import * as path from 'path';
 
-const db = new JSONdb('./data.json');
+const dbPath = path.resolve(__dirname, '../../data/db.json');
+const dbDir = path.dirname(dbPath);
 
+// Zajistěte, že adresář existuje
+if (!fs.existsSync(dbDir)) {
+    fs.mkdirSync(dbDir, { recursive: true });
+}
+
+const db = new JSONdb(dbPath);
 /**
  * Implementace úložiště používající JSON soubor.
  */

server/src/utils.ts

@@ -1,11 +1,13 @@
-import { Choices } from "../../types";
+import {Choices, LocationKey } from "../../types";
 
 /** Vrátí datum v ISO formátu. */
-export function formatDate(date: Date) {
-    let currentDay = String(date.getDate()).padStart(2, '0');
-    let currentMonth = String(date.getMonth() + 1).padStart(2, "0");
-    let currentYear = date.getFullYear();
-    return `${currentYear}-${currentMonth}-${currentDay}`;
+export function formatDate(date: Date, format?: string) {
+    let day = String(date.getDate()).padStart(2, '0');
+    let month = String(date.getMonth() + 1).padStart(2, "0");
+    let year = String(date.getFullYear());
+
+    const f = (format === undefined) ? 'YYYY-MM-DD' : format;
+    return f.replace('DD', day).replace('MM', month).replace('YYYY', year);
 }
 
 /** Vrátí human-readable reprezentaci předaného data pro zobrazení. */
@@ -110,19 +112,19 @@ export const checkBodyParams = (req: any, paramNames: string[]) => {
 // TODO umístit do samostatného souboru
 export class InsufficientPermissions extends Error { }
 
-export const getUsersByLocation = (data: Choices, login: string): string[] => {
+export const getUsersByLocation = (choices: Choices, login: string): string[] => {
     const result: string[] = [];
 
-    for (const location in data) {
-        if (data.hasOwnProperty(location)) {
-            if (data[location][login]) {
-                for (const username in data[location]) {
-                    if (data[location].hasOwnProperty(username)) {
-                        result.push(username);
-                    }
+    for (const location of Object.entries(choices)) {
+        const locationKey = location[0] as LocationKey;
+        const locationValue = location[1];
+        if (locationValue[login]) {
+            for (const username in choices[locationKey]) {
+                if (choices[locationKey].hasOwnProperty(username)) {
+                    result.push(username);
                 }
-                break;
             }
+            break;
         }
     }
 

types/RequestTypes.ts

@@ -1,23 +1,25 @@
-import { FeatureRequest, PizzaOrder } from "./Types";
+import { FeatureRequest, LocationKey, PizzaOrder } from "./Types";
+
+export type ILocationKey = {
+    locationKey: LocationKey,
+}
 
 export type IDayIndex = {
     dayIndex?: number,
 }
 
-export type AddChoiceRequest = IDayIndex & {
-    locationIndex: number,
+export type AddChoiceRequest = IDayIndex & ILocationKey & {
     foodIndex?: number,
 }
 
-export type RemoveChoicesRequest = IDayIndex & {
-    locationIndex: number,
-}
+export type RemoveChoicesRequest = IDayIndex & ILocationKey;
 
-export type RemoveChoiceRequest = IDayIndex & {
-    locationIndex: number,
+export type RemoveChoiceRequest = IDayIndex & ILocationKey & {
     foodIndex: number,
 }
 
+export type JdemeObedRequest = ILocationKey;
+
 export type UpdateNoteRequest = IDayIndex & {
     note?: string,
 }

types/Types.ts

@@ -3,6 +3,8 @@ export enum Restaurants {
     SLADOVNICKA = 'sladovnicka',
     // UMOTLIKU = 'uMotliku',
     TECHTOWER = 'techTower',
+    ZASTAVKAUMICHALA = 'zastavkaUmichala',
+    SENKSERIKOVA = 'senkSerikova',
 }
 
 export type FoodChoices = {
@@ -12,10 +14,11 @@ export type FoodChoices = {
     note?: string,
 }
 
+// TODO okomentovat / rozdělit
 export type Choices = {
-    [location: string]: {
+    [location in LocationKey]?: {
         [login: string]: FoodChoices
-    },
+    }
 }
 
 /** Velikost konkrétní pizzy */
@@ -88,7 +91,7 @@ export type DayData = {
 }
 
 /** Veškerá data pro zobrazení na klientovi. */
-export type ClientData extends DayData = {
+export type ClientData = DayData & {
     todayWeekIndex?: number, // index dnešního dne v týdnu (0-6)
 }
 
@@ -108,10 +111,13 @@ export type Food = {
 }
 
 // TODO tohle je dost špatné pojmenování, vzhledem k tomu co to obsahuje
+// TODO pokud by se použilo ovládáni výběru obědu kliknutím, pak bych restaurace z tohoto výčtu vyhodil
 export enum Locations {
     SLADOVNICKA = 'Sladovnická',
     // UMOTLIKU = 'U Motlíků',
     TECHTOWER = 'TechTower',
+    ZASTAVKAUMICHALA = 'Zastávka u Michala',
+    SENKSERIKOVA = 'Pivovarský šenk Šeříková',
     SPSE = 'SPŠE',
     PIZZA = 'Pizza day',
     OBJEDNAVAM = 'Budu objednávat',
@@ -119,24 +125,21 @@ export enum Locations {
     ROZHODUJI = 'Rozhoduji se',
 }
 
+// TODO totéž
+export type LocationKey = keyof typeof Locations;
+
 export enum UdalostEnum {
     ZAHAJENA_PIZZA = "Zahájen pizza day",
     OBJEDNANA_PIZZA = "Objednána pizza",
-    JDEME_OBED = "Jdeme oběd",
+    JDEME_OBED = "Jdeme na oběd",
 }
 
 export type NotififaceInput = {
+    locationKey?: LocationKey,
     udalost: UdalostEnum,
     user: string,
 }
 
-export type NotifikaceData = {
-    input: NotififaceInput,
-    gotify?: boolean,
-    teams?: boolean,
-    ntfy?: boolean,
-}
-
 export type GotifyServer = {
     server: string;
     api_keys: string[];