@dascompany/product 2.0.0 → 2.1.1

package/dist/index.d.ts

@@ -77,4 +77,6 @@ import CompanyData from "./stockObjects/CompanyData";
 import CompanyDataRepo from "./repo/CompanyDataRepo";
 import CompanyDataReader from "./reader/CompanyDataReader";
 import CompanyDataI from "./types/CompanyDataI";
-export { Client, ClientAccountRepo, ClientAccountReader, Admin, AdminRepo, AdminReader, Address, AddressI, AddressesRepo, AddressesReader, PersonalData, PersonalDataRepo, PersonalDataReader, PersonalDataI, CompanyDetails, CompanyDetailsRepo, CompanyDetailsReader, CompanyDetailsI, ContactDetails, ContactDetailsRepo, ContactDetailsReader, ContactDetailsI, DeliveryDetails, DeliveryDetailsRepo, DeliveryDetailsReader, DeliveryDetailsI, DeliveryMethods, DeliveryMethodRepo, DeliveryMethodReader, DeliveryMethodI, DeliveryMethodTypeE, DeliveryStatus, DeliveryStatusReader, DeliveryStatusTypeE, InvoiceDetails, InvoiceDetailsRepo, InvoiceDetailsReader, InvoiceDetailsI, PaymentDetails, PaymentDetailsRepo, PaymentDetailsReader, PaymentDetailsI, PaymentMethods, PaymentMethodRepo, PaymentMethodReader, PaymentMethodE, PaymentMethodI, PaymentStatus, PaymentStatusesReader, PaymentStatusE, Order, OrderRepo, OrderReader, OrderProduct, OrderProductsRepo, OrderProductsReader, OrderProductI, Status, OrderStatusRepo, OrderStatusReader, StatusI, OrderStatusTypeE, StatusTypesReader, ProductI, Product, ProductRepo, ProductReader, File, FilesRepo, FilesReader, FileI, FileConnection, FileConnectionsRepo, FileConnectionsReader, FileConnectionTypeE, CompanyData, CompanyDataRepo, CompanyDataReader, CompanyDataI, };
+import PriceConverter from "./utils/PriceConverter";
+import createQueryOptionsForId from "./utils/createQueryOptionsForId";
+export { Client, ClientAccountRepo, ClientAccountReader, Admin, AdminRepo, AdminReader, Address, AddressI, AddressesRepo, AddressesReader, PersonalData, PersonalDataRepo, PersonalDataReader, PersonalDataI, CompanyDetails, CompanyDetailsRepo, CompanyDetailsReader, CompanyDetailsI, ContactDetails, ContactDetailsRepo, ContactDetailsReader, ContactDetailsI, DeliveryDetails, DeliveryDetailsRepo, DeliveryDetailsReader, DeliveryDetailsI, DeliveryMethods, DeliveryMethodRepo, DeliveryMethodReader, DeliveryMethodI, DeliveryMethodTypeE, DeliveryStatus, DeliveryStatusReader, DeliveryStatusTypeE, InvoiceDetails, InvoiceDetailsRepo, InvoiceDetailsReader, InvoiceDetailsI, PaymentDetails, PaymentDetailsRepo, PaymentDetailsReader, PaymentDetailsI, PaymentMethods, PaymentMethodRepo, PaymentMethodReader, PaymentMethodE, PaymentMethodI, PaymentStatus, PaymentStatusesReader, PaymentStatusE, Order, OrderRepo, OrderReader, OrderProduct, OrderProductsRepo, OrderProductsReader, OrderProductI, Status, OrderStatusRepo, OrderStatusReader, StatusI, OrderStatusTypeE, StatusTypesReader, ProductI, Product, ProductRepo, ProductReader, File, FilesRepo, FilesReader, FileI, FileConnection, FileConnectionsRepo, FileConnectionsReader, FileConnectionTypeE, CompanyData, CompanyDataRepo, CompanyDataReader, CompanyDataI, PriceConverter, createQueryOptionsForId };

package/dist/index.js

@@ -63,4 +63,6 @@ import FileConnectionTypeE from './types/FileConnectionTypeE';
 import CompanyData from "./stockObjects/CompanyData";
 import CompanyDataRepo from "./repo/CompanyDataRepo";
 import CompanyDataReader from "./reader/CompanyDataReader";
-export { Client, ClientAccountRepo, ClientAccountReader, Admin, AdminRepo, AdminReader, Address, AddressesRepo, AddressesReader, PersonalData, PersonalDataRepo, PersonalDataReader, CompanyDetails, CompanyDetailsRepo, CompanyDetailsReader, ContactDetails, ContactDetailsRepo, ContactDetailsReader, DeliveryDetails, DeliveryDetailsRepo, DeliveryDetailsReader, DeliveryMethods, DeliveryMethodRepo, DeliveryMethodReader, DeliveryMethodTypeE, DeliveryStatus, DeliveryStatusReader, DeliveryStatusTypeE, InvoiceDetails, InvoiceDetailsRepo, InvoiceDetailsReader, PaymentDetails, PaymentDetailsRepo, PaymentDetailsReader, PaymentMethods, PaymentMethodRepo, PaymentMethodReader, PaymentMethodE, PaymentStatus, PaymentStatusesReader, PaymentStatusE, Order, OrderRepo, OrderReader, OrderProduct, OrderProductsRepo, OrderProductsReader, Status, OrderStatusRepo, OrderStatusReader, OrderStatusTypeE, StatusTypesReader, Product, ProductRepo, ProductReader, File, FilesRepo, FilesReader, FileConnection, FileConnectionsRepo, FileConnectionsReader, FileConnectionTypeE, CompanyData, CompanyDataRepo, CompanyDataReader, };
+import PriceConverter from "./utils/PriceConverter";
+import createQueryOptionsForId from "./utils/createQueryOptionsForId";
+export { Client, ClientAccountRepo, ClientAccountReader, Admin, AdminRepo, AdminReader, Address, AddressesRepo, AddressesReader, PersonalData, PersonalDataRepo, PersonalDataReader, CompanyDetails, CompanyDetailsRepo, CompanyDetailsReader, ContactDetails, ContactDetailsRepo, ContactDetailsReader, DeliveryDetails, DeliveryDetailsRepo, DeliveryDetailsReader, DeliveryMethods, DeliveryMethodRepo, DeliveryMethodReader, DeliveryMethodTypeE, DeliveryStatus, DeliveryStatusReader, DeliveryStatusTypeE, InvoiceDetails, InvoiceDetailsRepo, InvoiceDetailsReader, PaymentDetails, PaymentDetailsRepo, PaymentDetailsReader, PaymentMethods, PaymentMethodRepo, PaymentMethodReader, PaymentMethodE, PaymentStatus, PaymentStatusesReader, PaymentStatusE, Order, OrderRepo, OrderReader, OrderProduct, OrderProductsRepo, OrderProductsReader, Status, OrderStatusRepo, OrderStatusReader, OrderStatusTypeE, StatusTypesReader, Product, ProductRepo, ProductReader, File, FilesRepo, FilesReader, FileConnection, FileConnectionsRepo, FileConnectionsReader, FileConnectionTypeE, CompanyData, CompanyDataRepo, CompanyDataReader, PriceConverter, createQueryOptionsForId };

package/dist/reader/AdminReader.d.ts

@@ -3,10 +3,8 @@ import AdminI from "../types/AdminI";
 export default class AdminReader {
     static get(queryOptions: QueryOptions): Promise<AdminI>;
     static getId(queryOptions: QueryOptions): Promise<number>;
-    static getAll(queryOptions: QueryOptions): Promise<{
-        adminAccounts: AdminI[];
-        quantity: number;
-    }>;
+    static getAll(queryOptions: QueryOptions): Promise<AdminI[]>;
+    static getQuantity(queryOptions: QueryOptions): Promise<number>;
     private static correctAdmins;
     private static correctAdmin;
 }

package/dist/reader/AdminReader.js

@@ -9,11 +9,11 @@ export default class AdminReader {
     }
     static async getAll(queryOptions) {
         const adminAccounts = await DatabaseConnection.getInstance().adminAccounts.selectAll(queryOptions);
+        return this.correctAdmins(adminAccounts);
+    }
+    static async getQuantity(queryOptions) {
         const quantity = await DatabaseConnection.getInstance().adminAccounts.count(queryOptions);
-        return {
-            adminAccounts: this.correctAdmins(adminAccounts),
-            quantity
-        };
+        return quantity;
     }
     static correctAdmins(admins) {
         const correctAdmins = [];

package/dist/reader/ClientAccountReader.d.ts

@@ -2,10 +2,8 @@ import { QueryOptions } from "@dascompany/database";
 import ClientAccountI from "../types/ClientAccountI";
 export default class ClientAccountReader {
     static get(queryOptions: QueryOptions): Promise<ClientAccountI>;
-    static getAll(queryOptions: QueryOptions): Promise<{
-        clientAccounts: ClientAccountI[];
-        quantity: number;
-    }>;
+    static getAll(queryOptions: QueryOptions): Promise<ClientAccountI[]>;
+    static getQuantity(queryOptions: QueryOptions): Promise<number>;
     static getId(queryOptions: QueryOptions): Promise<number | null>;
     private static correctClientsFromRows;
     private static correctData;

package/dist/reader/ClientAccountReader.js

@@ -6,11 +6,11 @@ export default class ClientAccountReader {
     }
     static async getAll(queryOptions) {
         const clientAccounts = await DatabaseConnection.getInstance().clientAccounts.selectAll(queryOptions);
+        return this.correctClientsFromRows(clientAccounts);
+    }
+    static async getQuantity(queryOptions) {
         const quantity = await DatabaseConnection.getInstance().clientAccounts.count(queryOptions);
-        return {
-            clientAccounts: this.correctClientsFromRows(clientAccounts),
-            quantity
-        };
+        return quantity;
     }
     static async getId(queryOptions) {
         const accountId = await DatabaseConnection.getInstance().clientAccounts.selectId(queryOptions);

package/dist/reader/OrderProductsReader.js

@@ -1,7 +1,7 @@
 import { ParameterType, QueryOptions } from "@dascompany/database";
 import DatabaseConnection from "../DatabaseConnection";
-import calculateNetToGrossPrice from "../utils/calculateNetToGrossPrice";
 import FilesReader from "./FilesReader";
+import PriceConverter from "../utils/PriceConverter";
 export default class OrderProductsReader {
     static async getAll(queryOptions) {
         const orderProducts = await DatabaseConnection.getInstance().ordersProducts.selectAll(queryOptions);
@@ -28,7 +28,7 @@ export default class OrderProductsReader {
                 sku: orderProduct.sku,
                 title: orderProduct.title,
                 netPrice: orderProduct.net_price,
-                grossPrice: calculateNetToGrossPrice(orderProduct.net_price, orderProduct.vat),
+                grossPrice: PriceConverter.netToGrossPrice(orderProduct.net_price, orderProduct.vat),
                 vat: orderProduct.vat,
                 file,
             }

package/dist/reader/OrderReader.d.ts

@@ -3,10 +3,8 @@ import OrderI from "../types/OrderI";
 export default class OrderReader {
     static get(queryOptions: QueryOptions): Promise<OrderI>;
     static getAll(queryOptions: QueryOptions): Promise<OrderI[]>;
-    static getAllForClient(queryOptions: QueryOptions): Promise<{
-        orders: OrderI[];
-        quantity: number;
-    }>;
+    static getAllForClient(queryOptions: QueryOptions): Promise<OrderI[]>;
+    static getQuantity(queryOptions: QueryOptions): Promise<number>;
     private static correctOrders;
     private static correctOrder;
 }

package/dist/reader/OrderReader.js

@@ -18,9 +18,12 @@ export default class OrderReader {
     }
     static async getAllForClient(queryOptions) {
         const orderRows = await DatabaseConnection.getInstance().orders.selectAll(queryOptions);
-        const quantity = await DatabaseConnection.getInstance().orders.count(queryOptions);
         const orders = await this.correctOrders(orderRows);
-        return { orders, quantity };
+        return orders;
+    }
+    static async getQuantity(queryOptions) {
+        const quantity = await DatabaseConnection.getInstance().orders.count(queryOptions);
+        return quantity;
     }
     static async correctOrders(orderRows) {
         const orders = [];

package/dist/reader/ProductReader.js

@@ -1,8 +1,8 @@
 import { ParameterType, QueryOptions } from "@dascompany/database";
-import calculateNetToGrossPrice from "../utils/calculateNetToGrossPrice";
 import FilesReader from "./FilesReader";
 import DatabaseConnection from "../DatabaseConnection";
 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);
@@ -55,7 +55,7 @@ export default class ProductReader {
             createdAt: product.created_at,
             deleted: product.deleted,
             thumbnail: thumbnail ? thumbnail : null,
-            grossPrice: calculateNetToGrossPrice(product.net_price, product.vat),
+            grossPrice: PriceConverter.netToGrossPrice(product.net_price, product.vat),
             jsonData: product.json_data
         };
     }

package/dist/repo/AdminRepo.d.ts

@@ -3,10 +3,8 @@ import Admin from "../stockObjects/Admin";
 export default class AdminRepo {
     static get(queryOptions: QueryOptions): Promise<Admin>;
     static getId(queryOptions: QueryOptions): Promise<number>;
-    static getAll(queryOptions: QueryOptions): Promise<{
-        adminAccounts: Admin[];
-        quantity: number;
-    }>;
+    static getAll(queryOptions: QueryOptions): Promise<Admin[]>;
+    static getQuantity(queryOptions: QueryOptions): Promise<number>;
     private static createAdminsFromRows;
     private static createAdminFromRow;
 }

package/dist/repo/AdminRepo.js

@@ -10,8 +10,11 @@ export default class AdminRepo {
     }
     static async getAll(queryOptions) {
         const adminAccounts = await DatabaseConnection.getInstance().adminAccounts.selectAll(queryOptions);
+        return this.createAdminsFromRows(adminAccounts);
+    }
+    static async getQuantity(queryOptions) {
         const quantity = await DatabaseConnection.getInstance().adminAccounts.count(queryOptions);
-        return { adminAccounts: this.createAdminsFromRows(adminAccounts), quantity };
+        return quantity;
     }
     static createAdminsFromRows(dataRows) {
         const admins = [];

package/dist/stockObjects/Order.js

@@ -1,7 +1,7 @@
 import { ParameterType, QueryOptions, StockObject } from "@dascompany/database";
 import OrderMapper from "../mappers/OrderMapper";
 import OrderProductsRepo from "../repo/OrderProductsRepo";
-import calculateNetToGrossPrice from "../utils/calculateNetToGrossPrice";
+import PriceConverter from "../utils/PriceConverter";
 export default class Order extends StockObject {
     email;
     price;
@@ -45,7 +45,7 @@ export default class Order extends StockObject {
     }
     getGrossPrice() {
         const vatPercentage = 23; //brak stawki vat dla zamówienia
-        return calculateNetToGrossPrice(this.price, vatPercentage);
+        return PriceConverter.netToGrossPrice(this.price, vatPercentage);
     }
     getclientId() {
         return this.clientId;

package/dist/stockObjects/Product.js

@@ -2,7 +2,7 @@ import { ParameterType, QueryOptions, StockObject } from "@dascompany/database";
 import ProductMapper from "../mappers/ProductMapper";
 import FilesReader from "../reader/FilesReader";
 import FileConnectionTypeE from "../types/FileConnectionTypeE";
-import calculateNetToGrossPrice from "../utils/calculateNetToGrossPrice";
+import PriceConverter from "../utils/PriceConverter";
 export default class Product extends StockObject {
     sku;
     url;
@@ -54,7 +54,7 @@ export default class Product extends StockObject {
         return this.description;
     }
     getNetPrice() {
-        return calculateNetToGrossPrice(this.netPrice, this.vat);
+        return PriceConverter.netToGrossPrice(this.netPrice, this.vat);
     }
     getGrossPrice() {
         return this.netPrice;
@@ -126,7 +126,7 @@ export default class Product extends StockObject {
         };
     }
     calculateGrossPrice() {
-        return calculateNetToGrossPrice(this.netPrice, this.vat);
+        return PriceConverter.netToGrossPrice(this.netPrice, this.vat);
     }
     setCreatedAt(createdAt) {
         this.createdAt = createdAt;

package/dist/utils/PriceConverter.d.ts

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

package/dist/utils/PriceConverter.js

@@ -0,0 +1,14 @@
+export default class PriceConverter {
+    static netToGrossPrice(netPrice, vatPercentage = 23) {
+        const netPriceInPenny = Math.round(netPrice * 100);
+        const vatPriceInPenny = Math.round((netPriceInPenny * vatPercentage) / 100);
+        const grossPriceInPenny = netPriceInPenny + vatPriceInPenny;
+        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 Number(netPrice);
+    }
+}

package/dist/utils/createQueryOptionsForId.d.ts

@@ -0,0 +1,2 @@
+import { QueryOptions } from "@dascompany/database";
+export default function createQueryOptionsForId(id: number): QueryOptions;

package/dist/utils/createQueryOptionsForId.js

@@ -0,0 +1,6 @@
+import { ParameterType, QueryOptions } from "@dascompany/database";
+export default function createQueryOptionsForId(id) {
+    const queryOptions = new QueryOptions();
+    queryOptions.setWhere([{ name: 'id', type: ParameterType.bigint, value: id }]);
+    return queryOptions;
+}

package/package.json

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