@dascompany/product 2.1.3 → 2.1.5

package/dist/reader/OrderReader.js

@@ -1,4 +1,6 @@
+import { ParameterType, QueryOptions } from "@dascompany/database";
 import DatabaseConnection from "../DatabaseConnection";
+import OrderStatusReader from "./OrderStatusReader";
 export default class OrderReader {
     static async get(queryOptions) {
         const orderData = await DatabaseConnection.getInstance().orders.select(queryOptions);
@@ -31,6 +33,9 @@ export default class OrderReader {
         return orders;
     }
     static async correctOrder(order) {
+        const queryOptions = new QueryOptions();
+        queryOptions.setWhere([{ name: 'order_id', type: ParameterType.bigint, value: order.id }]);
+        const status = await OrderStatusReader.get(queryOptions);
         const correctOrder = {
             id: order.id,
             email: order.email,
@@ -41,7 +46,8 @@ export default class OrderReader {
             deliveryDetailsId: order.delivery_details_id,
             invoiceDetailsId: order.invoice_details_id,
             paymentDetailsId: order.payment_details_id,
-            zsiId: order.zsi_id
+            zsiId: order.zsi_id,
+            status
         };
         return correctOrder;
     }

package/dist/reader/ProductReader.js

@@ -5,12 +5,13 @@ import FileConnectionTypeE from "../types/FileConnectionTypeE";
 import PriceConverter from "../utils/PriceConverter";
 export default class ProductReader {
     static async get(queryOption) {
-        const product = await DatabaseConnection.getInstance().products.select(queryOption);
+        const productRow = await DatabaseConnection.getInstance().products.select(queryOption);
         const queryOptionsFiles = new QueryOptions();
-        queryOptionsFiles.setWhere([{ name: 'connection_id', type: ParameterType.bigint, value: product.id }, { name: 'connection_type', type: ParameterType.string, value: FileConnectionTypeE.product }]);
+        queryOptionsFiles.setWhere([{ name: 'connection_id', type: ParameterType.bigint, value: productRow.id }, { name: 'connection_type', type: ParameterType.string, value: FileConnectionTypeE.product }]);
         queryOptionsFiles.setOrderBy([{ key: 'sequence', order: 'asc' }]);
         const files = await FilesReader.getForConnection(queryOptionsFiles);
-        return { ...this.correctProduct(product), files };
+        const product = await this.correctProduct(productRow);
+        return { ...product, files };
     }
     static async getAll(queryOption) {
         const products = await DatabaseConnection.getInstance().products.selectAll(queryOption);

package/dist/types/OrderI.d.ts

@@ -1,3 +1,4 @@
+import StatusI from "./StatusI";
 export default interface OrderI {
     id: number;
     email: string;
@@ -9,4 +10,5 @@ export default interface OrderI {
     invoiceDetailsId: number;
     paymentDetailsId: number;
     zsiId: number;
+    status: StatusI;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dascompany/product",
-  "version": "2.1.3",
+  "version": "2.1.5",
   "main": "dist/index.js",
   "scripts": {
     "test": "vitest",