Compare commits
30 Commits
d91c8db49c
..
master
| Author | SHA1 | Date | |
|---|---|---|---|
| c404a3a03b | |||
| 84b95c6c70 | |||
|
9152425d2b
|
|||
|
b42b051e6f
|
|||
|
88b9e20e2d
|
|||
|
cc09ddbd2c
|
|||
| 491ec25b52 | |||
| 1df21edc1a | |||
| df5423511f | |||
|
17132d4124
|
|||
|
f28f127a92
|
|||
|
fb84bff687
|
|||
|
c85842267a
|
|||
|
c2bbf7ea60
|
|||
|
318d188495
|
|||
|
a26d6cf85c
|
|||
|
640c7ed41d
|
|||
|
a166634db8
|
|||
| 916766450a | |||
| 5e596c3b99 | |||
| 3ba5fdd086 | |||
| 03f4e438a3 | |||
| b591411d10 | |||
|
8a588cf486
|
|||
|
0e4dc061b8
|
|||
|
7fd3ba0fc4
|
|||
| 94b8f0a452 | |||
| 3e6ecd4e6a | |||
| f12dc7b562 | |||
| 8aef00ab05 |
@@ -4,3 +4,6 @@ types/gen
|
||||
.mcp.json
|
||||
.claude/settings.local.json
|
||||
server/public/
|
||||
.claude/*.lock
|
||||
.claude/worktrees
|
||||
.playwright-mcp
|
||||
Vendored
+32
@@ -0,0 +1,32 @@
|
||||
{
|
||||
"version": "0.2.0",
|
||||
"configurations": [
|
||||
{
|
||||
"name": "Server (ts-node, debug)",
|
||||
"type": "node",
|
||||
"request": "launch",
|
||||
"cwd": "${workspaceFolder}/server",
|
||||
"runtimeArgs": ["-r", "ts-node/register"],
|
||||
"program": "${workspaceFolder}/server/src/index.ts",
|
||||
"env": { "NODE_ENV": "development" },
|
||||
"console": "integratedTerminal",
|
||||
"skipFiles": ["<node_internals>/**"],
|
||||
"preLaunchTask": "types: openapi-ts"
|
||||
},
|
||||
{
|
||||
"name": "Client (vite + Edge)",
|
||||
"type": "msedge",
|
||||
"request": "launch",
|
||||
"url": "http://localhost:3000",
|
||||
"webRoot": "${workspaceFolder}/client",
|
||||
"preLaunchTask": "client: vite"
|
||||
}
|
||||
],
|
||||
"compounds": [
|
||||
{
|
||||
"name": "Dev: server + client",
|
||||
"configurations": ["Server (ts-node, debug)", "Client (vite + Edge)"],
|
||||
"stopAll": true
|
||||
}
|
||||
]
|
||||
}
|
||||
+1
-1
@@ -76,7 +76,7 @@ WORKDIR /app
|
||||
# Export /data/db.json do složky /data
|
||||
VOLUME ["/data"]
|
||||
|
||||
EXPOSE 3000
|
||||
EXPOSE 3001
|
||||
|
||||
CMD [ "node", "./server/src/index.js" ]
|
||||
|
||||
|
||||
@@ -1,4 +1,9 @@
|
||||
# TODO
|
||||
|
||||
## HA / multi-replica follow-ups
|
||||
- [ ] `foodRoutes.ts` per-pod rate limiter (`rateLimits` map) — s více replikami může uživatel překročit limit ~N× rychleji; přesunout do Redis (např. `INCR` + `EXPIRE`)
|
||||
- [ ] `easterEggRoutes.ts` — náhodně generované URL easter eggů jsou per-pod; URL funguje pouze na podu, který ji vygeneroval; zvážit deterministické seedy nebo sdílení přes Redis
|
||||
- [ ] `service.ts` — komplexní víceúrovňové funkce (`addChoice`, `removeChoiceIfPresent`) provádějí více po sobě jdoucích zápisů do stejného Redis klíče; pro plnou atomicitu je potřeba per-klíčový distribuovaný zámek (Redlock nebo `SET NX EX`) nebo sloučení logiky do jednoho `updateData` volání
|
||||
- [ ] HTTP_REMOTE_TRUSTED_IPS se nikde nevalidují, hlavičky jsou přijímány odkudkoli
|
||||
- [ ] V případě zapnutí přihlašování přes trusted headers nefunguje standardní přihlášení (nevrátí žádnou odpověď)
|
||||
- [ ] Nemělo by se jít dostat na přihlašovací formulář (měla by tam být nanejvýš hláška nebo přesměrování)
|
||||
|
||||
@@ -18,6 +18,7 @@
|
||||
"bootstrap": "^5.3.8",
|
||||
"react": "^19.2.0",
|
||||
"react-bootstrap": "^2.10.10",
|
||||
"react-datepicker": "^9.1.0",
|
||||
"react-dom": "^19.2.0",
|
||||
"react-jwt": "^1.3.0",
|
||||
"react-modal": "^3.16.3",
|
||||
|
||||
@@ -226,6 +226,7 @@ body {
|
||||
&:hover svg {
|
||||
transform: rotate(15deg);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// ============================================
|
||||
@@ -278,6 +279,105 @@ body {
|
||||
}
|
||||
}
|
||||
|
||||
// Varianta navigace mezi dny na stránce objednávání – šipky kolem date pickeru
|
||||
.order-day-navigator {
|
||||
margin-bottom: 16px;
|
||||
gap: 16px;
|
||||
|
||||
// react-datepicker obaluje input do wrapperu – necháme ho zabrat jen potřebnou šířku
|
||||
.react-datepicker-wrapper {
|
||||
width: auto;
|
||||
}
|
||||
|
||||
.order-date-input {
|
||||
width: 160px;
|
||||
cursor: pointer;
|
||||
}
|
||||
}
|
||||
|
||||
// Zvýraznění dnů, ve kterých existuje alespoň jedna objednávka – tečka pod číslem dne
|
||||
.react-datepicker__day.luncher-order-day {
|
||||
position: relative;
|
||||
font-weight: 700;
|
||||
|
||||
&::after {
|
||||
content: "";
|
||||
position: absolute;
|
||||
left: 50%;
|
||||
bottom: 2px;
|
||||
transform: translateX(-50%);
|
||||
width: 5px;
|
||||
height: 5px;
|
||||
border-radius: 50%;
|
||||
background: var(--luncher-primary, #0d6efd);
|
||||
}
|
||||
|
||||
// U vybraného dne (tmavé pozadí) je tečka světlá, aby byla vidět
|
||||
&.react-datepicker__day--selected::after,
|
||||
&.react-datepicker__day--keyboard-selected::after {
|
||||
background: #fff;
|
||||
}
|
||||
}
|
||||
|
||||
// Vybraný den používá akcentovou barvu aplikace (v obou režimech), místo výchozí modré
|
||||
.react-datepicker__day--selected,
|
||||
.react-datepicker__day--keyboard-selected {
|
||||
background-color: var(--luncher-primary);
|
||||
color: #fff;
|
||||
|
||||
&:hover {
|
||||
background-color: var(--luncher-primary-hover);
|
||||
}
|
||||
}
|
||||
|
||||
// Tmavý režim kalendáře (react-datepicker) – navázáno na CSS proměnné motivu
|
||||
[data-bs-theme="dark"] {
|
||||
.react-datepicker {
|
||||
background-color: var(--luncher-bg-card);
|
||||
border-color: var(--luncher-border);
|
||||
color: var(--luncher-text);
|
||||
}
|
||||
|
||||
.react-datepicker__header {
|
||||
background-color: var(--luncher-bg-hover);
|
||||
border-bottom-color: var(--luncher-border);
|
||||
}
|
||||
|
||||
.react-datepicker__current-month,
|
||||
.react-datepicker__day-name,
|
||||
.react-datepicker__day,
|
||||
.react-datepicker-year-header {
|
||||
color: var(--luncher-text);
|
||||
}
|
||||
|
||||
.react-datepicker__day:hover,
|
||||
.react-datepicker__month-text:hover {
|
||||
background-color: var(--luncher-bg-hover);
|
||||
}
|
||||
|
||||
.react-datepicker__day--today {
|
||||
color: var(--luncher-primary);
|
||||
}
|
||||
|
||||
.react-datepicker__day--disabled,
|
||||
.react-datepicker__day--outside-month {
|
||||
color: var(--luncher-text-muted);
|
||||
}
|
||||
|
||||
// Šipky pro přepínání měsíců
|
||||
.react-datepicker__navigation-icon::before {
|
||||
border-color: var(--luncher-text-secondary);
|
||||
}
|
||||
|
||||
// Špička popoveru (SVG) míří do hlavičky – sladíme barvy.
|
||||
// !important kvůli vyšší specificitě knihovního pravidla [data-placement].
|
||||
.react-datepicker__triangle {
|
||||
fill: var(--luncher-bg-hover) !important;
|
||||
color: var(--luncher-bg-hover) !important;
|
||||
stroke: var(--luncher-border) !important;
|
||||
}
|
||||
}
|
||||
|
||||
// ============================================
|
||||
// FOOD TABLES - CARD STYLE
|
||||
// ============================================
|
||||
|
||||
+32
-38
@@ -13,13 +13,15 @@ import './App.scss';
|
||||
import { faCircleCheck, faNoteSticky, faTrashCan, faComment } from '@fortawesome/free-regular-svg-icons';
|
||||
import { useSettings } from './context/settings';
|
||||
import Footer from './components/Footer';
|
||||
import { faBasketShopping, faChainBroken, faChevronLeft, faChevronRight, faGear, faMoneyBillTransfer, faSatelliteDish, faSearch, faTriangleExclamation } from '@fortawesome/free-solid-svg-icons';
|
||||
import { faArrowUpRightFromSquare, faBasketShopping, faChainBroken, faChevronLeft, faChevronRight, faGear, faMoneyBillTransfer, faSatelliteDish, faSearch, faTriangleExclamation } from '@fortawesome/free-solid-svg-icons';
|
||||
import { useNavigate } from 'react-router-dom';
|
||||
import Loader from './components/Loader';
|
||||
import { getHumanDateTime, isInTheFuture, formatDateString } from './Utils';
|
||||
import { getHumanDateTime, isInTheFuture } from './Utils';
|
||||
import NoteModal from './components/modals/NoteModal';
|
||||
import PayForAllModal from './components/modals/PayForAllModal';
|
||||
import PendingPayments from './components/PendingPayments';
|
||||
import { useEasterEgg } from './context/eggs';
|
||||
import { ClientData, Food, MealSlot, PendingQr, PizzaOrder, DepartureTime, PizzaDayState, Restaurant, RestaurantDayMenu, RestaurantDayMenuMap, LunchChoice, LocationLunchChoicesMap, UserLunchChoice, PizzaVariant, getData, getEasterEggImage, addPizza, removePizza, updatePizzaDayNote, createPizzaDay, deletePizzaDay, lockPizzaDay, unlockPizzaDay, finishOrder, finishDelivery, addChoice, jdemeObed, removeChoices, removeChoice, updateNote, changeDepartureTime, setBuyer, dismissQr, generateQr } from '../../types';
|
||||
import { ClientData, Food, MealSlot, PendingQr, PizzaOrder, DepartureTime, PizzaDayState, Restaurant, RestaurantDayMenu, RestaurantDayMenuMap, LunchChoice, LocationLunchChoicesMap, UserLunchChoice, PizzaVariant, getData, getEasterEggImage, addPizza, removePizza, updatePizzaDayNote, createPizzaDay, deletePizzaDay, lockPizzaDay, unlockPizzaDay, finishOrder, finishDelivery, addChoice, jdemeObed, removeChoices, removeChoice, updateNote, changeDepartureTime, setBuyer, generateQr } from '../../types';
|
||||
import { getLunchChoiceName } from './enums';
|
||||
// import FallingLeaves, { LEAF_PRESETS, LEAF_COLOR_THEMES } from './FallingLeaves';
|
||||
// import './FallingLeaves.scss';
|
||||
@@ -59,6 +61,7 @@ const EASTER_EGG_DEFAULT_DURATION = 0.75;
|
||||
function App() {
|
||||
const auth = useAuth();
|
||||
const settings = useSettings();
|
||||
const navigate = useNavigate();
|
||||
const [easterEgg, _] = useEasterEgg(auth);
|
||||
const [isConnected, setIsConnected] = useState<boolean>(false);
|
||||
const [data, setData] = useState<ClientData>();
|
||||
@@ -151,6 +154,21 @@ function App() {
|
||||
}
|
||||
}, [auth?.login, socket]);
|
||||
|
||||
// Po znovupřipojení socketu znovu vstoupit do místnosti a obnovit data
|
||||
useEffect(() => {
|
||||
const onReconnect = () => {
|
||||
if (auth?.login) socket.emit('join', auth.login);
|
||||
getData({ query: { dayIndex: dayIndexRef.current } }).then(response => {
|
||||
if (response.data) {
|
||||
setData(response.data);
|
||||
setFood(response.data.menus);
|
||||
}
|
||||
});
|
||||
};
|
||||
socket.io.on('reconnect', onReconnect);
|
||||
return () => { socket.io.off('reconnect', onReconnect); };
|
||||
}, [socket, auth?.login]);
|
||||
|
||||
useEffect(() => {
|
||||
if (!auth?.login || !data?.choices) {
|
||||
return
|
||||
@@ -449,7 +467,7 @@ function App() {
|
||||
data.pizzaList?.forEach((pizza, index) => {
|
||||
const group: SelectSearchOption = { name: pizza.name, type: "group", items: [] }
|
||||
pizza.sizes.forEach((size, sizeIndex) => {
|
||||
const name = `${size.size} (${size.price} Kč)`;
|
||||
const name = `${size.size} (${size.price / 100} Kč)`;
|
||||
const value = `pizza|${index}|${sizeIndex}`;
|
||||
group.items?.push({ name, value });
|
||||
})
|
||||
@@ -458,7 +476,7 @@ function App() {
|
||||
if (data.salatList?.length) {
|
||||
const salatGroup: SelectSearchOption = { name: "Saláty", type: "group", items: [] }
|
||||
data.salatList.forEach((salat, index) => {
|
||||
salatGroup.items?.push({ name: `${salat.name} (${salat.price} Kč)`, value: `salat|${index}` });
|
||||
salatGroup.items?.push({ name: `${salat.name} (${salat.price / 100} Kč)`, value: `salat|${index}` });
|
||||
});
|
||||
suggestions.push(salatGroup);
|
||||
}
|
||||
@@ -732,6 +750,9 @@ function App() {
|
||||
markAsBuyer();
|
||||
}} icon={faBasketShopping} className={isBuyer ? 'buyer-icon' : 'action-icon'} style={{ cursor: 'pointer' }} />
|
||||
</span>}
|
||||
{login === auth.login && locationKey === LunchChoice.OBJEDNAVAM && <span title='Přejít na stránku objednávek'>
|
||||
<FontAwesomeIcon onClick={() => navigate('/objednani')} icon={faArrowUpRightFromSquare} className='action-icon' style={{ cursor: 'pointer' }} />
|
||||
</span>}
|
||||
{login !== auth.login && locationKey === LunchChoice.OBJEDNAVAM && isBuyer && <span title='Objednávající'>
|
||||
<FontAwesomeIcon onClick={() => {
|
||||
copyNote(userPayload.note!);
|
||||
@@ -881,48 +902,21 @@ function App() {
|
||||
</div>
|
||||
}
|
||||
<PizzaOrderList state={data.pizzaDay.state!} orders={data.pizzaDay.orders!} onDelete={handlePizzaDelete} creator={data.pizzaDay.creator!} />
|
||||
{
|
||||
data.pizzaDay.state === PizzaDayState.DELIVERED && myOrder?.hasQr && (() => {
|
||||
const pizzaQr = data.pendingQrs?.find(qr => qr.creator === data.pizzaDay?.creator);
|
||||
return pizzaQr ? (
|
||||
<div className='qr-code'>
|
||||
<h3>QR platba</h3>
|
||||
<img src={`/api/qr?login=${auth.login}&id=${pizzaQr.id}`} alt='QR kód' />
|
||||
</div>
|
||||
) : null;
|
||||
})()
|
||||
}
|
||||
</>
|
||||
}
|
||||
</div>
|
||||
}
|
||||
</div>
|
||||
{data.pendingQrs && data.pendingQrs.length > 0 &&
|
||||
<div className='pizza-section fade-in mt-4'>
|
||||
<h3>Nevyřízené platby</h3>
|
||||
<p>Máte neuhrazené platby.</p>
|
||||
{data.pendingQrs.map(qr => (
|
||||
<div key={qr.id} className='qr-code mb-3'>
|
||||
<p>
|
||||
<strong>{formatDateString(qr.date)}</strong> — {qr.creator} ({qr.totalPrice} Kč)
|
||||
{qr.purpose && <><br /><span className="text-muted">{qr.purpose}</span></>}
|
||||
</p>
|
||||
<img src={`/api/qr?login=${auth.login}&id=${qr.id}`} alt='QR kód' />
|
||||
<div className='mt-2'>
|
||||
<Button variant="success" onClick={async () => {
|
||||
await dismissQr({ body: { id: qr.id } });
|
||||
<PendingPayments
|
||||
pendingQrs={data.pendingQrs}
|
||||
login={auth.login}
|
||||
onDismissed={async () => {
|
||||
const response = await getData({ query: { dayIndex } });
|
||||
if (response.data) {
|
||||
setData(response.data);
|
||||
}
|
||||
}}>
|
||||
Zaplatil jsem
|
||||
</Button>
|
||||
</div>
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
}
|
||||
}}
|
||||
/>
|
||||
</>
|
||||
</div>
|
||||
{/* <FallingLeaves
|
||||
|
||||
@@ -6,15 +6,22 @@ import { ToastContainer } from "react-toastify";
|
||||
import { SocketContext, socket } from "./context/socket";
|
||||
import StatsPage from "./pages/StatsPage";
|
||||
import OrderGroupsPage from "./pages/OrderGroupsPage";
|
||||
import SuggestionsPage from "./pages/SuggestionsPage";
|
||||
import App from "./App";
|
||||
|
||||
export const STATS_URL = '/stats';
|
||||
export const OBJEDNANI_URL = '/objednani';
|
||||
export const NAVRHY_URL = '/navrhy';
|
||||
|
||||
export default function AppRoutes() {
|
||||
return (
|
||||
<Routes>
|
||||
<Route path={STATS_URL} element={<StatsPage />} />
|
||||
<Route path={NAVRHY_URL} element={
|
||||
<ProvideSettings>
|
||||
<SuggestionsPage />
|
||||
</ProvideSettings>
|
||||
} />
|
||||
<Route path={OBJEDNANI_URL} element={
|
||||
<ProvideSettings>
|
||||
<SocketContext.Provider value={socket}>
|
||||
|
||||
@@ -110,3 +110,16 @@ export function formatDateString(dateString: string): string {
|
||||
const [year, month, day] = dateString.split('-');
|
||||
return `${day}.${month}.${year}`;
|
||||
}
|
||||
|
||||
/**
|
||||
* Očistí zprávu (účel platby) pro QR platbu – musí odpovídat serverové logice (qr.ts):
|
||||
* transliteruje diakritiku na základní písmena (š→s, č→c, ...), odstraní znaky mimo
|
||||
* ISO 8859-1 a hvězdičku (oddělovač polí v QR platbě) a ořízne na max. 60 znaků.
|
||||
*/
|
||||
export function sanitizeQrMessage(message: string): string {
|
||||
const sanitized = message
|
||||
.normalize('NFD').replace(/[\u0300-\u036f]/g, '') // diakritika → základní písmeno
|
||||
.replace(/[^\x00-\xff]/g, '') // znaky mimo ISO 8859-1
|
||||
.replace(/\*/g, ''); // '*' je v QR platbě oddělovač
|
||||
return sanitized.length > 60 ? sanitized.substring(0, 60) : sanitized;
|
||||
}
|
||||
@@ -0,0 +1,70 @@
|
||||
.bolt-progress {
|
||||
display: flex;
|
||||
align-items: flex-start;
|
||||
max-width: 400px;
|
||||
|
||||
.bolt-step {
|
||||
position: relative;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
flex: 1;
|
||||
min-width: 64px;
|
||||
|
||||
.bolt-dot {
|
||||
position: relative;
|
||||
z-index: 1;
|
||||
width: 12px;
|
||||
height: 12px;
|
||||
border-radius: 50%;
|
||||
background: var(--luncher-border, #ced4da);
|
||||
}
|
||||
|
||||
.bolt-label {
|
||||
margin-top: 2px;
|
||||
font-size: 0.7em;
|
||||
color: var(--luncher-text-muted, #6c757d);
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
// Spojnice k předchozímu kroku
|
||||
&:not(:first-child)::before {
|
||||
content: '';
|
||||
position: absolute;
|
||||
top: 5px;
|
||||
right: 50%;
|
||||
width: 100%;
|
||||
height: 2px;
|
||||
background: var(--luncher-border, #ced4da);
|
||||
}
|
||||
|
||||
&.done {
|
||||
.bolt-dot {
|
||||
background: var(--bs-success, #198754);
|
||||
}
|
||||
|
||||
&:not(:first-child)::before {
|
||||
background: var(--bs-success, #198754);
|
||||
}
|
||||
}
|
||||
|
||||
&.active .bolt-label {
|
||||
font-weight: 600;
|
||||
color: inherit;
|
||||
}
|
||||
}
|
||||
|
||||
// Pulzování aktivního kroku, dokud sledování běží
|
||||
&.live .bolt-step.active .bolt-dot {
|
||||
animation: bolt-pulse 2s ease-in-out infinite;
|
||||
}
|
||||
}
|
||||
|
||||
@keyframes bolt-pulse {
|
||||
0%, 100% {
|
||||
box-shadow: 0 0 0 0 rgba(25, 135, 84, 0.5);
|
||||
}
|
||||
50% {
|
||||
box-shadow: 0 0 0 5px rgba(25, 135, 84, 0);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,89 @@
|
||||
import { OverlayTrigger, Tooltip } from 'react-bootstrap';
|
||||
import './BoltOrderProgress.scss';
|
||||
|
||||
const STEPS = ['Přijato', 'Příprava', 'Na cestě', 'Doručeno'];
|
||||
|
||||
/**
|
||||
* Známé stavy objednávky z Bolt API → index kroku ve stepperu.
|
||||
* Pozor: waiting_delivery znamená "jídlo čeká v podniku na vyzvednutí",
|
||||
* nikoli "na cestě" — tu signalizuje až stav kurýra (picked_up apod.).
|
||||
*/
|
||||
const ORDER_STATE_TO_STEP: Record<string, number> = {
|
||||
created: 0,
|
||||
pending: 0,
|
||||
accepted: 0,
|
||||
waiting_preparation: 0,
|
||||
preparing: 1,
|
||||
waiting_delivery: 1,
|
||||
ready_for_pickup: 1,
|
||||
waiting_courier: 1,
|
||||
waiting_pickup: 1,
|
||||
picked_up: 2,
|
||||
in_delivery: 2,
|
||||
delivering: 2,
|
||||
heading_to_client: 2,
|
||||
delivered: 3,
|
||||
finished: 3,
|
||||
};
|
||||
|
||||
/** Stavy kurýra z Bolt API → index kroku. Kurýr u podniku ještě neznamená "na cestě". */
|
||||
const COURIER_STATE_TO_STEP: Record<string, number> = {
|
||||
heading_to_provider: 1,
|
||||
arrived_to_provider: 1,
|
||||
picked_up: 2,
|
||||
heading_to_client: 2,
|
||||
delivering: 2,
|
||||
arrived_to_client: 2,
|
||||
delivered: 3,
|
||||
};
|
||||
|
||||
/** Neznámé stavy se mapují heuristicky podle klíčových slov. */
|
||||
function stepForOrderState(state: string): number | 'cancelled' {
|
||||
const s = state.toLowerCase();
|
||||
if (s in ORDER_STATE_TO_STEP) return ORDER_STATE_TO_STEP[s];
|
||||
if (/cancel|reject|fail/.test(s)) return 'cancelled';
|
||||
if (/delivered|finished/.test(s)) return 3;
|
||||
if (/^waiting|prepar|ready|cook/.test(s)) return 1;
|
||||
if (/picked|delivering|heading_to_client|transport/.test(s)) return 2;
|
||||
return 0;
|
||||
}
|
||||
|
||||
function stepForCourierState(state?: string): number {
|
||||
if (!state) return 0;
|
||||
const s = state.toLowerCase();
|
||||
if (s in COURIER_STATE_TO_STEP) return COURIER_STATE_TO_STEP[s];
|
||||
if (/picked|client|delivering|transport/.test(s)) return 2;
|
||||
return 0;
|
||||
}
|
||||
|
||||
interface Props {
|
||||
/** Raw order_state z Bolt API (např. waiting_preparation) */
|
||||
state: string;
|
||||
/** Raw courier.state z Bolt API (např. arrived_to_provider) */
|
||||
courierState?: string;
|
||||
/** Zda sledování stále běží (skupina má boltTrackingToken) */
|
||||
tracking: boolean;
|
||||
}
|
||||
|
||||
/** Mini progress stepper se stavem objednávky Bolt Food. */
|
||||
export default function BoltOrderProgress({ state, courierState, tracking }: Props) {
|
||||
const orderStep = stepForOrderState(state);
|
||||
if (orderStep === 'cancelled') {
|
||||
return <small className="text-danger">Objednávka Bolt byla zrušena</small>;
|
||||
}
|
||||
// Stav kurýra může krok jen zpřesnit dopředu (např. waiting_delivery + picked_up → Na cestě)
|
||||
const step = Math.max(orderStep, stepForCourierState(courierState));
|
||||
const rawInfo = courierState ? `${state} / kurýr: ${courierState}` : state;
|
||||
return (
|
||||
<OverlayTrigger overlay={<Tooltip>Stav z Bolt Food: {rawInfo}</Tooltip>}>
|
||||
<div className={`bolt-progress${tracking && step < 3 ? ' live' : ''}`}>
|
||||
{STEPS.map((label, i) => (
|
||||
<div key={label} className={`bolt-step${i <= step ? ' done' : ''}${i === step ? ' active' : ''}`}>
|
||||
<div className="bolt-dot" />
|
||||
<div className="bolt-label">{label}</div>
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
</OverlayTrigger>
|
||||
);
|
||||
}
|
||||
@@ -3,15 +3,15 @@ import { Navbar, Nav, NavDropdown, Modal, Button } from "react-bootstrap";
|
||||
import { useAuth } from "../context/auth";
|
||||
import SettingsModal from "./modals/SettingsModal";
|
||||
import { useSettings, ThemePreference } from "../context/settings";
|
||||
import FeaturesVotingModal from "./modals/FeaturesVotingModal";
|
||||
import HuePicker from "./HuePicker";
|
||||
import PizzaCalculatorModal from "./modals/PizzaCalculatorModal";
|
||||
import RefreshMenuModal from "./modals/RefreshMenuModal";
|
||||
import GenerateQrModal from "./modals/GenerateQrModal";
|
||||
import GenerateMockDataModal from "./modals/GenerateMockDataModal";
|
||||
import ClearMockDataModal from "./modals/ClearMockDataModal";
|
||||
import { useNavigate } from "react-router";
|
||||
import { STATS_URL, OBJEDNANI_URL } from "../AppRoutes";
|
||||
import { FeatureRequest, getVotes, updateVote, LunchChoices, getChangelogs } from "../../../types";
|
||||
import { STATS_URL, OBJEDNANI_URL, NAVRHY_URL } from "../AppRoutes";
|
||||
import { LunchChoices, getChangelogs } from "../../../types";
|
||||
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
|
||||
import { faSun, faMoon } from "@fortawesome/free-solid-svg-icons";
|
||||
import { formatDateString } from "../Utils";
|
||||
@@ -30,7 +30,6 @@ export default function Header({ choices, dayIndex }: Props) {
|
||||
const settings = useSettings();
|
||||
const navigate = useNavigate();
|
||||
const [settingsModalOpen, setSettingsModalOpen] = useState<boolean>(false);
|
||||
const [votingModalOpen, setVotingModalOpen] = useState<boolean>(false);
|
||||
const [pizzaModalOpen, setPizzaModalOpen] = useState<boolean>(false);
|
||||
const [refreshMenuModalOpen, setRefreshMenuModalOpen] = useState<boolean>(false);
|
||||
const [changelogModalOpen, setChangelogModalOpen] = useState<boolean>(false);
|
||||
@@ -38,35 +37,8 @@ export default function Header({ choices, dayIndex }: Props) {
|
||||
const [qrModalOpen, setQrModalOpen] = useState<boolean>(false);
|
||||
const [generateMockModalOpen, setGenerateMockModalOpen] = useState<boolean>(false);
|
||||
const [clearMockModalOpen, setClearMockModalOpen] = useState<boolean>(false);
|
||||
const [featureVotes, setFeatureVotes] = useState<FeatureRequest[] | undefined>([]);
|
||||
|
||||
// Zjistíme aktuální efektivní téma (pro zobrazení správné ikony)
|
||||
const [effectiveTheme, setEffectiveTheme] = useState<'light' | 'dark'>('light');
|
||||
|
||||
useEffect(() => {
|
||||
const updateEffectiveTheme = () => {
|
||||
if (settings?.themePreference === 'system') {
|
||||
const isDark = window.matchMedia('(prefers-color-scheme: dark)').matches;
|
||||
setEffectiveTheme(isDark ? 'dark' : 'light');
|
||||
} else {
|
||||
setEffectiveTheme(settings?.themePreference || 'light');
|
||||
}
|
||||
};
|
||||
|
||||
updateEffectiveTheme();
|
||||
|
||||
const mediaQuery = window.matchMedia('(prefers-color-scheme: dark)');
|
||||
mediaQuery.addEventListener('change', updateEffectiveTheme);
|
||||
return () => mediaQuery.removeEventListener('change', updateEffectiveTheme);
|
||||
}, [settings?.themePreference]);
|
||||
|
||||
useEffect(() => {
|
||||
if (auth?.login) {
|
||||
getVotes().then(response => {
|
||||
setFeatureVotes(response.data);
|
||||
})
|
||||
}
|
||||
}, [auth?.login]);
|
||||
const effectiveDark = settings?.effectiveDark ?? false;
|
||||
|
||||
useEffect(() => {
|
||||
if (!auth?.login) return;
|
||||
@@ -85,10 +57,6 @@ export default function Header({ choices, dayIndex }: Props) {
|
||||
setSettingsModalOpen(false);
|
||||
}
|
||||
|
||||
const closeVotingModal = () => {
|
||||
setVotingModalOpen(false);
|
||||
}
|
||||
|
||||
const closePizzaModal = () => {
|
||||
setPizzaModalOpen(false);
|
||||
}
|
||||
@@ -110,8 +78,7 @@ export default function Header({ choices, dayIndex }: Props) {
|
||||
}
|
||||
|
||||
const toggleTheme = () => {
|
||||
// Přepínáme mezi light a dark (ignorujeme system pro jednoduchost)
|
||||
const newTheme: ThemePreference = effectiveTheme === 'dark' ? 'light' : 'dark';
|
||||
const newTheme: ThemePreference = effectiveDark ? 'light' : 'dark';
|
||||
settings?.setThemePreference(newTheme);
|
||||
}
|
||||
|
||||
@@ -176,17 +143,6 @@ export default function Header({ choices, dayIndex }: Props) {
|
||||
closeSettingsModal();
|
||||
}
|
||||
|
||||
const saveFeatureVote = async (option: FeatureRequest, active: boolean) => {
|
||||
await updateVote({ body: { option, active } });
|
||||
const votes = [...featureVotes || []];
|
||||
if (active) {
|
||||
votes.push(option);
|
||||
} else {
|
||||
votes.splice(votes.indexOf(option), 1);
|
||||
}
|
||||
setFeatureVotes(votes);
|
||||
}
|
||||
|
||||
return <Navbar variant='dark' expand="lg">
|
||||
<Navbar.Brand href="/">Luncher</Navbar.Brand>
|
||||
<Navbar.Toggle aria-controls="basic-navbar-nav" />
|
||||
@@ -195,15 +151,20 @@ export default function Header({ choices, dayIndex }: Props) {
|
||||
<button
|
||||
className="theme-toggle"
|
||||
onClick={toggleTheme}
|
||||
title={effectiveTheme === 'dark' ? 'Přepnout na světlý režim' : 'Přepnout na tmavý režim'}
|
||||
aria-label="Přepnout barevný motiv"
|
||||
title={effectiveDark ? 'Přepnout na světlý režim' : 'Přepnout na tmavý režim'}
|
||||
aria-label="Přepnout světlý/tmavý režim"
|
||||
>
|
||||
<FontAwesomeIcon icon={effectiveTheme === 'dark' ? faSun : faMoon} />
|
||||
<FontAwesomeIcon icon={effectiveDark ? faSun : faMoon} />
|
||||
</button>
|
||||
<HuePicker
|
||||
accentHue={settings?.accentHue ?? 142}
|
||||
isDark={effectiveDark}
|
||||
onChange={hue => settings?.setAccentHue(hue)}
|
||||
/>
|
||||
<NavDropdown align="end" title={auth?.login} id="basic-nav-dropdown">
|
||||
<NavDropdown.Item onClick={() => setSettingsModalOpen(true)}>Nastavení</NavDropdown.Item>
|
||||
<NavDropdown.Item onClick={() => setRefreshMenuModalOpen(true)}>Přenačtení menu</NavDropdown.Item>
|
||||
<NavDropdown.Item onClick={() => setVotingModalOpen(true)}>Hlasovat o nových funkcích</NavDropdown.Item>
|
||||
<NavDropdown.Item onClick={() => navigate(NAVRHY_URL)}>Návrhy na vylepšení</NavDropdown.Item>
|
||||
<NavDropdown.Item onClick={() => setPizzaModalOpen(true)}>Pizza kalkulačka</NavDropdown.Item>
|
||||
<NavDropdown.Item onClick={handleQrMenuClick}>Generování QR kódů</NavDropdown.Item>
|
||||
<NavDropdown.Item onClick={() => navigate(STATS_URL)}>Statistiky</NavDropdown.Item>
|
||||
@@ -233,7 +194,6 @@ export default function Header({ choices, dayIndex }: Props) {
|
||||
</Navbar.Collapse>
|
||||
<SettingsModal isOpen={settingsModalOpen} onClose={closeSettingsModal} onSave={saveSettings} />
|
||||
<RefreshMenuModal isOpen={refreshMenuModalOpen} onClose={closeRefreshMenuModal} />
|
||||
<FeaturesVotingModal isOpen={votingModalOpen} onClose={closeVotingModal} onChange={saveFeatureVote} initialValues={featureVotes} />
|
||||
<PizzaCalculatorModal isOpen={pizzaModalOpen} onClose={closePizzaModal} />
|
||||
{choices && settings?.bankAccount && settings?.holderName && (
|
||||
<GenerateQrModal
|
||||
|
||||
@@ -0,0 +1,138 @@
|
||||
.hue-picker-dropdown {
|
||||
.dropdown-toggle {
|
||||
background: transparent !important;
|
||||
border: none !important;
|
||||
color: var(--luncher-navbar-text) !important;
|
||||
padding: 8px 12px;
|
||||
font-size: 1.1rem;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
cursor: pointer;
|
||||
border-radius: var(--luncher-radius-sm);
|
||||
transition: var(--luncher-transition);
|
||||
|
||||
&::after {
|
||||
display: none;
|
||||
}
|
||||
|
||||
&:hover {
|
||||
background: rgba(255, 255, 255, 0.1) !important;
|
||||
transform: scale(1.1);
|
||||
}
|
||||
|
||||
&:focus {
|
||||
outline: none;
|
||||
box-shadow: 0 0 0 2px rgba(255, 255, 255, 0.3) !important;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.hue-picker-panel {
|
||||
padding: 0 !important;
|
||||
min-width: 240px;
|
||||
|
||||
.hue-picker-inner {
|
||||
padding: 14px 16px;
|
||||
}
|
||||
|
||||
.hue-picker-label {
|
||||
font-size: 0.75rem;
|
||||
font-weight: 600;
|
||||
text-transform: uppercase;
|
||||
letter-spacing: 0.5px;
|
||||
color: var(--luncher-text-secondary);
|
||||
margin-bottom: 12px;
|
||||
}
|
||||
}
|
||||
|
||||
.hue-slider {
|
||||
-webkit-appearance: none;
|
||||
appearance: none;
|
||||
width: 100%;
|
||||
height: 12px;
|
||||
border-radius: 6px;
|
||||
background: linear-gradient(
|
||||
to right,
|
||||
hsl(0 70% 50%), hsl(30 70% 50%), hsl(60 70% 50%), hsl(90 70% 50%),
|
||||
hsl(120 70% 50%), hsl(150 70% 50%), hsl(180 70% 50%), hsl(210 70% 50%),
|
||||
hsl(240 70% 50%), hsl(270 70% 50%), hsl(300 70% 50%), hsl(330 70% 50%), hsl(360 70% 50%)
|
||||
);
|
||||
outline: none;
|
||||
cursor: pointer;
|
||||
margin-bottom: 14px;
|
||||
|
||||
&::-webkit-slider-thumb {
|
||||
-webkit-appearance: none;
|
||||
appearance: none;
|
||||
width: 20px;
|
||||
height: 20px;
|
||||
border-radius: 50%;
|
||||
background: white;
|
||||
border: 2px solid rgba(0, 0, 0, 0.25);
|
||||
cursor: pointer;
|
||||
box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
|
||||
transition: transform 0.15s ease;
|
||||
|
||||
&:hover {
|
||||
transform: scale(1.15);
|
||||
}
|
||||
}
|
||||
|
||||
&::-moz-range-thumb {
|
||||
width: 20px;
|
||||
height: 20px;
|
||||
border-radius: 50%;
|
||||
background: white;
|
||||
border: 2px solid rgba(0, 0, 0, 0.25);
|
||||
cursor: pointer;
|
||||
box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
|
||||
}
|
||||
}
|
||||
|
||||
.hue-presets {
|
||||
display: flex;
|
||||
gap: 8px;
|
||||
margin-bottom: 14px;
|
||||
|
||||
.hue-swatch {
|
||||
width: 26px;
|
||||
height: 26px;
|
||||
border-radius: 50%;
|
||||
border: 2px solid transparent;
|
||||
cursor: pointer;
|
||||
padding: 0;
|
||||
transition: transform 0.15s ease, border-color 0.15s ease;
|
||||
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.2);
|
||||
|
||||
&:hover {
|
||||
transform: scale(1.15);
|
||||
}
|
||||
|
||||
&.active {
|
||||
border-color: var(--luncher-text);
|
||||
transform: scale(1.1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.hue-preview {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 10px;
|
||||
padding-top: 4px;
|
||||
border-top: 1px solid var(--luncher-border);
|
||||
|
||||
.hue-preview-chip {
|
||||
width: 32px;
|
||||
height: 32px;
|
||||
border-radius: var(--luncher-radius-sm);
|
||||
flex-shrink: 0;
|
||||
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.2);
|
||||
transition: background 0.2s ease;
|
||||
}
|
||||
|
||||
span {
|
||||
font-size: 0.8rem;
|
||||
color: var(--luncher-text-secondary);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,71 @@
|
||||
import { Dropdown } from 'react-bootstrap';
|
||||
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
|
||||
import { faPalette } from '@fortawesome/free-solid-svg-icons';
|
||||
import './HuePicker.scss';
|
||||
|
||||
const PRESETS = [
|
||||
{ hue: 142, label: 'Zelená' },
|
||||
{ hue: 217, label: 'Modrá' },
|
||||
{ hue: 263, label: 'Fialová' },
|
||||
{ hue: 0, label: 'Červená' },
|
||||
{ hue: 28, label: 'Oranžová' },
|
||||
{ hue: 340, label: 'Růžová' },
|
||||
];
|
||||
|
||||
type Props = {
|
||||
accentHue: number;
|
||||
isDark: boolean;
|
||||
onChange: (hue: number) => void;
|
||||
};
|
||||
|
||||
function swatchColor(hue: number, isDark: boolean): string {
|
||||
return `hsl(${hue} 70% ${isDark ? 55 : 38}%)`;
|
||||
}
|
||||
|
||||
export default function HuePicker({ accentHue, isDark, onChange }: Props) {
|
||||
return (
|
||||
<Dropdown align="end" autoClose="outside" className="hue-picker-dropdown">
|
||||
<Dropdown.Toggle
|
||||
as="button"
|
||||
className="theme-toggle"
|
||||
aria-label="Barva zvýraznění"
|
||||
title="Barva zvýraznění"
|
||||
>
|
||||
<FontAwesomeIcon icon={faPalette} />
|
||||
</Dropdown.Toggle>
|
||||
<Dropdown.Menu className="hue-picker-panel">
|
||||
<div className="hue-picker-inner">
|
||||
<div className="hue-picker-label">Barva zvýraznění</div>
|
||||
<input
|
||||
type="range"
|
||||
min={0}
|
||||
max={360}
|
||||
value={accentHue}
|
||||
onChange={e => onChange(parseInt(e.target.value, 10))}
|
||||
className="hue-slider"
|
||||
aria-label="Odstín barvy zvýraznění"
|
||||
/>
|
||||
<div className="hue-presets">
|
||||
{PRESETS.map(p => (
|
||||
<button
|
||||
key={p.hue}
|
||||
className={`hue-swatch${accentHue === p.hue ? ' active' : ''}`}
|
||||
style={{ background: swatchColor(p.hue, isDark) }}
|
||||
title={p.label}
|
||||
onClick={() => onChange(p.hue)}
|
||||
aria-label={p.label}
|
||||
/>
|
||||
))}
|
||||
</div>
|
||||
<div className="hue-preview">
|
||||
<div
|
||||
className="hue-preview-chip"
|
||||
style={{ background: swatchColor(accentHue, isDark) }}
|
||||
/>
|
||||
<span>Aktuální barva zvýraznění</span>
|
||||
</div>
|
||||
</div>
|
||||
</Dropdown.Menu>
|
||||
</Dropdown>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,102 @@
|
||||
import { useEffect, useRef, useState } from 'react';
|
||||
import { Button, Modal } from 'react-bootstrap';
|
||||
import { PendingQr, dismissQr } from '../../../types';
|
||||
import { formatDateString } from '../Utils';
|
||||
import ConfirmModal from './modals/ConfirmModal';
|
||||
|
||||
type Props = {
|
||||
pendingQrs?: PendingQr[];
|
||||
login?: string;
|
||||
// Zavolá se po úspěšném potvrzení platby, aby si rodič mohl znovu načíst data
|
||||
onDismissed?: () => void | Promise<void>;
|
||||
};
|
||||
|
||||
// Sekce "Nevyřízené platby" – zobrazí QR kódy neuhrazených plateb přihlášeného uživatele
|
||||
// včetně tlačítka "Zaplatil jsem" a potvrzovacího dialogu. Sdíleno hlavní stránkou i stránkou objednávek.
|
||||
// Při příchodu nových nevyřízených plateb se navíc automaticky otevře modální dialog,
|
||||
// aby si uživatel QR kódů určitě všiml (často si jich nevšimnou, protože sekce je dole na stránce).
|
||||
export default function PendingPayments({ pendingQrs, login, onDismissed }: Readonly<Props>) {
|
||||
const [dismissQrId, setDismissQrId] = useState<string | null>(null);
|
||||
const [modalOpen, setModalOpen] = useState(false);
|
||||
|
||||
// ID QR kódů, pro které už byl v rámci tohoto načtení stránky automaticky zobrazen
|
||||
// modální dialog. Drží se jen v paměti (ne v sessionStorage), takže se při každém
|
||||
// ručním přenačtení stránky vynuluje a dialog se znovu otevře, dokud uživatel platby
|
||||
// neuhradí. Zároveň se nepřekrývá při pouhém obnovení dat či příchodu už zobrazeného QR.
|
||||
const autoShownQrIds = useRef<Set<string>>(new Set());
|
||||
|
||||
const qrIdsKey = (pendingQrs ?? []).map(qr => qr.id).join(',');
|
||||
|
||||
// Automaticky otevřeme modální dialog, jakmile přijdou nové (dosud nezobrazené) platby.
|
||||
useEffect(() => {
|
||||
const ids = (pendingQrs ?? []).map(qr => qr.id);
|
||||
if (ids.length === 0) return;
|
||||
const unseen = ids.filter(id => !autoShownQrIds.current.has(id));
|
||||
if (unseen.length > 0) {
|
||||
setModalOpen(true);
|
||||
unseen.forEach(id => autoShownQrIds.current.add(id));
|
||||
}
|
||||
}, [qrIdsKey, pendingQrs]);
|
||||
|
||||
if (!pendingQrs || pendingQrs.length === 0) return null;
|
||||
|
||||
// Vykreslení jednoho QR kódu i s tlačítkem "Zaplatil jsem" – sdíleno sekcí i modálem.
|
||||
const renderQr = (qr: PendingQr) => (
|
||||
<div key={qr.id} className='qr-code mb-3'>
|
||||
<p>
|
||||
<strong>{formatDateString(qr.date)}</strong> — {qr.creator} ({qr.totalPrice / 100} Kč)
|
||||
{qr.purpose && <><br /><span className="text-muted">{qr.purpose}</span></>}
|
||||
</p>
|
||||
<img src={`/api/qr?login=${login}&id=${qr.id}`} alt='QR kód' />
|
||||
<div className='mt-2'>
|
||||
<Button variant="success" onClick={() => setDismissQrId(qr.id)}>
|
||||
Zaplatil jsem
|
||||
</Button>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
|
||||
return (
|
||||
<>
|
||||
<div className='pizza-section fade-in mt-4'>
|
||||
<h3>Nevyřízené platby</h3>
|
||||
<p>
|
||||
Máte neuhrazené platby.{' '}
|
||||
<Button variant="link" className="p-0 align-baseline" onClick={() => setModalOpen(true)}>
|
||||
Zobrazit QR kódy
|
||||
</Button>
|
||||
</p>
|
||||
{pendingQrs.map(renderQr)}
|
||||
</div>
|
||||
<Modal show={modalOpen} onHide={() => setModalOpen(false)} centered scrollable>
|
||||
<Modal.Header closeButton>
|
||||
<Modal.Title>Nevyřízené platby</Modal.Title>
|
||||
</Modal.Header>
|
||||
<Modal.Body>
|
||||
<p>Máte neuhrazené platby. Naskenujte QR kód pro zaplacení.</p>
|
||||
{pendingQrs.map(renderQr)}
|
||||
</Modal.Body>
|
||||
<Modal.Footer>
|
||||
<Button variant="secondary" onClick={() => setModalOpen(false)}>
|
||||
Zavřít
|
||||
</Button>
|
||||
</Modal.Footer>
|
||||
</Modal>
|
||||
<ConfirmModal
|
||||
isOpen={dismissQrId !== null}
|
||||
title="Potvrzení platby"
|
||||
message="Opravdu jste zaplatili? QR kód bude odstraněn."
|
||||
confirmLabel="Zaplatil jsem"
|
||||
confirmVariant="success"
|
||||
onClose={() => setDismissQrId(null)}
|
||||
onConfirm={async () => {
|
||||
if (!dismissQrId) return;
|
||||
const id = dismissQrId;
|
||||
setDismissQrId(null);
|
||||
await dismissQr({ body: { id } });
|
||||
await onDismissed?.();
|
||||
}}
|
||||
/>
|
||||
</>
|
||||
);
|
||||
}
|
||||
@@ -48,7 +48,7 @@ export default function PizzaOrderList({ state, orders, onDelete, creator }: Rea
|
||||
borderTop: '2px solid var(--luncher-border)'
|
||||
}}>
|
||||
<td colSpan={4} style={{ padding: '16px 20px', border: 'none' }}>Celkem</td>
|
||||
<td style={{ padding: '16px 20px', border: 'none', textAlign: 'right', color: 'var(--luncher-primary)' }}>{`${total} Kč`}</td>
|
||||
<td style={{ padding: '16px 20px', border: 'none', textAlign: 'right', color: 'var(--luncher-primary)' }}>{`${total / 100} Kč`}</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</Table>
|
||||
|
||||
@@ -26,7 +26,7 @@ export default function PizzaOrderRow({ creator, order, state, onDelete, onFeeMo
|
||||
<td>{order.customer}</td>
|
||||
<td>{order.pizzaList!.map<React.ReactNode>(pizzaOrder =>
|
||||
<span key={pizzaOrder.name}>
|
||||
{`${pizzaOrder.name}, ${pizzaOrder.size} (${pizzaOrder.price} Kč)`}
|
||||
{`${pizzaOrder.name}, ${pizzaOrder.size} (${pizzaOrder.price / 100} Kč)`}
|
||||
{auth?.login === order.customer && state === PizzaDayState.CREATED &&
|
||||
<span title='Odstranit'>
|
||||
<FontAwesomeIcon onClick={() => {
|
||||
@@ -38,10 +38,10 @@ export default function PizzaOrderRow({ creator, order, state, onDelete, onFeeMo
|
||||
.reduce((prev, curr, index) => [prev, <br key={`br-${index}`} />, curr])}
|
||||
</td>
|
||||
<td style={{ maxWidth: "200px" }}>{order.note ?? '-'}</td>
|
||||
<td style={{ maxWidth: "200px" }}>{order.fee?.price ? `${order.fee.price} Kč${order.fee.text ? ` (${order.fee.text})` : ''}` : '-'}</td>
|
||||
<td style={{ maxWidth: "200px" }}>{order.fee?.price ? `${order.fee.price / 100} Kč${order.fee.text ? ` (${order.fee.text})` : ''}` : '-'}</td>
|
||||
<td>
|
||||
{order.totalPrice} Kč{auth?.login === creator && state === PizzaDayState.CREATED && <span title='Nastavit příplatek'><FontAwesomeIcon onClick={() => { setIsFeeModalOpen(true) }} className='action-icon' icon={faMoneyBill1} /></span>}
|
||||
{order.totalPrice / 100} Kč{auth?.login === creator && state === PizzaDayState.CREATED && <span title='Nastavit příplatek'><FontAwesomeIcon onClick={() => { setIsFeeModalOpen(true) }} className='action-icon' icon={faMoneyBill1} /></span>}
|
||||
</td>
|
||||
<PizzaAdditionalFeeModal customerName={order.customer} isOpen={isFeeModalOpen} onClose={() => setIsFeeModalOpen(false)} onSave={saveFees} initialValues={{ text: order.fee?.text, price: order.fee?.price?.toString() }} />
|
||||
<PizzaAdditionalFeeModal customerName={order.customer} isOpen={isFeeModalOpen} onClose={() => setIsFeeModalOpen(false)} onSave={saveFees} initialValues={{ text: order.fee?.text, price: order.fee?.price != null ? String(order.fee.price / 100) : undefined }} />
|
||||
</>
|
||||
}
|
||||
@@ -0,0 +1,79 @@
|
||||
import { useState } from "react";
|
||||
import { Modal, Button, Form } from "react-bootstrap";
|
||||
|
||||
type Props = {
|
||||
isOpen: boolean;
|
||||
onClose: () => void;
|
||||
onSubmit: (title: string, description: string) => Promise<void>;
|
||||
};
|
||||
|
||||
/** Modální dialog pro přidání nového návrhu na vylepšení. */
|
||||
export default function AddSuggestionModal({ isOpen, onClose, onSubmit }: Readonly<Props>) {
|
||||
const [title, setTitle] = useState("");
|
||||
const [description, setDescription] = useState("");
|
||||
const [submitting, setSubmitting] = useState(false);
|
||||
|
||||
const reset = () => {
|
||||
setTitle("");
|
||||
setDescription("");
|
||||
};
|
||||
|
||||
const handleClose = () => {
|
||||
reset();
|
||||
onClose();
|
||||
};
|
||||
|
||||
const handleSubmit = async () => {
|
||||
if (!title.trim() || !description.trim()) return;
|
||||
setSubmitting(true);
|
||||
try {
|
||||
await onSubmit(title.trim(), description.trim());
|
||||
reset();
|
||||
onClose();
|
||||
} finally {
|
||||
setSubmitting(false);
|
||||
}
|
||||
};
|
||||
|
||||
return (
|
||||
<Modal show={isOpen} onHide={handleClose} size="lg">
|
||||
<Modal.Header closeButton>
|
||||
<Modal.Title><h2>Nový návrh na vylepšení</h2></Modal.Title>
|
||||
</Modal.Header>
|
||||
<Modal.Body>
|
||||
<Form.Group className="mb-3">
|
||||
<Form.Label>Název</Form.Label>
|
||||
<Form.Control
|
||||
type="text"
|
||||
placeholder="Stručný název návrhu"
|
||||
value={title}
|
||||
maxLength={120}
|
||||
onChange={e => setTitle(e.target.value)}
|
||||
onKeyDown={e => e.stopPropagation()}
|
||||
autoFocus
|
||||
/>
|
||||
<Form.Text className="text-muted">Krátký, výstižný název navrhované úpravy.</Form.Text>
|
||||
</Form.Group>
|
||||
<Form.Group className="mb-3">
|
||||
<Form.Label>Popis</Form.Label>
|
||||
<Form.Control
|
||||
as="textarea"
|
||||
rows={5}
|
||||
placeholder="Detailní popis navrhované úpravy, řešení apod."
|
||||
value={description}
|
||||
onChange={e => setDescription(e.target.value)}
|
||||
onKeyDown={e => e.stopPropagation()}
|
||||
/>
|
||||
</Form.Group>
|
||||
</Modal.Body>
|
||||
<Modal.Footer>
|
||||
<Button variant="secondary" onClick={handleClose}>
|
||||
Storno
|
||||
</Button>
|
||||
<Button onClick={handleSubmit} disabled={submitting || !title.trim() || !description.trim()}>
|
||||
Přidat
|
||||
</Button>
|
||||
</Modal.Footer>
|
||||
</Modal>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,26 @@
|
||||
import { Modal, Button } from "react-bootstrap";
|
||||
|
||||
type Props = {
|
||||
isOpen: boolean;
|
||||
title: string;
|
||||
message: string;
|
||||
confirmLabel?: string;
|
||||
confirmVariant?: string;
|
||||
onConfirm: () => void;
|
||||
onClose: () => void;
|
||||
};
|
||||
|
||||
export default function ConfirmModal({ isOpen, title, message, confirmLabel = "Potvrdit", confirmVariant = "primary", onConfirm, onClose }: Readonly<Props>) {
|
||||
return (
|
||||
<Modal show={isOpen} onHide={onClose}>
|
||||
<Modal.Header closeButton>
|
||||
<Modal.Title>{title}</Modal.Title>
|
||||
</Modal.Header>
|
||||
<Modal.Body>{message}</Modal.Body>
|
||||
<Modal.Footer>
|
||||
<Button variant="secondary" onClick={onClose}>Zrušit</Button>
|
||||
<Button variant={confirmVariant} onClick={onConfirm}>{confirmLabel}</Button>
|
||||
</Modal.Footer>
|
||||
</Modal>
|
||||
);
|
||||
}
|
||||
@@ -1,6 +1,7 @@
|
||||
import { useState, useEffect } from "react";
|
||||
import { Modal, Button, Form, Table, Alert } from "react-bootstrap";
|
||||
import { updateGroupFees, OrderGroup, OrderGroupMember } from "../../../../types";
|
||||
import { computeFeeShare, computeMemberTotal, countActiveMembers, isActiveMember } from "../../utils/groupFees";
|
||||
|
||||
type Props = {
|
||||
isOpen: boolean;
|
||||
@@ -9,18 +10,14 @@ type Props = {
|
||||
onSaved: (data: any) => void;
|
||||
};
|
||||
|
||||
function parseNum(s: string): number {
|
||||
function parseHal(s: string): number {
|
||||
const n = parseFloat(s.replace(',', '.'));
|
||||
return isNaN(n) || n < 0 ? 0 : Math.round(n * 100) / 100;
|
||||
return isNaN(n) || n < 0 ? 0 : Math.round(n * 100);
|
||||
}
|
||||
|
||||
function computeMemberTotal(member: OrderGroupMember, feeShare: number, discountType: string, discountValue: number, memberCount: number): number {
|
||||
const base = member.amount ?? 0;
|
||||
const surcharge = member.surchargeAmount ?? 0;
|
||||
const discount = discountType === 'percent'
|
||||
? Math.round((base + surcharge) * discountValue / 100 * 100) / 100
|
||||
: Math.round(discountValue / memberCount * 100) / 100;
|
||||
return Math.round((base + surcharge + feeShare - discount) * 100) / 100;
|
||||
function parsePercent(s: string): number {
|
||||
const n = parseFloat(s.replace(',', '.'));
|
||||
return isNaN(n) || n < 0 ? 0 : Math.round(n);
|
||||
}
|
||||
|
||||
export default function EditGroupFeesModal({ isOpen, onClose, group, onSaved }: Readonly<Props>) {
|
||||
@@ -34,23 +31,27 @@ export default function EditGroupFeesModal({ isOpen, onClose, group, onSaved }:
|
||||
|
||||
useEffect(() => {
|
||||
if (!isOpen) return;
|
||||
setFees(group.fees ? String(group.fees) : '');
|
||||
setShipping(group.shipping ? String(group.shipping) : '');
|
||||
setTip(group.tip ? String(group.tip) : '');
|
||||
setFees(group.fees ? String(group.fees / 100) : '');
|
||||
setShipping(group.shipping ? String(group.shipping / 100) : '');
|
||||
setTip(group.tip ? String(group.tip / 100) : '');
|
||||
setDiscountType((group.discountType as 'percent' | 'fixed') ?? 'percent');
|
||||
setDiscountValue(group.discountValue ? String(group.discountValue) : '');
|
||||
setDiscountValue(group.discountValue
|
||||
? ((group.discountType as string) === 'fixed' ? String(group.discountValue / 100) : String(group.discountValue))
|
||||
: '');
|
||||
setError(null);
|
||||
}, [isOpen, group]);
|
||||
|
||||
const memberEntries = Object.entries(group.members) as [string, OrderGroupMember][];
|
||||
const memberCount = memberEntries.length;
|
||||
// Poplatky se dělí jen mezi aktivní strávníky (kdo si reálně něco objednal).
|
||||
const activeCount = countActiveMembers(group.members);
|
||||
|
||||
const feesNum = parseNum(fees);
|
||||
const shippingNum = parseNum(shipping);
|
||||
const tipNum = parseNum(tip);
|
||||
const discountNum = parseNum(discountValue);
|
||||
const feesNum = parseHal(fees);
|
||||
const shippingNum = parseHal(shipping);
|
||||
const tipNum = parseHal(tip);
|
||||
const discountNum = discountType === 'percent' ? parsePercent(discountValue) : parseHal(discountValue);
|
||||
const totalFees = feesNum + shippingNum + tipNum;
|
||||
const feeShare = memberCount > 0 ? Math.round(totalFees / memberCount * 100) / 100 : 0;
|
||||
const feeShare = computeFeeShare(totalFees, activeCount);
|
||||
const feeParams = { totalFees, discountType, discountValue: discountNum };
|
||||
|
||||
const handleSave = async () => {
|
||||
setError(null);
|
||||
@@ -64,7 +65,7 @@ export default function EditGroupFeesModal({ isOpen, onClose, group, onSaved }:
|
||||
tip: tipNum,
|
||||
discountType: discountNum > 0 ? discountType : undefined,
|
||||
discountValue: discountNum > 0 ? discountNum : undefined,
|
||||
},
|
||||
}
|
||||
});
|
||||
if (res.error) {
|
||||
setError((res.error as any).error || 'Nastala chyba');
|
||||
@@ -143,7 +144,7 @@ export default function EditGroupFeesModal({ isOpen, onClose, group, onSaved }:
|
||||
</div>
|
||||
|
||||
<hr />
|
||||
<h6>Náhled celkových částek ({memberCount} členů, {feeShare > 0 ? `poplatek ${feeShare} Kč/os.` : 'bez poplatku'})</h6>
|
||||
<h6>Náhled celkových částek ({activeCount} {activeCount === 1 ? 'strávník' : 'strávníků'} s objednávkou, {feeShare > 0 ? `poplatek ${feeShare / 100} Kč/os.` : 'bez poplatku'})</h6>
|
||||
<Table size="sm" bordered>
|
||||
<thead>
|
||||
<tr>
|
||||
@@ -159,20 +160,22 @@ export default function EditGroupFeesModal({ isOpen, onClose, group, onSaved }:
|
||||
{memberEntries.map(([login, member]) => {
|
||||
const base = member.amount ?? 0;
|
||||
const surcharge = member.surchargeAmount ?? 0;
|
||||
const discount = discountNum > 0
|
||||
const active = isActiveMember(member);
|
||||
const total = computeMemberTotal(member, feeParams, feeShare, activeCount);
|
||||
// Sleva i poplatek se týkají jen aktivních strávníků.
|
||||
const discount = active && discountNum > 0
|
||||
? (discountType === 'percent'
|
||||
? Math.round((base + surcharge) * discountNum / 100 * 100) / 100
|
||||
: Math.round(discountNum / memberCount * 100) / 100)
|
||||
? Math.round((base + surcharge) * discountNum / 100)
|
||||
: Math.round(discountNum / activeCount))
|
||||
: 0;
|
||||
const total = computeMemberTotal(member, feeShare, discountType, discountNum, memberCount);
|
||||
return (
|
||||
<tr key={login}>
|
||||
<td><strong>{login}</strong></td>
|
||||
<td className="text-end">{base > 0 ? `${base} Kč` : '—'}</td>
|
||||
<td className="text-end">{surcharge > 0 ? `${surcharge} Kč` : '—'}</td>
|
||||
<td className="text-end">{feeShare > 0 ? `${feeShare} Kč` : '—'}</td>
|
||||
<td className="text-end text-danger">{discount > 0 ? `-${discount} Kč` : '—'}</td>
|
||||
<td className="text-end fw-bold">{total > 0 ? `${total} Kč` : '—'}</td>
|
||||
<tr key={login} className={active ? '' : 'text-muted'}>
|
||||
<td><strong>{login}</strong>{!active && <small className="ms-1">(jen objednává)</small>}</td>
|
||||
<td className="text-end">{base > 0 ? `${base / 100} Kč` : '—'}</td>
|
||||
<td className="text-end">{surcharge > 0 ? `${surcharge / 100} Kč` : '—'}</td>
|
||||
<td className="text-end">{active && feeShare > 0 ? `${feeShare / 100} Kč` : '—'}</td>
|
||||
<td className="text-end text-danger">{discount > 0 ? `-${discount / 100} Kč` : '—'}</td>
|
||||
<td className="text-end fw-bold">{total > 0 ? `${total / 100} Kč` : '—'}</td>
|
||||
</tr>
|
||||
);
|
||||
})}
|
||||
|
||||
@@ -1,45 +0,0 @@
|
||||
import { Modal, Button, Form } from "react-bootstrap"
|
||||
import { FeatureRequest } from "../../../../types";
|
||||
|
||||
type Props = {
|
||||
isOpen: boolean,
|
||||
onClose: () => void,
|
||||
onChange: (option: FeatureRequest, active: boolean) => void,
|
||||
initialValues?: FeatureRequest[],
|
||||
}
|
||||
|
||||
/** Modální dialog pro hlasování o nových funkcích. */
|
||||
export default function FeaturesVotingModal({ isOpen, onClose, onChange, initialValues }: Readonly<Props>) {
|
||||
|
||||
const handleChange = (e: React.ChangeEvent<HTMLInputElement>) => {
|
||||
onChange(e.currentTarget.value as FeatureRequest, e.currentTarget.checked);
|
||||
}
|
||||
|
||||
return <Modal show={isOpen} onHide={onClose} size="lg">
|
||||
<Modal.Header closeButton>
|
||||
<Modal.Title>
|
||||
Hlasujte pro nové funkce
|
||||
<p style={{ fontSize: '12px' }}>Je možno vybrat maximálně 4 možnosti</p>
|
||||
</Modal.Title>
|
||||
</Modal.Header>
|
||||
<Modal.Body>
|
||||
{(Object.keys(FeatureRequest) as Array<keyof typeof FeatureRequest>).map(key => {
|
||||
return <Form.Check
|
||||
key={key}
|
||||
type='checkbox'
|
||||
id={key}
|
||||
label={FeatureRequest[key]}
|
||||
onChange={handleChange}
|
||||
value={key}
|
||||
defaultChecked={initialValues?.includes(key as FeatureRequest)}
|
||||
/>
|
||||
})}
|
||||
<p className="mt-3" style={{ fontSize: '12px' }}>Něco jiného? Dejte vědět.</p>
|
||||
</Modal.Body>
|
||||
<Modal.Footer>
|
||||
<Button variant="primary" onClick={onClose}>
|
||||
Zavřít
|
||||
</Button>
|
||||
</Modal.Footer>
|
||||
</Modal>
|
||||
}
|
||||
@@ -33,9 +33,7 @@ function parseAmount(s: string): number | null {
|
||||
if (!s || s.trim().length === 0) return null;
|
||||
const n = parseFloat(s);
|
||||
if (isNaN(n) || n < 0) return null;
|
||||
const parts = s.split('.');
|
||||
if (parts.length === 2 && parts[1].length > 2) return null;
|
||||
return Math.round(n * 100) / 100;
|
||||
return Math.round(n * 100);
|
||||
}
|
||||
|
||||
export default function PayForAllModal({ isOpen, onClose, locationName, locationChoices, menu, payerLogin, bankAccount, bankAccountHolder }: Readonly<Props>) {
|
||||
@@ -55,11 +53,11 @@ export default function PayForAllModal({ isOpen, onClose, locationName, location
|
||||
let baseAmountParseFailed = false;
|
||||
if (menu) {
|
||||
for (const idx of selectedFoods) {
|
||||
const price = parsePriceCzk(menu.food?.[idx]?.price);
|
||||
if (price === null) {
|
||||
const priceKc = parsePriceCzk(menu.food?.[idx]?.price);
|
||||
if (priceKc === null) {
|
||||
baseAmountParseFailed = true;
|
||||
} else {
|
||||
baseAmount += price;
|
||||
baseAmount += Math.round(priceKc * 100);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -84,19 +82,19 @@ export default function PayForAllModal({ isOpen, onClose, locationName, location
|
||||
if (includedDiners.length === 0) return 0;
|
||||
const tip = parseAmount(tipTotal);
|
||||
if (tip === null || tip === 0) return 0;
|
||||
const totalPeople = includedDiners.length + 1; // +1 for payer
|
||||
return Math.round((tip / totalPeople) * 100) / 100;
|
||||
const totalPeople = includedDiners.length + 1;
|
||||
return Math.round(tip / totalPeople);
|
||||
})();
|
||||
const payerTipShare = (() => {
|
||||
const tip = parseAmount(tipTotal);
|
||||
if (!tip) return 0;
|
||||
return Math.round((tip - tipPerPerson * includedDiners.length) * 100) / 100;
|
||||
return tip - tipPerPerson * includedDiners.length;
|
||||
})();
|
||||
|
||||
const getTotal = (d: DinerEntry): number => {
|
||||
const surcharge = parseAmount(d.surchargeAmount) ?? 0;
|
||||
const tip = d.login === payerLogin ? payerTipShare : tipPerPerson;
|
||||
return Math.round((d.baseAmount + surcharge + tip) * 100) / 100;
|
||||
return d.baseAmount + surcharge + tip;
|
||||
};
|
||||
|
||||
const handleInclude = useCallback((login: string, checked: boolean) => {
|
||||
@@ -122,11 +120,6 @@ export default function PayForAllModal({ isOpen, onClose, locationName, location
|
||||
setError(`Celková částka pro ${d.login} musí být kladná`);
|
||||
return;
|
||||
}
|
||||
const amountStr = total.toString();
|
||||
if (amountStr.includes('.') && amountStr.split('.')[1].length > 2) {
|
||||
setError(`Částka pro ${d.login} má více než 2 desetinná místa`);
|
||||
return;
|
||||
}
|
||||
const foods = d.selectedFoods.map(i => menu?.food?.[i]?.name).filter(Boolean).join(', ');
|
||||
const purposeBase = `Oběd ${locationName}${foods ? ` — ${foods}` : ''}`;
|
||||
recipients.push({
|
||||
@@ -226,7 +219,7 @@ export default function PayForAllModal({ isOpen, onClose, locationName, location
|
||||
<td>
|
||||
<small>
|
||||
{foodNames || <span className="text-muted">—</span>}
|
||||
{hasMenu && d.baseAmount > 0 && <span className="text-muted"> ({d.baseAmount} Kč)</span>}
|
||||
{hasMenu && d.baseAmount > 0 && <span className="text-muted"> ({d.baseAmount / 100} Kč)</span>}
|
||||
{d.baseAmountParseFailed && <span className="text-warning"> ⚠</span>}
|
||||
</small>
|
||||
</td>
|
||||
@@ -254,10 +247,10 @@ export default function PayForAllModal({ isOpen, onClose, locationName, location
|
||||
</div>
|
||||
</td>
|
||||
<td className="text-end">
|
||||
{(() => { const s = isPayer ? payerTipShare : tipPerPerson; return s > 0 ? `${s} Kč` : '—'; })()}
|
||||
{(() => { const s = isPayer ? payerTipShare : tipPerPerson; return s > 0 ? `${s / 100} Kč` : '—'; })()}
|
||||
</td>
|
||||
<td className="text-end fw-bold">
|
||||
{`${total} Kč`}
|
||||
{`${total / 100} Kč`}
|
||||
</td>
|
||||
</tr>
|
||||
);
|
||||
@@ -278,7 +271,7 @@ export default function PayForAllModal({ isOpen, onClose, locationName, location
|
||||
/>
|
||||
<small className="text-muted">
|
||||
{includedDiners.length > 0 && tipPerPerson > 0
|
||||
? `(${tipPerPerson} Kč / osoba)`
|
||||
? `(${tipPerPerson / 100} Kč / osoba)`
|
||||
: ''}
|
||||
</small>
|
||||
</div>
|
||||
|
||||
@@ -1,10 +1,13 @@
|
||||
import { useState, useEffect } from "react";
|
||||
import { Modal, Button, Form, Table, Alert } from "react-bootstrap";
|
||||
import { generateQr, OrderGroup, OrderGroupMember, QrRecipient } from "../../../../types";
|
||||
import { sanitizeQrMessage } from "../../Utils";
|
||||
import { computeFeeShare, computeMemberTotal, countActiveMembers, isActiveMember } from "../../utils/groupFees";
|
||||
|
||||
type Props = {
|
||||
isOpen: boolean;
|
||||
onClose: () => void;
|
||||
onSuccess?: () => void;
|
||||
group: OrderGroup;
|
||||
payerLogin: string;
|
||||
bankAccount: string;
|
||||
@@ -18,7 +21,7 @@ type DinerEntry = {
|
||||
included: boolean;
|
||||
};
|
||||
|
||||
export default function PayForGroupModal({ isOpen, onClose, group, payerLogin, bankAccount, bankAccountHolder, groupId }: Readonly<Props>) {
|
||||
export default function PayForGroupModal({ isOpen, onClose, onSuccess, group, payerLogin, bankAccount, bankAccountHolder, groupId }: Readonly<Props>) {
|
||||
const [diners, setDiners] = useState<DinerEntry[]>([]);
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
const [loading, setLoading] = useState(false);
|
||||
@@ -29,32 +32,25 @@ export default function PayForGroupModal({ isOpen, onClose, group, payerLogin, b
|
||||
const entries: DinerEntry[] = (Object.entries(group.members) as [string, OrderGroupMember][]).map(([login, member]) => ({
|
||||
login,
|
||||
member,
|
||||
included: login !== payerLogin,
|
||||
// Standardně zahrnout všechny, kdo nejsou plátce a něco si objednali.
|
||||
included: login !== payerLogin && isActiveMember(member),
|
||||
}));
|
||||
setDiners(entries);
|
||||
setError(null);
|
||||
setSuccess(false);
|
||||
}, [isOpen, group, payerLogin]);
|
||||
|
||||
const memberCount = diners.length;
|
||||
const fees = group.fees ?? 0;
|
||||
const shipping = group.shipping ?? 0;
|
||||
const tip = group.tip ?? 0;
|
||||
const totalFees = fees + shipping + tip;
|
||||
const feeShare = memberCount > 0 ? Math.round(totalFees / memberCount * 100) / 100 : 0;
|
||||
// Poplatky se dělí jen mezi aktivní strávníky (kdo si reálně něco objednal).
|
||||
const activeCount = countActiveMembers(group.members);
|
||||
const feeShare = computeFeeShare(totalFees, activeCount);
|
||||
const feeParams = { totalFees, discountType: group.discountType, discountValue: group.discountValue ?? 0 };
|
||||
|
||||
const getMemberTotal = (entry: DinerEntry): number => {
|
||||
const base = entry.member.amount ?? 0;
|
||||
const surcharge = entry.member.surchargeAmount ?? 0;
|
||||
const discountType = group.discountType;
|
||||
const discountValue = group.discountValue ?? 0;
|
||||
const discount = discountValue > 0
|
||||
? (discountType === 'percent'
|
||||
? Math.round((base + surcharge) * discountValue / 100 * 100) / 100
|
||||
: Math.round(discountValue / memberCount * 100) / 100)
|
||||
: 0;
|
||||
return Math.round((base + surcharge + feeShare - discount) * 100) / 100;
|
||||
};
|
||||
const getMemberTotal = (entry: DinerEntry): number =>
|
||||
computeMemberTotal(entry.member, feeParams, feeShare, activeCount);
|
||||
|
||||
const includedNonPayers = diners.filter(d => d.included && d.login !== payerLogin);
|
||||
|
||||
@@ -73,14 +69,10 @@ export default function PayForGroupModal({ isOpen, onClose, group, payerLogin, b
|
||||
setError(`Celková částka pro ${d.login} musí být kladná`);
|
||||
return;
|
||||
}
|
||||
const amountStr = total.toString();
|
||||
if (amountStr.includes('.') && amountStr.split('.')[1].length > 2) {
|
||||
setError(`Částka pro ${d.login} má více než 2 desetinná místa`);
|
||||
return;
|
||||
}
|
||||
const note = d.member.note?.trim();
|
||||
recipients.push({
|
||||
login: d.login,
|
||||
purpose: `Objednávka ${group.name}`.substring(0, 60),
|
||||
purpose: sanitizeQrMessage(note || `Objednávka ${group.name}`),
|
||||
amount: total,
|
||||
});
|
||||
}
|
||||
@@ -99,6 +91,7 @@ export default function PayForGroupModal({ isOpen, onClose, group, payerLogin, b
|
||||
setError((response.error as any).error || 'Nastala chyba při generování QR kódů');
|
||||
} else {
|
||||
setSuccess(true);
|
||||
onSuccess?.();
|
||||
setTimeout(() => onClose(), 2000);
|
||||
}
|
||||
} catch (e: any) {
|
||||
@@ -132,15 +125,15 @@ export default function PayForGroupModal({ isOpen, onClose, group, payerLogin, b
|
||||
|
||||
{hasFees && (
|
||||
<div className="d-flex gap-3 mb-2 text-muted" style={{ fontSize: '0.9em' }}>
|
||||
{fees > 0 && <span>Poplatky: <strong>{fees} Kč</strong></span>}
|
||||
{shipping > 0 && <span>Doprava: <strong>{shipping} Kč</strong></span>}
|
||||
{tip > 0 && <span>Spropitné: <strong>{tip} Kč</strong></span>}
|
||||
<span>→ {feeShare} Kč/os.</span>
|
||||
{fees > 0 && <span>Poplatky: <strong>{fees / 100} Kč</strong></span>}
|
||||
{shipping > 0 && <span>Doprava: <strong>{shipping / 100} Kč</strong></span>}
|
||||
{tip > 0 && <span>Spropitné: <strong>{tip / 100} Kč</strong></span>}
|
||||
<span>→ {feeShare / 100} Kč/os.</span>
|
||||
</div>
|
||||
)}
|
||||
{group.discountValue != null && group.discountValue > 0 && (
|
||||
<div className="mb-2 text-success" style={{ fontSize: '0.9em' }}>
|
||||
Sleva: {group.discountType === 'percent' ? `${group.discountValue}%` : `${group.discountValue} Kč`}
|
||||
Sleva: {group.discountType === 'percent' ? `${group.discountValue}%` : `${group.discountValue / 100} Kč`}
|
||||
</div>
|
||||
)}
|
||||
|
||||
@@ -158,13 +151,16 @@ export default function PayForGroupModal({ isOpen, onClose, group, payerLogin, b
|
||||
<tbody>
|
||||
{diners.map(d => {
|
||||
const isPayer = d.login === payerLogin;
|
||||
const active = isActiveMember(d.member);
|
||||
const total = getMemberTotal(d);
|
||||
const surcharge = d.member.surchargeAmount ?? 0;
|
||||
return (
|
||||
<tr key={d.login} className={!d.included && !isPayer ? 'text-muted' : ''}>
|
||||
<tr key={d.login} className={(!d.included && !isPayer) || !active ? 'text-muted' : ''}>
|
||||
<td className="text-center">
|
||||
{isPayer ? (
|
||||
<small className="text-muted">plátce</small>
|
||||
) : !active ? (
|
||||
<small className="text-muted">jen objednává</small>
|
||||
) : (
|
||||
<Form.Check
|
||||
type="checkbox"
|
||||
@@ -180,18 +176,18 @@ export default function PayForGroupModal({ isOpen, onClose, group, payerLogin, b
|
||||
)}
|
||||
</td>
|
||||
<td className="text-end">
|
||||
{(d.member.amount ?? 0) > 0 ? `${d.member.amount} Kč` : <span className="text-muted">—</span>}
|
||||
{(d.member.amount ?? 0) > 0 ? `${d.member.amount! / 100} Kč` : <span className="text-muted">—</span>}
|
||||
</td>
|
||||
<td className="text-end">
|
||||
{surcharge > 0 ? `${surcharge} Kč` : <span className="text-muted">—</span>}
|
||||
{surcharge > 0 ? `${surcharge / 100} Kč` : <span className="text-muted">—</span>}
|
||||
</td>
|
||||
{hasFees && (
|
||||
<td className="text-end">
|
||||
{feeShare > 0 ? `${feeShare} Kč` : '—'}
|
||||
{active && feeShare > 0 ? `${feeShare / 100} Kč` : '—'}
|
||||
</td>
|
||||
)}
|
||||
<td className="text-end fw-bold">
|
||||
{total > 0 ? `${total} Kč` : <span className="text-muted">—</span>}
|
||||
{total > 0 ? `${total / 100} Kč` : <span className="text-muted">—</span>}
|
||||
</td>
|
||||
</tr>
|
||||
);
|
||||
|
||||
@@ -15,12 +15,12 @@ export default function PizzaAdditionalFeeModal({ customerName, isOpen, onClose,
|
||||
const priceRef = useRef<HTMLInputElement>(null);
|
||||
|
||||
const doSubmit = () => {
|
||||
onSave(customerName, textRef.current?.value, Number.parseInt(priceRef.current?.value ?? "0"));
|
||||
onSave(customerName, textRef.current?.value, Math.round(Number.parseFloat(priceRef.current?.value ?? "0") * 100));
|
||||
}
|
||||
|
||||
const handleKeyDown = (e: React.KeyboardEvent<HTMLInputElement>) => {
|
||||
if (e.key === 'Enter') {
|
||||
onSave(customerName, textRef.current?.value, Number.parseInt(priceRef.current?.value ?? "0"));
|
||||
onSave(customerName, textRef.current?.value, Math.round(Number.parseFloat(priceRef.current?.value ?? "0") * 100));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -2,17 +2,19 @@ import { useState } from "react";
|
||||
import { Modal, Button, Form, ListGroup, Alert } from "react-bootstrap";
|
||||
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
|
||||
import { faTrashCan } from "@fortawesome/free-regular-svg-icons";
|
||||
import { addStore, deleteStore } from "../../../../types";
|
||||
import { faUpRightFromSquare } from "@fortawesome/free-solid-svg-icons";
|
||||
import { addStore, deleteStore, Store } from "../../../../types";
|
||||
|
||||
type Props = {
|
||||
isOpen: boolean;
|
||||
onClose: () => void;
|
||||
stores: string[];
|
||||
onStoresChanged: (stores: string[]) => void;
|
||||
stores: Store[];
|
||||
onStoresChanged: (stores: Store[]) => void;
|
||||
};
|
||||
|
||||
export default function StoreAdminModal({ isOpen, onClose, stores, onStoresChanged }: Readonly<Props>) {
|
||||
const [newName, setNewName] = useState('');
|
||||
const [newUrl, setNewUrl] = useState('');
|
||||
const [heslo, setHeslo] = useState('');
|
||||
const [loading, setLoading] = useState(false);
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
@@ -22,12 +24,13 @@ export default function StoreAdminModal({ isOpen, onClose, stores, onStoresChang
|
||||
setError(null);
|
||||
setLoading(true);
|
||||
try {
|
||||
const res = await addStore({ body: { name: newName.trim(), heslo } });
|
||||
const res = await addStore({ body: { name: newName.trim(), url: newUrl.trim() || undefined, heslo } });
|
||||
if (res.error) {
|
||||
setError((res.error as any).error || 'Nastala chyba');
|
||||
} else if (res.data) {
|
||||
onStoresChanged(res.data as string[]);
|
||||
onStoresChanged(res.data as Store[]);
|
||||
setNewName('');
|
||||
setNewUrl('');
|
||||
}
|
||||
} catch (e: any) {
|
||||
setError(e.message || 'Nastala chyba');
|
||||
@@ -44,7 +47,7 @@ export default function StoreAdminModal({ isOpen, onClose, stores, onStoresChang
|
||||
if (res.error) {
|
||||
setError((res.error as any).error || 'Nastala chyba');
|
||||
} else if (res.data) {
|
||||
onStoresChanged(res.data as string[]);
|
||||
onStoresChanged(res.data as Store[]);
|
||||
}
|
||||
} catch (e: any) {
|
||||
setError(e.message || 'Nastala chyba');
|
||||
@@ -78,14 +81,22 @@ export default function StoreAdminModal({ isOpen, onClose, stores, onStoresChang
|
||||
|
||||
<hr />
|
||||
<h6>Přidat obchod</h6>
|
||||
<div className="d-flex gap-2 mb-3">
|
||||
<Form.Control
|
||||
className="mb-2"
|
||||
type="text"
|
||||
placeholder="Název obchodu"
|
||||
value={newName}
|
||||
onChange={e => setNewName(e.target.value)}
|
||||
onKeyDown={e => { e.stopPropagation(); if (e.key === 'Enter') handleAdd(); }}
|
||||
/>
|
||||
<div className="d-flex gap-2 mb-3">
|
||||
<Form.Control
|
||||
type="url"
|
||||
placeholder="URL na nabídku (volitelné, např. Bolt Food/Wolt)"
|
||||
value={newUrl}
|
||||
onChange={e => setNewUrl(e.target.value)}
|
||||
onKeyDown={e => { e.stopPropagation(); if (e.key === 'Enter') handleAdd(); }}
|
||||
/>
|
||||
<Button variant="primary" onClick={handleAdd} disabled={loading || !newName.trim() || !heslo}>
|
||||
Přidat
|
||||
</Button>
|
||||
@@ -97,13 +108,20 @@ export default function StoreAdminModal({ isOpen, onClose, stores, onStoresChang
|
||||
) : (
|
||||
<ListGroup>
|
||||
{stores.map(s => (
|
||||
<ListGroup.Item key={s} className="d-flex justify-content-between align-items-center">
|
||||
{s}
|
||||
<ListGroup.Item key={s.name} className="d-flex justify-content-between align-items-center">
|
||||
<span>
|
||||
{s.name}
|
||||
{s.url && /^https?:\/\//i.test(s.url) && (
|
||||
<a href={s.url} target="_blank" rel="noopener noreferrer" className="ms-2" title="Otevřít nabídku v nové záložce">
|
||||
<FontAwesomeIcon icon={faUpRightFromSquare} />
|
||||
</a>
|
||||
)}
|
||||
</span>
|
||||
<FontAwesomeIcon
|
||||
icon={faTrashCan}
|
||||
className="action-icon"
|
||||
title="Odebrat"
|
||||
onClick={() => handleRemove(s)}
|
||||
onClick={() => handleRemove(s.name)}
|
||||
style={{ cursor: 'pointer' }}
|
||||
/>
|
||||
</ListGroup.Item>
|
||||
|
||||
@@ -0,0 +1,30 @@
|
||||
import { Modal, Button } from "react-bootstrap";
|
||||
import { Suggestion } from "../../../../types";
|
||||
|
||||
type Props = {
|
||||
suggestion?: Suggestion;
|
||||
onClose: () => void;
|
||||
};
|
||||
|
||||
/** Modální dialog zobrazující celý detail návrhu na vylepšení. */
|
||||
export default function SuggestionDetailModal({ suggestion, onClose }: Readonly<Props>) {
|
||||
return (
|
||||
<Modal show={!!suggestion} onHide={onClose} size="lg">
|
||||
<Modal.Header closeButton>
|
||||
<Modal.Title><h2>{suggestion?.title}</h2></Modal.Title>
|
||||
</Modal.Header>
|
||||
<Modal.Body>
|
||||
<p className="text-muted mb-3">
|
||||
Navrhovatel: <strong>{suggestion?.author}</strong> · Hlasy: <strong>{suggestion?.voteScore}</strong>
|
||||
{suggestion?.resolved && <> · <strong>Vyřešeno</strong></>}
|
||||
</p>
|
||||
<p style={{ whiteSpace: "pre-wrap" }}>{suggestion?.description}</p>
|
||||
</Modal.Body>
|
||||
<Modal.Footer>
|
||||
<Button variant="secondary" onClick={onClose}>
|
||||
Zavřít
|
||||
</Button>
|
||||
</Modal.Footer>
|
||||
</Modal>
|
||||
);
|
||||
}
|
||||
@@ -4,6 +4,8 @@ const BANK_ACCOUNT_NUMBER_KEY = 'bank_account_number';
|
||||
const BANK_ACCOUNT_HOLDER_KEY = 'bank_account_holder_name';
|
||||
const HIDE_SOUPS_KEY = 'hide_soups';
|
||||
const THEME_KEY = 'theme_preference';
|
||||
const ACCENT_HUE_KEY = 'accent_hue';
|
||||
const LEGACY_COLOR_THEME_KEY = 'color_theme';
|
||||
|
||||
export type ThemePreference = 'system' | 'light' | 'dark';
|
||||
|
||||
@@ -12,10 +14,13 @@ export type SettingsContextProps = {
|
||||
holderName?: string,
|
||||
hideSoups?: boolean,
|
||||
themePreference: ThemePreference,
|
||||
accentHue: number,
|
||||
effectiveDark: boolean,
|
||||
setBankAccountNumber: (accountNumber?: string) => void,
|
||||
setBankAccountHolderName: (holderName?: string) => void,
|
||||
setHideSoupsOption: (hideSoups?: boolean) => void,
|
||||
setThemePreference: (theme: ThemePreference) => void,
|
||||
setAccentHue: (hue: number) => void,
|
||||
}
|
||||
|
||||
type ContextProps = {
|
||||
@@ -45,11 +50,74 @@ function getInitialTheme(): ThemePreference {
|
||||
return 'system';
|
||||
}
|
||||
|
||||
function getInitialAccentHue(): number {
|
||||
try {
|
||||
const saved = localStorage.getItem(ACCENT_HUE_KEY);
|
||||
if (saved !== null) {
|
||||
const n = parseInt(saved, 10);
|
||||
if (!isNaN(n) && n >= 0 && n <= 360) return n;
|
||||
}
|
||||
// Migrace ze starého string formátu (green/blue/purple)
|
||||
const old = localStorage.getItem(LEGACY_COLOR_THEME_KEY);
|
||||
if (old === 'blue') return 217;
|
||||
if (old === 'purple') return 263;
|
||||
} catch {
|
||||
// localStorage nedostupný
|
||||
}
|
||||
return 142;
|
||||
}
|
||||
|
||||
// Převod HSL na relativní jas dle WCAG (pro výpočet kontrastu s bílým textem)
|
||||
function hslToRelativeLuminance(h: number, s: number, l: number): number {
|
||||
const sn = s / 100, ln = l / 100;
|
||||
const a = sn * Math.min(ln, 1 - ln);
|
||||
const ch = (n: number) => {
|
||||
const k = (n + h / 30) % 12;
|
||||
return ln - a * Math.max(Math.min(k - 3, 9 - k, 1), -1);
|
||||
};
|
||||
const toLinear = (c: number) => c <= 0.04045 ? c / 12.92 : Math.pow((c + 0.055) / 1.055, 2.4);
|
||||
return 0.2126 * toLinear(ch(0)) + 0.7152 * toLinear(ch(8)) + 0.0722 * toLinear(ch(4));
|
||||
}
|
||||
|
||||
// Najde nejnižší světlost, při které má barva dostatečný kontrast s bílým textem (WCAG AA 4.5:1)
|
||||
function adjustedL(hue: number, sat: number, targetL: number): number {
|
||||
let l = targetL;
|
||||
while (l >= 5) {
|
||||
const lum = hslToRelativeLuminance(hue, sat, l);
|
||||
if (1.05 / (lum + 0.05) >= 4.5) return l;
|
||||
l -= 1;
|
||||
}
|
||||
return l;
|
||||
}
|
||||
|
||||
function applyAccentColors(hue: number, isDark: boolean): void {
|
||||
const sat = 70;
|
||||
const baseL = adjustedL(hue, sat, isDark ? 55 : 38);
|
||||
const hoverL = isDark ? Math.min(baseL + 10, 80) : Math.max(baseL - 10, 10);
|
||||
const root = document.documentElement;
|
||||
root.style.setProperty('--luncher-primary', `hsl(${hue} ${sat}% ${baseL}%)`);
|
||||
root.style.setProperty('--luncher-primary-hover', `hsl(${hue} ${sat}% ${hoverL}%)`);
|
||||
root.style.setProperty('--luncher-primary-light', isDark
|
||||
? `hsl(${hue} 60% 12%)`
|
||||
: `hsl(${hue} 60% 92%)`);
|
||||
root.style.setProperty('--luncher-action-icon', `hsl(${hue} ${sat}% ${baseL}%)`);
|
||||
root.style.setProperty('--luncher-success', `hsl(${hue} ${sat}% ${baseL}%)`);
|
||||
}
|
||||
|
||||
function useProvideSettings(): SettingsContextProps {
|
||||
const [bankAccount, setBankAccount] = useState<string | undefined>();
|
||||
const [holderName, setHolderName] = useState<string | undefined>();
|
||||
const [hideSoups, setHideSoups] = useState<boolean | undefined>();
|
||||
const [themePreference, setTheme] = useState<ThemePreference>(getInitialTheme);
|
||||
const [accentHue, setHue] = useState<number>(getInitialAccentHue);
|
||||
const [effectiveDark, setEffectiveDark] = useState<boolean>(() => {
|
||||
try {
|
||||
const pref = localStorage.getItem(THEME_KEY) as ThemePreference | null;
|
||||
if (pref === 'dark') return true;
|
||||
if (pref === 'light') return false;
|
||||
} catch { /* noop */ }
|
||||
return window.matchMedia?.('(prefers-color-scheme: dark)').matches ?? false;
|
||||
});
|
||||
|
||||
useEffect(() => {
|
||||
const accountNumber = localStorage.getItem(BANK_ACCOUNT_NUMBER_KEY);
|
||||
@@ -95,24 +163,27 @@ function useProvideSettings(): SettingsContextProps {
|
||||
}, [themePreference]);
|
||||
|
||||
useEffect(() => {
|
||||
const applyTheme = (theme: 'light' | 'dark') => {
|
||||
document.documentElement.setAttribute('data-bs-theme', theme);
|
||||
const applyTheme = (dark: boolean) => {
|
||||
document.documentElement.setAttribute('data-bs-theme', dark ? 'dark' : 'light');
|
||||
setEffectiveDark(dark);
|
||||
};
|
||||
|
||||
if (themePreference === 'system') {
|
||||
const mediaQuery = window.matchMedia('(prefers-color-scheme: dark)');
|
||||
applyTheme(mediaQuery.matches ? 'dark' : 'light');
|
||||
|
||||
const handler = (e: MediaQueryListEvent) => {
|
||||
applyTheme(e.matches ? 'dark' : 'light');
|
||||
};
|
||||
mediaQuery.addEventListener('change', handler);
|
||||
return () => mediaQuery.removeEventListener('change', handler);
|
||||
const mq = window.matchMedia('(prefers-color-scheme: dark)');
|
||||
applyTheme(mq.matches);
|
||||
const handler = (e: MediaQueryListEvent) => applyTheme(e.matches);
|
||||
mq.addEventListener('change', handler);
|
||||
return () => mq.removeEventListener('change', handler);
|
||||
} else {
|
||||
applyTheme(themePreference);
|
||||
applyTheme(themePreference === 'dark');
|
||||
}
|
||||
}, [themePreference]);
|
||||
|
||||
// Aplikuje accent barvy při změně hue nebo přepnutí světlý/tmavý
|
||||
useEffect(() => {
|
||||
localStorage.setItem(ACCENT_HUE_KEY, String(accentHue));
|
||||
applyAccentColors(accentHue, effectiveDark);
|
||||
}, [accentHue, effectiveDark]);
|
||||
|
||||
function setBankAccountNumber(bankAccount?: string) {
|
||||
setBankAccount(bankAccount);
|
||||
}
|
||||
@@ -129,14 +200,21 @@ function useProvideSettings(): SettingsContextProps {
|
||||
setTheme(theme);
|
||||
}
|
||||
|
||||
function setAccentHue(hue: number) {
|
||||
setHue(hue);
|
||||
}
|
||||
|
||||
return {
|
||||
bankAccount,
|
||||
holderName,
|
||||
hideSoups,
|
||||
themePreference,
|
||||
accentHue,
|
||||
effectiveDark,
|
||||
setBankAccountNumber,
|
||||
setBankAccountHolderName,
|
||||
setHideSoupsOption,
|
||||
setThemePreference,
|
||||
setAccentHue,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -8,12 +8,25 @@ if (process.env.NODE_ENV === 'development') {
|
||||
socketPath = undefined;
|
||||
} else {
|
||||
socketUrl = `${globalThis.location.host}`;
|
||||
socketPath = `${globalThis.location.pathname}socket.io`;
|
||||
socketPath = '/socket.io';
|
||||
}
|
||||
|
||||
export const socket = socketio.connect(socketUrl, { path: socketPath, transports: ["websocket"] });
|
||||
export const SocketContext = React.createContext();
|
||||
|
||||
// Prohlížeče throttlují setTimeout v neaktivních tabech, což zdržuje automatické
|
||||
// znovupřipojení socket.io. Po návratu do tabu nebo focusu okna se připojíme hned.
|
||||
document.addEventListener('visibilitychange', () => {
|
||||
if (document.visibilityState === 'visible' && !socket.connected) {
|
||||
socket.connect();
|
||||
}
|
||||
});
|
||||
window.addEventListener('focus', () => {
|
||||
if (!socket.connected) {
|
||||
socket.connect();
|
||||
}
|
||||
});
|
||||
|
||||
// Konstanty websocket eventů, musí odpovídat těm na serveru!
|
||||
export const EVENT_CONNECT = 'connect';
|
||||
export const EVENT_DISCONNECT = 'disconnect';
|
||||
|
||||
@@ -1,15 +1,20 @@
|
||||
import { useContext, useEffect, useRef, useState } from 'react';
|
||||
import { useCallback, useContext, useEffect, useRef, useState } from 'react';
|
||||
import { Alert, Badge, Button, Card, Form, Modal, OverlayTrigger, Table, Tooltip } from 'react-bootstrap';
|
||||
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
|
||||
import { faTrashCan } from '@fortawesome/free-regular-svg-icons';
|
||||
import { faBasketShopping, faCircleCheck, faGear, faLock, faLockOpen, faSearch, faUserPlus } from '@fortawesome/free-solid-svg-icons';
|
||||
import { faBasketShopping, faChevronLeft, faChevronRight, faCircleCheck, faClockRotateLeft, faGear, faLock, faLockOpen, faPen, faSearch, faUserPlus } from '@fortawesome/free-solid-svg-icons';
|
||||
import DatePicker, { registerLocale } from 'react-datepicker';
|
||||
import { cs } from 'date-fns/locale';
|
||||
import 'react-datepicker/dist/react-datepicker.css';
|
||||
import {
|
||||
ClientData, GroupState, MealSlot, OrderGroup, OrderGroupMember,
|
||||
getData, createGroup, deleteGroup, addGroupMember, removeGroupMember, updateGroupMember, setGroupState, updateGroupTimes,
|
||||
ClientData, GroupState, MealSlot, OrderGroup, OrderGroupMember, PendingQr,
|
||||
getData, createGroup, deleteGroup, addGroupMember, removeGroupMember, updateGroupMember, setGroupState, updateGroupTimes, setBoltTracking, getOrderDates,
|
||||
} from '../../../types';
|
||||
import { EVENT_MESSAGE, SocketContext } from '../context/socket';
|
||||
import { computeFeeShare, computeMemberTotal, countActiveMembers } from '../utils/groupFees';
|
||||
import { EVENT_MESSAGE, EVENT_PENDING_QR, SocketContext } from '../context/socket';
|
||||
import { useAuth } from '../context/auth';
|
||||
import { useSettings } from '../context/settings';
|
||||
import { formatDate, formatDateString } from '../Utils';
|
||||
import Login from '../Login';
|
||||
import Header from '../components/Header';
|
||||
import Footer from '../components/Footer';
|
||||
@@ -17,9 +22,50 @@ import Loader from '../components/Loader';
|
||||
import StoreAdminModal from '../components/modals/StoreAdminModal';
|
||||
import PayForGroupModal from '../components/modals/PayForGroupModal';
|
||||
import EditGroupFeesModal from '../components/modals/EditGroupFeesModal';
|
||||
import PendingPayments from '../components/PendingPayments';
|
||||
import BoltOrderProgress from '../components/BoltOrderProgress';
|
||||
|
||||
const SLOT = MealSlot.EXTRA;
|
||||
const TIME_REGEX = /^([01]\d|2[0-3]):[0-5]\d$/;
|
||||
const BOLT_SHARE_URL_PREFIX = 'https://food.bolt.eu/sharedActiveOrder/';
|
||||
const BOLT_TOKEN_REGEX = /^[0-9a-f]{64}$/i;
|
||||
|
||||
/** Vytáhne sledovací token ze sdílecí URL Bolt Food, nebo přijme samotný token. Null = neplatný vstup. */
|
||||
function extractBoltToken(input: string): string | null {
|
||||
const trimmed = input.trim();
|
||||
if (!trimmed) return null;
|
||||
if (BOLT_TOKEN_REGEX.test(trimmed)) return trimmed;
|
||||
try {
|
||||
const segments = new URL(trimmed).pathname.split('/').filter(Boolean);
|
||||
const last = segments[segments.length - 1];
|
||||
return last && BOLT_TOKEN_REGEX.test(last) ? last : null;
|
||||
} catch {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
/** Zkrátí dlouhý odkaz pro zobrazení v řádku (zachová začátek i konec). */
|
||||
function shortenUrl(url: string, max = 48): string {
|
||||
if (url.length <= max) return url;
|
||||
const head = Math.ceil((max - 1) / 2);
|
||||
const tail = Math.floor((max - 1) / 2);
|
||||
return `${url.slice(0, head)}…${url.slice(url.length - tail)}`;
|
||||
}
|
||||
|
||||
// Český lokál pro date picker (názvy měsíců/dnů, pondělí jako první den)
|
||||
registerLocale('cs', cs);
|
||||
|
||||
/** Vrátí ISO datum (YYYY-MM-DD) posunuté o předaný počet dní. */
|
||||
function shiftIsoDate(iso: string, days: number): string {
|
||||
const date = new Date(`${iso}T00:00:00`);
|
||||
date.setDate(date.getDate() + days);
|
||||
return formatDate(date);
|
||||
}
|
||||
|
||||
/** Převede ISO datum (YYYY-MM-DD) na lokální Date (půlnoc), nebo null. */
|
||||
function isoToDate(iso?: string): Date | null {
|
||||
return iso ? new Date(`${iso}T00:00:00`) : null;
|
||||
}
|
||||
|
||||
function stateBadge(state: GroupState) {
|
||||
const map: Record<GroupState, { bg: string; label: string }> = {
|
||||
@@ -37,43 +83,117 @@ export default function OrderGroupsPage() {
|
||||
const socket = useContext(SocketContext);
|
||||
const [data, setData] = useState<ClientData | undefined>();
|
||||
const [failure, setFailure] = useState(false);
|
||||
// Vybrané datum pro zobrazení historie (undefined = aktuální den)
|
||||
const [selectedDate, setSelectedDate] = useState<string | undefined>();
|
||||
// ISO datum dnešního dne dle serveru (horní hranice navigace), zjištěné při prvním načtení
|
||||
const [todayIso, setTodayIso] = useState<string | undefined>();
|
||||
// Ref pro socket handler – aby věděl, zda se zobrazuje historie (na ní se živé aktualizace neaplikují)
|
||||
const selectedDateRef = useRef<string | undefined>(undefined);
|
||||
// ISO data dnů, ve kterých existuje aspoň jedna objednávka (pro zvýraznění v date pickeru)
|
||||
const [orderDates, setOrderDates] = useState<string[]>([]);
|
||||
const [newGroupName, setNewGroupName] = useState('');
|
||||
const [creating, setCreating] = useState(false);
|
||||
const [adminModalOpen, setAdminModalOpen] = useState(false);
|
||||
const [editAmounts, setEditAmounts] = useState<Record<string, string>>({});
|
||||
const [editNotes, setEditNotes] = useState<Record<string, string>>({});
|
||||
const [editSurcharges, setEditSurcharges] = useState<Record<string, { text: string; amount: string }>>({});
|
||||
const [editTimes, setEditTimes] = useState<Record<string, { orderedAt: string; deliveryAt: string }>>({});
|
||||
const [editTimes, setEditTimes] = useState<Record<string, { orderedAt: string; deliveryAt: string; boltUrl: string }>>({});
|
||||
const [payModal, setPayModal] = useState<OrderGroup | null>(null);
|
||||
const [feesModal, setFeesModal] = useState<OrderGroup | null>(null);
|
||||
const [confirmOrderGroup, setConfirmOrderGroup] = useState<OrderGroup | null>(null);
|
||||
const [pageError, setPageError] = useState<string | null>(null);
|
||||
const inputRef = useRef<HTMLInputElement>(null);
|
||||
|
||||
const fetchData = async () => {
|
||||
const fetchData = async (date?: string) => {
|
||||
try {
|
||||
const r = await getData({ query: { slot: SLOT } });
|
||||
if (r.data) setData(r.data);
|
||||
const r = await getData({ query: { slot: SLOT, date } });
|
||||
if (r.data) {
|
||||
setData(r.data);
|
||||
// Při zobrazení aktuálního dne si zapamatujeme dnešní ISO datum jako horní hranici navigace
|
||||
if (!date && r.data.isoDate) setTodayIso(r.data.isoDate);
|
||||
}
|
||||
} catch {
|
||||
setFailure(true);
|
||||
}
|
||||
};
|
||||
|
||||
// Načte dny s objednávkou pro zvýraznění v date pickeru
|
||||
const fetchOrderDates = async () => {
|
||||
const r = await getOrderDates();
|
||||
if (r.data?.dates) setOrderDates(r.data.dates);
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
selectedDateRef.current = selectedDate;
|
||||
}, [selectedDate]);
|
||||
|
||||
useEffect(() => {
|
||||
if (!auth?.login) return;
|
||||
fetchData();
|
||||
fetchData(selectedDate);
|
||||
}, [auth?.login, selectedDate]);
|
||||
|
||||
useEffect(() => {
|
||||
if (!auth?.login) return;
|
||||
fetchOrderDates();
|
||||
}, [auth?.login]);
|
||||
|
||||
useEffect(() => {
|
||||
socket.on(EVENT_MESSAGE, (newData: ClientData) => {
|
||||
// Živé aktualizace se týkají vždy dneška – při zobrazení historie je ignorujeme
|
||||
if (selectedDateRef.current) return;
|
||||
if (newData.slot === SLOT) setData(prev => ({
|
||||
...newData,
|
||||
stores: newData.stores ?? prev?.stores,
|
||||
}));
|
||||
});
|
||||
return () => { socket.off(EVENT_MESSAGE); };
|
||||
// Nová nevyřízená platba (QR kód) – připojíme do dat, aby se zobrazila i bez znovunačtení stránky
|
||||
socket.on(EVENT_PENDING_QR, (pendingQr: PendingQr) => {
|
||||
if (selectedDateRef.current) return;
|
||||
setData(prev => prev ? { ...prev, pendingQrs: [...(prev.pendingQrs ?? []), pendingQr] } : prev);
|
||||
});
|
||||
return () => { socket.off(EVENT_MESSAGE); socket.off(EVENT_PENDING_QR); };
|
||||
}, [socket]);
|
||||
|
||||
// Připojení do osobní socket místnosti po přihlášení – bez toho nechodí události
|
||||
// o nových nevyřízených platbách (QR kódy se posílají do místnosti user:<login>)
|
||||
useEffect(() => {
|
||||
if (auth?.login) {
|
||||
socket.emit('join', auth.login);
|
||||
}
|
||||
}, [auth?.login, socket]);
|
||||
|
||||
useEffect(() => {
|
||||
// Po znovupřipojení socketu znovu vstoupíme do osobní místnosti a načteme aktuálně
|
||||
// zobrazený den (mohli jsme přijít o živé aktualizace)
|
||||
const onReconnect = () => {
|
||||
if (auth?.login) socket.emit('join', auth.login);
|
||||
fetchData(selectedDateRef.current);
|
||||
};
|
||||
socket.io.on('reconnect', onReconnect);
|
||||
return () => { socket.io.off('reconnect', onReconnect); };
|
||||
}, [socket, auth?.login]);
|
||||
|
||||
// Navigace mezi dny pomocí klávesových šipek (←/→), obdobně jako na hlavní stránce
|
||||
const handleKeyDown = useCallback((e: KeyboardEvent) => {
|
||||
// Ignorujeme, pokud uživatel právě píše do formulářového pole
|
||||
const tag = (e.target as HTMLElement)?.tagName;
|
||||
if (tag === 'INPUT' || tag === 'SELECT' || tag === 'TEXTAREA') return;
|
||||
const currentIso = data?.isoDate;
|
||||
if (!currentIso) return;
|
||||
if (e.keyCode === 37) {
|
||||
// Předchozí den – do minulosti bez omezení
|
||||
setSelectedDate(shiftIsoDate(currentIso, -1));
|
||||
} else if (e.keyCode === 39 && todayIso != null && currentIso < todayIso) {
|
||||
// Následující den – nejvýše po dnešek (na dnešek přes undefined kvůli živým aktualizacím)
|
||||
const target = shiftIsoDate(currentIso, 1);
|
||||
setSelectedDate(target >= todayIso ? undefined : target);
|
||||
}
|
||||
}, [data?.isoDate, todayIso]);
|
||||
|
||||
useEffect(() => {
|
||||
document.addEventListener('keydown', handleKeyDown);
|
||||
return () => document.removeEventListener('keydown', handleKeyDown);
|
||||
}, [handleKeyDown]);
|
||||
|
||||
const refresh = async (fn: () => Promise<any>): Promise<boolean> => {
|
||||
setPageError(null);
|
||||
const result = await fn();
|
||||
@@ -86,7 +206,8 @@ export default function OrderGroupsPage() {
|
||||
setData(result.data);
|
||||
socket.emit?.('message', result.data as ClientData);
|
||||
}
|
||||
await fetchData();
|
||||
// Sada dnů s objednávkou se mohla změnit (vytvoření/smazání skupiny)
|
||||
fetchOrderDates();
|
||||
return true;
|
||||
};
|
||||
|
||||
@@ -125,7 +246,7 @@ export default function OrderGroupsPage() {
|
||||
setPageError('Zadejte platnou kladnou částku');
|
||||
return;
|
||||
}
|
||||
const ok = await refresh(() => updateGroupMember({ body: { id: groupId, login, amount: n } }));
|
||||
const ok = await refresh(() => updateGroupMember({ body: { id: groupId, login, amount: Math.round(n * 100) } }));
|
||||
if (ok) setEditAmounts(prev => { const next = { ...prev }; delete next[key]; return next; });
|
||||
};
|
||||
|
||||
@@ -145,14 +266,14 @@ export default function OrderGroupsPage() {
|
||||
setPageError('Zadejte platnou výši příplatku');
|
||||
return;
|
||||
}
|
||||
const ok = await refresh(() => updateGroupMember({ body: { id: groupId, login, surchargeText, surchargeAmount: rawAmount === '' ? 0 : surchargeAmount } }));
|
||||
const ok = await refresh(() => updateGroupMember({ body: { id: groupId, login, surchargeText, surchargeAmount: rawAmount === '' ? 0 : Math.round(surchargeAmount * 100) } }));
|
||||
if (ok) setEditSurcharges(prev => { const next = { ...prev }; delete next[key]; return next; });
|
||||
};
|
||||
|
||||
const handleSaveTimes = async (group: OrderGroup) => {
|
||||
const times = editTimes[group.id];
|
||||
if (!times) return;
|
||||
const { orderedAt, deliveryAt } = times;
|
||||
const { orderedAt, deliveryAt, boltUrl } = times;
|
||||
if (orderedAt && !TIME_REGEX.test(orderedAt)) {
|
||||
setPageError('Čas objednání musí být ve formátu HH:MM');
|
||||
return;
|
||||
@@ -161,11 +282,24 @@ export default function OrderGroupsPage() {
|
||||
setPageError('Čas doručení musí být ve formátu HH:MM');
|
||||
return;
|
||||
}
|
||||
const ok = await refresh(() => updateGroupTimes({ body: { id: group.id, orderedAt, deliveryAt } }));
|
||||
// Bolt odkaz se odesílá jen při změně oproti aktuálnímu tokenu skupiny
|
||||
const boltToken = boltUrl.trim() ? extractBoltToken(boltUrl) : null;
|
||||
if (boltUrl.trim() && !boltToken) {
|
||||
setPageError('Neplatný odkaz Bolt (očekávána URL sdílení objednávky)');
|
||||
return;
|
||||
}
|
||||
const boltChanged = (boltToken ?? undefined) !== group.boltTrackingToken;
|
||||
let ok = await refresh(() => updateGroupTimes({ body: { id: group.id, orderedAt, deliveryAt } }));
|
||||
if (ok && boltChanged) {
|
||||
ok = await refresh(() => setBoltTracking({ body: { id: group.id, shareUrl: boltUrl.trim() } }));
|
||||
}
|
||||
if (ok) setEditTimes(prev => { const next = { ...prev }; delete next[group.id]; return next; });
|
||||
};
|
||||
|
||||
// Pozn.: tyto funkce se volají až v renderu, kde je k dispozici `selectedDate`.
|
||||
// Historie (jiný než aktuální den) je vždy read-only.
|
||||
const canEditMember = (group: OrderGroup, targetLogin: string) => {
|
||||
if (selectedDate) return false;
|
||||
if (group.state === GroupState.ORDERED) return false;
|
||||
if (auth?.login === group.creatorLogin) return true;
|
||||
if (auth?.login === targetLogin && group.state === GroupState.OPEN) return true;
|
||||
@@ -173,6 +307,7 @@ export default function OrderGroupsPage() {
|
||||
};
|
||||
|
||||
const canManageMembers = (group: OrderGroup) => {
|
||||
if (selectedDate) return false;
|
||||
if (group.state === GroupState.ORDERED) return false;
|
||||
if (auth?.login === group.creatorLogin) return true;
|
||||
return group.state === GroupState.OPEN;
|
||||
@@ -191,6 +326,29 @@ export default function OrderGroupsPage() {
|
||||
const stores = data.stores ?? [];
|
||||
const groups = data.groups ?? [];
|
||||
|
||||
// Zobrazené datum a režim historie (vše read-only, pokud nejde o aktuální den)
|
||||
const displayedIso = data.isoDate;
|
||||
const isToday = !selectedDate || (todayIso != null && displayedIso === todayIso);
|
||||
const isReadOnly = !isToday;
|
||||
const canGoNext = todayIso != null && displayedIso != null && displayedIso < todayIso;
|
||||
|
||||
const goToDay = (offset: number) => {
|
||||
if (!displayedIso) return;
|
||||
const target = shiftIsoDate(displayedIso, offset);
|
||||
// Na dnešek (či dál) se vracíme přes undefined, aby se obnovily živé aktualizace
|
||||
setSelectedDate(todayIso != null && target >= todayIso ? undefined : target);
|
||||
};
|
||||
|
||||
const handleDatePick = (value: string) => {
|
||||
if (!value) return;
|
||||
setSelectedDate(todayIso != null && value >= todayIso ? undefined : value);
|
||||
};
|
||||
|
||||
// Dny s objednávkou jako Date objekty pro zvýraznění v kalendáři
|
||||
const highlightedOrderDates = orderDates
|
||||
.map(d => isoToDate(d))
|
||||
.filter((d): d is Date => d != null);
|
||||
|
||||
return (
|
||||
<div className="app-container">
|
||||
<Header choices={data.choices} />
|
||||
@@ -203,6 +361,43 @@ export default function OrderGroupsPage() {
|
||||
</div>
|
||||
<p style={{ color: 'var(--luncher-text-muted)' }}>Skupinové objednávky z obchodů a restaurací</p>
|
||||
|
||||
{/* Navigace mezi dny – šipky kolem výběru data (i klávesami ←/→) */}
|
||||
<div className="day-navigator order-day-navigator">
|
||||
<span title="Předchozí den">
|
||||
<FontAwesomeIcon icon={faChevronLeft} onClick={() => goToDay(-1)} />
|
||||
</span>
|
||||
<DatePicker
|
||||
selected={isoToDate(displayedIso)}
|
||||
onChange={(d: Date | null) => handleDatePick(d ? formatDate(d) : '')}
|
||||
maxDate={isoToDate(todayIso) ?? undefined}
|
||||
highlightDates={[{ 'luncher-order-day': highlightedOrderDates }]}
|
||||
locale="cs"
|
||||
dateFormat="d. M. yyyy"
|
||||
calendarStartDay={1}
|
||||
popperPlacement="bottom"
|
||||
className={`form-control text-center fw-semibold order-date-input ${isReadOnly ? 'text-muted' : ''}`}
|
||||
/>
|
||||
<span title="Následující den">
|
||||
<FontAwesomeIcon
|
||||
icon={faChevronRight}
|
||||
style={{ visibility: canGoNext ? 'visible' : 'hidden' }}
|
||||
onClick={() => canGoNext && goToDay(1)}
|
||||
/>
|
||||
</span>
|
||||
</div>
|
||||
|
||||
{isReadOnly && (
|
||||
<Alert variant="secondary" className="d-flex align-items-center gap-2 py-2">
|
||||
<FontAwesomeIcon icon={faClockRotateLeft} />
|
||||
<span>
|
||||
Prohlížíte historii ze dne <strong>{displayedIso ? formatDateString(displayedIso) : data.date}</strong> – data jsou pouze pro čtení.
|
||||
</span>
|
||||
<Button variant="link" size="sm" className="p-0 ms-auto" onClick={() => setSelectedDate(undefined)}>
|
||||
Zpět na dnešek
|
||||
</Button>
|
||||
</Alert>
|
||||
)}
|
||||
|
||||
{pageError && (
|
||||
<Alert variant="danger" dismissible onClose={() => setPageError(null)} className="mt-2">
|
||||
{pageError}
|
||||
@@ -210,8 +405,9 @@ export default function OrderGroupsPage() {
|
||||
)}
|
||||
|
||||
<div className="content-wrapper">
|
||||
<div className="content">
|
||||
{/* Vytvoření nové skupiny */}
|
||||
<div className="content" style={{ maxWidth: 1200 }}>
|
||||
{/* Vytvoření nové skupiny – pouze pro aktuální den */}
|
||||
{!isReadOnly && (
|
||||
<div className="choice-section fade-in mb-4">
|
||||
<h5>Vytvořit skupinu</h5>
|
||||
{stores.length === 0 ? (
|
||||
@@ -229,7 +425,7 @@ export default function OrderGroupsPage() {
|
||||
style={{ maxWidth: 260 }}
|
||||
>
|
||||
<option value="">— vyberte obchod —</option>
|
||||
{stores.map(s => <option key={s} value={s}>{s}</option>)}
|
||||
{stores.map(s => <option key={s.name} value={s.name}>{s.name}</option>)}
|
||||
</Form.Select>
|
||||
<Button variant="primary" onClick={handleCreate} disabled={creating || !newGroupName}>
|
||||
Vytvořit skupinu
|
||||
@@ -237,10 +433,13 @@ export default function OrderGroupsPage() {
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
)}
|
||||
|
||||
{/* Seznam skupin */}
|
||||
{groups.length === 0 && (
|
||||
<p className="text-muted fade-in">Zatím žádné skupiny pro dnešní den.</p>
|
||||
<p className="text-muted fade-in">
|
||||
{isReadOnly ? 'Pro tento den nejsou žádné skupiny.' : 'Zatím žádné skupiny pro dnešní den.'}
|
||||
</p>
|
||||
)}
|
||||
|
||||
{groups.map(group => {
|
||||
@@ -250,33 +449,38 @@ export default function OrderGroupsPage() {
|
||||
const isOrdered = group.state === GroupState.ORDERED;
|
||||
const isLocked = group.state === GroupState.LOCKED;
|
||||
const memberEntries = Object.entries(group.members) as [string, OrderGroupMember][];
|
||||
const memberCount = memberEntries.length;
|
||||
const editingTimes = group.id in editTimes;
|
||||
// URL na nabídku podniku (pokud ji má dohledatelný obchod vyplněnou).
|
||||
// Povolíme jen http(s), aby odkaz nemohl být zneužit (např. javascript:).
|
||||
const rawStoreUrl = stores.find(s => s.name === group.name)?.url;
|
||||
const storeUrl = rawStoreUrl && /^https?:\/\//i.test(rawStoreUrl) ? rawStoreUrl : undefined;
|
||||
|
||||
const totalFees = (group.fees ?? 0) + (group.shipping ?? 0) + (group.tip ?? 0);
|
||||
const feeShare = memberCount > 0 ? Math.round(totalFees / memberCount * 100) / 100 : 0;
|
||||
const getMemberTotal = (m: OrderGroupMember) => {
|
||||
const base = m.amount ?? 0;
|
||||
const surcharge = m.surchargeAmount ?? 0;
|
||||
const dv = group.discountValue ?? 0;
|
||||
const discount = dv > 0
|
||||
? (group.discountType === 'percent'
|
||||
? Math.round((base + surcharge) * dv / 100 * 100) / 100
|
||||
: Math.round(dv / memberCount * 100) / 100)
|
||||
: 0;
|
||||
return Math.round((base + surcharge + feeShare - discount) * 100) / 100;
|
||||
};
|
||||
// Poplatky se dělí jen mezi aktivní strávníky (kdo si reálně něco objednal).
|
||||
const activeCount = countActiveMembers(group.members);
|
||||
const feeShare = computeFeeShare(totalFees, activeCount);
|
||||
const feeParams = { totalFees, discountType: group.discountType, discountValue: group.discountValue ?? 0 };
|
||||
const getMemberTotal = (m: OrderGroupMember) =>
|
||||
computeMemberTotal(m, feeParams, feeShare, activeCount);
|
||||
|
||||
return (
|
||||
<Card key={group.id} className="mb-3 fade-in">
|
||||
<Card.Header className="d-flex justify-content-between align-items-center">
|
||||
<div className="d-flex align-items-center gap-2">
|
||||
{storeUrl ? (
|
||||
<strong>
|
||||
<a href={storeUrl} target="_blank" rel="noopener noreferrer" title="Otevřít nabídku v nové záložce">
|
||||
{group.name}
|
||||
</a>
|
||||
</strong>
|
||||
) : (
|
||||
<strong>{group.name}</strong>
|
||||
)}
|
||||
{stateBadge(group.state)}
|
||||
<small className="text-muted">zakladatel: {group.creatorLogin}</small>
|
||||
</div>
|
||||
<div className="d-flex gap-2">
|
||||
{isCreator && !isOrdered && (
|
||||
{!isReadOnly && isCreator && !isOrdered && (
|
||||
<>
|
||||
<Button variant="outline-info" size="sm" onClick={() => setFeesModal(group)} title="Upravit poplatky a slevu">
|
||||
Poplatky
|
||||
@@ -294,9 +498,9 @@ export default function OrderGroupsPage() {
|
||||
</Button>
|
||||
</>
|
||||
)}
|
||||
{isCreator && isOrdered && (
|
||||
{!isReadOnly && isCreator && isOrdered && (
|
||||
<>
|
||||
{settings?.bankAccount && settings?.holderName && (
|
||||
{settings?.bankAccount && settings?.holderName && !group.qrGenerated && (
|
||||
<Button variant="primary" size="sm" onClick={() => setPayModal(group)}>
|
||||
<FontAwesomeIcon icon={faBasketShopping} className="me-1" />
|
||||
Generovat QR
|
||||
@@ -307,7 +511,7 @@ export default function OrderGroupsPage() {
|
||||
</Button>
|
||||
</>
|
||||
)}
|
||||
{!isMember && !isOrdered && !isLocked && (
|
||||
{!isReadOnly && !isMember && !isOrdered && !isLocked && (
|
||||
<Button variant="outline-success" size="sm" onClick={() => handleJoin(group.id)}>
|
||||
<FontAwesomeIcon icon={faUserPlus} className="me-1" />
|
||||
Přidat se
|
||||
@@ -320,10 +524,10 @@ export default function OrderGroupsPage() {
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Člen</th>
|
||||
<th style={{ width: 120 }}>Částka (Kč)</th>
|
||||
<th style={{ width: 180 }}>Příplatek</th>
|
||||
<th style={{ width: 180 }}>Částka (bez slev)</th>
|
||||
<th style={{ width: 220 }}>Příplatek</th>
|
||||
<th>Poznámka</th>
|
||||
<th style={{ width: 90 }}>Celkem</th>
|
||||
<th style={{ width: 160 }}>Celkem (s poplatky)</th>
|
||||
<th style={{ width: 40 }}></th>
|
||||
</tr>
|
||||
</thead>
|
||||
@@ -356,24 +560,23 @@ export default function OrderGroupsPage() {
|
||||
{canEdit && editingAmount ? (
|
||||
<div className="d-flex gap-1">
|
||||
<Form.Control
|
||||
ref={memberLogin === login ? inputRef : undefined}
|
||||
type="number"
|
||||
size="sm"
|
||||
value={editAmounts[key]}
|
||||
onChange={e => setEditAmounts(prev => ({ ...prev, [key]: e.target.value }))}
|
||||
onKeyDown={e => { e.stopPropagation(); if (e.key === 'Enter') handleSaveAmount(group.id, memberLogin); if (e.key === 'Escape') setEditAmounts(prev => { const n = { ...prev }; delete n[key]; return n; }); }}
|
||||
style={{ width: 75 }}
|
||||
autoFocus={memberLogin === login}
|
||||
style={{ width: 95 }}
|
||||
autoFocus
|
||||
/>
|
||||
<Button size="sm" variant="outline-success" onClick={() => handleSaveAmount(group.id, memberLogin)}>✓</Button>
|
||||
</div>
|
||||
) : (
|
||||
<span
|
||||
style={{ cursor: canEdit ? 'pointer' : undefined }}
|
||||
onClick={() => canEdit && setEditAmounts(prev => ({ ...prev, [key]: String(member.amount ?? '') }))}
|
||||
onClick={() => canEdit && setEditAmounts(prev => ({ ...prev, [key]: member.amount != null ? String(member.amount / 100) : '' }))}
|
||||
title={canEdit ? 'Klikněte pro úpravu' : undefined}
|
||||
>
|
||||
{member.amount != null ? `${member.amount} Kč` : <span className="text-muted">—</span>}
|
||||
{member.amount != null ? `${member.amount / 100} Kč` : <span className="text-muted">—</span>}
|
||||
</span>
|
||||
)}
|
||||
</td>
|
||||
@@ -404,11 +607,11 @@ export default function OrderGroupsPage() {
|
||||
) : (
|
||||
<span
|
||||
style={{ cursor: canEdit ? 'pointer' : undefined }}
|
||||
onClick={() => canEdit && setEditSurcharges(prev => ({ ...prev, [key]: { text: member.surchargeText ?? '', amount: member.surchargeAmount != null ? String(member.surchargeAmount) : '' } }))}
|
||||
onClick={() => canEdit && setEditSurcharges(prev => ({ ...prev, [key]: { text: member.surchargeText ?? '', amount: member.surchargeAmount != null ? String(member.surchargeAmount / 100) : '' } }))}
|
||||
title={canEdit ? 'Klikněte pro úpravu příplatku' : undefined}
|
||||
>
|
||||
{member.surchargeAmount != null && member.surchargeAmount > 0 ? (
|
||||
<small>{member.surchargeText ? `${member.surchargeText}: ` : ''}<strong>{member.surchargeAmount} Kč</strong></small>
|
||||
<small>{member.surchargeText ? `${member.surchargeText}: ` : ''}<strong>{member.surchargeAmount / 100} Kč</strong></small>
|
||||
) : (
|
||||
<small className="text-muted">—</small>
|
||||
)}
|
||||
@@ -440,7 +643,7 @@ export default function OrderGroupsPage() {
|
||||
</td>
|
||||
<td className="text-end">
|
||||
<small className={memberTotal > 0 ? 'fw-bold' : 'text-muted'}>
|
||||
{memberTotal > 0 ? `${memberTotal} Kč` : '—'}
|
||||
{memberTotal > 0 ? `${memberTotal / 100} Kč` : '—'}
|
||||
</small>
|
||||
</td>
|
||||
<td>
|
||||
@@ -459,18 +662,35 @@ export default function OrderGroupsPage() {
|
||||
);
|
||||
})}
|
||||
</tbody>
|
||||
{(() => {
|
||||
const sumBase = memberEntries.reduce((sum, [, m]) => sum + (m.amount ?? 0) + (m.surchargeAmount ?? 0), 0);
|
||||
const dv = group.discountValue ?? 0;
|
||||
const totalDiscount = dv > 0
|
||||
? (group.discountType === 'percent' ? Math.round(sumBase * dv / 100) : dv)
|
||||
: 0;
|
||||
const groupTotal = sumBase + totalFees - totalDiscount;
|
||||
return groupTotal > 0 ? (
|
||||
<tfoot>
|
||||
<tr style={{ fontWeight: 700, borderTop: '2px solid var(--luncher-border)' }}>
|
||||
<td colSpan={4} className="text-end" style={{ fontSize: '0.9em' }}>Celkem za skupinu:</td>
|
||||
<td className="text-end">{groupTotal / 100} Kč</td>
|
||||
<td></td>
|
||||
</tr>
|
||||
</tfoot>
|
||||
) : null;
|
||||
})()}
|
||||
</Table>
|
||||
|
||||
{/* Souhrn poplatků a slevy */}
|
||||
{(totalFees > 0 || (group.discountValue != null && group.discountValue > 0)) && (
|
||||
<div className="px-3 py-2 border-top d-flex gap-3 flex-wrap" style={{ fontSize: '0.85em', color: 'var(--luncher-text-muted)' }}>
|
||||
{group.fees != null && group.fees > 0 && <span>Poplatky: <strong>{group.fees} Kč</strong></span>}
|
||||
{group.shipping != null && group.shipping > 0 && <span>Doprava: <strong>{group.shipping} Kč</strong></span>}
|
||||
{group.tip != null && group.tip > 0 && <span>Spropitné: <strong>{group.tip} Kč</strong></span>}
|
||||
{feeShare > 0 && <span>→ <strong>{feeShare} Kč</strong>/os.</span>}
|
||||
{group.fees != null && group.fees > 0 && <span>Poplatky: <strong>{group.fees / 100} Kč</strong></span>}
|
||||
{group.shipping != null && group.shipping > 0 && <span>Doprava: <strong>{group.shipping / 100} Kč</strong></span>}
|
||||
{group.tip != null && group.tip > 0 && <span>Spropitné: <strong>{group.tip / 100} Kč</strong></span>}
|
||||
{feeShare > 0 && <span>→ <strong>{feeShare / 100} Kč</strong>/os.</span>}
|
||||
{group.discountValue != null && group.discountValue > 0 && (
|
||||
<span className="text-success">
|
||||
Sleva: <strong>{group.discountType === 'percent' ? `${group.discountValue}%` : `${group.discountValue} Kč`}</strong>
|
||||
Sleva: <strong>{group.discountType === 'percent' ? `${group.discountValue}%` : `${group.discountValue / 100} Kč`}</strong>
|
||||
</span>
|
||||
)}
|
||||
</div>
|
||||
@@ -479,7 +699,7 @@ export default function OrderGroupsPage() {
|
||||
{/* Časy objednání a doručení */}
|
||||
{isOrdered && (
|
||||
<div className="px-3 py-2 border-top">
|
||||
{isCreator && editingTimes ? (
|
||||
{!isReadOnly && isCreator && editingTimes ? (
|
||||
<div className="d-flex align-items-center gap-3 flex-wrap">
|
||||
<div className="d-flex align-items-center gap-1">
|
||||
<small className="text-muted text-nowrap">Objednáno v:</small>
|
||||
@@ -506,23 +726,81 @@ export default function OrderGroupsPage() {
|
||||
style={{ width: 75 }}
|
||||
/>
|
||||
</div>
|
||||
<div className="d-flex align-items-center gap-1">
|
||||
<small className="text-muted text-nowrap">Bolt odkaz pro sledování:</small>
|
||||
<Form.Control
|
||||
type="text"
|
||||
size="sm"
|
||||
placeholder={`${BOLT_SHARE_URL_PREFIX}…`}
|
||||
value={editTimes[group.id]?.boltUrl ?? ''}
|
||||
onChange={e => setEditTimes(prev => ({ ...prev, [group.id]: { ...prev[group.id], boltUrl: e.target.value } }))}
|
||||
onKeyDown={e => { e.stopPropagation(); if (e.key === 'Enter') handleSaveTimes(group); }}
|
||||
style={{ width: 260 }}
|
||||
/>
|
||||
</div>
|
||||
<Button size="sm" variant="outline-success" onClick={() => handleSaveTimes(group)}>Uložit</Button>
|
||||
<Button size="sm" variant="outline-secondary" onClick={() => setEditTimes(prev => { const n = { ...prev }; delete n[group.id]; return n; })}>Zrušit</Button>
|
||||
</div>
|
||||
) : (
|
||||
<div
|
||||
className="d-flex align-items-center gap-3 flex-wrap"
|
||||
style={{ cursor: isCreator ? 'pointer' : undefined }}
|
||||
onClick={() => isCreator && setEditTimes(prev => ({ ...prev, [group.id]: { orderedAt: group.orderedAt ?? '', deliveryAt: group.deliveryAt ?? '' } }))}
|
||||
title={isCreator ? 'Klikněte pro úpravu časů' : undefined}
|
||||
<div className="d-flex align-items-center gap-3 flex-wrap">
|
||||
{(() => {
|
||||
const canEdit = !isReadOnly && isCreator;
|
||||
// Aktivace editačního režimu – stejné chování jako tlačítko s tužkou
|
||||
const startEdit = () => canEdit && setEditTimes(prev => ({ ...prev, [group.id]: { orderedAt: group.orderedAt ?? '', deliveryAt: group.deliveryAt ?? '', boltUrl: group.boltTrackingToken ? `${BOLT_SHARE_URL_PREFIX}${group.boltTrackingToken}` : '' } }));
|
||||
const trackingUrl = group.boltTrackingToken ? `${BOLT_SHARE_URL_PREFIX}${group.boltTrackingToken}` : null;
|
||||
return (
|
||||
<>
|
||||
{canEdit && (
|
||||
<FontAwesomeIcon
|
||||
icon={faPen}
|
||||
className="action-icon"
|
||||
title="Upravit časy a odkaz pro sledování"
|
||||
onClick={startEdit}
|
||||
/>
|
||||
)}
|
||||
<small
|
||||
className="text-muted"
|
||||
style={{ cursor: canEdit ? 'pointer' : undefined }}
|
||||
onClick={startEdit}
|
||||
>
|
||||
<small className="text-muted">
|
||||
Objednáno v: <strong>{group.orderedAt ?? '—'}</strong>
|
||||
</small>
|
||||
<small className="text-muted">
|
||||
<small
|
||||
className="text-muted"
|
||||
style={{ cursor: canEdit ? 'pointer' : undefined }}
|
||||
onClick={startEdit}
|
||||
>
|
||||
Doručení v: <strong>{group.deliveryAt ?? '—'}</strong>
|
||||
{group.boltTrackingToken && (
|
||||
<OverlayTrigger overlay={<Tooltip>Čas doručení se aktualizuje automaticky z Bolt Food</Tooltip>}>
|
||||
<Badge bg="success" className="ms-1">Bolt</Badge>
|
||||
</OverlayTrigger>
|
||||
)}
|
||||
</small>
|
||||
{isCreator && <small className="text-muted fst-italic">(upravit)</small>}
|
||||
<small className="text-muted text-nowrap">
|
||||
URL pro sledování:{' '}
|
||||
{trackingUrl ? (
|
||||
<a
|
||||
href={trackingUrl}
|
||||
target="_blank"
|
||||
rel="noopener noreferrer"
|
||||
title={trackingUrl}
|
||||
onClick={e => e.stopPropagation()}
|
||||
>
|
||||
{shortenUrl(trackingUrl)}
|
||||
</a>
|
||||
) : (
|
||||
<strong>—</strong>
|
||||
)}
|
||||
</small>
|
||||
</>
|
||||
);
|
||||
})()}
|
||||
</div>
|
||||
)}
|
||||
{group.boltOrderState && (
|
||||
<div className="mt-2">
|
||||
<BoltOrderProgress state={group.boltOrderState} courierState={group.boltCourierState} tracking={!!group.boltTrackingToken} />
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
@@ -531,6 +809,15 @@ export default function OrderGroupsPage() {
|
||||
</Card>
|
||||
);
|
||||
})}
|
||||
|
||||
{/* Nevyřízené platby přihlášeného uživatele – jen v režimu aktuálního dne */}
|
||||
{!isReadOnly && (
|
||||
<PendingPayments
|
||||
pendingQrs={data.pendingQrs}
|
||||
login={auth.login}
|
||||
onDismissed={() => fetchData()}
|
||||
/>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -564,6 +851,7 @@ export default function OrderGroupsPage() {
|
||||
<PayForGroupModal
|
||||
isOpen={!!payModal}
|
||||
onClose={() => setPayModal(null)}
|
||||
onSuccess={() => fetchData()}
|
||||
group={payModal}
|
||||
groupId={payModal.id}
|
||||
payerLogin={auth.login}
|
||||
|
||||
@@ -89,67 +89,4 @@
|
||||
.recharts-cartesian-grid-vertical line {
|
||||
stroke: var(--luncher-border);
|
||||
}
|
||||
|
||||
.voting-stats-section {
|
||||
margin-top: 48px;
|
||||
width: 100%;
|
||||
max-width: 800px;
|
||||
|
||||
h2 {
|
||||
font-size: 1.5rem;
|
||||
font-weight: 700;
|
||||
color: var(--luncher-text);
|
||||
margin-bottom: 16px;
|
||||
text-align: center;
|
||||
}
|
||||
}
|
||||
|
||||
.voting-stats-table {
|
||||
width: 100%;
|
||||
background: var(--luncher-bg-card);
|
||||
border-radius: var(--luncher-radius-lg);
|
||||
box-shadow: var(--luncher-shadow);
|
||||
border: 1px solid var(--luncher-border-light);
|
||||
overflow: hidden;
|
||||
border-collapse: collapse;
|
||||
|
||||
th {
|
||||
background: var(--luncher-primary);
|
||||
color: #ffffff;
|
||||
padding: 12px 20px;
|
||||
text-align: left;
|
||||
font-weight: 600;
|
||||
font-size: 0.9rem;
|
||||
|
||||
&:last-child {
|
||||
text-align: center;
|
||||
width: 120px;
|
||||
}
|
||||
}
|
||||
|
||||
td {
|
||||
padding: 12px 20px;
|
||||
border-bottom: 1px solid var(--luncher-border-light);
|
||||
color: var(--luncher-text);
|
||||
font-size: 0.9rem;
|
||||
|
||||
&:last-child {
|
||||
text-align: center;
|
||||
font-weight: 600;
|
||||
color: var(--luncher-primary);
|
||||
}
|
||||
}
|
||||
|
||||
tbody tr {
|
||||
transition: var(--luncher-transition);
|
||||
|
||||
&:hover {
|
||||
background: var(--luncher-bg-hover);
|
||||
}
|
||||
|
||||
&:last-child td {
|
||||
border-bottom: none;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,7 +4,7 @@ import Header from "../components/Header";
|
||||
import { useAuth } from "../context/auth";
|
||||
import Login from "../Login";
|
||||
import { formatDate, getFirstWorkDayOfWeek, getHumanDate, getLastWorkDayOfWeek } from "../Utils";
|
||||
import { WeeklyStats, LunchChoice, VotingStats, FeatureRequest, getStats, getVotingStats } from "../../../types";
|
||||
import { WeeklyStats, LunchChoice, getStats } from "../../../types";
|
||||
import Loader from "../components/Loader";
|
||||
import { faChevronLeft, faChevronRight, faGear } from "@fortawesome/free-solid-svg-icons";
|
||||
import { Legend, Line, LineChart, Tooltip, XAxis, YAxis } from "recharts";
|
||||
@@ -32,7 +32,6 @@ export default function StatsPage() {
|
||||
const auth = useAuth();
|
||||
const [dateRange, setDateRange] = useState<Date[]>();
|
||||
const [data, setData] = useState<WeeklyStats>();
|
||||
const [votingStats, setVotingStats] = useState<VotingStats>();
|
||||
|
||||
// Prvotní nastavení aktuálního týdne
|
||||
useEffect(() => {
|
||||
@@ -49,19 +48,6 @@ export default function StatsPage() {
|
||||
}
|
||||
}, [dateRange]);
|
||||
|
||||
// Načtení statistik hlasování
|
||||
useEffect(() => {
|
||||
getVotingStats().then(response => {
|
||||
setVotingStats(response.data);
|
||||
});
|
||||
}, []);
|
||||
|
||||
const sortedVotingStats = useMemo(() => {
|
||||
if (!votingStats) return [];
|
||||
return Object.entries(votingStats)
|
||||
.sort((a, b) => (b[1] as number) - (a[1] as number));
|
||||
}, [votingStats]);
|
||||
|
||||
const renderLine = (location: LunchChoice) => {
|
||||
const index = Object.values(LunchChoice).indexOf(location);
|
||||
return <Line key={location} name={getLunchChoiceName(location)} type="monotone" dataKey={data => data.locations[location] ?? 0} stroke={COLORS[index]} strokeWidth={STROKE_WIDTH} />
|
||||
@@ -142,27 +128,6 @@ export default function StatsPage() {
|
||||
<Tooltip />
|
||||
<Legend />
|
||||
</LineChart>
|
||||
{sortedVotingStats.length > 0 && (
|
||||
<div className="voting-stats-section">
|
||||
<h2>Hlasování o funkcích</h2>
|
||||
<table className="voting-stats-table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Funkce</th>
|
||||
<th>Počet hlasů</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{sortedVotingStats.map(([feature, count]) => (
|
||||
<tr key={feature}>
|
||||
<td>{FeatureRequest[feature as keyof typeof FeatureRequest] ?? feature}</td>
|
||||
<td>{count as number}</td>
|
||||
</tr>
|
||||
))}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
<Footer />
|
||||
</>
|
||||
|
||||
@@ -0,0 +1,145 @@
|
||||
.suggestions-page {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
padding: 32px 24px;
|
||||
min-height: calc(100vh - 140px);
|
||||
background: var(--luncher-bg);
|
||||
|
||||
.suggestions-header {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
gap: 24px;
|
||||
width: 100%;
|
||||
max-width: 900px;
|
||||
flex-wrap: wrap;
|
||||
|
||||
h1 {
|
||||
font-size: 2rem;
|
||||
font-weight: 700;
|
||||
color: var(--luncher-text);
|
||||
margin: 0;
|
||||
}
|
||||
}
|
||||
|
||||
.suggestions-info {
|
||||
width: 100%;
|
||||
max-width: 900px;
|
||||
margin: 12px 0 24px;
|
||||
color: var(--luncher-text-secondary);
|
||||
font-size: 0.95rem;
|
||||
}
|
||||
|
||||
.suggestions-empty {
|
||||
color: var(--luncher-text-secondary);
|
||||
margin-top: 32px;
|
||||
}
|
||||
|
||||
.resolved-section {
|
||||
width: 100%;
|
||||
max-width: 900px;
|
||||
margin-top: 48px;
|
||||
|
||||
h2 {
|
||||
font-size: 1.4rem;
|
||||
font-weight: 700;
|
||||
color: var(--luncher-text);
|
||||
margin-bottom: 8px;
|
||||
}
|
||||
}
|
||||
|
||||
.suggestions-table.resolved {
|
||||
th {
|
||||
background: var(--luncher-text-secondary);
|
||||
}
|
||||
|
||||
td.col-score {
|
||||
color: var(--luncher-text-secondary);
|
||||
}
|
||||
}
|
||||
|
||||
.suggestions-table {
|
||||
width: 100%;
|
||||
max-width: 900px;
|
||||
background: var(--luncher-bg-card);
|
||||
border-radius: var(--luncher-radius-lg);
|
||||
box-shadow: var(--luncher-shadow);
|
||||
border: 1px solid var(--luncher-border-light);
|
||||
overflow: hidden;
|
||||
border-collapse: collapse;
|
||||
|
||||
th {
|
||||
background: var(--luncher-primary);
|
||||
color: #ffffff;
|
||||
padding: 12px 20px;
|
||||
text-align: left;
|
||||
font-weight: 600;
|
||||
font-size: 0.9rem;
|
||||
}
|
||||
|
||||
td {
|
||||
padding: 12px 20px;
|
||||
border-bottom: 1px solid var(--luncher-border-light);
|
||||
color: var(--luncher-text);
|
||||
font-size: 0.9rem;
|
||||
vertical-align: middle;
|
||||
}
|
||||
|
||||
.col-score {
|
||||
text-align: center;
|
||||
width: 80px;
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
td.col-score {
|
||||
color: var(--luncher-primary);
|
||||
}
|
||||
|
||||
.col-actions {
|
||||
text-align: center;
|
||||
width: 150px;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
tbody tr {
|
||||
cursor: pointer;
|
||||
transition: var(--luncher-transition);
|
||||
|
||||
&:hover {
|
||||
background: var(--luncher-bg-hover);
|
||||
}
|
||||
|
||||
&:last-child td {
|
||||
border-bottom: none;
|
||||
}
|
||||
}
|
||||
|
||||
.vote-btn {
|
||||
background: transparent;
|
||||
border: none;
|
||||
cursor: pointer;
|
||||
padding: 6px 8px;
|
||||
border-radius: var(--luncher-radius-sm, 6px);
|
||||
color: var(--luncher-text-secondary);
|
||||
transition: var(--luncher-transition);
|
||||
|
||||
&:hover {
|
||||
background: var(--luncher-bg-hover);
|
||||
color: var(--luncher-text);
|
||||
}
|
||||
|
||||
&.vote-up.active {
|
||||
color: #2e7d32;
|
||||
}
|
||||
|
||||
&.vote-down.active {
|
||||
color: #c62828;
|
||||
}
|
||||
|
||||
&.delete-btn:hover {
|
||||
color: #c62828;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,187 @@
|
||||
import { useCallback, useEffect, useState } from "react";
|
||||
import { Button, OverlayTrigger, Tooltip } from "react-bootstrap";
|
||||
import { ToastContainer } from "react-toastify";
|
||||
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
|
||||
import { faThumbsUp, faThumbsDown, faTrash, faPlus, faGear } from "@fortawesome/free-solid-svg-icons";
|
||||
import Header from "../components/Header";
|
||||
import Footer from "../components/Footer";
|
||||
import Loader from "../components/Loader";
|
||||
import { useAuth } from "../context/auth";
|
||||
import Login from "../Login";
|
||||
import AddSuggestionModal from "../components/modals/AddSuggestionModal";
|
||||
import SuggestionDetailModal from "../components/modals/SuggestionDetailModal";
|
||||
import {
|
||||
Suggestion,
|
||||
VoteDirection,
|
||||
listSuggestions,
|
||||
addSuggestion,
|
||||
voteSuggestion,
|
||||
deleteSuggestion,
|
||||
} from "../../../types";
|
||||
import "./SuggestionsPage.scss";
|
||||
|
||||
export default function SuggestionsPage() {
|
||||
const auth = useAuth();
|
||||
const [suggestions, setSuggestions] = useState<Suggestion[]>();
|
||||
const [addModalOpen, setAddModalOpen] = useState(false);
|
||||
const [detail, setDetail] = useState<Suggestion>();
|
||||
|
||||
const reload = useCallback(async () => {
|
||||
if (!auth?.login) return;
|
||||
const response = await listSuggestions();
|
||||
setSuggestions(response.data ?? []);
|
||||
}, [auth?.login]);
|
||||
|
||||
useEffect(() => {
|
||||
reload();
|
||||
}, [reload]);
|
||||
|
||||
const handleAdd = async (title: string, description: string) => {
|
||||
const response = await addSuggestion({ body: { title, description } });
|
||||
if (response.data) {
|
||||
setSuggestions(response.data);
|
||||
}
|
||||
};
|
||||
|
||||
const handleVote = async (id: string, direction: VoteDirection) => {
|
||||
const response = await voteSuggestion({ body: { id, direction } });
|
||||
if (response.data) {
|
||||
setSuggestions(response.data);
|
||||
}
|
||||
};
|
||||
|
||||
const handleDelete = async (suggestion: Suggestion) => {
|
||||
if (!window.confirm(`Opravdu chcete smazat návrh „${suggestion.title}“? Smažou se i všechny jeho hlasy.`)) {
|
||||
return;
|
||||
}
|
||||
const response = await deleteSuggestion({ body: { id: suggestion.id } });
|
||||
if (response.data) {
|
||||
setSuggestions(response.data);
|
||||
}
|
||||
};
|
||||
|
||||
// Vykreslí jeden řádek tabulky. Vyřešené návrhy jsou read-only (bez hlasování),
|
||||
// ale autor je stále může smazat.
|
||||
const renderRow = (suggestion: Suggestion) => (
|
||||
<OverlayTrigger
|
||||
key={suggestion.id}
|
||||
placement="top"
|
||||
overlay={<Tooltip id={`tooltip-${suggestion.id}`}>{suggestion.description}</Tooltip>}
|
||||
>
|
||||
<tr onClick={() => setDetail(suggestion)}>
|
||||
<td>{suggestion.author}</td>
|
||||
<td>{suggestion.title}</td>
|
||||
<td className="col-score">{suggestion.voteScore}</td>
|
||||
<td className="col-actions" onClick={e => e.stopPropagation()}>
|
||||
{!suggestion.resolved && (
|
||||
<>
|
||||
<button
|
||||
type="button"
|
||||
className={`vote-btn vote-up ${suggestion.myVote === VoteDirection.UP ? "active" : ""}`}
|
||||
title="Hlasovat pro"
|
||||
onClick={() => handleVote(suggestion.id, VoteDirection.UP)}
|
||||
>
|
||||
<FontAwesomeIcon icon={faThumbsUp} />
|
||||
</button>
|
||||
<button
|
||||
type="button"
|
||||
className={`vote-btn vote-down ${suggestion.myVote === VoteDirection.DOWN ? "active" : ""}`}
|
||||
title="Hlasovat proti"
|
||||
onClick={() => handleVote(suggestion.id, VoteDirection.DOWN)}
|
||||
>
|
||||
<FontAwesomeIcon icon={faThumbsDown} />
|
||||
</button>
|
||||
</>
|
||||
)}
|
||||
{suggestion.isMine && (
|
||||
<button
|
||||
type="button"
|
||||
className="vote-btn delete-btn"
|
||||
title="Smazat návrh"
|
||||
onClick={() => handleDelete(suggestion)}
|
||||
>
|
||||
<FontAwesomeIcon icon={faTrash} />
|
||||
</button>
|
||||
)}
|
||||
</td>
|
||||
</tr>
|
||||
</OverlayTrigger>
|
||||
);
|
||||
|
||||
if (!auth?.login) {
|
||||
return <Login />;
|
||||
}
|
||||
|
||||
if (!suggestions) {
|
||||
return <Loader icon={faGear} description={"Načítám návrhy..."} animation={"fa-bounce"} />;
|
||||
}
|
||||
|
||||
const activeSuggestions = suggestions.filter(s => !s.resolved);
|
||||
const resolvedSuggestions = suggestions.filter(s => s.resolved);
|
||||
|
||||
return (
|
||||
<>
|
||||
<Header />
|
||||
<div className="suggestions-page">
|
||||
<div className="suggestions-header">
|
||||
<h1>Návrhy na vylepšení</h1>
|
||||
<Button onClick={() => setAddModalOpen(true)}>
|
||||
<FontAwesomeIcon icon={faPlus} /> Přidat návrh
|
||||
</Button>
|
||||
</div>
|
||||
<p className="suggestions-info">
|
||||
Zde můžete navrhovat vylepšení aplikace a hlasovat o návrzích ostatních. U každého návrhu je
|
||||
zobrazeno jméno navrhovatele. Jména hlasujících jsou dostupná pouze administrátorům.
|
||||
</p>
|
||||
|
||||
{suggestions.length === 0 ? (
|
||||
<p className="suggestions-empty">Zatím nebyly přidány žádné návrhy. Buďte první!</p>
|
||||
) : (
|
||||
<>
|
||||
{activeSuggestions.length > 0 && (
|
||||
<table className="suggestions-table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Navrhovatel</th>
|
||||
<th>Název</th>
|
||||
<th className="col-score">Hlasy</th>
|
||||
<th className="col-actions">Akce</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{activeSuggestions.map(renderRow)}
|
||||
</tbody>
|
||||
</table>
|
||||
)}
|
||||
|
||||
{resolvedSuggestions.length > 0 && (
|
||||
<div className="resolved-section">
|
||||
<h2>Vyřešené návrhy</h2>
|
||||
<p className="suggestions-info">
|
||||
Tyto návrhy již byly zapracovány. Nelze pro ně hlasovat, autor je však může odstranit.
|
||||
</p>
|
||||
<table className="suggestions-table resolved">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Navrhovatel</th>
|
||||
<th>Název</th>
|
||||
<th className="col-score">Hlasy</th>
|
||||
<th className="col-actions">Akce</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{resolvedSuggestions.map(renderRow)}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
)}
|
||||
</>
|
||||
)}
|
||||
</div>
|
||||
<Footer />
|
||||
<AddSuggestionModal isOpen={addModalOpen} onClose={() => setAddModalOpen(false)} onSubmit={handleAdd} />
|
||||
<SuggestionDetailModal suggestion={detail} onClose={() => setDetail(undefined)} />
|
||||
<ToastContainer />
|
||||
</>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,67 @@
|
||||
import { OrderGroup, OrderGroupMember } from "../../../types";
|
||||
|
||||
/**
|
||||
* Pomocné funkce pro výpočet částek ve skupinových objednávkách.
|
||||
*
|
||||
* Klíčové pravidlo: poplatky (balné + doprava + spropitné) se rozpočítávají
|
||||
* pouze mezi "aktivní" strávníky — tedy ty, kteří si reálně něco objednali.
|
||||
* Kdo si nic neobjedná (typicky objednávající, který nakupuje jen pro ostatní),
|
||||
* neplatí nic a nezapočítává se mu ani poměrná část poplatků.
|
||||
*/
|
||||
|
||||
/** Parametry poplatků a slevy potřebné k výpočtu částky člena. */
|
||||
export type GroupFeeParams = {
|
||||
/** Celkové poplatky skupiny v haléřích (balné + doprava + spropitné). */
|
||||
totalFees: number;
|
||||
/** Typ slevy ('percent' = procenta, 'fixed' = pevná částka v haléřích). */
|
||||
discountType?: string;
|
||||
/** Hodnota slevy — procenta, nebo pevná částka v haléřích dle discountType. */
|
||||
discountValue?: number;
|
||||
};
|
||||
|
||||
/** Vrátí true, pokud si člen něco objednal (má kladnou částku nebo příplatek). */
|
||||
export function isActiveMember(member: OrderGroupMember): boolean {
|
||||
return (member.amount ?? 0) + (member.surchargeAmount ?? 0) > 0;
|
||||
}
|
||||
|
||||
/** Počet aktivních strávníků — jen mezi ně se dělí poplatky. */
|
||||
export function countActiveMembers(members: OrderGroup["members"]): number {
|
||||
return Object.values(members).filter(isActiveMember).length;
|
||||
}
|
||||
|
||||
/** Celkové poplatky skupiny (balné + doprava + spropitné) v haléřích. */
|
||||
export function totalGroupFees(group: OrderGroup): number {
|
||||
return (group.fees ?? 0) + (group.shipping ?? 0) + (group.tip ?? 0);
|
||||
}
|
||||
|
||||
/** Poměrná část poplatků na jednoho aktivního strávníka v haléřích. */
|
||||
export function computeFeeShare(totalFees: number, activeCount: number): number {
|
||||
return activeCount > 0 ? Math.round(totalFees / activeCount) : 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* Celková částka, kterou má člen zaplatit (v haléřích).
|
||||
* Neaktivní člen (nic si neobjednal) platí 0 — nepodílí se ani na poplatcích.
|
||||
*
|
||||
* @param member člen skupiny
|
||||
* @param params poplatky a sleva
|
||||
* @param feeShare poměrná část poplatků na osobu (viz computeFeeShare)
|
||||
* @param activeCount počet aktivních strávníků (dělitel pevné slevy)
|
||||
*/
|
||||
export function computeMemberTotal(
|
||||
member: OrderGroupMember,
|
||||
params: GroupFeeParams,
|
||||
feeShare: number,
|
||||
activeCount: number,
|
||||
): number {
|
||||
if (!isActiveMember(member)) return 0;
|
||||
const base = member.amount ?? 0;
|
||||
const surcharge = member.surchargeAmount ?? 0;
|
||||
const discountValue = params.discountValue ?? 0;
|
||||
const discount = discountValue > 0
|
||||
? (params.discountType === 'percent'
|
||||
? Math.round((base + surcharge) * discountValue / 100)
|
||||
: Math.round(discountValue / activeCount))
|
||||
: 0;
|
||||
return base + surcharge + feeShare - discount;
|
||||
}
|
||||
@@ -8,6 +8,7 @@ export default defineConfig({
|
||||
plugins: [react(), viteTsconfigPaths()],
|
||||
server: {
|
||||
open: true,
|
||||
host: '0.0.0.0',
|
||||
port: 3000,
|
||||
proxy: {
|
||||
'/api': 'http://localhost:3001',
|
||||
|
||||
@@ -428,6 +428,42 @@
|
||||
resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.27.2.tgz#9e585ab6086bef994c6e8a5b3a0481219ada862b"
|
||||
integrity sha512-sRdU18mcKf7F+YgheI/zGf5alZatMUTKj/jNS6l744f9u3WFu4v7twcUI9vu4mknF4Y9aDlblIie0IM+5xxaqQ==
|
||||
|
||||
"@floating-ui/core@^1.7.5":
|
||||
version "1.7.5"
|
||||
resolved "https://registry.yarnpkg.com/@floating-ui/core/-/core-1.7.5.tgz#d4af157a03330af5a60e69da7a4692507ada0622"
|
||||
integrity sha512-1Ih4WTWyw0+lKyFMcBHGbb5U5FtuHJuujoyyr5zTaWS5EYMeT6Jb2AuDeftsCsEuchO+mM2ij5+q9crhydzLhQ==
|
||||
dependencies:
|
||||
"@floating-ui/utils" "^0.2.11"
|
||||
|
||||
"@floating-ui/dom@^1.7.6":
|
||||
version "1.7.6"
|
||||
resolved "https://registry.yarnpkg.com/@floating-ui/dom/-/dom-1.7.6.tgz#f915bba5abbb177e1f227cacee1b4d0634b187bf"
|
||||
integrity sha512-9gZSAI5XM36880PPMm//9dfiEngYoC6Am2izES1FF406YFsjvyBMmeJ2g4SAju3xWwtuynNRFL2s9hgxpLI5SQ==
|
||||
dependencies:
|
||||
"@floating-ui/core" "^1.7.5"
|
||||
"@floating-ui/utils" "^0.2.11"
|
||||
|
||||
"@floating-ui/react-dom@^2.1.8":
|
||||
version "2.1.8"
|
||||
resolved "https://registry.yarnpkg.com/@floating-ui/react-dom/-/react-dom-2.1.8.tgz#5fb5a20d10aafb9505f38c24f38d00c8e1598893"
|
||||
integrity sha512-cC52bHwM/n/CxS87FH0yWdngEZrjdtLW/qVruo68qg+prK7ZQ4YGdut2GyDVpoGeAYe/h899rVeOVm6Oi40k2A==
|
||||
dependencies:
|
||||
"@floating-ui/dom" "^1.7.6"
|
||||
|
||||
"@floating-ui/react@^0.27.15":
|
||||
version "0.27.19"
|
||||
resolved "https://registry.yarnpkg.com/@floating-ui/react/-/react-0.27.19.tgz#d8d5d895b7cb97dac370bfbf55f3e630878fdf1f"
|
||||
integrity sha512-31B8h5mm8YxotlE7/AU/PhNAl8eWxAmjL/v2QOxroDNkTFLk3Uu82u63N3b6TXa4EGJeeZLVcd/9AlNlVqzeog==
|
||||
dependencies:
|
||||
"@floating-ui/react-dom" "^2.1.8"
|
||||
"@floating-ui/utils" "^0.2.11"
|
||||
tabbable "^6.0.0"
|
||||
|
||||
"@floating-ui/utils@^0.2.11":
|
||||
version "0.2.11"
|
||||
resolved "https://registry.yarnpkg.com/@floating-ui/utils/-/utils-0.2.11.tgz#a269e055e40e2f45873bae9d1a2fdccbd314ea3f"
|
||||
integrity sha512-RiB/yIh78pcIxl6lLMG0CgBXAZ2Y0eVHqMPYugu+9U0AeT6YBeiJpf7lbdJNIugFP5SIjwNRgo4DhR1Qxi26Gg==
|
||||
|
||||
"@fortawesome/fontawesome-common-types@7.1.0":
|
||||
version "7.1.0"
|
||||
resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-7.1.0.tgz#a4e0b7e40073d5fdef41182da1bc216a05875659"
|
||||
@@ -1216,6 +1252,11 @@ d3-timer@^3.0.1:
|
||||
resolved "https://registry.yarnpkg.com/d3-timer/-/d3-timer-3.0.1.tgz#6284d2a2708285b1abb7e201eda4380af35e63b0"
|
||||
integrity sha512-ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA==
|
||||
|
||||
date-fns@^4.1.0:
|
||||
version "4.4.0"
|
||||
resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-4.4.0.tgz#806539edf45c616b2b76b5f78b88c56ed3c7e036"
|
||||
integrity sha512-+1UMbeh68lH1SegH83CGWwpb6OHHbpSgr3+s5Eww5M4CAgswBpoWS0AjTOfEJ33HiYKz1hdj/KTFprzXHmq/6w==
|
||||
|
||||
debug@^4.1.0, debug@^4.3.1, debug@~4.4.1:
|
||||
version "4.4.3"
|
||||
resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.3.tgz#c6ae432d9bd9662582fce08709b038c58e9e3d6a"
|
||||
@@ -1626,6 +1667,15 @@ react-bootstrap@^2.10.10:
|
||||
uncontrollable "^7.2.1"
|
||||
warning "^4.0.3"
|
||||
|
||||
react-datepicker@^9.1.0:
|
||||
version "9.1.0"
|
||||
resolved "https://registry.yarnpkg.com/react-datepicker/-/react-datepicker-9.1.0.tgz#638c636780ae98f1930f87e1f76850de5fc37d5c"
|
||||
integrity sha512-lOp+m5bc+ttgtB5MHEjwiVu4nlp4CvJLS/PG1OiOe5pmg9kV73pEqO8H0Geqvg2E8gjqTaL9eRhSe+ZpeKP3nA==
|
||||
dependencies:
|
||||
"@floating-ui/react" "^0.27.15"
|
||||
clsx "^2.1.1"
|
||||
date-fns "^4.1.0"
|
||||
|
||||
react-dom@^19.2.0:
|
||||
version "19.2.3"
|
||||
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-19.2.3.tgz#f0b61d7e5c4a86773889fcc1853af3ed5f215b17"
|
||||
@@ -1881,6 +1931,11 @@ supports-color@^7.1.0:
|
||||
dependencies:
|
||||
has-flag "^4.0.0"
|
||||
|
||||
tabbable@^6.0.0:
|
||||
version "6.4.0"
|
||||
resolved "https://registry.yarnpkg.com/tabbable/-/tabbable-6.4.0.tgz#36eb7a06d80b3924a22095daf45740dea3bf5581"
|
||||
integrity sha512-05PUHKSNE8ou2dwIxTngl4EzcnsCDZGJ/iCLtDflR/SHB/ny14rXc+qU5P4mG9JkusiV7EivzY9Mhm55AzAvCg==
|
||||
|
||||
tiny-invariant@^1.3.3:
|
||||
version "1.3.3"
|
||||
resolved "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.3.3.tgz#46680b7a873a0d5d10005995eb90a70d74d60127"
|
||||
|
||||
@@ -4,7 +4,10 @@ import path from 'path';
|
||||
// Use 127.0.0.1 explicitly — on Node.js 18+/Windows, `localhost` may resolve to ::1
|
||||
// (IPv6) while the HTTP server only binds to 0.0.0.0 (IPv4), causing the webServer
|
||||
// readiness poll to time out even though the server is listening.
|
||||
const BASE_URL = process.env.E2E_BASE_URL ?? 'http://127.0.0.1:3001';
|
||||
// Port 3099 avoids conflicts with locally running Docker containers on 3001-3003.
|
||||
// Override with E2E_PORT env var if needed.
|
||||
const E2E_PORT = process.env.E2E_PORT ?? '3099';
|
||||
const BASE_URL = process.env.E2E_BASE_URL ?? `http://127.0.0.1:${E2E_PORT}`;
|
||||
|
||||
// Server env vars injected for local runs. In CI these are set at the step level.
|
||||
const serverEnv: Record<string, string> = {
|
||||
@@ -15,6 +18,7 @@ const serverEnv: Record<string, string> = {
|
||||
HTTP_REMOTE_USER_ENABLED: 'true',
|
||||
HTTP_REMOTE_USER_HEADER_NAME: 'remote-user',
|
||||
HTTP_REMOTE_TRUSTED_IPS: process.env.HTTP_REMOTE_TRUSTED_IPS ?? '127.0.0.1,::1,::ffff:127.0.0.1',
|
||||
PORT: E2E_PORT,
|
||||
};
|
||||
if (process.env.REDIS_HOST) {
|
||||
serverEnv.REDIS_HOST = process.env.REDIS_HOST;
|
||||
@@ -50,7 +54,7 @@ export default defineConfig({
|
||||
cwd: path.resolve(__dirname, '../server'),
|
||||
// Poll a dedicated health endpoint — polling '/' can stall in Express 5 when
|
||||
// server/public/ doesn't exist in the working directory (no finalhandler match).
|
||||
url: `http://127.0.0.1:3001/api/health`,
|
||||
url: `http://127.0.0.1:${E2E_PORT}/api/health`,
|
||||
timeout: 15_000,
|
||||
reuseExistingServer: !process.env.CI,
|
||||
env: serverEnv,
|
||||
|
||||
+186
@@ -0,0 +1,186 @@
|
||||
# Kubernetes — Luncher HA
|
||||
|
||||
Manifesty pro nasazení Luncheru na Kubernetes s vysokou dostupností (3 repliky, Redis adapter pro Socket.io, WATCH/MULTI atomické zápisy, graceful shutdown).
|
||||
|
||||
## Prerekvizity
|
||||
|
||||
- kubectl nakonfigurovaný na cílový cluster
|
||||
- `helm` nainstalovaný
|
||||
- Redis Stack image přístupný z clusteru (`redis/redis-stack-server:7.2.0-v14`)
|
||||
- Obraz `luncher:ha-test` načtený do clusteru (viz níže)
|
||||
|
||||
## Lokální kind cluster (testik) — setup
|
||||
|
||||
### 1. Smazat a znovu vytvořit cluster s port mappings
|
||||
|
||||
```powershell
|
||||
$env:KIND_EXPERIMENTAL_PROVIDER = "nerdctl"
|
||||
# Přidat nerdctl do PATH (Rancher Desktop)
|
||||
$env:PATH += ";$env:LOCALAPPDATA\Programs\Rancher Desktop\resources\resources\win32\bin"
|
||||
|
||||
kind delete cluster --name testik
|
||||
kind create cluster --name testik --config k8s/kind/testik.yaml
|
||||
```
|
||||
|
||||
### 2. Sestavit a načíst obraz
|
||||
|
||||
```powershell
|
||||
docker build -t luncher:ha-test .
|
||||
|
||||
# Uložit a načíst přes nerdctl (kind + nerdctl provider)
|
||||
nerdctl save luncher:ha-test -o luncher.tar
|
||||
kind load image-archive luncher.tar --name testik
|
||||
Remove-Item luncher.tar
|
||||
```
|
||||
|
||||
### 3. Nainstalovat Traefik (rke2-traefik)
|
||||
|
||||
> **Prerekvizita (Rancher Desktop):** Pokud Rancher Desktop běží s `kubernetes.options.traefik=true`,
|
||||
> host-switch.exe obsadí port 80 dříve než kind. Vypni traefik v k3s:
|
||||
> ```powershell
|
||||
> rdctl set --kubernetes.options.traefik=false
|
||||
> ```
|
||||
>
|
||||
> **Prerekvizita — inotify limity:** Čtyř-uzlový kind cluster vyčerpá výchozí
|
||||
> `fs.inotify.max_user_instances=128`. kube-proxy pak padá s „too many open files".
|
||||
> Zvyš limit v rancher-desktop WSL2 (přežije restart WSL2, ale ne reboot — přidej do
|
||||
> `/etc/sysctl.d/99-kind.conf` pro trvalost):
|
||||
> ```powershell
|
||||
> wsl -d rancher-desktop -- sysctl -w fs.inotify.max_user_instances=1280
|
||||
> ```
|
||||
|
||||
```powershell
|
||||
# rke2-traefik je v rke2-charts, ne rancher-charts
|
||||
helm repo add rke2-charts https://rke2-charts.rancher.io
|
||||
helm repo update
|
||||
|
||||
# Nejdřív CRD chart, pak samotný chart
|
||||
helm install traefik-crd rke2-charts/rke2-traefik-crd -n kube-system --create-namespace
|
||||
helm install traefik rke2-charts/rke2-traefik -n kube-system `
|
||||
--set "tolerations[0].key=node-role.kubernetes.io/control-plane" `
|
||||
--set "tolerations[0].operator=Exists" `
|
||||
--set "tolerations[0].effect=NoSchedule"
|
||||
```
|
||||
|
||||
Ověř že Traefik DaemonSet běží na control-plane (má hostPort 80):
|
||||
```powershell
|
||||
kubectl get ds -n kube-system traefik-rke2-traefik
|
||||
kubectl get pods -n kube-system -o wide | Select-String traefik
|
||||
```
|
||||
|
||||
### 4. Nainstalovat Reloader
|
||||
|
||||
[stakater/Reloader](https://github.com/stakater/Reloader) sleduje změny Secret a ConfigMap a automaticky spustí rolling restart Deploymentu — odpadá nutnost ručního `kubectl rollout restart` po rotaci `JWT_SECRET` nebo `ADMIN_PASSWORD`.
|
||||
|
||||
Manifest je vendorovaný ve verzi v1.4.16 (`k8s/base/reloader.yaml`). Nasadit do `default` namespace:
|
||||
|
||||
```powershell
|
||||
kubectl apply -f k8s/base/reloader.yaml
|
||||
kubectl rollout status deploy/reloader-reloader
|
||||
```
|
||||
|
||||
Reloader běží cluster-wide díky `ClusterRoleBinding` — nepotřebuje žádnou konfiguraci per-namespace. Deployment Luncheru má anotaci `reloader.stakater.com/auto: "true"`, která říká Reloaderu, ať sleduje všechny Secrety a ConfigMapy odkazované přes `envFrom`.
|
||||
|
||||
### 5. Nasadit Luncher
|
||||
|
||||
```powershell
|
||||
# Namespace + Redis
|
||||
kubectl apply -f k8s/base/namespace.yaml
|
||||
kubectl apply -f k8s/base/redis-statefulset.yaml
|
||||
kubectl apply -f k8s/base/redis-service.yaml
|
||||
|
||||
# Počkat na Redis
|
||||
kubectl rollout status statefulset/redis -n luncher
|
||||
|
||||
# Server secret (nebo použít šablonu server-secret.yaml)
|
||||
kubectl create secret generic luncher-secrets -n luncher `
|
||||
--from-literal=JWT_SECRET=dev-secret-change-me `
|
||||
--from-literal=ADMIN_PASSWORD=admin
|
||||
|
||||
# Server
|
||||
kubectl apply -f k8s/base/server-configmap.yaml
|
||||
kubectl apply -f k8s/base/server-deployment.yaml
|
||||
kubectl apply -f k8s/base/server-service.yaml
|
||||
kubectl apply -f k8s/base/server-pdb.yaml
|
||||
kubectl apply -f k8s/base/ingressroute.yaml
|
||||
|
||||
# Počkat na server
|
||||
kubectl rollout status deploy/luncher -n luncher
|
||||
```
|
||||
|
||||
## Testovací scénáře
|
||||
|
||||
### Baseline
|
||||
|
||||
```powershell
|
||||
kubectl get pods -n luncher -o wide
|
||||
# Ověř: 3 pody na 3 různých worker uzlech, status Running
|
||||
```
|
||||
|
||||
### Rolling update bez výpadku
|
||||
|
||||
V jednom terminálu posílej provoz:
|
||||
```powershell
|
||||
# Nainstaluj hey: go install github.com/rakyll/hey@latest
|
||||
hey -z 60s -c 20 http://luncher.localhost/api/health
|
||||
```
|
||||
|
||||
Ve druhém terminálu spusť rollout:
|
||||
```powershell
|
||||
kubectl rollout restart deploy/luncher -n luncher
|
||||
```
|
||||
|
||||
**Kritérium: 0 non-2xx odpovědí, 0 connection errors.**
|
||||
|
||||
### Node drain
|
||||
|
||||
```powershell
|
||||
kubectl cordon testik-worker2
|
||||
kubectl drain testik-worker2 --ignore-daemonsets --delete-emptydir-data
|
||||
# PDB zabrání souběžnému drainu druhého nodu
|
||||
kubectl get pods -n luncher -o wide # pody se přeplánují
|
||||
kubectl uncordon testik-worker2
|
||||
```
|
||||
|
||||
### Ověření Socket.io cross-pod
|
||||
|
||||
1. Otevři dvě záložky prohlížeče na `http://luncher.localhost`
|
||||
2. Z jednoho podu vyvolej změnu:
|
||||
```powershell
|
||||
kubectl exec -it deploy/luncher -n luncher -- curl -s -X POST localhost:3001/api/...
|
||||
```
|
||||
3. Ověř, že druhá záložka (pravděpodobně jiný pod) obdrží WebSocket event
|
||||
|
||||
### Concurrent write test
|
||||
|
||||
1. Otevři stejnou Pizza day objednávku ve dvou záložkách
|
||||
2. Simuluj souběžné odeslání (otevřít DevTools → síť → odeslat obě požadavky současně)
|
||||
3. Ověř Redis: `kubectl exec -it redis-0 -n luncher -- redis-cli JSON.GET luncher:<datum>`
|
||||
— oba zápisy musí být zachovány (WATCH/MULTI retry)
|
||||
|
||||
### Auto-rollout při změně Secret / ConfigMap
|
||||
|
||||
Reloader automaticky spustí rolling restart, kdykoli se změní `luncher-secrets` nebo `luncher-config`:
|
||||
|
||||
```powershell
|
||||
# Příklad: rotace admin hesla
|
||||
kubectl -n luncher patch secret luncher-secrets --type=merge `
|
||||
-p '{"stringData":{"ADMIN_PASSWORD":"nove-heslo"}}'
|
||||
|
||||
# Reloader detekuje změnu resourceVersion a patchne pod template
|
||||
kubectl rollout status deploy/luncher -n luncher
|
||||
|
||||
# Ověř anotaci přidanou Reloaderem na pod template
|
||||
kubectl get deploy luncher -n luncher -o yaml | Select-String "STAKATER"
|
||||
```
|
||||
|
||||
**Kritérium: pody se automaticky vyrolují bez ručního restartu. PDB zajistí, že alespoň jeden pod zůstane dostupný.**
|
||||
|
||||
## Pořadí aplikace manifestů
|
||||
|
||||
1. `reloader.yaml` (do `default` namespace — musí být před Deployment)
|
||||
2. `namespace.yaml`
|
||||
3. `redis-statefulset.yaml` + `redis-service.yaml`
|
||||
4. `server-configmap.yaml` + `server-secret.yaml`
|
||||
5. `server-deployment.yaml` + `server-service.yaml` + `server-pdb.yaml`
|
||||
6. `ingressroute.yaml`
|
||||
@@ -0,0 +1,16 @@
|
||||
apiVersion: traefik.io/v1alpha1
|
||||
kind: IngressRoute
|
||||
metadata:
|
||||
name: luncher
|
||||
namespace: luncher
|
||||
annotations:
|
||||
kubernetes.io/ingress.class: traefik
|
||||
spec:
|
||||
entryPoints:
|
||||
- web
|
||||
routes:
|
||||
- match: Host(`luncher.localhost`)
|
||||
kind: Rule
|
||||
services:
|
||||
- name: luncher
|
||||
port: 3001
|
||||
@@ -0,0 +1,4 @@
|
||||
apiVersion: v1
|
||||
kind: Namespace
|
||||
metadata:
|
||||
name: luncher
|
||||
@@ -0,0 +1,12 @@
|
||||
apiVersion: v1
|
||||
kind: Service
|
||||
metadata:
|
||||
name: redis
|
||||
namespace: luncher
|
||||
spec:
|
||||
clusterIP: None # headless — StatefulSet pod discovery
|
||||
selector:
|
||||
app: redis
|
||||
ports:
|
||||
- port: 6379
|
||||
targetPort: 6379
|
||||
@@ -0,0 +1,50 @@
|
||||
apiVersion: apps/v1
|
||||
kind: StatefulSet
|
||||
metadata:
|
||||
name: redis
|
||||
namespace: luncher
|
||||
spec:
|
||||
serviceName: redis
|
||||
replicas: 1
|
||||
selector:
|
||||
matchLabels:
|
||||
app: redis
|
||||
template:
|
||||
metadata:
|
||||
labels:
|
||||
app: redis
|
||||
spec:
|
||||
containers:
|
||||
- name: redis
|
||||
# Redis Stack je nutný — aplikace používá JSON.GET / JSON.SET (modul RedisJSON)
|
||||
image: redis/redis-stack-server:7.2.0-v14
|
||||
ports:
|
||||
- containerPort: 6379
|
||||
resources:
|
||||
requests:
|
||||
cpu: 100m
|
||||
memory: 128Mi
|
||||
limits:
|
||||
cpu: 500m
|
||||
memory: 512Mi
|
||||
volumeMounts:
|
||||
- name: data
|
||||
mountPath: /data
|
||||
readinessProbe:
|
||||
exec:
|
||||
command: ["redis-cli", "ping"]
|
||||
initialDelaySeconds: 5
|
||||
periodSeconds: 5
|
||||
livenessProbe:
|
||||
exec:
|
||||
command: ["redis-cli", "ping"]
|
||||
initialDelaySeconds: 10
|
||||
periodSeconds: 10
|
||||
volumeClaimTemplates:
|
||||
- metadata:
|
||||
name: data
|
||||
spec:
|
||||
accessModes: ["ReadWriteOnce"]
|
||||
resources:
|
||||
requests:
|
||||
storage: 1Gi
|
||||
@@ -0,0 +1,184 @@
|
||||
# stakater/Reloader v1.4.16
|
||||
# Zdroj: https://raw.githubusercontent.com/stakater/Reloader/v1.4.16/deployments/kubernetes/reloader.yaml
|
||||
# Aktualizace: stáhnout novou verzi ze stejné URL a nahradit tento soubor.
|
||||
apiVersion: v1
|
||||
kind: ServiceAccount
|
||||
metadata:
|
||||
name: reloader-reloader
|
||||
namespace: default
|
||||
---
|
||||
apiVersion: rbac.authorization.k8s.io/v1
|
||||
kind: Role
|
||||
metadata:
|
||||
name: reloader-reloader-metadata-role
|
||||
namespace: default
|
||||
rules:
|
||||
- apiGroups:
|
||||
- ""
|
||||
resources:
|
||||
- configmaps
|
||||
verbs:
|
||||
- list
|
||||
- get
|
||||
- watch
|
||||
- create
|
||||
- update
|
||||
---
|
||||
apiVersion: rbac.authorization.k8s.io/v1
|
||||
kind: ClusterRole
|
||||
metadata:
|
||||
name: reloader-reloader-role
|
||||
rules:
|
||||
- apiGroups:
|
||||
- ""
|
||||
resources:
|
||||
- secrets
|
||||
- configmaps
|
||||
verbs:
|
||||
- list
|
||||
- get
|
||||
- watch
|
||||
- apiGroups:
|
||||
- apps
|
||||
resources:
|
||||
- deployments
|
||||
- daemonsets
|
||||
- statefulsets
|
||||
verbs:
|
||||
- list
|
||||
- get
|
||||
- update
|
||||
- patch
|
||||
- apiGroups:
|
||||
- extensions
|
||||
resources:
|
||||
- deployments
|
||||
- daemonsets
|
||||
verbs:
|
||||
- list
|
||||
- get
|
||||
- update
|
||||
- patch
|
||||
- apiGroups:
|
||||
- batch
|
||||
resources:
|
||||
- cronjobs
|
||||
verbs:
|
||||
- list
|
||||
- get
|
||||
- apiGroups:
|
||||
- batch
|
||||
resources:
|
||||
- jobs
|
||||
verbs:
|
||||
- create
|
||||
- delete
|
||||
- list
|
||||
- get
|
||||
- apiGroups:
|
||||
- ""
|
||||
resources:
|
||||
- events
|
||||
verbs:
|
||||
- create
|
||||
- patch
|
||||
---
|
||||
apiVersion: rbac.authorization.k8s.io/v1
|
||||
kind: RoleBinding
|
||||
metadata:
|
||||
name: reloader-reloader-metadata-rolebinding
|
||||
namespace: default
|
||||
roleRef:
|
||||
apiGroup: rbac.authorization.k8s.io
|
||||
kind: Role
|
||||
name: reloader-reloader-metadata-role
|
||||
subjects:
|
||||
- kind: ServiceAccount
|
||||
name: reloader-reloader
|
||||
namespace: default
|
||||
---
|
||||
apiVersion: rbac.authorization.k8s.io/v1
|
||||
kind: ClusterRoleBinding
|
||||
metadata:
|
||||
name: reloader-reloader-role-binding
|
||||
roleRef:
|
||||
apiGroup: rbac.authorization.k8s.io
|
||||
kind: ClusterRole
|
||||
name: reloader-reloader-role
|
||||
subjects:
|
||||
- kind: ServiceAccount
|
||||
name: reloader-reloader
|
||||
namespace: default
|
||||
---
|
||||
apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
metadata:
|
||||
name: reloader-reloader
|
||||
namespace: default
|
||||
spec:
|
||||
replicas: 1
|
||||
revisionHistoryLimit: 2
|
||||
selector:
|
||||
matchLabels:
|
||||
app: reloader-reloader
|
||||
template:
|
||||
metadata:
|
||||
labels:
|
||||
app: reloader-reloader
|
||||
spec:
|
||||
containers:
|
||||
- env:
|
||||
- name: GOMAXPROCS
|
||||
valueFrom:
|
||||
resourceFieldRef:
|
||||
divisor: "1"
|
||||
resource: limits.cpu
|
||||
- name: GOMEMLIMIT
|
||||
valueFrom:
|
||||
resourceFieldRef:
|
||||
divisor: "1"
|
||||
resource: limits.memory
|
||||
- name: RELOADER_NAMESPACE
|
||||
valueFrom:
|
||||
fieldRef:
|
||||
fieldPath: metadata.namespace
|
||||
- name: RELOADER_DEPLOYMENT_NAME
|
||||
value: reloader-reloader
|
||||
image: ghcr.io/stakater/reloader:v1.4.16
|
||||
imagePullPolicy: IfNotPresent
|
||||
livenessProbe:
|
||||
failureThreshold: 5
|
||||
httpGet:
|
||||
path: /live
|
||||
port: http
|
||||
initialDelaySeconds: 10
|
||||
periodSeconds: 10
|
||||
successThreshold: 1
|
||||
timeoutSeconds: 5
|
||||
name: reloader-reloader
|
||||
ports:
|
||||
- containerPort: 9090
|
||||
name: http
|
||||
readinessProbe:
|
||||
failureThreshold: 5
|
||||
httpGet:
|
||||
path: /metrics
|
||||
port: http
|
||||
initialDelaySeconds: 10
|
||||
periodSeconds: 10
|
||||
successThreshold: 1
|
||||
timeoutSeconds: 5
|
||||
resources:
|
||||
limits:
|
||||
cpu: "1"
|
||||
memory: 512Mi
|
||||
requests:
|
||||
cpu: 10m
|
||||
memory: 512Mi
|
||||
securityContext: {}
|
||||
securityContext:
|
||||
runAsNonRoot: true
|
||||
runAsUser: 65534
|
||||
seccompProfile:
|
||||
type: RuntimeDefault
|
||||
serviceAccountName: reloader-reloader
|
||||
@@ -0,0 +1,12 @@
|
||||
apiVersion: v1
|
||||
kind: ConfigMap
|
||||
metadata:
|
||||
name: luncher-config
|
||||
namespace: luncher
|
||||
data:
|
||||
NODE_ENV: production
|
||||
STORAGE: redis
|
||||
REDIS_HOST: redis
|
||||
REDIS_PORT: "6379"
|
||||
PORT: "3001"
|
||||
HOST: "0.0.0.0"
|
||||
@@ -0,0 +1,85 @@
|
||||
apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
metadata:
|
||||
name: luncher
|
||||
namespace: luncher
|
||||
spec:
|
||||
replicas: 3
|
||||
selector:
|
||||
matchLabels:
|
||||
app: luncher
|
||||
strategy:
|
||||
type: RollingUpdate
|
||||
rollingUpdate:
|
||||
maxSurge: 0 # nelze přidat extra pod — každý worker je obsazen
|
||||
maxUnavailable: 1 # nejdřív smaž starý pod, pak naplánuj nový
|
||||
template:
|
||||
metadata:
|
||||
labels:
|
||||
app: luncher
|
||||
annotations:
|
||||
reloader.stakater.com/auto: "true"
|
||||
spec:
|
||||
terminationGracePeriodSeconds: 30
|
||||
|
||||
# Rozmístit každý pod na jiný worker uzel
|
||||
affinity:
|
||||
podAntiAffinity:
|
||||
requiredDuringSchedulingIgnoredDuringExecution:
|
||||
- labelSelector:
|
||||
matchLabels:
|
||||
app: luncher
|
||||
topologyKey: kubernetes.io/hostname
|
||||
|
||||
containers:
|
||||
- name: luncher
|
||||
image: luncher:ha-test
|
||||
imagePullPolicy: IfNotPresent
|
||||
ports:
|
||||
- containerPort: 3001
|
||||
|
||||
envFrom:
|
||||
- configMapRef:
|
||||
name: luncher-config
|
||||
- secretRef:
|
||||
name: luncher-secrets
|
||||
|
||||
env:
|
||||
# POD_ID pro leader election scheduleru připomínek
|
||||
- name: POD_ID
|
||||
valueFrom:
|
||||
fieldRef:
|
||||
fieldPath: metadata.name
|
||||
|
||||
resources:
|
||||
requests:
|
||||
cpu: 100m
|
||||
memory: 256Mi
|
||||
limits:
|
||||
cpu: 500m
|
||||
memory: 512Mi
|
||||
|
||||
# Liveness — levná kontrola bez externích závislostí
|
||||
livenessProbe:
|
||||
httpGet:
|
||||
path: /api/health
|
||||
port: 3001
|
||||
initialDelaySeconds: 10
|
||||
periodSeconds: 10
|
||||
failureThreshold: 3
|
||||
|
||||
# Readiness — kontroluje Redis; při shutdown vrací 503
|
||||
readinessProbe:
|
||||
httpGet:
|
||||
path: /api/health/ready
|
||||
port: 3001
|
||||
initialDelaySeconds: 10
|
||||
periodSeconds: 5
|
||||
failureThreshold: 2
|
||||
|
||||
# preStop sleep: dá čas kube-proxy a Traefiku odebrat endpoint
|
||||
# dřív než kontejner začne odmítat nová spojení
|
||||
lifecycle:
|
||||
preStop:
|
||||
exec:
|
||||
command: ["sleep", "5"]
|
||||
@@ -0,0 +1,10 @@
|
||||
apiVersion: policy/v1
|
||||
kind: PodDisruptionBudget
|
||||
metadata:
|
||||
name: luncher-pdb
|
||||
namespace: luncher
|
||||
spec:
|
||||
minAvailable: 2 # ze 3 replik, max 1 voluntary disruption najednou
|
||||
selector:
|
||||
matchLabels:
|
||||
app: luncher
|
||||
@@ -0,0 +1,14 @@
|
||||
# Šablona — hodnoty jsou zástupné symboly.
|
||||
# Pro kind test vytvoř secret příkazem:
|
||||
# kubectl create secret generic luncher-secrets -n luncher \
|
||||
# --from-literal=JWT_SECRET=<your-secret> \
|
||||
# --from-literal=ADMIN_PASSWORD=<your-password>
|
||||
apiVersion: v1
|
||||
kind: Secret
|
||||
metadata:
|
||||
name: luncher-secrets
|
||||
namespace: luncher
|
||||
type: Opaque
|
||||
stringData:
|
||||
JWT_SECRET: CHANGE_ME
|
||||
ADMIN_PASSWORD: CHANGE_ME
|
||||
@@ -0,0 +1,11 @@
|
||||
apiVersion: v1
|
||||
kind: Service
|
||||
metadata:
|
||||
name: luncher
|
||||
namespace: luncher
|
||||
spec:
|
||||
selector:
|
||||
app: luncher
|
||||
ports:
|
||||
- port: 3001
|
||||
targetPort: 3001
|
||||
@@ -0,0 +1,16 @@
|
||||
kind: Cluster
|
||||
apiVersion: kind.x-k8s.io/v1alpha4
|
||||
nodes:
|
||||
- role: control-plane
|
||||
# Mapuje porty na Windows localhost — luncher.localhost resolves to 127.0.0.1
|
||||
# Traefik na control-plane podu poslouchá na těchto portech přes hostPort
|
||||
extraPortMappings:
|
||||
- containerPort: 80
|
||||
hostPort: 80
|
||||
protocol: TCP
|
||||
- containerPort: 443
|
||||
hostPort: 443
|
||||
protocol: TCP
|
||||
- role: worker
|
||||
- role: worker
|
||||
- role: worker
|
||||
@@ -0,0 +1,7 @@
|
||||
[
|
||||
"Možnost zobrazení objednávek z historie",
|
||||
"Podpora neplatících osob u objednávání",
|
||||
"Zobrazení neuhrazených plateb i na stránce objednávek",
|
||||
"Oprava duplicitního zobrazení QR kódu u Pizza day",
|
||||
"Odstranění diakritiky v platebních QR kódech"
|
||||
]
|
||||
@@ -0,0 +1,3 @@
|
||||
[
|
||||
"Nová stránka pro návrhy na vylepšení (dostupná z uživatelského menu)"
|
||||
]
|
||||
@@ -0,0 +1,5 @@
|
||||
[
|
||||
"Proklik na nabídku podniku ze stránky objednávek",
|
||||
"Možnost přidat URL pro sledování stavu doručení pro Bolt Food",
|
||||
"Automatická aktualizace času doručení na základě sledovací URL pro Bolt Food"
|
||||
]
|
||||
@@ -29,6 +29,7 @@
|
||||
"typescript": "^5.9.3"
|
||||
},
|
||||
"dependencies": {
|
||||
"@socket.io/redis-adapter": "^8.3.0",
|
||||
"axios": "^1.13.2",
|
||||
"cheerio": "^1.1.2",
|
||||
"cors": "^2.8.5",
|
||||
|
||||
+8
-8
@@ -9,13 +9,13 @@ import jwt from 'jsonwebtoken';
|
||||
*/
|
||||
export function generateToken(login?: string, trusted?: boolean): string {
|
||||
if (!process.env.JWT_SECRET) {
|
||||
throw Error("Není vyplněna proměnná prostředí JWT_SECRET");
|
||||
throw new Error("Není vyplněna proměnná prostředí JWT_SECRET");
|
||||
}
|
||||
if (process.env.JWT_SECRET.length < 32) {
|
||||
throw Error("Proměnná prostředí JWT_SECRET musí být minimálně 32 znaků");
|
||||
throw new Error("Proměnná prostředí JWT_SECRET musí být minimálně 32 znaků");
|
||||
}
|
||||
if (!login || login.trim().length === 0) {
|
||||
throw Error("Nebyl předán login");
|
||||
throw new Error("Nebyl předán login");
|
||||
}
|
||||
const payload = { login, trusted: trusted || false, logoutUrl: process.env.LOGOUT_URL };
|
||||
return jwt.sign(payload, process.env.JWT_SECRET);
|
||||
@@ -28,7 +28,7 @@ export function generateToken(login?: string, trusted?: boolean): string {
|
||||
*/
|
||||
export function verify(token: string): boolean {
|
||||
if (!process.env.JWT_SECRET) {
|
||||
throw Error("Není vyplněna proměnná prostředí JWT_SECRET");
|
||||
throw new Error("Není vyplněna proměnná prostředí JWT_SECRET");
|
||||
}
|
||||
try {
|
||||
jwt.verify(token, process.env.JWT_SECRET);
|
||||
@@ -45,10 +45,10 @@ export function verify(token: string): boolean {
|
||||
*/
|
||||
export function getLogin(token?: string): string {
|
||||
if (!process.env.JWT_SECRET) {
|
||||
throw Error("Není vyplněna proměnná prostředí JWT_SECRET");
|
||||
throw new Error("Není vyplněna proměnná prostředí JWT_SECRET");
|
||||
}
|
||||
if (!token) {
|
||||
throw Error("Nebyl předán token");
|
||||
throw new Error("Nebyl předán token");
|
||||
}
|
||||
const payload: any = jwt.verify(token, process.env.JWT_SECRET);
|
||||
return payload.login;
|
||||
@@ -61,10 +61,10 @@ export function getLogin(token?: string): string {
|
||||
*/
|
||||
export function getTrusted(token?: string): boolean {
|
||||
if (!process.env.JWT_SECRET) {
|
||||
throw Error("Není vyplněna proměnná prostředí JWT_SECRET");
|
||||
throw new Error("Není vyplněna proměnná prostředí JWT_SECRET");
|
||||
}
|
||||
if (!token) {
|
||||
throw Error("Nebyl předán token");
|
||||
throw new Error("Nebyl předán token");
|
||||
}
|
||||
const payload: any = jwt.verify(token, process.env.JWT_SECRET);
|
||||
return payload.trusted || false;
|
||||
|
||||
@@ -0,0 +1,178 @@
|
||||
import axios from 'axios';
|
||||
import crypto from 'crypto';
|
||||
import getStorage from './storage';
|
||||
import { createLeaderLease } from './leaderLease';
|
||||
import { getToday } from './service';
|
||||
import { formatDate } from './utils';
|
||||
import { getWebsocket } from './websocket';
|
||||
import { ClientData, GroupState } from '../../types/gen/types.gen';
|
||||
|
||||
const storage = getStorage();
|
||||
const lease = createLeaderLease('luncher:bolt:leader');
|
||||
|
||||
const BOLT_POLLING_URL = 'https://deliveryuser.live.boltsvc.net/deliveryClient/public/getOrderPolling';
|
||||
const BOLT_TOKEN_REGEX = /^[0-9a-f]{64}$/i;
|
||||
const TERMINAL_STATE_REGEX = /delivered|finished|cancelled|rejected|failed/i;
|
||||
const MAX_CONSECUTIVE_FAILURES = 10;
|
||||
|
||||
/** Identifikátor zařízení pro Bolt API — generuje se jednou na proces. */
|
||||
const DEVICE_ID = crypto.randomUUID();
|
||||
|
||||
let boltInterval: ReturnType<typeof setInterval> | undefined;
|
||||
|
||||
/** Mapa groupId → počet po sobě jdoucích selhání dotazu na Bolt API. */
|
||||
const consecutiveFailures = new Map<string, number>();
|
||||
|
||||
/**
|
||||
* Vytáhne sledovací token ze sdílecí URL Bolt Food
|
||||
* (https://food.bolt.eu/sharedActiveOrder/<token>) nebo přijme samotný token.
|
||||
* Vrátí null, pokud vstup neobsahuje platný token (64 hex znaků).
|
||||
*/
|
||||
export function extractBoltToken(input: string): string | null {
|
||||
const trimmed = input.trim();
|
||||
if (!trimmed) return null;
|
||||
if (BOLT_TOKEN_REGEX.test(trimmed)) return trimmed;
|
||||
let pathname: string;
|
||||
try {
|
||||
pathname = new URL(trimmed).pathname;
|
||||
} catch {
|
||||
return null;
|
||||
}
|
||||
const segments = pathname.split('/').filter(Boolean);
|
||||
const last = segments[segments.length - 1];
|
||||
return last && BOLT_TOKEN_REGEX.test(last) ? last : null;
|
||||
}
|
||||
|
||||
/** Spočítá očekávaný čas doručení (teď + sekundy) ve formátu HH:MM. */
|
||||
export function computeDeliveryHHMM(seconds: number, now: Date = new Date()): string {
|
||||
const eta = new Date(now.getTime() + seconds * 1000);
|
||||
return `${String(eta.getHours()).padStart(2, '0')}:${String(eta.getMinutes()).padStart(2, '0')}`;
|
||||
}
|
||||
|
||||
interface BoltOrder {
|
||||
order_id: number;
|
||||
order_state: string;
|
||||
expected_time_to_client_in_seconds?: number;
|
||||
courier?: { state?: string } | null;
|
||||
}
|
||||
|
||||
/** Dotáže se veřejného Bolt API na stav sdílené objednávky. Vrátí null, pokud objednávka už neexistuje. */
|
||||
export async function pollBoltOrder(token: string): Promise<BoltOrder | null> {
|
||||
const res = await axios.post(BOLT_POLLING_URL, { token }, {
|
||||
params: {
|
||||
version: 'FW.1.111',
|
||||
language: 'cs-CZ',
|
||||
country: 'cz',
|
||||
device_name: 'web',
|
||||
device_os_version: 'web',
|
||||
deviceType: 'web',
|
||||
session_id: DEVICE_ID,
|
||||
distinct_id: DEVICE_ID,
|
||||
deviceId: DEVICE_ID,
|
||||
},
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
timeout: 10_000,
|
||||
});
|
||||
if (res.data?.code !== 0) {
|
||||
throw new Error(`Bolt API vrátilo kód ${res.data?.code}: ${res.data?.message}`);
|
||||
}
|
||||
return res.data?.data?.orders?.[0] ?? null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Jeden tik scheduleru: pro dnešní objednané skupiny se sledovacím tokenem
|
||||
* zjistí očekávaný čas doručení z Bolt API a aktualizuje deliveryAt.
|
||||
* Sledování se automaticky ukončí (token se smaže), když objednávka skončí
|
||||
* nebo dotazy opakovaně selhávají.
|
||||
*/
|
||||
export async function checkBoltTracking(): Promise<void> {
|
||||
const isLeader = await lease.tryAcquireOrRenew();
|
||||
if (!isLeader) return;
|
||||
|
||||
const key = `${formatDate(getToday())}_extra`;
|
||||
const data = await storage.getData<ClientData>(key);
|
||||
const candidates = (data?.groups ?? []).filter(g => g.boltTrackingToken && g.state === GroupState.ORDERED);
|
||||
|
||||
// Úklid čítačů selhání pro skupiny, které už nesledujeme
|
||||
for (const groupId of consecutiveFailures.keys()) {
|
||||
if (!candidates.some(g => g.id === groupId)) consecutiveFailures.delete(groupId);
|
||||
}
|
||||
if (candidates.length === 0) return;
|
||||
|
||||
let updated: ClientData | undefined;
|
||||
|
||||
for (const group of candidates) {
|
||||
let deliveryAt: string | undefined;
|
||||
let orderState: string | undefined;
|
||||
let courierState: string | undefined;
|
||||
let clearToken = false;
|
||||
|
||||
try {
|
||||
const order = await pollBoltOrder(group.boltTrackingToken!);
|
||||
consecutiveFailures.delete(group.id);
|
||||
if (!order) {
|
||||
// Objednávka z API zmizela — považujeme ji za doručenou
|
||||
orderState = 'delivered';
|
||||
clearToken = true;
|
||||
} else {
|
||||
orderState = order.order_state || undefined;
|
||||
courierState = order.courier?.state || undefined;
|
||||
if (TERMINAL_STATE_REGEX.test(order.order_state ?? '')) {
|
||||
clearToken = true;
|
||||
} else if (typeof order.expected_time_to_client_in_seconds === 'number') {
|
||||
deliveryAt = computeDeliveryHHMM(order.expected_time_to_client_in_seconds);
|
||||
}
|
||||
}
|
||||
} catch (e) {
|
||||
const failures = (consecutiveFailures.get(group.id) ?? 0) + 1;
|
||||
consecutiveFailures.set(group.id, failures);
|
||||
console.error(`Bolt tracking: chyba dotazu pro skupinu "${group.name}" (${failures}/${MAX_CONSECUTIVE_FAILURES})`, e);
|
||||
if (failures < MAX_CONSECUTIVE_FAILURES) continue;
|
||||
consecutiveFailures.delete(group.id);
|
||||
clearToken = true;
|
||||
}
|
||||
|
||||
const timeChanged = deliveryAt !== undefined && deliveryAt !== group.deliveryAt;
|
||||
const stateChanged = orderState !== undefined && orderState !== group.boltOrderState;
|
||||
const courierChanged = courierState !== group.boltCourierState && !clearToken;
|
||||
if (!clearToken && !timeChanged && !stateChanged && !courierChanged) continue;
|
||||
|
||||
updated = await storage.updateData<ClientData>(key, current => {
|
||||
const d = current ?? data!;
|
||||
const g = d.groups?.find(x => x.id === group.id);
|
||||
if (g?.boltTrackingToken) {
|
||||
if (timeChanged) g.deliveryAt = deliveryAt;
|
||||
if (stateChanged) g.boltOrderState = orderState;
|
||||
if (courierChanged) g.boltCourierState = courierState;
|
||||
if (clearToken) g.boltTrackingToken = undefined;
|
||||
}
|
||||
return d;
|
||||
});
|
||||
if (clearToken) {
|
||||
console.log(`Bolt tracking: sledování skupiny "${group.name}" ukončeno`);
|
||||
}
|
||||
}
|
||||
|
||||
if (updated) {
|
||||
getWebsocket()?.emit('message', updated);
|
||||
}
|
||||
}
|
||||
|
||||
/** Spustí scheduler pro sledování Bolt objednávek (každou minutu). */
|
||||
export function startBoltTrackingScheduler(): void {
|
||||
boltInterval = setInterval(checkBoltTracking, 60_000);
|
||||
console.log('Bolt tracking: scheduler spuštěn');
|
||||
}
|
||||
|
||||
/** Stopne scheduler sledování. Volá se při graceful shutdown. */
|
||||
export function stopBoltTrackingScheduler(): void {
|
||||
if (boltInterval) {
|
||||
clearInterval(boltInterval);
|
||||
boltInterval = undefined;
|
||||
}
|
||||
}
|
||||
|
||||
/** Uvolní leader lease při graceful shutdown. */
|
||||
export async function releaseBoltTrackingLease(): Promise<void> {
|
||||
await lease.release();
|
||||
}
|
||||
@@ -28,16 +28,16 @@ const buildPizzaUrl = (pizzaUrl: string) => {
|
||||
return `${baseUrl}/${pizzaUrl}`;
|
||||
}
|
||||
|
||||
// Ceny krabic dle velikosti
|
||||
// Ceny krabic dle velikosti v haléřích
|
||||
const boxPrices: { [key: string]: number } = {
|
||||
"30cm": 13,
|
||||
"35cm": 15,
|
||||
"40cm": 18,
|
||||
"50cm": 25
|
||||
"30cm": 1300,
|
||||
"35cm": 1500,
|
||||
"40cm": 1800,
|
||||
"50cm": 2500
|
||||
}
|
||||
|
||||
// Cena obalu pro salát
|
||||
const SALAT_BOX_PRICE = 13;
|
||||
// Cena obalu pro salát v haléřích
|
||||
const SALAT_BOX_PRICE = 1300;
|
||||
|
||||
/**
|
||||
* Stáhne a scrapne aktuální pizzy ze stránek Pizza Chefie.
|
||||
@@ -79,7 +79,7 @@ export async function downloadPizzy(mock: boolean): Promise<Pizza[]> {
|
||||
a.each((i, elm) => {
|
||||
const varId = Number.parseInt(elm.attribs.href.split('?varianta=')[1].trim());
|
||||
const size = $($(elm).contents().get(0)).text().trim();
|
||||
const price = Number.parseInt($($(elm).contents().get(1)).text().trim().split(" Kč")[0]);
|
||||
const price = Number.parseInt($($(elm).contents().get(1)).text().trim().split(" Kč")[0]) * 100;
|
||||
sizes.push({ varId, size, pizzaPrice: price, boxPrice: boxPrices[size], price: price + boxPrices[size] });
|
||||
})
|
||||
result.push({
|
||||
@@ -119,7 +119,7 @@ export async function downloadSalaty(mock: boolean): Promise<Salat[]> {
|
||||
ingredients.push($(elm).text());
|
||||
});
|
||||
const priceText = $('.cena > span', salatHtml).first().text().trim();
|
||||
const price = Number.parseInt(priceText.split(' Kč')[0]);
|
||||
const price = Number.parseInt(priceText.split(' Kč')[0]) * 100;
|
||||
result.push({ name, ingredients, price: price + SALAT_BOX_PRICE });
|
||||
}
|
||||
return result;
|
||||
|
||||
+58
-2
@@ -3,6 +3,7 @@ import getStorage from "./storage";
|
||||
import { getClientData, getToday, initIfNeeded } from "./service";
|
||||
import { getStores } from "./stores";
|
||||
import { removePendingQrsByGroupId } from "./pizza";
|
||||
import { extractBoltToken } from "./boltTracking";
|
||||
import { ClientData, GroupState, MealSlot, OrderGroup, OrderGroupMember } from "../../types/gen/types.gen";
|
||||
import { formatDate } from "./utils";
|
||||
|
||||
@@ -28,13 +29,31 @@ function findGroup(data: ClientData, id: string): OrderGroup | undefined {
|
||||
return data.groups?.find(g => g.id === id);
|
||||
}
|
||||
|
||||
/**
|
||||
* Vrátí seznam ISO dat (YYYY-MM-DD), pro která existuje alespoň jedna objednávková skupina.
|
||||
* Slouží ke zvýraznění dnů v date pickeru na stránce objednávání.
|
||||
*/
|
||||
export async function getOrderDates(): Promise<string[]> {
|
||||
const EXTRA_SUFFIX = '_extra';
|
||||
const keys = await storage.listKeys(EXTRA_SUFFIX);
|
||||
const dates: string[] = [];
|
||||
for (const key of keys) {
|
||||
if (!key.endsWith(EXTRA_SUFFIX)) continue;
|
||||
const data = await storage.getData<ClientData>(key);
|
||||
if (data?.groups && data.groups.length > 0) {
|
||||
dates.push(key.slice(0, -EXTRA_SUFFIX.length));
|
||||
}
|
||||
}
|
||||
return dates.sort();
|
||||
}
|
||||
|
||||
export async function createGroup(creatorLogin: string, name: string, date?: Date): Promise<ClientData> {
|
||||
const stores = await getStores();
|
||||
if (!stores.some(s => s.toLowerCase() === name.trim().toLowerCase())) {
|
||||
if (!stores.some(s => s.name.toLowerCase() === name.trim().toLowerCase())) {
|
||||
throw new Error('Obchod není v seznamu povolených obchodů');
|
||||
}
|
||||
const data = await getExtraData(date);
|
||||
const canonical = stores.find(s => s.toLowerCase() === name.trim().toLowerCase())!;
|
||||
const canonical = stores.find(s => s.name.toLowerCase() === name.trim().toLowerCase())!.name;
|
||||
const group: OrderGroup = {
|
||||
id: crypto.randomUUID(),
|
||||
name: canonical,
|
||||
@@ -131,6 +150,10 @@ export async function setGroupState(login: string, groupId: string, newState: Gr
|
||||
await removePendingQrsByGroupId(memberLogins, groupId);
|
||||
group.orderedAt = undefined;
|
||||
group.deliveryAt = undefined;
|
||||
group.qrGenerated = undefined;
|
||||
group.boltTrackingToken = undefined;
|
||||
group.boltOrderState = undefined;
|
||||
group.boltCourierState = undefined;
|
||||
for (const ml of memberLogins) {
|
||||
group.members[ml] = { ...group.members[ml], paid: undefined };
|
||||
}
|
||||
@@ -139,6 +162,16 @@ export async function setGroupState(login: string, groupId: string, newState: Gr
|
||||
return saveExtraData(data, date);
|
||||
}
|
||||
|
||||
export async function markGroupQrGenerated(login: string, groupId: string, date?: Date): Promise<void> {
|
||||
const data = await getExtraData(date);
|
||||
const group = findGroup(data, groupId);
|
||||
if (!group) throw new Error('Skupina nebyla nalezena');
|
||||
if (group.creatorLogin !== login) throw new Error('QR kódy může generovat pouze zakladatel');
|
||||
if (group.state !== GroupState.ORDERED) throw new Error('QR kódy lze generovat pouze ve stavu "objednáno"');
|
||||
group.qrGenerated = true;
|
||||
await saveExtraData(data, date);
|
||||
}
|
||||
|
||||
export async function markGroupMemberPaid(login: string, groupId: string, date?: Date): Promise<ClientData | null> {
|
||||
const data = await getExtraData(date);
|
||||
const group = findGroup(data, groupId);
|
||||
@@ -170,3 +203,26 @@ export async function updateGroupTimes(login: string, groupId: string, orderedAt
|
||||
if (deliveryAt !== undefined) group.deliveryAt = deliveryAt || undefined;
|
||||
return saveExtraData(data, date);
|
||||
}
|
||||
|
||||
export async function setGroupBoltTracking(login: string, groupId: string, shareUrl?: string, date?: Date): Promise<ClientData> {
|
||||
const data = await getExtraData(date);
|
||||
const group = findGroup(data, groupId);
|
||||
if (!group) throw new Error('Skupina nebyla nalezena');
|
||||
if (group.creatorLogin !== login) throw new Error('Sledování Bolt může nastavit pouze zakladatel');
|
||||
if (!shareUrl) {
|
||||
group.boltTrackingToken = undefined;
|
||||
group.boltOrderState = undefined;
|
||||
group.boltCourierState = undefined;
|
||||
} else {
|
||||
if (group.state !== GroupState.ORDERED) throw new Error('Sledování Bolt lze nastavit pouze ve stavu "objednáno"');
|
||||
const token = extractBoltToken(shareUrl);
|
||||
if (!token) throw new Error('Neplatný odkaz na sledování objednávky Bolt');
|
||||
if (token !== group.boltTrackingToken) {
|
||||
group.boltTrackingToken = token;
|
||||
// Stav patří k předchozí objednávce — vyčistíme, doplní ho první poll
|
||||
group.boltOrderState = undefined;
|
||||
group.boltCourierState = undefined;
|
||||
}
|
||||
}
|
||||
return saveExtraData(data, date);
|
||||
}
|
||||
|
||||
+103
-42
@@ -9,12 +9,15 @@ import { getQr } from "./qr";
|
||||
import { generateToken, getLogin, verify } from "./auth";
|
||||
import { getIsWeekend, InsufficientPermissions, PizzaDayConflictError, parseToken } from "./utils";
|
||||
import { getPendingQrs } from "./pizza";
|
||||
import { initWebsocket, getWebsocket } from "./websocket";
|
||||
import { startReminderScheduler, verifyQuickChoiceToken } from "./pushReminder";
|
||||
import { initWebsocket, initRedisAdapter, shutdownWebsocketClients, getWebsocket } from "./websocket";
|
||||
import { startReminderScheduler, stopReminderScheduler, releaseReminderLease, verifyQuickChoiceToken } from "./pushReminder";
|
||||
import { startBoltTrackingScheduler, stopBoltTrackingScheduler, releaseBoltTrackingLease } from "./boltTracking";
|
||||
import { storageReady } from "./storage";
|
||||
import getStorage from "./storage";
|
||||
import { shutdownRedisStorage } from "./storage/redis";
|
||||
import pizzaDayRoutes from "./routes/pizzaDayRoutes";
|
||||
import foodRoutes, { refreshMetoda } from "./routes/foodRoutes";
|
||||
import votingRoutes from "./routes/votingRoutes";
|
||||
import suggestionRoutes from "./routes/suggestionRoutes";
|
||||
import easterEggRoutes from "./routes/easterEggRoutes";
|
||||
import statsRoutes from "./routes/statsRoutes";
|
||||
import notificationRoutes from "./routes/notificationRoutes";
|
||||
@@ -27,23 +30,24 @@ import storeRoutes from "./routes/storeRoutes";
|
||||
const ENVIRONMENT = process.env.NODE_ENV ?? 'production';
|
||||
dotenv.config({ path: path.resolve(__dirname, `../.env.${ENVIRONMENT}`) });
|
||||
|
||||
// Validace nastavení JWT tokenu - nemá bez něj smysl vůbec povolit server spustit
|
||||
if (!process.env.JWT_SECRET) {
|
||||
throw Error("Není vyplněna proměnná prostředí JWT_SECRET");
|
||||
throw new Error("Není vyplněna proměnná prostředí JWT_SECRET");
|
||||
}
|
||||
|
||||
const app = express();
|
||||
const server = require("http").createServer(app);
|
||||
|
||||
// Tune keep-alive timeouts to outlive Traefik's 60s idle timeout.
|
||||
// headersTimeout must be strictly greater than keepAliveTimeout.
|
||||
server.keepAliveTimeout = 65_000;
|
||||
server.headersTimeout = 66_000;
|
||||
server.requestTimeout = 30_000;
|
||||
|
||||
initWebsocket(server);
|
||||
|
||||
// Body-parser middleware for parsing JSON
|
||||
app.use(bodyParser.json());
|
||||
app.use(cors({ origin: '*' }));
|
||||
|
||||
app.use(cors({
|
||||
origin: '*'
|
||||
}));
|
||||
|
||||
// Zapínatelný login přes hlavičky - pokud je zapnutý nepovolí "basicauth"
|
||||
const HTTP_REMOTE_USER_ENABLED = process.env.HTTP_REMOTE_USER_ENABLED === 'true' || false;
|
||||
const HTTP_REMOTE_USER_HEADER_NAME = process.env.HTTP_REMOTE_USER_HEADER_NAME ?? 'remote-user';
|
||||
if (HTTP_REMOTE_USER_ENABLED) {
|
||||
@@ -51,19 +55,73 @@ if (HTTP_REMOTE_USER_ENABLED) {
|
||||
throw new Error('Je zapnutý login z hlaviček, ale není nastaven rozsah adres ze kterých hlavička může přijít.');
|
||||
}
|
||||
const HTTP_REMOTE_TRUSTED_IPS = process.env.HTTP_REMOTE_TRUSTED_IPS.split(',').map(ip => ip.trim());
|
||||
//TODO: nevim jak udelat console.log pouze pro "debug"
|
||||
//console.log("Budu věřit hlavičkám z: " + HTTP_REMOTE_TRUSTED_IPS);
|
||||
app.set('trust proxy', HTTP_REMOTE_TRUSTED_IPS);
|
||||
console.log('Zapnutý login přes hlavičky z proxy.');
|
||||
}
|
||||
|
||||
// ─── Shutdown state ──────────────────────────────────────────────────────────
|
||||
|
||||
// ----------- Metody nevyžadující token --------------
|
||||
let shuttingDown = false;
|
||||
|
||||
async function shutdown(signal: string) {
|
||||
if (shuttingDown) return;
|
||||
shuttingDown = true;
|
||||
console.log(`${signal} received — initiating graceful shutdown`);
|
||||
|
||||
// Hard-exit failsafe: fires before terminationGracePeriodSeconds (30s)
|
||||
setTimeout(() => {
|
||||
console.error('Graceful shutdown timed out, forcing exit');
|
||||
process.exit(1);
|
||||
}, 25_000).unref();
|
||||
|
||||
// Disconnect WebSocket clients so they reconnect to another pod
|
||||
const io = getWebsocket();
|
||||
io?.disconnectSockets(true);
|
||||
|
||||
// Stop accepting new HTTP connections and drain in-flight requests
|
||||
(server as any).closeIdleConnections?.();
|
||||
await new Promise<void>(resolve => server.close(() => resolve()));
|
||||
|
||||
// Stop reminder scheduler and release leader lease
|
||||
stopReminderScheduler();
|
||||
await releaseReminderLease();
|
||||
|
||||
// Stop Bolt tracking scheduler and release leader lease
|
||||
stopBoltTrackingScheduler();
|
||||
await releaseBoltTrackingLease();
|
||||
|
||||
// Shut down Redis pub/sub clients (Socket.io adapter)
|
||||
await shutdownWebsocketClients();
|
||||
|
||||
// Shut down main Redis storage client
|
||||
if (process.env.STORAGE?.toLowerCase() === 'redis') {
|
||||
await shutdownRedisStorage();
|
||||
}
|
||||
|
||||
console.log('Graceful shutdown complete');
|
||||
process.exit(0);
|
||||
}
|
||||
|
||||
process.on('SIGTERM', () => shutdown('SIGTERM'));
|
||||
process.on('SIGINT', () => shutdown('SIGINT'));
|
||||
|
||||
// ─── Routes — no auth required ───────────────────────────────────────────────
|
||||
|
||||
/** Liveness probe — cheap, no external deps. */
|
||||
app.get("/api/health", (_req, res) => {
|
||||
res.status(200).json({ ok: true });
|
||||
});
|
||||
|
||||
/** Readiness probe — verifies Redis connectivity and rejects traffic during shutdown. */
|
||||
app.get("/api/health/ready", async (_req, res) => {
|
||||
if (shuttingDown) {
|
||||
return res.status(503).json({ ok: false, reason: 'shutting down' });
|
||||
}
|
||||
const healthy = await getStorage().healthCheck?.() ?? true;
|
||||
if (!healthy) return res.status(503).json({ ok: false, reason: 'storage unavailable' });
|
||||
res.status(200).json({ ok: true });
|
||||
});
|
||||
|
||||
app.get("/api/whoami", (req, res) => {
|
||||
if (!HTTP_REMOTE_USER_ENABLED) {
|
||||
res.status(403).json({ error: 'Není zapnuté přihlášení z hlaviček' });
|
||||
@@ -76,21 +134,17 @@ app.get("/api/whoami", (req, res) => {
|
||||
})
|
||||
|
||||
app.post("/api/login", (req, res) => {
|
||||
if (HTTP_REMOTE_USER_ENABLED) { // je rovno app.enabled('trust proxy')
|
||||
// Autentizace pomocí trusted headers
|
||||
if (HTTP_REMOTE_USER_ENABLED) {
|
||||
const remoteUser = req.header(HTTP_REMOTE_USER_HEADER_NAME);
|
||||
//const remoteName = req.header('remote-name');
|
||||
if (remoteUser && remoteUser.length > 0) {
|
||||
res.status(200).json(generateToken(Buffer.from(remoteUser, 'latin1').toString(), true));
|
||||
} else {
|
||||
throw Error("Je zapnuto přihlášení přes hlavičky, ale nepřišla hlavička nebo ??");
|
||||
throw new Error("Je zapnuto přihlášení přes hlavičky, ale nepřišla hlavička nebo ??");
|
||||
}
|
||||
} else {
|
||||
// Klasická autentizace loginem
|
||||
if (!req.body?.login || req.body.login.trim().length === 0) {
|
||||
throw Error("Nebyl předán login");
|
||||
throw new Error("Nebyl předán login");
|
||||
}
|
||||
// TODO zavést podmínky pro délku loginu (min i max)
|
||||
res.status(200).json(generateToken(req.body.login, false));
|
||||
}
|
||||
});
|
||||
@@ -111,12 +165,10 @@ app.get("/api/qr", async (req, res) => {
|
||||
res.end(img);
|
||||
});
|
||||
|
||||
// ----------------------------------------------------
|
||||
// ─── Semi-public routes ───────────────────────────────────────────────────────
|
||||
|
||||
// Přeskočení auth pro refresh dat xd
|
||||
app.use("/api/food/refresh", refreshMetoda);
|
||||
|
||||
// Rychlá akce z push notifikace — autentizace pomocí HMAC tokenu z push payloadu (SW nemá přístup k JWT)
|
||||
app.post("/api/notifications/push/quickChoice", async (req, res, next) => {
|
||||
try {
|
||||
const { login, token } = req.body ?? {};
|
||||
@@ -132,10 +184,10 @@ app.post("/api/notifications/push/quickChoice", async (req, res, next) => {
|
||||
} catch (e: any) { next(e); }
|
||||
});
|
||||
|
||||
/** Middleware ověřující JWT token */
|
||||
// ─── Auth middleware ──────────────────────────────────────────────────────────
|
||||
|
||||
app.use("/api/", (req, res, next) => {
|
||||
if (HTTP_REMOTE_USER_ENABLED) {
|
||||
// Autentizace pomocí trusted headers
|
||||
const remoteUser = req.header(HTTP_REMOTE_USER_HEADER_NAME);
|
||||
if (process.env.ENABLE_HEADERS_LOGGING === 'yes') {
|
||||
delete req.headers["cookie"]
|
||||
@@ -158,16 +210,24 @@ app.use("/api/", (req, res, next) => {
|
||||
next();
|
||||
});
|
||||
|
||||
/** Vrátí data pro aktuální den. */
|
||||
// ─── Authenticated routes ─────────────────────────────────────────────────────
|
||||
|
||||
app.get("/api/data", async (req, res) => {
|
||||
let date = undefined;
|
||||
if (req.query.dayIndex != null && typeof req.query.dayIndex === 'string') {
|
||||
if (req.query.date != null && typeof req.query.date === 'string') {
|
||||
// Konkrétní datum (YYYY-MM-DD) – umožňuje načtení historie i mimo aktuální týden
|
||||
const parsed = new Date(`${req.query.date}T00:00:00`);
|
||||
if (isNaN(parsed.getTime())) {
|
||||
return res.status(400).json({ error: 'Neplatné datum' });
|
||||
}
|
||||
// Budoucnost ořízneme na dnešek – do budoucna historii nedává smysl zobrazovat
|
||||
date = parsed.getTime() > getToday().getTime() ? getToday() : parsed;
|
||||
} else if (req.query.dayIndex != null && typeof req.query.dayIndex === 'string') {
|
||||
const index = parseInt(req.query.dayIndex);
|
||||
if (!isNaN(index)) {
|
||||
date = getDateForWeekIndex(parseInt(req.query.dayIndex));
|
||||
}
|
||||
} else if (getIsWeekend(getToday())) {
|
||||
// Na víkendu zobrazíme pátek místo hlášky "Užívejte víkend"
|
||||
date = getDateForWeekIndex(4);
|
||||
}
|
||||
const slotParam = typeof req.query.slot === 'string' ? req.query.slot as MealSlot : undefined;
|
||||
@@ -175,7 +235,6 @@ app.get("/api/data", async (req, res) => {
|
||||
return res.status(400).json({ error: 'Neplatný slot' });
|
||||
}
|
||||
const data = await getData(date, slotParam);
|
||||
// Připojíme nevyřízené QR kódy pro přihlášeného uživatele
|
||||
try {
|
||||
const login = getLogin(parseToken(req));
|
||||
const pendingQrs = await getPendingQrs(login);
|
||||
@@ -188,10 +247,9 @@ app.get("/api/data", async (req, res) => {
|
||||
res.status(200).json(data);
|
||||
});
|
||||
|
||||
// Ostatní routes
|
||||
app.use("/api/pizzaDay", pizzaDayRoutes);
|
||||
app.use("/api/food", foodRoutes);
|
||||
app.use("/api/voting", votingRoutes);
|
||||
app.use("/api/suggestions", suggestionRoutes);
|
||||
app.use("/api/easterEggs", easterEggRoutes);
|
||||
app.use("/api/stats", statsRoutes);
|
||||
app.use("/api/notifications", notificationRoutes);
|
||||
@@ -201,10 +259,12 @@ app.use("/api/changelogs", changelogRoutes);
|
||||
app.use("/api/groups", groupRoutes);
|
||||
app.use("/api/stores", storeRoutes);
|
||||
|
||||
app.use('/stats', express.static('public'));
|
||||
app.use(express.static('public'));
|
||||
app.use(express.static(path.join(process.cwd(), 'public')));
|
||||
app.get('*splat', (_req, res) => {
|
||||
res.sendFile(path.join(process.cwd(), 'public', 'index.html'));
|
||||
});
|
||||
|
||||
// Middleware pro zpracování chyb
|
||||
// Error handling middleware
|
||||
app.use((err: any, req: any, res: any, next: any) => {
|
||||
if (err instanceof InsufficientPermissions) {
|
||||
res.status(403).send({ error: err.message })
|
||||
@@ -216,18 +276,19 @@ app.use((err: any, req: any, res: any, next: any) => {
|
||||
next();
|
||||
});
|
||||
|
||||
// ─── Bootstrap ────────────────────────────────────────────────────────────────
|
||||
|
||||
const PORT = process.env.PORT ?? 3001;
|
||||
const HOST = process.env.HOST ?? '0.0.0.0';
|
||||
|
||||
storageReady.then(() => {
|
||||
storageReady.then(async () => {
|
||||
// Init Redis adapter after storage is connected (only in Redis mode)
|
||||
if (process.env.STORAGE?.toLowerCase() === 'redis') {
|
||||
await initRedisAdapter();
|
||||
}
|
||||
server.listen(PORT, () => {
|
||||
console.log(`Server listening on ${HOST}, port ${PORT}`);
|
||||
startReminderScheduler();
|
||||
startBoltTrackingScheduler();
|
||||
});
|
||||
});
|
||||
|
||||
// Umožníme vypnutí serveru přes SIGINT, jinak Docker čeká než ho sestřelí
|
||||
process.on('SIGINT', function () {
|
||||
console.log("\nSIGINT (Ctrl-C), vypínám server");
|
||||
process.exit(0);
|
||||
});
|
||||
@@ -0,0 +1,56 @@
|
||||
import { getRedisClient } from './storage/redis';
|
||||
|
||||
const POD_ID = process.env.POD_ID ?? `local-${process.pid}`;
|
||||
|
||||
export interface LeaderLease {
|
||||
tryAcquireOrRenew(): Promise<boolean>;
|
||||
release(): Promise<void>;
|
||||
}
|
||||
|
||||
/**
|
||||
* Vytvoří leader lease pro daný klíč — zajišťuje, že periodickou úlohu
|
||||
* spouští v multi-replica nasazení pouze jedna instance.
|
||||
* Při non-Redis storage vždy vrací true (single-process, leader election není potřeba).
|
||||
*/
|
||||
export function createLeaderLease(leaseKey: string, ttlSeconds = 90): LeaderLease {
|
||||
return {
|
||||
async tryAcquireOrRenew(): Promise<boolean> {
|
||||
if (process.env.STORAGE?.toLowerCase() !== 'redis') return true;
|
||||
try {
|
||||
const c = getRedisClient();
|
||||
if (!c) return true;
|
||||
|
||||
// Zkusíme získat lease atomicky (SET NX EX)
|
||||
const acquired = await c.set(leaseKey, POD_ID, { NX: true, EX: ttlSeconds });
|
||||
if (acquired !== null) return true; // lease čerstvě získána
|
||||
|
||||
// Pokud jsme ji nedostali, ověříme zda ji držíme my
|
||||
const currentHolder = await c.get(leaseKey);
|
||||
if (currentHolder === POD_ID) {
|
||||
// Naše lease — obnovíme TTL
|
||||
await c.set(leaseKey, POD_ID, { EX: ttlSeconds });
|
||||
return true;
|
||||
}
|
||||
return false; // lease drží jiná instance
|
||||
} catch (e) {
|
||||
console.error(`Leader lease (${leaseKey}): chyba při získávání, úloha bude spuštěna`, e);
|
||||
return true; // při chybě raději spustíme, než vynecháme
|
||||
}
|
||||
},
|
||||
|
||||
async release(): Promise<void> {
|
||||
if (process.env.STORAGE?.toLowerCase() !== 'redis') return;
|
||||
try {
|
||||
const c = getRedisClient();
|
||||
if (!c) return;
|
||||
const currentHolder = await c.get(leaseKey);
|
||||
if (currentHolder === POD_ID) {
|
||||
await c.del(leaseKey);
|
||||
console.log(`Leader lease (${leaseKey}): uvolněna`);
|
||||
}
|
||||
} catch (e) {
|
||||
console.error(`Leader lease (${leaseKey}): chyba při uvolňování`, e);
|
||||
}
|
||||
},
|
||||
};
|
||||
}
|
||||
+220
-220
@@ -661,30 +661,30 @@ const MOCK_PIZZA_LIST = [
|
||||
{
|
||||
varId: 1,
|
||||
size: "30cm",
|
||||
pizzaPrice: 138,
|
||||
boxPrice: 13,
|
||||
price: 151
|
||||
pizzaPrice: 13800,
|
||||
boxPrice: 1300,
|
||||
price: 15100
|
||||
},
|
||||
{
|
||||
varId: 2,
|
||||
size: "35cm",
|
||||
pizzaPrice: 166,
|
||||
boxPrice: 15,
|
||||
price: 181
|
||||
pizzaPrice: 16600,
|
||||
boxPrice: 1500,
|
||||
price: 18100
|
||||
},
|
||||
{
|
||||
varId: 3,
|
||||
size: "40cm",
|
||||
pizzaPrice: 223,
|
||||
boxPrice: 18,
|
||||
price: 241
|
||||
pizzaPrice: 22300,
|
||||
boxPrice: 1800,
|
||||
price: 24100
|
||||
},
|
||||
{
|
||||
varId: 4,
|
||||
size: "50cm",
|
||||
pizzaPrice: 306,
|
||||
boxPrice: 25,
|
||||
price: 331
|
||||
pizzaPrice: 30600,
|
||||
boxPrice: 2500,
|
||||
price: 33100
|
||||
}
|
||||
]
|
||||
},
|
||||
@@ -700,30 +700,30 @@ const MOCK_PIZZA_LIST = [
|
||||
{
|
||||
varId: 6,
|
||||
size: "30cm",
|
||||
pizzaPrice: 142,
|
||||
boxPrice: 13,
|
||||
price: 155
|
||||
pizzaPrice: 14200,
|
||||
boxPrice: 1300,
|
||||
price: 15500
|
||||
},
|
||||
{
|
||||
varId: 7,
|
||||
size: "35cm",
|
||||
pizzaPrice: 172,
|
||||
boxPrice: 15,
|
||||
price: 187
|
||||
pizzaPrice: 17200,
|
||||
boxPrice: 1500,
|
||||
price: 18700
|
||||
},
|
||||
{
|
||||
varId: 8,
|
||||
size: "40cm",
|
||||
pizzaPrice: 233,
|
||||
boxPrice: 18,
|
||||
price: 251
|
||||
pizzaPrice: 23300,
|
||||
boxPrice: 1800,
|
||||
price: 25100
|
||||
},
|
||||
{
|
||||
varId: 9,
|
||||
size: "50cm",
|
||||
pizzaPrice: 316,
|
||||
boxPrice: 25,
|
||||
price: 341
|
||||
pizzaPrice: 31600,
|
||||
boxPrice: 2500,
|
||||
price: 34100
|
||||
}
|
||||
]
|
||||
},
|
||||
@@ -741,30 +741,30 @@ const MOCK_PIZZA_LIST = [
|
||||
{
|
||||
varId: 10,
|
||||
size: "30cm",
|
||||
pizzaPrice: 142,
|
||||
boxPrice: 13,
|
||||
price: 155
|
||||
pizzaPrice: 14200,
|
||||
boxPrice: 1300,
|
||||
price: 15500
|
||||
},
|
||||
{
|
||||
varId: 11,
|
||||
size: "35cm",
|
||||
pizzaPrice: 172,
|
||||
boxPrice: 15,
|
||||
price: 187
|
||||
pizzaPrice: 17200,
|
||||
boxPrice: 1500,
|
||||
price: 18700
|
||||
},
|
||||
{
|
||||
varId: 12,
|
||||
size: "40cm",
|
||||
pizzaPrice: 233,
|
||||
boxPrice: 18,
|
||||
price: 251
|
||||
pizzaPrice: 23300,
|
||||
boxPrice: 1800,
|
||||
price: 25100
|
||||
},
|
||||
{
|
||||
varId: 13,
|
||||
size: "50cm",
|
||||
pizzaPrice: 316,
|
||||
boxPrice: 25,
|
||||
price: 341
|
||||
pizzaPrice: 31600,
|
||||
boxPrice: 2500,
|
||||
price: 34100
|
||||
}
|
||||
]
|
||||
},
|
||||
@@ -780,30 +780,30 @@ const MOCK_PIZZA_LIST = [
|
||||
{
|
||||
varId: 14,
|
||||
size: "30cm",
|
||||
pizzaPrice: 142,
|
||||
boxPrice: 13,
|
||||
price: 155
|
||||
pizzaPrice: 14200,
|
||||
boxPrice: 1300,
|
||||
price: 15500
|
||||
},
|
||||
{
|
||||
varId: 15,
|
||||
size: "35cm",
|
||||
pizzaPrice: 172,
|
||||
boxPrice: 15,
|
||||
price: 187
|
||||
pizzaPrice: 17200,
|
||||
boxPrice: 1500,
|
||||
price: 18700
|
||||
},
|
||||
{
|
||||
varId: 16,
|
||||
size: "40cm",
|
||||
pizzaPrice: 233,
|
||||
boxPrice: 18,
|
||||
price: 251
|
||||
pizzaPrice: 23300,
|
||||
boxPrice: 1800,
|
||||
price: 25100
|
||||
},
|
||||
{
|
||||
varId: 17,
|
||||
size: "50cm",
|
||||
pizzaPrice: 294,
|
||||
boxPrice: 25,
|
||||
price: 319
|
||||
pizzaPrice: 29400,
|
||||
boxPrice: 2500,
|
||||
price: 31900
|
||||
}
|
||||
]
|
||||
},
|
||||
@@ -821,30 +821,30 @@ const MOCK_PIZZA_LIST = [
|
||||
{
|
||||
varId: 22,
|
||||
size: "30cm",
|
||||
pizzaPrice: 162,
|
||||
boxPrice: 13,
|
||||
price: 175
|
||||
pizzaPrice: 16200,
|
||||
boxPrice: 1300,
|
||||
price: 17500
|
||||
},
|
||||
{
|
||||
varId: 23,
|
||||
size: "35cm",
|
||||
pizzaPrice: 186,
|
||||
boxPrice: 15,
|
||||
price: 201
|
||||
pizzaPrice: 18600,
|
||||
boxPrice: 1500,
|
||||
price: 20100
|
||||
},
|
||||
{
|
||||
varId: 24,
|
||||
size: "40cm",
|
||||
pizzaPrice: 263,
|
||||
boxPrice: 18,
|
||||
price: 281
|
||||
pizzaPrice: 26300,
|
||||
boxPrice: 1800,
|
||||
price: 28100
|
||||
},
|
||||
{
|
||||
varId: 25,
|
||||
size: "50cm",
|
||||
pizzaPrice: 346,
|
||||
boxPrice: 25,
|
||||
price: 371
|
||||
pizzaPrice: 34600,
|
||||
boxPrice: 2500,
|
||||
price: 37100
|
||||
}
|
||||
]
|
||||
},
|
||||
@@ -861,30 +861,30 @@ const MOCK_PIZZA_LIST = [
|
||||
{
|
||||
varId: 26,
|
||||
size: "30cm",
|
||||
pizzaPrice: 162,
|
||||
boxPrice: 13,
|
||||
price: 175
|
||||
pizzaPrice: 16200,
|
||||
boxPrice: 1300,
|
||||
price: 17500
|
||||
},
|
||||
{
|
||||
varId: 27,
|
||||
size: "35cm",
|
||||
pizzaPrice: 186,
|
||||
boxPrice: 15,
|
||||
price: 201
|
||||
pizzaPrice: 18600,
|
||||
boxPrice: 1500,
|
||||
price: 20100
|
||||
},
|
||||
{
|
||||
varId: 28,
|
||||
size: "40cm",
|
||||
pizzaPrice: 263,
|
||||
boxPrice: 18,
|
||||
price: 281
|
||||
pizzaPrice: 26300,
|
||||
boxPrice: 1800,
|
||||
price: 28100
|
||||
},
|
||||
{
|
||||
varId: 29,
|
||||
size: "50cm",
|
||||
pizzaPrice: 346,
|
||||
boxPrice: 25,
|
||||
price: 371
|
||||
pizzaPrice: 34600,
|
||||
boxPrice: 2500,
|
||||
price: 37100
|
||||
}
|
||||
]
|
||||
},
|
||||
@@ -902,30 +902,30 @@ const MOCK_PIZZA_LIST = [
|
||||
{
|
||||
varId: 30,
|
||||
size: "30cm",
|
||||
pizzaPrice: 162,
|
||||
boxPrice: 13,
|
||||
price: 175
|
||||
pizzaPrice: 16200,
|
||||
boxPrice: 1300,
|
||||
price: 17500
|
||||
},
|
||||
{
|
||||
varId: 31,
|
||||
size: "35cm",
|
||||
pizzaPrice: 186,
|
||||
boxPrice: 15,
|
||||
price: 201
|
||||
pizzaPrice: 18600,
|
||||
boxPrice: 1500,
|
||||
price: 20100
|
||||
},
|
||||
{
|
||||
varId: 32,
|
||||
size: "40cm",
|
||||
pizzaPrice: 263,
|
||||
boxPrice: 18,
|
||||
price: 281
|
||||
pizzaPrice: 26300,
|
||||
boxPrice: 1800,
|
||||
price: 28100
|
||||
},
|
||||
{
|
||||
varId: 33,
|
||||
size: "50cm",
|
||||
pizzaPrice: 346,
|
||||
boxPrice: 25,
|
||||
price: 371
|
||||
pizzaPrice: 34600,
|
||||
boxPrice: 2500,
|
||||
price: 37100
|
||||
}
|
||||
]
|
||||
},
|
||||
@@ -946,30 +946,30 @@ const MOCK_PIZZA_LIST = [
|
||||
{
|
||||
varId: 34,
|
||||
size: "30cm",
|
||||
pizzaPrice: 162,
|
||||
boxPrice: 13,
|
||||
price: 175
|
||||
pizzaPrice: 16200,
|
||||
boxPrice: 1300,
|
||||
price: 17500
|
||||
},
|
||||
{
|
||||
varId: 35,
|
||||
size: "35cm",
|
||||
pizzaPrice: 186,
|
||||
boxPrice: 15,
|
||||
price: 201
|
||||
pizzaPrice: 18600,
|
||||
boxPrice: 1500,
|
||||
price: 20100
|
||||
},
|
||||
{
|
||||
varId: 36,
|
||||
size: "40cm",
|
||||
pizzaPrice: 263,
|
||||
boxPrice: 18,
|
||||
price: 281
|
||||
pizzaPrice: 26300,
|
||||
boxPrice: 1800,
|
||||
price: 28100
|
||||
},
|
||||
{
|
||||
varId: 37,
|
||||
size: "50cm",
|
||||
pizzaPrice: 346,
|
||||
boxPrice: 25,
|
||||
price: 371
|
||||
pizzaPrice: 34600,
|
||||
boxPrice: 2500,
|
||||
price: 37100
|
||||
}
|
||||
]
|
||||
},
|
||||
@@ -987,30 +987,30 @@ const MOCK_PIZZA_LIST = [
|
||||
{
|
||||
varId: 38,
|
||||
size: "30cm",
|
||||
pizzaPrice: 162,
|
||||
boxPrice: 13,
|
||||
price: 175
|
||||
pizzaPrice: 16200,
|
||||
boxPrice: 1300,
|
||||
price: 17500
|
||||
},
|
||||
{
|
||||
varId: 39,
|
||||
size: "35cm",
|
||||
pizzaPrice: 186,
|
||||
boxPrice: 15,
|
||||
price: 201
|
||||
pizzaPrice: 18600,
|
||||
boxPrice: 1500,
|
||||
price: 20100
|
||||
},
|
||||
{
|
||||
varId: 40,
|
||||
size: "40cm",
|
||||
pizzaPrice: 263,
|
||||
boxPrice: 18,
|
||||
price: 281
|
||||
pizzaPrice: 26300,
|
||||
boxPrice: 1800,
|
||||
price: 28100
|
||||
},
|
||||
{
|
||||
varId: 41,
|
||||
size: "50cm",
|
||||
pizzaPrice: 346,
|
||||
boxPrice: 25,
|
||||
price: 371
|
||||
pizzaPrice: 34600,
|
||||
boxPrice: 2500,
|
||||
price: 37100
|
||||
}
|
||||
]
|
||||
},
|
||||
@@ -1028,30 +1028,30 @@ const MOCK_PIZZA_LIST = [
|
||||
{
|
||||
varId: 42,
|
||||
size: "30cm",
|
||||
pizzaPrice: 172,
|
||||
boxPrice: 13,
|
||||
price: 185
|
||||
pizzaPrice: 17200,
|
||||
boxPrice: 1300,
|
||||
price: 18500
|
||||
},
|
||||
{
|
||||
varId: 43,
|
||||
size: "35cm",
|
||||
pizzaPrice: 212,
|
||||
boxPrice: 15,
|
||||
price: 227
|
||||
pizzaPrice: 21200,
|
||||
boxPrice: 1500,
|
||||
price: 22700
|
||||
},
|
||||
{
|
||||
varId: 44,
|
||||
size: "40cm",
|
||||
pizzaPrice: 293,
|
||||
boxPrice: 18,
|
||||
price: 311
|
||||
pizzaPrice: 29300,
|
||||
boxPrice: 1800,
|
||||
price: 31100
|
||||
},
|
||||
{
|
||||
varId: 45,
|
||||
size: "50cm",
|
||||
pizzaPrice: 376,
|
||||
boxPrice: 25,
|
||||
price: 401
|
||||
pizzaPrice: 37600,
|
||||
boxPrice: 2500,
|
||||
price: 40100
|
||||
}
|
||||
]
|
||||
},
|
||||
@@ -1069,30 +1069,30 @@ const MOCK_PIZZA_LIST = [
|
||||
{
|
||||
varId: 46,
|
||||
size: "30cm",
|
||||
pizzaPrice: 182,
|
||||
boxPrice: 13,
|
||||
price: 195
|
||||
pizzaPrice: 18200,
|
||||
boxPrice: 1300,
|
||||
price: 19500
|
||||
},
|
||||
{
|
||||
varId: 47,
|
||||
size: "35cm",
|
||||
pizzaPrice: 222,
|
||||
boxPrice: 15,
|
||||
price: 237
|
||||
pizzaPrice: 22200,
|
||||
boxPrice: 1500,
|
||||
price: 23700
|
||||
},
|
||||
{
|
||||
varId: 48,
|
||||
size: "40cm",
|
||||
pizzaPrice: 303,
|
||||
boxPrice: 18,
|
||||
price: 321
|
||||
pizzaPrice: 30300,
|
||||
boxPrice: 1800,
|
||||
price: 32100
|
||||
},
|
||||
{
|
||||
varId: 49,
|
||||
size: "50cm",
|
||||
pizzaPrice: 386,
|
||||
boxPrice: 25,
|
||||
price: 411
|
||||
pizzaPrice: 38600,
|
||||
boxPrice: 2500,
|
||||
price: 41100
|
||||
}
|
||||
]
|
||||
},
|
||||
@@ -1114,30 +1114,30 @@ const MOCK_PIZZA_LIST = [
|
||||
{
|
||||
varId: 50,
|
||||
size: "30cm",
|
||||
pizzaPrice: 182,
|
||||
boxPrice: 13,
|
||||
price: 195
|
||||
pizzaPrice: 18200,
|
||||
boxPrice: 1300,
|
||||
price: 19500
|
||||
},
|
||||
{
|
||||
varId: 51,
|
||||
size: "35cm",
|
||||
pizzaPrice: 222,
|
||||
boxPrice: 15,
|
||||
price: 237
|
||||
pizzaPrice: 22200,
|
||||
boxPrice: 1500,
|
||||
price: 23700
|
||||
},
|
||||
{
|
||||
varId: 52,
|
||||
size: "40cm",
|
||||
pizzaPrice: 303,
|
||||
boxPrice: 18,
|
||||
price: 321
|
||||
pizzaPrice: 30300,
|
||||
boxPrice: 1800,
|
||||
price: 32100
|
||||
},
|
||||
{
|
||||
varId: 53,
|
||||
size: "50cm",
|
||||
pizzaPrice: 396,
|
||||
boxPrice: 25,
|
||||
price: 421
|
||||
pizzaPrice: 39600,
|
||||
boxPrice: 2500,
|
||||
price: 42100
|
||||
}
|
||||
]
|
||||
},
|
||||
@@ -1156,30 +1156,30 @@ const MOCK_PIZZA_LIST = [
|
||||
{
|
||||
varId: 54,
|
||||
size: "30cm",
|
||||
pizzaPrice: 182,
|
||||
boxPrice: 13,
|
||||
price: 195
|
||||
pizzaPrice: 18200,
|
||||
boxPrice: 1300,
|
||||
price: 19500
|
||||
},
|
||||
{
|
||||
varId: 55,
|
||||
size: "35cm",
|
||||
pizzaPrice: 222,
|
||||
boxPrice: 15,
|
||||
price: 237
|
||||
pizzaPrice: 22200,
|
||||
boxPrice: 1500,
|
||||
price: 23700
|
||||
},
|
||||
{
|
||||
varId: 56,
|
||||
size: "40cm",
|
||||
pizzaPrice: 303,
|
||||
boxPrice: 18,
|
||||
price: 321
|
||||
pizzaPrice: 30300,
|
||||
boxPrice: 1800,
|
||||
price: 32100
|
||||
},
|
||||
{
|
||||
varId: 57,
|
||||
size: "50cm",
|
||||
pizzaPrice: 396,
|
||||
boxPrice: 25,
|
||||
price: 421
|
||||
pizzaPrice: 39600,
|
||||
boxPrice: 2500,
|
||||
price: 42100
|
||||
}
|
||||
]
|
||||
},
|
||||
@@ -1199,30 +1199,30 @@ const MOCK_PIZZA_LIST = [
|
||||
{
|
||||
varId: 58,
|
||||
size: "30cm",
|
||||
pizzaPrice: 182,
|
||||
boxPrice: 13,
|
||||
price: 195
|
||||
pizzaPrice: 18200,
|
||||
boxPrice: 1300,
|
||||
price: 19500
|
||||
},
|
||||
{
|
||||
varId: 59,
|
||||
size: "35cm",
|
||||
pizzaPrice: 222,
|
||||
boxPrice: 15,
|
||||
price: 237
|
||||
pizzaPrice: 22200,
|
||||
boxPrice: 1500,
|
||||
price: 23700
|
||||
},
|
||||
{
|
||||
varId: 60,
|
||||
size: "40cm",
|
||||
pizzaPrice: 303,
|
||||
boxPrice: 18,
|
||||
price: 321
|
||||
pizzaPrice: 30300,
|
||||
boxPrice: 1800,
|
||||
price: 32100
|
||||
},
|
||||
{
|
||||
varId: 61,
|
||||
size: "50cm",
|
||||
pizzaPrice: 396,
|
||||
boxPrice: 25,
|
||||
price: 421
|
||||
pizzaPrice: 39600,
|
||||
boxPrice: 2500,
|
||||
price: 42100
|
||||
}
|
||||
]
|
||||
},
|
||||
@@ -1241,30 +1241,30 @@ const MOCK_PIZZA_LIST = [
|
||||
{
|
||||
varId: 62,
|
||||
size: "30cm",
|
||||
pizzaPrice: 188,
|
||||
boxPrice: 13,
|
||||
price: 201
|
||||
pizzaPrice: 18800,
|
||||
boxPrice: 1300,
|
||||
price: 20100
|
||||
},
|
||||
{
|
||||
varId: 63,
|
||||
size: "35cm",
|
||||
pizzaPrice: 226,
|
||||
boxPrice: 15,
|
||||
price: 241
|
||||
pizzaPrice: 22600,
|
||||
boxPrice: 1500,
|
||||
price: 24100
|
||||
},
|
||||
{
|
||||
varId: 64,
|
||||
size: "40cm",
|
||||
pizzaPrice: 313,
|
||||
boxPrice: 18,
|
||||
price: 331
|
||||
pizzaPrice: 31300,
|
||||
boxPrice: 1800,
|
||||
price: 33100
|
||||
},
|
||||
{
|
||||
varId: 65,
|
||||
size: "50cm",
|
||||
pizzaPrice: 426,
|
||||
boxPrice: 25,
|
||||
price: 451
|
||||
pizzaPrice: 42600,
|
||||
boxPrice: 2500,
|
||||
price: 45100
|
||||
}
|
||||
]
|
||||
},
|
||||
@@ -1283,30 +1283,30 @@ const MOCK_PIZZA_LIST = [
|
||||
{
|
||||
varId: 66,
|
||||
size: "30cm",
|
||||
pizzaPrice: 188,
|
||||
boxPrice: 13,
|
||||
price: 201
|
||||
pizzaPrice: 18800,
|
||||
boxPrice: 1300,
|
||||
price: 20100
|
||||
},
|
||||
{
|
||||
varId: 67,
|
||||
size: "35cm",
|
||||
pizzaPrice: 226,
|
||||
boxPrice: 15,
|
||||
price: 241
|
||||
pizzaPrice: 22600,
|
||||
boxPrice: 1500,
|
||||
price: 24100
|
||||
},
|
||||
{
|
||||
varId: 68,
|
||||
size: "40cm",
|
||||
pizzaPrice: 313,
|
||||
boxPrice: 18,
|
||||
price: 331
|
||||
pizzaPrice: 31300,
|
||||
boxPrice: 1800,
|
||||
price: 33100
|
||||
},
|
||||
{
|
||||
varId: 69,
|
||||
size: "50cm",
|
||||
pizzaPrice: 426,
|
||||
boxPrice: 25,
|
||||
price: 451
|
||||
pizzaPrice: 42600,
|
||||
boxPrice: 2500,
|
||||
price: 45100
|
||||
}
|
||||
]
|
||||
},
|
||||
@@ -1327,30 +1327,30 @@ const MOCK_PIZZA_LIST = [
|
||||
{
|
||||
varId: 309,
|
||||
size: "30cm",
|
||||
pizzaPrice: 182,
|
||||
boxPrice: 13,
|
||||
price: 195
|
||||
pizzaPrice: 18200,
|
||||
boxPrice: 1300,
|
||||
price: 19500
|
||||
},
|
||||
{
|
||||
varId: 310,
|
||||
size: "35cm",
|
||||
pizzaPrice: 222,
|
||||
boxPrice: 15,
|
||||
price: 237
|
||||
pizzaPrice: 22200,
|
||||
boxPrice: 1500,
|
||||
price: 23700
|
||||
},
|
||||
{
|
||||
varId: 311,
|
||||
size: "40cm",
|
||||
pizzaPrice: 303,
|
||||
boxPrice: 18,
|
||||
price: 321
|
||||
pizzaPrice: 30300,
|
||||
boxPrice: 1800,
|
||||
price: 32100
|
||||
},
|
||||
{
|
||||
varId: 312,
|
||||
size: "50cm",
|
||||
pizzaPrice: 396,
|
||||
boxPrice: 25,
|
||||
price: 421
|
||||
pizzaPrice: 39600,
|
||||
boxPrice: 2500,
|
||||
price: 42100
|
||||
}
|
||||
]
|
||||
},
|
||||
@@ -1369,30 +1369,30 @@ const MOCK_PIZZA_LIST = [
|
||||
{
|
||||
varId: 394,
|
||||
size: "30cm",
|
||||
pizzaPrice: 188,
|
||||
boxPrice: 13,
|
||||
price: 201
|
||||
pizzaPrice: 18800,
|
||||
boxPrice: 1300,
|
||||
price: 20100
|
||||
},
|
||||
{
|
||||
varId: 395,
|
||||
size: "35cm",
|
||||
pizzaPrice: 226,
|
||||
boxPrice: 15,
|
||||
price: 241
|
||||
pizzaPrice: 22600,
|
||||
boxPrice: 1500,
|
||||
price: 24100
|
||||
},
|
||||
{
|
||||
varId: 396,
|
||||
size: "40cm",
|
||||
pizzaPrice: 313,
|
||||
boxPrice: 18,
|
||||
price: 331
|
||||
pizzaPrice: 31300,
|
||||
boxPrice: 1800,
|
||||
price: 33100
|
||||
},
|
||||
{
|
||||
varId: 397,
|
||||
size: "50cm",
|
||||
pizzaPrice: 426,
|
||||
boxPrice: 25,
|
||||
price: 451
|
||||
pizzaPrice: 42600,
|
||||
boxPrice: 2500,
|
||||
price: 45100
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -1434,22 +1434,22 @@ const MOCK_SALAT_LIST = [
|
||||
{
|
||||
name: "Greek",
|
||||
ingredients: ["Salát", "Černé olivy", "Paprika mix", "Červená cibule", "Rajčata", "Okurka salátová", "Jogurtový dresing"],
|
||||
price: 174 + 13,
|
||||
price: (174 + 13) * 100,
|
||||
},
|
||||
{
|
||||
name: "Caesar",
|
||||
ingredients: ["Salát", "Rajčata", "Kuřecí maso", "Krutony", "Parmazán", "Caesar dresing", "Olivový olej"],
|
||||
price: 184 + 13,
|
||||
price: (184 + 13) * 100,
|
||||
},
|
||||
{
|
||||
name: "Šopský salát",
|
||||
ingredients: ["Salátová okurka", "Rajčata", "Paprika mix", "Červená cibule", "Balkánský sýr"],
|
||||
price: 164 + 13,
|
||||
price: (164 + 13) * 100,
|
||||
},
|
||||
{
|
||||
name: "Těstovinový salát",
|
||||
ingredients: ["Penne", "Okurka", "Rajčata", "Paprika mix", "Kuřecí maso", "Jogurtový dresing"],
|
||||
price: 184 + 13,
|
||||
price: (184 + 13) * 100,
|
||||
},
|
||||
]
|
||||
|
||||
|
||||
+145
-330
@@ -10,10 +10,6 @@ import crypto from "crypto";
|
||||
const storage = getStorage();
|
||||
const PENDING_QR_PREFIX = 'pending_qr';
|
||||
|
||||
/**
|
||||
* Vrátí seznam dostupných pizz pro dnešní den.
|
||||
* Stáhne je, pokud je pro dnešní den nemá.
|
||||
*/
|
||||
export async function getPizzaList(): Promise<Pizza[] | undefined> {
|
||||
await initIfNeeded();
|
||||
let clientData = await getClientData(getToday());
|
||||
@@ -24,25 +20,17 @@ export async function getPizzaList(): Promise<Pizza[] | undefined> {
|
||||
return Promise.resolve(clientData.pizzaList);
|
||||
}
|
||||
|
||||
/**
|
||||
* Uloží seznam dostupných pizz pro dnešní den.
|
||||
*
|
||||
* @param pizzaList seznam dostupných pizz
|
||||
*/
|
||||
export async function savePizzaList(pizzaList: Pizza[]): Promise<ClientData> {
|
||||
await initIfNeeded();
|
||||
const today = formatDate(getToday());
|
||||
const clientData = await getClientData(getToday());
|
||||
clientData.pizzaList = pizzaList;
|
||||
clientData.pizzaListLastUpdate = formatDate(new Date());
|
||||
await storage.setData(today, clientData);
|
||||
return clientData;
|
||||
return storage.updateData<ClientData>(today, (current) => {
|
||||
const data = current ?? ({} as ClientData);
|
||||
data.pizzaList = pizzaList;
|
||||
data.pizzaListLastUpdate = formatDate(new Date());
|
||||
return data;
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Vrátí seznam dostupných salátů pro dnešní den.
|
||||
* Stáhne je, pokud je pro dnešní den nemá.
|
||||
*/
|
||||
export async function getSalatList(): Promise<Salat[] | undefined> {
|
||||
await initIfNeeded();
|
||||
let clientData = await getClientData(getToday());
|
||||
@@ -53,423 +41,250 @@ export async function getSalatList(): Promise<Salat[] | undefined> {
|
||||
return Promise.resolve(clientData.salatList);
|
||||
}
|
||||
|
||||
/**
|
||||
* Uloží seznam dostupných salátů pro dnešní den.
|
||||
*
|
||||
* @param salatList seznam dostupných salátů
|
||||
*/
|
||||
export async function saveSalatList(salatList: Salat[]): Promise<ClientData> {
|
||||
await initIfNeeded();
|
||||
const today = formatDate(getToday());
|
||||
const clientData = await getClientData(getToday());
|
||||
clientData.salatList = salatList;
|
||||
await storage.setData(today, clientData);
|
||||
return clientData;
|
||||
return storage.updateData<ClientData>(today, (current) => {
|
||||
const data = current ?? ({} as ClientData);
|
||||
data.salatList = salatList;
|
||||
return data;
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Vytvoří pizza day pro aktuální den a vrátí data pro klienta.
|
||||
*/
|
||||
export async function createPizzaDay(creator: string): Promise<ClientData> {
|
||||
await initIfNeeded();
|
||||
const clientData = await getClientData(getToday());
|
||||
if (clientData.pizzaDay) {
|
||||
throw Error("Pizza day pro dnešní den již existuje");
|
||||
}
|
||||
// TODO berka rychlooprava, vyřešit lépe - stahovat jednou, na jediném místě!
|
||||
// Stáhneme pizzy a saláty před samotnou atomickou operací
|
||||
const [pizzaList, salatList] = await Promise.all([getPizzaList(), getSalatList()]);
|
||||
const data: ClientData = { pizzaDay: { state: PizzaDayState.CREATED, creator, orders: [] }, pizzaList, salatList, ...clientData };
|
||||
const today = formatDate(getToday());
|
||||
await storage.setData(today, data);
|
||||
callNotifikace({ input: { udalost: UdalostEnum.ZAHAJENA_PIZZA, user: creator } })
|
||||
return data;
|
||||
const result = await storage.updateData<ClientData>(today, (current) => {
|
||||
if (!current) throw Error("Data pro dnešní den nejsou inicializována");
|
||||
if (current.pizzaDay) throw Error("Pizza day pro dnešní den již existuje");
|
||||
return { ...current, pizzaDay: { state: PizzaDayState.CREATED, creator, orders: [] }, pizzaList, salatList };
|
||||
});
|
||||
callNotifikace({ input: { udalost: UdalostEnum.ZAHAJENA_PIZZA, user: creator } });
|
||||
return result;
|
||||
}
|
||||
|
||||
/**
|
||||
* Smaže pizza day pro aktuální den.
|
||||
*/
|
||||
export async function deletePizzaDay(login: string): Promise<ClientData> {
|
||||
const clientData = await getClientData(getToday());
|
||||
if (!clientData.pizzaDay) {
|
||||
throw Error("Pizza day pro dnešní den neexistuje");
|
||||
}
|
||||
if (clientData.pizzaDay.creator !== login) {
|
||||
throw Error("Login uživatele se neshoduje se zakladatelem Pizza Day");
|
||||
}
|
||||
delete clientData.pizzaDay;
|
||||
const today = formatDate(getToday());
|
||||
await storage.setData(today, clientData);
|
||||
return clientData;
|
||||
return storage.updateData<ClientData>(today, (current) => {
|
||||
if (!current?.pizzaDay) throw Error("Pizza day pro dnešní den neexistuje");
|
||||
if (current.pizzaDay.creator !== login) throw Error("Login uživatele se neshoduje se zakladatelem Pizza Day");
|
||||
const data = { ...current };
|
||||
delete data.pizzaDay;
|
||||
return data;
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Přidá objednávku pizzy uživateli.
|
||||
*
|
||||
* @param login login uživatele
|
||||
* @param pizza zvolená pizza
|
||||
* @param size zvolená velikost pizzy
|
||||
*/
|
||||
export async function addPizzaOrder(login: string, pizza: Pizza, size: PizzaSize) {
|
||||
const today = formatDate(getToday());
|
||||
const clientData = await getClientData(getToday());
|
||||
if (!clientData.pizzaDay) {
|
||||
throw Error("Pizza day pro dnešní den neexistuje");
|
||||
}
|
||||
if (clientData.pizzaDay.state !== PizzaDayState.CREATED) {
|
||||
throw Error("Pizza day není ve stavu " + PizzaDayState.CREATED);
|
||||
}
|
||||
let order: PizzaOrder | undefined = clientData.pizzaDay?.orders?.find(o => o.customer === login);
|
||||
return storage.updateData<ClientData>(today, (current) => {
|
||||
if (!current?.pizzaDay) throw Error("Pizza day pro dnešní den neexistuje");
|
||||
if (current.pizzaDay.state !== PizzaDayState.CREATED) throw Error("Pizza day není ve stavu " + PizzaDayState.CREATED);
|
||||
let order: PizzaOrder | undefined = current.pizzaDay.orders?.find(o => o.customer === login);
|
||||
if (!order) {
|
||||
order = {
|
||||
customer: login,
|
||||
pizzaList: [],
|
||||
totalPrice: 0,
|
||||
hasQr: false,
|
||||
}
|
||||
clientData.pizzaDay.orders ??= [];
|
||||
clientData.pizzaDay.orders.push(order);
|
||||
}
|
||||
const pizzaOrder: PizzaVariant = {
|
||||
varId: size.varId,
|
||||
name: pizza.name,
|
||||
size: size.size,
|
||||
price: size.price,
|
||||
order = { customer: login, pizzaList: [], totalPrice: 0, hasQr: false };
|
||||
current.pizzaDay.orders ??= [];
|
||||
current.pizzaDay.orders.push(order);
|
||||
}
|
||||
const pizzaOrder: PizzaVariant = { varId: size.varId, name: pizza.name, size: size.size, price: size.price };
|
||||
order.pizzaList ??= [];
|
||||
order.pizzaList.push(pizzaOrder);
|
||||
order.totalPrice += pizzaOrder.price;
|
||||
await storage.setData(today, clientData);
|
||||
return clientData;
|
||||
return current;
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Přidá objednávku salátu uživateli.
|
||||
*
|
||||
* @param login login uživatele
|
||||
* @param salat zvolený salát
|
||||
*/
|
||||
export async function addSalatOrder(login: string, salat: Salat) {
|
||||
const today = formatDate(getToday());
|
||||
const clientData = await getClientData(getToday());
|
||||
if (!clientData.pizzaDay) {
|
||||
throw Error("Pizza day pro dnešní den neexistuje");
|
||||
}
|
||||
if (clientData.pizzaDay.state !== PizzaDayState.CREATED) {
|
||||
throw Error("Pizza day není ve stavu " + PizzaDayState.CREATED);
|
||||
}
|
||||
let order: PizzaOrder | undefined = clientData.pizzaDay?.orders?.find(o => o.customer === login);
|
||||
return storage.updateData<ClientData>(today, (current) => {
|
||||
if (!current?.pizzaDay) throw Error("Pizza day pro dnešní den neexistuje");
|
||||
if (current.pizzaDay.state !== PizzaDayState.CREATED) throw Error("Pizza day není ve stavu " + PizzaDayState.CREATED);
|
||||
let order: PizzaOrder | undefined = current.pizzaDay.orders?.find(o => o.customer === login);
|
||||
if (!order) {
|
||||
order = {
|
||||
customer: login,
|
||||
pizzaList: [],
|
||||
totalPrice: 0,
|
||||
hasQr: false,
|
||||
}
|
||||
clientData.pizzaDay.orders ??= [];
|
||||
clientData.pizzaDay.orders.push(order);
|
||||
}
|
||||
const salatOrder: PizzaVariant = {
|
||||
varId: 0,
|
||||
name: salat.name,
|
||||
size: "1 porce",
|
||||
price: salat.price,
|
||||
category: 'salat',
|
||||
order = { customer: login, pizzaList: [], totalPrice: 0, hasQr: false };
|
||||
current.pizzaDay.orders ??= [];
|
||||
current.pizzaDay.orders.push(order);
|
||||
}
|
||||
const salatOrder: PizzaVariant = { varId: 0, name: salat.name, size: "1 porce", price: salat.price, category: 'salat' };
|
||||
order.pizzaList ??= [];
|
||||
order.pizzaList.push(salatOrder);
|
||||
order.totalPrice += salatOrder.price;
|
||||
await storage.setData(today, clientData);
|
||||
return clientData;
|
||||
return current;
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Odstraní všechny pizzy uživatele (celou jeho objednávku).
|
||||
* Pokud Pizza day neexistuje nebo není ve stavu CREATED, neudělá nic.
|
||||
*
|
||||
* @param login login uživatele
|
||||
* @param date datum, pro které se objednávka odstraňuje (výchozí je dnešek)
|
||||
* @returns aktuální data pro klienta
|
||||
*/
|
||||
export async function removeAllUserPizzas(login: string, date?: Date) {
|
||||
const usedDate = date ?? getToday();
|
||||
const today = formatDate(usedDate);
|
||||
const clientData = await getClientData(usedDate);
|
||||
|
||||
if (!clientData.pizzaDay) {
|
||||
return clientData; // Pizza day neexistuje, není co mazat
|
||||
}
|
||||
|
||||
if (clientData.pizzaDay.state !== PizzaDayState.CREATED) {
|
||||
return clientData; // Pizza day není ve stavu CREATED, nelze mazat
|
||||
}
|
||||
|
||||
const orderIndex = clientData.pizzaDay.orders!.findIndex(o => o.customer === login);
|
||||
if (orderIndex >= 0) {
|
||||
clientData.pizzaDay.orders!.splice(orderIndex, 1);
|
||||
await storage.setData(today, clientData);
|
||||
}
|
||||
|
||||
return clientData;
|
||||
return storage.updateData<ClientData>(today, (current) => {
|
||||
if (!current?.pizzaDay) return current ?? ({} as ClientData);
|
||||
if (current.pizzaDay.state !== PizzaDayState.CREATED) return current;
|
||||
const orderIndex = current.pizzaDay.orders!.findIndex(o => o.customer === login);
|
||||
if (orderIndex >= 0) current.pizzaDay.orders!.splice(orderIndex, 1);
|
||||
return current;
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Odstraní danou objednávku pizzy.
|
||||
*
|
||||
* @param login login uživatele
|
||||
* @param pizzaOrder objednávka pizzy
|
||||
*/
|
||||
export async function removePizzaOrder(login: string, pizzaOrder: PizzaVariant) {
|
||||
const today = formatDate(getToday());
|
||||
const clientData = await getClientData(getToday());
|
||||
if (!clientData.pizzaDay) {
|
||||
throw Error("Pizza day pro dnešní den neexistuje");
|
||||
}
|
||||
const orderIndex = clientData.pizzaDay.orders!.findIndex(o => o.customer === login);
|
||||
if (orderIndex < 0) {
|
||||
throw Error("Nebyly nalezeny žádné objednávky pro uživatele " + login);
|
||||
}
|
||||
const order = clientData.pizzaDay.orders![orderIndex];
|
||||
return storage.updateData<ClientData>(today, (current) => {
|
||||
if (!current?.pizzaDay) throw Error("Pizza day pro dnešní den neexistuje");
|
||||
const orderIndex = current.pizzaDay.orders!.findIndex(o => o.customer === login);
|
||||
if (orderIndex < 0) throw Error("Nebyly nalezeny žádné objednávky pro uživatele " + login);
|
||||
const order = current.pizzaDay.orders![orderIndex];
|
||||
const index = order.pizzaList!.findIndex(o => o.name === pizzaOrder.name && o.size === pizzaOrder.size);
|
||||
if (index < 0) {
|
||||
throw Error("Objednávka s danými parametry nebyla nalezena");
|
||||
}
|
||||
if (index < 0) throw Error("Objednávka s danými parametry nebyla nalezena");
|
||||
const price = order.pizzaList![index].price;
|
||||
order.pizzaList!.splice(index, 1);
|
||||
order.totalPrice -= price;
|
||||
if (order.pizzaList!.length == 0) {
|
||||
clientData.pizzaDay.orders!.splice(orderIndex, 1);
|
||||
}
|
||||
await storage.setData(today, clientData);
|
||||
return clientData;
|
||||
if (order.pizzaList!.length === 0) current.pizzaDay.orders!.splice(orderIndex, 1);
|
||||
return current;
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Uzamkne možnost editovat objednávky pizzy.
|
||||
*
|
||||
* @param login login uživatele
|
||||
* @returns aktuální data pro uživatele
|
||||
*/
|
||||
export async function lockPizzaDay(login: string) {
|
||||
const today = formatDate(getToday());
|
||||
const clientData = await getClientData(getToday());
|
||||
if (!clientData.pizzaDay) {
|
||||
throw Error("Pizza day pro dnešní den neexistuje");
|
||||
}
|
||||
if (clientData.pizzaDay.creator !== login) {
|
||||
throw Error("Pizza day není spravován uživatelem " + login);
|
||||
}
|
||||
if (clientData.pizzaDay.state !== PizzaDayState.CREATED && clientData.pizzaDay.state !== PizzaDayState.ORDERED) {
|
||||
return storage.updateData<ClientData>(today, (current) => {
|
||||
if (!current?.pizzaDay) throw Error("Pizza day pro dnešní den neexistuje");
|
||||
if (current.pizzaDay.creator !== login) throw Error("Pizza day není spravován uživatelem " + login);
|
||||
if (current.pizzaDay.state !== PizzaDayState.CREATED && current.pizzaDay.state !== PizzaDayState.ORDERED) {
|
||||
throw Error("Pizza day není ve stavu " + PizzaDayState.CREATED + " nebo " + PizzaDayState.ORDERED);
|
||||
}
|
||||
clientData.pizzaDay.state = PizzaDayState.LOCKED;
|
||||
await storage.setData(today, clientData);
|
||||
return clientData;
|
||||
current.pizzaDay.state = PizzaDayState.LOCKED;
|
||||
return current;
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Odekmne možnost editovat objednávky pizzy.
|
||||
*
|
||||
* @param login login uživatele
|
||||
* @returns aktuální data pro uživatele
|
||||
*/
|
||||
export async function unlockPizzaDay(login: string) {
|
||||
const today = formatDate(getToday());
|
||||
const clientData = await getClientData(getToday());
|
||||
if (!clientData.pizzaDay) {
|
||||
throw Error("Pizza day pro dnešní den neexistuje");
|
||||
}
|
||||
if (clientData.pizzaDay.creator !== login) {
|
||||
throw Error("Pizza day není spravován uživatelem " + login);
|
||||
}
|
||||
if (clientData.pizzaDay.state !== PizzaDayState.LOCKED) {
|
||||
throw Error("Pizza day není ve stavu " + PizzaDayState.LOCKED);
|
||||
}
|
||||
clientData.pizzaDay.state = PizzaDayState.CREATED;
|
||||
await storage.setData(today, clientData);
|
||||
return clientData;
|
||||
return storage.updateData<ClientData>(today, (current) => {
|
||||
if (!current?.pizzaDay) throw Error("Pizza day pro dnešní den neexistuje");
|
||||
if (current.pizzaDay.creator !== login) throw Error("Pizza day není spravován uživatelem " + login);
|
||||
if (current.pizzaDay.state !== PizzaDayState.LOCKED) throw Error("Pizza day není ve stavu " + PizzaDayState.LOCKED);
|
||||
current.pizzaDay.state = PizzaDayState.CREATED;
|
||||
return current;
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Nastaví stav pizza day na "pizzy objednány".
|
||||
*
|
||||
* @param login login uživatele
|
||||
* @returns aktuální data pro uživatele
|
||||
*/
|
||||
export async function finishPizzaOrder(login: string) {
|
||||
const today = formatDate(getToday());
|
||||
const clientData = await getClientData(getToday());
|
||||
if (!clientData.pizzaDay) {
|
||||
throw Error("Pizza day pro dnešní den neexistuje");
|
||||
}
|
||||
if (clientData.pizzaDay.creator !== login) {
|
||||
throw Error("Pizza day není spravován uživatelem " + login);
|
||||
}
|
||||
if (clientData.pizzaDay.state !== PizzaDayState.LOCKED) {
|
||||
throw Error("Pizza day není ve stavu " + PizzaDayState.LOCKED);
|
||||
}
|
||||
clientData.pizzaDay.state = PizzaDayState.ORDERED;
|
||||
await storage.setData(today, clientData);
|
||||
callNotifikace({ input: { udalost: UdalostEnum.OBJEDNANA_PIZZA, user: clientData?.pizzaDay?.creator } })
|
||||
return clientData;
|
||||
const result = await storage.updateData<ClientData>(today, (current) => {
|
||||
if (!current?.pizzaDay) throw Error("Pizza day pro dnešní den neexistuje");
|
||||
if (current.pizzaDay.creator !== login) throw Error("Pizza day není spravován uživatelem " + login);
|
||||
if (current.pizzaDay.state !== PizzaDayState.LOCKED) throw Error("Pizza day není ve stavu " + PizzaDayState.LOCKED);
|
||||
current.pizzaDay.state = PizzaDayState.ORDERED;
|
||||
return current;
|
||||
});
|
||||
callNotifikace({ input: { udalost: UdalostEnum.OBJEDNANA_PIZZA, user: result.pizzaDay!.creator! } });
|
||||
return result;
|
||||
}
|
||||
|
||||
/**
|
||||
* Nastaví stav pizza day na "pizzy doručeny".
|
||||
* Vygeneruje QR kódy pro všechny objednatele, pokud objednávající má vyplněné číslo účtu a jméno.
|
||||
*
|
||||
* @param login login uživatele
|
||||
* @returns aktuální data pro uživatele
|
||||
*/
|
||||
export async function finishPizzaDelivery(login: string, bankAccount?: string, bankAccountHolder?: string) {
|
||||
const today = formatDate(getToday());
|
||||
// Načteme aktuální data pro přípravu QR (potřebujeme objednávky)
|
||||
const clientData = await getClientData(getToday());
|
||||
if (!clientData.pizzaDay) {
|
||||
throw Error("Pizza day pro dnešní den neexistuje");
|
||||
}
|
||||
if (clientData.pizzaDay.creator !== login) {
|
||||
throw Error("Pizza day není spravován uživatelem " + login);
|
||||
}
|
||||
if (clientData.pizzaDay.state !== PizzaDayState.ORDERED) {
|
||||
throw Error("Pizza day není ve stavu " + PizzaDayState.ORDERED);
|
||||
}
|
||||
clientData.pizzaDay.state = PizzaDayState.DELIVERED;
|
||||
if (!clientData.pizzaDay) throw Error("Pizza day pro dnešní den neexistuje");
|
||||
if (clientData.pizzaDay.creator !== login) throw Error("Pizza day není spravován uživatelem " + login);
|
||||
if (clientData.pizzaDay.state !== PizzaDayState.ORDERED) throw Error("Pizza day není ve stavu " + PizzaDayState.ORDERED);
|
||||
|
||||
// Vygenerujeme QR kód, pokud k tomu máme data
|
||||
// Generujeme QR kódy před atomickým zápisem
|
||||
const pendingQrs: Array<{ customer: string; id: string; pendingQr: PendingQr }> = [];
|
||||
if (bankAccount?.length && bankAccountHolder?.length) {
|
||||
for (const order of clientData.pizzaDay.orders!) {
|
||||
if (order.customer !== login) { // zatím platí creator = objednávající, a pro toho nemá QR kód smysl
|
||||
if (order.customer !== login) {
|
||||
const id = crypto.randomUUID();
|
||||
let message = order.pizzaList!.map(item =>
|
||||
const message = order.pizzaList!.map(item =>
|
||||
item.category === 'salat' ? `Salát ${item.name}` : `Pizza ${item.name} (${item.size})`
|
||||
).join(', ');
|
||||
await generateQr(order.customer, bankAccount, bankAccountHolder, order.totalPrice, message, id);
|
||||
order.hasQr = true;
|
||||
// Uložíme nevyřízený QR kód pro persistentní zobrazení
|
||||
await addPendingQr(order.customer, {
|
||||
id,
|
||||
date: today,
|
||||
creator: login,
|
||||
totalPrice: order.totalPrice,
|
||||
purpose: message,
|
||||
await generateQr(order.customer, bankAccount, bankAccountHolder, order.totalPrice / 100, message, id);
|
||||
pendingQrs.push({
|
||||
customer: order.customer, id, pendingQr: {
|
||||
id, date: today, creator: login, totalPrice: order.totalPrice, purpose: message,
|
||||
},
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
await storage.setData(today, clientData);
|
||||
return clientData;
|
||||
|
||||
const result = await storage.updateData<ClientData>(today, (current) => {
|
||||
if (!current?.pizzaDay) throw Error("Pizza day pro dnešní den neexistuje");
|
||||
current.pizzaDay.state = PizzaDayState.DELIVERED;
|
||||
for (const { customer } of pendingQrs) {
|
||||
const order = current.pizzaDay.orders!.find(o => o.customer === customer);
|
||||
if (order) { order.hasQr = true; }
|
||||
}
|
||||
return current;
|
||||
});
|
||||
|
||||
// Uložení nevyřízených QR kódů mimo hlavní transakci (per-user klíče)
|
||||
for (const { customer, pendingQr } of pendingQrs) {
|
||||
await addPendingQr(customer, pendingQr);
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
/**
|
||||
* Aktualizuje poznámku k Pizza day uživatele.
|
||||
*
|
||||
* @param login přihlašovací jméno uživatele
|
||||
* @param note nová poznámka k Pizza day
|
||||
* @returns aktuální klientská data
|
||||
*/
|
||||
export async function updatePizzaDayNote(login: string, note?: string) {
|
||||
const today = formatDate(getToday());
|
||||
let clientData = await getClientData(getToday());
|
||||
if (!clientData.pizzaDay) {
|
||||
throw Error("Pizza day pro dnešní den neexistuje");
|
||||
}
|
||||
if (clientData.pizzaDay.state !== PizzaDayState.CREATED) {
|
||||
throw Error("Pizza day není ve stavu " + PizzaDayState.CREATED);
|
||||
}
|
||||
const myOrder = clientData.pizzaDay.orders!.find(o => o.customer === login);
|
||||
if (!myOrder?.pizzaList?.length) {
|
||||
throw Error("Pizza day neobsahuje žádné objednávky uživatele " + login);
|
||||
}
|
||||
return storage.updateData<ClientData>(today, (current) => {
|
||||
if (!current?.pizzaDay) throw Error("Pizza day pro dnešní den neexistuje");
|
||||
if (current.pizzaDay.state !== PizzaDayState.CREATED) throw Error("Pizza day není ve stavu " + PizzaDayState.CREATED);
|
||||
const myOrder = current.pizzaDay.orders!.find(o => o.customer === login);
|
||||
if (!myOrder?.pizzaList?.length) throw Error("Pizza day neobsahuje žádné objednávky uživatele " + login);
|
||||
myOrder.note = note;
|
||||
await storage.setData(today, clientData);
|
||||
return clientData;
|
||||
return current;
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Aktualizuje příplatek uživatele k objednávce pizzy.
|
||||
* V případě nevyplnění ceny je příplatek odebrán.
|
||||
*
|
||||
* @param login přihlašovací jméno aktuálního uživatele
|
||||
* @param targetLogin přihlašovací jméno uživatele, kterému je nastavován příplatek
|
||||
* @param text text popisující příplatek
|
||||
* @param price celková cena příplatku
|
||||
*/
|
||||
export async function updatePizzaFee(login: string, targetLogin: string, text?: string, price?: number) {
|
||||
const today = formatDate(getToday());
|
||||
let clientData = await getClientData(getToday());
|
||||
if (!clientData.pizzaDay) {
|
||||
throw Error("Pizza day pro dnešní den neexistuje");
|
||||
}
|
||||
if (clientData.pizzaDay.state !== PizzaDayState.CREATED) {
|
||||
throw Error(`Pizza day není ve stavu ${PizzaDayState.CREATED}`);
|
||||
}
|
||||
if (clientData.pizzaDay.creator !== login) {
|
||||
throw Error("Příplatky může měnit pouze zakladatel Pizza day");
|
||||
}
|
||||
const targetOrder = clientData.pizzaDay.orders!.find(o => o.customer === targetLogin);
|
||||
if (!targetOrder?.pizzaList?.length) {
|
||||
throw Error(`Pizza day neobsahuje žádné objednávky uživatele ${targetLogin}`);
|
||||
}
|
||||
return storage.updateData<ClientData>(today, (current) => {
|
||||
if (!current?.pizzaDay) throw Error("Pizza day pro dnešní den neexistuje");
|
||||
if (current.pizzaDay.state !== PizzaDayState.CREATED) throw Error(`Pizza day není ve stavu ${PizzaDayState.CREATED}`);
|
||||
if (current.pizzaDay.creator !== login) throw Error("Příplatky může měnit pouze zakladatel Pizza day");
|
||||
const targetOrder = current.pizzaDay.orders!.find(o => o.customer === targetLogin);
|
||||
if (!targetOrder?.pizzaList?.length) throw Error(`Pizza day neobsahuje žádné objednávky uživatele ${targetLogin}`);
|
||||
if (!price) {
|
||||
delete targetOrder.fee;
|
||||
} else {
|
||||
targetOrder.fee = { text, price };
|
||||
}
|
||||
// Přepočet ceny
|
||||
targetOrder.totalPrice = targetOrder.pizzaList.reduce((price, pizzaOrder) => price + pizzaOrder.price, 0) + (targetOrder.fee?.price ?? 0);
|
||||
await storage.setData(today, clientData);
|
||||
return clientData;
|
||||
targetOrder.totalPrice = targetOrder.pizzaList.reduce((p, o) => p + o.price, 0) + (targetOrder.fee?.price ?? 0);
|
||||
return current;
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Vrátí klíč pro uložení nevyřízených QR kódů uživatele.
|
||||
*/
|
||||
function getPendingQrKey(login: string): string {
|
||||
return `${PENDING_QR_PREFIX}_${login}`;
|
||||
}
|
||||
|
||||
/**
|
||||
* Přidá nevyřízený QR kód pro uživatele.
|
||||
*/
|
||||
export async function addPendingQr(login: string, pendingQr: PendingQr): Promise<void> {
|
||||
const key = getPendingQrKey(login);
|
||||
const existing = await storage.getData<PendingQr[]>(key) ?? [];
|
||||
// Deduplikace podle id (ne podle data — jeden den může mít uživatel víc QR kódů)
|
||||
if (!existing.some(qr => qr.id === pendingQr.id)) {
|
||||
existing.push(pendingQr);
|
||||
await storage.setData(key, existing);
|
||||
}
|
||||
await storage.updateData<PendingQr[]>(getPendingQrKey(login), (current) => {
|
||||
const existing = current ?? [];
|
||||
if (!existing.some(qr => qr.id === pendingQr.id)) existing.push(pendingQr);
|
||||
return existing;
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Vrátí nevyřízené QR kódy pro uživatele.
|
||||
*/
|
||||
export async function getPendingQrs(login: string): Promise<PendingQr[]> {
|
||||
return await storage.getData<PendingQr[]>(getPendingQrKey(login)) ?? [];
|
||||
}
|
||||
|
||||
/**
|
||||
* Označí QR kód jako uhrazený (odstraní ho ze seznamu nevyřízených).
|
||||
* Vrátí odstraněný QR kód, pokud byl nalezen.
|
||||
*/
|
||||
export async function dismissPendingQr(login: string, id: string): Promise<PendingQr | undefined> {
|
||||
const key = getPendingQrKey(login);
|
||||
const existing = await storage.getData<PendingQr[]>(key) ?? [];
|
||||
const dismissed = existing.find(qr => qr.id === id);
|
||||
const filtered = existing.filter(qr => qr.id !== id);
|
||||
await storage.setData(key, filtered);
|
||||
let dismissed: PendingQr | undefined;
|
||||
await storage.updateData<PendingQr[]>(getPendingQrKey(login), (current) => {
|
||||
const existing = current ?? [];
|
||||
dismissed = existing.find(qr => qr.id === id);
|
||||
return existing.filter(qr => qr.id !== id);
|
||||
});
|
||||
return dismissed;
|
||||
}
|
||||
|
||||
/**
|
||||
* Odstraní všechny nevyřízené QR kódy patřící dané skupině objednávky.
|
||||
*/
|
||||
export async function removePendingQrsByGroupId(logins: string[], groupId: string): Promise<void> {
|
||||
for (const login of logins) {
|
||||
const key = getPendingQrKey(login);
|
||||
const existing = await storage.getData<PendingQr[]>(key) ?? [];
|
||||
const filtered = existing.filter(qr => qr.groupId !== groupId);
|
||||
if (filtered.length !== existing.length) {
|
||||
await storage.setData(key, filtered);
|
||||
}
|
||||
await storage.updateData<PendingQr[]>(getPendingQrKey(login), (current) => {
|
||||
return (current ?? []).filter(qr => qr.groupId !== groupId);
|
||||
});
|
||||
}
|
||||
}
|
||||
+46
-37
@@ -1,12 +1,16 @@
|
||||
import webpush from 'web-push';
|
||||
import crypto from 'crypto';
|
||||
import getStorage from './storage';
|
||||
import { createLeaderLease } from './leaderLease';
|
||||
import { getClientData, getToday } from './service';
|
||||
import { getIsWeekend } from './utils';
|
||||
import { LunchChoices } from '../../types';
|
||||
|
||||
const storage = getStorage();
|
||||
const REGISTRY_KEY = 'push_reminder_registry';
|
||||
const lease = createLeaderLease('luncher:reminder:leader');
|
||||
|
||||
const POD_ID = process.env.POD_ID ?? `local-${process.pid}`;
|
||||
|
||||
interface RegistryEntry {
|
||||
time: string;
|
||||
@@ -20,6 +24,8 @@ const lastReminded = new Map<string, number>();
|
||||
|
||||
const REMINDER_COOLDOWN_MS = 60 * 60 * 1000; // 60 minut mezi připomínkami
|
||||
|
||||
let reminderInterval: ReturnType<typeof setInterval> | undefined;
|
||||
|
||||
function getCurrentTimeHHMM(): string {
|
||||
const now = new Date();
|
||||
return `${String(now.getHours()).padStart(2, '0')}:${String(now.getMinutes()).padStart(2, '0')}`;
|
||||
@@ -36,27 +42,36 @@ function userHasChoice(choices: LunchChoices, login: string): boolean {
|
||||
return false;
|
||||
}
|
||||
|
||||
async function getRegistry(): Promise<Registry> {
|
||||
return await storage.getData<Registry>(REGISTRY_KEY) ?? {};
|
||||
/** Uvolní leader lease při graceful shutdown. */
|
||||
export async function releaseReminderLease(): Promise<void> {
|
||||
await lease.release();
|
||||
}
|
||||
|
||||
async function saveRegistry(registry: Registry): Promise<void> {
|
||||
await storage.setData(REGISTRY_KEY, registry);
|
||||
/** Stopne scheduler připomínek. Volá se při graceful shutdown. */
|
||||
export function stopReminderScheduler(): void {
|
||||
if (reminderInterval) {
|
||||
clearInterval(reminderInterval);
|
||||
reminderInterval = undefined;
|
||||
}
|
||||
}
|
||||
|
||||
/** Přidá nebo aktualizuje push subscription pro uživatele. */
|
||||
export async function subscribePush(login: string, subscription: webpush.PushSubscription, reminderTime: string): Promise<void> {
|
||||
const registry = await getRegistry();
|
||||
await storage.updateData<Registry>(REGISTRY_KEY, (current) => {
|
||||
const registry = current ?? {};
|
||||
registry[login] = { time: reminderTime, subscription };
|
||||
await saveRegistry(registry);
|
||||
return registry;
|
||||
});
|
||||
console.log(`Push reminder: uživatel ${login} přihlášen k připomínkám v ${reminderTime}`);
|
||||
}
|
||||
|
||||
/** Odebere push subscription pro uživatele. */
|
||||
export async function unsubscribePush(login: string): Promise<void> {
|
||||
const registry = await getRegistry();
|
||||
await storage.updateData<Registry>(REGISTRY_KEY, (current) => {
|
||||
const registry = current ?? {};
|
||||
delete registry[login];
|
||||
await saveRegistry(registry);
|
||||
return registry;
|
||||
});
|
||||
lastReminded.delete(login);
|
||||
console.log(`Push reminder: uživatel ${login} odhlášen z připomínek`);
|
||||
}
|
||||
@@ -79,23 +94,20 @@ export function verifyQuickChoiceToken(login: string, token: string): boolean {
|
||||
return crypto.timingSafeEqual(Buffer.from(expected, 'hex'), Buffer.from(token, 'hex'));
|
||||
}
|
||||
|
||||
|
||||
/** Zkontroluje a odešle připomínky uživatelům, kteří si nezvolili oběd. */
|
||||
async function checkAndSendReminders(): Promise<void> {
|
||||
// Přeskočit víkendy
|
||||
if (getIsWeekend(getToday())) {
|
||||
return;
|
||||
}
|
||||
if (getIsWeekend(getToday())) return;
|
||||
|
||||
const registry = await getRegistry();
|
||||
// Leader election — pouze jeden pod spouští připomínky
|
||||
const isLeader = await lease.tryAcquireOrRenew();
|
||||
if (!isLeader) return;
|
||||
|
||||
const registry = await storage.getData<Registry>(REGISTRY_KEY) ?? {};
|
||||
const entries = Object.entries(registry);
|
||||
if (entries.length === 0) {
|
||||
return;
|
||||
}
|
||||
if (entries.length === 0) return;
|
||||
|
||||
const currentTime = getCurrentTimeHHMM();
|
||||
|
||||
// Získáme data pro dnešek jednou pro všechny uživatele
|
||||
let clientData;
|
||||
try {
|
||||
clientData = await getClientData(getToday());
|
||||
@@ -104,24 +116,16 @@ async function checkAndSendReminders(): Promise<void> {
|
||||
return;
|
||||
}
|
||||
|
||||
const expiredLogins: string[] = [];
|
||||
|
||||
for (const [login, entry] of entries) {
|
||||
// Ještě nedosáhl čas připomínky
|
||||
if (currentTime < entry.time) {
|
||||
continue;
|
||||
}
|
||||
if (currentTime < entry.time) continue;
|
||||
|
||||
// Cooldown — nepřipomínat častěji než jednou za hodinu
|
||||
const last = lastReminded.get(login) ?? 0;
|
||||
if (Date.now() - last < REMINDER_COOLDOWN_MS) {
|
||||
continue;
|
||||
}
|
||||
if (Date.now() - last < REMINDER_COOLDOWN_MS) continue;
|
||||
|
||||
// Uživatel už má zvolenou možnost
|
||||
if (clientData.choices && userHasChoice(clientData.choices, login)) {
|
||||
continue;
|
||||
}
|
||||
if (clientData.choices && userHasChoice(clientData.choices, login)) continue;
|
||||
|
||||
// Odešleme push notifikaci
|
||||
try {
|
||||
await webpush.sendNotification(
|
||||
entry.subscription,
|
||||
@@ -136,15 +140,21 @@ async function checkAndSendReminders(): Promise<void> {
|
||||
console.log(`Push reminder: odeslána připomínka uživateli ${login}`);
|
||||
} catch (error: any) {
|
||||
if (error.statusCode === 410 || error.statusCode === 404) {
|
||||
// Subscription expirovala nebo je neplatná — odebereme z registry
|
||||
console.log(`Push reminder: subscription uživatele ${login} expirovala, odebírám`);
|
||||
delete registry[login];
|
||||
await saveRegistry(registry);
|
||||
expiredLogins.push(login);
|
||||
} else {
|
||||
console.error(`Push reminder: chyba při odesílání notifikace uživateli ${login}:`, error);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (expiredLogins.length > 0) {
|
||||
await storage.updateData<Registry>(REGISTRY_KEY, (current) => {
|
||||
const r = current ?? {};
|
||||
for (const login of expiredLogins) delete r[login];
|
||||
return r;
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
/** Spustí scheduler pro kontrolu a odesílání připomínek každou minutu. */
|
||||
@@ -160,7 +170,6 @@ export function startReminderScheduler(): void {
|
||||
|
||||
webpush.setVapidDetails(subject, publicKey, privateKey);
|
||||
|
||||
// Spustíme kontrolu každou minutu
|
||||
setInterval(checkAndSendReminders, 60_000);
|
||||
console.log('Push reminder: scheduler spuštěn');
|
||||
reminderInterval = setInterval(checkAndSendReminders, 60_000);
|
||||
console.log(`Push reminder: scheduler spuštěn (POD_ID=${POD_ID})`);
|
||||
}
|
||||
|
||||
+22
-10
@@ -31,10 +31,10 @@ export function convertBbanToIban(bankAccountNumber: string): string {
|
||||
// Zatím napevno, nemá smysl řešit nic jiného než CZ
|
||||
iban = iban.replace('C', '12').replace('Z', '35');
|
||||
const remainder = BigInt(iban) % BigInt(97);
|
||||
const checkDigits = BigInt(98) - remainder;
|
||||
iban = `${COUNTRY_CODE}${checkDigits.toString()}${bankCode}${prefix}${accountNumber}`;
|
||||
const checkDigits = (BigInt(98) - remainder).toString().padStart(2, '0');
|
||||
iban = `${COUNTRY_CODE}${checkDigits}${bankCode}${prefix}${accountNumber}`;
|
||||
if (iban.length !== 24) {
|
||||
throw Error("Neplatná délka sestaveného IBAN: " + iban.length + ", očekáváno 24");
|
||||
throw new Error("Neplatná délka sestaveného IBAN: " + iban.length + ", očekáváno 24");
|
||||
}
|
||||
return iban;
|
||||
}
|
||||
@@ -44,6 +44,24 @@ function createStorageKey(customerName: string, id: string): string {
|
||||
return `qr_${nameHash}_${id}`;
|
||||
}
|
||||
|
||||
/**
|
||||
* Očistí zprávu (účel platby) pro QR platbu:
|
||||
* - transliteruje diakritiku na základní písmena (š→s, č→c, ř→r, ...)
|
||||
* - odstraní zbylé znaky mimo ISO 8859-1
|
||||
* - odstraní '*', který v QR platbě slouží jako oddělovač polí
|
||||
* - ořízne na max. 60 znaků
|
||||
*
|
||||
* @param message původní zpráva
|
||||
* @returns očištěná zpráva vhodná pro QR platbu
|
||||
*/
|
||||
export function sanitizeQrMessage(message: string): string {
|
||||
const sanitized = message
|
||||
.normalize('NFD').replace(/[\u0300-\u036f]/g, '') // diakritika → základní písmeno
|
||||
.replace(/[^\x00-\xff]/g, '') // znaky mimo ISO 8859-1
|
||||
.replace(/\*/g, ''); // '*' je v QR platbě oddělovač
|
||||
return sanitized.length > 60 ? sanitized.substring(0, 60) : sanitized;
|
||||
}
|
||||
|
||||
/**
|
||||
* Vygeneruje a uloží obrázek platebního QR kódu do storage (Redis/JSON).
|
||||
* Data přežijí redeploy — není třeba persistentní filesystém.
|
||||
@@ -56,13 +74,7 @@ function createStorageKey(customerName: string, id: string): string {
|
||||
* @param id unikátní identifikátor (UUID) tohoto QR kódu
|
||||
*/
|
||||
export async function generateQr(customerName: string, bankAccountNumber: string, bankAccountHolder: string, amount: number, message: string, id: string): Promise<void> {
|
||||
// Zpráva pro příjemce nesmí dle standardu obsahovat '*' a být delší než 60 znaků
|
||||
if (message.indexOf('*') >= 0) {
|
||||
message = message.replace(/\*/g, '');
|
||||
}
|
||||
if (message.length > 60) {
|
||||
message = message.substring(0, 60);
|
||||
}
|
||||
message = sanitizeQrMessage(message);
|
||||
const payload = {
|
||||
iban: convertBbanToIban(bankAccountNumber),
|
||||
amount,
|
||||
|
||||
@@ -314,11 +314,65 @@ export const getMenuTechTower = async (firstDayOfWeek: Date, mock: boolean = fal
|
||||
}
|
||||
|
||||
const result: Food[][] = [];
|
||||
const siblings = thirdTry
|
||||
|
||||
// Čtvrtý pokus (detekce): thirdTry našel <font>, ale nový formát má každý den v jednom <p>
|
||||
// s položkami oddělenými <br> místo separátních <p> pro každou položku
|
||||
const fourthTry = thirdTry && $(font).parent().siblings('p').toArray().some(el => {
|
||||
const firstChild = $(el).contents().first();
|
||||
return firstChild.is('strong') && DAYS_IN_WEEK.includes(firstChild.text().trim().toLocaleLowerCase());
|
||||
});
|
||||
|
||||
const siblings = (fourthTry || thirdTry)
|
||||
? $(font).parent().siblings('p')
|
||||
: secondTry
|
||||
? $(font).parent().parent().parent().siblings('p')
|
||||
: $(font).parent().parent().siblings();
|
||||
|
||||
if (fourthTry) {
|
||||
siblings.each((_, el) => {
|
||||
const $el = $(el);
|
||||
const firstChild = $el.contents().first();
|
||||
if (!firstChild.is('strong')) return;
|
||||
const dayName = firstChild.text().trim().toLocaleLowerCase();
|
||||
if (!DAYS_IN_WEEK.includes(dayName)) return;
|
||||
|
||||
const dayIndex = DAYS_IN_WEEK.indexOf(dayName);
|
||||
result[dayIndex] ??= [];
|
||||
|
||||
const elHtml = $el.html() ?? '';
|
||||
const itemLines = elHtml.split(/<br\s*\/?>/i).slice(1)
|
||||
.map(part => $(`<span>${part}</span>`).text().trim())
|
||||
.filter(line => line.length > 0);
|
||||
|
||||
for (const text of itemLines) {
|
||||
let price = 'na\xA0váhu';
|
||||
let nameRaw = text.replace('•', '');
|
||||
if (text.toLowerCase().endsWith('kč')) {
|
||||
const tmp = text.replace('\xA0', ' ').split(' ');
|
||||
const split = [tmp.slice(0, -2).join(' ')].concat(tmp.slice(-2));
|
||||
price = `${split.slice(1)[0]}\xA0Kč`;
|
||||
nameRaw = split[0].replace('•', '');
|
||||
} else if (text.toLowerCase().endsWith(',-')) {
|
||||
const tmp = text.replace('\xA0', ' ').split(' ');
|
||||
const split = [tmp.slice(0, -1).join(' ')].concat(tmp.slice(-1));
|
||||
price = `${split.slice(1)[0].replace(',-', '')}\xA0Kč`;
|
||||
nameRaw = split[0].replace('•', '');
|
||||
}
|
||||
if (nameRaw.endsWith('–') || nameRaw.endsWith('—')) {
|
||||
nameRaw = nameRaw.slice(0, -1).trim();
|
||||
}
|
||||
|
||||
const parsed = parseAllergens(nameRaw);
|
||||
result[dayIndex].push({
|
||||
amount: '-',
|
||||
name: parsed.cleanName,
|
||||
price,
|
||||
isSoup: isTextSoupName(parsed.cleanName),
|
||||
allergens: parsed.allergens.length > 0 ? parsed.allergens : undefined,
|
||||
});
|
||||
}
|
||||
});
|
||||
} else {
|
||||
let parsing = false;
|
||||
let currentDayIndex = 0;
|
||||
for (let i = 0; i < siblings.length; i++) {
|
||||
@@ -363,6 +417,7 @@ export const getMenuTechTower = async (firstDayOfWeek: Date, mock: boolean = fal
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Validace, zda text hlavičky obsahuje datum odpovídající požadovanému týdnu
|
||||
const headerText = $(font).text().trim();
|
||||
|
||||
@@ -56,15 +56,15 @@ function checkRateLimit(key: string, limit: number = RATE_LIMIT): boolean {
|
||||
*/
|
||||
const parseValidateFutureDayIndex = (req: Request<{}, any, AddChoiceData["body"] | UpdateNoteData["body"]>) => {
|
||||
if (req.body.dayIndex == null) {
|
||||
throw Error(`Nebyl předán index dne v týdnu.`);
|
||||
throw new Error(`Nebyl předán index dne v týdnu.`);
|
||||
}
|
||||
const todayDayIndex = getDayOfWeekIndex(getToday());
|
||||
const dayIndex = req.body.dayIndex;
|
||||
if (isNaN(dayIndex)) {
|
||||
throw Error(`Neplatný index dne v týdnu: ${req.body.dayIndex}`);
|
||||
throw new Error(`Neplatný index dne v týdnu: ${req.body.dayIndex}`);
|
||||
}
|
||||
if (dayIndex < todayDayIndex) {
|
||||
throw Error(`Předaný index dne v týdnu (${dayIndex}) nesmí být nižší než dnešní den (${todayDayIndex})`);
|
||||
throw new Error(`Předaný index dne v týdnu (${dayIndex}) nesmí být nižší než dnešní den (${todayDayIndex})`);
|
||||
}
|
||||
return dayIndex;
|
||||
}
|
||||
@@ -72,7 +72,7 @@ const parseValidateFutureDayIndex = (req: Request<{}, any, AddChoiceData["body"]
|
||||
const parseSlot = (body: Record<string, any>): MealSlot | undefined => {
|
||||
const slot = body?.slot;
|
||||
if (slot != null && slot !== MealSlot.OBED) {
|
||||
throw Error(`Neplatný slot: ${slot}`);
|
||||
throw new Error(`Neplatný slot: ${slot}`);
|
||||
}
|
||||
return slot ?? undefined;
|
||||
};
|
||||
@@ -153,7 +153,7 @@ router.post("/updateNote", async (req: Request<{}, any, UpdateNoteData["body"]>,
|
||||
try { slot = parseSlot(req.body); } catch (e: any) { return res.status(400).json({ error: e.message }); }
|
||||
try {
|
||||
if (note && note.length > 70) {
|
||||
throw Error("Poznámka může mít maximálně 70 znaků");
|
||||
throw new Error("Poznámka může mít maximálně 70 znaků");
|
||||
}
|
||||
let date = undefined;
|
||||
if (req.body.dayIndex != null) {
|
||||
|
||||
@@ -2,8 +2,9 @@ import express, { Request } from "express";
|
||||
import { getLogin } from "../auth";
|
||||
import { parseToken } from "../utils";
|
||||
import { getWebsocket } from "../websocket";
|
||||
import { createGroup, deleteGroup, addGroupMember, removeGroupMember, updateGroupMember, setGroupState, updateGroupTimes, updateGroupFees } from "../groups";
|
||||
import { createGroup, deleteGroup, addGroupMember, removeGroupMember, updateGroupMember, setGroupState, updateGroupTimes, updateGroupFees, setGroupBoltTracking, getOrderDates } from "../groups";
|
||||
import { GroupState } from "../../../types/gen/types.gen";
|
||||
import { checkBoltTracking } from "../boltTracking";
|
||||
|
||||
const router = express.Router();
|
||||
|
||||
@@ -11,6 +12,13 @@ function broadcastExtra(data: any) {
|
||||
getWebsocket().emit("message", data);
|
||||
}
|
||||
|
||||
router.get("/dates", async (_req, res, next) => {
|
||||
try {
|
||||
const dates = await getOrderDates();
|
||||
res.status(200).json({ dates });
|
||||
} catch (e: any) { next(e); }
|
||||
});
|
||||
|
||||
router.post("/create", async (req: Request, res, next) => {
|
||||
const login = getLogin(parseToken(req));
|
||||
const { name } = req.body ?? {};
|
||||
@@ -69,7 +77,7 @@ router.post("/updateMember", async (req: Request, res, next) => {
|
||||
if (!targetLogin) return res.status(400).json({ error: 'Nebyl předán login uživatele' });
|
||||
const patch: Record<string, any> = {};
|
||||
if (amount !== undefined) {
|
||||
if (typeof amount !== 'number' || !Number.isFinite(amount) || amount < 0) {
|
||||
if (!Number.isInteger(amount) || amount < 0) {
|
||||
return res.status(400).json({ error: 'Neplatná částka' });
|
||||
}
|
||||
patch.amount = amount;
|
||||
@@ -83,7 +91,7 @@ router.post("/updateMember", async (req: Request, res, next) => {
|
||||
patch.surchargeText = surchargeText;
|
||||
}
|
||||
if (surchargeAmount !== undefined) {
|
||||
if (typeof surchargeAmount !== 'number' || !Number.isFinite(surchargeAmount) || surchargeAmount < 0) {
|
||||
if (!Number.isInteger(surchargeAmount) || surchargeAmount < 0) {
|
||||
return res.status(400).json({ error: 'Neplatná výše příplatku' });
|
||||
}
|
||||
patch.surchargeAmount = surchargeAmount;
|
||||
@@ -113,19 +121,19 @@ router.post("/updateFees", async (req: Request, res, next) => {
|
||||
const login = getLogin(parseToken(req));
|
||||
const { id, fees, shipping, tip, discountType, discountValue } = req.body ?? {};
|
||||
if (!id) return res.status(400).json({ error: 'Nebylo předáno ID skupiny' });
|
||||
if (fees !== undefined && (typeof fees !== 'number' || !Number.isFinite(fees) || fees < 0)) {
|
||||
if (fees !== undefined && (!Number.isInteger(fees) || fees < 0)) {
|
||||
return res.status(400).json({ error: 'Neplatná výše poplatků' });
|
||||
}
|
||||
if (shipping !== undefined && (typeof shipping !== 'number' || !Number.isFinite(shipping) || shipping < 0)) {
|
||||
if (shipping !== undefined && (!Number.isInteger(shipping) || shipping < 0)) {
|
||||
return res.status(400).json({ error: 'Neplatná výše dopravy' });
|
||||
}
|
||||
if (tip !== undefined && (typeof tip !== 'number' || !Number.isFinite(tip) || tip < 0)) {
|
||||
if (tip !== undefined && (!Number.isInteger(tip) || tip < 0)) {
|
||||
return res.status(400).json({ error: 'Neplatná výše spropitného' });
|
||||
}
|
||||
if (discountType !== undefined && discountType !== '' && !['percent', 'fixed'].includes(discountType)) {
|
||||
return res.status(400).json({ error: 'Neplatný typ slevy' });
|
||||
}
|
||||
if (discountValue !== undefined && (typeof discountValue !== 'number' || !Number.isFinite(discountValue) || discountValue < 0)) {
|
||||
if (discountValue !== undefined && (!Number.isInteger(discountValue) || discountValue < 0)) {
|
||||
return res.status(400).json({ error: 'Neplatná výše slevy' });
|
||||
}
|
||||
try {
|
||||
@@ -153,4 +161,22 @@ router.post("/updateTimes", async (req: Request, res, next) => {
|
||||
} catch (e: any) { next(e); }
|
||||
});
|
||||
|
||||
router.post("/setBoltTracking", async (req: Request, res, next) => {
|
||||
const login = getLogin(parseToken(req));
|
||||
const { id, shareUrl } = req.body ?? {};
|
||||
if (!id) return res.status(400).json({ error: 'Nebylo předáno ID skupiny' });
|
||||
if (shareUrl !== undefined && typeof shareUrl !== 'string') {
|
||||
return res.status(400).json({ error: 'Neplatný odkaz na sledování objednávky Bolt' });
|
||||
}
|
||||
try {
|
||||
const data = await setGroupBoltTracking(login, id, shareUrl);
|
||||
broadcastExtra(data);
|
||||
res.status(200).json(data);
|
||||
// Okamžitý poll, ať uživatel nečeká na další tik scheduleru
|
||||
if (shareUrl) {
|
||||
checkBoltTracking().catch(e => console.error('Bolt tracking: okamžitý poll selhal', e));
|
||||
}
|
||||
} catch (e: any) { next(e); }
|
||||
});
|
||||
|
||||
export default router;
|
||||
|
||||
@@ -30,10 +30,10 @@ router.post("/add", async (req: Request<{}, any, AddPizzaData["body"]>, res) =>
|
||||
const salatIndex = req.body.salatIndex;
|
||||
const salaty = await getSalatList();
|
||||
if (!salaty) {
|
||||
throw Error("Selhalo získání seznamu dostupných salátů.");
|
||||
throw new Error("Selhalo získání seznamu dostupných salátů.");
|
||||
}
|
||||
if (!salaty[salatIndex]) {
|
||||
throw Error("Neplatný index salátu: " + salatIndex);
|
||||
throw new Error("Neplatný index salátu: " + salatIndex);
|
||||
}
|
||||
const data = await addSalatOrder(login, salaty[salatIndex]);
|
||||
getWebsocket().emit("message", data);
|
||||
@@ -41,22 +41,22 @@ router.post("/add", async (req: Request<{}, any, AddPizzaData["body"]>, res) =>
|
||||
} else {
|
||||
// Přidání pizzy
|
||||
if (req.body?.pizzaIndex === undefined || isNaN(req.body.pizzaIndex)) {
|
||||
throw Error("Nebyl předán index pizzy ani salátu");
|
||||
throw new Error("Nebyl předán index pizzy ani salátu");
|
||||
}
|
||||
const pizzaIndex = req.body.pizzaIndex;
|
||||
if (req.body?.pizzaSizeIndex === undefined || isNaN(req.body.pizzaSizeIndex)) {
|
||||
throw Error("Nebyl předán index velikosti pizzy");
|
||||
throw new Error("Nebyl předán index velikosti pizzy");
|
||||
}
|
||||
const pizzaSizeIndex = req.body.pizzaSizeIndex;
|
||||
let pizzy = await getPizzaList();
|
||||
if (!pizzy) {
|
||||
throw Error("Selhalo získání seznamu dostupných pizz.");
|
||||
throw new Error("Selhalo získání seznamu dostupných pizz.");
|
||||
}
|
||||
if (!pizzy[pizzaIndex]) {
|
||||
throw Error("Neplatný index pizzy: " + pizzaIndex);
|
||||
throw new Error("Neplatný index pizzy: " + pizzaIndex);
|
||||
}
|
||||
if (!pizzy[pizzaIndex].sizes[pizzaSizeIndex]) {
|
||||
throw Error("Neplatný index velikosti pizzy: " + pizzaSizeIndex);
|
||||
throw new Error("Neplatný index velikosti pizzy: " + pizzaSizeIndex);
|
||||
}
|
||||
const data = await addPizzaOrder(login, pizzy[pizzaIndex], pizzy[pizzaIndex].sizes[pizzaSizeIndex]);
|
||||
getWebsocket().emit("message", data);
|
||||
@@ -67,7 +67,7 @@ router.post("/add", async (req: Request<{}, any, AddPizzaData["body"]>, res) =>
|
||||
router.post("/remove", async (req: Request<{}, any, RemovePizzaData["body"]>, res) => {
|
||||
const login = getLogin(parseToken(req));
|
||||
if (!req.body?.pizzaOrder) {
|
||||
throw Error("Nebyla předána objednávka");
|
||||
throw new Error("Nebyla předána objednávka");
|
||||
}
|
||||
const data = await removePizzaOrder(login, req.body?.pizzaOrder);
|
||||
getWebsocket().emit("message", data);
|
||||
@@ -106,7 +106,7 @@ router.post("/updatePizzaDayNote", async (req: Request<{}, any, UpdatePizzaDayNo
|
||||
const login = getLogin(parseToken(req));
|
||||
try {
|
||||
if (req.body.note && req.body.note.length > 70) {
|
||||
throw Error("Poznámka může mít maximálně 70 znaků");
|
||||
throw new Error("Poznámka může mít maximálně 70 znaků");
|
||||
}
|
||||
const data = await updatePizzaDayNote(login, req.body.note);
|
||||
getWebsocket().emit("message", data);
|
||||
|
||||
@@ -3,6 +3,7 @@ import { getLogin } from "../auth";
|
||||
import { parseToken, formatDate } from "../utils";
|
||||
import { generateQr } from "../qr";
|
||||
import { addPendingQr } from "../pizza";
|
||||
import { markGroupQrGenerated } from "../groups";
|
||||
import { emitToUser } from "../websocket";
|
||||
import { GenerateQrData } from "../../../types";
|
||||
import crypto from "crypto";
|
||||
@@ -36,18 +37,13 @@ router.post("/generate", async (req: Request<{}, any, GenerateQrData["body"]>, r
|
||||
if (!recipient.purpose || recipient.purpose.trim().length === 0) {
|
||||
return res.status(400).json({ error: `Příjemce ${recipient.login} nemá vyplněný účel platby` });
|
||||
}
|
||||
if (typeof recipient.amount !== 'number' || recipient.amount <= 0) {
|
||||
if (!Number.isInteger(recipient.amount) || recipient.amount <= 0) {
|
||||
return res.status(400).json({ error: `Příjemce ${recipient.login} má neplatnou částku` });
|
||||
}
|
||||
// Validace max 2 desetinná místa
|
||||
const amountStr = recipient.amount.toString();
|
||||
if (amountStr.includes('.') && amountStr.split('.')[1].length > 2) {
|
||||
return res.status(400).json({ error: `Částka pro ${recipient.login} má více než 2 desetinná místa` });
|
||||
}
|
||||
|
||||
// Vygenerovat QR kód
|
||||
const id = crypto.randomUUID();
|
||||
await generateQr(recipient.login, bankAccount, bankAccountHolder, recipient.amount, recipient.purpose, id);
|
||||
await generateQr(recipient.login, bankAccount, bankAccountHolder, recipient.amount / 100, recipient.purpose, id);
|
||||
|
||||
// Uložit jako nevyřízený QR kód a okamžitě doručit příjemci
|
||||
const pendingQr = {
|
||||
@@ -62,6 +58,10 @@ router.post("/generate", async (req: Request<{}, any, GenerateQrData["body"]>, r
|
||||
emitToUser(recipient.login, 'pendingQr', pendingQr);
|
||||
}
|
||||
|
||||
if (groupId) {
|
||||
await markGroupQrGenerated(login, groupId);
|
||||
}
|
||||
|
||||
res.status(200).json({ success: true, count: recipients.length });
|
||||
} catch (e: any) {
|
||||
next(e);
|
||||
|
||||
@@ -11,15 +11,18 @@ router.get("/", async (_req, res, next) => {
|
||||
});
|
||||
|
||||
router.post("/add", async (req, res, next) => {
|
||||
const { name, heslo } = req.body ?? {};
|
||||
const { name, heslo, url } = req.body ?? {};
|
||||
if (!name || typeof name !== 'string') {
|
||||
return res.status(400).json({ error: 'Nebyl předán název obchodu' });
|
||||
}
|
||||
if (!heslo || typeof heslo !== 'string') {
|
||||
return res.status(400).json({ error: 'Nebylo předáno heslo' });
|
||||
}
|
||||
if (url != null && typeof url !== 'string') {
|
||||
return res.status(400).json({ error: 'Neplatná URL obchodu' });
|
||||
}
|
||||
try {
|
||||
const stores = await addStore(name, heslo);
|
||||
const stores = await addStore(name, heslo, url);
|
||||
res.status(200).json(stores);
|
||||
} catch (e: any) {
|
||||
if (e.message === 'UNAUTHORIZED') {
|
||||
|
||||
@@ -0,0 +1,50 @@
|
||||
import express, { Request } from "express";
|
||||
import { getLogin } from "../auth";
|
||||
import { parseToken } from "../utils";
|
||||
import { addSuggestion, deleteSuggestion, listSuggestions, voteSuggestion } from "../suggestions";
|
||||
import { AddSuggestionData, VoteSuggestionData, DeleteSuggestionData } from "../../../types";
|
||||
|
||||
const router = express.Router();
|
||||
|
||||
router.get("/list", async (req: Request, res, next) => {
|
||||
try {
|
||||
const login = getLogin(parseToken(req));
|
||||
const data = await listSuggestions(login);
|
||||
res.status(200).json(data);
|
||||
} catch (e: any) { next(e) }
|
||||
});
|
||||
|
||||
router.post("/add", async (req: Request<{}, any, AddSuggestionData["body"]>, res, next) => {
|
||||
try {
|
||||
const login = getLogin(parseToken(req));
|
||||
if (!req.body?.title || !req.body?.description) {
|
||||
return res.status(400).json({ error: "Chybné parametry volání" });
|
||||
}
|
||||
const data = await addSuggestion(login, req.body.title, req.body.description);
|
||||
res.status(200).json(data);
|
||||
} catch (e: any) { next(e) }
|
||||
});
|
||||
|
||||
router.post("/vote", async (req: Request<{}, any, VoteSuggestionData["body"]>, res, next) => {
|
||||
try {
|
||||
const login = getLogin(parseToken(req));
|
||||
if (!req.body?.id || !req.body?.direction) {
|
||||
return res.status(400).json({ error: "Chybné parametry volání" });
|
||||
}
|
||||
const data = await voteSuggestion(login, req.body.id, req.body.direction);
|
||||
res.status(200).json(data);
|
||||
} catch (e: any) { next(e) }
|
||||
});
|
||||
|
||||
router.post("/delete", async (req: Request<{}, any, DeleteSuggestionData["body"]>, res, next) => {
|
||||
try {
|
||||
const login = getLogin(parseToken(req));
|
||||
if (!req.body?.id) {
|
||||
return res.status(400).json({ error: "Chybné parametry volání" });
|
||||
}
|
||||
const data = await deleteSuggestion(login, req.body.id);
|
||||
res.status(200).json(data);
|
||||
} catch (e: any) { next(e) }
|
||||
});
|
||||
|
||||
export default router;
|
||||
@@ -1,33 +0,0 @@
|
||||
import express, { Request } from "express";
|
||||
import { getLogin } from "../auth";
|
||||
import { parseToken } from "../utils";
|
||||
import { getUserVotes, updateFeatureVote, getVotingStats } from "../voting";
|
||||
import { GetVotesData, UpdateVoteData } from "../../../types";
|
||||
|
||||
const router = express.Router();
|
||||
|
||||
router.get("/getVotes", async (req: Request<{}, any, GetVotesData["body"]>, res) => {
|
||||
const login = getLogin(parseToken(req));
|
||||
const data = await getUserVotes(login);
|
||||
res.status(200).json(data);
|
||||
});
|
||||
|
||||
router.post("/updateVote", async (req: Request<{}, any, UpdateVoteData["body"]>, res, next) => {
|
||||
const login = getLogin(parseToken(req));
|
||||
if (req.body?.option == null || req.body?.active == null) {
|
||||
res.status(400).json({ error: "Chybné parametry volání" });
|
||||
}
|
||||
try {
|
||||
const data = await updateFeatureVote(login, req.body.option, req.body.active);
|
||||
res.status(200).json(data);
|
||||
} catch (e: any) { next(e) }
|
||||
});
|
||||
|
||||
router.get("/stats", async (req, res, next) => {
|
||||
try {
|
||||
const data = await getVotingStats();
|
||||
res.status(200).json(data);
|
||||
} catch (e: any) { next(e) }
|
||||
});
|
||||
|
||||
export default router;
|
||||
+43
-49
@@ -40,6 +40,7 @@ export function getEmptyData(date?: Date): ClientData {
|
||||
return {
|
||||
todayDayIndex: getDayOfWeekIndex(getToday()),
|
||||
date: getHumanDate(usedDate),
|
||||
isoDate: formatDate(usedDate),
|
||||
isWeekend: getIsWeekend(usedDate),
|
||||
dayIndex: getDayOfWeekIndex(usedDate),
|
||||
choices: {},
|
||||
@@ -319,18 +320,17 @@ export async function initIfNeeded(date?: Date, slot?: MealSlot) {
|
||||
*/
|
||||
export async function removeChoices(login: string, trusted: boolean, locationKey: LunchChoice, date?: Date, slot?: MealSlot) {
|
||||
const selectedDay = getDataKey(date ?? getToday(), slot);
|
||||
let data = await getClientData(date, slot);
|
||||
validateTrusted(data, login, trusted);
|
||||
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);
|
||||
}
|
||||
// Validate trusted flag against current data before atomic update
|
||||
const snapshot = await getClientData(date, slot);
|
||||
validateTrusted(snapshot, login, trusted);
|
||||
return storage.updateData<ClientData>(selectedDay, (current) => {
|
||||
const data = current ?? getEmptyData(date);
|
||||
if (locationKey in data.choices && 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];
|
||||
}
|
||||
return data;
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -346,18 +346,16 @@ export async function removeChoices(login: string, trusted: boolean, locationKey
|
||||
*/
|
||||
export async function removeChoice(login: string, trusted: boolean, locationKey: LunchChoice, foodIndex: number, date?: Date, slot?: MealSlot) {
|
||||
const selectedDay = getDataKey(date ?? getToday(), slot);
|
||||
let data = await getClientData(date, slot);
|
||||
validateTrusted(data, login, trusted);
|
||||
if (locationKey in data.choices) {
|
||||
if (data.choices[locationKey] && login in data.choices[locationKey]) {
|
||||
const snapshot = await getClientData(date, slot);
|
||||
validateTrusted(snapshot, login, trusted);
|
||||
return storage.updateData<ClientData>(selectedDay, (current) => {
|
||||
const data = current ?? getEmptyData(date);
|
||||
if (locationKey in data.choices && data.choices[locationKey] && login in data.choices[locationKey]) {
|
||||
const index = data.choices[locationKey][login].selectedFoods?.indexOf(foodIndex);
|
||||
if (index != null && index > -1) {
|
||||
data.choices[locationKey][login].selectedFoods?.splice(index, 1);
|
||||
await storage.setData(selectedDay, data);
|
||||
}
|
||||
}
|
||||
if (index != null && index > -1) data.choices[locationKey][login].selectedFoods?.splice(index, 1);
|
||||
}
|
||||
return data;
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -485,13 +483,13 @@ export async function addChoice(login: string, trusted: boolean, locationKey: Lu
|
||||
async function validateFoodIndex(locationKey: LunchChoice, foodIndex?: number, date?: Date) {
|
||||
if (foodIndex != null) {
|
||||
if (typeof foodIndex !== 'number') {
|
||||
throw Error(`Neplatný index ${foodIndex} typu ${typeof foodIndex}`);
|
||||
throw new Error(`Neplatný index ${foodIndex} typu ${typeof foodIndex}`);
|
||||
}
|
||||
if (foodIndex < 0) {
|
||||
throw Error(`Neplatný index ${foodIndex}`);
|
||||
throw new Error(`Neplatný index ${foodIndex}`);
|
||||
}
|
||||
if (!Object.keys(Restaurant).includes(locationKey)) {
|
||||
throw Error(`Neplatný index ${foodIndex} pro lokalitu ${locationKey} nepodporující indexy`);
|
||||
throw new Error(`Neplatný index ${foodIndex} pro lokalitu ${locationKey} nepodporující indexy`);
|
||||
}
|
||||
const usedDate = date ?? getToday();
|
||||
const menu = await getRestaurantMenu(locationKey as Restaurant, usedDate);
|
||||
@@ -512,18 +510,17 @@ async function validateFoodIndex(locationKey: LunchChoice, foodIndex?: number, d
|
||||
export async function updateNote(login: string, trusted: boolean, note?: string, date?: Date, slot?: MealSlot) {
|
||||
const usedDate = date ?? getToday();
|
||||
await initIfNeeded(usedDate, slot);
|
||||
let data = await getClientData(usedDate, slot);
|
||||
validateTrusted(data, login, trusted);
|
||||
const snapshot = await getClientData(usedDate, slot);
|
||||
validateTrusted(snapshot, login, trusted);
|
||||
return storage.updateData<ClientData>(getDataKey(usedDate, slot), (current) => {
|
||||
const data = current ?? getEmptyData(date);
|
||||
const userEntry = data.choices != null && Object.entries(data.choices).find(entry => entry[1][login] != null);
|
||||
if (userEntry) {
|
||||
if (!note?.length) {
|
||||
delete userEntry[1][login].note;
|
||||
} else {
|
||||
userEntry[1][login].note = note;
|
||||
}
|
||||
await storage.setData(getDataKey(usedDate, slot), data);
|
||||
if (!note?.length) delete userEntry[1][login].note;
|
||||
else userEntry[1][login].note = note;
|
||||
}
|
||||
return data;
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -535,21 +532,18 @@ export async function updateNote(login: string, trusted: boolean, note?: string,
|
||||
*/
|
||||
export async function updateDepartureTime(login: string, time?: string, date?: Date) {
|
||||
const usedDate = date ?? getToday();
|
||||
let clientData = await getClientData(usedDate);
|
||||
const found = Object.values(clientData.choices).find(location => login in location);
|
||||
// TODO validace, že se jedná o restauraci
|
||||
if (found) {
|
||||
if (!time?.length) {
|
||||
delete found[login].departureTime;
|
||||
} else {
|
||||
if (!Object.values<string>(DepartureTime).includes(time)) {
|
||||
if (time?.length && !Object.values<string>(DepartureTime).includes(time)) {
|
||||
throw Error(`Neplatný čas odchodu ${time}`);
|
||||
}
|
||||
found[login].departureTime = time;
|
||||
return storage.updateData<ClientData>(getDataKey(usedDate), (current) => {
|
||||
const data = current ?? getEmptyData(date);
|
||||
const found = Object.values(data.choices).find(location => login in location);
|
||||
if (found) {
|
||||
if (!time?.length) delete found[login].departureTime;
|
||||
else found[login].departureTime = time;
|
||||
}
|
||||
await storage.setData(getDataKey(usedDate), clientData);
|
||||
}
|
||||
return clientData;
|
||||
return data;
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -560,14 +554,13 @@ export async function updateDepartureTime(login: string, time?: string, date?: D
|
||||
*/
|
||||
export async function updateBuyer(login: string, slot?: MealSlot) {
|
||||
const usedDate = getToday();
|
||||
let clientData = await getClientData(usedDate, slot);
|
||||
const userEntry = clientData.choices?.['OBJEDNAVAM']?.[login];
|
||||
if (!userEntry) {
|
||||
throw new Error("Nelze nastavit objednatele pro uživatele s jinou volbou než \"Budu objednávat\"");
|
||||
}
|
||||
return storage.updateData<ClientData>(getDataKey(usedDate, slot), (current) => {
|
||||
const data = current ?? getEmptyData();
|
||||
const userEntry = data.choices?.['OBJEDNAVAM']?.[login];
|
||||
if (!userEntry) throw new Error("Nelze nastavit objednatele pro uživatele s jinou volbou než \"Budu objednávat\"");
|
||||
userEntry.isBuyer = !(userEntry.isBuyer || false);
|
||||
await storage.setData(getDataKey(usedDate, slot), clientData);
|
||||
return clientData;
|
||||
return data;
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -583,6 +576,7 @@ export async function getClientData(date?: Date, slot?: MealSlot): Promise<Clien
|
||||
return {
|
||||
...clientData,
|
||||
todayDayIndex: getDayOfWeekIndex(getToday()),
|
||||
isoDate: formatDate(targetDate),
|
||||
...(slot === MealSlot.EXTRA ? { slot: MealSlot.EXTRA } : {}),
|
||||
}
|
||||
}
|
||||
+2
-2
@@ -22,13 +22,13 @@ export async function getStats(startDate: string, endDate: string): Promise<Week
|
||||
// Dočasná validace, aby to někdo ručně neshodil
|
||||
const daysDiff = ((end as any) - (start as any)) / (1000 * 60 * 60 * 24);
|
||||
if (daysDiff > 4) {
|
||||
throw Error('Neplatný rozsah');
|
||||
throw new Error('Neplatný rozsah');
|
||||
}
|
||||
|
||||
const today = new Date();
|
||||
today.setHours(23, 59, 59, 999);
|
||||
if (end > today) {
|
||||
throw Error('Nelze načíst statistiky pro budoucí datum');
|
||||
throw new Error('Nelze načíst statistiky pro budoucí datum');
|
||||
}
|
||||
|
||||
const result = [];
|
||||
|
||||
@@ -1,32 +1,29 @@
|
||||
/**
|
||||
* Interface pro úložiště dat.
|
||||
*
|
||||
* Aktuálně pouze "primitivní" has, get a set odrážející původní JSON DB.
|
||||
* Postupem času lze předělat pro efektivnější využití Redis.
|
||||
*/
|
||||
export interface StorageInterface {
|
||||
|
||||
/**
|
||||
* Inicializuje úložiště, pokud je potřeba (např. připojení k databázi).
|
||||
*/
|
||||
initialize?(): Promise<void>;
|
||||
|
||||
/**
|
||||
* Vrátí příznak, zda existují data pro předaný klíč.
|
||||
* @param key klíč, pro který zjišťujeme data (typicky datum)
|
||||
*/
|
||||
hasData(key: string): Promise<boolean>;
|
||||
|
||||
/**
|
||||
* Vrátí veškerá data pro předaný klíč.
|
||||
* @param key klíč, pro který vrátit data (typicky datum)
|
||||
*/
|
||||
getData<Type>(key: string): Promise<Type | undefined>;
|
||||
|
||||
/**
|
||||
* Uloží data pod předaný klíč.
|
||||
* @param key klíč, pod kterým uložit data (typicky datum)
|
||||
* @param data data pro uložení
|
||||
*/
|
||||
setData<Type>(key: string, data: Type): Promise<void>;
|
||||
|
||||
/**
|
||||
* Vrátí seznam všech klíčů, případně jen těch obsahujících předaný podřetězec.
|
||||
* @param contains volitelný podřetězec, který musí klíč obsahovat (např. '_extra')
|
||||
*/
|
||||
listKeys(contains?: string): Promise<string[]>;
|
||||
|
||||
/**
|
||||
* Atomicky načte, zmutuje a uloží data pod daným klíčem.
|
||||
* V Redis implementaci používá WATCH/MULTI/EXEC retry loop.
|
||||
* Vrátí výslednou hodnotu po aplikaci mutátoru.
|
||||
*/
|
||||
updateData<Type>(key: string, mutator: (current: Type | undefined) => Type): Promise<Type>;
|
||||
|
||||
/** Ověří dostupnost úložiště. Vrátí false pokud není dostupné. */
|
||||
healthCheck?(): Promise<boolean>;
|
||||
}
|
||||
@@ -20,7 +20,7 @@ if (!process.env.STORAGE || process.env.STORAGE?.toLowerCase() === JSON_KEY) {
|
||||
} else if (process.env.STORAGE?.toLowerCase() === MEMORY_KEY) {
|
||||
storage = new MemoryStorage();
|
||||
} else {
|
||||
throw Error("Nepodporovaná hodnota proměnné STORAGE: " + process.env.STORAGE + ", podporované jsou 'json', 'redis' nebo 'memory'");
|
||||
throw new Error("Nepodporovaná hodnota proměnné STORAGE: " + process.env.STORAGE + ", podporované jsou 'json', 'redis' nebo 'memory'");
|
||||
}
|
||||
|
||||
export const storageReady: Promise<void> = storage.initialize
|
||||
|
||||
@@ -6,7 +6,6 @@ import * as path from 'path';
|
||||
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 });
|
||||
}
|
||||
@@ -29,4 +28,20 @@ export default class JsonStorage implements StorageInterface {
|
||||
db.set(key, data);
|
||||
return Promise.resolve();
|
||||
}
|
||||
|
||||
listKeys(contains?: string): Promise<string[]> {
|
||||
const keys = Object.keys(db.JSON());
|
||||
return Promise.resolve(contains ? keys.filter(k => k.includes(contains)) : keys);
|
||||
}
|
||||
|
||||
updateData<Type>(key: string, mutator: (current: Type | undefined) => Type): Promise<Type> {
|
||||
const current = db.get(key) as Type | undefined;
|
||||
const next = mutator(current);
|
||||
db.set(key, next);
|
||||
return Promise.resolve(next);
|
||||
}
|
||||
|
||||
healthCheck(): Promise<boolean> {
|
||||
return Promise.resolve(true);
|
||||
}
|
||||
}
|
||||
@@ -24,4 +24,20 @@ export default class MemoryStorage implements StorageInterface {
|
||||
store.set(key, data);
|
||||
return Promise.resolve();
|
||||
}
|
||||
|
||||
listKeys(contains?: string): Promise<string[]> {
|
||||
const keys = Array.from(store.keys());
|
||||
return Promise.resolve(contains ? keys.filter(k => k.includes(contains)) : keys);
|
||||
}
|
||||
|
||||
updateData<Type>(key: string, mutator: (current: Type | undefined) => Type): Promise<Type> {
|
||||
const current = store.get(key) as Type | undefined;
|
||||
const next = mutator(current);
|
||||
store.set(key, next);
|
||||
return Promise.resolve(next);
|
||||
}
|
||||
|
||||
healthCheck(): Promise<boolean> {
|
||||
return Promise.resolve(true);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -10,7 +10,7 @@ export default class RedisStorage implements StorageInterface {
|
||||
constructor() {
|
||||
const HOST = process.env.REDIS_HOST ?? 'localhost';
|
||||
const PORT = process.env.REDIS_PORT ?? 6379;
|
||||
client = createClient({ url: `redis://${HOST}:${PORT}` });
|
||||
client = createClient({ url: `redis://${HOST}:${PORT}` }) as RedisClientType;
|
||||
}
|
||||
|
||||
async initialize() {
|
||||
@@ -29,6 +29,56 @@ export default class RedisStorage implements StorageInterface {
|
||||
|
||||
async setData<Type>(key: string, data: Type) {
|
||||
await client.json.set(key, '.', data as any);
|
||||
await client.json.get(key);
|
||||
}
|
||||
|
||||
async listKeys(contains?: string): Promise<string[]> {
|
||||
// SCAN je bezpečnější než KEYS na produkci (neblokuje server)
|
||||
const match = contains ? `*${contains}*` : '*';
|
||||
const keys: string[] = [];
|
||||
for await (const key of client.scanIterator({ MATCH: match, COUNT: 100 })) {
|
||||
// node-redis v4 vrací buď string, nebo (novější verze) pole stringů
|
||||
if (Array.isArray(key)) keys.push(...key);
|
||||
else keys.push(key);
|
||||
}
|
||||
return keys;
|
||||
}
|
||||
|
||||
async updateData<Type>(key: string, mutator: (current: Type | undefined) => Type): Promise<Type> {
|
||||
// node-redis v5 nemá executeIsolated — pro WATCH/MULTI potřebujeme dedikované spojení
|
||||
const c = client.duplicate();
|
||||
await c.connect();
|
||||
try {
|
||||
for (let attempt = 0; attempt < 10; attempt++) {
|
||||
await c.watch(key);
|
||||
const current = await c.json.get(key, { path: '.' }) as Type | undefined;
|
||||
const next = mutator(current);
|
||||
const multi = c.multi();
|
||||
multi.json.set(key, '.', next as any);
|
||||
const result = await multi.exec();
|
||||
if (result !== null) return next;
|
||||
}
|
||||
throw new Error(`updateData: optimistic lock failed after 10 retries for key: ${key}`);
|
||||
} finally {
|
||||
await c.disconnect();
|
||||
}
|
||||
}
|
||||
|
||||
async healthCheck(): Promise<boolean> {
|
||||
try {
|
||||
const pong = await client.ping();
|
||||
return pong === 'PONG';
|
||||
} catch {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/** Vrátí hlavní Redis klient — používá se pro lease připomínkovače a shutdown. */
|
||||
export function getRedisClient(): RedisClientType | undefined {
|
||||
return client;
|
||||
}
|
||||
|
||||
/** Zavře připojení k Redisu. Volá se při graceful shutdown. */
|
||||
export async function shutdownRedisStorage(): Promise<void> {
|
||||
await client?.quit();
|
||||
}
|
||||
|
||||
+43
-7
@@ -1,13 +1,29 @@
|
||||
import { Store } from "../../types/gen/types.gen";
|
||||
import getStorage from "./storage";
|
||||
|
||||
const storage = getStorage();
|
||||
const STORES_KEY = 'stores';
|
||||
|
||||
export async function getStores(): Promise<string[]> {
|
||||
return (await storage.getData<string[]>(STORES_KEY)) ?? [];
|
||||
/**
|
||||
* Vrátí seznam povolených obchodů. Zachovává zpětnou kompatibilitu se starším
|
||||
* formátem, kdy byly obchody uloženy jako pole řetězců (převede je na objekty).
|
||||
*/
|
||||
export async function getStores(): Promise<Store[]> {
|
||||
const raw = await storage.getData<(string | Store)[]>(STORES_KEY);
|
||||
if (!raw) {
|
||||
return [];
|
||||
}
|
||||
return raw.map(s => (typeof s === 'string' ? { name: s } : s));
|
||||
}
|
||||
|
||||
export async function addStore(name: string, heslo: string): Promise<string[]> {
|
||||
/**
|
||||
* Přidá nový obchod do seznamu povolených.
|
||||
*
|
||||
* @param name název obchodu
|
||||
* @param heslo admin heslo
|
||||
* @param url volitelná URL na nabídku podniku
|
||||
*/
|
||||
export async function addStore(name: string, heslo: string, url?: string): Promise<Store[]> {
|
||||
const adminPassword = process.env.ADMIN_PASSWORD;
|
||||
if (!adminPassword || heslo !== adminPassword) {
|
||||
throw new Error('UNAUTHORIZED');
|
||||
@@ -17,21 +33,41 @@ export async function addStore(name: string, heslo: string): Promise<string[]> {
|
||||
throw new Error('Název obchodu nesmí být prázdný');
|
||||
}
|
||||
const stores = await getStores();
|
||||
if (stores.some(s => s.toLowerCase() === trimmed.toLowerCase())) {
|
||||
if (stores.some(s => s.name.toLowerCase() === trimmed.toLowerCase())) {
|
||||
throw new Error('Obchod s tímto názvem již existuje');
|
||||
}
|
||||
const updated = [...stores, trimmed];
|
||||
const trimmedUrl = url?.trim();
|
||||
if (trimmedUrl) {
|
||||
// Povolíme pouze http(s), aby URL nemohla být zneužita (např. javascript: → XSS)
|
||||
let parsed: URL;
|
||||
try {
|
||||
parsed = new URL(trimmedUrl);
|
||||
} catch {
|
||||
throw new Error('Neplatná URL obchodu');
|
||||
}
|
||||
if (parsed.protocol !== 'http:' && parsed.protocol !== 'https:') {
|
||||
throw new Error('URL musí začínat http:// nebo https://');
|
||||
}
|
||||
}
|
||||
const store: Store = trimmedUrl ? { name: trimmed, url: trimmedUrl } : { name: trimmed };
|
||||
const updated = [...stores, store];
|
||||
await storage.setData(STORES_KEY, updated);
|
||||
return updated;
|
||||
}
|
||||
|
||||
export async function removeStore(name: string, heslo: string): Promise<string[]> {
|
||||
/**
|
||||
* Odebere obchod ze seznamu povolených (dle názvu).
|
||||
*
|
||||
* @param name název obchodu
|
||||
* @param heslo admin heslo
|
||||
*/
|
||||
export async function removeStore(name: string, heslo: string): Promise<Store[]> {
|
||||
const adminPassword = process.env.ADMIN_PASSWORD;
|
||||
if (!adminPassword || heslo !== adminPassword) {
|
||||
throw new Error('UNAUTHORIZED');
|
||||
}
|
||||
const stores = await getStores();
|
||||
const updated = stores.filter(s => s.toLowerCase() !== name.trim().toLowerCase());
|
||||
const updated = stores.filter(s => s.name.toLowerCase() !== name.trim().toLowerCase());
|
||||
await storage.setData(STORES_KEY, updated);
|
||||
return updated;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,148 @@
|
||||
import crypto from "crypto";
|
||||
import { Suggestion, VoteDirection } from "../../types/gen/types.gen";
|
||||
import getStorage from "./storage";
|
||||
|
||||
/** Interní reprezentace návrhu uložená ve storage (včetně seznamů hlasujících). */
|
||||
interface StoredSuggestion {
|
||||
id: string;
|
||||
author: string;
|
||||
title: string;
|
||||
description: string;
|
||||
createdAt: string;
|
||||
/** Loginy uživatelů hlasujících PRO návrh */
|
||||
upvoters: string[];
|
||||
/** Loginy uživatelů hlasujících PROTI návrhu */
|
||||
downvoters: string[];
|
||||
/** Příznak vyřešeného (zapracovaného) návrhu - nastavuje se pouze ručním zásahem do dat */
|
||||
resolved?: boolean;
|
||||
}
|
||||
|
||||
const storage = getStorage();
|
||||
const STORAGE_KEY = 'suggestions';
|
||||
|
||||
/** Načte interní seznam návrhů ze storage. */
|
||||
async function loadSuggestions(): Promise<StoredSuggestion[]> {
|
||||
return (await storage.getData<StoredSuggestion[]>(STORAGE_KEY)) ?? [];
|
||||
}
|
||||
|
||||
/**
|
||||
* Převede interní návrh na DTO pro daného uživatele - skryje seznamy hlasujících
|
||||
* a doplní hlas přihlášeného uživatele a příznak vlastnictví.
|
||||
*/
|
||||
function toDto(suggestion: StoredSuggestion, login: string): Suggestion {
|
||||
let myVote: VoteDirection | undefined;
|
||||
if (suggestion.upvoters.includes(login)) {
|
||||
myVote = 'up';
|
||||
} else if (suggestion.downvoters.includes(login)) {
|
||||
myVote = 'down';
|
||||
}
|
||||
return {
|
||||
id: suggestion.id,
|
||||
author: suggestion.author,
|
||||
title: suggestion.title,
|
||||
description: suggestion.description,
|
||||
voteScore: suggestion.upvoters.length - suggestion.downvoters.length,
|
||||
myVote,
|
||||
isMine: suggestion.author === login,
|
||||
resolved: suggestion.resolved ?? false,
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* Vrátí seznam návrhů jako DTO pro daného uživatele, seřazený sestupně dle skóre
|
||||
* (při shodě skóre stabilně dle data vytvoření vzestupně).
|
||||
*
|
||||
* @param login login přihlášeného uživatele
|
||||
*/
|
||||
export async function listSuggestions(login: string): Promise<Suggestion[]> {
|
||||
const suggestions = await loadSuggestions();
|
||||
return suggestions
|
||||
.map(s => toDto(s, login))
|
||||
.sort((a, b) => b.voteScore - a.voteScore);
|
||||
}
|
||||
|
||||
/**
|
||||
* Přidá nový návrh. Autorovi se automaticky nastaví hlas pro.
|
||||
*
|
||||
* @param login login autora
|
||||
* @param title název návrhu
|
||||
* @param description detailní popis návrhu
|
||||
* @returns aktualizovaný seznam návrhů jako DTO
|
||||
*/
|
||||
export async function addSuggestion(login: string, title: string, description: string): Promise<Suggestion[]> {
|
||||
const trimmedTitle = title?.trim();
|
||||
const trimmedDescription = description?.trim();
|
||||
if (!trimmedTitle) {
|
||||
throw new Error('Název návrhu nesmí být prázdný');
|
||||
}
|
||||
if (!trimmedDescription) {
|
||||
throw new Error('Popis návrhu nesmí být prázdný');
|
||||
}
|
||||
const suggestions = await loadSuggestions();
|
||||
suggestions.push({
|
||||
id: crypto.randomUUID(),
|
||||
author: login,
|
||||
title: trimmedTitle,
|
||||
description: trimmedDescription,
|
||||
createdAt: new Date().toISOString(),
|
||||
// Autor automaticky hlasuje pro svůj návrh
|
||||
upvoters: [login],
|
||||
downvoters: [],
|
||||
});
|
||||
await storage.setData(STORAGE_KEY, suggestions);
|
||||
return listSuggestions(login);
|
||||
}
|
||||
|
||||
/**
|
||||
* Přepne hlas uživatele u návrhu. Klik na již aktivní směr hlas zruší,
|
||||
* opačný směr stávající hlas přepíše.
|
||||
*
|
||||
* @param login login hlasujícího uživatele
|
||||
* @param id identifikátor návrhu
|
||||
* @param direction směr hlasu, na který uživatel klikl
|
||||
* @returns aktualizovaný seznam návrhů jako DTO
|
||||
*/
|
||||
export async function voteSuggestion(login: string, id: string, direction: VoteDirection): Promise<Suggestion[]> {
|
||||
const suggestions = await loadSuggestions();
|
||||
const suggestion = suggestions.find(s => s.id === id);
|
||||
if (!suggestion) {
|
||||
throw new Error('Návrh nebyl nalezen');
|
||||
}
|
||||
if (suggestion.resolved) {
|
||||
throw new Error('Pro vyřešený návrh nelze hlasovat');
|
||||
}
|
||||
const hadUp = suggestion.upvoters.includes(login);
|
||||
const hadDown = suggestion.downvoters.includes(login);
|
||||
// Nejprve odebereme případný stávající hlas uživatele
|
||||
suggestion.upvoters = suggestion.upvoters.filter(l => l !== login);
|
||||
suggestion.downvoters = suggestion.downvoters.filter(l => l !== login);
|
||||
// Hlas přidáme pouze pokud uživatel neklikl na již aktivní směr (jinak ho jen zrušíme)
|
||||
if (direction === 'up' && !hadUp) {
|
||||
suggestion.upvoters.push(login);
|
||||
} else if (direction === 'down' && !hadDown) {
|
||||
suggestion.downvoters.push(login);
|
||||
}
|
||||
await storage.setData(STORAGE_KEY, suggestions);
|
||||
return listSuggestions(login);
|
||||
}
|
||||
|
||||
/**
|
||||
* Smaže návrh včetně všech jeho hlasů. Smazat lze pouze vlastní návrh.
|
||||
*
|
||||
* @param login login uživatele požadujícího smazání
|
||||
* @param id identifikátor návrhu ke smazání
|
||||
* @returns aktualizovaný seznam návrhů jako DTO
|
||||
*/
|
||||
export async function deleteSuggestion(login: string, id: string): Promise<Suggestion[]> {
|
||||
const suggestions = await loadSuggestions();
|
||||
const suggestion = suggestions.find(s => s.id === id);
|
||||
if (!suggestion) {
|
||||
throw new Error('Návrh nebyl nalezen');
|
||||
}
|
||||
if (suggestion.author !== login) {
|
||||
throw new Error('Smazat lze pouze vlastní návrh');
|
||||
}
|
||||
const filtered = suggestions.filter(s => s.id !== id);
|
||||
await storage.setData(STORAGE_KEY, filtered);
|
||||
return listSuggestions(login);
|
||||
}
|
||||
@@ -0,0 +1,265 @@
|
||||
import axios from 'axios';
|
||||
import { resetMemoryStorage } from '../storage/memory';
|
||||
import getStorage from '../storage';
|
||||
import { addStore } from '../stores';
|
||||
import { createGroup, setGroupState, setGroupBoltTracking } from '../groups';
|
||||
import { extractBoltToken, computeDeliveryHHMM, checkBoltTracking } from '../boltTracking';
|
||||
import { ClientData, GroupState } from '../../../types/gen/types.gen';
|
||||
import { formatDate } from '../utils';
|
||||
|
||||
jest.mock('axios');
|
||||
const mockedAxios = axios as jest.Mocked<typeof axios>;
|
||||
|
||||
const mockEmit = jest.fn();
|
||||
jest.mock('../websocket', () => ({
|
||||
getWebsocket: () => ({ emit: mockEmit }),
|
||||
}));
|
||||
|
||||
const storage = getStorage();
|
||||
|
||||
const CREATOR = 'tomas';
|
||||
const USER = 'petr';
|
||||
const ADMIN_PW = 'testadmin';
|
||||
const STORE = 'McDonald\'s';
|
||||
const TOKEN = '0d521a8be3c4acebb26d8bd5716d91eac67050fb152a899a55fa19bd5ed65f15';
|
||||
const SHARE_URL = `https://food.bolt.eu/sharedActiveOrder/${TOKEN}`;
|
||||
|
||||
function boltResponse(order: object | null) {
|
||||
return {
|
||||
data: {
|
||||
code: 0,
|
||||
message: 'OK',
|
||||
data: { orders: order ? [order] : [], baskets: [] },
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
beforeEach(async () => {
|
||||
resetMemoryStorage();
|
||||
jest.clearAllMocks();
|
||||
process.env.ADMIN_PASSWORD = ADMIN_PW;
|
||||
await addStore(STORE, ADMIN_PW);
|
||||
});
|
||||
|
||||
afterEach(() => {
|
||||
delete process.env.ADMIN_PASSWORD;
|
||||
});
|
||||
|
||||
describe('extractBoltToken', () => {
|
||||
test('přijme plnou share URL', () => {
|
||||
expect(extractBoltToken(SHARE_URL)).toBe(TOKEN);
|
||||
});
|
||||
|
||||
test('toleruje lomítko, query a hash na konci', () => {
|
||||
expect(extractBoltToken(`${SHARE_URL}/`)).toBe(TOKEN);
|
||||
expect(extractBoltToken(`${SHARE_URL}?utm=x`)).toBe(TOKEN);
|
||||
expect(extractBoltToken(`${SHARE_URL}#sekce`)).toBe(TOKEN);
|
||||
expect(extractBoltToken(` ${SHARE_URL} `)).toBe(TOKEN);
|
||||
});
|
||||
|
||||
test('přijme samotný token včetně velkých písmen', () => {
|
||||
expect(extractBoltToken(TOKEN)).toBe(TOKEN);
|
||||
expect(extractBoltToken(TOKEN.toUpperCase())).toBe(TOKEN.toUpperCase());
|
||||
});
|
||||
|
||||
test('odmítne neplatný vstup', () => {
|
||||
expect(extractBoltToken('')).toBeNull();
|
||||
expect(extractBoltToken('nesmysl')).toBeNull();
|
||||
expect(extractBoltToken('https://food.bolt.eu/sharedActiveOrder/abc123')).toBeNull();
|
||||
expect(extractBoltToken(`https://food.bolt.eu/sharedActiveOrder/${'z'.repeat(64)}`)).toBeNull();
|
||||
expect(extractBoltToken(TOKEN.slice(0, 63))).toBeNull();
|
||||
});
|
||||
});
|
||||
|
||||
describe('computeDeliveryHHMM', () => {
|
||||
test('přičte sekundy k aktuálnímu času', () => {
|
||||
expect(computeDeliveryHHMM(1800, new Date('2025-01-10T11:00:00'))).toBe('11:30');
|
||||
});
|
||||
|
||||
test('přechod přes půlnoc', () => {
|
||||
expect(computeDeliveryHHMM(1200, new Date('2025-01-10T23:50:00'))).toBe('00:10');
|
||||
});
|
||||
});
|
||||
|
||||
describe('setGroupBoltTracking', () => {
|
||||
const TODAY = new Date('2025-01-10');
|
||||
let groupId: string;
|
||||
|
||||
beforeEach(async () => {
|
||||
const d = await createGroup(CREATOR, STORE, TODAY);
|
||||
groupId = d.groups![0].id;
|
||||
await setGroupState(CREATOR, groupId, GroupState.LOCKED, TODAY);
|
||||
await setGroupState(CREATOR, groupId, GroupState.ORDERED, TODAY);
|
||||
});
|
||||
|
||||
test('uloží token ze share URL', async () => {
|
||||
const d = await setGroupBoltTracking(CREATOR, groupId, SHARE_URL, TODAY);
|
||||
expect(d.groups![0].boltTrackingToken).toBe(TOKEN);
|
||||
});
|
||||
|
||||
test('prázdná hodnota sledování zruší včetně stavu', async () => {
|
||||
await setGroupBoltTracking(CREATOR, groupId, SHARE_URL, TODAY);
|
||||
const d = await setGroupBoltTracking(CREATOR, groupId, '', TODAY);
|
||||
expect(d.groups![0].boltTrackingToken).toBeUndefined();
|
||||
expect(d.groups![0].boltOrderState).toBeUndefined();
|
||||
});
|
||||
|
||||
test('nový token vynuluje stav předchozí objednávky', async () => {
|
||||
await setGroupBoltTracking(CREATOR, groupId, SHARE_URL, TODAY);
|
||||
await storage.updateData<ClientData>(`2025-01-10_extra`, (current) => {
|
||||
current!.groups![0].boltOrderState = 'preparing';
|
||||
return current!;
|
||||
});
|
||||
// Stejný token stav nemění
|
||||
let d = await setGroupBoltTracking(CREATOR, groupId, SHARE_URL, TODAY);
|
||||
expect(d.groups![0].boltOrderState).toBe('preparing');
|
||||
// Jiný token stav vynuluje
|
||||
const otherUrl = `https://food.bolt.eu/sharedActiveOrder/${'b'.repeat(64)}`;
|
||||
d = await setGroupBoltTracking(CREATOR, groupId, otherUrl, TODAY);
|
||||
expect(d.groups![0].boltOrderState).toBeUndefined();
|
||||
expect(d.groups![0].boltTrackingToken).toBe('b'.repeat(64));
|
||||
});
|
||||
|
||||
test('odmítne neplatný odkaz', async () => {
|
||||
await expect(setGroupBoltTracking(CREATOR, groupId, 'nesmysl', TODAY)).rejects.toThrow('Neplatný odkaz');
|
||||
});
|
||||
|
||||
test('nezakladatel nemůže sledování nastavit', async () => {
|
||||
await expect(setGroupBoltTracking(USER, groupId, SHARE_URL, TODAY)).rejects.toThrow('zakladatel');
|
||||
});
|
||||
|
||||
test('nelze nastavit mimo stav objednáno', async () => {
|
||||
const d = await createGroup(CREATOR, STORE, TODAY);
|
||||
const openGroupId = d.groups![1].id;
|
||||
await expect(setGroupBoltTracking(CREATOR, openGroupId, SHARE_URL, TODAY)).rejects.toThrow('objednáno');
|
||||
});
|
||||
});
|
||||
|
||||
describe('checkBoltTracking', () => {
|
||||
// Scheduler čte vždy dnešní data (getToday), proto se skupiny zakládají bez explicitního data
|
||||
const extraKey = () => `${formatDate(new Date())}_extra`;
|
||||
let groupId: string;
|
||||
|
||||
beforeEach(async () => {
|
||||
const d = await createGroup(CREATOR, STORE);
|
||||
groupId = d.groups![0].id;
|
||||
await setGroupState(CREATOR, groupId, GroupState.LOCKED);
|
||||
await setGroupState(CREATOR, groupId, GroupState.ORDERED);
|
||||
await setGroupBoltTracking(CREATOR, groupId, SHARE_URL);
|
||||
});
|
||||
|
||||
async function getGroup() {
|
||||
const data = await storage.getData<ClientData>(extraKey());
|
||||
return data!.groups!.find(g => g.id === groupId)!;
|
||||
}
|
||||
|
||||
test('aktualizuje deliveryAt podle expected_time_to_client_in_seconds', async () => {
|
||||
mockedAxios.post.mockResolvedValue(boltResponse({ order_state: 'waiting_preparation', expected_time_to_client_in_seconds: 1800 }));
|
||||
const before = computeDeliveryHHMM(1800);
|
||||
await checkBoltTracking();
|
||||
const after = computeDeliveryHHMM(1800);
|
||||
const group = await getGroup();
|
||||
expect([before, after]).toContain(group.deliveryAt);
|
||||
expect(group.boltOrderState).toBe('waiting_preparation');
|
||||
expect(group.boltTrackingToken).toBe(TOKEN);
|
||||
expect(mockEmit).toHaveBeenCalledWith('message', expect.anything());
|
||||
expect(mockedAxios.post).toHaveBeenCalledWith(
|
||||
expect.stringContaining('getOrderPolling'),
|
||||
{ token: TOKEN },
|
||||
expect.objectContaining({ headers: { 'Content-Type': 'application/json' } }),
|
||||
);
|
||||
});
|
||||
|
||||
test('nezapisuje, pokud se čas nezměnil', async () => {
|
||||
mockedAxios.post.mockResolvedValue(boltResponse({ order_state: 'preparing', expected_time_to_client_in_seconds: 1800 }));
|
||||
await checkBoltTracking();
|
||||
expect(mockEmit).toHaveBeenCalledTimes(1);
|
||||
await checkBoltTracking();
|
||||
expect(mockEmit).toHaveBeenCalledTimes(1);
|
||||
});
|
||||
|
||||
test('ukončí sledování po doručení (token smazán, deliveryAt zůstává)', async () => {
|
||||
mockedAxios.post.mockResolvedValue(boltResponse({ order_state: 'preparing', expected_time_to_client_in_seconds: 1800 }));
|
||||
await checkBoltTracking();
|
||||
mockedAxios.post.mockResolvedValue(boltResponse({ order_state: 'delivered', expected_time_to_client_in_seconds: 0 }));
|
||||
await checkBoltTracking();
|
||||
const group = await getGroup();
|
||||
expect(group.boltTrackingToken).toBeUndefined();
|
||||
expect(group.boltOrderState).toBe('delivered');
|
||||
expect(group.deliveryAt).toMatch(/^\d{2}:\d{2}$/);
|
||||
});
|
||||
|
||||
test('ukončí sledování, když objednávka už neexistuje', async () => {
|
||||
mockedAxios.post.mockResolvedValue(boltResponse(null));
|
||||
await checkBoltTracking();
|
||||
const group = await getGroup();
|
||||
expect(group.boltTrackingToken).toBeUndefined();
|
||||
expect(group.boltOrderState).toBe('delivered');
|
||||
});
|
||||
|
||||
test('ukládá stav kurýra (reálná odpověď s waiting_delivery)', async () => {
|
||||
mockedAxios.post.mockResolvedValue(boltResponse({
|
||||
order_id: 312222357,
|
||||
order_state: 'waiting_delivery',
|
||||
expected_time_to_client_in_seconds: 911,
|
||||
provider: { provider_id: 82859, state: 'waiting_pickup' },
|
||||
courier: { courier_id: 1958424, state: 'arrived_to_provider', lat: 49.7, lng: 13.3 },
|
||||
}));
|
||||
await checkBoltTracking();
|
||||
let group = await getGroup();
|
||||
expect(group.boltOrderState).toBe('waiting_delivery');
|
||||
expect(group.boltCourierState).toBe('arrived_to_provider');
|
||||
|
||||
// Kurýr vyzvedl — změní se jen courier state
|
||||
mockedAxios.post.mockResolvedValue(boltResponse({
|
||||
order_state: 'waiting_delivery',
|
||||
expected_time_to_client_in_seconds: 911,
|
||||
courier: { state: 'picked_up' },
|
||||
}));
|
||||
await checkBoltTracking();
|
||||
group = await getGroup();
|
||||
expect(group.boltCourierState).toBe('picked_up');
|
||||
});
|
||||
|
||||
test('aktualizuje boltOrderState při změně stavu beze změny času', async () => {
|
||||
mockedAxios.post.mockResolvedValue(boltResponse({ order_state: 'waiting_preparation', expected_time_to_client_in_seconds: 1800 }));
|
||||
await checkBoltTracking();
|
||||
mockedAxios.post.mockResolvedValue(boltResponse({ order_state: 'preparing', expected_time_to_client_in_seconds: 1800 }));
|
||||
await checkBoltTracking();
|
||||
const group = await getGroup();
|
||||
expect(group.boltOrderState).toBe('preparing');
|
||||
expect(group.boltTrackingToken).toBe(TOKEN);
|
||||
});
|
||||
|
||||
test('chybová odpověď Bolt API (code != 0) se počítá jako selhání', async () => {
|
||||
const errorSpy = jest.spyOn(console, 'error').mockImplementation(() => {});
|
||||
mockedAxios.post.mockResolvedValue({ data: { code: 42, message: 'FAIL' } });
|
||||
await checkBoltTracking();
|
||||
const group = await getGroup();
|
||||
expect(group.boltTrackingToken).toBe(TOKEN);
|
||||
errorSpy.mockRestore();
|
||||
});
|
||||
|
||||
test('po 10 po sobě jdoucích selháních sledování ukončí', async () => {
|
||||
const errorSpy = jest.spyOn(console, 'error').mockImplementation(() => {});
|
||||
mockedAxios.post.mockRejectedValue(new Error('network down'));
|
||||
for (let i = 0; i < 9; i++) {
|
||||
await checkBoltTracking();
|
||||
}
|
||||
expect((await getGroup()).boltTrackingToken).toBe(TOKEN);
|
||||
await checkBoltTracking();
|
||||
expect((await getGroup()).boltTrackingToken).toBeUndefined();
|
||||
errorSpy.mockRestore();
|
||||
});
|
||||
|
||||
test('ignoruje skupiny mimo stav objednáno', async () => {
|
||||
await storage.updateData<ClientData>(extraKey(), (current) => {
|
||||
const d = current!;
|
||||
const g = d.groups!.find(x => x.id === groupId)!;
|
||||
g.state = GroupState.LOCKED;
|
||||
return d;
|
||||
});
|
||||
await checkBoltTracking();
|
||||
expect(mockedAxios.post).not.toHaveBeenCalled();
|
||||
});
|
||||
});
|
||||
@@ -31,8 +31,8 @@ test('saláty mají name a ingredients', async () => {
|
||||
|
||||
test('cena salátu zahrnuje pevný příplatek 13 Kč za obal', async () => {
|
||||
const salaty = await downloadSalaty(false);
|
||||
// Caesar sticker price = 129, box = 13
|
||||
expect(salaty[0].price).toBe(129 + 13);
|
||||
// Řecký sticker price = 119, box = 13
|
||||
expect(salaty[1].price).toBe(119 + 13);
|
||||
// Caesar sticker price = 129, box = 13 → (129 + 13) * 100 haléřů
|
||||
expect(salaty[0].price).toBe((129 + 13) * 100);
|
||||
// Řecký sticker price = 119, box = 13 → (119 + 13) * 100 haléřů
|
||||
expect(salaty[1].price).toBe((119 + 13) * 100);
|
||||
});
|
||||
|
||||
+8
-22
@@ -1,29 +1,15 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<body>
|
||||
<div class="outer-container">
|
||||
<div class="header-section"><!-- font.parent().parent() -->
|
||||
<p><!-- font.parent() -->
|
||||
<font class="wsw-41">Obědy 12.5.-16.5.2025</font>
|
||||
</p>
|
||||
<div class="b b-text cf">
|
||||
<div class="b-c b-text-c cf">
|
||||
<p class="wnd-align-center"><font class="wsw-41 wnd-font-size-120"><strong>Jídelní lístek 12.5.-16.5.2025</strong></font></p>
|
||||
<p class="wnd-align-center"><strong>Pondělí</strong><br>Polévka dne 1<br>Svíčková na smetaně s knedlíkem 1,3,7 — 149 Kč<br>Smažený sýr s bramborami 1,3 — 139 Kč</p>
|
||||
<p class="wnd-align-center"><strong>Úterý</strong><br>Česnečka 1<br>Vepřový guláš s houskovým knedlíkem 1,3 — 145 Kč</p>
|
||||
<p class="wnd-align-center"><strong>Středa</strong><br>Hovězí vývar s nudlemi 1<br>Kuřecí řízek s bramborami 1 — 139 Kč</p>
|
||||
<p class="wnd-align-center"><strong>Čtvrtek</strong><br>Dršťková polévka 1<br>Segedínský guláš s knedlíkem 1,3 — 145 Kč</p>
|
||||
<p class="wnd-align-center"><strong>Pátek</strong><br>Rajská polévka s rýží 1<br>Rizoto s kuřecím masem a zeleninou 1 — 139 Kč</p>
|
||||
</div>
|
||||
<!-- níže jsou sourozenci .header-section = výsledek $(font).parent().parent().siblings() -->
|
||||
<p>Pondělí</p>
|
||||
<p>• Polévka dne 1</p>
|
||||
<p>• Svíčková na smetaně s knedlíkem 1, 3, 7 149 Kč</p>
|
||||
<p>• Smažený sýr s bramborami 1, 3 139 Kč</p>
|
||||
<p>Úterý</p>
|
||||
<p>• Česnečka 1</p>
|
||||
<p>• Vepřový guláš s houskovým knedlíkem 1, 3 145 Kč</p>
|
||||
<p>Středa</p>
|
||||
<p>• Hovězí vývar s nudlemi 1</p>
|
||||
<p>• Kuřecí řízek s bramborami 1 139 Kč</p>
|
||||
<p>Čtvrtek</p>
|
||||
<p>• Dršťková polévka 1</p>
|
||||
<p>• Segedínský guláš s knedlíkem 1, 3 145 Kč</p>
|
||||
<p>Pátek</p>
|
||||
<p>• Rajská polévka s rýží 1</p>
|
||||
<p>• Rizoto s kuřecím masem a zeleninou 1 139 Kč</p>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { resetMemoryStorage } from '../storage/memory';
|
||||
import { getStores, addStore } from '../stores';
|
||||
import { createGroup, deleteGroup, addGroupMember, removeGroupMember, updateGroupMember, setGroupState } from '../groups';
|
||||
import { createGroup, deleteGroup, addGroupMember, removeGroupMember, updateGroupMember, setGroupState, setGroupBoltTracking } from '../groups';
|
||||
import { GroupState } from '../../../types/gen/types.gen';
|
||||
|
||||
const CREATOR = 'tomas';
|
||||
@@ -192,4 +192,13 @@ describe('setGroupState', () => {
|
||||
test('nečlen nemůže měnit stav', async () => {
|
||||
await expect(setGroupState(USER, groupId, GroupState.LOCKED, TODAY)).rejects.toThrow('zakladatel');
|
||||
});
|
||||
|
||||
test('ordered → locked smaže boltTrackingToken', async () => {
|
||||
await setGroupState(CREATOR, groupId, GroupState.LOCKED, TODAY);
|
||||
await setGroupState(CREATOR, groupId, GroupState.ORDERED, TODAY);
|
||||
const token = 'a'.repeat(64);
|
||||
await setGroupBoltTracking(CREATOR, groupId, `https://food.bolt.eu/sharedActiveOrder/${token}`, TODAY);
|
||||
const d = await setGroupState(CREATOR, groupId, GroupState.LOCKED, TODAY);
|
||||
expect(d.groups![0].boltTrackingToken).toBeUndefined();
|
||||
});
|
||||
});
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { convertBbanToIban } from '../qr';
|
||||
import { convertBbanToIban, sanitizeQrMessage } from '../qr';
|
||||
|
||||
test('konverze BBAN s prefixem na IBAN', () => {
|
||||
// Číslo účtu 19-2000145399/0800 (Česká spořitelna) → CZ6508000000192000145399
|
||||
@@ -34,3 +34,26 @@ test('výsledek vždy začíná CZ', () => {
|
||||
expect(convertBbanToIban('100-2000145399/0300')).toMatch(/^CZ/);
|
||||
expect(convertBbanToIban('2000145399/0100')).toMatch(/^CZ/);
|
||||
});
|
||||
|
||||
test('sanitizace zprávy – diakritika se transliteruje na základní písmena', () => {
|
||||
expect(sanitizeQrMessage('Pizza Šunková')).toBe('Pizza Sunkova');
|
||||
expect(sanitizeQrMessage('čaj a káva')).toBe('caj a kava');
|
||||
expect(sanitizeQrMessage('Žížala, řeřicha, ďábel')).toBe('Zizala, rericha, dabel');
|
||||
});
|
||||
|
||||
test('sanitizace zprávy – hvězdička se odstraní', () => {
|
||||
expect(sanitizeQrMessage('Pizza *akce* 1+1')).toBe('Pizza akce 1+1');
|
||||
expect(sanitizeQrMessage('***')).toBe('');
|
||||
});
|
||||
|
||||
test('sanitizace zprávy – znaky mimo ISO 8859-1 se odstraní', () => {
|
||||
// Emoji a CJK znaky nemají ASCII ekvivalent → zmizí, zbytek zůstane
|
||||
expect(sanitizeQrMessage('Oběd 🍕 hotovo')).toBe('Obed hotovo');
|
||||
// Znaky v rozsahu ISO 8859-1 (např. § ° é) zůstanou zachovány
|
||||
expect(sanitizeQrMessage('Cena 100°C § café')).toBe('Cena 100°C § cafe');
|
||||
});
|
||||
|
||||
test('sanitizace zprávy – ořez na 60 znaků', () => {
|
||||
const long = 'a'.repeat(70);
|
||||
expect(sanitizeQrMessage(long)).toHaveLength(60);
|
||||
});
|
||||
|
||||
@@ -28,8 +28,8 @@ beforeEach(() => {
|
||||
|
||||
const VALID_BODY = {
|
||||
recipients: [
|
||||
{ login: 'uzivatel1', purpose: 'Pizza Margherita', amount: 149 },
|
||||
{ login: 'uzivatel2', purpose: 'Pizza Diavola', amount: 179 },
|
||||
{ login: 'uzivatel1', purpose: 'Pizza Margherita', amount: 14900 },
|
||||
{ login: 'uzivatel2', purpose: 'Pizza Diavola', amount: 17900 },
|
||||
],
|
||||
bankAccount: '19-2000145399/0800',
|
||||
bankAccountHolder: 'Jan Novák',
|
||||
@@ -76,17 +76,17 @@ test('POST /generate vrátí 400 pro zápornou částku', async () => {
|
||||
expect(res.body.error).toContain('částku');
|
||||
});
|
||||
|
||||
test('POST /generate vrátí 400 pro částku s více než 2 desetinnými místy', async () => {
|
||||
test('POST /generate vrátí 400 pro necelou částku', async () => {
|
||||
const body = {
|
||||
...VALID_BODY,
|
||||
recipients: [{ login: 'uzivatel1', purpose: 'Pizza', amount: 149.999 }],
|
||||
recipients: [{ login: 'uzivatel1', purpose: 'Pizza', amount: 149.5 }],
|
||||
};
|
||||
const res = await request(buildApp())
|
||||
.post('/api/qr/generate')
|
||||
.set('Authorization', TOKEN)
|
||||
.send(body);
|
||||
expect(res.status).toBe(400);
|
||||
expect(res.body.error).toContain('desetinná');
|
||||
expect(res.body.error).toContain('částku');
|
||||
});
|
||||
|
||||
test('POST /generate vrátí 400 pro příjemce bez login', async () => {
|
||||
|
||||
@@ -26,6 +26,10 @@ const implementations: [string, () => StorageInterface, () => void][] = [
|
||||
inst.hasData = async (key: string) => Promise.resolve((inst as any).db.has(key));
|
||||
inst.getData = async (key: string) => (inst as any).db.get(key);
|
||||
inst.setData = async (key: string, data: any) => { (inst as any).db.set(key, data); return Promise.resolve(); };
|
||||
inst.listKeys = async (contains?: string) => {
|
||||
const keys = Object.keys((inst as any).db.JSON());
|
||||
return contains ? keys.filter((k: string) => k.includes(contains)) : keys;
|
||||
};
|
||||
return inst;
|
||||
}, () => {
|
||||
if (fs.existsSync(tempDbPath)) {
|
||||
@@ -76,6 +80,22 @@ describe.each(implementations)('%s splňuje StorageInterface kontrakt', (name, f
|
||||
expect((await storage.getData<{ val: string }>('a'))?.val).toBe('A');
|
||||
expect((await storage.getData<{ val: string }>('b'))?.val).toBe('B');
|
||||
});
|
||||
|
||||
test('listKeys vrátí všechny uložené klíče', async () => {
|
||||
await storage.setData('2024-01-01_extra', {});
|
||||
await storage.setData('2024-01-02', {});
|
||||
const keys = await storage.listKeys();
|
||||
expect(keys).toContain('2024-01-01_extra');
|
||||
expect(keys).toContain('2024-01-02');
|
||||
});
|
||||
|
||||
test('listKeys filtruje podle podřetězce', async () => {
|
||||
await storage.setData('2024-01-01_extra', {});
|
||||
await storage.setData('2024-01-02_extra', {});
|
||||
await storage.setData('2024-01-02', {});
|
||||
const keys = await storage.listKeys('_extra');
|
||||
expect(keys.sort()).toEqual(['2024-01-01_extra', '2024-01-02_extra']);
|
||||
});
|
||||
});
|
||||
|
||||
afterAll(() => {
|
||||
|
||||
@@ -1,8 +1,12 @@
|
||||
import { resetMemoryStorage } from '../storage/memory';
|
||||
import getStorage from '../storage';
|
||||
import { getStores, addStore, removeStore } from '../stores';
|
||||
|
||||
const ADMIN_PW = 'testadmin';
|
||||
|
||||
/** Vrátí pole názvů obchodů pro snadné porovnání v testech. */
|
||||
const names = (stores: { name: string }[]) => stores.map(s => s.name);
|
||||
|
||||
beforeEach(() => {
|
||||
resetMemoryStorage();
|
||||
process.env.ADMIN_PASSWORD = ADMIN_PW;
|
||||
@@ -17,12 +21,37 @@ describe('getStores', () => {
|
||||
const stores = await getStores();
|
||||
expect(stores).toEqual([]);
|
||||
});
|
||||
|
||||
test('převede starý formát (pole řetězců) na objekty', async () => {
|
||||
// Simulace dat uložených ve starším formátu (před zavedením URL)
|
||||
await getStorage().setData('stores', ['McDonald\'s', 'KFC']);
|
||||
const stores = await getStores();
|
||||
expect(stores).toEqual([{ name: 'McDonald\'s' }, { name: 'KFC' }]);
|
||||
});
|
||||
});
|
||||
|
||||
describe('addStore', () => {
|
||||
test('přidá obchod se správným heslem', async () => {
|
||||
const stores = await addStore('McDonald\'s', ADMIN_PW);
|
||||
expect(stores).toContain('McDonald\'s');
|
||||
expect(names(stores)).toContain('McDonald\'s');
|
||||
});
|
||||
|
||||
test('uloží volitelnou URL a ořízne mezery', async () => {
|
||||
const stores = await addStore('Bistro', ADMIN_PW, ' https://wolt.com/bistro ');
|
||||
expect(stores).toContainEqual({ name: 'Bistro', url: 'https://wolt.com/bistro' });
|
||||
});
|
||||
|
||||
test('bez URL uloží obchod bez pole url', async () => {
|
||||
const stores = await addStore('KFC', ADMIN_PW, ' ');
|
||||
expect(stores).toContainEqual({ name: 'KFC' });
|
||||
});
|
||||
|
||||
test('odmítne URL s nepovoleným schématem (javascript:)', async () => {
|
||||
await expect(addStore('Zlo', ADMIN_PW, 'javascript:alert(1)')).rejects.toThrow('http');
|
||||
});
|
||||
|
||||
test('odmítne nevalidní URL', async () => {
|
||||
await expect(addStore('Zlo', ADMIN_PW, 'nfdjska')).rejects.toThrow('Neplatná URL');
|
||||
});
|
||||
|
||||
test('vyhodí UNAUTHORIZED s nesprávným heslem', async () => {
|
||||
@@ -47,8 +76,8 @@ describe('addStore', () => {
|
||||
await addStore('McDonald\'s', ADMIN_PW);
|
||||
const stores = await addStore('KFC', ADMIN_PW);
|
||||
expect(stores).toHaveLength(2);
|
||||
expect(stores).toContain('McDonald\'s');
|
||||
expect(stores).toContain('KFC');
|
||||
expect(names(stores)).toContain('McDonald\'s');
|
||||
expect(names(stores)).toContain('KFC');
|
||||
});
|
||||
});
|
||||
|
||||
@@ -59,12 +88,12 @@ describe('removeStore', () => {
|
||||
|
||||
test('odebere obchod se správným heslem', async () => {
|
||||
const stores = await removeStore('McDonald\'s', ADMIN_PW);
|
||||
expect(stores).not.toContain('McDonald\'s');
|
||||
expect(names(stores)).not.toContain('McDonald\'s');
|
||||
});
|
||||
|
||||
test('case-insensitive odebrání', async () => {
|
||||
const stores = await removeStore('MCDONALD\'S', ADMIN_PW);
|
||||
expect(stores).not.toContain('McDonald\'s');
|
||||
expect(names(stores)).not.toContain('McDonald\'s');
|
||||
});
|
||||
|
||||
test('vyhodí UNAUTHORIZED s nesprávným heslem', async () => {
|
||||
@@ -73,6 +102,6 @@ describe('removeStore', () => {
|
||||
|
||||
test('odebrání neexistujícího obchodu nic nerozbije', async () => {
|
||||
const stores = await removeStore('Neexistuje', ADMIN_PW);
|
||||
expect(stores).toContain('McDonald\'s');
|
||||
expect(names(stores)).toContain('McDonald\'s');
|
||||
});
|
||||
});
|
||||
|
||||
@@ -0,0 +1,165 @@
|
||||
import { resetMemoryStorage } from '../storage/memory';
|
||||
import getStorage from '../storage';
|
||||
import { addSuggestion, deleteSuggestion, listSuggestions, voteSuggestion } from '../suggestions';
|
||||
|
||||
/** Ručně označí návrh jako vyřešený - simuluje zásah do dat (Redis/JSON). */
|
||||
async function markResolved(id: string) {
|
||||
const storage = getStorage();
|
||||
const data = await storage.getData<any[]>('suggestions');
|
||||
data!.find(s => s.id === id).resolved = true;
|
||||
await storage.setData('suggestions', data);
|
||||
}
|
||||
|
||||
const AUTHOR = 'tomas';
|
||||
const VOTER = 'petr';
|
||||
const OTHER = 'jana';
|
||||
|
||||
beforeEach(() => {
|
||||
resetMemoryStorage();
|
||||
});
|
||||
|
||||
/** Pomocná funkce: vytvoří návrh a vrátí jeho id (z pohledu autora). */
|
||||
async function createSuggestion(author = AUTHOR, title = 'Tmavý režim', description = 'Přidat tmavý režim aplikace') {
|
||||
const list = await addSuggestion(author, title, description);
|
||||
return list.find(s => s.title === title)!.id;
|
||||
}
|
||||
|
||||
describe('addSuggestion', () => {
|
||||
test('přidá návrh a autorovi nastaví hlas pro', async () => {
|
||||
const list = await addSuggestion(AUTHOR, 'Tmavý režim', 'Popis');
|
||||
expect(list).toHaveLength(1);
|
||||
const s = list[0];
|
||||
expect(s.author).toBe(AUTHOR);
|
||||
expect(s.title).toBe('Tmavý režim');
|
||||
expect(s.description).toBe('Popis');
|
||||
expect(s.voteScore).toBe(1);
|
||||
expect(s.myVote).toBe('up');
|
||||
expect(s.isMine).toBe(true);
|
||||
});
|
||||
|
||||
test('ořízne mezery a odmítne prázdný název i popis', async () => {
|
||||
await expect(addSuggestion(AUTHOR, ' ', 'popis')).rejects.toThrow();
|
||||
await expect(addSuggestion(AUTHOR, 'název', ' ')).rejects.toThrow();
|
||||
const list = await addSuggestion(AUTHOR, ' Název ', ' Popis ');
|
||||
expect(list[0].title).toBe('Název');
|
||||
expect(list[0].description).toBe('Popis');
|
||||
});
|
||||
|
||||
test('jeden uživatel může přidat více návrhů', async () => {
|
||||
await addSuggestion(AUTHOR, 'První', 'popis');
|
||||
const list = await addSuggestion(AUTHOR, 'Druhý', 'popis');
|
||||
expect(list).toHaveLength(2);
|
||||
});
|
||||
});
|
||||
|
||||
describe('listSuggestions', () => {
|
||||
test('řadí sestupně dle skóre', async () => {
|
||||
const lowId = await createSuggestion(AUTHOR, 'Nízké', 'popis');
|
||||
const highId = await createSuggestion(OTHER, 'Vysoké', 'popis');
|
||||
// "Vysoké" dostane další hlas pro
|
||||
await voteSuggestion(VOTER, highId, 'up');
|
||||
|
||||
const list = await listSuggestions(VOTER);
|
||||
expect(list[0].id).toBe(highId);
|
||||
expect(list[0].voteScore).toBe(2);
|
||||
expect(list[1].id).toBe(lowId);
|
||||
});
|
||||
|
||||
test('myVote a isMine jsou relativní k uživateli', async () => {
|
||||
const id = await createSuggestion(AUTHOR);
|
||||
const asAuthor = (await listSuggestions(AUTHOR))[0];
|
||||
expect(asAuthor.isMine).toBe(true);
|
||||
expect(asAuthor.myVote).toBe('up');
|
||||
|
||||
const asOther = (await listSuggestions(VOTER))[0];
|
||||
expect(asOther.isMine).toBe(false);
|
||||
expect(asOther.myVote).toBeUndefined();
|
||||
// Seznamy hlasujících se klientovi neposílají
|
||||
expect((asOther as any).upvoters).toBeUndefined();
|
||||
expect(id).toBeDefined();
|
||||
});
|
||||
});
|
||||
|
||||
describe('voteSuggestion', () => {
|
||||
test('hlas pro a proti od jiného uživatele', async () => {
|
||||
const id = await createSuggestion();
|
||||
let list = await voteSuggestion(VOTER, id, 'up');
|
||||
expect(list[0].voteScore).toBe(2);
|
||||
expect(list.find(s => s.id === id)!.voteScore).toBe(2);
|
||||
|
||||
// přehlasování z pro na proti
|
||||
list = await voteSuggestion(VOTER, id, 'down');
|
||||
// autor +1, voter -1 => 0
|
||||
expect(list[0].voteScore).toBe(0);
|
||||
expect((await listSuggestions(VOTER))[0].myVote).toBe('down');
|
||||
});
|
||||
|
||||
test('klik na aktivní směr hlas zruší', async () => {
|
||||
const id = await createSuggestion();
|
||||
await voteSuggestion(VOTER, id, 'up');
|
||||
const list = await voteSuggestion(VOTER, id, 'up');
|
||||
// zůstává jen autorův hlas
|
||||
expect(list[0].voteScore).toBe(1);
|
||||
expect((await listSuggestions(VOTER))[0].myVote).toBeUndefined();
|
||||
});
|
||||
|
||||
test('autor může svůj automatický hlas odebrat', async () => {
|
||||
const id = await createSuggestion();
|
||||
const list = await voteSuggestion(AUTHOR, id, 'up');
|
||||
expect(list[0].voteScore).toBe(0);
|
||||
expect((await listSuggestions(AUTHOR))[0].myVote).toBeUndefined();
|
||||
});
|
||||
|
||||
test('hlasování pro neexistující návrh vyhodí chybu', async () => {
|
||||
await expect(voteSuggestion(VOTER, 'neexistuje', 'up')).rejects.toThrow();
|
||||
});
|
||||
});
|
||||
|
||||
describe('vyřešené návrhy', () => {
|
||||
test('listSuggestions vrací příznak resolved', async () => {
|
||||
const id = await createSuggestion();
|
||||
expect((await listSuggestions(AUTHOR))[0].resolved).toBe(false);
|
||||
await markResolved(id);
|
||||
expect((await listSuggestions(AUTHOR))[0].resolved).toBe(true);
|
||||
});
|
||||
|
||||
test('pro vyřešený návrh nelze hlasovat', async () => {
|
||||
const id = await createSuggestion();
|
||||
await markResolved(id);
|
||||
await expect(voteSuggestion(VOTER, id, 'up')).rejects.toThrow();
|
||||
// skóre zůstává nezměněné (jen autorův hlas)
|
||||
expect((await listSuggestions(VOTER))[0].voteScore).toBe(1);
|
||||
});
|
||||
|
||||
test('autor může vyřešený návrh stále smazat', async () => {
|
||||
const id = await createSuggestion();
|
||||
await markResolved(id);
|
||||
const list = await deleteSuggestion(AUTHOR, id);
|
||||
expect(list).toHaveLength(0);
|
||||
});
|
||||
|
||||
test('cizí uživatel nemůže smazat ani vyřešený návrh', async () => {
|
||||
const id = await createSuggestion();
|
||||
await markResolved(id);
|
||||
await expect(deleteSuggestion(VOTER, id)).rejects.toThrow();
|
||||
});
|
||||
});
|
||||
|
||||
describe('deleteSuggestion', () => {
|
||||
test('autor smaže svůj návrh včetně hlasů', async () => {
|
||||
const id = await createSuggestion();
|
||||
await voteSuggestion(VOTER, id, 'up');
|
||||
const list = await deleteSuggestion(AUTHOR, id);
|
||||
expect(list).toHaveLength(0);
|
||||
});
|
||||
|
||||
test('cizí uživatel nemůže smazat návrh', async () => {
|
||||
const id = await createSuggestion();
|
||||
await expect(deleteSuggestion(VOTER, id)).rejects.toThrow();
|
||||
expect(await listSuggestions(AUTHOR)).toHaveLength(1);
|
||||
});
|
||||
|
||||
test('smazání neexistujícího návrhu vyhodí chybu', async () => {
|
||||
await expect(deleteSuggestion(AUTHOR, 'neexistuje')).rejects.toThrow();
|
||||
});
|
||||
});
|
||||
@@ -1,77 +0,0 @@
|
||||
import { getUserVotes, updateFeatureVote, getVotingStats } from '../voting';
|
||||
import { resetMemoryStorage } from '../storage/memory';
|
||||
import { FeatureRequest } from '../../../types/gen/types.gen';
|
||||
|
||||
const OPT_A = FeatureRequest.STATISTICS;
|
||||
const OPT_B = FeatureRequest.UI;
|
||||
|
||||
beforeEach(() => {
|
||||
resetMemoryStorage();
|
||||
});
|
||||
|
||||
describe('updateFeatureVote', () => {
|
||||
test('přidá hlas pro nového uživatele', async () => {
|
||||
const result = await updateFeatureVote('alice', OPT_A, true);
|
||||
expect(result['alice']).toContain(OPT_A);
|
||||
});
|
||||
|
||||
test('vyhodí chybu při duplicitním hlasování', async () => {
|
||||
await updateFeatureVote('alice', OPT_A, true);
|
||||
await expect(updateFeatureVote('alice', OPT_A, true)).rejects.toThrow('hlasovali');
|
||||
});
|
||||
|
||||
test('odebere hlas', async () => {
|
||||
await updateFeatureVote('alice', OPT_A, true);
|
||||
await updateFeatureVote('alice', OPT_A, false);
|
||||
const stats = await getVotingStats();
|
||||
expect(stats[OPT_A] ?? 0).toBe(0);
|
||||
});
|
||||
|
||||
test('odebrání neexistujícího hlasu je no-op', async () => {
|
||||
await expect(updateFeatureVote('alice', OPT_A, false)).resolves.not.toThrow();
|
||||
});
|
||||
|
||||
test('odebrání posledního hlasu odstraní login ze storage', async () => {
|
||||
await updateFeatureVote('alice', OPT_A, true);
|
||||
const data = await updateFeatureVote('alice', OPT_A, false);
|
||||
expect('alice' in data).toBe(false);
|
||||
});
|
||||
|
||||
test('vyhodí chybu po 4 hlasech', async () => {
|
||||
const options = Object.values(FeatureRequest);
|
||||
for (let i = 0; i < 4; i++) {
|
||||
await updateFeatureVote('alice', options[i], true);
|
||||
}
|
||||
await expect(updateFeatureVote('alice', options[4], true)).rejects.toThrow('4');
|
||||
});
|
||||
});
|
||||
|
||||
describe('getUserVotes', () => {
|
||||
test('vrátí hlasy uživatele', async () => {
|
||||
await updateFeatureVote('alice', OPT_A, true);
|
||||
const votes = await getUserVotes('alice');
|
||||
expect(votes).toContain(OPT_A);
|
||||
});
|
||||
|
||||
test('vrátí prázdné pole pro uživatele bez hlasů', async () => {
|
||||
const votes = await getUserVotes('neexistujici');
|
||||
expect(votes).toEqual([]);
|
||||
});
|
||||
});
|
||||
|
||||
describe('getVotingStats', () => {
|
||||
test('vrátí agregované počty hlasů', async () => {
|
||||
await updateFeatureVote('alice', OPT_A, true);
|
||||
await updateFeatureVote('bob', OPT_A, true);
|
||||
await updateFeatureVote('bob', OPT_B, true);
|
||||
|
||||
const stats = await getVotingStats();
|
||||
expect(stats[OPT_A]).toBe(2);
|
||||
expect(stats[OPT_B]).toBe(1);
|
||||
});
|
||||
|
||||
test('vrátí prázdný objekt bez hlasů', async () => {
|
||||
const stats = await getVotingStats();
|
||||
expect(stats).toEqual({});
|
||||
});
|
||||
});
|
||||
@@ -1,76 +0,0 @@
|
||||
import express from 'express';
|
||||
import request from 'supertest';
|
||||
import bodyParser from 'body-parser';
|
||||
import { generateToken } from '../auth';
|
||||
import { resetMemoryStorage } from '../storage/memory';
|
||||
import { FeatureRequest } from '../../../types/gen/types.gen';
|
||||
import votingRouter from '../routes/votingRoutes';
|
||||
|
||||
const VALID_OPTION = FeatureRequest.STATISTICS;
|
||||
|
||||
function buildApp() {
|
||||
const app = express();
|
||||
app.use(bodyParser.json());
|
||||
app.use('/api/voting', votingRouter);
|
||||
app.use((err: any, _req: any, res: any, _next: any) => {
|
||||
res.status(400).json({ error: err.message });
|
||||
});
|
||||
return app;
|
||||
}
|
||||
|
||||
const TOKEN = `Bearer ${generateToken('testuser')}`;
|
||||
|
||||
beforeEach(() => {
|
||||
resetMemoryStorage();
|
||||
});
|
||||
|
||||
test('GET /getVotes vrátí 200 s prázdným polem pro nového uživatele', async () => {
|
||||
const res = await request(buildApp())
|
||||
.get('/api/voting/getVotes')
|
||||
.set('Authorization', TOKEN);
|
||||
expect(res.status).toBe(200);
|
||||
expect(res.body).toEqual([]);
|
||||
});
|
||||
|
||||
test('GET /getVotes vrátí 401 bez tokenu', async () => {
|
||||
const res = await request(buildApp()).get('/api/voting/getVotes');
|
||||
expect(res.status).toBeGreaterThanOrEqual(400);
|
||||
});
|
||||
|
||||
test('POST /updateVote přidá hlas a vrátí 200', async () => {
|
||||
const res = await request(buildApp())
|
||||
.post('/api/voting/updateVote')
|
||||
.set('Authorization', TOKEN)
|
||||
.send({ option: VALID_OPTION, active: true });
|
||||
expect(res.status).toBe(200);
|
||||
});
|
||||
|
||||
test('POST /updateVote vrátí 400 pro chybějící parametry', async () => {
|
||||
const res = await request(buildApp())
|
||||
.post('/api/voting/updateVote')
|
||||
.set('Authorization', TOKEN)
|
||||
.send({});
|
||||
expect(res.status).toBe(400);
|
||||
});
|
||||
|
||||
test('POST /updateVote vrátí 400 při duplicitním hlasu', async () => {
|
||||
const app = buildApp();
|
||||
await request(app)
|
||||
.post('/api/voting/updateVote')
|
||||
.set('Authorization', TOKEN)
|
||||
.send({ option: VALID_OPTION, active: true });
|
||||
const res = await request(app)
|
||||
.post('/api/voting/updateVote')
|
||||
.set('Authorization', TOKEN)
|
||||
.send({ option: VALID_OPTION, active: true });
|
||||
expect(res.status).toBe(400);
|
||||
expect(res.body.error).toContain('hlasovali');
|
||||
});
|
||||
|
||||
test('GET /stats vrátí 200 s objektem', async () => {
|
||||
const res = await request(buildApp())
|
||||
.get('/api/voting/stats')
|
||||
.set('Authorization', TOKEN);
|
||||
expect(res.status).toBe(200);
|
||||
expect(typeof res.body).toBe('object');
|
||||
});
|
||||
+2
-2
@@ -90,7 +90,7 @@ export const parseToken = (req: any) => {
|
||||
export const checkQueryParams = (req: any, paramNames: string[]) => {
|
||||
for (const name of paramNames) {
|
||||
if (req.query[name] == null) {
|
||||
throw Error(`Nebyl předán parametr '${name}' v query požadavku`);
|
||||
throw new Error(`Nebyl předán parametr '${name}' v query požadavku`);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -105,7 +105,7 @@ export const checkQueryParams = (req: any, paramNames: string[]) => {
|
||||
export const checkBodyParams = (req: any, paramNames: string[]) => {
|
||||
for (const name of paramNames) {
|
||||
if (req.body[name] == null) {
|
||||
throw Error(`Nebyl předán parametr '${name}' v těle požadavku`);
|
||||
throw new Error(`Nebyl předán parametr '${name}' v těle požadavku`);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,76 +0,0 @@
|
||||
import { FeatureRequest, VotingStats } from "../../types/gen/types.gen";
|
||||
import getStorage from "./storage";
|
||||
|
||||
interface VotingData {
|
||||
[login: string]: FeatureRequest[],
|
||||
}
|
||||
|
||||
export interface VotingStatsResult {
|
||||
[feature: string]: number;
|
||||
}
|
||||
|
||||
const storage = getStorage();
|
||||
const STORAGE_KEY = 'voting';
|
||||
|
||||
/**
|
||||
* Vrátí pole voleb, pro které uživatel aktuálně hlasuje.
|
||||
*
|
||||
* @param login login uživatele
|
||||
* @returns pole voleb
|
||||
*/
|
||||
export async function getUserVotes(login: string) {
|
||||
const data = await storage.getData<VotingData>(STORAGE_KEY);
|
||||
return data?.[login] || [];
|
||||
}
|
||||
|
||||
/**
|
||||
* Aktualizuje hlas uživatele pro konkrétní volbu.
|
||||
*
|
||||
* @param login login uživatele
|
||||
* @param option volba
|
||||
* @param active příznak, zda volbu přidat nebo odebrat
|
||||
* @returns aktuální data
|
||||
*/
|
||||
export async function updateFeatureVote(login: string, option: FeatureRequest, active: boolean): Promise<VotingData> {
|
||||
let data = await storage.getData<VotingData>(STORAGE_KEY);
|
||||
data ??= {};
|
||||
if (!(login in data)) {
|
||||
data[login] = [];
|
||||
}
|
||||
const index = data[login].indexOf(option);
|
||||
if (index > -1) {
|
||||
if (active) {
|
||||
throw Error('Pro tuto možnost jste již hlasovali');
|
||||
} else {
|
||||
data[login].splice(index, 1);
|
||||
if (data[login].length === 0) {
|
||||
delete data[login];
|
||||
}
|
||||
}
|
||||
} else if (active) {
|
||||
if (data[login].length == 4) {
|
||||
throw Error('Je možné hlasovat pro maximálně 4 možnosti');
|
||||
}
|
||||
data[login].push(option);
|
||||
}
|
||||
await storage.setData(STORAGE_KEY, data);
|
||||
return data;
|
||||
}
|
||||
|
||||
/**
|
||||
* Vrátí agregované statistiky hlasování - počet hlasů pro každou funkci.
|
||||
*
|
||||
* @returns objekt, kde klíčem je název funkce a hodnotou počet hlasů
|
||||
*/
|
||||
export async function getVotingStats(): Promise<VotingStatsResult> {
|
||||
const data = await storage.getData<VotingData>(STORAGE_KEY);
|
||||
const stats: VotingStatsResult = {};
|
||||
if (data) {
|
||||
for (const votes of Object.values(data)) {
|
||||
for (const feature of votes) {
|
||||
stats[feature] = (stats[feature] || 0) + 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
return stats;
|
||||
}
|
||||
+25
-5
@@ -1,12 +1,15 @@
|
||||
import { DefaultEventsMap, Server } from "socket.io";
|
||||
import { createAdapter } from "@socket.io/redis-adapter";
|
||||
import { createClient } from "redis";
|
||||
|
||||
let io: Server<DefaultEventsMap, DefaultEventsMap, DefaultEventsMap, any>;
|
||||
let pubClient: ReturnType<typeof createClient>;
|
||||
let subClient: ReturnType<typeof createClient>;
|
||||
|
||||
export const initWebsocket = (server: any) => {
|
||||
io = new Server(server, {
|
||||
cors: {
|
||||
origin: "*",
|
||||
},
|
||||
cors: { origin: "*" },
|
||||
transports: ["websocket"],
|
||||
});
|
||||
io.on("connection", (socket) => {
|
||||
console.log(`New client connected: ${socket.id}`);
|
||||
@@ -26,7 +29,24 @@ export const initWebsocket = (server: any) => {
|
||||
});
|
||||
});
|
||||
return io;
|
||||
}
|
||||
};
|
||||
|
||||
/** Připojí Redis adapter pro cross-pod broadcasting. Volat až po inicializaci Redis klienta. */
|
||||
export const initRedisAdapter = async () => {
|
||||
const HOST = process.env.REDIS_HOST ?? 'localhost';
|
||||
const PORT = process.env.REDIS_PORT ?? 6379;
|
||||
const url = `redis://${HOST}:${PORT}`;
|
||||
pubClient = createClient({ url }) as ReturnType<typeof createClient>;
|
||||
subClient = pubClient.duplicate();
|
||||
await Promise.all([pubClient.connect(), subClient.connect()]);
|
||||
io.adapter(createAdapter(pubClient as any, subClient as any));
|
||||
console.log('Socket.io: Redis adapter connected');
|
||||
};
|
||||
|
||||
/** Zavře pub/sub Redis klienty adaptéru při graceful shutdown. */
|
||||
export const shutdownWebsocketClients = async () => {
|
||||
await Promise.allSettled([pubClient?.quit(), subClient?.quit()]);
|
||||
};
|
||||
|
||||
export const getWebsocket = () => io;
|
||||
|
||||
@@ -34,4 +54,4 @@ export const getWebsocket = () => io;
|
||||
export const emitToUser = (login: string, event: string, data: unknown) => {
|
||||
if (!io) return;
|
||||
io.to(`user:${login}`).emit(event, data);
|
||||
}
|
||||
};
|
||||
|
||||
@@ -1521,6 +1521,15 @@
|
||||
resolved "https://registry.yarnpkg.com/@socket.io/component-emitter/-/component-emitter-3.1.2.tgz#821f8442f4175d8f0467b9daf26e3a18e2d02af2"
|
||||
integrity sha512-9BCxFwvbGg/RsZK9tjXd8s4UcwR0MWeFQ1XEKIQVVvAGJyINdrqKMcTRyLoK8Rse1GjzLV9cwjWV1olXRWEXVA==
|
||||
|
||||
"@socket.io/redis-adapter@^8.3.0":
|
||||
version "8.3.0"
|
||||
resolved "https://registry.yarnpkg.com/@socket.io/redis-adapter/-/redis-adapter-8.3.0.tgz#bdce1e8f34c07df4a8baf98170bf24dc84eaed4a"
|
||||
integrity sha512-ly0cra+48hDmChxmIpnESKrc94LjRL80TEmZVscuQ/WWkRP81nNj8W8cCGMqbI4L6NCuAaPRSzZF1a9GlAxxnA==
|
||||
dependencies:
|
||||
debug "~4.3.1"
|
||||
notepack.io "~3.0.1"
|
||||
uid2 "1.0.0"
|
||||
|
||||
"@tsconfig/node10@^1.0.7":
|
||||
version "1.0.11"
|
||||
resolved "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.11.tgz#6ee46400685f130e278128c7b38b7e031ff5b2f2"
|
||||
@@ -2438,6 +2447,13 @@ debug@^4.1.1:
|
||||
dependencies:
|
||||
ms "^2.1.3"
|
||||
|
||||
debug@~4.3.1:
|
||||
version "4.3.7"
|
||||
resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.7.tgz#87945b4151a011d76d95a198d7111c865c360a52"
|
||||
integrity sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==
|
||||
dependencies:
|
||||
ms "^2.1.3"
|
||||
|
||||
dedent@^1.6.0:
|
||||
version "1.7.0"
|
||||
resolved "https://registry.yarnpkg.com/dedent/-/dedent-1.7.0.tgz#c1f9445335f0175a96587be245a282ff451446ca"
|
||||
@@ -3844,6 +3860,11 @@ normalize-path@^3.0.0, normalize-path@~3.0.0:
|
||||
resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
|
||||
integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
|
||||
|
||||
notepack.io@~3.0.1:
|
||||
version "3.0.1"
|
||||
resolved "https://registry.yarnpkg.com/notepack.io/-/notepack.io-3.0.1.tgz#2c2c9de1bd4e64a79d34e33c413081302a0d4019"
|
||||
integrity sha512-TKC/8zH5pXIAMVQio2TvVDTtPRX+DJPHDqjRbxogtFiByHyzKmy96RA0JtCQJ+WouyyL4A10xomQzgbUT+1jCg==
|
||||
|
||||
npm-run-path@^4.0.1:
|
||||
version "4.0.1"
|
||||
resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"
|
||||
@@ -4571,6 +4592,11 @@ typescript@^5.9.3:
|
||||
resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.9.3.tgz#5b4f59e15310ab17a216f5d6cf53ee476ede670f"
|
||||
integrity sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==
|
||||
|
||||
uid2@1.0.0:
|
||||
version "1.0.0"
|
||||
resolved "https://registry.yarnpkg.com/uid2/-/uid2-1.0.0.tgz#ef8d95a128d7c5c44defa1a3d052eecc17a06bfb"
|
||||
integrity sha512-+I6aJUv63YAcY9n4mQreLUt0d4lvwkkopDNmpomkAUz0fAkEMV9pRWxN0EjhW1YfRhcuyHg2v3mwddCDW1+LFQ==
|
||||
|
||||
undefsafe@^2.0.5:
|
||||
version "2.0.5"
|
||||
resolved "https://registry.yarnpkg.com/undefsafe/-/undefsafe-2.0.5.tgz#38733b9327bdcd226db889fb723a6efd162e6e2c"
|
||||
|
||||
+13
-7
@@ -69,19 +69,23 @@ paths:
|
||||
/stats:
|
||||
$ref: "./paths/stats/stats.yml"
|
||||
|
||||
# Hlasování (/api/voting)
|
||||
/voting/getVotes:
|
||||
$ref: "./paths/voting/getVotes.yml"
|
||||
/voting/updateVote:
|
||||
$ref: "./paths/voting/updateVote.yml"
|
||||
/voting/stats:
|
||||
$ref: "./paths/voting/getVotingStats.yml"
|
||||
# Návrhy na vylepšení (/api/suggestions)
|
||||
/suggestions/list:
|
||||
$ref: "./paths/suggestions/list.yml"
|
||||
/suggestions/add:
|
||||
$ref: "./paths/suggestions/add.yml"
|
||||
/suggestions/vote:
|
||||
$ref: "./paths/suggestions/vote.yml"
|
||||
/suggestions/delete:
|
||||
$ref: "./paths/suggestions/delete.yml"
|
||||
|
||||
# Changelog (/api/changelogs)
|
||||
/changelogs:
|
||||
$ref: "./paths/changelogs/getChangelogs.yml"
|
||||
|
||||
# Skupiny objednávek (/api/groups)
|
||||
/groups/dates:
|
||||
$ref: "./paths/groups/getOrderDates.yml"
|
||||
/groups/create:
|
||||
$ref: "./paths/groups/createGroup.yml"
|
||||
/groups/delete:
|
||||
@@ -96,6 +100,8 @@ paths:
|
||||
$ref: "./paths/groups/setState.yml"
|
||||
/groups/updateTimes:
|
||||
$ref: "./paths/groups/updateTimes.yml"
|
||||
/groups/setBoltTracking:
|
||||
$ref: "./paths/groups/setBoltTracking.yml"
|
||||
/groups/updateFees:
|
||||
$ref: "./paths/groups/updateFees.yml"
|
||||
|
||||
|
||||
@@ -9,6 +9,15 @@ get:
|
||||
type: integer
|
||||
minimum: 0
|
||||
maximum: 4
|
||||
- in: query
|
||||
name: date
|
||||
description: >-
|
||||
Konkrétní datum (YYYY-MM-DD), pro které se mají vrátit data. Má přednost
|
||||
před dayIndex a umožňuje načtení historických dat i mimo aktuální týden.
|
||||
Datum v budoucnosti je oříznuto na dnešek.
|
||||
schema:
|
||||
type: string
|
||||
format: date
|
||||
- in: query
|
||||
name: slot
|
||||
description: Slot jídla. Pokud není předán, je použit výchozí slot (oběd).
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
get:
|
||||
operationId: getOrderDates
|
||||
summary: Vrátí seznam dnů, pro které existuje alespoň jedna objednávková skupina.
|
||||
responses:
|
||||
"200":
|
||||
description: Seznam dnů s objednávkou
|
||||
content:
|
||||
application/json:
|
||||
schema:
|
||||
type: object
|
||||
required:
|
||||
- dates
|
||||
properties:
|
||||
dates:
|
||||
description: Pole ISO dat (YYYY-MM-DD) s alespoň jednou skupinou
|
||||
type: array
|
||||
items:
|
||||
type: string
|
||||
format: date
|
||||
@@ -0,0 +1,21 @@
|
||||
post:
|
||||
operationId: setBoltTracking
|
||||
summary: Nastaví nebo zruší sledování objednávky Bolt Food (pouze zakladatel).
|
||||
requestBody:
|
||||
required: true
|
||||
content:
|
||||
application/json:
|
||||
schema:
|
||||
type: object
|
||||
required:
|
||||
- id
|
||||
properties:
|
||||
id:
|
||||
description: ID skupiny
|
||||
type: string
|
||||
shareUrl:
|
||||
description: Sdílecí URL objednávky Bolt Food (https://food.bolt.eu/sharedActiveOrder/...). Prázdná hodnota sledování zruší.
|
||||
type: string
|
||||
responses:
|
||||
"200":
|
||||
$ref: "../../api.yml#/components/responses/ClientDataResponse"
|
||||
@@ -14,21 +14,21 @@ post:
|
||||
description: ID skupiny
|
||||
type: string
|
||||
fees:
|
||||
description: Poplatky (Kč)
|
||||
type: number
|
||||
description: Poplatky (haléře)
|
||||
type: integer
|
||||
shipping:
|
||||
description: Doprava (Kč)
|
||||
type: number
|
||||
description: Doprava (haléře)
|
||||
type: integer
|
||||
tip:
|
||||
description: Spropitné (Kč)
|
||||
type: number
|
||||
description: Spropitné (haléře)
|
||||
type: integer
|
||||
discountType:
|
||||
description: Typ slevy
|
||||
type: string
|
||||
enum: [percent, fixed]
|
||||
discountValue:
|
||||
description: Hodnota slevy
|
||||
type: number
|
||||
description: Hodnota slevy (procenta nebo haléře pro fixed)
|
||||
type: integer
|
||||
responses:
|
||||
"200":
|
||||
$ref: "../../api.yml#/components/responses/ClientDataResponse"
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user