@dascompany/product 2.1.7 → 2.1.9

package/dist/reader/CompanyDataReader.js

@@ -1,13 +1,11 @@
-import { ParameterType, QueryOptions } from "@dascompany/database";
 import DatabaseConnection from "../DatabaseConnection";
 import AddressesReader from "./AddressesReader";
+import createQueryOptionsForId from "../utils/createQueryOptionsForId";
 export default class CompanyDataReader {
     static async get() {
         const companyData = await DatabaseConnection.getInstance().companyData.select();
         if (companyData) {
-            const queryOptions = new QueryOptions();
-            queryOptions.setWhere([{ name: 'id', type: ParameterType.bigint, value: companyData.address_id }]);
-            const address = companyData?.address_id ? await AddressesReader.get(queryOptions) : null;
+            const address = companyData?.address_id ? await AddressesReader.get(createQueryOptionsForId(companyData.address_id)) : null;
             return {
                 id: companyData.id,
                 name: companyData.name,

package/dist/reader/ContactDetailsReader.js

@@ -1,16 +1,12 @@
-import { ParameterType, QueryOptions } from "@dascompany/database";
 import DatabaseConnection from "../DatabaseConnection";
 import AddressesReader from "./AddressesReader";
 import PersonalDataReader from "./PersonalDataReader";
+import createQueryOptionsForId from "../utils/createQueryOptionsForId";
 export default class ContactDetailsReader {
     static async get(queryOptions) {
         const contactDetails = await DatabaseConnection.getInstance().contactDetails.select(queryOptions);
-        const queryOptionsPersonalData = new QueryOptions();
-        queryOptionsPersonalData.setWhere([{ name: 'id', type: ParameterType.bigint, value: contactDetails.personal_data_id }]);
-        const personalData = await PersonalDataReader.get(queryOptionsPersonalData);
-        const queryOptionsAddress = new QueryOptions();
-        queryOptionsAddress.setWhere([{ name: 'id', type: ParameterType.bigint, value: contactDetails.address_id }]);
-        const address = contactDetails.address_id ? await AddressesReader.get(queryOptionsAddress) : null;
+        const personalData = await PersonalDataReader.get(createQueryOptionsForId(contactDetails.personal_data_id));
+        const address = contactDetails.address_id ? await AddressesReader.get(createQueryOptionsForId(contactDetails.address_id)) : null;
         return {
             id: contactDetails.id,
             personalData,

package/dist/reader/DeliveryDetailsReader.js

@@ -1,8 +1,8 @@
-import { ParameterType, QueryOptions } from "@dascompany/database";
 import DatabaseConnection from "../DatabaseConnection";
 import AddressesReader from "./AddressesReader";
 import DeliveryMethodReader from "./DeliveryMethodReader";
 import PersonalDataReader from "./PersonalDataReader";
+import createQueryOptionsForId from "../utils/createQueryOptionsForId";
 export default class DeliveryDetailsReader {
     static async get(queryOptions) {
         const deliveryDetails = await DatabaseConnection.getInstance().deliveryDetails.select(queryOptions);
@@ -10,21 +10,12 @@ export default class DeliveryDetailsReader {
         let personalData = null;
         let address = null;
         let deliveryMethod = null;
-        if (deliveryDetails.personal_data_id) {
-            const queryOptionsPersonalData = new QueryOptions();
-            queryOptionsPersonalData.setWhere([{ name: 'id', type: ParameterType.bigint, value: deliveryDetails.personal_data_id }]);
-            personalData = await PersonalDataReader.get(queryOptionsPersonalData);
-        }
-        if (deliveryDetails.address_id) {
-            const queryOptionsAddress = new QueryOptions();
-            queryOptionsAddress.setWhere([{ name: 'id', type: ParameterType.bigint, value: deliveryDetails.address_id }]);
-            address = await AddressesReader.get(queryOptionsAddress);
-        }
-        if (deliveryDetails.delivery_method_id) {
-            const queryOptionsDeliveryMethod = new QueryOptions();
-            queryOptionsDeliveryMethod.setWhere([{ name: 'id', type: ParameterType.bigint, value: deliveryDetails.delivery_method_id }]);
-            deliveryMethod = await DeliveryMethodReader.get(queryOptionsDeliveryMethod);
-        }
+        if (deliveryDetails.personal_data_id)
+            personalData = await PersonalDataReader.get(createQueryOptionsForId(deliveryDetails.personal_data_id));
+        if (deliveryDetails.address_id)
+            address = await AddressesReader.get(createQueryOptionsForId(deliveryDetails.address_id));
+        if (deliveryDetails.delivery_method_id)
+            deliveryMethod = await DeliveryMethodReader.get(createQueryOptionsForId(deliveryDetails.delivery_method_id));
         return {
             id,
             personalData,

package/dist/reader/DeliveryStatusReader.js

@@ -1,5 +1,5 @@
-import { ParameterType, QueryOptions } from "@dascompany/database";
 import DatabaseConnection from "../DatabaseConnection";
+import createQueryOptionsForId from "../utils/createQueryOptionsForId";
 export default class DeliveryStatusReader {
     static async get(queryOptions) {
         const deliveryStatus = await DatabaseConnection.getInstance().deliveryStatuses.select(queryOptions);
@@ -18,9 +18,7 @@ export default class DeliveryStatusReader {
         return deliveryStatuses;
     }
     static async correctDeliveryStatus(deliveryStatus) {
-        const queryOptions = new QueryOptions();
-        queryOptions.setWhere([{ name: 'id', type: ParameterType.bigint, value: deliveryStatus.delivery_status_type_id }]);
-        const deliveryStatusType = await DatabaseConnection.getInstance().deliveryStatusTypes.select(queryOptions);
+        const deliveryStatusType = await DatabaseConnection.getInstance().deliveryStatusTypes.select(createQueryOptionsForId(deliveryStatus.delivery_status_type_id));
         return {
             id: deliveryStatus.id,
             type: deliveryStatusType,

package/dist/reader/InvoiceDetailsReader.js

@@ -1,31 +1,17 @@
-import { ParameterType, QueryOptions } from "@dascompany/database";
 import DatabaseConnection from "../DatabaseConnection";
 import AddressesReader from "./AddressesReader";
 import PersonalDataReader from "./PersonalDataReader";
+import createQueryOptionsForId from "../utils/createQueryOptionsForId";
 export default class InvoiceDetailsReader {
     static async get(queryOptions) {
         const invoiceDetails = await DatabaseConnection.getInstance().invoiceDetails.select(queryOptions);
         const id = invoiceDetails.id;
         let personalData = null;
         let address = null;
-        if (invoiceDetails.personal_data_id) {
-            const queryOptionsPersonalData = new QueryOptions();
-            queryOptionsPersonalData.setWhere([{
-                    name: 'id',
-                    type: ParameterType.bigint,
-                    value: invoiceDetails.personal_data_id
-                }]);
-            personalData = await PersonalDataReader.get(queryOptionsPersonalData);
-        }
-        if (invoiceDetails.address_id) {
-            const queryOptionsAddress = new QueryOptions();
-            queryOptionsAddress.setWhere([{
-                    name: 'id',
-                    type: ParameterType.bigint,
-                    value: invoiceDetails.address_id
-                }]);
-            address = await AddressesReader.get(queryOptionsAddress);
-        }
+        if (invoiceDetails.personal_data_id)
+            personalData = await PersonalDataReader.get(createQueryOptionsForId(invoiceDetails.personal_data_id));
+        if (invoiceDetails.address_id)
+            address = await AddressesReader.get(createQueryOptionsForId(invoiceDetails.address_id));
         return {
             id,
             personalData,

package/dist/reader/OrderProductsReader.js

@@ -1,7 +1,7 @@
-import { ParameterType, QueryOptions } from "@dascompany/database";
 import DatabaseConnection from "../DatabaseConnection";
 import FilesReader from "./FilesReader";
 import PriceConverter from "../utils/PriceConverter";
+import createQueryOptionsForId from "../utils/createQueryOptionsForId";
 export default class OrderProductsReader {
     static async getAll(queryOptions) {
         const orderProducts = await DatabaseConnection.getInstance().ordersProducts.selectAll(queryOptions);
@@ -17,9 +17,7 @@ export default class OrderProductsReader {
         return correctProducts;
     }
     static async correctProduct(orderProduct) {
-        const queryOptions = new QueryOptions();
-        queryOptions.setWhere([{ name: 'id', type: ParameterType.bigint, value: orderProduct.file_id }]);
-        const file = await FilesReader.get(queryOptions);
+        const thumbnail = await FilesReader.get(createQueryOptionsForId(orderProduct.file_id));
         const correctProduct = {
             id: orderProduct.id,
             orderId: orderProduct.order_id,
@@ -30,7 +28,7 @@ export default class OrderProductsReader {
                 netPrice: orderProduct.net_price,
                 grossPrice: PriceConverter.netToGrossPrice(orderProduct.net_price, orderProduct.vat),
                 vat: orderProduct.vat,
-                file,
+                thumbnail,
             }
         };
         return correctProduct;

package/dist/reader/PersonalDataReader.js

@@ -1,19 +1,13 @@
-import { ParameterType, QueryOptions } from "@dascompany/database";
 import DatabaseConnection from "../DatabaseConnection";
 import correctPhoneNumber from "../utils/correctPhoneNumber";
 import CompanyDetailsReader from "./CompanyDetailsReader";
+import createQueryOptionsForId from "../utils/createQueryOptionsForId";
 export default class PersonalDataReader {
     static async get(queryOptions) {
         const personalDataRow = await DatabaseConnection.getInstance().personalData.select(queryOptions);
         const personalData = this.correctPersonalData(personalDataRow);
         if (personalDataRow.company_details_id) {
-            const queryOptions = new QueryOptions();
-            queryOptions.setWhere([{
-                    name: 'id',
-                    type: ParameterType.bigint,
-                    value: personalDataRow.company_details_id
-                }]);
-            personalData.companyDetails = await CompanyDetailsReader.get(queryOptions);
+            personalData.companyDetails = await CompanyDetailsReader.get(createQueryOptionsForId(personalDataRow.company_details_id));
             personalData.isCompany = true;
         }
         return personalData;

package/dist/reader/ProductReader.js

@@ -3,6 +3,7 @@ import FilesReader from "./FilesReader";
 import DatabaseConnection from "../DatabaseConnection";
 import FileConnectionTypeE from "../types/FileConnectionTypeE";
 import PriceConverter from "../utils/PriceConverter";
+import createQueryOptionsForId from "../utils/createQueryOptionsForId";
 export default class ProductReader {
     static async get(queryOption) {
         const productRow = await DatabaseConnection.getInstance().products.select(queryOption);
@@ -37,9 +38,7 @@ export default class ProductReader {
         return correctProducts;
     }
     static async correctProduct(product) {
-        const queryOptions = new QueryOptions();
-        queryOptions.setWhere([{ name: 'id', type: ParameterType.bigint, value: product.file_id }]);
-        const thumbnail = await FilesReader.get(queryOptions);
+        const thumbnail = await FilesReader.get(createQueryOptionsForId(product.file_id));
         return {
             id: product.id,
             sku: product.sku,

package/dist/reader/payment/PaymentDetailsReader.js

@@ -17,7 +17,7 @@ export default class PaymentDetailsReader {
             }]);
         const queryOptionsForPaymentStatus = new QueryOptions();
         queryOptionsForPaymentStatus.setWhere([{
-                name: 'peyment_details_id',
+                name: 'payment_details_id',
                 type: ParameterType.bigint,
                 value: paymentDetails.id
             }]);

package/dist/reader/payment/PaymentStatusesReader.js

@@ -1,5 +1,5 @@
-import { ParameterType, QueryOptions } from "@dascompany/database";
 import DatabaseConnection from "../../DatabaseConnection";
+import createQueryOptionsForId from "../../utils/createQueryOptionsForId";
 export default class PaymentStatusesReader {
     static async get(queryOptions) {
         const paymentStatus = await DatabaseConnection.getInstance().paymentStatuses.select(queryOptions);
@@ -18,9 +18,7 @@ export default class PaymentStatusesReader {
         return paymentStatuses;
     }
     static async correctPaymentStatus(paymentStatus) {
-        const queryOptions = new QueryOptions();
-        queryOptions.setWhere([{ name: 'id', type: ParameterType.bigint, value: paymentStatus.payment_status_type_id }]);
-        const paymentStatusType = await DatabaseConnection.getInstance().paymentStatusTypes.select(queryOptions);
+        const paymentStatusType = await DatabaseConnection.getInstance().paymentStatusTypes.select(createQueryOptionsForId(paymentStatus.payment_status_type_id));
         return {
             id: paymentStatus.id,
             type: paymentStatusType,

package/dist/types/OrderProductI.d.ts

@@ -9,6 +9,6 @@ export default interface OrderProductI {
         netPrice: number;
         grossPrice: number;
         vat: number;
-        file: FileI;
+        thumbnail: FileI;
     };
 }

package/package.json

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