@dascompany/product 4.2.0 → 4.2.2

package/dist/SQL.json

@@ -18,10 +18,11 @@
         "selectNextId": "SELECT nextval('clients.accounts_id'::regclass)"
     },
     "accountCart": {
-        "select": "SELECT * FROM clients.account_cart WHERE account_id = $account_id::BIGINT",
-        "insert": "INSERT INTO clients.account_cart(account_id, product_id, installation) VALUES ($account_id::BIGINT, $product_id::BIGINT, $installation::BOOL)",
-        "update": "UPDATE clients.account_cart SET installation = $installation WHERE account_id = $account_id::BIGINT AND product_id = $product_id::BIGINT AND installation = $installation::Bool",
-        "delete": "DELETE FROM clients.account_cart WHERE product_id = $product_id::BIGINT AND account_id = $account_id::BIGINT AND installation = $installation::BOOL"
+        "selectAll": "SELECT * FROM clients.account_cart WHERE account_id = $account_id::BIGINT",
+        "select": "SELECT * FROM clients.account_cart WHERE account_id = $account_id::BIGINT AND product_id = $product_id::BIGINT",
+        "insert": "INSERT INTO clients.account_cart(account_id, product_id, installation, quantity) VALUES ($account_id::BIGINT, $product_id::BIGINT, $installation::BOOL, $quantity::INT)",
+        "update": "UPDATE clients.account_cart SET installation = $installation::BOOL, quantity = $quantity::INT WHERE account_id = $account_id::BIGINT AND product_id = $product_id::BIGINT AND (installation != $installation::BOOL OR quantity != $quantity::INT)",
+        "delete": "DELETE FROM clients.account_cart WHERE product_id = $product_id::BIGINT AND account_id = $account_id::BIGINT"
     },
     "accountDeliveryDetails": {
         "select": "SELECT * FROM clients.account_delivery_details WHERE account_id = $account_id::BIGINT",
@@ -98,7 +99,7 @@
     "files": {
         "select": "SELECT * FROM files.files",
         "selectId": "SELECT id FROM files.files ",
-        "selectForConnection": "SELECT id, name, catalog, type, sequence FROM files.files JOIN files.file_connections ON file_id = id",
+        "selectForConnection": "SELECT id, name, catalog, type, sequence, alt, title FROM files.files JOIN files.file_connections ON file_id = id",
         "insert": "INSERT INTO files.files(  id, name, orginal_name, catalog, size_kb, type, alt, title, created_at  ) VALUES (  $id::BIGINT, $name::TEXT, $orginal_name::TEXT, $catalog::TEXT, $size_kb::BIGINT, $type::TEXT, $alt::TEXT, $title::TEXT, now() )",
         "update": "UPDATE files.files SET name = $name::TEXT, orginal_name = $orginal_name::TEXT, catalog = $catalog::TEXT, size_kb = $size_kb::BIGINT, type = $type::TEXT, alt = $alt::TEXT, title = $title::TEXT WHERE id = $id::BIGINT ",
         "count": "SELECT COUNT(*) AS total_rows FROM files.files",

package/dist/index.d.ts

@@ -1,9 +1,10 @@
 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 AccountCart from "./utils/AccountCart";
+import AccountCartReader from "./reader/AccountCartReader";
 import Admin from "./stockObjects/Admin";
 import AdminRepo from "./repo/AdminRepo";
 import AdminReader from "./reader/AdminReader";
@@ -73,4 +74,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, AccountCart, AccountCartReader, 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,9 +1,10 @@
 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 AccountCart from "./utils/AccountCart";
+import AccountCartReader from "./reader/AccountCartReader";
 import Admin from "./stockObjects/Admin";
 import AdminRepo from "./repo/AdminRepo";
 import AdminReader from "./reader/AdminReader";
@@ -61,4 +62,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, AccountCart, AccountCartReader, 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,4 @@
-import ProductI from "../types/ProductI";
 export default class AccountCartReader {
-    static getAll(accountId: string): Promise<ProductI[]>;
+    static getAll(accountId: string): Promise<any[]>;
     private static correctAccountCart;
 }

package/dist/reader/AccountCartReader.js

@@ -1,6 +1,4 @@
 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);
@@ -9,8 +7,11 @@ export default class AccountCartReader {
     static async correctAccountCart(accountCart) {
         const correctAccountCart = [];
         for (let i = 0; i < accountCart.length; i++) {
-            const product = await ProductReader.get(createQueryOptionsForId(accountCart[i].product_id));
-            correctAccountCart.push(product);
+            correctAccountCart.push({
+                id: accountCart[i].product_id,
+                installation: accountCart[i].installation,
+                quantity: accountCart[i].quantity
+            });
         }
         return correctAccountCart;
     }

package/dist/stockObjects/AccountCartItem.ts.d.ts

@@ -0,0 +1,21 @@
+export default class AccountCartItem {
+    private accountId;
+    private productId;
+    private installation;
+    private quantity;
+    constructor(accountId: string, productId: string, installation: boolean, quantity: number);
+    getData(): {
+        accountId: string;
+        productId: string;
+        installation: boolean;
+        quantity: number;
+    };
+    getAccountId(): string;
+    getProductId(): string;
+    getInstallation(): boolean;
+    getQuantity(): number;
+    setAccountId(accountId: string): void;
+    setProductId(productId: string): void;
+    setInstallation(installation: boolean): void;
+    setQuantity(quantity: number): void;
+}

package/dist/stockObjects/AccountCartItem.ts.js

@@ -0,0 +1,44 @@
+export default class AccountCartItem {
+    accountId;
+    productId;
+    installation;
+    quantity;
+    constructor(accountId, productId, installation, quantity) {
+        this.accountId = accountId;
+        this.productId = productId;
+        this.installation = installation;
+        this.quantity = quantity;
+    }
+    getData() {
+        return {
+            accountId: this.accountId,
+            productId: this.productId,
+            installation: this.installation,
+            quantity: this.quantity,
+        };
+    }
+    getAccountId() {
+        return this.accountId;
+    }
+    getProductId() {
+        return this.productId;
+    }
+    getInstallation() {
+        return this.installation;
+    }
+    getQuantity() {
+        return this.quantity;
+    }
+    setAccountId(accountId) {
+        this.accountId = accountId;
+    }
+    setProductId(productId) {
+        this.productId = productId;
+    }
+    setInstallation(installation) {
+        this.installation = installation;
+    }
+    setQuantity(quantity) {
+        this.quantity = quantity;
+    }
+}

package/dist/stockObjects/Product.js

@@ -54,7 +54,7 @@ export default class Product extends StockObject {
         return this.url;
     }
     getArticleNumber() {
-        return this.url;
+        return this.articleNumber;
     }
     getTitle() {
         return this.title;

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

@@ -1,9 +1,12 @@
 import { Table } from '@dascompany/database';
 import AccountCartRow from '../../types/rows/AccountCartRow';
+import AccountCartItem from '../../stockObjects/AccountCartItem.ts';
 export default class AccountCartTable extends Table {
     selectAll(accountId: string): Promise<AccountCartRow[]>;
-    delete(accountId: string, productId: string, installation: boolean): Promise<void>;
-    insert(accountId: string, productId: string, installation: boolean): Promise<void>;
-    update(accountId: string, productId: string, oldInstallation: boolean, newInstallation: boolean): Promise<void>;
+    select(accountId: string, productId: string): Promise<AccountCartRow[]>;
+    delete(accountId: string, productId: string): Promise<void>;
+    insert(accountCartItem: AccountCartItem): Promise<void>;
+    update(accountCartItem: AccountCartItem): Promise<void>;
     private bindParams;
+    private bindSideParams;
 }

package/dist/tables/clients/AccountCartTable.js

@@ -2,29 +2,43 @@ import { Table } from '@dascompany/database';
 import * as SQL from '../../SQL.json';
 export default class AccountCartTable extends Table {
     async selectAll(accountId) {
-        const query = this.createQuery(SQL.accountCart.select);
+        const query = this.createQuery(SQL.accountCart.selectAll);
         query.bindParameter('account_id', accountId);
         const result = await query.execute();
         return result.getRows();
     }
-    async delete(accountId, productId, installation) {
+    async select(accountId, productId) {
+        const query = this.createQuery(SQL.accountCart.select);
+        query.bindParameter('account_id', accountId);
+        query.bindParameter('product_id', productId);
+        const result = await query.execute();
+        return result.getRow();
+    }
+    async delete(accountId, productId) {
         const query = this.createQuery(SQL.accountCart.delete);
-        this.bindParams(query, accountId, productId, installation);
+        this.bindParams(query, accountId, productId);
         await query.execute();
     }
-    async insert(accountId, productId, installation) {
+    async insert(accountCartItem) {
         const query = this.createQuery(SQL.accountCart.insert);
-        this.bindParams(query, accountId, productId, installation);
+        this.bindParams(query, accountCartItem.getAccountId(), accountCartItem.getProductId());
+        this.bindSideParams(query, accountCartItem);
         await query.execute();
     }
-    async update(accountId, productId, oldInstallation, newInstallation) {
+    async update(accountCartItem) {
         const query = this.createQuery(SQL.accountCart.update);
-        this.bindParams(query, accountId, productId, newInstallation);
+        query.bindParameter('account_id', accountCartItem.getAccountId());
+        query.bindParameter('product_id', accountCartItem.getProductId());
+        query.bindParameter('installation', accountCartItem.getInstallation());
+        query.bindParameter('quantity', accountCartItem.getQuantity());
         await query.execute();
     }
-    bindParams(query, accountId, productId, installation) {
+    bindParams(query, accountId, productId) {
         query.bindParameter('account_id', accountId);
         query.bindParameter('product_id', productId);
-        query.bindParameter('installation', installation);
+    }
+    bindSideParams(query, accountCartItem) {
+        query.bindParameter('installation', accountCartItem.getInstallation());
+        query.bindParameter('quantity', accountCartItem.getQuantity());
     }
 }

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

@@ -1,4 +1,6 @@
 export default interface AccountCartRow {
     account_id: string;
     product_id: string;
+    installation: boolean;
+    quantity: boolean;
 }

package/dist/utils/AccountCart.d.ts

@@ -1,5 +1,5 @@
 export default class AccountCart {
-    static delete(accountId: string, productId: string, installation: boolean): Promise<boolean>;
-    static insert(accountId: string, productId: string, installation: boolean): Promise<boolean>;
-    static update(accountId: string, productId: string, oldInstallation: boolean, installation: boolean): Promise<boolean>;
+    static delete(accountId: string, productId: string): Promise<boolean>;
+    static insert(accountId: string, productId: string, installation: boolean, quantity: number): Promise<boolean>;
+    static update(accountId: string, productId: string, installation: boolean, quantity: number): Promise<boolean>;
 }

package/dist/utils/AccountCart.js

@@ -1,15 +1,18 @@
 import DatabaseConnection from "../DatabaseConnection";
+import AccountCartItem from "../stockObjects/AccountCartItem.ts";
 export default class AccountCart {
-    static async delete(accountId, productId, installation) {
-        await DatabaseConnection.getInstance().accountCart.delete(accountId, productId, installation);
+    static async delete(accountId, productId) {
+        await DatabaseConnection.getInstance().accountCart.delete(accountId, productId);
         return true;
     }
-    static async insert(accountId, productId, installation) {
-        await DatabaseConnection.getInstance().accountCart.insert(accountId, productId, installation);
+    static async insert(accountId, productId, installation, quantity) {
+        const item = new AccountCartItem(accountId, productId, installation, quantity);
+        await DatabaseConnection.getInstance().accountCart.insert(item);
         return true;
     }
-    static async update(accountId, productId, oldInstallation, installation) {
-        await DatabaseConnection.getInstance().accountCart.update(accountId, productId, oldInstallation, installation);
+    static async update(accountId, productId, installation, quantity) {
+        const item = new AccountCartItem(accountId, productId, installation, quantity);
+        await DatabaseConnection.getInstance().accountCart.update(item);
         return true;
     }
 }

package/package.json

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