@dascompany/product 3.0.3 → 3.0.5

package/dist/DatabaseConnection.d.ts

@@ -8,7 +8,6 @@ import ClientAccountsTable from './tables/clients/ClientAccountsTable';
 import PersonalDataTable from './tables/personalInformation/PersonalDataTable';
 import OrdersProductsTable from './tables/orders/OrdersProductsTable';
 import CompanyDetailsTable from './tables/personalInformation/CompanyDetailsTable';
-import ContactDetailsTable from './tables/personalInformation/ContactDetailsTable';
 import DeliveryDetailsTable from './tables/personalInformation/DeliveryDetailsTable';
 import InvoiceDetailsTable from './tables/personalInformation/InvoiceDetailsTable';
 import DeliveryMethodsTable from './tables/settings/DeliveryMethodsTable';
@@ -42,7 +41,6 @@ export default class DatabaseConnection {
     get companyDetails(): CompanyDetailsTable;
     get personalData(): PersonalDataTable;
     get ordersProducts(): OrdersProductsTable;
-    get contactDetails(): ContactDetailsTable;
     get deliveryDetails(): DeliveryDetailsTable;
     get invoiceDetails(): InvoiceDetailsTable;
     get deliveryMethods(): DeliveryMethodsTable;

package/dist/DatabaseConnection.js

@@ -10,7 +10,6 @@ import ClientAccountsTable from './tables/clients/ClientAccountsTable';
 import PersonalDataTable from './tables/personalInformation/PersonalDataTable';
 import OrdersProductsTable from './tables/orders/OrdersProductsTable';
 import CompanyDetailsTable from './tables/personalInformation/CompanyDetailsTable';
-import ContactDetailsTable from './tables/personalInformation/ContactDetailsTable';
 import DeliveryDetailsTable from './tables/personalInformation/DeliveryDetailsTable';
 import InvoiceDetailsTable from './tables/personalInformation/InvoiceDetailsTable';
 import DeliveryMethodsTable from './tables/settings/DeliveryMethodsTable';
@@ -102,11 +101,6 @@ export default class DatabaseConnection {
             this.tables.set(TableNames.ordersProducts, new OrdersProductsTable(this.connection));
         return this.tables.get(TableNames.ordersProducts);
     }
-    get contactDetails() {
-        if (!this.tables.get(TableNames.contactDetails))
-            this.tables.set(TableNames.contactDetails, new ContactDetailsTable(this.connection));
-        return this.tables.get(TableNames.contactDetails);
-    }
     get deliveryDetails() {
         if (!this.tables.get(TableNames.deliveryDetails))
             this.tables.set(TableNames.deliveryDetails, new DeliveryDetailsTable(this.connection));

package/dist/SQL.json

@@ -12,7 +12,7 @@
         "select": "SELECT * FROM clients.accounts",
         "selectId": "SELECT id FROM clients.accounts ",
         "insert": "INSERT INTO clients.accounts( id, email, activated, personal_data_id) VALUES ($id::BIGINT, LOWER($email::TEXT), $activated::BOOL, $personal_data_id::BIGINT)",
-        "update": "UPDATE clients.accounts SET activated = $activated::BOOL, deleted = $deleted::BOOL, personal_data_id = $personal_details_id::BIGINT, delivery_details_id = $delivery_details_id::BIGINT, company_details_id = $company_details_id::BIGINT WHERE id = $id::BIGINT",
+        "update": "UPDATE clients.accounts SET activated = $activated::BOOL, deleted = $deleted::BOOL, personal_data_id = $personal_data_id::BIGINT, delivery_details_id = $delivery_details_id::BIGINT, company_details_id = $company_details_id::BIGINT WHERE id = $id::BIGINT",
         "delete": "DELETE FROM clients.accounts WHERE id = $account_id::BIGINT",
         "count": "SELECT COUNT(*) AS total_rows FROM clients.accounts",
         "selectNextId": "SELECT nextval('clients.accounts_id'::regclass)"
@@ -27,12 +27,6 @@
         "insert": "INSERT INTO clients.account_company_details(account_id, company_details_id) VALUES ($account_id::BIGINT, $company_details_id::BIGINT)",
         "delete": "DELETE FROM clients.account_company_details"
     },
-    "contactDetails": {
-        "select": "SELECT * FROM personal_information.contact_details",
-        "insert": "INSERT INTO personal_information.contact_details(id, personal_data_id, address_id) VALUES ($id::BIGINT, $personal_data_id::BIGINT, $address_id::BIGINT)",
-        "update": "UPDATE personal_information.contact_details SET personal_data_id = $personal_data_id::BIGINT, address_id = $address_id::BIGINT WHERE id = $id::BIGINT",
-        "selectNextId": "SELECT nextval('personal_information.contact_details_id'::regclass)"
-    },
     "deliveryDetails": {
         "select": "SELECT * FROM personal_information.delivery_details",
         "insert": "INSERT INTO personal_information.delivery_details(id, personal_data_id, address_id, delivery_method_id) VALUES ($id::BIGINT, $personal_data_id::BIGINT, $address_id::BIGINT, $delivery_method_id::BIGINT)",
@@ -76,8 +70,8 @@
     },
     "orders": {
         "select": "SELECT * FROM orders.orders",
-        "insert": "INSERT INTO orders.orders( id, email, price, client_id, contact_details_id, delivery_details_id, invoice_details_id, payment_details_id ) VALUES ($order_id::BIGINT, $email::TEXT, $price::DOUBLE PRECISION, $client_id::BIGINT,  $contact_details_id::BIGINT, $delivery_details_id::BIGINT , $invoice_details_id::BIGINT, $payment_details_id::BIGINT )",
-        "update": "UPDATE orders.orders SET price = $price::DOUBLE PRECISION, contact_details_id = $contact_details_id::BIGINT, delivery_details_id = $delivery_details_id::BIGINT, invoice_details_id = $invoice_details_id::BIGINT, payment_details_id = $payment_details_id::BIGINT, zsi_id = $zsi_id::BIGINT WHERE id = $id::BIGINT",
+        "insert": "INSERT INTO orders.orders( id, email, price, client_id, personal_data_id_id, delivery_details_id, invoice_details_id, payment_details_id ) VALUES ($order_id::BIGINT, $email::TEXT, $price::DOUBLE PRECISION, $client_id::BIGINT,  $personal_data_id_id::BIGINT, $delivery_details_id::BIGINT , $invoice_details_id::BIGINT, $payment_details_id::BIGINT )",
+        "update": "UPDATE orders.orders SET price = $price::DOUBLE PRECISION, personal_data_id_id = $personal_data_id_id::BIGINT, delivery_details_id = $delivery_details_id::BIGINT, invoice_details_id = $invoice_details_id::BIGINT, payment_details_id = $payment_details_id::BIGINT, zsi_id = $zsi_id::BIGINT WHERE id = $id::BIGINT",
         "count": "SELECT COUNT (*) AS TOTAL_ROWS FROM orders.orders",
         "selectNextId": "SELECT nextval('orders.orders_id'::regclass)"
     },

package/dist/index.d.ts

@@ -18,10 +18,6 @@ import CompanyDetails from "./stockObjects/CompanyDetails";
 import CompanyDetailsRepo from "./repo/CompanyDetailsRepo";
 import CompanyDetailsReader from "./reader/CompanyDetailsReader";
 import CompanyDetailsI from "./types/CompanyDetailsI";
-import ContactDetails from "./stockObjects/ContactDetails";
-import ContactDetailsRepo from "./repo/ContactDetailsRepo";
-import ContactDetailsReader from "./reader/ContactDetailsReader";
-import ContactDetailsI from "./types/ContactDetailsI";
 import DeliveryDetails from "./stockObjects/DeliveryDetails";
 import DeliveryDetailsRepo from "./repo/DeliveryDetailsRepo";
 import DeliveryDetailsReader from "./reader/DeliveryDetailsReader";
@@ -80,4 +76,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, AccountDeliveryDetailsReader, AccountCompanyDetailsReader, 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, 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, InvoiceDetails, InvoiceDetailsRepo, InvoiceDetailsReader, InvoiceDetailsI, 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

@@ -15,9 +15,6 @@ import PersonalDataReader from "./reader/PersonalDataReader";
 import CompanyDetails from "./stockObjects/CompanyDetails";
 import CompanyDetailsRepo from "./repo/CompanyDetailsRepo";
 import CompanyDetailsReader from "./reader/CompanyDetailsReader";
-import ContactDetails from "./stockObjects/ContactDetails";
-import ContactDetailsRepo from "./repo/ContactDetailsRepo";
-import ContactDetailsReader from "./reader/ContactDetailsReader";
 import DeliveryDetails from "./stockObjects/DeliveryDetails";
 import DeliveryDetailsRepo from "./repo/DeliveryDetailsRepo";
 import DeliveryDetailsReader from "./reader/DeliveryDetailsReader";
@@ -66,4 +63,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, AccountDeliveryDetailsReader, AccountCompanyDetailsReader, 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, 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, InvoiceDetails, InvoiceDetailsRepo, InvoiceDetailsReader, 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/mappers/AccountAddressMapper.d.ts

@@ -0,0 +1,9 @@
+import { StockObjectMapper } from "@dascompany/database";
+import AccountAddress from "../stockObjects/AccountAddress";
+export default class AccountAddressMapper implements StockObjectMapper {
+    private accountAddress;
+    private accountAddressessTable;
+    constructor(accountAddress: AccountAddress);
+    save(): Promise<void>;
+    delete(): Promise<void>;
+}

package/dist/mappers/AccountAddressMapper.js

@@ -0,0 +1,19 @@
+import DatabaseConnection from "../DatabaseConnection";
+export default class AccountAddressMapper {
+    accountAddress;
+    accountAddressessTable;
+    constructor(accountAddress) {
+        this.accountAddressessTable = DatabaseConnection.getInstance().accountAddresses;
+        this.accountAddress = accountAddress;
+    }
+    async save() {
+        await this.accountAddressessTable.insert(this.accountAddress);
+    }
+    async delete() {
+        const accountAddressId = this.accountAddress.getId();
+        if (accountAddressId)
+            await this.accountAddressessTable.delete(accountAddressId);
+        else
+            throw new Error('Can`t remove the order and product connection without providing its ID');
+    }
+}

package/dist/reader/AccountAddressesReader.d.ts

@@ -0,0 +1,7 @@
+import { QueryOptions } from "@dascompany/database";
+import AccountAddressesI from "../types/AccountAddressesI";
+export default class AccountAddressesReader {
+    static getAll(queryOptions?: QueryOptions): Promise<AccountAddressesI[]>;
+    private static correctAccountAddresses;
+    private static correctAccountAddress;
+}

package/dist/reader/AccountAddressesReader.js

@@ -0,0 +1,26 @@
+import DatabaseConnection from "../DatabaseConnection";
+import AddressesReader from "./AddressesReader";
+import createQueryOptionsForId from "../utils/createQueryOptionsForId";
+export default class AccountAddressesReader {
+    static async getAll(queryOptions) {
+        const accountAddresses = await DatabaseConnection.getInstance().accountAddresses.selectAll(queryOptions);
+        return this.correctAccountAddresses(accountAddresses);
+    }
+    static async correctAccountAddresses(accountAddresses) {
+        const correctAccountAddresses = [];
+        for (let i = 0; i < accountAddresses.length; i++) {
+            const correctAccountAddress = await this.correctAccountAddress(accountAddresses[i]);
+            correctAccountAddresses.push(correctAccountAddress);
+        }
+        return correctAccountAddresses;
+    }
+    static async correctAccountAddress(accountAddress) {
+        const address = await AddressesReader.get(createQueryOptionsForId(accountAddress.address_id));
+        const correctAddress = {
+            id: accountAddress.id,
+            accountId: accountAddress.account_id,
+            address: address
+        };
+        return correctAddress;
+    }
+}

package/dist/reader/OrderReader.js

@@ -42,7 +42,7 @@ export default class OrderReader {
             price: order.price,
             createdAt: order.created_at,
             clientId: order.client_id,
-            contactDetailsId: order.contact_details_id,
+            personalDataId: order.personal_data_id,
             deliveryDetailsId: order.delivery_details_id,
             invoiceDetailsId: order.invoice_details_id,
             paymentDetailsId: order.payment_details_id,

package/dist/repo/AccountAddressesRepo.d.ts

@@ -0,0 +1,6 @@
+import { QueryOptions } from "@dascompany/database";
+import AccountAddress from "../stockObjects/AccountAddress";
+export default class AccountAddressesRepo {
+    static get(queryOptions: QueryOptions): Promise<AccountAddress>;
+    private static createAccountAddressFromRow;
+}

package/dist/repo/AccountAddressesRepo.js

@@ -0,0 +1,13 @@
+import DatabaseConnection from "../DatabaseConnection";
+import AccountAddress from "../stockObjects/AccountAddress";
+export default class AccountAddressesRepo {
+    static async get(queryOptions) {
+        const accountAddress = await DatabaseConnection.getInstance().accountAddresses.select(queryOptions);
+        return this.createAccountAddressFromRow(accountAddress);
+    }
+    static async createAccountAddressFromRow(dataRow) {
+        const accountAddress = new AccountAddress(dataRow.account_id, dataRow.address_id);
+        accountAddress.setId(dataRow.id);
+        return accountAddress;
+    }
+}

package/dist/repo/OrderRepo.js

@@ -6,7 +6,7 @@ export default class OrderRepo {
         return this.createOrderFromRow(orderData);
     }
     static createOrderFromRow(orderData) {
-        const order = new Order(orderData.email, orderData.price, orderData.client_id, orderData.contact_details_id, orderData.delivery_details_id, orderData.invoice_details_id, orderData.payment_details_id);
+        const order = new Order(orderData.email, orderData.price, orderData.client_id, orderData.personal_data_id, orderData.delivery_details_id, orderData.invoice_details_id, orderData.payment_details_id);
         order.setId(orderData.id);
         return order;
     }

package/dist/repo/OrderStatusRepo.d.ts

@@ -0,0 +1,8 @@
+import { QueryOptions } from "@dascompany/database";
+import Status from "../stockObjects/Status";
+export default class OrderStatusRepo {
+    static get(queryOptions: QueryOptions): Promise<Status>;
+    static getAll(queryOptions?: QueryOptions): Promise<Status[]>;
+    private static createStatusesFromRows;
+    private static createStatusFromRow;
+}

package/dist/repo/OrderStatusRepo.js

@@ -0,0 +1,25 @@
+import DatabaseConnection from "../DatabaseConnection";
+import Status from "../stockObjects/Status";
+export default class OrderStatusRepo {
+    static async get(queryOptions) {
+        const status = await DatabaseConnection.getInstance().statuses.select(queryOptions);
+        return this.createStatusFromRow(status);
+    }
+    static async getAll(queryOptions) {
+        const statuses = await DatabaseConnection.getInstance().statuses.selectAll(queryOptions);
+        return this.createStatusesFromRows(statuses);
+    }
+    static async createStatusesFromRows(dataRows) {
+        const statuses = [];
+        for (const dataRow of dataRows) {
+            const status = await this.createStatusFromRow(dataRow);
+            statuses.push(status);
+        }
+        return statuses;
+    }
+    static async createStatusFromRow(dataRow) {
+        const status = new Status(dataRow.order_id, dataRow.user_id, dataRow.type, dataRow.created_at);
+        status.setId(dataRow.id);
+        return status;
+    }
+}

package/dist/stockObjects/AccountAddress.d.ts

@@ -0,0 +1,11 @@
+import { StockObject, StockObjectMapper } from "@dascompany/database";
+export default class AccountAddress extends StockObject {
+    private accountId;
+    private addressId;
+    constructor(accountId: number, addressId: number);
+    getAccountId(): number;
+    getAddressId(): number;
+    setAccountId(accountId: number): void;
+    setAddressId(addressId: number): void;
+    protected getMapper(): StockObjectMapper;
+}

package/dist/stockObjects/AccountAddress.js

@@ -0,0 +1,26 @@
+import { StockObject } from "@dascompany/database";
+import AccountAddressMapper from "../mappers/AccountAddressMapper";
+export default class AccountAddress extends StockObject {
+    accountId;
+    addressId;
+    constructor(accountId, addressId) {
+        super();
+        this.accountId = accountId;
+        this.addressId = addressId;
+    }
+    getAccountId() {
+        return this.accountId;
+    }
+    getAddressId() {
+        return this.addressId;
+    }
+    setAccountId(accountId) {
+        this.accountId = accountId;
+    }
+    setAddressId(addressId) {
+        this.addressId = addressId;
+    }
+    getMapper() {
+        return new AccountAddressMapper(this);
+    }
+}

package/dist/stockObjects/Order.d.ts

@@ -3,18 +3,18 @@ export default class Order extends StockObject {
     private email;
     private price;
     private clientId;
-    private contactDetailsId;
+    private personalDataId;
     private deliveryDetailsId;
     private invoiceDetailsId;
     private paymentDetailsId;
     private zsiId;
-    constructor(email: string, price: number, clientId: number | null, contactDetailsId: number, deliveryDetailsId: number, invoiceDetailsId?: number | null, paymentDetailsId?: number | null);
+    constructor(email: string, price: number, clientId: number | null, personalDataId: number, deliveryDetailsId: number, invoiceDetailsId?: number | null, paymentDetailsId?: number | null);
     getData(): Promise<{
         id: number | null;
         email: string;
         price: number;
         clientId: number | null;
-        contactDetailsId: number | null;
+        personalDataId: number | null;
         deliveryDetailsId: number | null;
         invoiceDetailsId: number | null;
         paymentDetailsId: number | null;
@@ -23,14 +23,14 @@ export default class Order extends StockObject {
     getPrice(): number;
     getZsiId(): number | null;
     getGrossPrice(): number;
-    getclientId(): number | null;
-    getContactDetailsId(): number | null;
+    getClientId(): number | null;
+    getPersonalDataId(): number | null;
     getDeliveryDetailsId(): number | null;
     getInvoiceDetailsId(): number | null;
     getPaymentDetailsId(): number | null;
     setPrice(price: number): void;
     setclientId(clientId: number): void;
-    setContactDetailsId(contactDetailsId: number): void;
+    setPersonalDataId(personalDataId: number): void;
     setDeliveryDetailsId(deliveryDetailsId: number): void;
     setInvoiceDetailsId(invoiceDetailsId: number): void;
     setPaymentDetailsId(paymentDetailsId: number): void;

package/dist/stockObjects/Order.js

@@ -6,17 +6,17 @@ export default class Order extends StockObject {
     email;
     price;
     clientId;
-    contactDetailsId;
+    personalDataId;
     deliveryDetailsId;
     invoiceDetailsId;
     paymentDetailsId;
     zsiId;
-    constructor(email, price, clientId, contactDetailsId, deliveryDetailsId, invoiceDetailsId = null, paymentDetailsId = null) {
+    constructor(email, price, clientId, personalDataId, deliveryDetailsId, invoiceDetailsId = null, paymentDetailsId = null) {
         super();
         this.email = email;
         this.price = price;
         this.clientId = clientId;
-        this.contactDetailsId = contactDetailsId;
+        this.personalDataId = personalDataId;
         this.deliveryDetailsId = deliveryDetailsId;
         this.invoiceDetailsId = invoiceDetailsId;
         this.paymentDetailsId = paymentDetailsId;
@@ -28,7 +28,7 @@ export default class Order extends StockObject {
             email: this.email,
             price: this.price,
             clientId: this.clientId,
-            contactDetailsId: this.contactDetailsId,
+            personalDataId: this.personalDataId,
             deliveryDetailsId: this.deliveryDetailsId,
             invoiceDetailsId: this.invoiceDetailsId,
             paymentDetailsId: this.paymentDetailsId,
@@ -47,11 +47,11 @@ export default class Order extends StockObject {
         const vatPercentage = 23; //brak stawki vat dla zamówienia
         return PriceConverter.netToGrossPrice(this.price, vatPercentage);
     }
-    getclientId() {
+    getClientId() {
         return this.clientId;
     }
-    getContactDetailsId() {
-        return this.contactDetailsId;
+    getPersonalDataId() {
+        return this.personalDataId;
     }
     getDeliveryDetailsId() {
         return this.deliveryDetailsId;
@@ -68,8 +68,8 @@ export default class Order extends StockObject {
     setclientId(clientId) {
         this.clientId = clientId;
     }
-    setContactDetailsId(contactDetailsId) {
-        this.contactDetailsId = contactDetailsId;
+    setPersonalDataId(personalDataId) {
+        this.personalDataId = personalDataId;
     }
     setDeliveryDetailsId(deliveryDetailsId) {
         this.deliveryDetailsId = deliveryDetailsId;

package/dist/tables/TableNames.d.ts

@@ -14,7 +14,6 @@ declare enum TableNames {
     statusTypes = "statusTypesTable",
     addresses = "addressesTable",
     companyDetails = "companyDetailsTable",
-    contactDetails = "contactDetailsTable",
     deliveryDetails = "deliveryDetailsTable",
     deliveryStatuses = "deliveryStatusesTable",
     deliveryStatusTypes = "deliveryStatusTypesTable",

package/dist/tables/TableNames.js

@@ -15,7 +15,6 @@ var TableNames;
     TableNames["statusTypes"] = "statusTypesTable";
     TableNames["addresses"] = "addressesTable";
     TableNames["companyDetails"] = "companyDetailsTable";
-    TableNames["contactDetails"] = "contactDetailsTable";
     TableNames["deliveryDetails"] = "deliveryDetailsTable";
     TableNames["deliveryStatuses"] = "deliveryStatusesTable";
     TableNames["deliveryStatusTypes"] = "deliveryStatusTypesTable";

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

@@ -0,0 +1,12 @@
+import { QueryOptions, Table } from '@dascompany/database';
+import AccountAddressesRow from '../../types/rows/AccountAddressesRow';
+import AccountAddress from '../../stockObjects/AccountAddress';
+export default class AccountAddressesTable extends Table {
+    select(queryOptions: QueryOptions): Promise<AccountAddressesRow>;
+    selectAll(queryOptions?: QueryOptions): Promise<AccountAddressesRow[]>;
+    selectId(queryOptions: QueryOptions): Promise<number | null>;
+    delete(id: number): Promise<number>;
+    private bindParameters;
+    insert(AccountAddresses: AccountAddress): Promise<void>;
+    private selectNextId;
+}

package/dist/tables/clients/AccountAddressesTable.js

@@ -0,0 +1,41 @@
+import { Table } from '@dascompany/database';
+import * as SQL from '../../SQL.json';
+export default class AccountAddressesTable extends Table {
+    async select(queryOptions) {
+        const query = this.createQuery(SQL.accountAddresses.select, queryOptions);
+        const result = await query.execute();
+        return result.getRow();
+    }
+    async selectAll(queryOptions) {
+        const query = this.createQuery(SQL.accountAddresses.select, queryOptions);
+        const result = await query.execute();
+        return result.getRows();
+    }
+    async selectId(queryOptions) {
+        const query = this.createQuery(SQL.accountAddresses.selectId, queryOptions);
+        const result = await query.execute();
+        return result.getValue();
+    }
+    async delete(id) {
+        const query = this.createQuery(SQL.accountAddresses.delete);
+        query.bindParameter('id', id);
+        const result = await query.execute();
+        return result.getRowCount();
+    }
+    bindParameters(query, AccountAddresses) {
+        query.bindParameter('account_id', AccountAddresses.getAccountId());
+        query.bindParameter('address_id', AccountAddresses.getAddressId());
+    }
+    async insert(AccountAddresses) {
+        const id = await this.selectNextId();
+        const query = this.createQuery(SQL.accountAddresses.insert);
+        this.bindParameters(query, AccountAddresses);
+        await query.execute();
+        AccountAddresses.setId(id);
+    }
+    async selectNextId() {
+        const query = this.createQuery(SQL.accountAddresses.selectNextId);
+        const result = await query.execute();
+        return result.getValue();
+    }
+}

package/dist/tables/orders/OrdersTable.js

@@ -36,11 +36,11 @@ export default class OrdersTable extends Table {
     bindParameters(query, order) {
         query.bindParameter('email', order.getEmail());
         query.bindParameter('price', order.getPrice());
-        query.bindParameter('client_id', order.getclientId());
+        query.bindParameter('client_id', order.getClientId());
         this.bindDetailsParameters(query, order);
     }
     bindDetailsParameters(query, order) {
-        query.bindParameter('contact_details_id', order.getContactDetailsId());
+        query.bindParameter('personal_data_id', order.getPersonalDataId());
         query.bindParameter('delivery_details_id', order.getDeliveryDetailsId());
         query.bindParameter('invoice_details_id', order.getInvoiceDetailsId());
         query.bindParameter('payment_details_id', order.getPaymentDetailsId());

package/dist/types/AccountAddressesI.d.ts

@@ -0,0 +1,6 @@
+import AddressI from "./AddressI";
+export default interface AccountAddressesI {
+    id: number;
+    accountId: number;
+    address: AddressI;
+}

package/dist/types/AccountAddressesI.js

@@ -0,0 +1 @@
+export {};

package/dist/types/OrderI.d.ts

@@ -5,7 +5,7 @@ export default interface OrderI {
     price: number;
     createdAt: string;
     clientId: number;
-    contactDetailsId: number;
+    personalDataId: number;
     deliveryDetailsId: number;
     invoiceDetailsId: number;
     paymentDetailsId: number;

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

@@ -0,0 +1,5 @@
+export default interface AccountAddressesRow {
+    id: number;
+    account_id: number;
+    address_id: number;
+}

package/dist/types/rows/AccountAddressesRow.js

@@ -0,0 +1 @@
+export {};

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

@@ -4,7 +4,7 @@ export default interface OrderRow {
     price: number;
     created_at: string;
     client_id: number;
-    contact_details_id: number;
+    personal_data_id: number;
     delivery_details_id: number;
     invoice_details_id: number;
     payment_details_id: number;

package/dist/utils/calculateNetToGrossPrice.d.ts

@@ -0,0 +1 @@
+export default function calculateNetToGrossPrice(netPrice: number, vatPercentage: number): number;

package/dist/utils/calculateNetToGrossPrice.js

@@ -0,0 +1,7 @@
+export default function calculateNetToGrossPrice(netPrice, vatPercentage) {
+    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);
+}

package/package.json

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