@dascompany/product 3.0.8 → 3.1.1

package/dist/SQL.json

@@ -62,8 +62,8 @@
     "products": {
         "select": "SELECT * FROM products",
         "selectId": "SELECT id FROM products",
-        "insert": "INSERT INTO products( id, sku, url, title, description, net_price, installation_price, vat, color, quantity, width, length, height, file_id, json_data, deleted) VALUES ($id::BIGINT, $sku::TEXT, $url::TEXT, $title::TEXT, $description::TEXT, $net_price::DOUBLE PRECISION, $installation_price::DOUBLE PRECISION, $vat::INT, $color::TEXT, $quantity::INT, $width::INT,  $length::INT, $height::DOUBLE PRECISION,$file_id::BIGINT , $json_data::JSON, false::BOOL)",
-        "update": "UPDATE products SET url = $url::TEXT, title = $title::TEXT, description = $description::TEXT , net_price = $net_price::DOUBLE PRECISION, installation_price = $installation_price::DOUBLE PRECISION ,vat = $vat::INT, color = $color::TEXT, quantity = $quantity::INT, width = $width::INT, length = $length::INT, height = $height::DOUBLE PRECISION, file_id = $file_id::BIGINT, json_data = $json_data::JSON  WHERE id = $id::BIGINT",
+        "insert": "INSERT INTO products( id, sku, url, title, description, net_price, vat, color, quantity, width, length, height, file_id, json_data, deleted) VALUES ($id::BIGINT, $sku::TEXT, $url::TEXT, $title::TEXT, $description::TEXT, $net_price::DOUBLE PRECISION, $vat::INT, $color::TEXT, $quantity::INT, $width::INT,  $length::INT, $height::DOUBLE PRECISION,$file_id::BIGINT , $json_data::JSON, false::BOOL)",
+        "update": "UPDATE products SET url = $url::TEXT, title = $title::TEXT, description = $description::TEXT , net_price = $net_price::DOUBLE PRECISION, vat = $vat::INT, color = $color::TEXT, quantity = $quantity::INT, width = $width::INT, length = $length::INT, height = $height::DOUBLE PRECISION, file_id = $file_id::BIGINT, json_data = $json_data::JSON  WHERE id = $id::BIGINT",
         "delete": "UPDATE products SET deleted = true WHERE id = $id::BIGINT",
         "maxPrice": "SELECT MAX(net_price) FROM products",
         "count": "SELECT COUNT(*) AS total_rows FROM products",
@@ -71,8 +71,8 @@
     },
     "orders": {
         "select": "SELECT * FROM orders.orders",
-        "insert": "INSERT INTO orders.orders( id, email, price, client_id, personal_data_id_id, delivery_details_id, invoice_details_id, payment_details_id ) VALUES ($order_id::BIGINT, $email::TEXT, $price::DOUBLE PRECISION, $client_id::BIGINT,  $personal_data_id_id::BIGINT, $delivery_details_id::BIGINT , $invoice_details_id::BIGINT, $payment_details_id::BIGINT )",
-        "update": "UPDATE orders.orders SET price = $price::DOUBLE PRECISION, personal_data_id_id = $personal_data_id_id::BIGINT, delivery_details_id = $delivery_details_id::BIGINT, invoice_details_id = $invoice_details_id::BIGINT, payment_details_id = $payment_details_id::BIGINT, zsi_id = $zsi_id::BIGINT WHERE id = $id::BIGINT",
+        "insert": "INSERT INTO orders.orders( id, email, price, client_id, delivery_details_id, company_details_id, payment_details_id ) VALUES ($order_id::BIGINT, $email::TEXT, $price::DOUBLE PRECISION, $client_id::BIGINT, $delivery_details_id::BIGINT , $company_details_id::BIGINT, $payment_details_id::BIGINT )",
+        "update": "UPDATE orders.orders SET price = $price::DOUBLE PRECISION, delivery_details_id = $delivery_details_id::BIGINT, company_details_id = $company_details_id::BIGINT, payment_details_id = $payment_details_id::BIGINT, zsi_id = $zsi_id::BIGINT WHERE id = $id::BIGINT",
         "count": "SELECT COUNT (*) AS TOTAL_ROWS FROM orders.orders",
         "selectNextId": "SELECT nextval('orders.orders_id'::regclass)"
     },

package/dist/reader/OrderReader.js

@@ -42,9 +42,8 @@ export default class OrderReader {
             price: order.price,
             createdAt: order.created_at,
             clientId: order.client_id,
-            personalDataId: order.personal_data_id,
             deliveryDetailsId: order.delivery_details_id,
-            invoiceDetailsId: order.invoice_details_id,
+            companyDetailsId: order.company_details_id,
             paymentDetailsId: order.payment_details_id,
             zsiId: order.zsi_id,
             status

package/dist/reader/ProductReader.js

@@ -4,6 +4,7 @@ import DatabaseConnection from "../DatabaseConnection";
 import FileConnectionTypeE from "../types/FileConnectionTypeE";
 import PriceConverter from "../utils/PriceConverter";
 import createQueryOptionsForId from "../utils/createQueryOptionsForId";
+import getTentInstallationPrice from "../utils/getTentInstallationPrice";
 export default class ProductReader {
     static async get(queryOption) {
         const productRow = await DatabaseConnection.getInstance().products.select(queryOption);
@@ -12,6 +13,7 @@ export default class ProductReader {
         queryOptionsFiles.setOrderBy([{ key: 'sequence', order: 'asc' }]);
         const files = await FilesReader.getForConnection(queryOptionsFiles);
         const product = await this.correctProduct(productRow);
+        product.installationPrice = await getTentInstallationPrice(product);
         return { ...product, files };
     }
     static async getAll(queryOption) {
@@ -46,7 +48,6 @@ export default class ProductReader {
             title: product.title,
             description: product.description,
             netPrice: product.net_price,
-            installationPrice: product.installation_price,
             vat: product.vat,
             color: product.color,
             quantity: product.quantity,

package/dist/repo/OrderRepo.js

@@ -6,7 +6,7 @@ export default class OrderRepo {
         return this.createOrderFromRow(orderData);
     }
     static createOrderFromRow(orderData) {
-        const order = new Order(orderData.email, orderData.price, orderData.client_id, orderData.personal_data_id, orderData.delivery_details_id, orderData.invoice_details_id, orderData.payment_details_id);
+        const order = new Order(orderData.email, orderData.price, orderData.client_id, orderData.delivery_details_id, orderData.company_details_id, orderData.payment_details_id);
         order.setId(orderData.id);
         return order;
     }

package/dist/repo/ProductRepo.js

@@ -6,7 +6,7 @@ export default class ProductRepo {
         return this.createProductFromRow(product);
     }
     static createProductFromRow(productRow) {
-        const product = new Product(productRow.sku, productRow.url, productRow.title, productRow.description, productRow.net_price, productRow.installation_price, productRow.vat, productRow.color, productRow.quantity, productRow.width, productRow.length, productRow.height, productRow.file_id, productRow.deleted);
+        const product = new Product(productRow.sku, productRow.url, productRow.title, productRow.description, productRow.net_price, productRow.vat, productRow.color, productRow.quantity, productRow.width, productRow.length, productRow.height, productRow.file_id, productRow.deleted);
         product.setId(productRow.id);
         product.setCreatedAt(productRow.created_at);
         return product;

package/dist/stockObjects/Order.d.ts

@@ -3,20 +3,18 @@ export default class Order extends StockObject {
     private email;
     private price;
     private clientId;
-    private personalDataId;
     private deliveryDetailsId;
-    private invoiceDetailsId;
+    private companyDetailsId;
     private paymentDetailsId;
     private zsiId;
-    constructor(email: string, price: number, clientId: number | null, personalDataId: number, deliveryDetailsId: number, invoiceDetailsId?: number | null, paymentDetailsId?: number | null);
+    constructor(email: string, price: number, clientId: number | null, deliveryDetailsId: number, companyDetailsId?: number | null, paymentDetailsId?: number | null);
     getData(): Promise<{
         id: number | null;
         email: string;
         price: number;
         clientId: number | null;
-        personalDataId: number | null;
         deliveryDetailsId: number | null;
-        invoiceDetailsId: number | null;
+        companyDetailsId: number | null;
         paymentDetailsId: number | null;
     }>;
     getEmail(): string;
@@ -24,15 +22,13 @@ export default class Order extends StockObject {
     getZsiId(): number | null;
     getGrossPrice(): number;
     getClientId(): number | null;
-    getPersonalDataId(): number | null;
     getDeliveryDetailsId(): number | null;
     getInvoiceDetailsId(): number | null;
     getPaymentDetailsId(): number | null;
     setPrice(price: number): void;
     setclientId(clientId: number): void;
-    setPersonalDataId(personalDataId: number): void;
     setDeliveryDetailsId(deliveryDetailsId: number): void;
-    setInvoiceDetailsId(invoiceDetailsId: number): void;
+    setInvoiceDetailsId(companyDetailsId: number): void;
     setPaymentDetailsId(paymentDetailsId: number): void;
     setZsiId(zsiId: number): void;
     calculateAndUpdatePrice(): Promise<void>;

package/dist/stockObjects/Order.js

@@ -6,19 +6,17 @@ export default class Order extends StockObject {
     email;
     price;
     clientId;
-    personalDataId;
     deliveryDetailsId;
-    invoiceDetailsId;
+    companyDetailsId;
     paymentDetailsId;
     zsiId;
-    constructor(email, price, clientId, personalDataId, deliveryDetailsId, invoiceDetailsId = null, paymentDetailsId = null) {
+    constructor(email, price, clientId, deliveryDetailsId, companyDetailsId = null, paymentDetailsId = null) {
         super();
         this.email = email;
         this.price = price;
         this.clientId = clientId;
-        this.personalDataId = personalDataId;
         this.deliveryDetailsId = deliveryDetailsId;
-        this.invoiceDetailsId = invoiceDetailsId;
+        this.companyDetailsId = companyDetailsId;
         this.paymentDetailsId = paymentDetailsId;
         this.zsiId = null;
     }
@@ -28,9 +26,8 @@ export default class Order extends StockObject {
             email: this.email,
             price: this.price,
             clientId: this.clientId,
-            personalDataId: this.personalDataId,
             deliveryDetailsId: this.deliveryDetailsId,
-            invoiceDetailsId: this.invoiceDetailsId,
+            companyDetailsId: this.companyDetailsId,
             paymentDetailsId: this.paymentDetailsId,
         };
     }
@@ -50,14 +47,11 @@ export default class Order extends StockObject {
     getClientId() {
         return this.clientId;
     }
-    getPersonalDataId() {
-        return this.personalDataId;
-    }
     getDeliveryDetailsId() {
         return this.deliveryDetailsId;
     }
     getInvoiceDetailsId() {
-        return this.invoiceDetailsId;
+        return this.companyDetailsId;
     }
     getPaymentDetailsId() {
         return this.paymentDetailsId;
@@ -68,14 +62,11 @@ export default class Order extends StockObject {
     setclientId(clientId) {
         this.clientId = clientId;
     }
-    setPersonalDataId(personalDataId) {
-        this.personalDataId = personalDataId;
-    }
     setDeliveryDetailsId(deliveryDetailsId) {
         this.deliveryDetailsId = deliveryDetailsId;
     }
-    setInvoiceDetailsId(invoiceDetailsId) {
-        this.invoiceDetailsId = invoiceDetailsId;
+    setInvoiceDetailsId(companyDetailsId) {
+        this.companyDetailsId = companyDetailsId;
     }
     setPaymentDetailsId(paymentDetailsId) {
         this.paymentDetailsId = paymentDetailsId;

package/dist/stockObjects/Product.d.ts

@@ -6,7 +6,6 @@ export default class Product extends StockObject {
     private title;
     private description;
     private netPrice;
-    private installationPrice;
     private vat;
     private color;
     private quantity;
@@ -19,13 +18,12 @@ export default class Product extends StockObject {
     private file;
     private jsonData;
     private files;
-    constructor(sku: string, url: string, title: string, description: string, netPrice: number, installationPrice: number, vat: number, color: string, quantity: number, width: number, length: number, height: number, fileId: number, jsonData: any, deleted?: boolean);
+    constructor(sku: string, url: string, title: string, description: string, netPrice: number, vat: number, color: string, quantity: number, width: number, length: number, height: number, fileId: number, jsonData: any, deleted?: boolean);
     getSku(): string;
     getUrl(): string;
     getTitle(): string;
     getDescription(): string;
     getNetPrice(): number;
-    getInstallationPrice(): number;
     getGrossPrice(): number;
     getVat(): number;
     getColor(): string;
@@ -45,7 +43,6 @@ export default class Product extends StockObject {
         title: string;
         description: string;
         netPrice: number;
-        installationPrice: number;
         vat: number;
         color: string;
         quantity: number;
@@ -62,7 +59,6 @@ export default class Product extends StockObject {
     setTitle(title: string): string;
     setDescription(description: string): string;
     setNetPrice(netPrice: number): number;
-    setInstallationPrice(installationPrice: number): number;
     setVat(vat: number): number;
     setColor(color: string): string;
     setQuantity(quantity: number): number;

package/dist/stockObjects/Product.js

@@ -9,7 +9,6 @@ export default class Product extends StockObject {
     title;
     description;
     netPrice;
-    installationPrice;
     vat;
     color;
     quantity;
@@ -22,14 +21,13 @@ export default class Product extends StockObject {
     file;
     jsonData;
     files;
-    constructor(sku, url, title, description, netPrice, installationPrice, vat, color, quantity, width, length, height, fileId, jsonData, deleted = false) {
+    constructor(sku, url, title, description, netPrice, vat, color, quantity, width, length, height, fileId, jsonData, deleted = false) {
         super();
         this.sku = sku;
         this.url = url;
         this.title = title;
         this.description = description;
         this.netPrice = netPrice;
-        this.installationPrice = installationPrice;
         this.vat = vat;
         this.color = color;
         this.quantity = quantity;
@@ -58,9 +56,6 @@ export default class Product extends StockObject {
     getNetPrice() {
         return PriceConverter.netToGrossPrice(this.netPrice, this.vat);
     }
-    getInstallationPrice() {
-        return this.installationPrice;
-    }
     getGrossPrice() {
         return this.netPrice;
     }
@@ -119,7 +114,6 @@ export default class Product extends StockObject {
             title: this.title,
             description: this.description,
             netPrice: this.netPrice,
-            installationPrice: this.installationPrice,
             vat: this.vat,
             color: this.color,
             quantity: this.quantity,
@@ -149,9 +143,6 @@ export default class Product extends StockObject {
     setNetPrice(netPrice) {
         return this.netPrice = netPrice;
     }
-    setInstallationPrice(installationPrice) {
-        return this.installationPrice = installationPrice;
-    }
     setVat(vat) {
         return this.vat = vat;
     }

package/dist/tables/orders/OrdersTable.js

@@ -40,9 +40,8 @@ export default class OrdersTable extends Table {
         this.bindDetailsParameters(query, order);
     }
     bindDetailsParameters(query, order) {
-        query.bindParameter('personal_data_id', order.getPersonalDataId());
         query.bindParameter('delivery_details_id', order.getDeliveryDetailsId());
-        query.bindParameter('invoice_details_id', order.getInvoiceDetailsId());
+        query.bindParameter('company_details_id', order.getInvoiceDetailsId());
         query.bindParameter('payment_details_id', order.getPaymentDetailsId());
     }
     async selectNextId() {

package/dist/tables/public/ProductsTable.js

@@ -68,7 +68,6 @@ export default class ProductsTable extends Table {
         query.bindParameter('title', product.getTitle());
         query.bindParameter('description', product.getDescription());
         query.bindParameter('net_price', product.getNetPrice());
-        query.bindParameter('installation_price', product.getInstallationPrice());
         query.bindParameter('vat', product.getVat());
         query.bindParameter('color', product.getColor());
         query.bindParameter('quantity', product.getQuantity());

package/dist/types/OrderI.d.ts

@@ -5,9 +5,8 @@ export default interface OrderI {
     price: number;
     createdAt: string;
     clientId: number;
-    personalDataId: number;
     deliveryDetailsId: number;
-    invoiceDetailsId: number;
+    companyDetailsId: number;
     paymentDetailsId: number;
     zsiId: number;
     status: StatusI;

package/dist/types/rows/OrderRow.d.ts

@@ -4,9 +4,8 @@ export default interface OrderRow {
     price: number;
     created_at: string;
     client_id: number;
-    personal_data_id: number;
     delivery_details_id: number;
-    invoice_details_id: number;
+    company_details_id: number;
     payment_details_id: number;
     zsi_id: number;
     status_id: number;

package/dist/types/rows/ProductRow.d.ts

@@ -6,7 +6,6 @@ export default interface ProductRow {
     description: string;
     file_id: number;
     net_price: number;
-    installation_price: number;
     vat: number;
     color: string;
     quantity: number;

package/dist/utils/getTentInstallationPrice.d.ts

@@ -0,0 +1,2 @@
+import ProductI from "../types/ProductI";
+export default function getTentInstallationPrice(productData: ProductI): Promise<number>;

package/dist/utils/getTentInstallationPrice.js

@@ -0,0 +1,14 @@
+import { TentInstallation } from "@dascompany/zsi";
+export default async function getTentInstallationPrice(productData) {
+    const constructionSplit = productData.jsonData.construction.type.split(' ');
+    const tentData = {
+        construction: constructionSplit[0],
+        reinforcement: constructionSplit[1].toUpperCase() === 'POLAR',
+        fireResistant: (productData.jsonData.cover.type === 'PVC - 600g' || productData.jsonData.cover.type === 'PVC - 620g'),
+        width: productData.width,
+        length: productData.length,
+        height: productData.height
+    };
+    const installationPrice = await TentInstallation.getPrice(tentData);
+    return installationPrice;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dascompany/product",
-  "version": "3.0.8",
+  "version": "3.1.1",
   "main": "dist/index.js",
   "scripts": {
     "test": "vitest",
@@ -21,6 +21,7 @@
   },
   "peerDependencies": {
     "@dascompany/database": "^3.0.2",
+    "@dascompany/zsi": "^2.0.1",
     "@types/pg": "^8.11.11",
     "pg": "^8.13.3"
   }