From b44d21d476c46e4d144a1019b3dd91b07a778d39 Mon Sep 17 00:00:00 2001 From: Reallag Date: Thu, 12 Oct 2023 19:09:32 +0200 Subject: [PATCH] =?UTF-8?q?feat:=20podpora=20notifikac=C3=AD=20z=20notify?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/src/App.tsx | 11 +++-- client/src/api/FoodApi.ts | 3 ++ server/.env.template | 3 ++ server/src/notifikace.ts | 77 +++++++++++++++++++++++++++------ server/src/routes/foodRoutes.ts | 16 +++++-- server/src/utils.ts | 23 +++++++++- types/Types.ts | 8 +++- 7 files changed, 119 insertions(+), 22 deletions(-) diff --git a/client/src/App.tsx b/client/src/App.tsx index 51dd614..3111851 100644 --- a/client/src/App.tsx +++ b/client/src/App.tsx @@ -19,7 +19,7 @@ import Footer from './components/Footer'; import { faChainBroken, faChevronLeft, faChevronRight, faGear, faSatelliteDish, faSearch } from '@fortawesome/free-solid-svg-icons'; import Loader from './components/Loader'; import { getData, errorHandler, getQrUrl } from './api/Api'; -import { addChoice, removeChoices, removeChoice, changeDepartureTime } from './api/FoodApi'; +import {addChoice, removeChoices, removeChoice, changeDepartureTime, jdemeObed} from './api/FoodApi'; const EVENT_CONNECT = "connect" @@ -167,7 +167,11 @@ function App() { } } } - + const doJdemeObed=async ()=>{ + if(auth?.login){ + await jdemeObed() + } + } const doAddFoodChoice = async (event: React.ChangeEvent) => { if (event.target.value && foodChoiceList?.length && choiceRef.current?.value) { const restaurantKey = choiceRef.current.value; @@ -475,10 +479,11 @@ function App() { Zjišťujeme dostupné pizzy : - + } } diff --git a/client/src/api/FoodApi.ts b/client/src/api/FoodApi.ts index a35bf0a..326c976 100644 --- a/client/src/api/FoodApi.ts +++ b/client/src/api/FoodApi.ts @@ -17,3 +17,6 @@ export const removeChoice = async (locationIndex: number, foodIndex: number, day export const changeDepartureTime = async (time: string, dayIndex?: number) => { return await api.post(`${FOOD_API_PREFIX}/changeDepartureTime`, JSON.stringify({ time, dayIndex })); } +export const jdemeObed = async () => { + return await api.post(`${FOOD_API_PREFIX}/jdemeObed`, JSON.stringify({})); +} diff --git a/server/.env.template b/server/.env.template index 0525728..e0e7e77 100644 --- a/server/.env.template +++ b/server/.env.template @@ -24,3 +24,6 @@ # To je užitečné pro odesílání upozornění na různé servery Gotify s různými klíči API. # Struktura dat je ve formátu JSON a je uložena jako řetězec. # GOTIFY_SERVERS_AND_KEYS='[{"server":"https://notification.server.eu", "api_keys":["key1", "key2"]},{"server":"https://notification.server2.eu", "api_keys":["key3", "key4"]}]' +#NTFY_HOST = "http://192.168.0.113:80" +#NTFY_USERNAME="username" +#NTFY_PASSWD="password" diff --git a/server/src/notifikace.ts b/server/src/notifikace.ts index 0771f24..4cf7b14 100644 --- a/server/src/notifikace.ts +++ b/server/src/notifikace.ts @@ -1,15 +1,19 @@ /** Notifikace pro gotify*/ -import { GotifyServer, NotififaceInput, NotifikaceData } from '../../types'; -import axios, { AxiosError } from 'axios'; +import {ClientData, GotifyServer, NotififaceInput, NotifikaceData} from '../../types'; +import axios, {AxiosError} from 'axios'; import dotenv from 'dotenv'; import path from 'path'; +import {log} from "util"; +import {getToday} from "./service"; +import {formatDate, getUsersByLocation} from "./utils"; +import getStorage from "./storage"; +const storage = getStorage(); const ENVIRONMENT = process.env.NODE_ENV || 'production' -dotenv.config({ path: path.resolve(__dirname, `../.env.${ENVIRONMENT}`) }); +dotenv.config({path: path.resolve(__dirname, `../.env.${ENVIRONMENT}`)}); const gotifyDataRaw = process.env.GOTIFY_SERVERS_AND_KEYS || "{}"; const gotifyData: GotifyServer[] = JSON.parse(gotifyDataRaw); - export const gotifyCall = async (data: NotififaceInput, gotifyServers?: GotifyServer[]): Promise => { if (!Array.isArray(gotifyServers)) { return [] @@ -23,10 +27,10 @@ export const gotifyCall = async (data: NotififaceInput, gotifyServers?: GotifySe priority: 7, }; - const headers = { "Content-Type": "application/json" }; + const headers = {"Content-Type": "application/json"}; const promises = urls.map(url => - axios.post(url, dataPayload, { headers }).then(response => { + axios.post(url, dataPayload, {headers}).then(response => { response.data = { success: true, message: "Notifikace doručena", @@ -51,15 +55,56 @@ export const gotifyCall = async (data: NotififaceInput, gotifyServers?: GotifySe return promises; }; -/** Zavolá notifikace na všechny konfigurované způsoby notifikace, přetížení proměných na false pro jednotlivé způsoby je vypne*/ -export const callNotifikace = async ({ input, teams = true, gotify = true }: NotifikaceData) => { - const notifications = []; - - if (gotify) { - const gotifyPromises = await gotifyCall(input, gotifyData); - notifications.push(...gotifyPromises); +export const ntfyCall = async (data: NotififaceInput) => { + const url = process.env.NTFY_HOST + const username = process.env.NTFY_USERNAME; + const password = process.env.NTFY_PASSWD; + if (!url) { + console.log("NTFY_HOST není definován v env") + return } + if (!username) { + console.log("NTFY_USERNAME není definován v env") + return + } + if (!password) { + console.log("NTFY_PASSWD není definován v env") + return + } + const today = formatDate(getToday()); + let clientData: ClientData = await storage.getData(today); + const userByCLocation = getUsersByLocation(clientData.choices, data.user) + const token = Buffer.from(`${username}:${password}`, 'utf8').toString('base64'); + const promises = userByCLocation.map(async user => { + try { + const response = await axios({ + url: `${url}/${user}`, + method: 'POST', + data: `${data.udalost} - spustil:${data.user}`, + headers: { + 'Authorization': `Basic ${token}`, + 'Tag': 'meat_on_bone' + } + }); + console.log(response.data); + } catch (error) { + console.error(error); + } + }) + + return promises; + +} +/** Zavolá notifikace na všechny konfigurované způsoby notifikace, přetížení proměných na false pro jednotlivé způsoby je vypne*/ +export const callNotifikace = async ({input, teams = true, gotify = false, ntfy = true}: NotifikaceData) => { + const notifications = []; + if (ntfy) { + const ntfyPromises = await ntfyCall(input); + if (ntfyPromises) { + notifications.push(...ntfyPromises); + } + } /* Zatím není if (teams) { notifications.push(teamsCall(input)); @@ -67,6 +112,12 @@ export const callNotifikace = async ({ input, teams = true, gotify = true }: Not // Add more notifications as necessary + //gotify bych řekl, že už je deprecated + if (gotify) { + const gotifyPromises = await gotifyCall(input, gotifyData); + notifications.push(...gotifyPromises); + } + try { const results = await Promise.all(notifications); return results; diff --git a/server/src/routes/foodRoutes.ts b/server/src/routes/foodRoutes.ts index 2767773..aae5728 100644 --- a/server/src/routes/foodRoutes.ts +++ b/server/src/routes/foodRoutes.ts @@ -1,8 +1,10 @@ import express from "express"; -import { getLogin, getTrusted } from "../auth"; -import { getDateForWeekIndex, addChoice, removeChoices, removeChoice, updateDepartureTime, getToday } from "../service"; -import { getDayOfWeekIndex, parseToken } from "../utils"; -import { getWebsocket } from "../websocket"; +import {getLogin, getTrusted} from "../auth"; +import {addChoice, getDateForWeekIndex, getToday, removeChoice, removeChoices, updateDepartureTime} from "../service"; +import {getDayOfWeekIndex, parseToken} from "../utils"; +import {getWebsocket} from "../websocket"; +import {callNotifikace} from "../notifikace"; +import {UdalostEnum} from "../../../types"; /** * Ověří a vrátí index dne v týdnu z požadavku, za předpokladu, že byl předán, a je zároveň @@ -109,5 +111,11 @@ router.post("/changeDepartureTime", async (req, res, next) => { res.status(200).json(data); } catch (e: any) { next(e) } }); +router.post("/jdemeObed", async (req, res, next) => { + const login = getLogin(parseToken(req)); + try { + await callNotifikace({input: {user:login,udalost:UdalostEnum.JDEME_OBED},gotify:false}) + } catch (e: any) { next(e) } +}); export default router; \ No newline at end of file diff --git a/server/src/utils.ts b/server/src/utils.ts index 1dbd885..9475529 100644 --- a/server/src/utils.ts +++ b/server/src/utils.ts @@ -1,3 +1,5 @@ +import {Choices, groupedUsers} from "../../types"; + /** Vrátí datum v ISO formátu. */ export function formatDate(date: Date) { let currentDay = String(date.getDate()).padStart(2, '0'); @@ -83,4 +85,23 @@ export const checkBodyParams = (req: any, paramNames: string[]) => { // TODO umístit do samostatného souboru -export class InsufficientPermissions extends Error { } \ No newline at end of file +export class InsufficientPermissions extends Error { } + +export const getUsersByLocation=(data: Choices, login: string): string[]=> { + const result: string[] = []; + + for (const location in data) { + if (data.hasOwnProperty(location)) { + if (data[location][login]) { + for (const username in data[location]) { + if (data[location].hasOwnProperty(username)) { + result.push(username); + } + } + break; // Exit the loop early since the login was found + } + } + } + + return result; +} \ No newline at end of file diff --git a/types/Types.ts b/types/Types.ts index ccc2c44..38b2e97 100644 --- a/types/Types.ts +++ b/types/Types.ts @@ -109,7 +109,8 @@ export enum Locations { export enum UdalostEnum { ZAHAJENA_PIZZA = "Zahájen pizza day", - OBJEDNANA_PIZZA = "Objednána pizza" + OBJEDNANA_PIZZA = "Objednána pizza", + JDEME_OBED="Jdeme oběd", } export interface NotififaceInput { @@ -121,6 +122,7 @@ export interface NotifikaceData { input: NotififaceInput, gotify?: boolean, teams?: boolean, + ntfy?:boolean } export interface GotifyServer { @@ -154,4 +156,8 @@ export enum FeatureRequest { SAFETY = "Zvýšená ochrana proti chybám uživatele (potvrzovací dialogy, překliky, ...)", UI = "Celkové vylepšení UI/UX", DEVELOPMENT = "Zlepšení dokumentace/postupů pro ostatní vývojáře" +} +export type groupedUsers = { + location: string; + users: string[]; } \ No newline at end of file