@dascompany/product 4.0.7 → 4.0.9

package/dist/index.d.ts

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

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

package/dist/reader/AccountCartReader.d.ts

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

package/dist/reader/AccountCartReader.js

@@ -2,8 +2,8 @@ import DatabaseConnection from "../DatabaseConnection";
 import createQueryOptionsForId from "../utils/createQueryOptionsForId";
 import ProductReader from "./ProductReader";
 export default class AccountCartReader {
-    static async getAll(accountId) {
-        const accountCart = await DatabaseConnection.getInstance().accountCart.selectAll(accountId);
+    static async getAll(accountId, productId) {
+        const accountCart = await DatabaseConnection.getInstance().accountCart.selectAll(accountId, productId);
         return this.correctAccountCart(accountCart);
     }
     static async correctAccountCart(accountCart) {

package/dist/reader/ProductReader.js

@@ -39,6 +39,10 @@ export default class ProductReader {
     }
     static async correctProduct(product) {
         const thumbnail = await FilesReader.get(createQueryOptionsForId(product.file_id));
+        const netPrice = PriceConverter.priceToPenny(product.net_price);
+        const promotionalNetPrice = product.promotional_net_price ? PriceConverter.priceToPenny(product.promotional_net_price) : null;
+        const grossPrice = PriceConverter.netToGrossPrice(Number(product.net_price), Number(product.vat));
+        const promotionalGrossPrice = product.promotional_net_price ? PriceConverter.netToGrossPrice(Number(product.promotional_net_price), Number(product.vat)) : null;
         return {
             id: product.id,
             sku: product.sku,
@@ -47,8 +51,8 @@ export default class ProductReader {
             title: product.title,
             subtitle: product.subtitle,
             description: product.description,
-            netPrice: PriceConverter.priceToPenny(product.net_price),
-            promotionalNetPrice: PriceConverter.priceToPenny(product.promotional_net_price),
+            netPrice,
+            promotionalNetPrice,
             vat: product.vat,
             color: product.color,
             quantity: product.quantity,
@@ -58,7 +62,8 @@ export default class ProductReader {
             createdAt: product.created_at,
             deleted: product.deleted,
             thumbnail: thumbnail ? thumbnail : null,
-            grossPrice: PriceConverter.netToGrossPrice(Number(product.net_price), Number(product.vat)),
+            grossPrice,
+            promotionalGrossPrice,
             jsonData: product.json_data
         };
     }

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

@@ -1,7 +1,7 @@
 import { Table } from '@dascompany/database';
 import AccountCartRow from '../../types/rows/AccountCartRow';
 export default class AccountCartTable extends Table {
-    selectAll(accountId: string): Promise<AccountCartRow[]>;
+    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,9 +1,9 @@
 import { Table } from '@dascompany/database';
 import * as SQL from '../../SQL.json';
 export default class AccountCartTable extends Table {
-    async selectAll(accountId) {
+    async selectAll(accountId, productId) {
         const query = this.createQuery(SQL.accountCart.select);
-        query.bindParameter('account_id', accountId);
+        this.bindParams(query, accountId, productId);
         const result = await query.execute();
         return result.getRows();
     }
@@ -18,6 +18,7 @@ export default class AccountCartTable extends Table {
         await query.execute();
     }
     bindParams(query, accountId, productId) {
+        console.log(query, accountId, productId);
         query.bindParameter('account_id', accountId);
         query.bindParameter('product_id', productId);
     }

package/package.json

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