@dascompany/database 0.0.5 → 0.0.7

package/dist/SQL.json

@@ -69,24 +69,31 @@
         "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  WHERE id = $id::BIGINT",
         "delete": "UPDATE products SET deleted = true WHERE id = $id::BIGINT",
         "restore": "UPDATE products SET deleted = false WHERE id = $id::BIGINT",
-        "selectForSku": "SELECT id as product_id FROM products WHERE LOWER( sku ) = LOWER($sku::TEXT)",
+        "selectForSku": "SELECT * FROM products WHERE LOWER( sku ) = LOWER($sku::TEXT)",
         "selectForUrl": "SELECT id, sku, url, title, description, net_price, vat, color, quantity, width, height, length, file_id, created_at, deleted FROM products WHERE LOWER( url ) = LOWER($url::TEXT)",
         "selectNextId": "SELECT nextval('product_id'::regclass)",
         "count": "SELECT COUNT(*) AS total_rows FROM products WHERE deleted = false $PARAMS"
     },
     "orders": {
+        "selectAll": "SELECT id, email, price, client_id, contact_details_id, delivery_details_id, invoice_details_id, payment_details_id, zsi_id FROM orders.orders",
         "select": "SELECT id, email, price, client_id, contact_details_id, delivery_details_id, invoice_details_id, payment_details_id, zsi_id FROM orders.orders WHERE id = $id::BIGINT",
         "selectForClient": "SELECT id, email, price, client_id, contact_details_id, delivery_details_id, invoice_details_id, payment_details_id FROM orders.orders WHERE client_id = $client_id::BIGINT ORDER BY id DESC",
         "insert": "INSERT INTO orders.orders( id, email, price, client_id, contact_details_id, delivery_details_id, invoice_details_id, payment_details_id ) VALUES ($order_id::BIGINT, $email::TEXT, $price::DOUBLE PRECISION, $client_id::BIGINT,  $contact_details_id::BIGINT, $delivery_details_id::BIGINT , $invoice_details_id::BIGINT, $payment_details_id::BIGINT )",
         "update": "UPDATE orders.orders SET price = $price::DOUBLE PRECISION, contact_details_id = $contact_details_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",
-        "selectNextId": "SELECT nextval('orders.orders_id'::regclass)"
+        "selectNextId": "SELECT nextval('orders.orders_id'::regclass)",
+        "count": "SELECT COUNT (*) AS TOTAL_ROWS FROM orders.orders as o JOIN orders.statuses as os ON o.id = os.order_id JOIN (SELECT order_id, MAX(id) as max_id FROM orders.statuses GROUP BY order_id) as latest ON os.order_id = latest.order_id AND os.id = latest.max_id $WHERE"
     },
     "ordersProducts": {
-        "selectForOrder": "SELECT id, order_id, product_id, net_price FROM orders.orders_products WHERE order_id = $order_id::BIGINT AND in_order = true",
-        "insert": "INSERT INTO orders.orders_products( id, order_id, product_id, net_price ) VALUES ($id::BIGINT, $order_id::BIGINT, $product_id::BIGINT, $net_price::DOUBLE PRECISION )",
-        "selectNextId": "SELECT nextval('orders.orders_products_id'::regclass)"
+        "selectProducts": "SELECT op.id, order_id, product_id, title, sku, p.file_id, op.net_price FROM orders.orders_products as op JOIN products as p ON op.product_id = p.id WHERE order_id = $order_id::BIGINT AND in_order = true",
+        "select": "SELECT id, order_id, product_id, in_order FROM orders.orders_products  WHERE order_id = $order_id::BIGINT AND in_order = true",
+        "selectAll": "SELECT * FROM orders.orders_products $WHERE",
+        "getAllActiveForOrderId": "SELECT * FROM orders.orders_products WHERE order_id = $order_id::BIGINT and in_order = true",
+        "insert": "INSERT INTO orders.orders_products( id, order_id, product_id, net_price ) VALUES ( $id::BIGINT , $order_id::BIGINT, $product_id::BIGINT, $net_price::DOUBLE PRECISION )",
+        "selectNextId": "SELECT nextval('orders.orders_products_id'::regclass)",
+        "delete": "UPDATE orders.orders_products SET in_order = false WHERE id = $id::BIGINT"
     },
     "statuses": {
+        "selectLatest": "SELECT s.id, s.order_id, created_at, user_id, s.type as type_id, st.key as type_name FROM orders.statuses as s JOIN orders.status_types as st ON s.type = st.id WHERE s.order_id = $order_id::BIGINT ORDER BY s.id DESC LIMIT 1",
         "selectForOrder": "SELECT s.id, order_id, created_at, user_id, st.key as type FROM orders.statuses as s JOIN orders.status_types as st ON s.type = st.id WHERE order_id = $order_id::BIGINT ORDER BY s.id DESC LIMIT 1",
         "selectAllForOrder": "SELECT s.id, order_id, created_at, user_id, st.key as type FROM orders.statuses as s JOIN orders.status_types as st ON s.type = st.id WHERE order_id = $order_id::BIGINT ORDER BY s.id DESC",
         "insert": "INSERT INTO orders.statuses( id, type, order_id, user_id ) VALUES ($id::BIGINT, $type::BIGINT, $order_id::BIGINT, $user_id::BIGINT)",

package/dist/index.d.ts

@@ -10,6 +10,7 @@ import OrderProductsReader from "./reader/OrderProductsReader";
 import OrderReader from "./reader/OrderReader";
 import FilesReader from './reader/FilesReader';
 import OrderStatusReader from "./reader/OrderStatusReader";
+import OrderStatusRepo from "./repo/OrderStatusRepo";
 import PaymentDetailsReader from "./reader/payment/PaymentDetailsReader";
 import PaymentMethodReader from "./reader/payment/PaymentMethodReader";
 import PaymentStatusesReader from "./reader/payment/PaymentStatusesReader";
@@ -46,7 +47,6 @@ import AdminRepo from './repo/AdminRepo';
 import TableConnection from './TableConnection';
 import ParameterType from './types/parameters/ParameterType';
 import DeliveryStatusReader from './reader/DeliveryStatusReader';
-import FileConnectionE from './types/FileConnectionE';
 import ConnectorE from './types/ConnectorE';
 import ParameterI from './types/ParameterI';
 import QueryOptionsI from './types/QueryOptionsI';
@@ -62,4 +62,8 @@ import FileConnectionsRepo from "./repo/FileConnectionsRepo";
 import CompanyDataReader from "./reader/CompanyDataReader";
 import OrderByI from "./utils/OrderByI";
 import FilesRepo from './repo/FilesRepo';
-export { TableConnection, DatabaseConnection, OrderByI, ParameterType, ConnectorE, FileConnectionE, PaymentStatusE, Parameters, ParameterI, QueryOptionsI, ResultLimitationI, OrderProductI, ParameterFilter, PaymentDetailsReader, FilesReader, PaymentMethodReader, DeliveryStatusReader, PaymentStatusesReader, AddressesReader, ClientAccountReader, CompanyDetailsReader, ContactDetailsReader, DeliveryDetailsReader, DeliveryMethodReader, InvoiceDetailsReader, OrderProductsReader, OrderReader, OrderStatusReader, PersonalDataReader, ProductReader, StatusTypesReader, FileConnectionsReader, CompanyDataReader, DeliveryMethodRepo, AdminRepo, PaymentDetailsRepo, AddressesRepo, ClientAccountRepo, CompanyDetailsRepo, ContactDetailsRepo, DeliveryDetailsRepo, CompanyDataRepo, InvoiceDetailsRepo, OrderRepo, PersonalDataRepo, PaymentMethodRepo, ProductRepo, FileConnectionsRepo, FilesRepo, Address, Admin, Client, CompanyDetails, ContactDetails, DeliveryDetails, InvoiceDetails, DeliveryStatus, Order, OrderProduct, PaymentDetails, PaymentStatus, PersonalData, Product, Status, };
+import File from './stockObjects/File';
+import QueryOptions from './query/QueryOptions';
+import OrderProductsRepo from "./repo/OrderProductsRepo";
+import FileConnectionTypeE from './types/FileConnectionTypeE';
+export { TableConnection, DatabaseConnection, File, OrderByI, ParameterType, ConnectorE, FileConnectionTypeE, PaymentStatusE, Parameters, ParameterI, QueryOptions, QueryOptionsI, ResultLimitationI, OrderProductI, ParameterFilter, PaymentDetailsReader, FilesReader, PaymentMethodReader, DeliveryStatusReader, PaymentStatusesReader, AddressesReader, ClientAccountReader, CompanyDetailsReader, ContactDetailsReader, DeliveryDetailsReader, DeliveryMethodReader, InvoiceDetailsReader, OrderProductsReader, OrderReader, OrderStatusReader, PersonalDataReader, ProductReader, StatusTypesReader, FileConnectionsReader, CompanyDataReader, DeliveryMethodRepo, AdminRepo, PaymentDetailsRepo, AddressesRepo, ClientAccountRepo, CompanyDetailsRepo, ContactDetailsRepo, DeliveryDetailsRepo, CompanyDataRepo, InvoiceDetailsRepo, OrderRepo, PersonalDataRepo, PaymentMethodRepo, ProductRepo, FileConnectionsRepo, FilesRepo, OrderProductsRepo, OrderStatusRepo, Address, Admin, Client, CompanyDetails, ContactDetails, DeliveryDetails, InvoiceDetails, DeliveryStatus, Order, OrderProduct, PaymentDetails, PaymentStatus, PersonalData, Product, Status, };

package/dist/index.js

@@ -10,6 +10,7 @@ import OrderProductsReader from "./reader/OrderProductsReader";
 import OrderReader from "./reader/OrderReader";
 import FilesReader from './reader/FilesReader';
 import OrderStatusReader from "./reader/OrderStatusReader";
+import OrderStatusRepo from "./repo/OrderStatusRepo";
 import PaymentDetailsReader from "./reader/payment/PaymentDetailsReader";
 import PaymentMethodReader from "./reader/payment/PaymentMethodReader";
 import PaymentStatusesReader from "./reader/payment/PaymentStatusesReader";
@@ -46,7 +47,6 @@ import AdminRepo from './repo/AdminRepo';
 import TableConnection from './TableConnection';
 import ParameterType from './types/parameters/ParameterType';
 import DeliveryStatusReader from './reader/DeliveryStatusReader';
-import FileConnectionE from './types/FileConnectionE';
 import ConnectorE from './types/ConnectorE';
 import PaymentStatusE from './types/PaymentStatusE';
 import Parameters from './utils/Parameters';
@@ -56,4 +56,8 @@ import FileConnectionsReader from "./reader/FileConnectionsReader";
 import FileConnectionsRepo from "./repo/FileConnectionsRepo";
 import CompanyDataReader from "./reader/CompanyDataReader";
 import FilesRepo from './repo/FilesRepo';
-export { TableConnection, DatabaseConnection, ParameterType, ConnectorE, FileConnectionE, PaymentStatusE, Parameters, PaymentDetailsReader, FilesReader, PaymentMethodReader, DeliveryStatusReader, PaymentStatusesReader, AddressesReader, ClientAccountReader, CompanyDetailsReader, ContactDetailsReader, DeliveryDetailsReader, DeliveryMethodReader, InvoiceDetailsReader, OrderProductsReader, OrderReader, OrderStatusReader, PersonalDataReader, ProductReader, StatusTypesReader, FileConnectionsReader, CompanyDataReader, DeliveryMethodRepo, AdminRepo, PaymentDetailsRepo, AddressesRepo, ClientAccountRepo, CompanyDetailsRepo, ContactDetailsRepo, DeliveryDetailsRepo, CompanyDataRepo, InvoiceDetailsRepo, OrderRepo, PersonalDataRepo, PaymentMethodRepo, ProductRepo, FileConnectionsRepo, FilesRepo, Address, Admin, Client, CompanyDetails, ContactDetails, DeliveryDetails, InvoiceDetails, DeliveryStatus, Order, OrderProduct, PaymentDetails, PaymentStatus, PersonalData, Product, Status, };
+import File from './stockObjects/File';
+import QueryOptions from './query/QueryOptions';
+import OrderProductsRepo from "./repo/OrderProductsRepo";
+import FileConnectionTypeE from './types/FileConnectionTypeE';
+export { TableConnection, DatabaseConnection, File, ParameterType, ConnectorE, FileConnectionTypeE, PaymentStatusE, Parameters, QueryOptions, PaymentDetailsReader, FilesReader, PaymentMethodReader, DeliveryStatusReader, PaymentStatusesReader, AddressesReader, ClientAccountReader, CompanyDetailsReader, ContactDetailsReader, DeliveryDetailsReader, DeliveryMethodReader, InvoiceDetailsReader, OrderProductsReader, OrderReader, OrderStatusReader, PersonalDataReader, ProductReader, StatusTypesReader, FileConnectionsReader, CompanyDataReader, DeliveryMethodRepo, AdminRepo, PaymentDetailsRepo, AddressesRepo, ClientAccountRepo, CompanyDetailsRepo, ContactDetailsRepo, DeliveryDetailsRepo, CompanyDataRepo, InvoiceDetailsRepo, OrderRepo, PersonalDataRepo, PaymentMethodRepo, ProductRepo, FileConnectionsRepo, FilesRepo, OrderProductsRepo, OrderStatusRepo, Address, Admin, Client, CompanyDetails, ContactDetails, DeliveryDetails, InvoiceDetails, DeliveryStatus, Order, OrderProduct, PaymentDetails, PaymentStatus, PersonalData, Product, Status, };

package/dist/mappers/ProductMapper.js

@@ -13,6 +13,8 @@ export default class ProductMapper {
             await this.productTable.insert(this.product);
     }
     async delete() {
-        await this.productTable.delete(this.product.getId());
+        const id = this.product.getId();
+        if (id)
+            await this.productTable.delete(id);
     }
 }

package/dist/reader/CompanyDataReader.js

@@ -20,7 +20,7 @@ export default class CompanyDataReader {
                 name: '',
                 taxNumber: '',
                 phoneNumber: '',
-                address: {}
+                address: null
             };
         }
     }

package/dist/reader/FilesReader.d.ts

@@ -1,4 +1,4 @@
-import FileConnectionE from "../types/FileConnectionE";
+import FileConnectionTypeE from "../types/FileConnectionTypeE";
 import FileI from "../types/FileI";
 import QueryOptionsI from "../types/QueryOptionsI";
 export default class FilesReader {
@@ -6,7 +6,7 @@ export default class FilesReader {
     static getAll(queryOptions: QueryOptionsI): Promise<FileI[]>;
     static isExist(queryOptions: QueryOptionsI): Promise<number>;
     static getQuantity(queryOptions: any): Promise<number>;
-    static getForConnection(connectionType: FileConnectionE, connectionId: number): Promise<FileI[]>;
+    static getForConnection(connectionType: FileConnectionTypeE, connectionId: number): Promise<FileI[]>;
     private static correctFiles;
     private static correctFile;
 }

package/dist/reader/OrderProductsReader.d.ts

@@ -1,6 +1,10 @@
 import OrderProductI from "../types/OrderProductI";
 export default class OrderProductsReader {
-    static getForOrder(orderId: number): Promise<OrderProductI[]>;
+    static getForOrder(orderId: number): Promise<any[]>;
     static getAll(orderId: number): Promise<OrderProductI[]>;
     private static correctProduct;
+    static get(orderId: number): Promise<OrderProductI[]>;
+    static getAllForIds(orderProductsIds: number[]): Promise<any[]>;
+    private static correctOrdersProducts;
+    private static correctOrderProduct;
 }

package/dist/reader/OrderProductsReader.js

@@ -1,4 +1,6 @@
 import DatabaseConnection from "../DatabaseConnection";
+import ConnectorE from "../types/ConnectorE";
+import ParameterType from "../types/parameters/ParameterType";
 import calculateNetToGrossPrice from "../utils/calculateNetToGrossPrice";
 import FilesReader from "./FilesReader";
 import ProductReader from "./ProductReader";
@@ -47,4 +49,44 @@ export default class OrderProductsReader {
         };
         return correctProduct;
     }
+    static async get(orderId) {
+        const connection = DatabaseConnection.get();
+        const orderProducts = await connection.ordersProducts.selectProducts(orderId);
+        for (const product of orderProducts) {
+            const file = await FilesReader.get(product.file_id);
+            product.file = file;
+        }
+        return this.correctOrdersProducts(orderProducts);
+    }
+    static async getAllForIds(orderProductsIds) {
+        const connection = DatabaseConnection.get();
+        const queryOptions = {
+            where: {
+                connector: ConnectorE.and,
+                parameters: [
+                    { name: 'id', type: ParameterType.arrayBigint, value: orderProductsIds },
+                ]
+            }
+        };
+        const orderProducts = await connection.ordersProducts.selectAllForIds(queryOptions);
+        return orderProducts;
+    }
+    static correctOrdersProducts(productRows) {
+        const products = [];
+        for (let i = 0; i < productRows.length; i++) {
+            const product = this.correctOrderProduct(productRows[i]);
+            products.push(product);
+        }
+        return products;
+    }
+    static correctOrderProduct(product) {
+        return {
+            orderProductId: product.id,
+            netPrice: product.net_price,
+            id: product.product_id,
+            title: product.title,
+            sku: product.sku,
+            file: product.file
+        };
+    }
 }

package/dist/reader/OrderReader.d.ts

@@ -1,6 +1,12 @@
 import OrderI from "../types/OrderI";
+import QueryOptionsI from "../types/QueryOptionsI";
 export default class OrderReader {
     static get(orderId: number): Promise<OrderI>;
     static getForClient(clientAccountId: number): Promise<OrderI[]>;
+    static getAll(queryOptions: QueryOptionsI): Promise<{
+        orders: OrderI[];
+        quantity: number;
+    }>;
+    private static correctOrders;
     private static correctOrder;
 }

package/dist/reader/OrderReader.js

@@ -19,6 +19,20 @@ export default class OrderReader {
         }
         return correctOrders;
     }
+    static async getAll(queryOptions) {
+        const connection = DatabaseConnection.get();
+        const orders = await connection.orders.selectAll(queryOptions);
+        const quantity = await connection.orders.count(queryOptions);
+        return { orders: this.correctOrders(orders), quantity };
+    }
+    static correctOrders(orderRows) {
+        const orders = [];
+        for (let i = 0; i < orderRows.length; i++) {
+            const order = this.correctOrder(orderRows[i]);
+            orders.push(order);
+        }
+        return orders;
+    }
     static correctOrder(order) {
         const correctOrder = {
             id: order.id,

package/dist/reader/ProductReader.d.ts

@@ -2,10 +2,11 @@ import ProductI from "../types/ProductI";
 import QueryOptionsI from "../types/QueryOptionsI";
 export default class ProductReader {
     static get(productId: number): Promise<ProductI>;
+    static getIdForSku(productSku: string): Promise<number>;
     static getForUrl(productUrl: string): Promise<ProductI>;
-    static getListForOrder(): Promise<any>;
     static getAll(queryOptions: QueryOptionsI): Promise<ProductI[]>;
     static getQuantity(queryOptions: QueryOptionsI): Promise<number>;
+    static getListForOrder(): Promise<any>;
     private static correctProducts;
     private static correctProduct;
     private static correctProductForOrderList;

package/dist/reader/ProductReader.js

@@ -1,17 +1,34 @@
 import DatabaseConnection from "../DatabaseConnection";
+import FileConnectionTypeE from "../types/FileConnectionTypeE";
 import calculateNetToGrossPrice from "../utils/calculateNetToGrossPrice";
 import FilesReader from "./FilesReader";
 export default class ProductReader {
     static async get(productId) {
         const connection = DatabaseConnection.get();
         const product = await connection.products.select(productId);
-        return this.correctProduct(product);
+        const thumbnail = await FilesReader.get(product.file_id);
+        const files = await FilesReader.getForConnection(FileConnectionTypeE.product, product.id);
+        return this.correctProduct(product, thumbnail, files);
+    }
+    static async getIdForSku(productSku) {
+        const connection = DatabaseConnection.get();
+        return await connection.products.selectIdForSku(productSku);
     }
     static async getForUrl(productUrl) {
         const connection = DatabaseConnection.get();
         const product = await connection.products.selectForUrl(productUrl);
         return this.correctProduct(product);
     }
+    static async getAll(queryOptions) {
+        const connection = DatabaseConnection.get();
+        const products = await connection.products.selectAll(queryOptions);
+        return this.correctProducts(products);
+    }
+    static async getQuantity(queryOptions) {
+        const connection = DatabaseConnection.get();
+        const quantity = await connection.products.count(queryOptions);
+        return quantity;
+    }
     static async getListForOrder() {
         const connection = DatabaseConnection.get();
         let correctProducts = [];
@@ -23,16 +40,6 @@ export default class ProductReader {
         }
         return correctProducts;
     }
-    static async getAll(queryOptions) {
-        const connection = DatabaseConnection.get();
-        const products = await connection.products.selectAll(queryOptions);
-        return this.correctProducts(products);
-    }
-    static async getQuantity(queryOptions) {
-        const connection = DatabaseConnection.get();
-        const quantity = await connection.products.count(queryOptions);
-        return quantity;
-    }
     static correctProducts(products) {
         const correctProducts = [];
         for (let i = 0; i < products.length; i++) {
@@ -41,7 +48,7 @@ export default class ProductReader {
         }
         return correctProducts;
     }
-    static correctProduct(product) {
+    static correctProduct(product, thumbnail, files) {
         return {
             id: product.id,
             sku: product.sku,
@@ -55,9 +62,10 @@ export default class ProductReader {
             width: product.width,
             height: product.height,
             length: product.length,
-            fileId: product.file_id,
             createdAt: product.created_at,
             deleted: product.deleted,
+            thumbnail: thumbnail ? thumbnail : null,
+            files: files,
             grossPrice: calculateNetToGrossPrice(product.net_price, product.vat)
         };
     }

package/dist/repo/FilesRepo.d.ts

@@ -1,7 +1,7 @@
-import FileConnectionE from "../types/FileConnectionE";
+import FileConnectionTypeE from "../types/FileConnectionTypeE";
 export default class FilesRepo {
     static get(fileId: number): Promise<any>;
-    static getAllForConnection(connectionType: FileConnectionE, connectionId: number): Promise<any>;
+    static getAllForConnection(connectionType: FileConnectionTypeE, connectionId: number): Promise<any>;
     private static createFilesFromRows;
     private static createFileFromRow;
 }

package/dist/repo/OrderProductsRepo.d.ts

@@ -0,0 +1,7 @@
+import OrderProduct from "../stockObjects/OrderProduct";
+export default class OrderProductsRepo {
+    static getAllActiveForOrderId(orderId: number): Promise<OrderProduct[]>;
+    static getAllForIds(orderProductsIds: number[]): Promise<OrderProduct[]>;
+    private static createOrdersProductsFromRows;
+    private static createOrdersProductFromRow;
+}

package/dist/repo/OrderProductsRepo.js

@@ -0,0 +1,37 @@
+import DatabaseConnection from "../DatabaseConnection";
+import OrderProduct from "../stockObjects/OrderProduct";
+import ConnectorE from "../types/ConnectorE";
+import ParameterType from "../types/parameters/ParameterType";
+export default class OrderProductsRepo {
+    static async getAllActiveForOrderId(orderId) {
+        const connection = DatabaseConnection.get();
+        const orderProducts = await connection.ordersProducts.selectAll(orderId);
+        return this.createOrdersProductsFromRows(orderProducts);
+    }
+    static async getAllForIds(orderProductsIds) {
+        const connection = DatabaseConnection.get();
+        const queryOptions = {
+            where: {
+                connector: ConnectorE.and,
+                parameters: [
+                    { name: 'id', type: ParameterType.arrayBigint, value: orderProductsIds },
+                ]
+            }
+        };
+        const orderProducts = await connection.ordersProducts.selectAllForIds(queryOptions);
+        return this.createOrdersProductsFromRows(orderProducts);
+    }
+    static async createOrdersProductsFromRows(dataRows) {
+        const products = [];
+        for (const dataRow of dataRows) {
+            const product = await this.createOrdersProductFromRow(dataRow);
+            products.push(product);
+        }
+        return products;
+    }
+    static async createOrdersProductFromRow(dataRow) {
+        const orderProduct = new OrderProduct(dataRow.order_id, dataRow.product_id, dataRow.net_price, dataRow.in_order);
+        orderProduct.setId(dataRow.id);
+        return orderProduct;
+    }
+}

package/dist/repo/OrderStatusRepo.d.ts

@@ -0,0 +1,7 @@
+import Status from "../stockObjects/Status";
+export default class OrderStatusRepo {
+    static get(orderId: number): Promise<Status>;
+    static getAll(orderId: number): Promise<Status[]>;
+    private static createStatusesFromRows;
+    private static createStatusFromRow;
+}

package/dist/repo/OrderStatusRepo.js

@@ -0,0 +1,27 @@
+import DatabaseConnection from "../DatabaseConnection";
+import Status from "../stockObjects/Status";
+export default class OrderStatusRepo {
+    static async get(orderId) {
+        const connection = DatabaseConnection.get();
+        const status = await connection.statuses.selectLatest(orderId);
+        return this.createStatusFromRow(status);
+    }
+    static async getAll(orderId) {
+        const connection = DatabaseConnection.get();
+        const statuses = await connection.statuses.selectAllForOrder(orderId);
+        return this.createStatusesFromRows(statuses);
+    }
+    static async createStatusesFromRows(dataRows) {
+        const statuses = [];
+        for (const dataRow of dataRows) {
+            const status = await this.createStatusFromRow(dataRow);
+            statuses.push(status);
+        }
+        return statuses;
+    }
+    static async createStatusFromRow(dataRow) {
+        const status = new Status(dataRow.order_id, dataRow.user_id, dataRow.type_id, dataRow.type_name, dataRow.created_at);
+        status.setId(dataRow.id);
+        return status;
+    }
+}

package/dist/repo/ProductRepo.js

@@ -9,6 +9,7 @@ export default class ProductRepo {
     static async getForSku(productSku) {
         const connection = DatabaseConnection.get();
         const product = await connection.products.selectForSku(productSku);
+        console.log(product);
         return this.createProductFromRow(product);
     }
     static createProductFromRow(productRow) {

package/dist/stockObjects/Order.d.ts

@@ -36,5 +36,6 @@ export default class Order extends StockObject {
     setInvoiceDetailsId(invoiceDetailsId: number): void;
     setPaymentDetailsId(paymentDetailsId: number): void;
     setZsiId(zsiId: number): void;
+    calculateAndUpdatePrice(): Promise<void>;
     protected getMapper(): StockObjectMapper;
 }

package/dist/stockObjects/Order.js

@@ -1,4 +1,5 @@
 import OrderMapper from "../mappers/OrderMapper";
+import OrderProductsRepo from "../repo/OrderProductsRepo";
 import StockObject from "../types/StockObject";
 import calculateNetToGrossPrice from "../utils/calculateNetToGrossPrice";
 export default class Order extends StockObject {
@@ -82,6 +83,14 @@ export default class Order extends StockObject {
     setZsiId(zsiId) {
         this.zsiId = zsiId;
     }
+    async calculateAndUpdatePrice() {
+        let totalPrice = 0;
+        const orderProducts = await OrderProductsRepo.getAllActiveForOrderId(this.getId());
+        for (const product of orderProducts) {
+            totalPrice += product.getNetPrice();
+        }
+        this.setPrice(totalPrice);
+    }
     getMapper() {
         return new OrderMapper(this);
     }

package/dist/stockObjects/OrderProduct.d.ts

@@ -5,7 +5,7 @@ export default class OrderProduct extends StockObject {
     private productId;
     private netPrice;
     private inOrder;
-    constructor(orderId: number, productId: number, netPrice: number);
+    constructor(orderId: number, productId: number, netPrice: number, inOrder: boolean);
     getOrderId(): number;
     getProductId(): number;
     getNetPrice(): number;

package/dist/stockObjects/OrderProduct.js

@@ -5,12 +5,12 @@ export default class OrderProduct extends StockObject {
     productId;
     netPrice;
     inOrder;
-    constructor(orderId, productId, netPrice) {
+    constructor(orderId, productId, netPrice, inOrder) {
         super();
         this.orderId = orderId;
         this.productId = productId;
         this.netPrice = netPrice;
-        this.inOrder = true;
+        this.inOrder = inOrder;
     }
     getOrderId() {
         return this.orderId;

package/dist/stockObjects/Product.js

@@ -1,6 +1,6 @@
 import ProductMapper from "../mappers/ProductMapper";
 import FilesReader from "../reader/FilesReader";
-import FileConnectionE from "../types/FileConnectionE";
+import FileConnectionTypeE from "../types/FileConnectionTypeE";
 import StockObject from "../types/StockObject";
 import calculateNetToGrossPrice from "../utils/calculateNetToGrossPrice";
 export default class Product extends StockObject {
@@ -90,7 +90,7 @@ export default class Product extends StockObject {
         if (!this.files) {
             const id = this.getId();
             if (id) {
-                const files = await FilesReader.getForConnection(FileConnectionE.product, id);
+                const files = await FilesReader.getForConnection(FileConnectionTypeE.product, id);
                 this.files = files;
             }
         }

package/dist/stockObjects/Status.d.ts

@@ -3,13 +3,21 @@ import StockObjectMapper from "../types/StockObjectMapper";
 export default class Status extends StockObject {
     private orderId;
     private userId;
-    private type;
-    constructor(orderId: number, userId: number, type: number);
+    private typeId;
+    private typeName;
+    private createdAt;
+    constructor(orderId: number, userId: number, typeId: number, typeName?: string | null, createdAt?: string | null);
     getOrderId(): number;
+    getCreatedAt(): string | null;
     getUserId(): number;
-    getType(): number;
-    setUserId(userId: number): void;
-    setType(type: number): void;
+    getTypeId(): number;
+    getType(): {
+        id: number;
+        name: string | null;
+    };
     setOrderId(orderId: number): void;
+    setCreatedAt(createdAt: string): void;
+    setUserId(userId: number): void;
+    setTypeId(typeId: number): void;
     protected getMapper(): StockObjectMapper;
 }

package/dist/stockObjects/Status.js

@@ -3,30 +3,46 @@ import StockObject from "../types/StockObject";
 export default class Status extends StockObject {
     orderId;
     userId;
-    type;
-    constructor(orderId, userId, type) {
+    typeId;
+    typeName;
+    createdAt;
+    constructor(orderId, userId, typeId, typeName = null, createdAt = null) {
         super();
         this.orderId = orderId;
         this.userId = userId;
-        this.type = type;
+        this.typeId = typeId;
+        this.typeName = typeName;
+        this.createdAt = createdAt;
     }
     getOrderId() {
         return this.orderId;
     }
+    getCreatedAt() {
+        return this.createdAt;
+    }
     getUserId() {
         return this.userId;
     }
+    getTypeId() {
+        return this.typeId;
+    }
     getType() {
-        return this.type;
+        return {
+            id: this.typeId,
+            name: this.typeName
+        };
+    }
+    setOrderId(orderId) {
+        this.orderId = orderId;
+    }
+    setCreatedAt(createdAt) {
+        this.createdAt = createdAt;
     }
     setUserId(userId) {
         this.userId = userId;
     }
-    setType(type) {
-        this.type = type;
-    }
-    setOrderId(orderId) {
-        this.orderId = orderId;
+    setTypeId(typeId) {
+        this.typeId = typeId;
     }
     getMapper() {
         return new StatusMapper(this);

package/dist/tables/files/FileConnectionsTable.d.ts

@@ -1,9 +1,9 @@
 import Table from '../../Table';
-import FileConnectionE from '../../types/FileConnectionE';
+import FileConnectionTypeE from '../../types/FileConnectionTypeE';
 import FileConnection from '../../stockObjects/FileConnection';
 import FileConnectionRow from '../../types/rows/FileConnectionRow';
 export default class FileConnectionsTable extends Table {
-    select(connectionType: FileConnectionE, connection_id: number): Promise<any[]>;
+    select(connectionType: FileConnectionTypeE, connection_id: number): Promise<any[]>;
     selectForFileId(fileId: number): Promise<FileConnectionRow[]>;
     insert(fileConnection: FileConnection): Promise<void>;
     delete(fileId: number): Promise<boolean>;

package/dist/tables/files/FilesTable.d.ts

@@ -1,13 +1,13 @@
 import Table from '../../Table';
 import FileRow from '../../types/rows/FileRow';
-import FileConnectionE from '../../types/FileConnectionE';
+import FileConnectionTypeE from '../../types/FileConnectionTypeE';
 import QueryOptionsI from '../../types/QueryOptionsI';
 import File from '../../stockObjects/File';
 export default class FilesTable extends Table {
     selectId(queryOptions: QueryOptionsI): Promise<number>;
     selectAll(queryOptions: QueryOptionsI): Promise<FileRow[]>;
     select(fileId: number): Promise<FileRow>;
-    selectForConnection(connectionType: FileConnectionE, connectionId: number): Promise<FileRow[]>;
+    selectForConnection(connectionType: FileConnectionTypeE, connectionId: number): Promise<FileRow[]>;
     insert(file: File): Promise<boolean>;
     update(fileData: File): Promise<boolean>;
     count(queryOptions: QueryOptionsI): Promise<number>;

package/dist/tables/orders/OrdersProductsTable.d.ts

@@ -1,8 +1,14 @@
 import Table from '../../Table';
 import OrderProductRow from '../../types/rows/OrderProductRow';
 import OrderProduct from '../../stockObjects/OrderProduct';
+import QueryOptionsI from '../../types/QueryOptionsI';
 export default class OrdersProductsTable extends Table {
     selectAll(orderId: number): Promise<OrderProductRow[]>;
-    insert(orderProduct: OrderProduct): Promise<void>;
+    getAllActiveForOrderId(orderId: number): Promise<OrderProduct[]>;
+    selectProducts(orderId: number): Promise<OrderProductRow[]>;
+    selectAllForIds(queryOprions: QueryOptionsI): Promise<OrderProduct[]>;
+    delete(orderProduct: OrderProduct): Promise<boolean>;
+    private bindParams;
+    insert(orderProduct: OrderProduct): Promise<boolean>;
     private selectNextId;
 }

package/dist/tables/orders/OrdersProductsTable.js

@@ -2,20 +2,49 @@ import Table from '../../Table';
 import * as SQL from '../../SQL.json';
 export default class OrdersProductsTable extends Table {
     async selectAll(orderId) {
-        const query = this.createQuery(SQL.ordersProducts.selectForOrder);
+        const query = this.createQuery(SQL.ordersProducts.getAllActiveForOrderId);
         query.bindParameter('order_id', orderId);
-        const results = await query.execute();
-        return results.getRows();
+        const result = await query.execute();
+        return result.getRows();
     }
-    async insert(orderProduct) {
-        const id = await this.selectNextId();
-        const query = this.createQuery(SQL.ordersProducts.insert);
+    async getAllActiveForOrderId(orderId) {
+        const query = this.createQuery(SQL.ordersProducts.getAllActiveForOrderId);
+        query.bindParameter('order_id', orderId);
+        const result = await query.execute();
+        return result.getRows();
+    }
+    async selectProducts(orderId) {
+        const query = this.createQuery(SQL.ordersProducts.selectProducts);
+        query.bindParameter('order_id', orderId);
+        const result = await query.execute();
+        return result.getRows();
+    }
+    async selectAllForIds(queryOprions) {
+        const query = this.createQuery(SQL.ordersProducts.selectAll, queryOprions);
+        const result = await query.execute();
+        return result.getRows();
+    }
+    async delete(orderProduct) {
+        const query = this.createQuery(SQL.ordersProducts.delete);
+        const id = orderProduct.getId();
         query.bindParameter('id', id);
+        await query.execute();
+        return true;
+    }
+    bindParams(query, orderProduct) {
         query.bindParameter('order_id', orderProduct.getOrderId());
         query.bindParameter('product_id', orderProduct.getProductId());
         query.bindParameter('net_price', orderProduct.getNetPrice());
+        query.bindParameter('in_order', orderProduct.getInOrder());
+    }
+    async insert(orderProduct) {
+        const query = this.createQuery(SQL.ordersProducts.insert);
+        const id = await this.selectNextId();
+        query.bindParameter('id', id);
+        this.bindParams(query, orderProduct);
         await query.execute();
         orderProduct.setId(id);
+        return true;
     }
     async selectNextId() {
         const query = this.createQuery(SQL.ordersProducts.selectNextId);

package/dist/tables/orders/OrdersTable.d.ts

@@ -1,9 +1,12 @@
 import Table from '../../Table';
 import OrderRow from '../../types/rows/OrderRow';
 import Order from '../../stockObjects/Order';
+import QueryOptionsI from '../../types/QueryOptionsI';
 export default class OrdersTable extends Table {
     select(orderId: number): Promise<OrderRow>;
     selectForClient(clientId: number): Promise<OrderRow[]>;
+    selectAll(queryOption: QueryOptionsI): Promise<OrderRow[]>;
+    count(queryOptions?: QueryOptionsI): Promise<number>;
     insert(order: Order): Promise<void>;
     update(order: Order): Promise<void>;
     private bindParameters;

package/dist/tables/orders/OrdersTable.js

@@ -13,6 +13,16 @@ export default class OrdersTable extends Table {
         const result = await query.execute();
         return result.getRows();
     }
+    async selectAll(queryOption) {
+        const query = this.createQuery(SQL.orders.selectAll, queryOption);
+        const result = await query.execute();
+        return result.getRows();
+    }
+    async count(queryOptions) {
+        const query = this.createQuery(SQL.orders.count, queryOptions);
+        const result = await query.execute();
+        return result.getValue();
+    }
     async insert(order) {
         const orderId = await this.selectNextId();
         const query = this.createQuery(SQL.orders.insert);

package/dist/tables/orders/StatusesTable.d.ts

@@ -3,6 +3,7 @@ import Status from '../../stockObjects/Status';
 import StatusRow from '../../types/rows/StatusRow';
 export default class StatusesTable extends Table {
     selectForOrder(orderId: number): Promise<StatusRow>;
+    selectLatest(orderId: number): Promise<StatusRow>;
     selectAllForOrder(orderId: number): Promise<StatusRow[]>;
     insert(status: Status): Promise<void>;
     private bindParameters;

package/dist/tables/orders/StatusesTable.js

@@ -7,6 +7,12 @@ export default class StatusesTable extends Table {
         const result = await query.execute();
         return result.getRow();
     }
+    async selectLatest(orderId) {
+        const query = this.createQuery(SQL.statuses.selectLatest);
+        query.bindParameter('order_id', orderId);
+        const result = await query.execute();
+        return result.getRow();
+    }
     async selectAllForOrder(orderId) {
         const query = this.createQuery(SQL.statuses.selectAllForOrder);
         query.bindParameter('order_id', orderId);

package/dist/types/CompanyDataI.d.ts

@@ -4,5 +4,5 @@ export default interface CompanyDataI {
     name: string;
     taxNumber: string;
     phoneNumber: string;
-    address: AddressI;
+    address: AddressI | null;
 }

package/dist/types/FileConnectionTypeE.d.ts

@@ -0,0 +1,4 @@
+declare enum FileConnectionTypeE {
+    product = "product"
+}
+export default FileConnectionTypeE;

package/dist/types/FileConnectionTypeE.js

@@ -0,0 +1,5 @@
+var FileConnectionTypeE;
+(function (FileConnectionTypeE) {
+    FileConnectionTypeE["product"] = "product";
+})(FileConnectionTypeE || (FileConnectionTypeE = {}));
+export default FileConnectionTypeE;

package/dist/types/OrderProductI.d.ts

@@ -1,9 +1,15 @@
 import FileI from "./FileI";
 export default interface OrderProductI {
-    orderProductId: number;
     id: number;
-    netPrice: number;
-    title: string;
-    sku: string;
-    file: FileI;
+    productId: number;
+    orderId: number;
+    product: {
+        id: number;
+        sku: string;
+        title: string;
+        netPrice: number;
+        grossPrice: number;
+        vat: number;
+        file: FileI;
+    };
 }

package/dist/types/ProductI.d.ts

@@ -14,6 +14,7 @@ export default interface ProductI {
     length: number;
     height: number;
     fileId: number;
+    thumbnail: FileI | null;
     createdAt: string;
     deleted: boolean;
     file?: FileI;

package/dist/types/StatusI.d.ts

@@ -0,0 +1,5 @@
+export default interface StatusI {
+    id: number;
+    typeId: number;
+    key: string;
+}

package/dist/types/StatusI.js

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

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

@@ -9,4 +9,7 @@ export default interface OrderRow {
     invoice_details_id: number;
     payment_details_id: number;
     zsi_id: number;
+    status_id: number;
+    status_name: string;
+    status_type: number;
 }

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

@@ -3,5 +3,6 @@ export default interface StatusRow {
     order_id: number;
     created_at: string;
     user_id: number;
-    type: number;
+    type_id: number;
+    type_name: string;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dascompany/database",
-  "version": "0.0.5",
+  "version": "0.0.7",
   "main": "dist/index.js",
   "scripts": {
     "test": "vitest",

package/dist/types/FileConnectionE.d.ts

@@ -1,4 +0,0 @@
-declare enum FileConnectionE {
-    product = "product"
-}
-export default FileConnectionE;

package/dist/types/FileConnectionE.js

@@ -1,5 +0,0 @@
-var FileConnectionE;
-(function (FileConnectionE) {
-    FileConnectionE["product"] = "product";
-})(FileConnectionE || (FileConnectionE = {}));
-export default FileConnectionE;