Compare commits

...

6 commits

Author SHA1 Message Date
d5d2f2e889 Add forgejo actions
All checks were successful
Build dev / build (push) Successful in 1m41s
2023-11-09 02:28:33 +01:00
f26206de87 Reconfigure Vuetify to be installed as Vuetify doc states
As of today, the vutetify doc states how to install it in the nuxt.
So following the guide I did it.
Now the website layout does not "jump" with offsets on load.
2023-11-09 00:45:37 +01:00
aa645e710e Add nix shell 2023-11-08 06:03:30 +01:00
eebf25198d Replace mysql2 with prisma
also I updated packages,
and properly typed api input
a lot of time was spent, I don't remeber what really I did x3
but everything was related to replacing mysql2 with prisma
2023-11-08 05:36:12 +01:00
be1e3909b6 Delete unrelated testing stuff 2023-11-07 17:36:30 +01:00
1d893c4a78 Update dependencies, fix (auto)import problems 2023-11-07 17:36:30 +01:00
51 changed files with 6166 additions and 4138 deletions

View file

@ -0,0 +1,32 @@
name: Build dev
on:
push:
jobs:
build:
runs-on: docker
steps:
# Setup
- uses: https://code.forgejo.org/actions/setup-node@v3
with:
node-version: 18
- uses: https://code.forgejo.org/actions/checkout@v3
- name: Install dependencies
run: npm install -D
# Compile
- name: Build project
if: success()
run: npx nuxi build
# Upload
- name: Package to zip
if: success()
run: tar --create --file build-${{ github.run_number }}.tar .output
- name: Upload build
if: success()
uses: https://code.forgejo.org/actions/upload-artifact@v3
with:
name: Build-${{ github.run_number }}
path: build-${{ github.run_number }}.tar

View file

@ -14,10 +14,6 @@ Project uses Oracle MySQL as a database store. It uses environment variables for
| Environment variable | Description | | Environment variable | Description |
|----------------------|-------------------| |----------------------|-------------------|
| `DB_HOST` | Database host | | `DB_URL` | Database url, see [this](https://www.prisma.io/docs/concepts/database-connectors/mysql#connection-url) |
| `DB_PORT` | Database port |
| `DB_USER` | Database user |
| `DB_PASSWORD` | Database password |
| `DB_SCHEMA` | Database schema |
After setting variables, you can run the project using `npx nuxi dev` or `npx nuxi preview`. After setting variables, you can run the project using `npx nuxi dev` or `npx nuxi preview`.

View file

@ -1,8 +1,10 @@
<script setup lang="ts"> <script setup lang="ts">
import { order as orderType } from '~/utils/types/database'; import type { useFetch } from '#imports';
type Order = Awaited<ReturnType<typeof useFetch<void, any, "/api/orders/:id", "get">>>["data"]["value"];
const props = defineProps<{ const props = defineProps<{
order?: orderType order?: Order | undefined
}>(); }>();
</script> </script>
@ -24,7 +26,7 @@ const props = defineProps<{
</thead> </thead>
<tbody> <tbody>
<tr v-for="i in props.order.work" :key="i.id"> <tr v-for="i in props.order.work" :key="i.id">
<td>{{ i.is_fulfilled }}</td> <td>{{ i.fulfilled }}</td>
<td> <td>
{{ i.offer.name }} {{ i.offer.name }}
</td> </td>

View file

@ -1,10 +1,19 @@
import { defineNuxtConfig } from "nuxt/config"; import { defineNuxtConfig } from "nuxt/config";
import vuetify, { transformAssetUrls } from 'vite-plugin-vuetify';
// https://nuxt.com/docs/api/configuration/nuxt-config // https://nuxt.com/docs/api/configuration/nuxt-config
export default defineNuxtConfig({ export default defineNuxtConfig({
pages: true, pages: true,
build: { build: {
transpile: ["vuetify"], transpile: ["vuetify"],
}, },
modules: [
(_options, nuxt) => {
nuxt.hooks.hook('vite:extendConfig', (config) => {
config.plugins?.push(vuetify({ autoImport: true }));
});
},
],
css: [ css: [
"vuetify/lib/styles/main.sass", "vuetify/lib/styles/main.sass",
"@mdi/font/css/materialdesignicons.min.css", "@mdi/font/css/materialdesignicons.min.css",
@ -18,7 +27,11 @@ export default defineNuxtConfig({
}, },
}, },
vite: { vite: {
// devBundler: "legacy" vue: {
template: {
transformAssetUrls,
},
},
}, },
imports: { imports: {
autoImport: false, autoImport: false,

8249
package-lock.json generated

File diff suppressed because it is too large Load diff

View file

@ -13,15 +13,17 @@
"devDependencies": { "devDependencies": {
"@mdi/font": "^7.2.96", "@mdi/font": "^7.2.96",
"@nuxtjs/eslint-config-typescript": "^12.0.0", "@nuxtjs/eslint-config-typescript": "^12.0.0",
"@typescript-eslint/eslint-plugin": "^5.59.0", "@typescript-eslint/eslint-plugin": "^6.9.1",
"@typescript-eslint/parser": "^5.59.0", "@typescript-eslint/parser": "^6.9.1",
"eslint": "^8.39.0", "eslint": "^8.39.0",
"nuxt": "3.4.0", "nuxt": "3.8.1",
"prisma": "5.5.2",
"sass": "^1.62.0", "sass": "^1.62.0",
"vite-plugin-vuetify": "^1.0.2", "vite-plugin-vuetify": "^1.0.2",
"vuetify": "^3.1.15" "vuetify": "^3.1.15"
}, },
"dependencies": { "dependencies": {
"@prisma/client": "5.5.2",
"mysql2": "^3.2.3" "mysql2": "^3.2.3"
} }
} }

View file

@ -1,29 +1,33 @@
<script setup lang="ts"> <script setup lang="ts">
/* global $fetch */ /* global $fetch */
import { useRoute, useFetch, createError } from "nuxt/app"; import { useRoute, useFetch, createError } from "nuxt/app";
import { ref, Ref } from "vue"; import { ref, type Ref } from "vue";
import { VBtn, VForm } from "vuetify/components"; import { VBtn, VForm } from "vuetify/components";
import PagedList from "~/components/pagedList.vue"; import PagedList from "~/components/pagedList.vue";
import Snowflake from "~/utils/snowflake"; import Snowflake from "~/utils/snowflake";
import { client as clientType, order, orderSummary } from "~/utils/types/database";
import OrderView from "~/components/orderView.vue"; import OrderView from "~/components/orderView.vue";
import EntryEditor, { fieldDefinition } from "~/components/entryEditor.vue"; import EntryEditor, { type fieldDefinition } from "~/components/entryEditor.vue";
const route = useRoute(); const route = useRoute();
const id = route.params.id; const id = route.params.id;
const clientRequest = await useFetch(`/api/clients/${id}`); const clientRequest = await useFetch(`/api/clients/${id}` as "/api/clients/:id");
if (clientRequest.error.value) throw createError(clientRequest.error.value?.data ?? ""); if (clientRequest.error.value) throw createError(clientRequest.error.value?.data ?? "");
const client = clientRequest.data as Ref<clientType>; type Client = NonNullable<typeof clientRequest.data.value>;
const client = clientRequest.data as Ref<Client>;
const clientOrdersRequest = await useFetch(`/api/clients/${id}/orders`); const clientOrdersRequest = await useFetch(`/api/clients/${id}/orders` as "/api/clients/:id/orders");
if (clientOrdersRequest.error.value) throw createError(clientOrdersRequest.error.value?.data ?? ""); if (clientOrdersRequest.error.value) throw createError(clientOrdersRequest.error.value?.data ?? "");
const clientOrders = clientOrdersRequest.data as Ref<Array<orderSummary>>; type OrderSummary = NonNullable<typeof clientOrdersRequest.data.value>;
const clientOrders = clientOrdersRequest.data as Ref<OrderSummary>;
type Order = Awaited<ReturnType<typeof useFetch<void, any, "/api/orders/:id", "get">>>["data"]["value"];
// cache
const orders = ref<Map<string, { const orders = ref<Map<string, {
loading: boolean, loading: boolean,
value?: order value?: Order
}>>(new Map()); }>>(new Map());
for (const i of clientOrders.value) for (const i of clientOrders.value)
@ -36,7 +40,7 @@ async function loadOrder(id: string) {
// @ts-expect-error // @ts-expect-error
entry.value = await $fetch(`/api/orders/${id}` as "/api/order/:id", { entry.value = await $fetch(`/api/orders/${id}` as "/api/order/:id", {
method: "GET", method: "GET",
}); }) as Order;
entry.loading = false; entry.loading = false;
} }
@ -184,24 +188,24 @@ function getCreationDate() {
> >
<template #title="i"> <template #title="i">
<VRow> <VRow>
<VCol>{{ new Date(Number(new Snowflake(BigInt(((i.record) as orderSummary).id)).timestamp)).toLocaleDateString() }}</VCol> <VCol>{{ new Date(Number(new Snowflake(BigInt((i.record.id))).timestamp)).toLocaleDateString() }}</VCol>
<VCol>{{ ((i.record) as orderSummary).value }} PLN</VCol> <VCol>{{ i.record.value }} PLN</VCol>
<VCol> <VCol>
{{ ((i.record) as orderSummary).imported_products_count }} {{ i.record.imported_products_count }}
products, products,
{{ ((i.record) as orderSummary).work_count }} {{ i.record.work_count }}
works works
</VCol> </VCol>
</VRow> </VRow>
</template> </template>
<template #text="i"> <template #text="i">
<VProgressLinear <VProgressLinear
:height="orders.get((i.record as orderSummary).id)?.loading ?? true ? undefined : 0" :height="orders.get(i.record.id)?.loading ?? true ? undefined : 0"
absolute absolute
:progress="orders.get((i.record as orderSummary).id)?.loading ?? true" :progress="orders.get(i.record.id)?.loading ?? true"
:indeterminate="orders.get((i.record as orderSummary).id)?.loading ?? true" :indeterminate="orders.get(i.record.id)?.loading ?? true"
/> />
<OrderView :order="(orders.get((i.record as orderSummary).id)?.value as order | undefined)" /> <OrderView :order="orders.get(i.record.id)?.value" />
</template> </template>
</PagedList> </PagedList>
</VCol> </VCol>

View file

@ -1,14 +1,14 @@
<script setup lang="ts"> <script setup lang="ts">
/* global $fetch */ /* global $fetch */
import { useFetch, createError, navigateTo, NuxtError, useRoute } from "nuxt/app"; import { type NuxtError } from "nuxt/app";
import { ref, Ref, reactive } from "vue"; import { ref, type Ref, reactive } from "vue";
import { VBtn } from "vuetify/components"; import { VBtn } from "vuetify/components";
import { definePageMeta } from "~/.nuxt/imports";
import { client as clientType } from "~/utils/types/database";
import pagedTable from "~/components/pagedTable.vue"; import pagedTable from "~/components/pagedTable.vue";
import Alerts, { AlertData } from "~/components/alerts.vue"; import Alerts, { type AlertData } from "~/components/alerts.vue";
import { fieldDefinition } from "~/components/entryEditor.vue"; import { type fieldDefinition } from "~/components/entryEditor.vue";
import { useFetch, createError, navigateTo, useRoute, definePageMeta } from "#imports";
definePageMeta({ middleware: ["auth"] }); definePageMeta({ middleware: ["auth"] });
const route = useRoute(); const route = useRoute();
@ -32,7 +32,7 @@ async function rowClicked(client: string, edit = false) {
async function rowDelete(client: string) { async function rowDelete(client: string) {
try { try {
await $fetch<clientType>(`/api/clients/${client}`, { await $fetch(`/api/clients/${client}` as "api/clients/:id", {
method: "DELETE", method: "DELETE",
}); });
clients.value = clients.value.filter(e => e.id !== client); clients.value = clients.value.filter(e => e.id !== client);

View file

@ -1,11 +1,11 @@
<script setup lang="ts"> <script setup lang="ts">
/* global $fetch */ /* global $fetch */
import { ref } from 'vue'; import { ref } from 'vue';
import { NuxtError, navigateTo, useFetch } from 'nuxt/app'; import { type NuxtError } from 'nuxt/app';
import { definePageMeta } from '~/.nuxt/imports'; import { navigateTo, useFetch, definePageMeta } from '#imports';
import EntryEditor, { fieldDefinition } from '~/components/entryEditor.vue'; import EntryEditor, { type fieldDefinition } from '~/components/entryEditor.vue';
import Alerts, { AlertData } from '~/components/alerts.vue'; import Alerts, { type AlertData } from '~/components/alerts.vue';
const editorFields: Array<fieldDefinition> = [ const editorFields: Array<fieldDefinition> = [
{ key: "username", type: "text", label: "Username", optional: false }, { key: "username", type: "text", label: "Username", optional: false },

View file

@ -1,5 +1,5 @@
<script setup lang="ts"> <script setup lang="ts">
import { navigateTo } from 'nuxt/app'; import { navigateTo } from '#imports';
navigateTo("/clients"); navigateTo("/clients");
</script> </script>

View file

@ -2,9 +2,8 @@
/* global $fetch */ /* global $fetch */
import { ref, watch } from "vue"; import { ref, watch } from "vue";
import { VForm } from "vuetify/components"; import { VForm } from "vuetify/components";
import { navigateTo, useCookie, useFetch, useRoute } from "nuxt/app";
import { cookieSettings } from "~/utils/cookieSettings"; import { cookieSettings } from "~/utils/cookieSettings";
import { definePageMeta } from "~/.nuxt/imports"; import { definePageMeta, navigateTo, useCookie, useFetch, useRoute } from "#imports";
const route = useRoute(); const route = useRoute();

View file

@ -6,8 +6,6 @@ import { defineNuxtPlugin } from '#app';
export default defineNuxtPlugin((nuxtApp) => { export default defineNuxtPlugin((nuxtApp) => {
const vuetify = createVuetify({ const vuetify = createVuetify({
ssr: true, ssr: true,
components,
directives,
theme: { theme: {
}, },
}); });

116
schema.prisma Normal file
View file

@ -0,0 +1,116 @@
datasource db {
provider = "mysql"
url = env("DB_URL")
}
generator client {
provider = "prisma-client-js"
}
model User {
id BigInt @id @unique @default(dbgenerated("(((unix_timestamp() * 1000) * pow(2,22)) + floor((rand() * pow(2,12))))")) @db.UnsignedBigInt
username String @unique @db.VarChar(30)
email String @unique @db.VarChar(128)
password Bytes @db.Binary(64)
display_name String? @db.VarChar(30)
managedOrders Order[]
sessions Session[]
@@map("users")
}
model Session {
id BigInt @id @default(dbgenerated("(((unix_timestamp() * 1000) * pow(2,22)) + floor((rand() * pow(2,12))))")) @db.UnsignedBigInt
userId BigInt @map("user") @db.UnsignedBigInt
expiry_date DateTime? @default(dbgenerated("(now() + interval 30 day)")) @db.Timestamp(0)
user User @relation(fields: [userId], references: [id])
@@index([userId], map: "user_idx")
@@map("sessions")
}
model Client {
id BigInt @id @default(dbgenerated("(((unix_timestamp() * 1000) * pow(2,22)) + floor((rand() * pow(2,12))))")) @db.UnsignedBigInt
name String? @db.VarChar(128)
address String? @db.VarChar(128)
phone String? @db.VarChar(16)
email String? @db.VarChar(128)
orders Order[]
@@map("clients")
}
model Order {
id BigInt @id @default(dbgenerated("(((unix_timestamp() * 1000) * pow(2,22)) + floor((rand() * pow(2,12))))")) @db.UnsignedBigInt
clientId BigInt @db.UnsignedBigInt @map("client")
userId BigInt @db.UnsignedBigInt @map("user")
draft Boolean @default(true) @map("is_draft") @db.TinyInt
imported_products ImportedProduct[]
client Client @relation(fields: [clientId], references: [id])
user User @relation(fields: [userId], references: [id])
work Work[]
@@index([clientId])
@@index([userId])
@@map("orders")
}
model ImportedProduct {
id BigInt @id @default(dbgenerated("(((unix_timestamp() * 1000) * pow(2,22)) + floor((rand() * pow(2,12))))")) @db.UnsignedBigInt
orderId BigInt @db.UnsignedBigInt @map("order")
name String? @db.VarChar(128)
link String @db.VarChar(1024)
price_imported Decimal @default(0.00) @db.Decimal(10, 2)
price Decimal @default(0.00) @db.Decimal(10, 2)
order Order @relation(fields: [orderId], references: [id])
@@index([orderId])
@@map("imported_products")
}
model Offer {
id BigInt @id @default(dbgenerated("(((unix_timestamp() * 1000) * pow(2,22)) + floor((rand() * pow(2,12))))")) @db.UnsignedBigInt
name String @db.VarChar(45)
description String? @db.Text
recommended_price Decimal? @db.Decimal(10, 2)
work Work[]
@@map("offer")
}
model OrderTemplate {
id BigInt @id @default(dbgenerated("(((unix_timestamp() * 1000) * pow(2,22)) + floor((rand() * pow(2,12))))")) @db.UnsignedBigInt
name String @db.VarChar(45)
description String? @db.Text
work_templates WorkTemplate[]
@@map("order_templates")
}
model Work {
id BigInt @id @default(dbgenerated("(((unix_timestamp() * 1000) * pow(2,22)) + floor((rand() * pow(2,12))))")) @db.UnsignedBigInt
orderId BigInt @map("order") @db.UnsignedBigInt
offerId BigInt @map("offer") @db.UnsignedBigInt
price Decimal @db.Decimal(10, 2)
notes String? @db.Text
fulfilled Boolean @default(false) @map("is_fulfilled") @db.TinyInt
order Order @relation(fields: [orderId], references: [id])
offer Offer @relation(fields: [offerId], references: [id])
@@index([offerId], map: "offer_idx")
@@index([orderId], map: "order_idx")
@@map("work")
}
model WorkTemplate {
id BigInt @id @default(dbgenerated("(((unix_timestamp() * 1000) * pow(2,22)) + floor((rand() * pow(2,12))))")) @db.UnsignedBigInt
orderTemplateId BigInt @map("order_template") @db.UnsignedBigInt
offerId BigInt @map("offer") @db.UnsignedBigInt
price Decimal @default(0.00) @db.Decimal(10, 2)
notes String? @db.Text
orderTemplate OrderTemplate @relation(fields: [orderTemplateId], references: [id])
@@index([offerId])
@@index([orderTemplateId])
@@map("work_templates")
}

Binary file not shown.

View file

@ -1,167 +0,0 @@
-- Server version 8.0.32
--
-- Table structure for table `users`
--
CREATE TABLE `users` (
`id` bigint unsigned NOT NULL DEFAULT (((unix_timestamp() * 1000 * pow(2,22)) + floor((rand() * pow(2,12))))),
`username` varchar(30) NOT NULL,
`email` varchar(128) NOT NULL,
`password` binary(64) NOT NULL,
`display_name` varchar(30) DEFAULT NULL,
PRIMARY KEY (`id`),
UNIQUE KEY `idusers_UNIQUE` (`id`),
UNIQUE KEY `username_UNIQUE` (`username`),
UNIQUE KEY `email_UNIQUE` (`email`)
);
--
-- Table structure for table `clients`
--
CREATE TABLE `clients` (
`id` bigint unsigned NOT NULL DEFAULT (((unix_timestamp() * 1000 * pow(2,22)) + floor((rand() * pow(2,12))))),
`name` varchar(128) DEFAULT NULL,
`address` varchar(128) DEFAULT NULL,
`phone` varchar(16) DEFAULT NULL,
`email` varchar(128) DEFAULT NULL,
PRIMARY KEY (`id`)
);
--
-- Table structure for table `orders`
--
CREATE TABLE `orders` (
`id` bigint unsigned NOT NULL DEFAULT (((unix_timestamp() * 1000 * pow(2,22)) + floor((rand() * pow(2,12))))),
`client` bigint unsigned NOT NULL,
`user` bigint unsigned NOT NULL,
`is_draft` tinyint NOT NULL DEFAULT '1',
PRIMARY KEY (`id`),
KEY `user_idx` (`user`),
KEY `client_idx` (`client`),
CONSTRAINT `client` FOREIGN KEY (`client`) REFERENCES `clients` (`id`),
CONSTRAINT `user` FOREIGN KEY (`user`) REFERENCES `users` (`id`)
);
--
-- Table structure for table `imported_products`
--
CREATE TABLE `imported_products` (
`id` bigint unsigned NOT NULL DEFAULT (((unix_timestamp() * 1000 * pow(2,22)) + floor((rand() * pow(2,12))))),
`order` bigint unsigned NOT NULL,
`name` varchar(128) DEFAULT NULL,
`link` varchar(1024) NOT NULL,
`price_imported` decimal(10,2) NOT NULL DEFAULT '0.00',
`price` decimal(10,2) NOT NULL DEFAULT '0.00',
PRIMARY KEY (`id`),
KEY `order_idx` (`order`),
CONSTRAINT `order2` FOREIGN KEY (`order`) REFERENCES `orders` (`id`)
);
--
-- Table structure for table `offer`
--
CREATE TABLE `offer` (
`id` bigint unsigned NOT NULL DEFAULT (((unix_timestamp() * 1000 * pow(2,22)) + floor((rand() * pow(2,12))))),
`name` varchar(45) NOT NULL,
`description` text,
`recommended_price` decimal(10,2) DEFAULT NULL,
PRIMARY KEY (`id`)
);
--
-- Table structure for table `order_templates`
--
CREATE TABLE `order_templates` (
`id` bigint unsigned NOT NULL DEFAULT (((unix_timestamp() * 1000 * pow(2,22)) + floor((rand() * pow(2,12))))),
`name` varchar(45) NOT NULL,
`description` text,
PRIMARY KEY (`id`)
);
--
-- Table structure for table `sessions`
--
CREATE TABLE `sessions` (
`id` bigint unsigned NOT NULL DEFAULT (((unix_timestamp() * 1000 * pow(2,22)) + floor((rand() * pow(2,12))))),
`user` bigint unsigned NOT NULL,
`expiry_date` timestamp NULL DEFAULT ((now() + interval 30 day)),
PRIMARY KEY (`id`),
KEY `user_idx` (`user`),
CONSTRAINT `user_session` FOREIGN KEY (`user`) REFERENCES `users` (`id`)
);
--
-- Table structure for table `work`
--
CREATE TABLE `work` (
`id` bigint unsigned NOT NULL DEFAULT (((unix_timestamp() * 1000 * pow(2,22)) + floor((rand() * pow(2,12))))),
`order` bigint unsigned NOT NULL,
`offer` bigint unsigned NOT NULL,
`price` decimal(10,2) NOT NULL,
`notes` text,
`is_fulfilled` tinyint NOT NULL DEFAULT '0',
PRIMARY KEY (`id`),
KEY `order_idx` (`order`),
KEY `offer_idx` (`offer`),
CONSTRAINT `offer` FOREIGN KEY (`offer`) REFERENCES `offer` (`id`),
CONSTRAINT `order` FOREIGN KEY (`order`) REFERENCES `orders` (`id`)
);
--
-- Table structure for table `work_templates`
--
CREATE TABLE `work_templates` (
`id` bigint unsigned NOT NULL DEFAULT (((unix_timestamp() * 1000 * pow(2,22)) + floor((rand() * pow(2,12))))),
`order_template` bigint unsigned NOT NULL,
`offer` bigint unsigned NOT NULL,
`price` decimal(10,2) NOT NULL DEFAULT '0.00',
`notes` text,
PRIMARY KEY (`id`),
KEY `order_template_idx` (`order_template`),
KEY `offer_idx` (`offer`),
CONSTRAINT `offer2` FOREIGN KEY (`offer`) REFERENCES `offer` (`id`),
CONSTRAINT `order_template` FOREIGN KEY (`order_template`) REFERENCES `order_templates` (`id`)
);
--
-- Final view structure for view `orderSummaries`
--
CREATE VIEW `orderSummaries` AS
SELECT
`id`,
`client`,
`user`,
`is_draft`,
(COALESCE(`imported_products`.`price`, 0) + COALESCE(`work`.`price`, 0)) AS `value`,
COALESCE(`imported_products`.`count`, 0) as `imported_products_count`,
COALESCE(`work`.`count`, 0) as `work_count`
FROM
`orders`
LEFT JOIN
(
SELECT
`order`,
SUM(`price`) as `price`,
COUNT(*) AS `count`
FROM `imported_products`
GROUP BY `order`
) as `imported_products` ON `orders`.`id` = `imported_products`.`order`
LEFT JOIN
(
SELECT
`order`,
SUM(`price`) AS `price`,
COUNT(*) AS `count`
FROM `work`
GROUP BY `work`.`order`
) AS `work` ON `work`.`order` = `orders`.`id`;

View file

@ -1,10 +1,10 @@
/* global defineEventHandler getQuery, createError */ import { defineEventHandler } from "h3";
import BaaPagination from "~/server/utils/baaPagination"; import getPaginatedParameters from "../utils/baaPageParsing";
import { client } from "~/utils/types/database"; import { database } from "../utils/database";
import { prismaToWeb } from "~/server/utils/prismaToWeb";
export const baaWrapper = new BaaPagination<client, "id">("clients", "id");
export default defineEventHandler((e) => { export default defineEventHandler((e) => {
return baaWrapper.RESTget(e); const pageParameters = getPaginatedParameters(e, 50, 200);
return database.client.findPaginated(pageParameters, {}).then(prismaToWeb);
}); });

View file

@ -1,7 +1,12 @@
/* global defineEventHandler, createError, readBody */ import { defineEventHandler, readBody, setResponseStatus } from "h3";
import { type Client } from "@prisma/client";
import { baaWrapper } from "./clients.get"; import getRequestingUser from "../utils/getRequestingUser";
import { client } from "~/utils/types/database"; import { database } from "../utils/database";
import { prismaToWeb } from "~/server/utils/prismaToWeb";
import Snowflake from "~/utils/snowflake";
import { createError } from "#imports";
const clientKeys: Array<string> = [ const clientKeys: Array<string> = [
"name", "name",
@ -10,10 +15,10 @@ const clientKeys: Array<string> = [
"email", "email",
]; ];
export function checkIsClient( export function checkIsClient<Patch extends boolean = boolean>(
value: any, value: any,
required = false, patch: Patch,
): value is Partial<Omit<client, "id">> { ): value is Patch extends true ? Partial<Omit<Client, "id">> : Omit<Client, "id"> {
const errors = new Map<string, string>(); const errors = new Map<string, string>();
if (typeof value !== "object") { if (typeof value !== "object") {
@ -23,12 +28,12 @@ export function checkIsClient(
}); });
} }
if (!(typeof value.name === "string" || value.name === null || (!required && value.name === undefined))) errors.set("name", "is not string or null"); if (!(typeof value.name === "string" || value.name === null || (!patch && value.name === undefined))) errors.set("name", "is not string or null");
if (!(typeof value.address === "string" || value.address === null || (!required && value.address === undefined))) errors.set("address", "is not string or null"); if (!(typeof value.address === "string" || value.address === null || (!patch && value.address === undefined))) errors.set("address", "is not string or null");
if (!(typeof value.phone === "string" || value.phone === null || (!required && value.phone === undefined))) errors.set("phone", "is not string or null"); if (!(typeof value.phone === "string" || value.phone === null || (!patch && value.phone === undefined))) errors.set("phone", "is not string or null");
if (!(typeof value.email === "string" || value.email === null || (!required && value.email === undefined))) errors.set("email", "is not string or null"); if (!(typeof value.email === "string" || value.email === null || (!patch && value.email === undefined))) errors.set("email", "is not string or null");
for (const i in value as Partial<Omit<client, "id">>) for (const i in value as Partial<Omit<Client, "id">>)
if (!clientKeys.includes(i)) errors.set(i, `excessive property`); if (!clientKeys.includes(i)) errors.set(i, `excessive property`);
if (errors.size !== 0) { if (errors.size !== 0) {
@ -48,6 +53,20 @@ export function checkIsClient(
return true; return true;
} }
export default defineEventHandler((e) => { export default defineEventHandler(async (e) => {
return baaWrapper.RESTpost(e, clientKeys as Array<keyof Omit<client, "id">>, (o): o is Omit<client, "id"> => checkIsClient(o, true)); const body = await readBody(e);
const id = new Snowflake().state;
const user = await getRequestingUser(e);
if (!checkIsClient(body, false)) throw createError({ message: "Invalid body", statusCode: 400 });
const rvalue = await database.client.create({
data: {
...body,
id,
},
});
setResponseStatus(e, 201);
return prismaToWeb(rvalue);
}); });

View file

@ -1,7 +1,22 @@
/* global defineEventHandler */ import { defineEventHandler } from "h3";
import { baaWrapper } from "../clients.get"; import { database } from "~/server/utils/database";
export default defineEventHandler((e) => { import { createError } from "#imports";
return baaWrapper.RESTdeleteRecord(e);
export default defineEventHandler(async (e) => {
const id = e.context.params?.id as string;
try {
await database.client.delete({
where: {
id: BigInt(id),
},
});
} catch (e) {
// FIXME: should be 500 on errors other than "RecordNotFound"
throw createError({ statusCode: 404 });
}
return null;
}); });

View file

@ -1,7 +1,18 @@
/* global defineEventHandler */ import { defineEventHandler } from "h3";
import { baaWrapper } from "../clients.get"; import { database } from "~/server/utils/database";
import { prismaToWeb } from "~/server/utils/prismaToWeb";
export default defineEventHandler((e) => { import { createError } from "#imports";
return baaWrapper.RESTgetRecord(e);
export default defineEventHandler(async (e) => {
const key = e.context.params?.id as string;
const rvalue = await database.client.findUnique({
where: {
id: BigInt(key),
},
});
if (!rvalue) throw createError({ statusCode: 404 });
return prismaToWeb(rvalue);
}); });

View file

@ -1,8 +1,23 @@
/* global defineEventHandler */ import { defineEventHandler, readBody } from "h3";
import { checkIsClient } from "../clients.post"; import { checkIsClient } from "../clients.post";
import { baaWrapper } from "../clients.get"; import { database } from "~/server/utils/database";
import { prismaToWeb } from "~/server/utils/prismaToWeb";
export default defineEventHandler((e) => { import { createError } from "#imports";
return baaWrapper.RESTpatchRecord(e, checkIsClient);
export default defineEventHandler(async (e) => {
const body = await readBody(e);
const id = e.context.params?.id as string;
if (!checkIsClient(body, true)) throw createError({ message: "Invalid body", statusCode: 400 });
const rvalue = await database.client.update({
where: {
id: BigInt(id),
},
data: body,
});
return prismaToWeb(rvalue);
}); });

View file

@ -1,9 +1,16 @@
/* global defineEventHandler */ import { defineEventHandler } from "h3";
import { baaWrapper } from "~/server/api/orders.get"; import { getOrders } from "~/server/api/orders.get";
import { prismaToWeb } from "~/server/utils/prismaToWeb";
import getPaginatedParameters from "~/server/utils/baaPageParsing";
export default defineEventHandler(async (e) => { export default defineEventHandler((e) => {
const baa = await baaWrapper.RESTget(e, 50, 200, "`client` = ?", [e.context.params?.id]); const pageParameters = getPaginatedParameters(e, 50, 200);
console.log(baa); const clientId = e.context.params?.id as string;
return baa; return getOrders(
pageParameters,
{
clientId: BigInt(clientId),
},
).then(prismaToWeb);
}); });

View file

@ -1,7 +1,9 @@
/* global defineEventHandler */ import { defineEventHandler } from "h3";
import { baaWrapper } from "../clients.get"; import { database } from "~/server/utils/database";
export default defineEventHandler((e) => { export default defineEventHandler(async (e) => {
return baaWrapper.RESTrecordCount(e); return {
count: await database.client.count({}),
};
}); });

View file

@ -1,9 +0,0 @@
/* global defineEventHandler */
import { database } from "~/server/utils/database";
export default defineEventHandler(async (e) => {
if (!e.context.params?.id) return Error("id is not provided");
const rowID = e.context.params.id;
await database.execute("DELETE FROM `sch_baza_smartfony`.`lombardy` WHERE `id` = ?", [rowID]);
});

View file

@ -1,4 +1,4 @@
/* global defineEventHandler */ import { defineEventHandler } from "h3";
export default defineEventHandler((event) => { export default defineEventHandler((event) => {
const message = event.node.req.read(); const message = event.node.req.read();

View file

@ -1,13 +1,14 @@
/* global defineEventHandler */ import { defineEventHandler } from "h3";
import { data, database } from "../utils/database"; import { database } from "../utils/database";
export async function isFirstRun() { export async function isFirstRun() {
const [tables] = await database.query({ sql: "SHOW TABLES", rowsAsArray: true }, []) as data<[string]>; try {
if (tables.length === 0) return true; const numberOfUsers = await database.user.count();
if (!tables.find(a => a[0] === "users")) return true; return numberOfUsers === 0;
const [[users]] = await database.query("SELECT COUNT(*) as `count` FROM `users`") as data<{count: number}>; } catch {
if (users.count === 0) return true; // We could fall here if the database is not initialized
return false; return true;
}
} }
export default defineEventHandler((e) => { export default defineEventHandler((e) => {

View file

@ -1,16 +1,17 @@
/* global defineEventHandler, setResponseStatus, readBody, createError */ import { execSync } from "node:child_process";
import { defineEventHandler, setResponseStatus, readBody } from "h3";
import fs from "node:fs/promises"; import { database } from "../utils/database";
import { database as db } from "../utils/database";
import { isFirstRun } from "./firstRun.get"; import { isFirstRun } from "./firstRun.get";
import { getPasswordHash } from "./login.post"; import { getPasswordHash } from "./login.post";
import Snowflake from "~/utils/snowflake"; import Snowflake from "~/utils/snowflake";
import { createError } from "#imports";
export default defineEventHandler(async (e) => { export default defineEventHandler(async (e) => {
if (!isFirstRun()) { if (!isFirstRun()) {
setResponseStatus(e, 404); setResponseStatus(e, 404);
return ""; return null;
} }
const body = await readBody(e); const body = await readBody(e);
@ -22,12 +23,14 @@ export default defineEventHandler(async (e) => {
const email = body.email; const email = body.email;
if (typeof email !== "string") throw createError({ message: "email is not string", statusCode: 400 }); if (typeof email !== "string") throw createError({ message: "email is not string", statusCode: 400 });
const sql = await fs.readFile("./schemaModel.sql", "utf-8"); execSync("npx prisma db push --force-reset");
database.user.create({
const database = await db.new({ multipleStatements: true }); data: {
await database.query(sql); id: new Snowflake().state,
await database.execute( username,
"INSERT INTO `users` (`id`, `username`, `password`, `email`) VALUES (?, ?, ?, ?)", email,
[new Snowflake().toString(), username, getPasswordHash(password), email]); password: getPasswordHash(password),
return ""; },
});
return null;
}); });

View file

@ -1,4 +1,4 @@
/* global defineEventHandler */ import { defineEventHandler } from "h3";
export default defineEventHandler(() => { export default defineEventHandler(() => {
return "Hi mom!"; return "Hi mom!";

View file

@ -1,11 +1,13 @@
/* global defineEventHandler, getCookie, setCookie, readBody, createError */
import crypto from "crypto"; import crypto from "crypto";
import { defineEventHandler, getCookie, setCookie, readBody } from "h3";
import { database, data } from "../utils/database"; import { database } from "../utils/database";
import { isString } from "../utils/isString"; import { isString } from "../utils/isString";
import { cookieSettings } from "../utils/rootUtils"; import { cookieSettings } from "../utils/rootUtils";
import Snowflake from "~/utils/snowflake"; import Snowflake from "~/utils/snowflake";
import { createError } from "#imports";
export function getPasswordHash(password: string) { export function getPasswordHash(password: string) {
return crypto.createHmac("sha512", "42") return crypto.createHmac("sha512", "42")
.update(password) .update(password)
@ -26,19 +28,26 @@ export default defineEventHandler(async (e) => {
const hashedPassword = getPasswordHash(password); const hashedPassword = getPasswordHash(password);
const [account] = await database.query( const account = await database.user.findUnique({
"SELECT CONVERT(`id`, CHAR(32)) AS `id` from `users` WHERE `username` = ? AND `password` = ? LIMIT 1", where: {
[login, hashedPassword], username: login,
)as unknown as data<{id: string}>; password: hashedPassword,
},
select: {
id: true,
},
});
if (account.length === 0) throw createError({ statusCode: 400, message: "Invalid username or password." }); if (account === null) throw createError({ statusCode: 400, message: "Invalid username or password." });
const sessionId = new Snowflake().toString(); const sessionId = new Snowflake();
await database.query( await database.session.create({
"INSERT INTO `sessions` (`id`, `user`) VALUES ( ? , ? )", data: {
[sessionId, account[0].id], id: sessionId.state,
); userId: account.id,
setCookie(e, "token", sessionId, cookieSettings); },
return { message: "Login successful", token: sessionId }; });
setCookie(e, "token", sessionId.toString(), cookieSettings);
return { message: "Login successful", token: sessionId.toString() };
}); });

View file

@ -1,9 +1,11 @@
/* global defineEventHandler, createError, getCookie, deleteCookie */ import { defineEventHandler, getCookie, deleteCookie } from "h3";
import { isAuthorised } from "../middleware/auth"; import { isAuthorised } from "../middleware/auth";
import { database } from "../utils/database"; import { database } from "../utils/database";
import { cookieSettings } from "../utils/rootUtils"; import { cookieSettings } from "../utils/rootUtils";
import { createError } from "#imports";
export default defineEventHandler(async (e) => { export default defineEventHandler(async (e) => {
const token = getCookie(e, "token"); const token = getCookie(e, "token");
if (token === undefined) { if (token === undefined) {
@ -21,9 +23,10 @@ export default defineEventHandler(async (e) => {
}); });
} }
database.query( database.session.delete({
"DELETE FROM `sessions` WHERE `id` = ?", where: {
[token], id: BigInt(token),
); },
});
return { message: "Logged out" }; return { message: "Logged out" };
}); });

View file

@ -1,37 +1,65 @@
/* global defineEventHandler */ import { defineEventHandler } from "h3";
import { type Order, type Client, Prisma } from "@prisma/client";
import BaaPagination from "../utils/baaPagination"; import getPaginatedParameters, { type pageData } from "../utils/baaPageParsing";
import { data, database } from "../utils/database"; import { database } from "../utils/database";
import { client, orderSummary } from "~/utils/types/database"; import { prismaToWeb } from "~/server/utils/prismaToWeb";
export const baaWrapper = new BaaPagination<orderSummary, "id">( type orderSummary = Omit<Order, "clientId"> & {
"orderSummaries", client: Client;
"id", value: number;
"*, CONVERT(`client`, CHAR) AS `client`, CONVERT(`user`, CHAR) as `user`", imported_products_count: number;
); work_count: number;
};
export default defineEventHandler(async (e) => { export async function getOrders(
const orders = await baaWrapper.RESTget(e, 50, 200); pageParameters: pageData,
where?: Prisma.OrderWhereInput,
) {
const data = await database.order.findPaginated(
pageParameters,
{
select: {
id: true,
client: true,
userId: true,
draft: true,
imported_products: {
select: {
price: true,
},
},
work: {
select: {
price: true,
},
},
},
where,
},
);
const uniqueClients: Array<string> = []; const rvalue = new Array<orderSummary>();
for (const i of orders) {
if (!uniqueClients.includes(i.client)) for (const i of data) {
uniqueClients.push(database.escape(i.client)); const importedProductsPriceSum = i.imported_products.reduce((pv, cv) => pv + cv.price.toNumber(), 0);
const workPriceSum = i.work.reduce((pv, cv) => pv + cv.price.toNumber(), 0);
rvalue.push({
id: i.id,
client: i.client,
draft: i.draft,
imported_products_count: i.imported_products.length,
userId: i.userId,
value: importedProductsPriceSum + workPriceSum,
work_count: i.work.length,
});
} }
const [clients] = await database.query(
["SELECT",
"*,",
"CONVERT(`id`, CHAR) AS `id`",
"FROM `clients`",
"WHERE `id` IN",
`(${uniqueClients.join(', ')})`,
].join(" "),
) as data<client>;
const rvalue: Array<Omit<typeof orders, "client"> | { client?: client }> = [];
for (const i of orders)
rvalue.push({ ...i, client: clients.find(e => i.client === e.id) });
return rvalue; return rvalue;
}
export default defineEventHandler((e) => {
const pageParameters = getPaginatedParameters(e, 50, 200);
return getOrders(pageParameters, {}).then(prismaToWeb);
}); });

View file

@ -1,37 +1,44 @@
/* global defineEventHandler, createError, readBody, setResponseStatus */ import { defineEventHandler, readBody, setResponseStatus } from "h3";
import * as Prisma from "@prisma/client";
import { createValidationError, handleRecursedValidationError } from "../utils/validation"; import { createValidationError, handleRecursedValidationError } from "../utils/validation";
import { database as db } from "../utils/database"; import { database } from "../utils/database";
import getRequestingUser from "../utils/getRequestingUser"; import getRequestingUser from "../utils/getRequestingUser";
import { getOrder } from "./orders/[id].get"; import { getOrder } from "./orders/[id].get";
import { prismaToWeb } from "~/server/utils/prismaToWeb";
import Snowflake from "~/utils/snowflake"; import Snowflake from "~/utils/snowflake";
type importedProduct = { import { createError } from "#imports";
type importedProduct<inOrder extends boolean = boolean> = {
orderId: inOrder extends true ? never : string,
name: string | null, name: string | null,
link: string, link: string,
price_imported: number, price_imported: number,
price: number, price: number,
} }
type work = { type work<inOrder extends boolean = boolean> = {
offer: string, orderId: inOrder extends true ? never : string,
offerId: string,
price: number, price: number,
notes: string | null, notes: string | null,
is_fulfilled: boolean | 0 | 1, fulfilled: boolean,
} }
type order = { type order = {
client: string, clientId: string,
// user: string, // userId: string,
is_draft: boolean | 0 | 1, draft: boolean,
imported_products: Array<importedProduct>, imported_products: Array<importedProduct<true>>,
work: Array<work>, work: Array<work<true>>,
}; };
export function checkIsWork<Patch extends boolean = boolean>( export function checkIsWork<Patch extends boolean = boolean, inOrder extends boolean = boolean>(
value: any, value: any,
patch: Patch, patch: Patch,
): value is Patch extends true ? Partial<work> : work { needsOrderId: inOrder,
): value is Patch extends true ? Partial<work<inOrder>> : work<inOrder> {
const errors = new Map<string, string>(); const errors = new Map<string, string>();
if (typeof value !== "object") { if (typeof value !== "object") {
@ -41,19 +48,24 @@ export function checkIsWork<Patch extends boolean = boolean>(
}); });
} }
if (!(typeof value.offer === "string" || (patch && value.offer === undefined))) errors.set("offer", "is not string"); if (!(typeof value.orderId === "string" || (patch && value.orderId === undefined) || !needsOrderId)) errors.set("orderId", "is not string");
if (!(typeof value.offerId === "string" || (patch && value.offerId === undefined))) errors.set("offerId", "is not string");
if (!(typeof value.price === "number" || (patch && value.price === undefined))) errors.set("price", "is not price"); if (!(typeof value.price === "number" || (patch && value.price === undefined))) errors.set("price", "is not price");
if (!(typeof value.notes === "string" || value.notes === null || (patch && value.notes === undefined))) errors.set("notes", "is not string or null"); if (!(typeof value.notes === "string" || value.notes === null || (patch && value.notes === undefined))) errors.set("notes", "is not string or null");
if (!(typeof value.is_fulfilled === "boolean" || value.is_fulfilled === 0 || value.is_fulfilled === 1 || (patch && value.is_fulfilled === undefined))) errors.set("is_fulfilled", "is not boolean"); if (!(typeof value.is_fulfilled === "boolean" || (patch && value.is_fulfilled === undefined))) errors.set("is_fulfilled", "is not boolean");
// TODO: Excessive property checking
// Excessive properties should be checked and an error should be thrown if there is one
if (errors.size !== 0) throw createValidationError(errors); if (errors.size !== 0) throw createValidationError(errors);
return true; return true;
} }
export function checkIsImportedProduct<Patch extends boolean = boolean>( export function checkIsImportedProduct<Patch extends boolean = boolean, inOrder extends boolean = boolean>(
value: any, value: any,
patch: Patch, patch: Patch,
): value is Patch extends true ? Partial<importedProduct> : importedProduct { needsOrderId: inOrder,
): value is Patch extends true ? Partial<importedProduct<inOrder>> : importedProduct<inOrder> {
const errors = new Map<string, string>(); const errors = new Map<string, string>();
if (typeof value !== "object") { if (typeof value !== "object") {
@ -63,10 +75,14 @@ export function checkIsImportedProduct<Patch extends boolean = boolean>(
}); });
} }
if (!(typeof value.orderId === "string" || (patch && value.orderId === undefined) || !needsOrderId)) errors.set("orderId", "is not string");
if (!(typeof value.name === "string" || value.name === null || (patch && value.name === undefined))) errors.set("name", "is not string or null"); if (!(typeof value.name === "string" || value.name === null || (patch && value.name === undefined))) errors.set("name", "is not string or null");
if (!(typeof value.link === "string" || (patch && value.name === undefined))) errors.set("link", "is not string"); if (!(typeof value.link === "string" || (patch && value.name === undefined))) errors.set("link", "is not string");
if (!(typeof value.price_imported === "number" || (patch && value.name === undefined))) errors.set("price_imported", "is not number"); if (!(typeof value.price_imported === "number" || (patch && value.name === undefined))) errors.set("price_imported", "is not number");
if (!(typeof value.price || (patch && value.price === undefined))) errors.set("price", "is not number"); if (!(typeof value.price === "number" || (patch && value.price === undefined))) errors.set("price", "is not number");
// TODO: Excessive property checking
// Excessive properties should be checked and an error should be thrown if there is one
if (errors.size !== 0) throw createValidationError(errors); if (errors.size !== 0) throw createValidationError(errors);
@ -76,7 +92,7 @@ export function checkIsImportedProduct<Patch extends boolean = boolean>(
export function checkIsOrder<Patch extends boolean = boolean>( export function checkIsOrder<Patch extends boolean = boolean>(
value: any, value: any,
patch: Patch, patch: Patch,
): value is Patch extends true ? Partial<Pick<order, "client" | "is_draft">> : order { ): value is Patch extends true ? Partial<Omit<order, "imported_products" | "work">> : order {
const errors = new Map<string, string>(); const errors = new Map<string, string>();
if (typeof value !== "object") { if (typeof value !== "object") {
@ -86,19 +102,22 @@ export function checkIsOrder<Patch extends boolean = boolean>(
}); });
} }
if (!(typeof value.client === "string" || (patch && value.client === undefined))) errors.set("client", "is not string"); if (!(typeof value.clientId === "string" || (patch && value.clientId === undefined))) errors.set("clientId", "is not string");
if (!(typeof value.is_draft === "boolean" || value.is_draft === 0 || value.is_draft === 1 || (patch && value.is_draft === undefined))) errors.set("is_draft", "is not boolean"); if (!(typeof value.draft === "boolean" || (patch && value.is_draft === undefined))) errors.set("draft", "is not boolean");
if (!(value.imported_products instanceof Array)) errors.set("imported_products", "is not array"); if (!(value.imported_products instanceof Array)) errors.set("imported_products", "is not array");
else if (patch && value.imported_products !== undefined) errors.set("imported_products", "cannot patch from order"); else if (patch && value.imported_products !== undefined) errors.set("imported_products", "cannot patch from order");
if (!(value.work instanceof Array)) errors.set("work", "is not array"); if (!(value.work instanceof Array)) errors.set("work", "is not array");
else if (patch && value.work !== undefined) errors.set("work", "cannot patch from order"); else if (patch && value.work !== undefined) errors.set("work", "cannot patch from order");
// TODO: Excessive property checking
// Excessive properties should be checked and an error should be thrown if there is one
if (!patch) { if (!patch) {
const importedProducts = value.imported_products; const importedProducts = value.imported_products;
if (importedProducts instanceof Array) { if (importedProducts instanceof Array) {
for (const i in importedProducts) { for (const i in importedProducts) {
try { try {
checkIsImportedProduct(importedProducts[i], patch); checkIsImportedProduct(importedProducts[i], patch, false);
} catch (e) { } catch (e) {
handleRecursedValidationError(e, errors, `imported_products[${i}]`); handleRecursedValidationError(e, errors, `imported_products[${i}]`);
} }
@ -109,7 +128,7 @@ export function checkIsOrder<Patch extends boolean = boolean>(
if (work instanceof Array) { if (work instanceof Array) {
for (const i in work) { for (const i in work) {
try { try {
checkIsWork(work[i], patch); checkIsWork(work[i], patch, false);
} catch (e) { } catch (e) {
handleRecursedValidationError(e, errors, `work[${i}]`); handleRecursedValidationError(e, errors, `work[${i}]`);
} }
@ -124,49 +143,49 @@ export function checkIsOrder<Patch extends boolean = boolean>(
export default defineEventHandler(async (e) => { export default defineEventHandler(async (e) => {
const body = await readBody(e); const body = await readBody(e);
const id = new Snowflake().toString(); const id = new Snowflake().state;
const user = await getRequestingUser(e); const user = await getRequestingUser(e);
if (!checkIsOrder(body, false)) throw createError({ message: "Invalid body", statusCode: 400 }); if (!checkIsOrder(body, false)) throw createError({ message: "Invalid body", statusCode: 400 });
const database = await db.new(); await database.order.create({
await database.beginTransaction(); data: {
clientId: BigInt(body.clientId),
await database.query( draft: body.draft,
["INSERT INTO", imported_products: {
"`orders`", createMany: {
"VALUES", data: body.imported_products.reduce(
"(?, ?, ?, ?)", (pV, cV) => {
].join(" "), pV.push({
[id, body.client, user.id, body.is_draft], ...cV,
); id: new Snowflake().state,
});
const promises: Array<Promise<any>> = []; return pV;
for (const i of body.imported_products) { },
promises.push(database.query( [] as Array<Omit<Prisma.Prisma.ImportedProductCreateManyOrderInput, "orderId">>,
["INSERT INTO", ),
"`imported_products`", },
"VALUES", },
"(?, ?, ?, ?, ?, ?)", work: {
].join(" "), createMany: {
[new Snowflake().toString(), id, i.name, i.link, i.price_imported, i.price], data: body.work.reduce(
)); (pV, cV) => {
} pV.push({
...cV,
for (const i of body.work) { id: new Snowflake().state,
promises.push(database.query( offerId: BigInt(cV.offerId),
["INSERT INTO", });
"`work`", return pV;
"VALUES", },
"(?, ?, ?, ?, ?, ?)", [] as Array<Omit<Prisma.Prisma.WorkCreateManyOrderInput, "orderId">>,
].join(" "), ),
[new Snowflake().toString(), id, i.offer, i.price, i.notes, i.is_fulfilled], },
)); },
} id,
userId: user.id,
await Promise.all(promises); },
await database.commit(); });
setResponseStatus(e, 201); setResponseStatus(e, 201);
return getOrder(id); return getOrder(id).then(prismaToWeb);
}); });

View file

@ -1,17 +1,22 @@
/* global defineEventHandler, createError */ import { defineEventHandler } from "h3";
import { ResultSetHeader } from "mysql2";
import { database } from "~/server/utils/database"; import { database } from "~/server/utils/database";
import { createError } from "#imports";
export default defineEventHandler(async (e) => { export default defineEventHandler(async (e) => {
const id = e.context.params?.id; const id = e.context.params?.id as string;
const [result] = await database.query( try {
"DELETE FROM `orders` WHERE `id` = ?", await database.order.delete({
[id], where: {
) as unknown as [ResultSetHeader]; id: BigInt(id),
},
if (result.affectedRows === 0) throw createError({ statusCode: 404 }); });
} catch (e) {
// FIXME: should be 500 on errors other than "RecordNotFound"
throw createError({ statusCode: 404 });
}
return null; return null;
}); });

View file

@ -1,108 +1,38 @@
/* global defineEventHandler, createError */ import { defineEventHandler } from "h3";
import { createError } from "#imports";
import { offer as offerType, order } from "~/utils/types/database"; import { database } from "~/server/utils/database";
import { database, data } from "~/server/utils/database"; import { prismaToWeb } from "~/server/utils/prismaToWeb";
export async function orderExists(id: string) { export async function orderExists(id: bigint) {
const [[exists]] = await database.query( const exists = await database.order.findUnique({
"SELECT EXISTS(*) AS `exists` FROM `orders` WHERE `id` = ?", where: {
[id], id,
) as data<{exists: 0 | 1}>; },
});
return exists.exists === 1; return exists !== null;
} }
export async function getImportedProducts(id: string) { export async function getOrder(id: bigint) {
const [importedProducts] = await database.query( const order = await database.order.findUnique({
["SELECT", where: {
"CONVERT(`id`, CHAR) AS `id`,", id,
"`name`,", },
"`link`,", include: {
"`price`,", imported_products: true,
"`price_imported`", work: {
"FROM `imported_products`", include: {
"WHERE `order` = ?", offer: true,
].join(" "), },
[id], },
) as data<{ },
id: string, });
name: string | null,
link: string,
price: string,
price_imported: string
}>;
return importedProducts;
}
export async function getWork(id: string) {
const [work] = await database.query(
["SELECT",
"CONVERT(`id`, CHAR) AS `id`,",
"CONVERT(`offer`, CHAR) AS `offer`,",
"`price`,",
"`notes`,",
"`is_fulfilled`",
"FROM `work`",
"WHERE `order` = ?",
].join(" "),
[id],
) as data<{
id: string,
offer: offerType,
price: number,
notes: string | null,
is_fulfilled: 0 | 1,
}>;
const [offer] = await database.query(
["SELECT",
"CONVERT(`offer`.`id`, CHAR) AS `id`,",
"`offer`.`name`,",
"`offer`.`description`,",
"`offer`.`recommended_price`",
"FROM",
"`work`",
"LEFT JOIN `offer` ON `work`.`offer` = `offer`.`id`",
"WHERE `work`.`order` = ?",
].join(" "),
[id],
) as data<offerType>;
// @ts-ignore i.offer is string, but it needs to be an offer object
for (const i of work) i.offer = offer.find(e => e.id === i.offer) as offerType;
return work;
}
export async function getOrder(id: string): Promise<order> {
const [[order]] = await database.query(
["SELECT",
"CONVERT(`id`, CHAR) AS `id`,",
"CONVERT(`client`, CHAR) AS `client`,",
"CONVERT(`user`, CHAR) AS `user`, ",
"`is_draft`,",
"`value`",
"FROM `orderSummaries`",
"WHERE `id` = ?",
].join(" "),
[id],
) as data<{
id: string,
client: string,
user: string,
is_draft: 0 | 1,
value: number,
}>;
if (!order) throw createError({ statusCode: 404 }); if (!order) throw createError({ statusCode: 404 });
return order;
const importedProducts = await getImportedProducts(id);
const work = await getWork(id);
return { ...order, imported_products: importedProducts, work };
} }
export default defineEventHandler((e) => { export default defineEventHandler((e) => {
const key = e.context.params?.id; const key = e.context.params?.id as string;
return getOrder(key as string); return getOrder(BigInt(key)).then(prismaToWeb);
}); });

View file

@ -1,17 +1,27 @@
/* global defineEventHandler, readBody, createError */ import { defineEventHandler, readBody } from "h3";
import { checkIsOrder } from "../orders.post"; import { checkIsOrder } from "../orders.post";
import { database as db } from "~/server/utils/database"; import { getOrder } from "./[id].get";
import { database } from "~/server/utils/database";
import { prismaToWeb } from "~/server/utils/prismaToWeb";
import { createError } from "#imports";
export default defineEventHandler(async (e) => { export default defineEventHandler(async (e) => {
const body = await readBody(e); const body = await readBody(e);
const id = e.context.params?.id; const id = e.context.params?.id as string;
if (!checkIsOrder(e, true)) throw createError({ message: "Invalid body", statusCode: 400 }); if (!checkIsOrder(body, true)) throw createError({ message: "Invalid body", statusCode: 400 });
const database = await db.new(); await database.order.update({
await database.beginTransaction(); where: {
id: BigInt(id),
},
data: {
clientId: body.clientId ? BigInt(body.clientId) : undefined,
draft: body.draft,
},
});
for (const [k, v] of Object.entries(body)) return getOrder(BigInt(id)).then(prismaToWeb);
database.query(`UPDATE TABLE \`orders\` SET \`${k}\` = ? WHERE \`id\` = ?`, [v, id]);
}); });

View file

@ -1,12 +1,27 @@
/* global defineEventHandler, createError */ import { defineEventHandler } from "h3";
import { orderExists, getImportedProducts } from "../[id].get"; import { orderExists } from "../[id].get";
import { database } from "~/server/utils/database";
import { prismaToWeb } from "~/server/utils/prismaToWeb";
import { createError } from "#imports";
export default defineEventHandler(async (e) => { export default defineEventHandler(async (e) => {
const id = e.context.params?.id as string; const orderId = e.context.params?.id as string;
if (!orderExists(id)) throw createError({ statusCode: 404 }); if (!(await orderExists(BigInt(orderId)))) throw createError({ statusCode: 404 });
const importedProducts = await getImportedProducts(id); return database.importedProduct.findMany({
return importedProducts; where: {
orderId: BigInt(orderId),
},
select: {
id: true,
link: true,
name: true,
orderId: true,
price: true,
price_imported: true,
},
}).then(prismaToWeb);
}); });

View file

@ -1,27 +1,33 @@
/* global defineEventHandler, readBody, createError, setResponseStatus */ import { defineEventHandler, readBody, setResponseStatus } from "h3";
import { checkIsImportedProduct } from "../../orders.post"; import { checkIsImportedProduct } from "../../orders.post";
import { getImportedProducts, orderExists } from "../[id].get"; import { orderExists } from "../[id].get";
import Snowflake from "~/utils/snowflake"; import Snowflake from "~/utils/snowflake";
import { database } from "~/server/utils/database"; import { database } from "~/server/utils/database";
import { prismaToWeb } from "~/server/utils/prismaToWeb";
import { createError } from "#imports";
export default defineEventHandler(async (e) => { export default defineEventHandler(async (e) => {
const body = await readBody(e); const body = await readBody(e);
const idOrder = e.context.params?.id as string; const idOrder = e.context.params?.id as string;
const idImportedProducts = new Snowflake().toString(); const idImportedProduct = new Snowflake().state;
if (!orderExists(idOrder)) throw createError({ statusCode: 404 }); if (!await orderExists(BigInt(idOrder))) throw createError({ statusCode: 404 });
if (!checkIsImportedProduct(body, false)) throw createError({ message: "Invalid body", statusCode: 400 }); if (!checkIsImportedProduct(body, false, false)) throw createError({ message: "Invalid body", statusCode: 400 });
await database.query( const rvalue = await database.importedProduct.create({
["INSERT INTO", data: {
"`imported_products`", id: idImportedProduct,
"VALUES", link: body.link,
"(?, ?, ?, ?, ?, ?)", name: body.name,
].join(" "), orderId: BigInt(idOrder),
[idImportedProducts, idOrder, body.name, body.link, body.price_imported, body.price], price: body.price,
); price_imported: body.price_imported,
},
});
setResponseStatus(e, 201); setResponseStatus(e, 201);
return getImportedProducts(idOrder);
return prismaToWeb(rvalue);
}); });

View file

@ -1,12 +1,31 @@
/* global defineEventHandler, createError */ import { defineEventHandler } from "h3";
import { orderExists, getWork } from "../[id].get"; import { orderExists } from "../[id].get";
import { database } from "~/server/utils/database";
import { prismaToWeb } from "~/server/utils/prismaToWeb";
import { createError } from "#imports";
export default defineEventHandler(async (e) => { export default defineEventHandler(async (e) => {
const id = e.context.params?.id as string; const orderId = e.context.params?.id as string;
if (!orderExists(id)) throw createError({ statusCode: 404 }); if (!await orderExists(BigInt(orderId))) throw createError({ statusCode: 404 });
const work = await getWork(id); const data = await database.work.findMany({
return work; where: {
orderId: BigInt(orderId),
},
select: {
id: true,
fulfilled: true,
notes: true,
offer: true,
orderId: true,
price: true,
},
});
if (!data) throw createError({ statusCode: 404 });
return prismaToWeb(data);
}); });

View file

@ -1,28 +1,34 @@
/* global defineEventHandler, readBody, createError, setResponseStatus */ import { defineEventHandler, readBody, setResponseStatus } from "h3";
import { Decimal } from "@prisma/client/runtime/library";
import { checkIsWork } from "../../orders.post"; import { checkIsWork } from "../../orders.post";
import { getWork, orderExists } from "../[id].get"; import { orderExists } from "../[id].get";
import Snowflake from "~/utils/snowflake"; import Snowflake from "~/utils/snowflake";
import { database } from "~/server/utils/database"; import { database } from "~/server/utils/database";
import { prismaToWeb } from "~/server/utils/prismaToWeb";
import { createError } from "#imports";
export default defineEventHandler(async (e) => { export default defineEventHandler(async (e) => {
const body = await readBody(e); const body = await readBody(e);
const idOrder = e.context.params?.id as string; const idOrder = e.context.params?.id as string;
const idWork = new Snowflake().toString(); const idWork = new Snowflake().state;
if (!orderExists(idOrder)) throw createError({ statusCode: 404 }); if (!orderExists(BigInt(idOrder))) throw createError({ statusCode: 404 });
if (!checkIsWork(body, false)) throw createError({ message: "Invalid body", statusCode: 400 }); if (!checkIsWork(body, false, false)) throw createError({ message: "Invalid body", statusCode: 400 });
await database.query( const rvalue = await database.work.create({
["INSERT INTO", data: {
"`work`", id: BigInt(idWork),
"VALUES", fulfilled: body.fulfilled,
"(?, ?, ?, ?, ?, ?)", notes: body.notes,
].join(" "), offerId: BigInt(body.offerId),
[idWork, idOrder, body.offer, body.price, body.notes, body.is_fulfilled], orderId: BigInt(body.orderId),
); price: new Decimal(body.price),
},
});
setResponseStatus(e, 201); setResponseStatus(e, 201);
return getWork(idWork); return prismaToWeb(rvalue);
}); });

View file

@ -1,20 +1,24 @@
/* global defineEventHandler, createError */ import { defineEventHandler } from "h3";
import { ResultSetHeader } from "mysql2";
import { orderExists } from "../../[id].get";
import { database } from "~/server/utils/database"; import { database } from "~/server/utils/database";
import { createError } from "#imports";
export default defineEventHandler(async (e) => { export default defineEventHandler(async (e) => {
const idOrder = e.context.params?.id as string; const idOrder = e.context.params?.id as string;
const idWork = e.context.params?.idWork as string; const idWork = e.context.params?.idWork as string;
if (!orderExists(idOrder)) throw createError({ statusCode: 404 }); try {
await database.work.delete({
where: {
id: BigInt(idWork),
orderId: BigInt(idOrder),
},
});
} catch (e) {
// FIXME: should be 500 on errors other than "RecordNotFound"
throw createError({ statusCode: 404 });
}
const [response] = await database.query(
"DELETE FROM `work` WHERE `id` = ?",
[idWork],
) as unknown as [ResultSetHeader];
if (response.affectedRows === 0) throw createError({ statusCode: 404 });
return null; return null;
}); });

View file

@ -1,11 +1,32 @@
/* global defineEventHandler, createError */ import { defineEventHandler } from "h3";
import { orderExists, getWork } from "../../[id].get"; import { orderExists } from "../../[id].get";
import { database } from "~/server/utils/database";
import { prismaToWeb } from "~/server/utils/prismaToWeb";
export default defineEventHandler((e) => { import { createError } from "#imports";
export default defineEventHandler(async (e) => {
const idOrder = e.context.params?.id as string; const idOrder = e.context.params?.id as string;
const idWork = e.context.params?.idWork as string; const idWork = e.context.params?.idWork as string;
if (!orderExists(idOrder)) throw createError({ statusCode: 404 }); if (!await orderExists(BigInt(idOrder))) throw createError({ statusCode: 404 });
return getWork(idWork); const data = await database.work.findUnique({
where: {
orderId: BigInt(idOrder),
id: BigInt(idWork),
},
select: {
id: true,
fulfilled: true,
notes: true,
offer: true,
orderId: true,
price: true,
},
});
if (!data) throw createError({ statusCode: 404 });
return prismaToWeb(data);
}); });

View file

@ -1,14 +1,8 @@
/* global defineEventHandler, getCookie */ import { defineEventHandler } from "h3";
import { database, data } from "~/server/utils/database"; import getRequestingUser from "~/server/utils/getRequestingUser";
import { user } from "~/utils/types/database"; import { prismaToWeb } from "~/server/utils/prismaToWeb";
export default defineEventHandler(async (e) => { export default defineEventHandler((e) => {
const token = getCookie(e, "token"); return getRequestingUser(e).then(prismaToWeb);
const [[userData]] = await database.query(
"SELECT CONVERT(`users`.`id`, CHAR(32)) as `id`, `users`.`username` as `username`, `users`.`email` as `email`, `users`.`display_name` as `display_name` FROM `sessions` LEFT JOIN `users` ON `sessions`.`user` = `users`.`id` WHERE `sessions`.`id` = ?",
[token],
) as unknown as data<user>;
return userData;
}); });

View file

@ -1,6 +1,8 @@
/* global defineEventHandler, createError, getCookie */ import { defineEventHandler, getCookie } from "h3";
import { createError } from "#imports";
import { database, data } from "~/server/utils/database"; import { database } from "~/server/utils/database";
import getRequestingUser from "~/server/utils/getRequestingUser";
const endpointsWithoutAuth: string[] = [ const endpointsWithoutAuth: string[] = [
"/dbtest", "/dbtest",
@ -33,13 +35,14 @@ export default defineEventHandler(async (e) => {
export async function isAuthorised(token: string | undefined): Promise<boolean> { export async function isAuthorised(token: string | undefined): Promise<boolean> {
if (!token) return false; if (!token) return false;
try { try {
const [[session]] = await database.query( await database.session.findUniqueOrThrow({
"SELECT EXISTS(SELECT `id` FROM `sessions` WHERE `id` = ? AND `expiry_date` >= NOW()) as `logged_in`", where: {
[token], id: BigInt(token),
) as unknown as data<{logged_in: number}>; },
});
return session.logged_in === 1; return true;
} catch { } catch (e) {
return false; return false;
} }
} }

View file

@ -0,0 +1,108 @@
// BAA stands for Before Around After
import { getQuery, type H3Event } from "h3";
import { type QueryObject } from "ufo";
import { isString } from "./isString";
import { createError } from "#imports";
type queryType<none extends boolean = boolean> = none extends false ? {
type: "before" | "after" | "around",
id: bigint
} : {
type: null
};
export type pageData<none extends boolean = boolean> = queryType<none> & { count: number }
/**
* Gets queryType for a given query with a value
* @param query the query to parse
* @throws if query malformed (multiple before/after/around)
*/
function getLocationParameterType(query: QueryObject): queryType {
const before = query.before;
const after = query.after;
const around = query.around;
let setLocationParametersCount = 0;
let rvalue: queryType = { type: null };
if (isString(before)) {
setLocationParametersCount++;
rvalue = { type: "before", id: BigInt(before) };
}
if (isString(after)) {
setLocationParametersCount++;
rvalue = { type: "after", id: BigInt(after) };
}
if (isString(around)) {
setLocationParametersCount++;
rvalue = { type: "around", id: BigInt(around) };
}
if (setLocationParametersCount > 1) {
throw createError({
statusCode: 400,
message: "multiple location parameters not allowed",
});
}
return rvalue;
}
/** Gets the count parameter from the query object.
* @param query the query to check.
* @param defaultCount the default count if the query doesn't have count parameter. (default 50)
* @param countLimit the maximum count of the parameter before throwing. (default 200)
* @returns the value of count parameter.
* @throws if the parameter in query exceeds provided countLimit.
*/
function getRequestedCount(
query: QueryObject,
defaultCount = 50,
countLimit = 200,
) {
let count = defaultCount;
if (query.limit) count = Number(query.limit);
if (count > countLimit) {
throw createError({
statusCode: 400,
message: `Cannot retrieve more than ${countLimit} records`,
});
}
if (count <= 0) {
throw createError({
statusCode: 400,
message: "Tried to retireve 0 or less records",
});
}
return count;
}
/** Gets the baa page parameters from the H3event,
* @param e the H3event to fetch parameters.
* @param defaultCount the default count to use if there is no count parameter. (default 50)
* @param countLimit the maximum value of the count parameter before throwing an error. (default 200)
* @returns the page data found in the query.
* @throws if event has a count parameter in the query that exceed provided countLimit.
*/
export default function getPaginatedParameters(
e: H3Event,
defaultCount = 50,
countLimit = 200,
): pageData {
const query = getQuery(e);
const queryParameters = getLocationParameterType(query);
const queryCount = getRequestedCount(query, defaultCount, countLimit);
return {
...queryParameters,
count: queryCount,
};
}

View file

@ -1,261 +0,0 @@
/* global defineEventHandler, getQuery, createError, readBody, setResponseStatus */
import { QueryObject } from "ufo";
import { H3Event } from "h3";
import { ResultSetHeader } from "mysql2/promise";
import { data, database } from "./database";
import { isString } from "./isString";
import Snowflake from "~/utils/snowflake";
import { client } from "~/utils/types/database";
type queryType = {
type: "before" | "after" | "around",
id: string
} | {
type: null
};
/**
* Before, around, after pagination wrapper
*/
export default class BaaPagination<T extends {[k: string]: any}, keyType extends string = "id"> {
readonly table: string;
readonly key: keyType;
readonly select: string;
readonly groupBy: string;
private get sqlGroupBy() {
return this.groupBy !== "" ? `GROUP BY ${this.groupBy}` : "";
}
/**
* Gets queryType for a given query with a value
* @param query the query to parse
* @throws if query malformed (multiple before/after/around)
*/
static getLocationParameterType(query: QueryObject): queryType {
const before = query.before;
const after = query.after;
const around = query.around;
let setLocationParametersCount = 0;
let rvalue: queryType = { type: null };
if (isString(before)) {
setLocationParametersCount++;
rvalue = { type: "before", id: before };
}
if (isString(after)) {
setLocationParametersCount++;
rvalue = { type: "after", id: after };
}
if (isString(around)) {
setLocationParametersCount++;
rvalue = { type: "around", id: around };
}
if (setLocationParametersCount > 1) {
throw createError({
statusCode: 400,
message: "multiple location parameters not allowed",
});
}
return rvalue;
}
async getPagedResults(
queryType: queryType,
limit = 50,
where = "",
bind: Array<any> = [],
) {
const sqlwhere = where !== "" ? `AND (${where})` : "";
switch (queryType.type) {
case "before": {
const [data] = await database.query(
`SELECT ${this.select}, CONVERT(\`${this.key}\`, CHAR) AS \`${this.key}\` FROM \`${this.table}\` WHERE \`${this.key}\` < ? ${sqlwhere} ORDER BY \`${this.key}\` DESC ${this.sqlGroupBy} LIMIT ?`,
[queryType.id, ...bind, limit],
) as unknown as data<T>;
return data;
}
case "after": {
const [data] = await database.query(
`SELECT ${this.select}, CONVERT(\`${this.key}\`, CHAR) AS \`${this.key}\` FROM \`${this.table}\` WHERE \`${this.key}\` > ? ${sqlwhere} ORDER BY \`${this.key}\` DESC ${this.sqlGroupBy} LIMIT ?`,
[queryType.id, ...bind, limit],
) as unknown as data<T>;
return data;
}
case "around": {
const [data] = await database.query(
` SELECT ${this.select}, CONVERT(\`${this.key}\`, CHAR) AS \`${this.key}\` FROM (\n` +
`(SELECT * FROM \`${this.table}\` WHERE \`${this.key}\` >= ? ${sqlwhere} ORDER BY \`${this.key}\` ${this.sqlGroupBy} ASC LIMIT ?)\n` +
"UNION ALL\n" +
`(SELECT ${this.select} FROM \`${this.table}\` WHERE \`${this.key}\` < ? ${sqlwhere} ORDER BY \`${this.key}\` DESC ${this.sqlGroupBy} LIMIT ?)\n` +
`) as \`x\` ORDER BY \`${this.key}\` DESC`,
[queryType.id, ...bind, Math.ceil(limit / 2), queryType.id, ...bind, Math.floor(limit / 2)],
) as unknown as data<T>;
return data;
}
case null: {
const [data] = await database.query(
`SELECT ${this.select}, CONVERT(\`${this.key}\`, CHAR) AS \`${this.key}\` FROM \`${this.table}\` WHERE TRUE ${sqlwhere} ORDER BY \`${this.key}\` DESC ${this.sqlGroupBy} LIMIT ?`,
[...bind, limit],
) as unknown as data<T>;
return data;
}
default:
throw createError("Not implemented");
}
}
RESTget(
e: H3Event,
defaultLimit = 50,
limitLimit = 200,
where = "",
bind: Array<any> = [],
) {
const query = getQuery(e);
let limit = defaultLimit;
if (query.limit) limit = Number(query.limit);
if (limit > limitLimit) {
throw createError({
statusCode: 400,
message: `Cannot retrieve more than ${limitLimit} records`,
});
}
if (limit <= 0) {
throw createError({
statusCode: 400,
message: "Tried to retireve 0 or less records",
});
}
const queryData = BaaPagination.getLocationParameterType(query);
return this.getPagedResults(queryData, limit, where, bind);
}
async RESTpost<K extends keyof Omit<T, keyType>>(
e: H3Event,
fields: Array<K>,
valueChecker: (obj: unknown) => obj is {[P in K]: T[P]},
) {
const body = await readBody(e);
const id = new Snowflake().toString();
if (!valueChecker(body)) throw createError({ message: "Invalid body", statusCode: 400 });
const arrayToInsert: Array<any> = [id];
arrayToInsert.push(...fields.map(field => body[field]));
await database.query(
`INSERT INTO \`${this.table}\` ` +
`(\`${this.key}\`,\`${fields.join("`, `")}\`) ` +
"VALUES (" +
"?, ".repeat(fields.length) +
"?)",
arrayToInsert,
);
setResponseStatus(e, 201);
// FIXME: data may be turncated in the database
// either throw an error when data is too large or
// reply with turncated data
return { id, ...body };
}
async RESTgetRecord(e: H3Event) {
const key = e.context.params?.[this.key];
const [data] = await database.query(
`SELECT ${this.select}, CONVERT(\`${this.key}\`, CHAR) AS \`${this.key}\` FROM \`${this.table}\` WHERE \`${this.key}\` = ?`,
[key],
) as data<T>;
if (!data[0]) {
throw createError({
statusCode: 404,
});
}
return data[0];
}
async RESTpatchRecord(
e: H3Event,
valueChecker: (obj: unknown) => obj is Partial<Omit<T, keyType>>,
) {
const body = await readBody(e);
const key = e.context.params?.[this.key];
if (!valueChecker(body)) throw createError({ message: "Invalid body", statusCode: 400 });
for (const [k, v] of Object.entries(body)) {
// FIXME: use single database.query method instead of looping through keys and values
const [res] = await database.query(
// I believe it is safe to put key (k) in the template
// because it is limited to 4 values here
`UPDATE \`${this.table}\` SET \`${k}\` = ? WHERE \`${this.key}\` = ?`,
[v, key],
) as unknown as [ResultSetHeader];
if (res.affectedRows !== 1) {
throw createError({
statusCode: 404,
});
}
}
const [data] = await database.query(
`SELECT ${this.select}, CONVERT(\`${this.key}\`, CHAR) AS \`${this.key}\` FROM \`${this.table}\` WHERE \`${this.key}\` = ?`,
[key],
) as data<T>;
return data[0];
}
async RESTdeleteRecord(e: H3Event) {
const key = e.context.params?.[this.key];
const [result] = await database.query(
`DELETE FROM \`${this.table}\` WHERE \`${this.key}\` = ?`,
[key],
) as unknown as [ResultSetHeader];
if (result.affectedRows === 0) throw createError({ statusCode: 404 });
return null;
}
async RESTrecordCount(
e :H3Event,
where = "",
bind: Array<any> = [],
) {
const sqlwhere = where !== "" ? `WHERE ${where}` : "";
const [[data]] = await database.query(
`SELECT COUNT(*) as \`count\` FROM \`${this.table}\` ${sqlwhere} ${this.sqlGroupBy}`,
bind,
) as data<{count: number}>;
if (!data) throw createError("Database returned no rows");
return data;
}
constructor(
table: string,
key: keyType,
select = "*",
groupBy = "",
) {
this.table = table;
this.key = key;
this.select = select;
this.groupBy = groupBy;
}
}

View file

@ -1,19 +1,99 @@
import mysql, { Connection } from "mysql2/promise"; import { PrismaClient, Prisma } from "@prisma/client";
const connectionOptions: mysql.ConnectionOptions = { import { type pageData } from "./baaPageParsing";
host: process.env.DB_HOST,
port: Number(process.env.DB_PORT),
user: process.env.DB_USER,
password: process.env.DB_PASSWORD,
database: process.env.DB_SCHEMA,
decimalNumbers: true,
supportBigNumbers: true,
};
export const database = type model = PrismaClient[Uncapitalize<Prisma.ModelName>];
await mysql.createConnection(connectionOptions) as Connection & {
new: (localConnectionOptions: mysql.ConnectionOptions | undefined) => Promise<Connection>
};
database.new = (localConnectionOptions: mysql.ConnectionOptions | undefined) => { return mysql.createConnection({ ...localConnectionOptions, ...connectionOptions }); };
export type data<T> = [T[], mysql.FieldPacket[]]; function getBeforeParameters<T, A>(
pageData: pageData<false>,
fetchArgs: Prisma.Args<T, "findMany">,
) {
const _fetchArgs = Object.assign({}, fetchArgs);
return Object.assign(_fetchArgs, {
take: pageData.count,
orderBy: [
{ id: "desc" },
],
where: {
AND: [
{
id: {
_lt: pageData.id,
},
},
fetchArgs.where,
],
},
});
}
function getAfterParameters<T>(
pageData: pageData<false>,
fetchArgs: Prisma.Args<T, "findMany">,
) {
const _fetchArgs = Object.assign({}, fetchArgs);
return Object.assign(_fetchArgs, {
take: pageData.count,
orderBy: [
{ id: "desc" },
],
where: {
AND: [
{
id: {
_gt: pageData.id,
},
},
fetchArgs.where,
],
},
});
}
function getNullParameters<T>(
pageData: pageData<true>,
fetchArgs: Prisma.Args<T, "findMany">,
) {
const _fetchArgs = Object.assign({}, fetchArgs);
return Object.assign(_fetchArgs, {
take: pageData.count,
orderBy: [
{ id: "desc" },
],
});
}
export const database = new PrismaClient().$extends({
model: {
$allModels: {
findPaginated<T, A>(
this: T,
pageData: pageData,
fetchArgs: Prisma.Exact<A, Prisma.Args<T, "findMany">>,
): Promise<Prisma.Result<T, A, "findMany">> {
const context = Prisma.getExtensionContext(this) as any;
switch (pageData.type) {
case "before":
return context.findMany(getBeforeParameters(pageData, fetchArgs));
case "after":
return context.findMany(getAfterParameters(pageData, fetchArgs));
case "around":
return Promise.all([
context.findMany(getBeforeParameters({
type: "before",
id: pageData.id,
count: Math.ceil(pageData.count),
}, fetchArgs)),
context.findMany(getAfterParameters({
type: "after",
id: pageData.id,
count: Math.floor(pageData.count),
}, fetchArgs)),
]).then(rv => rv.flat()) as Promise<any>;
case null:
return context.findMany(getNullParameters(pageData, fetchArgs));
}
},
},
},
});

View file

@ -1,24 +1,30 @@
/* global getCookie, createError */ import { getCookie, H3Event } from "h3";
import { H3Event } from "h3";
import { database, data } from "./database"; import { database } from "./database";
import { user } from "~/utils/types/database";
import { createError } from "#imports";
export default async function getRequestingUser(e: H3Event) { export default async function getRequestingUser(e: H3Event) {
const cookie = getCookie(e, "token"); const cookie = getCookie(e, "token");
const [[user]] = await database.query( if (!cookie) throw createError("User not found");
["SELECT", const { user } = await database.session.findUnique({
"CONVERT(`users`.`id`, CHAR) as `id`,", where: {
"`users`.`username`,", id: BigInt(cookie),
"`users`.`email`,", },
"`users`.`display_name`", select: {
"FROM", user: {
"`sessions`", select: {
"LEFT JOIN `users` ON `sessions`.`user` = `users`.`id`", display_name: true,
"WHERE `sessions`.`id` = ?", email: true,
].join(" "), id: true,
[cookie], username: true,
) as data<user>; },
},
},
}).then((e) => {
if (e === null) throw createError("User not found");
return e;
});
if (!user) throw createError("User not found"); if (!user) throw createError("User not found");
return user; return user;

View file

@ -0,0 +1,44 @@
import { Decimal } from "@prisma/client/runtime/library";
type func = (...args: any[]) => any | Function;
export type replaceJsonUnparsableToString<T> =
T extends Array<infer E> ? Array<replaceJsonUnparsableToString<E>>
: {
[K in keyof T]:
T[K] extends null ? null
: T[K] extends func ? never
: T[K] extends Decimal ? `${number}`
: T[K] extends Array<infer E> ? Array<replaceJsonUnparsableToString<E>>
: T[K] extends object ? replaceJsonUnparsableToString<T[K]>
: T[K] extends bigint ? `${bigint}`
: T[K]
};
type exactToInterface = (...args: any[]) => any extends Function ? true : false;
function arrayPrismaToWeb<T>(array: Array<T>) {
return array.reduce(
(pV, cV) => {
pV.push(prismaToWeb(cV));
return pV;
},
[] as Array<replaceJsonUnparsableToString<T>>,
);
}
export function prismaToWeb<T>(ivalue: T): replaceJsonUnparsableToString<T> {
const rvalue: any = ivalue instanceof Array ? [] : {};
for (const i in ivalue) {
const current = ivalue[i];
if (current === null) rvalue[i] = null;
else if (typeof current === 'function') continue;
else if (current instanceof Decimal) rvalue[i] = current.toString();
else if (current instanceof Array) rvalue[i] = arrayPrismaToWeb(current);
else if (typeof current === 'object') rvalue[i] = prismaToWeb(current);
else if (typeof current === 'bigint') rvalue[i] = current.toString();
else rvalue[i] = current;
}
return rvalue;
}

View file

@ -1,4 +1,4 @@
/* global createError */ import { createError } from "#imports";
export function createValidationError(errors: Map<string, string>) { export function createValidationError(errors: Map<string, string>) {
let message = "Invalid parameters: "; let message = "Invalid parameters: ";

86
shell.nix Normal file
View file

@ -0,0 +1,86 @@
{ pkgs ? import <nixpkgs> {} }:
let
# Updating this package will force an update for nodePackages.prisma. The
# version of prisma-engines and nodePackages.prisma must be the same for them to
# function correctly.
prisma-version = "5.5.2";
prisma-src = pkgs.fetchFromGitHub {
owner = "prisma";
repo = "prisma-engines";
rev = prisma-version;
hash = "sha256-d24b+Jobt5+vH7SGYOnDIR9DOtM0Y2XSfHZGkr7EidA=";
};
new-prisma-engines = pkgs.rustPlatform.buildRustPackage {
pname = "prisma-engines";
version = prisma-version;
src = builtins.storePath prisma-src;
# Use system openssl.
OPENSSL_NO_VENDOR = 1;
nativeBuildInputs = [ pkgs.pkg-config pkgs.git ];
buildInputs = [
pkgs.openssl
pkgs.protobuf
];
cargoLock = {
lockFile = "${prisma-src}/Cargo.lock";
outputHashes = {
"barrel-0.6.6-alpha.0" = "sha256-USh0lQ1z+3Spgc69bRFySUzhuY79qprLlEExTmYWFN8=";
"graphql-parser-0.3.0" = "sha256-0ZAsj2mW6fCLhwTETucjbu4rPNzfbNiHu2wVTBlTNe4=";
"mysql_async-0.31.3" = "sha256-QIO9s0Upc0/1W7ux1RNJNGKqzO4gB4gMV3NoakAbxkQ=";
"postgres-native-tls-0.5.0" = "sha256-UYPsxhCkXXWk8yPbqjNS0illwjS5mVm3Z/jFwpVwqfw=";
};
};
preBuild = ''
export OPENSSL_DIR=${pkgs.lib.getDev pkgs.openssl}
export OPENSSL_LIB_DIR=${pkgs.lib.getLib pkgs.openssl}/lib
export PROTOC=${pkgs.protobuf}/bin/protoc
export PROTOC_INCLUDE="${pkgs.protobuf}/include";
export SQLITE_MAX_VARIABLE_NUMBER=250000
export SQLITE_MAX_EXPR_DEPTH=10000
'';
cargoBuildFlags = [
"-p" "query-engine"
"-p" "query-engine-node-api"
"-p" "schema-engine-cli"
"-p" "prisma-fmt"
];
postInstall = ''
mv $out/lib/libquery_engine${pkgs.stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/libquery_engine.node
'';
# Tests are long to compile
doCheck = false;
# meta = with lib; {
# description = "A collection of engines that power the core stack for Prisma";
# homepage = "https://www.prisma.io/";
# license = licenses.asl20;
# platforms = platforms.unix;
# maintainers = with maintainers; [ pimeys tomhoule ivan aqrln ];
# };
};
in
pkgs.mkShell {
nativeBuildInputs = [
new-prisma-engines
pkgs.nodejs_18
pkgs.openssl
];
shellHook = ''
export PRISMA_SCHEMA_ENGINE_BINARY="${new-prisma-engines}/bin/schema-engine"
export PRISMA_QUERY_ENGINE_BINARY="${new-prisma-engines}/bin/query-engine"
export PRISMA_QUERY_ENGINE_LIBRARY="${new-prisma-engines}/lib/libquery_engine.node"
export PRISMA_FMT_BINARY="${new-prisma-engines}/bin/prisma-fmt"
'';
}

View file

@ -1,4 +1,4 @@
import { CookieSerializeOptions } from "cookie-es"; import { type CookieSerializeOptions } from "cookie-es";
export const cookieSettings: CookieSerializeOptions = { export const cookieSettings: CookieSerializeOptions = {
sameSite: "lax", sameSite: "lax",

View file

@ -1,99 +0,0 @@
export interface client {
id: string;
name: string | null;
address: string | null;
phone: string | null;
email: string | null;
}
export interface user {
id: string;
username: string;
email: string;
display_name?: string;
}
export interface session {
id: string;
user: string;
expiry_date: string;
}
export interface imported_product {
id: string;
// order: string,
name?: string;
link: string;
price_imported: string;
price: string;
}
export interface offer {
id: string;
name: string;
description?: string;
recommended_price?: string;
}
export interface work {
id: string;
// order: string,
offer: string | offer;
price: string;
notes: string;
is_fulfilled: boolean;
}
export interface order {
imported_products: Array<{
id: string;
name: string | null;
link: string;
price: string;
price_imported: string;
}>;
work: {
id: string;
offer: offer;
price: number;
notes: string | null;
is_fulfilled: 0 | 1;
}[];
id: string;
client: string;
user: string;
is_draft: 0 | 1;
value: number;
}
export interface orderSummary {
id: string;
client: string;
user: string;
is_draft: 0 | 1;
value: string;
imported_products_count: number;
work_count: number;
}
export interface work_template {
id: string;
// order_template: string,
offer: string | offer;
price: string;
notes?: string;
}
export interface order_template {
id: string;
name: string;
description?: string;
}
// 1 is true, 0 is false
export type Dboolean =
| boolean
| 0 // false
| 1; // true
export type Dnumber = number | `${number}`;