Marbes/Luncher
5
2
Fork 0
Code Issues 6 Pull Requests Packages Projects Releases Wiki Activity

Compare commits

merge into: Marbes:master
Branches Tags
Marbes:master
Marbes:feat/refreshMenu
Marbes:feat/openapi
Marbes:feat/jdemeNaObed
Marbes:feat/DayOfWeekIndex
Marbes:feat/enumFixes
...
pull from: Marbes:feat/enumFixes
Branches Tags
Marbes:feat/refreshMenu
Marbes:master
Marbes:feat/openapi
Marbes:feat/jdemeNaObed
Marbes:feat/DayOfWeekIndex
Marbes:feat/enumFixes

1 Commits
master ... feat/enumF

Author SHA1 Message Date
Martin Berka
bc039a361d Magic bullshit 2025-01-09 00:35:47 +01:00
7 changed files with 115 additions and 95 deletions
Show Stats Expand all files Collapse all files

41
client/src/App.tsx
View File

@ -194,9 +194,9 @@ function App() {
}, [auth?.login, easterEgg?.duration, easterEgg?.url, eggImage]); }, [auth?.login, easterEgg?.duration, easterEgg?.url, eggImage]);
const doAddChoice = async (event: React.ChangeEvent<HTMLSelectElement>) => { const doAddChoice = async (event: React.ChangeEvent<HTMLSelectElement>) => {
const index = Object.keys(Locations).indexOf(event.target.value as unknown as Locations); const locationKey = event.target.value as Locations;
if (auth?.login) { if (auth?.login) {
await errorHandler(() => addChoice(index, undefined, dayIndex)); await errorHandler(() => addChoice(locationKey, undefined, dayIndex));
if (foodChoiceRef.current?.value) { if (foodChoiceRef.current?.value) {
foodChoiceRef.current.value = ""; foodChoiceRef.current.value = "";
} }
@ -211,17 +211,16 @@ function App() {
const doAddFoodChoice = async (event: React.ChangeEvent<HTMLSelectElement>) => { const doAddFoodChoice = async (event: React.ChangeEvent<HTMLSelectElement>) => {
if (event.target.value && foodChoiceList?.length && choiceRef.current?.value) { if (event.target.value && foodChoiceList?.length && choiceRef.current?.value) {
const restaurantKey = choiceRef.current.value; const locationKey = choiceRef.current.value as Locations;
if (auth?.login) { if (auth?.login) {
const locationIndex = Object.keys(Locations).indexOf(restaurantKey as unknown as Locations); await errorHandler(() => addChoice(locationKey, Number(event.target.value), dayIndex));
await errorHandler(() => addChoice(locationIndex, Number(event.target.value), dayIndex));
} }
} }
} }
const doRemoveChoices = async (locationKey: string) => { const doRemoveChoices = async (locationKey: Locations) => {
if (auth?.login) { if (auth?.login) {
await errorHandler(() => removeChoices(Number(locationKey), dayIndex)); await errorHandler(() => removeChoices(locationKey, dayIndex));
// Vyresetujeme výběr, aby bylo jasné pro který případně vybíráme jídlo // Vyresetujeme výběr, aby bylo jasné pro který případně vybíráme jídlo
if (choiceRef?.current?.value) { if (choiceRef?.current?.value) {
choiceRef.current.value = ""; choiceRef.current.value = "";
@ -232,9 +231,9 @@ function App() {
} }
} }
const doRemoveFoodChoice = async (locationKey: string, foodIndex: number) => { const doRemoveFoodChoice = async (locationKey: Locations, foodIndex: number) => {
if (auth?.login) { if (auth?.login) {
await errorHandler(() => removeChoice(Number(locationKey), foodIndex, dayIndex)); await errorHandler(() => removeChoice(locationKey, foodIndex, dayIndex));
if (choiceRef?.current?.value) { if (choiceRef?.current?.value) {
choiceRef.current.value = ""; choiceRef.current.value = "";
} }
@ -459,11 +458,21 @@ function App() {
{Object.keys(data.choices).length > 0 ? {Object.keys(data.choices).length > 0 ?
<Table bordered className='mt-5'> <Table bordered className='mt-5'>
<tbody> <tbody>
{Object.keys(data.choices).map((locationKey: string) => { {Object.keys(data.choices).map(key => {
const locationName = Object.values(Locations)[Number(locationKey)]; const locationKey = key as keyof typeof Locations;
const locationLoginList = Object.entries(data.choices[Number(locationKey)]); console.log("Mapuji location key", locationKey);
const locationName = Locations[locationKey];
console.log("Location name", locationName);
console.log("Obsah data.choices", data.choices);
const loginObject = data.choices[locationKey];
// TODO toto je hovnokód, mělo by to být napsané tak, aby si na to TypeScript nemohl stěžovat
if (!loginObject) {
return;
}
const locationLoginList = Object.entries(loginObject);
console.log("Entries", locationLoginList);
return ( return (
<tr key={locationKey}> <tr key={key}>
<td>{locationName}</td> <td>{locationName}</td>
<td className='p-0'> <td className='p-0'>
<Table> <Table>
@ -485,20 +494,20 @@ function App() {
setNoteModalOpen(true); setNoteModalOpen(true);
}} title='Upravit poznámku' className='action-icon' icon={faNoteSticky} />} }} title='Upravit poznámku' className='action-icon' icon={faNoteSticky} />}
{login === auth.login && canChangeChoice && <FontAwesomeIcon onClick={() => { {login === auth.login && canChangeChoice && <FontAwesomeIcon onClick={() => {
doRemoveChoices(locationKey); doRemoveChoices(key as Locations); // TODO dořešit
}} title={`Odstranit volbu ${locationName}, včetně případných zvolených jídel`} className='action-icon' icon={faTrashCan} />} }} title={`Odstranit volbu ${locationName}, včetně případných zvolených jídel`} className='action-icon' icon={faTrashCan} />}
</td> </td>
{userChoices?.length && food ? <td> {userChoices?.length && food ? <td>
<ul> <ul>
{userChoices?.map(foodIndex => { {userChoices?.map(foodIndex => {
const locationsKey = Object.keys(Locations)[Number(locationKey)] const locationsKey = Object.keys(Locations)[Number(key)]
const restaurantKey = Object.keys(Restaurants).indexOf(locationsKey); const restaurantKey = Object.keys(Restaurants).indexOf(locationsKey);
const restaurant = Object.values(Restaurants)[restaurantKey]; const restaurant = Object.values(Restaurants)[restaurantKey];
const foodName = food[restaurant]?.food[foodIndex].name; const foodName = food[restaurant]?.food[foodIndex].name;
return <li key={foodIndex}> return <li key={foodIndex}>
{foodName} {foodName}
{login === auth.login && canChangeChoice && <FontAwesomeIcon onClick={() => { {login === auth.login && canChangeChoice && <FontAwesomeIcon onClick={() => {
doRemoveFoodChoice(locationKey, foodIndex); doRemoveFoodChoice(key as Locations, foodIndex); // TODO dořešit
}} title={`Odstranit ${foodName}`} className='action-icon' icon={faTrashCan} />} }} title={`Odstranit ${foodName}`} className='action-icon' icon={faTrashCan} />}
</li> </li>
})} })}

14
client/src/api/FoodApi.ts
View File

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

9
server/src/routes/foodRoutes.ts
View File

@ -33,7 +33,6 @@ const router = express.Router();
router.post("/addChoice", async (req: Request<{}, any, AddChoiceRequest>, res, next) => { router.post("/addChoice", async (req: Request<{}, any, AddChoiceRequest>, res, next) => {
const login = getLogin(parseToken(req)); const login = getLogin(parseToken(req));
const trusted = getTrusted(parseToken(req)); const trusted = getTrusted(parseToken(req));
if (req.body.locationIndex > -1) {
let date = undefined; let date = undefined;
if (req.body.dayIndex != null) { if (req.body.dayIndex != null) {
let dayIndex; let dayIndex;
@ -45,12 +44,10 @@ router.post("/addChoice", async (req: Request<{}, any, AddChoiceRequest>, res, n
date = getDateForWeekIndex(dayIndex); date = getDateForWeekIndex(dayIndex);
} }
try { try {
const data = await addChoice(login, trusted, req.body.locationIndex, req.body.foodIndex, date); const data = await addChoice(login, trusted, req.body.locationKey, req.body.foodIndex, date);
getWebsocket().emit("message", await addVolatileData(data)); getWebsocket().emit("message", await addVolatileData(data));
return res.status(200).json(data); return res.status(200).json(data);
} catch (e: any) { next(e) } } catch (e: any) { next(e) }
}
return res.status(400); // TODO přidat popis chyby
}); });
router.post("/removeChoices", async (req: Request<{}, any, RemoveChoicesRequest>, res, next) => { router.post("/removeChoices", async (req: Request<{}, any, RemoveChoicesRequest>, res, next) => {
@ -67,7 +64,7 @@ router.post("/removeChoices", async (req: Request<{}, any, RemoveChoicesRequest>
date = getDateForWeekIndex(dayIndex); date = getDateForWeekIndex(dayIndex);
} }
try { try {
const data = await removeChoices(login, trusted, req.body.locationIndex, date); const data = await removeChoices(login, trusted, req.body.locationKey, date);
getWebsocket().emit("message", await addVolatileData(data)); getWebsocket().emit("message", await addVolatileData(data));
res.status(200).json(data); res.status(200).json(data);
} catch (e: any) { next(e) } } catch (e: any) { next(e) }
@ -87,7 +84,7 @@ router.post("/removeChoice", async (req: Request<{}, any, RemoveChoiceRequest>,
date = getDateForWeekIndex(dayIndex); date = getDateForWeekIndex(dayIndex);
} }
try { try {
const data = await removeChoice(login, trusted, req.body.locationIndex, req.body.foodIndex, date); const data = await removeChoice(login, trusted, req.body.locationKey, req.body.foodIndex, date);
getWebsocket().emit("message", await addVolatileData(data)); getWebsocket().emit("message", await addVolatileData(data));
res.status(200).json(data); res.status(200).json(data);
} catch (e: any) { next(e) } } catch (e: any) { next(e) }

70
server/src/service.ts
View File

@ -192,19 +192,19 @@ export async function initIfNeeded(date?: Date) {
* *
* @param login login uživatele * @param login login uživatele
* @param trusted příznak, zda se jedná o ověřeného uživatele * @param trusted příznak, zda se jedná o ověřeného uživatele
* @param locationIndex vybrané "umístění" * @param locationKey vybrané "umístění"
* @param date datum, ke kterému se volba vztahuje * @param date datum, ke kterému se volba vztahuje
* @returns * @returns
*/ */
export async function removeChoices(login: string, trusted: boolean, locationIndex: number, date?: Date) { export async function removeChoices(login: string, trusted: boolean, locationKey: keyof typeof Locations, date?: Date) {
const selectedDay = formatDate(date ?? getToday()); const selectedDay = formatDate(date ?? getToday());
let data: DayData = await storage.getData(selectedDay); let data: DayData = await storage.getData(selectedDay);
validateTrusted(data, login, trusted); validateTrusted(data, login, trusted);
if (locationIndex in data.choices) { if (locationKey in data.choices) {
if (login in data.choices[locationIndex]) { if (data.choices[locationKey] && login in data.choices[locationKey]) {
delete data.choices[locationIndex][login] delete data.choices[locationKey][login]
if (Object.keys(data.choices[locationIndex]).length === 0) { if (Object.keys(data.choices[locationKey]).length === 0) {
delete data.choices[locationIndex] delete data.choices[locationKey]
} }
await storage.setData(selectedDay, data); await storage.setData(selectedDay, data);
} }
@ -218,20 +218,20 @@ export async function removeChoices(login: string, trusted: boolean, locationInd
* *
* @param login login uživatele * @param login login uživatele
* @param trusted příznak, zda se jedná o ověřeného uživatele * @param trusted příznak, zda se jedná o ověřeného uživatele
* @param locationIndex vybrané "umístění" * @param locationKey vybrané "umístění"
* @param foodIndex index jídla v jídelním lístku daného umístění, pokud existuje * @param foodIndex index jídla v jídelním lístku daného umístění, pokud existuje
* @param date datum, ke kterému se volba vztahuje * @param date datum, ke kterému se volba vztahuje
* @returns * @returns
*/ */
export async function removeChoice(login: string, trusted: boolean, locationIndex: number, foodIndex: number, date?: Date) { export async function removeChoice(login: string, trusted: boolean, locationKey: keyof typeof Locations, foodIndex: number, date?: Date) {
const selectedDay = formatDate(date ?? getToday()); const selectedDay = formatDate(date ?? getToday());
let data: DayData = await storage.getData(selectedDay); let data: DayData = await storage.getData(selectedDay);
validateTrusted(data, login, trusted); validateTrusted(data, login, trusted);
if (locationIndex in data.choices) { if (locationKey in data.choices) {
if (login in data.choices[locationIndex]) { if (data.choices[locationKey] && login in data.choices[locationKey]) {
const index = data.choices[locationIndex][login].options.indexOf(foodIndex); const index = data.choices[locationKey][login].options.indexOf(foodIndex);
if (index > -1) { if (index > -1) {
data.choices[locationIndex][login].options.splice(index, 1) data.choices[locationKey][login].options.splice(index, 1)
await storage.setData(selectedDay, data); await storage.setData(selectedDay, data);
} }
} }
@ -247,10 +247,11 @@ export async function removeChoice(login: string, trusted: boolean, locationInde
async function removeChoiceIfPresent(login: string, date: string) { async function removeChoiceIfPresent(login: string, date: string) {
let data: DayData = await storage.getData(date); let data: DayData = await storage.getData(date);
for (const key of Object.keys(data.choices)) { for (const key of Object.keys(data.choices)) {
if (login in data.choices[key]) { const locationKey = key as keyof typeof Locations;
delete data.choices[key][login]; if (data.choices[locationKey] && login in data.choices[locationKey]) {
if (Object.keys(data.choices[key]).length === 0) { delete data.choices[locationKey][login];
delete data.choices[key]; if (Object.keys(data.choices[locationKey]).length === 0) {
delete data.choices[locationKey];
} }
await storage.setData(date, data); await storage.setData(date, data);
} }
@ -285,13 +286,13 @@ function validateTrusted(data: ClientData, login: string, trusted: boolean) {
* *
* @param login login uživatele * @param login login uživatele
* @param trusted příznak, zda se jedná o ověřeného uživatele * @param trusted příznak, zda se jedná o ověřeného uživatele
* @param locationIndex vybrané "umístění" * @param locationKey vybrané "umístění"
* @param foodIndex volitelný index jídla v daném umístění * @param foodIndex volitelný index jídla v daném umístění
* @param trusted příznak, zda se jedná o ověřeného uživatele * @param trusted příznak, zda se jedná o ověřeného uživatele
* @param date datum, ke kterému se volba vztahuje * @param date datum, ke kterému se volba vztahuje
* @returns aktuální data * @returns aktuální data
*/ */
export async function addChoice(login: string, trusted: boolean, locationIndex: number, foodIndex?: number, date?: Date) { export async function addChoice(login: string, trusted: boolean, locationKey: keyof typeof Locations, foodIndex?: number, date?: Date) {
const usedDate = date ?? getToday(); const usedDate = date ?? getToday();
await initIfNeeded(usedDate); await initIfNeeded(usedDate);
const selectedDate = formatDate(usedDate); const selectedDate = formatDate(usedDate);
@ -301,18 +302,29 @@ export async function addChoice(login: string, trusted: boolean, locationIndex:
if (foodIndex == null) { if (foodIndex == null) {
data = await removeChoiceIfPresent(login, selectedDate); data = await removeChoiceIfPresent(login, selectedDate);
} }
if (!(locationIndex in data.choices)) { if (!data.choices) {
data.choices[locationIndex] = {}; console.log("Klíč", Locations[locationKey]); // TODO smazat
data.choices = {
[Locations[locationKey]]: {}
} }
if (!(login in data.choices[locationIndex])) {
data.choices[locationIndex][login] = {
trusted,
options: []
};
}
if (foodIndex != null && !data.choices[locationIndex][login].options.includes(foodIndex)) {
data.choices[locationIndex][login].options.push(foodIndex);
} }
console.log("Máme choices", data.choices);
console.log("Hodnota locationKey", locationKey);
// if (!(data.choices[locationKey])) {
// data?.choices[locationKey] = {}
// }
// if (!(login in data.choices[locationKey])) {
// if (!data.choices[locationKey]) {
// data.choices[locationKey] = {}
// }
// data.choices[locationKey][login] = {
// trusted,
// options: []
// };
// }
// if (foodIndex != null && !data.choices[locationKey][login].options.includes(foodIndex)) {
// data.choices[locationKey][login].options.push(foodIndex);
// }
await storage.setData(selectedDate, data); await storage.setData(selectedDate, data);
return data; return data;
} }

28
server/src/utils.ts
View File

@ -1,4 +1,4 @@
import { Choices } from "../../types"; import { Choices, Locations } from "../../types";
/** Vrátí datum v ISO formátu. */ /** Vrátí datum v ISO formátu. */
export function formatDate(date: Date) { export function formatDate(date: Date) {
@ -110,20 +110,22 @@ export const checkBodyParams = (req: any, paramNames: string[]) => {
// TODO umístit do samostatného souboru // TODO umístit do samostatného souboru
export class InsufficientPermissions extends Error { } export class InsufficientPermissions extends Error { }
export const getUsersByLocation = (data: Choices, login: string): string[] => { export const getUsersByLocation = (choices: Choices, login: string): string[] => {
const result: string[] = []; const result: string[] = [];
for (const location in data) { for (const location of Object.entries(choices)) {
if (data.hasOwnProperty(location)) { const locationKey = location[0];
if (data[location][login]) { const locationValue = location[1];
for (const username in data[location]) { console.log("locationKey", locationKey);
if (data[location].hasOwnProperty(username)) { console.log("locationValue", locationValue);
result.push(username); // if (locationValues[login]) {
} // for (const username in choices[locationKey]) {
} // if (choices[locationKey].hasOwnProperty(username)) {
break; // result.push(username);
} // }
} // }
// break;
// }
} }
return result; return result;

16
types/RequestTypes.ts
View File

@ -1,20 +1,20 @@
import { FeatureRequest, PizzaOrder } from "./Types"; import { FeatureRequest, Locations, PizzaOrder } from "./Types";
export type ILocationKey = {
locationKey: keyof typeof Locations,
}
export type IDayIndex = { export type IDayIndex = {
dayIndex?: number, dayIndex?: number,
} }
export type AddChoiceRequest = IDayIndex & { export type AddChoiceRequest = IDayIndex & ILocationKey & {
locationIndex: number,
foodIndex?: number, foodIndex?: number,
} }
export type RemoveChoicesRequest = IDayIndex & { export type RemoveChoicesRequest = IDayIndex & ILocationKey;
locationIndex: number,
}
export type RemoveChoiceRequest = IDayIndex & { export type RemoveChoiceRequest = IDayIndex & ILocationKey & {
locationIndex: number,
foodIndex: number, foodIndex: number,
} }

6
types/Types.ts
View File

@ -13,9 +13,9 @@ export type FoodChoices = {
} }
export type Choices = { export type Choices = {
[location: string]: { [location in keyof typeof Locations]?: {
[login: string]: FoodChoices [login: string]: FoodChoices
}, }
} }
/** Velikost konkrétní pizzy */ /** Velikost konkrétní pizzy */
@ -88,7 +88,7 @@ export type DayData = {
} }
/** Veškerá data pro zobrazení na klientovi. */ /** Veškerá data pro zobrazení na klientovi. */
export type ClientData extends DayData = { export type ClientData = DayData & {
todayWeekIndex?: number, // index dnešního dne v týdnu (0-6) todayWeekIndex?: number, // index dnešního dne v týdnu (0-6)
} }