@dascompany/product 4.0.2 → 4.0.5

package/dist/DatabaseConnection.d.ts

@@ -21,7 +21,6 @@ import FileConnectionsTable from './tables/files/FileConnectionsTable';
 import AdminAccountsTable from './tables/public/AdminAccountsTable';
 import AccountCompanyDetailsTable from './tables/clients/AccountCompanyDetailsTable';
 import AccountDeliveryDetailsTable from './tables/clients/AccountDeliveryDetailsTable';
-import AccountCartTable from './tables/clients/AccountCartTable';
 export default class DatabaseConnection {
     static instance: DatabaseConnection;
     private tables;
@@ -36,7 +35,6 @@ export default class DatabaseConnection {
     get addresses(): AddressesTable;
     get clientAccounts(): ClientAccountsTable;
     get accountCompanyDetails(): AccountCompanyDetailsTable;
-    get accountCart(): AccountCartTable;
     get accountDeliveryDetails(): AccountDeliveryDetailsTable;
     get adminAccounts(): AdminAccountsTable;
     get companyDetails(): CompanyDetailsTable;

package/dist/DatabaseConnection.js

@@ -23,7 +23,6 @@ import FileConnectionsTable from './tables/files/FileConnectionsTable';
 import AdminAccountsTable from './tables/public/AdminAccountsTable';
 import AccountCompanyDetailsTable from './tables/clients/AccountCompanyDetailsTable';
 import AccountDeliveryDetailsTable from './tables/clients/AccountDeliveryDetailsTable';
-import AccountCartTable from './tables/clients/AccountCartTable';
 export default class DatabaseConnection {
     static instance;
     tables = new Map();
@@ -76,11 +75,6 @@ export default class DatabaseConnection {
             this.tables.set(TableNames.accountCompanyDetails, new AccountCompanyDetailsTable(this.connection));
         return this.tables.get(TableNames.accountCompanyDetails);
     }
-    get accountCart() {
-        if (!this.tables.get(TableNames.accountCart))
-            this.tables.set(TableNames.accountCart, new AccountCartTable(this.connection));
-        return this.tables.get(TableNames.accountCart);
-    }
     get accountDeliveryDetails() {
         if (!this.tables.get(TableNames.accountDeliveryDetails))
             this.tables.set(TableNames.accountDeliveryDetails, new AccountDeliveryDetailsTable(this.connection));

package/dist/SQL.json

@@ -17,11 +17,6 @@
         "count": "SELECT COUNT(*) AS total_rows FROM clients.accounts",
         "selectNextId": "SELECT nextval('clients.accounts_id'::regclass)"
     },
-    "accountCart": {
-        "select": "SELECT * FROM clients.account_cart WHERE account_id = $account_id::BIGINT AND product_id = $product_id::BIGINT",
-        "insert": "INSERT INTO clients.account_cart(account_id, product_id) VALUES ($account_id::BIGINT, $product_id::BIGINT)",
-        "delete": "DELETE FROM clients.account_cart WHERE product_id = $product_id::BIGINT AND account_id = $account_id::BIGINT"
-    },
     "accountDeliveryDetails": {
         "select": "SELECT * FROM clients.account_delivery_details WHERE account_id = $account_id::BIGINT",
         "insert": "INSERT INTO clients.account_delivery_details(account_id, delivery_details_id) VALUES ($account_id::BIGINT, $delivery_details_id::BIGINT)",
@@ -63,8 +58,8 @@
     "products": {
         "select": "SELECT * FROM products",
         "selectId": "SELECT id FROM products",
-        "insert": "INSERT INTO products( id, sku, article_number, url, title, subtitle, description, net_price, promotional_net_price, vat, color, quantity, width, length, height, file_id, json_data, deleted) VALUES ($id::BIGINT, $sku::TEXT, $article_number::TEXT, $url::TEXT, $title::TEXT, subtitle::TEXT ,$description::TEXT, $net_price::DOUBLE PRECISION, $promotional_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, article_number = $article_number::TEXT, title = $title::TEXT, subtitle = $subtitle::text, description = $description::TEXT , net_price = $net_price::DOUBLE PRECISION, promotional_net_price = $promotional_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",
+        "insert": "INSERT INTO products( id, sku, article_number, url, title, description, net_price, promotional_net_price, vat, color, quantity, width, length, height, file_id, json_data, deleted) VALUES ($id::BIGINT, $sku::TEXT, $article_number::TEXT, $url::TEXT, $title::TEXT, $description::TEXT, $net_price::DOUBLE PRECISION, $promotional_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, article_number = $article_number::TEXT, title = $title::TEXT, description = $description::TEXT , net_price = $net_price::DOUBLE PRECISION, promotional_net_price = $promotional_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",

package/dist/reader/OrderProductsReader.js

@@ -23,11 +23,11 @@ export default class OrderProductsReader {
             productId: orderProduct.product_id,
             sku: orderProduct.sku,
             title: orderProduct.title,
-            netPrice: PriceConverter.priceToPenny(orderProduct.net_price),
+            netPrice: Number(orderProduct.net_price),
             installation: orderProduct.installation_price ? true : false,
-            installationPrice: PriceConverter.priceToPenny(orderProduct.installation_price),
+            installationPrice: Number(orderProduct.installation_price),
             grossPrice: PriceConverter.netToGrossPrice(Number(orderProduct.net_price), Number(orderProduct.vat)),
-            vat: orderProduct.vat,
+            vat: Number(orderProduct.vat),
             thumbnail,
         };
         return correctProduct;

package/dist/reader/OrderReader.js

@@ -1,7 +1,6 @@
 import { ParameterType, QueryOptions } from "@dascompany/database";
 import DatabaseConnection from "../DatabaseConnection";
 import OrderStatusReader from "./OrderStatusReader";
-import PriceConverter from "../utils/PriceConverter";
 export default class OrderReader {
     static async get(queryOptions) {
         const orderData = await DatabaseConnection.getInstance().orders.select(queryOptions);
@@ -40,7 +39,7 @@ export default class OrderReader {
         const correctOrder = {
             id: order.id,
             email: order.email,
-            price: PriceConverter.priceToPenny(order.price),
+            price: Number(order.price),
             createdAt: order.created_at,
             clientId: order.client_id,
             deliveryDetailsId: order.delivery_details_id,

package/dist/reader/ProductReader.js

@@ -45,13 +45,12 @@ export default class ProductReader {
             articleNumber: product.article_number,
             url: product.url,
             title: product.title,
-            subtitle: product.subtitle,
             description: product.description,
-            netPrice: PriceConverter.priceToPenny(product.net_price),
-            promotionalNetPrice: PriceConverter.priceToPenny(product.promotional_net_price),
-            vat: product.vat,
+            netPrice: Number(product.net_price),
+            promotionalNetPrice: Number(product.promotional_net_price),
+            vat: Number(product.vat),
             color: product.color,
-            quantity: product.quantity,
+            quantity: Number(product.quantity),
             width: product.width,
             height: product.height,
             length: product.length,

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.article_number, productRow.title, productRow.subtitle, productRow.description, productRow.net_price, productRow.promotional_net_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.article_number, productRow.title, productRow.description, productRow.net_price, productRow.promotional_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/Address.d.ts

@@ -8,7 +8,7 @@ export default class Address extends StockObject {
     private apartmentNumber;
     constructor(country: string, city: string, street: string, postalCode: string, houseNumber: string, apartmentNumber?: string | null);
     getData(): {
-        id: string | null;
+        id: number | null;
         country: string;
         city: string;
         street: string;

package/dist/stockObjects/Order.d.ts

@@ -10,7 +10,7 @@ export default class Order extends StockObject {
     private zsiId;
     constructor(email: string, price: number, clientId: string | null, deliveryDetailsId: string, companyDetailsId?: string | null, paymentDetailsId?: string | null, invoice?: boolean);
     getData(): Promise<{
-        id: string | null;
+        id: number | null;
         email: string;
         price: number;
         invoice: boolean;

package/dist/stockObjects/Product.d.ts

@@ -5,7 +5,6 @@ export default class Product extends StockObject {
     private url;
     private articleNumber;
     private title;
-    private subtitle;
     private description;
     private netPrice;
     private promotionalNetPrice;
@@ -21,12 +20,11 @@ export default class Product extends StockObject {
     private file;
     private jsonData;
     private files;
-    constructor(sku: string, url: string, articleNumber: string, title: string, subtitle: string, description: string, netPrice: number, promotionalNetPrice: number | null, vat: number, color: string, quantity: number, width: number, length: number, height: number, fileId: number, jsonData: any, deleted?: boolean);
+    constructor(sku: string, url: string, articleNumber: string, title: string, description: string, netPrice: number, promotionalNetPrice: number | null, vat: number, color: string, quantity: number, width: number, length: number, height: number, fileId: number, jsonData: any, deleted?: boolean);
     getSku(): string;
     getUrl(): string;
     getArticleNumber(): string;
     getTitle(): string;
-    getSubtitle(): string;
     getDescription(): string;
     getNetPrice(): number;
     getPromotionalNetPrice(): number | null;
@@ -43,7 +41,7 @@ export default class Product extends StockObject {
     getFile(): Promise<FileI | null>;
     getFiles(): Promise<FileI[] | null>;
     getData(): {
-        id: string | null;
+        id: number | null;
         sku: string;
         url: string;
         title: string;
@@ -64,7 +62,6 @@ export default class Product extends StockObject {
     setUrl(url: string): string;
     setArticleNumber(articleNumber: string): string;
     setTitle(title: string): string;
-    setSubtitle(subtitle: string): string;
     setDescription(description: string): string;
     setNetPrice(netPrice: number): number;
     setPromotionalNetPrice(promotionalNetPrice: number | null): number | null;

package/dist/stockObjects/Product.js

@@ -8,7 +8,6 @@ export default class Product extends StockObject {
     url;
     articleNumber;
     title;
-    subtitle;
     description;
     netPrice;
     promotionalNetPrice;
@@ -24,13 +23,12 @@ export default class Product extends StockObject {
     file;
     jsonData;
     files;
-    constructor(sku, url, articleNumber, title, subtitle, description, netPrice, promotionalNetPrice, vat, color, quantity, width, length, height, fileId, jsonData, deleted = false) {
+    constructor(sku, url, articleNumber, title, description, netPrice, promotionalNetPrice, vat, color, quantity, width, length, height, fileId, jsonData, deleted = false) {
         super();
         this.sku = sku;
         this.url = url;
         this.articleNumber = articleNumber;
         this.title = title;
-        this.subtitle = subtitle;
         this.description = description;
         this.netPrice = netPrice;
         this.promotionalNetPrice = promotionalNetPrice;
@@ -59,9 +57,6 @@ export default class Product extends StockObject {
     getTitle() {
         return this.title;
     }
-    getSubtitle() {
-        return this.subtitle;
-    }
     getDescription() {
         return this.description;
     }
@@ -155,9 +150,6 @@ export default class Product extends StockObject {
     setTitle(title) {
         return this.title = title;
     }
-    setSubtitle(subtitle) {
-        return this.subtitle = subtitle;
-    }
     setDescription(description) {
         return this.description = description;
     }

package/dist/tables/TableNames.d.ts

@@ -2,7 +2,6 @@ declare enum TableNames {
     adminAccounts = "adminAccountsTable",
     clientAccounts = "clientAccountsTable",
     accountDeliveryDetails = "accountDeliveryDetailsTable",
-    accountCart = "accountCartTable",
     accountCompanyDetails = "accountCompanyDetailsTable",
     fileConnections = "fileConnectionsTable",
     files = "filesTable",

package/dist/tables/TableNames.js

@@ -3,7 +3,6 @@ var TableNames;
     TableNames["adminAccounts"] = "adminAccountsTable";
     TableNames["clientAccounts"] = "clientAccountsTable";
     TableNames["accountDeliveryDetails"] = "accountDeliveryDetailsTable";
-    TableNames["accountCart"] = "accountCartTable";
     TableNames["accountCompanyDetails"] = "accountCompanyDetailsTable";
     TableNames["fileConnections"] = "fileConnectionsTable";
     TableNames["files"] = "filesTable";

package/dist/tables/public/ProductsTable.js

@@ -67,7 +67,6 @@ export default class ProductsTable extends Table {
         query.bindParameter('url', product.getUrl());
         query.bindParameter('article_number', product.getArticleNumber());
         query.bindParameter('title', product.getTitle());
-        query.bindParameter('subtitle', product.getSubtitle());
         query.bindParameter('description', product.getDescription());
         query.bindParameter('net_price', product.getNetPrice());
         query.bindParameter('promotional_net_price', product.getPromotionalNetPrice());

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

@@ -2,10 +2,10 @@ export default interface OrderProductRow {
     id: string;
     order_id: string;
     product_id: string;
-    net_price: number;
-    installation_price: number;
+    net_price: string;
+    installation_price: string;
     title: string;
     sku: string;
-    vat: number;
+    vat: string;
     file_id: string;
 }

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

@@ -4,7 +4,6 @@ export default interface ProductRow {
     article_number: string;
     url: string;
     title: string;
-    subtitle: string;
     description: string;
     file_id: string;
     net_price: number;

package/dist/utils/PriceConverter.d.ts

@@ -1,5 +1,4 @@
 export default class PriceConverter {
     static netToGrossPrice(netPrice: number, vatPercentage?: number): number;
-    static grossToNetPrice(grossPrice: number, vatPercentage?: number): string;
-    static priceToPenny(price: number): number;
+    static grossToNetPrice(grossPrice: number, vatPercentage?: number): number;
 }

package/dist/utils/PriceConverter.js

@@ -3,14 +3,12 @@ export default class PriceConverter {
         const netPriceInPenny = Math.round(netPrice * 100);
         const vatPriceInPenny = Math.round((netPriceInPenny * vatPercentage) / 100);
         const grossPriceInPenny = netPriceInPenny + vatPriceInPenny;
-        return grossPriceInPenny;
+        const grossPrice = (grossPriceInPenny / 100).toFixed(2);
+        return Number(grossPrice);
     }
     static grossToNetPrice(grossPrice, vatPercentage = 23) {
         const grossPriceInPenny = Math.round(grossPrice * 100);
         const netPrice = ((grossPriceInPenny / (vatPercentage / 100 + 1)) / 100).toFixed(2);
-        return netPrice;
-    }
-    static priceToPenny(price) {
-        return Math.round(price * 100);
+        return Number(netPrice);
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dascompany/product",
-  "version": "4.0.2",
+  "version": "4.0.5",
   "main": "dist/index.js",
   "scripts": {
     "test": "vitest",
@@ -20,7 +20,7 @@
     "vitest": "^3.0.6"
   },
   "peerDependencies": {
-    "@dascompany/database": "^4.0.5",
+    "@dascompany/database": "4.0.8",
     "@types/pg": "^8.11.11",
     "pg": "^8.13.3"
   }

package/dist/reader/AccountCartReader.d.ts

@@ -1,5 +0,0 @@
-import ProductI from "../types/ProductI";
-export default class AccountCartReader {
-    static getAll(accountId: string, productId: string): Promise<ProductI[]>;
-    private static correctAccountCart;
-}

package/dist/reader/AccountCartReader.js

@@ -1,17 +0,0 @@
-import DatabaseConnection from "../DatabaseConnection";
-import createQueryOptionsForId from "../utils/createQueryOptionsForId";
-import ProductReader from "./ProductReader";
-export default class AccountCartReader {
-    static async getAll(accountId, productId) {
-        const accountCart = await DatabaseConnection.getInstance().accountCart.selectAll(accountId, productId);
-        return this.correctAccountCart(accountCart);
-    }
-    static async correctAccountCart(accountCart) {
-        const correctAccountCart = [];
-        for (let i = 0; i < accountCart.length; i++) {
-            const product = await ProductReader.get(createQueryOptionsForId(accountCart[i].product_id));
-            correctAccountCart.push(product);
-        }
-        return correctAccountCart;
-    }
-}

package/dist/tables/clients/AccountCartTable.d.ts

@@ -1,8 +0,0 @@
-import { Table } from '@dascompany/database';
-import AccountCartRow from '../../types/rows/AccountCartRow';
-export default class AccountCartTable extends Table {
-    selectAll(accountId: string, productId: string): Promise<AccountCartRow[]>;
-    delete(accountId: string, productId: string): Promise<void>;
-    insert(accountId: string, productId: string): Promise<void>;
-    private bindParams;
-}

package/dist/tables/clients/AccountCartTable.js

@@ -1,25 +0,0 @@
-import { Table } from '@dascompany/database';
-import * as SQL from '../../SQL.json';
-export default class AccountCartTable extends Table {
-    async selectAll(accountId, productId) {
-        const query = this.createQuery(SQL.accountCart.select);
-        this.bindParams(query, accountId, productId);
-        const result = await query.execute();
-        return result.getRows();
-    }
-    async delete(accountId, productId) {
-        const query = this.createQuery(SQL.accountCart.delete);
-        this.bindParams(query, accountId, productId);
-        await query.execute();
-    }
-    async insert(accountId, productId) {
-        const query = this.createQuery(SQL.accountCart.insert);
-        this.bindParams(query, accountId, productId);
-        await query.execute();
-    }
-    bindParams(query, accountId, productId) {
-        console.log(query, accountId, productId);
-        query.bindParameter('account_id', accountId);
-        query.bindParameter('product_id', productId);
-    }
-}

package/dist/types/AccountDeliveryDetailsI.d.ts

@@ -1,7 +0,0 @@
-import AddressI from "./AddressI";
-export default interface AccountDeliveryDetailsI {
-    id: number;
-    accountId: number;
-    address: AddressI;
-    personalData: number;
-}

package/dist/types/AccountDeliveryDetailsI.js

@@ -1 +0,0 @@
-export {};

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

@@ -1,4 +0,0 @@
-export default interface AccountCartRow {
-    account_id: string;
-    product_id: string;
-}

package/dist/types/rows/AccountCartRow.js

@@ -1 +0,0 @@
-export {};

package/dist/utils/AccountCart.d.ts

@@ -1,4 +0,0 @@
-export default class AccountCart {
-    static delete(accountId: string, productId: string): Promise<boolean>;
-    static insert(accountId: string, productId: string): Promise<boolean>;
-}

package/dist/utils/AccountCart.js

@@ -1,11 +0,0 @@
-import DatabaseConnection from "../DatabaseConnection";
-export default class AccountCart {
-    static async delete(accountId, productId) {
-        await DatabaseConnection.getInstance().accountCart.delete(accountId, productId);
-        return true;
-    }
-    static async insert(accountId, productId) {
-        await DatabaseConnection.getInstance().accountCart.insert(accountId, productId);
-        return true;
-    }
-}