@dascompany/product 3.4.2 → 3.5.0

package/dist/SQL.json

@@ -73,8 +73,8 @@
         "selectNextId": "SELECT nextval('orders.orders_id'::regclass)"
     },
     "ordersProducts": {
-        "selectAll": "SELECT  op.id, order_id, product_id, title, sku, vat, p.file_id, op.net_price FROM orders.orders_products as op JOIN products as p ON op.product_id = p.id",
-        "insert": "INSERT INTO orders.orders_products( id, order_id, product_id, net_price ) VALUES ( $id::BIGINT , $order_id::BIGINT, $product_id::BIGINT, $net_price::DOUBLE PRECISION )",
+        "selectAll": "SELECT  op.id, order_id, product_id, title, sku, vat, p.file_id, op.net_price, op.installation_price FROM orders.orders_products as op JOIN products as p ON op.product_id = p.id",
+        "insert": "INSERT INTO orders.orders_products( id, order_id, product_id, net_price, installation_price ) VALUES ( $id::BIGINT , $order_id::BIGINT, $product_id::BIGINT, $net_price::DOUBLE PRECISION, $installation_price::DOUBLE PRECISION)",
         "selectNextId": "SELECT nextval('orders.orders_products_id'::regclass)",
         "delete": "UPDATE orders.orders_products SET in_order = false WHERE id = $id::BIGINT"
     },

package/dist/reader/AdminReader.d.ts

@@ -2,7 +2,7 @@ import { QueryOptions } from "@dascompany/database";
 import AdminI from "../types/AdminI";
 export default class AdminReader {
     static get(queryOptions: QueryOptions): Promise<AdminI>;
-    static getId(queryOptions: QueryOptions): Promise<number>;
+    static getId(queryOptions: QueryOptions): Promise<string>;
     static getAll(queryOptions?: QueryOptions): Promise<AdminI[]>;
     static getQuantity(queryOptions: QueryOptions): Promise<number>;
     private static correctAdmins;

package/dist/reader/AdminReader.js

@@ -13,7 +13,7 @@ export default class AdminReader {
     }
     static async getQuantity(queryOptions) {
         const quantity = await DatabaseConnection.getInstance().adminAccounts.count(queryOptions);
-        return quantity;
+        return Number(quantity);
     }
     static correctAdmins(admins) {
         const correctAdmins = [];

package/dist/reader/ClientAccountReader.d.ts

@@ -4,7 +4,7 @@ export default class ClientAccountReader {
     static get(queryOptions: QueryOptions): Promise<ClientAccountI>;
     static getAll(queryOptions?: QueryOptions): Promise<ClientAccountI[]>;
     static getQuantity(queryOptions: QueryOptions): Promise<number>;
-    static getId(queryOptions: QueryOptions): Promise<number | null>;
+    static getId(queryOptions: QueryOptions): Promise<string | null>;
     private static correctClientsFromRows;
     private static correctData;
 }

package/dist/reader/ClientAccountReader.js

@@ -10,7 +10,7 @@ export default class ClientAccountReader {
     }
     static async getQuantity(queryOptions) {
         const quantity = await DatabaseConnection.getInstance().clientAccounts.count(queryOptions);
-        return quantity;
+        return Number(quantity);
     }
     static async getId(queryOptions) {
         const accountId = await DatabaseConnection.getInstance().clientAccounts.selectId(queryOptions);

package/dist/reader/CompanyDataReader.js

@@ -4,7 +4,6 @@ import createQueryOptionsForId from "../utils/createQueryOptionsForId";
 export default class CompanyDataReader {
     static async get() {
         const companyData = await DatabaseConnection.getInstance().companyData.select();
-        console.log('companyData', companyData);
         if (companyData) {
             const address = companyData?.address_id ? await AddressesReader.get(createQueryOptionsForId(companyData.address_id)) : null;
             return {

package/dist/reader/FilesReader.d.ts

@@ -3,7 +3,7 @@ import FileI from "../types/FileI";
 export default class FilesReader {
     static get(queryOptions: QueryOptions): Promise<FileI>;
     static getAll(queryOptions?: QueryOptions): Promise<FileI[]>;
-    static getId(queryOptions: QueryOptions): Promise<number>;
+    static getId(queryOptions: QueryOptions): Promise<string>;
     static getQuantity(queryOptions: any): Promise<number>;
     static getForConnection(queryOptions: QueryOptions): Promise<FileI[]>;
     private static correctFiles;

package/dist/reader/FilesReader.js

@@ -14,7 +14,7 @@ export default class FilesReader {
     }
     static async getQuantity(queryOptions) {
         const quantity = await DatabaseConnection.getInstance().files.count(queryOptions);
-        return quantity;
+        return Number(quantity);
     }
     static async getForConnection(queryOptions) {
         const files = await DatabaseConnection.getInstance().files.selectForConnection(queryOptions);

package/dist/reader/OrderProductsReader.js

@@ -24,6 +24,7 @@ export default class OrderProductsReader {
             sku: orderProduct.sku,
             title: orderProduct.title,
             netPrice: Number(orderProduct.net_price),
+            installationPrice: Number(orderProduct.installation_price),
             grossPrice: PriceConverter.netToGrossPrice(Number(orderProduct.net_price), Number(orderProduct.vat)),
             vat: Number(orderProduct.vat),
             thumbnail,

package/dist/reader/OrderReader.js

@@ -22,7 +22,7 @@ export default class OrderReader {
     }
     static async getQuantity(queryOptions) {
         const quantity = await DatabaseConnection.getInstance().orders.count(queryOptions);
-        return quantity;
+        return Number(quantity);
     }
     static async correctOrders(orderRows) {
         const orders = [];

package/dist/reader/ProductReader.d.ts

@@ -3,7 +3,7 @@ import ProductI from "../types/ProductI";
 export default class ProductReader {
     static get(queryOption: QueryOptions): Promise<ProductI>;
     static getAll(queryOption: QueryOptions): Promise<ProductI[]>;
-    static getId(queryOptions: QueryOptions): Promise<number>;
+    static getId(queryOptions: QueryOptions): Promise<string>;
     static getQuantity(queryOptions: QueryOptions): Promise<number>;
     static getMaxPrice(queryOptions: QueryOptions): Promise<number>;
     private static correctProducts;

package/dist/reader/ProductReader.js

@@ -23,11 +23,11 @@ export default class ProductReader {
     }
     static async getQuantity(queryOptions) {
         const quantity = await DatabaseConnection.getInstance().products.count(queryOptions);
-        return quantity;
+        return Number(quantity);
     }
     static async getMaxPrice(queryOptions) {
         const price = await DatabaseConnection.getInstance().products.selectMaxPrice(queryOptions);
-        return price;
+        return Number(price);
     }
     static async correctProducts(products) {
         const correctProducts = [];

package/dist/repo/AdminRepo.d.ts

@@ -2,7 +2,7 @@ import { QueryOptions } from "@dascompany/database";
 import Admin from "../stockObjects/Admin";
 export default class AdminRepo {
     static get(queryOptions: QueryOptions): Promise<Admin>;
-    static getId(queryOptions: QueryOptions): Promise<number>;
+    static getId(queryOptions: QueryOptions): Promise<string>;
     static getQuantity(queryOptions: QueryOptions): Promise<number>;
     private static createAdminFromRow;
 }

package/dist/repo/OrderProductsRepo.js

@@ -14,7 +14,7 @@ export default class OrderProductsRepo {
         return products;
     }
     static async createOrdersProductFromRow(dataRow) {
-        const orderProduct = new OrderProduct(dataRow.order_id, dataRow.product_id, dataRow.net_price, dataRow.in_order);
+        const orderProduct = new OrderProduct(dataRow.order_id, dataRow.product_id, dataRow.net_price, dataRow.installation_price, dataRow.in_order);
         orderProduct.setId(dataRow.id);
         return orderProduct;
     }

package/dist/stockObjects/DeliveryDetails.d.ts

@@ -3,13 +3,13 @@ export default class DeliveryDetails extends StockObject {
     private personalDataId;
     private addressId;
     private deliveryMethodId;
-    constructor(personalDataId: number, addressId: number, deliveryMethodId: number | null);
-    getPersonalDataId(): number;
-    getAddressId(): number;
-    getDeliveryMethodId(): number | null;
-    setAddressId(addressId: number): number;
-    setPersonalDataId(personalDataId: number): number;
-    setDeliveryDetailsId(deliveryMethodId: number): number;
-    setDeliveryMethodId(deliveryMethodId: number): number;
+    constructor(personalDataId: string, addressId: string, deliveryMethodId: string | null);
+    getPersonalDataId(): string;
+    getAddressId(): string;
+    getDeliveryMethodId(): string | null;
+    setAddressId(addressId: string): string;
+    setPersonalDataId(personalDataId: string): string;
+    setDeliveryDetailsId(deliveryMethodId: string): string;
+    setDeliveryMethodId(deliveryMethodId: string): string;
     protected getMapper(): StockObjectMapper;
 }

package/dist/stockObjects/DeliveryStatus.d.ts

@@ -4,14 +4,14 @@ export default class DeliveryStatus extends StockObject {
     private typeId;
     private userId;
     private createdAt;
-    constructor(deliveryDetailsId: number, typeId: number, userId: number);
-    getDeliveryDetailsId(): number;
-    getDeliveryStatusTypeId(): number;
-    getUserId(): number;
+    constructor(deliveryDetailsId: string, typeId: string, userId: string);
+    getDeliveryDetailsId(): string;
+    getDeliveryStatusTypeId(): string;
+    getUserId(): string;
     getCreatedAt(): string;
-    setDeliveryDetailsId(deliveryDetailsId: number): number;
-    setDeliveryStatusTypeId(typeId: number): number;
-    setUserId(userId: number): number;
+    setDeliveryDetailsId(deliveryDetailsId: string): string;
+    setDeliveryStatusTypeId(typeId: string): string;
+    setUserId(userId: string): string;
     setCreatedAt(createdAt: string): void;
     protected getMapper(): StockObjectMapper;
 }

package/dist/stockObjects/FileConnection.d.ts

@@ -4,14 +4,14 @@ export default class FileConnection extends StockObject {
     private connectionType;
     private connectionId;
     private sequence;
-    constructor(fileId: number, connectionType: string, connectionId: number, sequence: number);
-    getFileId(): number;
+    constructor(fileId: string, connectionType: string, connectionId: string, sequence: number);
+    getFileId(): string;
     getConnectionType(): string;
-    getConnectionId(): number;
+    getConnectionId(): string;
     getSequence(): number;
-    setFileId(fileId: number): void;
+    setFileId(fileId: string): void;
     setConnectionType(connectionType: string): void;
-    setConnectionId(connectionId: number): void;
+    setConnectionId(connectionId: string): void;
     setSequence(sequence: number): void;
     protected getMapper(): StockObjectMapper;
 }

package/dist/stockObjects/OrderProduct.d.ts

@@ -4,11 +4,13 @@ export default class OrderProduct extends StockObject {
     private productId;
     private netPrice;
     private inOrder;
-    constructor(orderId: number, productId: number, netPrice: number, inOrder: boolean);
+    private installationPrice;
+    constructor(orderId: number, productId: number, netPrice: number, inOrder: boolean, installationPrice: number);
     getOrderId(): number;
     getProductId(): number;
     getNetPrice(): number;
     getInOrder(): boolean;
+    getInstallationPrice(): number;
     setInOrder(inOrder: boolean): void;
     protected getMapper(): StockObjectMapper;
 }

package/dist/stockObjects/OrderProduct.js

@@ -5,12 +5,14 @@ export default class OrderProduct extends StockObject {
     productId;
     netPrice;
     inOrder;
-    constructor(orderId, productId, netPrice, inOrder) {
+    installationPrice;
+    constructor(orderId, productId, netPrice, inOrder, installationPrice) {
         super();
         this.orderId = orderId;
         this.productId = productId;
         this.netPrice = netPrice;
         this.inOrder = inOrder;
+        this.installationPrice = installationPrice;
     }
     getOrderId() {
         return this.orderId;
@@ -24,6 +26,9 @@ export default class OrderProduct extends StockObject {
     getInOrder() {
         return this.inOrder;
     }
+    getInstallationPrice() {
+        return this.installationPrice;
+    }
     setInOrder(inOrder) {
         this.inOrder = inOrder;
     }

package/dist/stockObjects/Status.d.ts

@@ -4,14 +4,14 @@ export default class Status extends StockObject {
     private userId;
     private type;
     private createdAt;
-    constructor(orderId: number, userId: number, type: number, createdAt?: string | null);
-    getOrderId(): number;
+    constructor(orderId: string, userId: string, type: number, createdAt?: string | null);
+    getOrderId(): string;
     getCreatedAt(): string | null;
-    getUserId(): number;
+    getUserId(): string;
     getType(): number;
-    setOrderId(orderId: number): void;
+    setOrderId(orderId: string): void;
     setCreatedAt(createdAt: string): void;
-    setUserId(userId: number): void;
+    setUserId(userId: string): void;
     setType(type: number): void;
     protected getMapper(): StockObjectMapper;
 }

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

@@ -4,7 +4,7 @@ import Client from '../../stockObjects/Client';
 export default class ClientAccountsTable extends Table {
     select(queryOptions: QueryOptions): Promise<ClientAccountRow>;
     selectAll(queryOptions?: QueryOptions): Promise<ClientAccountRow[]>;
-    selectId(queryOptions: QueryOptions): Promise<number | null>;
+    selectId(queryOptions: QueryOptions): Promise<string | null>;
     count(queryOptions: QueryOptions): Promise<number>;
     update(clientData: Client): Promise<void>;
     delete(accountId: number): Promise<number>;

package/dist/tables/files/FilesTable.d.ts

@@ -4,12 +4,12 @@ import File from '../../stockObjects/File';
 export default class FilesTable extends Table {
     select(queryOptions: QueryOptions): Promise<FileRow>;
     selectAll(queryOptions?: QueryOptions): Promise<FileRow[]>;
-    selectId(queryOptions: QueryOptions): Promise<number>;
+    selectId(queryOptions: QueryOptions): Promise<string>;
     selectForConnection(queryOptions: QueryOptions): Promise<FileRow[]>;
     insert(file: File): Promise<boolean>;
     update(fileData: File): Promise<boolean>;
     count(queryOptions: QueryOptions): Promise<number>;
     private bindParameters;
-    delete(fileId: number): Promise<number>;
+    delete(fileId: string): Promise<number>;
     private selectNextId;
 }

package/dist/tables/orders/OrdersProductsTable.js

@@ -31,5 +31,6 @@ export default class OrdersProductsTable extends Table {
         query.bindParameter('product_id', orderProduct.getProductId());
         query.bindParameter('net_price', orderProduct.getNetPrice());
         query.bindParameter('in_order', orderProduct.getInOrder());
+        query.bindParameter('installation_price', orderProduct.getInstallationPrice());
     }
 }

package/dist/tables/personalInformation/AddressesTable.d.ts

@@ -6,6 +6,6 @@ export default class AddressesTable extends Table {
     update(addressData: Address): Promise<void>;
     insert(address: Address): Promise<void>;
     private selectNextId;
-    delete(id: number): Promise<void>;
+    delete(id: string): Promise<void>;
     private bindParameters;
 }

package/dist/tables/public/AdminAccountsTable.d.ts

@@ -4,9 +4,9 @@ import Admin from "../../stockObjects/Admin";
 export default class AdminAccountsTable extends Table {
     select(queryOptions: QueryOptions): Promise<AdminRow>;
     selectAll(queryOptions?: QueryOptions): Promise<AdminRow[]>;
-    selectId(queryOptions: QueryOptions): Promise<number>;
+    selectId(queryOptions: QueryOptions): Promise<string>;
     count(queryOptions: QueryOptions): Promise<number>;
-    insert(admin: Admin): Promise<number>;
+    insert(admin: Admin): Promise<string>;
     update(admin: Admin): Promise<boolean>;
     delete(accountId: number): Promise<number>;
     private bindParameters;

package/dist/tables/public/ProductsTable.d.ts

@@ -4,8 +4,8 @@ import ProductRow from '../../types/rows/ProductRow';
 export default class ProductsTable extends Table {
     select(queryOptions: QueryOptions): Promise<ProductRow>;
     selectAll(queryOptions?: QueryOptions): Promise<ProductRow[]>;
-    selectId(queryOptions: QueryOptions): Promise<number>;
-    insert(productData: Product): Promise<number>;
+    selectId(queryOptions: QueryOptions): Promise<string>;
+    insert(productData: Product): Promise<string>;
     update(product: Product): Promise<boolean>;
     delete(productId: number): Promise<number>;
     selectMaxPrice(queryOption: QueryOptions): Promise<number>;

package/dist/types/OrderProductI.d.ts

@@ -5,6 +5,7 @@ export default interface OrderProductI {
     sku: string;
     title: string;
     netPrice: number;
+    installationPrice: number;
     grossPrice: number;
     vat: number;
     thumbnail: FileI;

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

@@ -3,6 +3,7 @@ export default interface OrderProductRow {
     order_id: string;
     product_id: string;
     net_price: string;
+    installation_price: string;
     title: string;
     sku: string;
     vat: string;

package/package.json

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