@dascompany/product 2.1.12 → 2.1.14

package/dist/SQL.json

@@ -78,7 +78,7 @@
         "delete": "UPDATE orders.orders_products SET in_order = false WHERE id = $id::BIGINT"
     },
     "statuses": {
-        "select": "SELECT s.id, s.order_id, created_at, user_id, s.type as type_id, st.key as type_name FROM orders.statuses as s JOIN orders.status_types as st ON s.type = st.id",
+        "select": "SELECT * FROM orders.statuses",
         "insert": "INSERT INTO orders.statuses( id, type, order_id, user_id ) VALUES ($id::BIGINT, $type::BIGINT, $order_id::BIGINT, $user_id::BIGINT)",
         "selectNextId": "SELECT nextval('orders.statuses_id'::regclass)"
     },

package/dist/reader/OrderStatusReader.d.ts

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

package/dist/reader/OrderStatusReader.js

@@ -19,8 +19,7 @@ export default class OrderStatusReader {
             orderId: status.order_id,
             createdAt: status.created_at,
             userId: status.user_id,
-            typeId: status.type_id,
-            typeName: status.type_name,
+            type: status.type
         };
         return correctStatus;
     }

package/dist/reader/StatusTypesReader.d.ts

@@ -1,3 +1,5 @@
+import { QueryOptions } from "@dascompany/database";
 export default class StatusTypesReader {
-    static get(): Promise<any[]>;
+    static get(queryOptions: QueryOptions): Promise<any[]>;
+    static getAll(queryOptions?: QueryOptions): Promise<any[]>;
 }

package/dist/reader/StatusTypesReader.js

@@ -1,7 +1,11 @@
 import DatabaseConnection from "../DatabaseConnection";
 export default class StatusTypesReader {
-    static async get() {
-        const statusTypes = await DatabaseConnection.getInstance().statusTypes.select();
+    static async get(queryOptions) {
+        const statusTypes = await DatabaseConnection.getInstance().statusTypes.select(queryOptions);
+        return statusTypes;
+    }
+    static async getAll(queryOptions) {
+        const statusTypes = await DatabaseConnection.getInstance().statusTypes.selectAll(queryOptions);
         return statusTypes;
     }
 }

package/dist/repo/OrderStatusRepo.js

@@ -18,7 +18,7 @@ export default class OrderStatusRepo {
         return statuses;
     }
     static async createStatusFromRow(dataRow) {
-        const status = new Status(dataRow.order_id, dataRow.user_id, dataRow.type_id, dataRow.type_name, dataRow.created_at);
+        const status = new Status(dataRow.order_id, dataRow.user_id, dataRow.type, dataRow.created_at);
         status.setId(dataRow.id);
         return status;
     }

package/dist/stockObjects/Status.d.ts

@@ -2,21 +2,16 @@ import { StockObject, StockObjectMapper } from "@dascompany/database";
 export default class Status extends StockObject {
     private orderId;
     private userId;
-    private typeId;
-    private typeName;
+    private type;
     private createdAt;
-    constructor(orderId: number, userId: number, typeId: number, typeName?: string | null, createdAt?: string | null);
+    constructor(orderId: number, userId: number, type: number, createdAt?: string | null);
     getOrderId(): number;
     getCreatedAt(): string | null;
     getUserId(): number;
-    getTypeId(): number;
-    getType(): {
-        id: number;
-        name: string | null;
-    };
+    getType(): number;
     setOrderId(orderId: number): void;
     setCreatedAt(createdAt: string): void;
     setUserId(userId: number): void;
-    setTypeId(typeId: number): void;
+    setType(type: number): void;
     protected getMapper(): StockObjectMapper;
 }

package/dist/stockObjects/Status.js

@@ -3,15 +3,13 @@ import StatusMapper from "../mappers/StatusMapper";
 export default class Status extends StockObject {
     orderId;
     userId;
-    typeId;
-    typeName;
+    type;
     createdAt;
-    constructor(orderId, userId, typeId, typeName = null, createdAt = null) {
+    constructor(orderId, userId, type, createdAt = null) {
         super();
         this.orderId = orderId;
         this.userId = userId;
-        this.typeId = typeId;
-        this.typeName = typeName;
+        this.type = type;
         this.createdAt = createdAt;
     }
     getOrderId() {
@@ -23,14 +21,8 @@ export default class Status extends StockObject {
     getUserId() {
         return this.userId;
     }
-    getTypeId() {
-        return this.typeId;
-    }
     getType() {
-        return {
-            id: this.typeId,
-            name: this.typeName
-        };
+        return this.type;
     }
     setOrderId(orderId) {
         this.orderId = orderId;
@@ -41,8 +33,8 @@ export default class Status extends StockObject {
     setUserId(userId) {
         this.userId = userId;
     }
-    setTypeId(typeId) {
-        this.typeId = typeId;
+    setType(type) {
+        this.type = type;
     }
     getMapper() {
         return new StatusMapper(this);

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

@@ -1,4 +1,5 @@
-import { Table } from '@dascompany/database';
+import { QueryOptions, Table } from '@dascompany/database';
 export default class StatusTypesTable extends Table {
-    select(): Promise<any[]>;
+    select(queryOptions: QueryOptions): Promise<any[]>;
+    selectAll(queryOptions?: QueryOptions): Promise<any[]>;
 }

package/dist/tables/orders/StatusTypesTable.js

@@ -1,8 +1,13 @@
 import { Table } from '@dascompany/database';
 import * as SQL from '../../SQL.json';
 export default class StatusTypesTable extends Table {
-    async select() {
-        const query = this.createQuery(SQL.statusTypes.select);
+    async select(queryOptions) {
+        const query = this.createQuery(SQL.statusTypes.select, queryOptions);
+        const result = await query.execute();
+        return result.getRow();
+    }
+    async selectAll(queryOptions) {
+        const query = this.createQuery(SQL.statusTypes.select, queryOptions);
         const result = await query.execute();
         return result.getRows();
     }

package/dist/tables/orders/StatusesTable.js

@@ -22,7 +22,7 @@ export default class StatusesTable extends Table {
     bindParameters(query, status) {
         query.bindParameter('order_id', status.getOrderId());
         query.bindParameter('user_id', status.getUserId());
-        query.bindParameter('type', status.getTypeId());
+        query.bindParameter('type', status.getType());
     }
     async selectNextId() {
         const query = this.createQuery(SQL.statuses.selectNextId);

package/dist/types/StatusI.d.ts

@@ -1,7 +1,7 @@
 export default interface StatusI {
     id: number;
+    orderId: number;
     createdAt: string;
     userId: number;
-    typeId: number;
-    typeName: string;
+    type: number;
 }

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

@@ -3,6 +3,5 @@ export default interface StatusRow {
     order_id: number;
     created_at: string;
     user_id: number;
-    type_id: number;
-    type_name: string;
+    type: number;
 }

package/package.json

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