diff --git a/api/routers/backuprestore.py b/api/routers/backuprestore.py index ee19a11..ab6e374 100644 --- a/api/routers/backuprestore.py +++ b/api/routers/backuprestore.py @@ -9,6 +9,12 @@ from repos.tickets import Ticket, TicketRepo from repos.baskets import Basket, BasketRepo from repos.template import Repo +def chunk_list(in_lst: list, chunk_size: int): + chunks = [] + for i in range(0, len(in_lst), chunk_size): + chunks.append(in_lst[i:i + chunk_size]) + return chunks + @dataclass class BackupFile: prefixes: List[Prefix] = field(default_factory=list) @@ -21,8 +27,10 @@ class BackupFileRepo: return new_file def post_file(self, uploaded_file: BackupFile) -> str: PrefixRepo().add_list(uploaded_file.prefixes) - TicketRepo().post_list(uploaded_file.tickets) - BasketRepo().post_list(uploaded_file.baskets) + for ticket_chunk in chunk_list(uploaded_file.tickets, 300): + TicketRepo().post_list(ticket_chunk) + for basket_chunk in chunk_list(uploaded_file.baskets, 300): + BasketRepo().post_list(basket_chunk) return "File posted successfully." backup_router = APIRouter(prefix="/api/backuprestore") diff --git a/deployment/client/client-launch.sh b/deployment/client/client-launch.sh index 2ece3e8..34a1b0d 100755 --- a/deployment/client/client-launch.sh +++ b/deployment/client/client-launch.sh @@ -9,9 +9,9 @@ if [ $rmserver = "y" -o $rmserver = "Y" ]; then read -p "Enter the protocol, server host/ip, and port like "https://ip_or_host:8443" w/o quotes: " serveraddr read -p "Paste in (Ctrl + Shift + V on most terminal emulators) or enter the api key you generated for your server: " serverapi if [ -x "$(command -v docker)" ]; then -docker run -d --name=tam3-webclient --restart=always -v ~/.config/TAM3/data:/data:rw,z -e TAM3_REMOTE=$serveraddr -e TAM3_REMOTE_KEY=$serverapi -e NODE_TLS_REJECT_UNAUTHORIZED=0 -e PUBLIC_TAM3_VENUE="$venuename" -p 127.0.0.1:8300:3000 docker.io/dbob16/tam3-webclient:0.1.1 +docker run -d --name=tam3-webclient --restart=always -v ~/.config/TAM3/data:/data:rw,z -e TAM3_REMOTE=$serveraddr -e TAM3_REMOTE_KEY=$serverapi -e PUBLIC_TAM3_VENUE="$venuename" -p 127.0.0.1:8300:3000 docker.io/dbob16/tam3-webclient:0.1.1 elif [ -x "$(command -v podman)" ]; then -podman run -d --name=tam3-webclient --restart=always -v ~/.config/TAM3/data:/data:rw,z -e TAM3_REMOTE=$serveraddr -e TAM3_REMOTE_KEY=$serverapi -e NODE_TLS_REJECT_UNAUTHORIZED=0 -e PUBLIC_TAM3_VENUE="$venuename" -p 127.0.0.1:8300:3000 docker.io/dbob16/tam3-webclient:0.1.1 +podman run -d --name=tam3-webclient --restart=always -v ~/.config/TAM3/data:/data:rw,z -e TAM3_REMOTE=$serveraddr -e TAM3_REMOTE_KEY=$serverapi -e PUBLIC_TAM3_VENUE="$venuename" -p 127.0.0.1:8300:3000 docker.io/dbob16/tam3-webclient:0.1.1 runin_podman="true" else echo "Neither Docker nor Podman are installed. Please install whichever you prefer and try again." @@ -19,9 +19,9 @@ exit 1 fi else if [ -x "$(command -v docker)" ]; then -docker run -d --name=tam3-webclient --restart=always -v ~/.config/TAM3/data:/data:rw,z -e PUBLIC_TAM3_VENUE="$venuename" -p 127.0.0.1:8300:3000 docker.io/dbob16/tam3-webclient:0.1.1 +docker run -d --name=tam3-webclient --restart=always -v ~/.config/TAM3/data:/data:rw,z -e PUBLIC_TAM3_VENUE="$venuename" -p 127.0.0.1:8300:3000 docker.io/dbob16/tam3-webclient:0.2.0 elif [ -x "$(command -v podman )" ]; then -podman run -d --name=tam3-webclient --restart=always -v ~/.config/TAM3/data:/data:rw,z -e PUBLIC_TAM3_VENUE="$venuename" -p 127.0.0.1:8300:3000 docker.io/dbob16/tam3-webclient:0.1.1 +podman run -d --name=tam3-webclient --restart=always -v ~/.config/TAM3/data:/data:rw,z -e PUBLIC_TAM3_VENUE="$venuename" -p 127.0.0.1:8300:3000 docker.io/dbob16/tam3-webclient:0.2.0 runin_podman="true" else echo "Neither Docker nor Podman are installed. Please install whichever you prefer and try again." diff --git a/deployment/remote_server/compose.yml b/deployment/remote_server/compose.yml index 853788d..a27b39a 100644 --- a/deployment/remote_server/compose.yml +++ b/deployment/remote_server/compose.yml @@ -1,6 +1,6 @@ services: tam3-db: - image: docker.io/dbob16/tam3-db:0.1.1 + image: docker.io/dbob16/tam3-db:0.2.0 restart: always environment: MARIADB_RANDOM_ROOT_PASSWORD: 1 @@ -16,7 +16,7 @@ services: timeout: 5s retries: 3 tam3-api: - image: docker.io/dbob16/tam3-api:0.1.1 + image: docker.io/dbob16/tam3-api:0.2.0 restart: always environment: TAM3_DATA_PATH: /data diff --git a/deployment/remote_server_secure/compose.yml b/deployment/remote_server_secure/compose.yml index 83e4361..4fb85f7 100644 --- a/deployment/remote_server_secure/compose.yml +++ b/deployment/remote_server_secure/compose.yml @@ -1,6 +1,6 @@ services: tam3-db: - image: docker.io/dbob16/tam3-db:0.1.1 + image: docker.io/dbob16/tam3-db:0.2.0 restart: always environment: MARIADB_RANDOM_ROOT_PASSWORD: 1 @@ -16,7 +16,7 @@ services: timeout: 5s retries: 3 tam3-api: - image: docker.io/dbob16/tam3-api:0.1.1 + image: docker.io/dbob16/tam3-api:0.2.0 restart: always environment: TAM3_DATA_PATH: /data diff --git a/webapp/src/routes/api/reports/bybasket/[prefix]/+server.js b/webapp/src/routes/api/reports/bybasket/[prefix]/+server.js index d545faf..7e2d06e 100644 --- a/webapp/src/routes/api/reports/bybasket/[prefix]/+server.js +++ b/webapp/src/routes/api/reports/bybasket/[prefix]/+server.js @@ -1,4 +1,4 @@ -import { env } from "process"; +import { env } from "$env/dynamic/private"; import { db } from "$lib/server/db"; import { report } from "$lib/server/db/schema"; import { eq } from "drizzle-orm"; diff --git a/webapp/src/routes/api/reports/byname/[prefix]/+server.js b/webapp/src/routes/api/reports/byname/[prefix]/+server.js index 5157995..3d56987 100644 --- a/webapp/src/routes/api/reports/byname/[prefix]/+server.js +++ b/webapp/src/routes/api/reports/byname/[prefix]/+server.js @@ -1,4 +1,4 @@ -import { env } from "process"; +import { env } from "$env/dynamic/private"; import { db } from "$lib/server/db"; import { report } from "$lib/server/db/schema"; import { eq } from "drizzle-orm";