@dascompany/product 3.5.2 → 3.5.4

package/dist/reader/OrderProductsReader.js

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

package/dist/reader/OrderStatusReader.d.ts

@@ -1,7 +1,6 @@
 import { QueryOptions } from "@dascompany/database";
-import StatusI from "../types/StatusI";
 export default class OrderStatusReader {
-    static get(queryOptions: QueryOptions): Promise<StatusI>;
-    static getAll(queryOptions?: QueryOptions): Promise<StatusI[]>;
+    static get(queryOptions: QueryOptions): Promise<any>;
+    static getAll(queryOptions?: QueryOptions): Promise<any[]>;
     private static correctStatus;
 }

package/dist/reader/OrderStatusReader.js

@@ -1,4 +1,6 @@
 import DatabaseConnection from "../DatabaseConnection";
+import StatusTypesReader from "./StatusTypesReader";
+import createQueryOptionsForId from "../utils/createQueryOptionsForId";
 export default class OrderStatusReader {
     static async get(queryOptions) {
         const statusRow = await DatabaseConnection.getInstance().statuses.select(queryOptions);
@@ -8,18 +10,19 @@ export default class OrderStatusReader {
         const statuses = await DatabaseConnection.getInstance().statuses.selectAll(queryOptions);
         const correctStatuss = [];
         for (let i = 0; i < statuses.length; i++) {
-            const correctStatus = this.correctStatus(statuses[i]);
+            const correctStatus = await this.correctStatus(statuses[i]);
             correctStatuss.push(correctStatus);
         }
         return correctStatuss;
     }
-    static correctStatus(status) {
+    static async correctStatus(status) {
+        const statusName = await StatusTypesReader.get(createQueryOptionsForId(status.type));
         const correctStatus = {
             id: status.id,
             orderId: status.order_id,
             createdAt: status.created_at,
             userId: status.user_id,
-            type: Number(status.type)
+            type: statusName
         };
         return correctStatus;
     }

package/dist/stockObjects/PaymentDetails.d.ts

@@ -2,10 +2,10 @@ import { StockObject, StockObjectMapper } from "@dascompany/database";
 export default class PaymentDetails extends StockObject {
     private paymentMethodId;
     private paymentOrderId;
-    constructor(paymentMethodId: number, paymentOrderId: string | null);
-    getPaymentMethodId(): number | null;
+    constructor(paymentMethodId: string, paymentOrderId: string | null);
+    getPaymentMethodId(): string | null;
     getPaymentOrderId(): string | null;
-    setPaymentMethodId(paymentMethodId: number): number;
+    setPaymentMethodId(paymentMethodId: string): string;
     setPaymentOrderId(paymentOrderId: string): string;
     protected getMapper(): StockObjectMapper;
 }

package/dist/stockObjects/PaymentStatus.d.ts

@@ -3,10 +3,10 @@ import PaymentStatusE from "../types/PaymentStatusE";
 export default class PaymentStatus extends StockObject {
     private paymentDetailsId;
     private typeId;
-    constructor(paymentDetailsId: number, typeId: PaymentStatusE);
-    getPaymentDetailsId(): number;
+    constructor(paymentDetailsId: string, typeId: PaymentStatusE);
+    getPaymentDetailsId(): string;
     getPaymentStatusTypeId(): number;
-    setPaymentDetailsId(paymentDetailsId: number): void;
+    setPaymentDetailsId(paymentDetailsId: string): void;
     setPaymentStatusTypeId(typeId: number): void;
     protected getMapper(): StockObjectMapper;
 }

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

@@ -7,7 +7,7 @@ export default class ClientAccountsTable extends Table {
     selectId(queryOptions: QueryOptions): Promise<string | null>;
     count(queryOptions: QueryOptions): Promise<number>;
     update(clientData: Client): Promise<void>;
-    delete(accountId: number): Promise<number>;
+    delete(accountId: string): Promise<number>;
     private bindParameters;
     insert(clientAccount: Client): Promise<void>;
     private selectNextId;

package/dist/tables/orders/OrdersProductsTable.d.ts

@@ -4,7 +4,7 @@ import OrderProduct from '../../stockObjects/OrderProduct';
 export default class OrdersProductsTable extends Table {
     selectAll(queryOptions?: QueryOptions): Promise<OrderProductRow[]>;
     insert(orderProduct: OrderProduct): Promise<boolean>;
-    delete(id: number): Promise<boolean>;
+    delete(id: string): Promise<boolean>;
     private selectNextId;
     private bindParams;
 }

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

@@ -5,7 +5,7 @@ export default class CompanyDetailsTable extends Table {
     select(queryOptions: QueryOptions): Promise<CompanyDetailsRow>;
     update(companyDetails: CompanyDetails): Promise<void>;
     insert(companyDetails: CompanyDetails): Promise<void>;
-    delete(id: number): Promise<void>;
+    delete(id: string): Promise<void>;
     private selectNextId;
     private bindParameters;
 }

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

@@ -5,7 +5,7 @@ export default class DeliveryDetailsTable extends Table {
     select(queryOptions: QueryOptions): Promise<DeliveryDetailsRow>;
     insert(deliveryDetails: DeliveryDetails): Promise<void>;
     update(deliveryDetails: DeliveryDetails): Promise<void>;
-    delete(id: number): Promise<void>;
+    delete(id: string): Promise<void>;
     private selectNextId;
     private bindParameters;
 }

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

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

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

@@ -8,7 +8,7 @@ export default class AdminAccountsTable extends Table {
     count(queryOptions: QueryOptions): Promise<number>;
     insert(admin: Admin): Promise<string>;
     update(admin: Admin): Promise<boolean>;
-    delete(accountId: number): Promise<number>;
+    delete(accountId: string): Promise<number>;
     private bindParameters;
     private selectNextId;
 }

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

@@ -7,7 +7,7 @@ export default class ProductsTable extends Table {
     selectId(queryOptions: QueryOptions): Promise<string>;
     insert(productData: Product): Promise<string>;
     update(product: Product): Promise<boolean>;
-    delete(productId: number): Promise<number>;
+    delete(productId: string): Promise<number>;
     selectMaxPrice(queryOption: QueryOptions): Promise<number>;
     count(queryOption: QueryOptions): Promise<number>;
     private selectNextId;

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

@@ -1,10 +1,10 @@
 export default interface ClientAccountRow {
-    id: number;
+    id: string;
     email: string;
     created_at: string;
     activated: boolean;
     deleted: boolean;
-    personal_data_id: number;
-    delivery_details_id: number;
-    company_details_id: number;
+    personal_data_id: string;
+    delivery_details_id: string;
+    company_details_id: string;
 }

package/package.json

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