From 0727d5f71a2c4ac18c81cbef216a1769835e896e Mon Sep 17 00:00:00 2001 From: Nikola Petrov Date: Fri, 1 Nov 2024 15:33:15 +0100 Subject: [PATCH] Remove cash --- build.ts | 2 +- controllers/cashTransactionController.ts | 97 ------------------- frontend/cash/cash.tsx | 116 ----------------------- models/cashTransactionModel.ts | 69 -------------- routes/api/apiRouter.ts | 2 - routes/api/cashTransactionRouter.ts | 12 --- routes/main.ts | 4 - views/cash.hbs | 68 ------------- 8 files changed, 1 insertion(+), 369 deletions(-) delete mode 100644 controllers/cashTransactionController.ts delete mode 100644 frontend/cash/cash.tsx delete mode 100644 models/cashTransactionModel.ts delete mode 100644 routes/api/cashTransactionRouter.ts delete mode 100644 views/cash.hbs diff --git a/build.ts b/build.ts index 46dd0d8..a9f189f 100644 --- a/build.ts +++ b/build.ts @@ -7,7 +7,7 @@ async function build() { } const sa = await Bun.build({ - entrypoints: ["./frontend/cash/cash", "./frontend/list/list"], + entrypoints: ["./frontend/list/list"], outdir: "./public/assets/build/", minify, }) diff --git a/controllers/cashTransactionController.ts b/controllers/cashTransactionController.ts deleted file mode 100644 index 0fd9e00..0000000 --- a/controllers/cashTransactionController.ts +++ /dev/null @@ -1,97 +0,0 @@ -import { type Request, type Response } from "express"; - -import cashTransactionModel from '../models/cashTransactionModel'; - -const types = ['ZAVRNITEV POS NAKUP', 'POS NAKUP', 'BA DVIG', 'priliv', 'SDD', 'SPLET/TEL NAKUP', 'PREDAVTORIZACIJE']; - -// TODO hendel this PREDAVTORIZACIJA - -export default { - - list: async function (req: Request, res: Response) { - try { - var transactions; - const date = req.body.date; - - if (date) { - const splitDate = date.split('-'); - var year = splitDate[0]; - var month = splitDate[1]; - year = parseInt(year); - month = parseInt(month); - transactions = await cashTransactionModel.findWithPar(year, month); - } else { - transactions = await cashTransactionModel.find(); - } - - const data = { transactions: transactions, types: types }; - - return res.json(data); - } catch (err) { - return res.status(500).json({ - message: 'Error when getting transactions.', - error: err - }); - }; - }, - - create: async function (req: Request, res: Response) { - const rawString = req.body.messageBody; - - if (rawString == "") return res.status(400).json({ message: "empty string" }); - - const transaction = { - rawMessage: rawString, - day: 0, - month: 0, - year: 0, - amount: 0, - type: -1, - company: "", - }; - - const datePattern = /(0[1-9]|[12][0-9]|3[01])\.(0[1-9]|1[0-2])\.(19|20)\d{2}/; - const amountPattern = /\d{1,3}(?:[.]\d{3})*(?:[.,]\d{2})(?=\sEUR)/; - const companyPattern1 = /(?<=(UR,|\sod)\s).*?(?=\s(na\s|za\s|Inf))/; - - for (var i = 0; i < types.length; i++) { - if (rawString.includes(types[i])) { - transaction.type = i; - break; - } - } - - if (transaction.type != -1) { - const amountMatch = rawString.match(amountPattern); - if (amountMatch) { - const amount = amountMatch[0].replace('.', '').replace(',', '.'); - transaction.amount = parseFloat(amount); - } - - const companyMatch1 = rawString.match(companyPattern1); - if (companyMatch1) transaction.company = companyMatch1[0]; - - const dateMatch = rawString.match(datePattern); - if (dateMatch) { - const date = dateMatch[0].split('.'); - transaction.day = date[0]; - transaction.month = date[1]; - transaction.year = date[2]; - } - } - const trans = await cashTransactionModel.save(transaction.rawMessage, transaction.day, transaction.month, transaction.year, transaction.amount, transaction.type, transaction.company); - if (trans) { - return res.status(201).json(trans); - } - else { - return res.status(400).json({ message: "something went wrong" }); - } - }, - - delete: async function (req: Request, res: Response) { - cashTransactionModel.findOneAndDelete(-1) - .then(data => { - res.status(201).json({ message: "OK" }); - }); - }, -}; \ No newline at end of file diff --git a/frontend/cash/cash.tsx b/frontend/cash/cash.tsx deleted file mode 100644 index adb7721..0000000 --- a/frontend/cash/cash.tsx +++ /dev/null @@ -1,116 +0,0 @@ -import Chart from 'chart.js/auto' -import * as elements from "frontend/elementcreate"; - -interface Transaction { - day: number; - month: number; - year: number; - amount: number; - type: number; - company: string; -} - -var types: Array = []; - -async function submitMedia(event: SubmitEvent) { - event.preventDefault(); - const pass = document.getElementById("pass") as HTMLInputElement | null; - const date = document.getElementById("date") as HTMLInputElement | null; - if (!pass || !date) return; - - if (pass.value == "") return; - - try { - const result = await fetch('/api/cash/list', { - method: 'POST', - headers: { - 'Content-Type': 'application/json', - }, - body: JSON.stringify({ pass: pass.value, date: date.value }), - }) - - const data: { types: string[]; transactions: Array; } = await result.json(); - types = data.types; - - renderData(data.transactions); - renderChart(data.transactions); - } catch (e) { - console.log(e); - } - - pass.value = ""; -}; - -document.addEventListener('DOMContentLoaded', async () => { - document.getElementById("myform")?.addEventListener("submit", submitMedia); -}); - -function renderChart(transactions: Array) { - - const cash = []; - - for (let index = 0; index < 7; index++) { - cash.push(0); - } - - for (let index = 0; index < transactions.length; index++) { - const element = transactions[index]; - - const type = element.type; - const amount = element.amount; - if (type == -1) continue; - cash[type] += amount; - } - - var data = { - labels: types, - datasets: [{ - label: '', - data: cash - }] - }; - - var ctx = document.getElementById('acquisitions') as HTMLCanvasElement | null; - if (ctx == null) return; - new Chart( - ctx, - { - type: 'pie', - data: data, - } - ); -}; - -function getTypeName(type: number) { - if (type == -1) return "UNKNOWN"; - return types[type]; -} - -function renderData(transactions: Array) { - var tbody = document.getElementById("tbody"); - if (tbody == null) return; - tbody.innerHTML = ""; - - transactions - .sort((a, b) => a.day - b.day) - .sort((a, b) => a.month - b.month) - .sort((a, b) => a.year - b.year); - - for (let index = 0; index < transactions.length; index++) { - const element = transactions[index]; - - var row = - - {index} - {element.day} - {element.month} - {element.year} - {element.amount} - {getTypeName(element.type)} - {element.company} - - - tbody.appendChild(row); - - } -}; \ No newline at end of file diff --git a/models/cashTransactionModel.ts b/models/cashTransactionModel.ts deleted file mode 100644 index d349202..0000000 --- a/models/cashTransactionModel.ts +++ /dev/null @@ -1,69 +0,0 @@ -import { type ResultSetHeader, type RowDataPacket, type QueryOptions } from "mysql2" -import pool from 'miscellaneous/db' - -interface CashTransaction extends RowDataPacket { - id?: number; - rawMessage?: string; - day?: number; - month?: number; - year?: number; - amount?: number; - type?: number; - company?: string; -} - -async function save(rawMessage: string, day: number, month: number, year: number, amount: number, type: number, company: string): Promise { - try { - const options: QueryOptions = { - sql: "INSERT INTO bankCardTransaction (raw, day, month, year, amount, type, company) VALUES (?,?,?,?,?,?,?)", - values: [rawMessage, day, month, year, amount, type, company] - }; - const [result, fields] = await pool.query(options); - return result.affectedRows; - } - catch (err) { - console.log(err); - } - return 0; -} - -async function find(): Promise { - try { - const [rows, fields] = await pool.query("SELECT * FROM bankCardTransaction;"); - return rows; - } - catch (err) { - console.log(err); - } - return []; -} - -async function findWithPar(month: number, year: number): Promise { - try { - const [rows, fields] = await pool.query("SELECT * FROM bankCardTransaction;"); - return rows; - } - catch (err) { - console.log(err); - } - return []; -} - -async function findOneAndDelete(type: number): Promise { - try { - const [result, fields] = await pool.query("DELETE FROM bankCardTransaction WHERE type = ?;", [type]); - return result.affectedRows; - } - catch (err) { - console.log(err); - } - return 0; -} - - -export default { - find, - findWithPar, - save, - findOneAndDelete -}; diff --git a/routes/api/apiRouter.ts b/routes/api/apiRouter.ts index c26e137..0882e12 100644 --- a/routes/api/apiRouter.ts +++ b/routes/api/apiRouter.ts @@ -1,12 +1,10 @@ import express, { type Request, type Response } from "express"; import checkAuthenticated from 'miscellaneous/checkAuthenticated'; import mediaRouter from 'routes/api/mediaRouter'; -import cashTransactionRouter from 'routes/api/cashTransactionRouter'; const router = express.Router(); router.use('/media', mediaRouter); -router.use('/cash', checkAuthenticated, cashTransactionRouter); router.get('/', function (req: Request, res: Response) { res.status(200).json({ message: 'API is working' }); diff --git a/routes/api/cashTransactionRouter.ts b/routes/api/cashTransactionRouter.ts deleted file mode 100644 index 26546b8..0000000 --- a/routes/api/cashTransactionRouter.ts +++ /dev/null @@ -1,12 +0,0 @@ -import express from "express"; -import cashTransaction from '../../controllers/cashTransactionController'; - -const router = express.Router(); - -router.post('/list', cashTransaction.list); - -router.post('/', cashTransaction.create); - -router.delete('/', cashTransaction.delete); - -export default router; \ No newline at end of file diff --git a/routes/main.ts b/routes/main.ts index c403d8b..2f8d87b 100644 --- a/routes/main.ts +++ b/routes/main.ts @@ -24,10 +24,6 @@ router.get('/list', function (req: Request, res: Response) { res.render('list'); }); -router.get('/cash', function (req: Request, res: Response) { - res.render('cash'); -}); - //import userRouter from './user'; //router.use('/user', userRouter); diff --git a/views/cash.hbs b/views/cash.hbs deleted file mode 100644 index ef3158c..0000000 --- a/views/cash.hbs +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - - - - Cash - - - - - - - -
- -
- -
-
- - - - - - - - - - - - - - -
#DayMonthYearAmountTypeCompany
-
-
-
- -
-
- - - - \ No newline at end of file