diff --git a/api/app/data/__pycache__/drawing.cpython-314.pyc b/api/app/data/__pycache__/drawing.cpython-314.pyc new file mode 100644 index 0000000..5d8137f Binary files /dev/null and b/api/app/data/__pycache__/drawing.cpython-314.pyc differ diff --git a/api/app/data/drawing.py b/api/app/data/drawing.py new file mode 100644 index 0000000..e9b1cca --- /dev/null +++ b/api/app/data/drawing.py @@ -0,0 +1,66 @@ +from dataclasses import dataclass +from db import RepoTemplate +from .baskets import Basket +from system.auth import AuthRepo +from fastapi import APIRouter, Header + +@dataclass +class DrawingLine: + prefix: str + b_id: int + description: str = "" + winning_ticket: int = 0 + last_name: str = "" + first_name: str = "" + phone_number: str = "" + +class DrawingRepo(RepoTemplate): + def get_all_drawing_lines(self): + self.cur.execute("SELECT * FROM drawing ORDER BY prefix, b_id") + results = self.cur.fetchall() + return [DrawingLine(*r) for r in results] + def get_prefix_drawing_lines(self, prefix: str): + self.cur.execute("SELECT * FROM drawing WHERE prefix = ? ORDER BY prefix, b_id", (prefix,)) + results = self.cur.fetchall() + return [DrawingLine(*r) for r in results] + def get_single_drawing_line(self, prefix: str, b_id: int): + self.cur.execute("SELECT * FROM drawing WHERE prefix = ? AND b_id = ? ORDER BY prefix, b_id", (prefix, b_id)) + results = self.cur.fetchall() + return [DrawingLine(*r) for r in results] + def get_range_drawing_lines(self, prefix: str, id_from: int, id_to: int): + self.cur.execute("SELECT * FROM drawing WHERE prefix = ? AND b_id BETWEEN ? AND ? ORDER BY prefix, b_id", (prefix, id_from, id_to)) + results = self.cur.fetchall() + return [DrawingLine(*r) for r in results] + def post_drawing_lines(self, ds: list[Basket]): + for d in ds: + self.cur.execute("""INSERT INTO baskets (prefix, b_id, winning_ticket) VALUES (?, ?, ?) ON CONFLICT (prefix, b_id) DO UPDATE SET + winning_ticket = EXCLUDED.winning_ticket""", (d.prefix, d.b_id, d.winning_ticket)) + self.conn.commit() + return ds + +drawing_router = APIRouter(prefix="/api/drawing") + +@drawing_router.get("") +def get_all_drawing_lines(tam_key: str = Header("")): + AuthRepo().verify_key(tam_key) + return DrawingRepo().get_all_drawing_lines() + +@drawing_router.get("/{prefix}") +def get_prefix_drawing_lines(prefix: str, tam_key: str = Header("")): + AuthRepo().verify_key(tam_key) + return DrawingRepo().get_prefix_drawing_lines(prefix) + +@drawing_router.get("/{prefix}/{b_id}") +def get_single_drawing_line(prefix: str, b_id: int, tam_key: str = Header("")): + AuthRepo().verify_key(tam_key) + return DrawingRepo().get_single_drawing_line(prefix, b_id) + +@drawing_router.get("/{prefix}/{id_from}/{id_to}") +def get_range_drawing_lines(prefix: str, id_from: int, id_to: int, tam_key: str = Header("")): + AuthRepo().verify_key(tam_key) + return DrawingRepo().get_range_drawing_lines(prefix, id_from, id_to) + +@drawing_router.post("") +def post_drawing_lines(ds: list[Basket], tam_key: str = Header("")): + AuthRepo().verify_key(tam_key) + return DrawingRepo().post_drawing_lines(ds) diff --git a/api/app/db.py b/api/app/db.py index b1fed1c..cf31e1e 100644 --- a/api/app/db.py +++ b/api/app/db.py @@ -21,6 +21,10 @@ def init_db(): phone_number TEXT, pref TEXT, PRIMARY KEY (prefix, t_id))""") cur.execute("""CREATE TABLE IF NOT EXISTS baskets (prefix TEXT, b_id INTEGER, description TEXT, donors TEXT, winning_ticket INTEGER, PRIMARY KEY (prefix, b_id))""") + cur.execute("""CREATE VIEW IF NOT EXISTS drawing AS + SELECT b.prefix, b.b_id, b.description, b.winning_ticket, t.last_name, t.first_name, t.phone_number + FROM baskets b LEFT JOIN tickets t ON b.prefix = t.prefix AND b.winning_ticket = t.t_id + ORDER BY b.prefix, b.b_id""") conn.commit() conn.close() diff --git a/api/app/routers.py b/api/app/routers.py index e7a2ba5..320a1a6 100644 --- a/api/app/routers.py +++ b/api/app/routers.py @@ -3,9 +3,11 @@ from system.auth import auth_router from system.prefixes import prefix_router from data.tickets import tickets_router from data.baskets import basket_router +from data.drawing import drawing_router def imp_routers(app: FastAPI): app.include_router(auth_router) app.include_router(prefix_router) app.include_router(tickets_router) app.include_router(basket_router) + app.include_router(drawing_router) diff --git a/client/src/lib/server/db/schema.js b/client/src/lib/server/db/schema.js index 33185a7..819b900 100644 --- a/client/src/lib/server/db/schema.js +++ b/client/src/lib/server/db/schema.js @@ -1,4 +1,5 @@ -import { integer, sqliteTable, text, primaryKey } from 'drizzle-orm/sqlite-core'; +import { sql } from 'drizzle-orm'; +import { integer, sqliteTable, text, primaryKey, sqliteView } from 'drizzle-orm/sqlite-core'; export const prefixes = sqliteTable('prefixes', { prefix: text('prefix').primaryKey(), @@ -30,3 +31,15 @@ export const baskets = sqliteTable( }, (b) => [primaryKey({ columns: [b.prefix, b.b_id] })] ); + +export const drawing = sqliteView('drawing', { + prefix: text('prefix'), + b_id: integer('b_id'), + description: text('description'), + winning_ticket: integer('winning_ticket'), + last_name: text('last_name'), + first_name: text('first_name'), + phone_number: text('phone_number') +}).as(sql`SELECT b.prefix, b.b_id, b.description, b.winning_ticket, t.last_name, t.first_name, t.phone_number + FROM baskets b LEFT JOIN tickets t ON b.prefix = t.prefix AND b.winning_ticket = t.t_id + ORDER BY b.prefix, b.b_id`) diff --git a/client/src/routes/+page.svelte b/client/src/routes/+page.svelte index fee5410..d26dccd 100644 --- a/client/src/routes/+page.svelte +++ b/client/src/routes/+page.svelte @@ -64,13 +64,14 @@ {#if curPrefix}

Forms:

-
+
Tickets Baskets + Drawing Form
{:else} diff --git a/client/src/routes/api/drawing/+server.js b/client/src/routes/api/drawing/+server.js new file mode 100644 index 0000000..eed5cab --- /dev/null +++ b/client/src/routes/api/drawing/+server.js @@ -0,0 +1,39 @@ +import { db } from "$lib/server/db"; +import { baskets, drawing } from "$lib/server/db/schema"; +import { getPath, getSettings } from "$lib/server/settings" +import { error, json } from "@sveltejs/kit"; +import { sql } from "drizzle-orm"; + +export const GET = async () => { + const s = getSettings(); + if (s.remote_server) { + const connStr = getPath(s); + try { + const res = await fetch(`${connStr}/api/drawing`, {headers: {'TAM-KEY': s.remote_key}}); + if (!res.ok) throw error(res.status); + const data = await res.json(); + return json(data); + } catch { + return json([]); + } + } else { + const data = await db.select().from(drawing).orderBy(drawing.prefix, drawing.b_id); + return json(data); + } +} + +export const POST = async ({ request }) => { + const reqData = await request.json(); + const s = getSettings(); + if (s.remote_server) { + const connStr = getPath(s); + const res = await fetch(`${connStr}/api/drawing`, { + method: 'POST', + headers: {'TAM-KEY': s.remote_key, 'Content-Type': 'application/json'}, + body: JSON.stringify(reqData) + }); + if (!res.ok) throw error(res.status); + } + await db.insert(baskets).values(reqData).onConflictDoUpdate({target: [baskets.prefix, baskets.b_id], set: {winning_ticket: sql`EXCLUDED.winning_ticket`}}); + return json(reqData); +} diff --git a/client/src/routes/api/drawing/[prefix]/+server.js b/client/src/routes/api/drawing/[prefix]/+server.js new file mode 100644 index 0000000..9801a27 --- /dev/null +++ b/client/src/routes/api/drawing/[prefix]/+server.js @@ -0,0 +1,24 @@ +import { db } from '$lib/server/db/index.js'; +import { drawing } from '$lib/server/db/schema.js'; +import { getPath, getSettings } from '$lib/server/settings'; +import { error, json } from '@sveltejs/kit'; +import { eq } from 'drizzle-orm'; + +export const GET = async ({ params }) => { + const { prefix } = params; + const s = getSettings(); + if (s.remote_server) { + const connStr = getPath(s); + try { + const res = await fetch(`${connStr}/api/drawing/${prefix}`, {headers: {'TAM-KEY': s.remote_key}}); + if (!res.ok) throw error(res.status); + const data = await res.json(); + return json(data); + } catch { + return json([]); + } + } else { + const data = await db.select().from(drawing).where(eq(drawing.prefix, prefix)).orderBy(drawing.prefix, drawing.b_id); + return json(data); + } +} diff --git a/client/src/routes/api/drawing/[prefix]/[b_id]/+server.js b/client/src/routes/api/drawing/[prefix]/[b_id]/+server.js new file mode 100644 index 0000000..3497a61 --- /dev/null +++ b/client/src/routes/api/drawing/[prefix]/[b_id]/+server.js @@ -0,0 +1,44 @@ +import { db } from '$lib/server/db/index.js'; +import { drawing } from '$lib/server/db/schema.js'; +import { getPath, getSettings } from '$lib/server/settings'; +import { error, json } from '@sveltejs/kit'; +import { and, eq } from 'drizzle-orm'; + +const placeholder_data = (prefix, b_id) => { + return { + prefix, + b_id, + description: "", + winning_ticket: 0, + last_name: "", + first_name: "", + phone_number: "" + } +} + +export const GET = async ({ params }) => { + const [prefix, b_id] = [params.prefix, parseInt(params.b_id)]; + const s = getSettings(); + if (s.remote_server) { + const connStr = getPath(s); + try { + const res = await fetch(`${connStr}/api/drawing/${prefix}/${b_id}`, {headers: {'TAM-KEY': s.remote_key}}); + if (!res.ok) throw error(res.status); + const [data] = await res.json(); + if (data) { + return json(data); + } else { + return json(placeholder_data(prefix, b_id)); + }; + } catch { + return json(placeholder_data(prefix, b_id)); + } + } else { + const [data] = await db.select().from(drawing).where(and(eq(drawing.prefix, prefix), eq(drawing.b_id, b_id))).orderBy(drawing.prefix, drawing.b_id); + if (data) { + return json(data); + } else { + return json(placeholder_data(prefix, b_id)); + } + } +} diff --git a/client/src/routes/api/drawing/[prefix]/[id_from]/[id_to]/+server.js b/client/src/routes/api/drawing/[prefix]/[id_from]/[id_to]/+server.js new file mode 100644 index 0000000..b03d65e --- /dev/null +++ b/client/src/routes/api/drawing/[prefix]/[id_from]/[id_to]/+server.js @@ -0,0 +1,41 @@ +import { db } from '$lib/server/db/index.js'; +import { drawing } from '$lib/server/db/schema.js'; +import { getPath, getSettings } from '$lib/server/settings'; +import { error, json } from '@sveltejs/kit'; +import { and, between, eq } from 'drizzle-orm'; + +const placeholder_data = (prefix, b_id) => { + return { + prefix, + b_id, + description: "", + winning_ticket: 0, + last_name: "", + first_name: "", + phone_number: "" + }; +}; + +export const GET = async ({ params }) => { + const [prefix, id_from, id_to] = [params.prefix, parseInt(params.id_from), parseInt(params.id_to)]; + const s = getSettings(); + const rtnData = {}; + for (let i = id_from; i <= id_to; i++) { + rtnData[i] = {...placeholder_data(prefix, i)}; + }; + if (s.remote_server) { + const connStr = getPath(s); + try { + const res = await fetch(`${connStr}/api/drawing/${prefix}/${id_from}/${id_to}`, {headers: {'TAM-KEY': s.remote_key}}); + if (!res.ok) throw error(res.status); + const data = Array.from(await res.json()); + data.forEach((b) => rtnData[b.b_id] = b); + } catch { + return json([]); + } + } else { + const data = await db.select().from(drawing).where(and(eq(drawing.prefix, prefix), between(drawing.b_id, id_from, id_to))).orderBy(drawing.prefix, drawing.b_id); + data.forEach((b) => rtnData[b.b_id] = b); + }; + return json(Object.values(rtnData)); +} diff --git a/client/src/routes/baskets/[prefix]/+page.svelte b/client/src/routes/baskets/[prefix]/+page.svelte index 37c947e..1949739 100644 --- a/client/src/routes/baskets/[prefix]/+page.svelte +++ b/client/src/routes/baskets/[prefix]/+page.svelte @@ -95,7 +95,7 @@ dupDown: () => { if (items[nextIdx]) { const buffer = { ...items[curIdx] }; - ['prefix', 't_id'].forEach((key) => delete buffer[key]); + ['prefix', 'b_id'].forEach((key) => delete buffer[key]); items[nextIdx] = { ...items[nextIdx], ...buffer, changed: true }; functions.nextLine(); } else { @@ -105,7 +105,7 @@ dupUp: () => { if (curIdx > 0) { const buffer = { ...items[curIdx] }; - ['prefix', 't_id'].forEach((key) => delete buffer[key]); + ['prefix', 'b_id'].forEach((key) => delete buffer[key]); items[prevIdx] = { ...items[prevIdx], ...buffer, changed: true }; functions.prevLine(); } else { @@ -116,13 +116,13 @@ if (items[curIdx]) { const buffer = { ...items[curIdx] }; ['prefix', 't_id'].forEach((key) => delete buffer[key]); - window.localStorage.setItem('tam-ticket', JSON.stringify(buffer)); + window.localStorage.setItem('tam-basket', JSON.stringify(buffer)); } focusIdx(curIdx); }, paste: () => { if (items[curIdx]) { - const buffer = JSON.parse(window.localStorage.getItem('tam-ticket')); + const buffer = JSON.parse(window.localStorage.getItem('tam-basket')); items[curIdx] = { ...items[curIdx], ...buffer, changed: true }; } focusIdx(curIdx); diff --git a/client/src/routes/drawing/[prefix]/+page.server.js b/client/src/routes/drawing/[prefix]/+page.server.js new file mode 100644 index 0000000..93d9016 --- /dev/null +++ b/client/src/routes/drawing/[prefix]/+page.server.js @@ -0,0 +1,7 @@ +export const load = async ({ params, fetch }) => { + const { prefix } = params; + const res = await fetch('/api/prefixes'); + const prefixes = await res.json(); + const prefixObj = Array.from(prefixes).find((p) => p.prefix == prefix); + return { prefix: prefixObj, prefixes }; +}; diff --git a/client/src/routes/drawing/[prefix]/+page.svelte b/client/src/routes/drawing/[prefix]/+page.svelte new file mode 100644 index 0000000..1c138d6 --- /dev/null +++ b/client/src/routes/drawing/[prefix]/+page.svelte @@ -0,0 +1,224 @@ + + + + {pageTitle} + + + + + + + + + {#each headers as header (header)} + + {/each} + + + + {#each items as item, idx (item.b_id)} + { + changeIdx(idx); + e.target.scrollIntoView({ block: 'center' }); + }} + > + + + + + + + {/each} + +
+ +
Baskets:
+ {#each prefixes as p (p.prefix)} + {p.prefix} + {/each} + +

{pageTitle}

+ +
{header}
{item.b_id}{item.description} { + item.changed = true; + const res = await fetch(`/api/tickets/${prefix.prefix}/${item.winning_ticket}`); + if (res.ok) { + const data = await res.json(); + [item.last_name, item.first_name, item.phone_number] = [(data.last_name || ""), (data.first_name || ""), (data.phone_number || "")]; + } + }} + bind:value={item.winning_ticket} + /> + {item.last_name || ""}, {item.first_name || ""}: {item.phone_number || ""} +