fix dto and ordering

apps/e-commerce/src/admin/entity-type-factor/dto/entity-type.dto.ts

@@ -13,14 +13,4 @@ export class EntityTypeDto {
     description: 'entityTypeId',
   })
   entityTypeId: number;
-
-  @AutoMap()
-  @IsOptional()
-  @IsString()
-  @ApiProperty({
-    required: true,
-    type: String,
-    description: 'description',
-  })
-  public description?: string;
 }

apps/e-commerce/src/product/service/product-query-builder.service.ts

@@ -34,6 +34,7 @@ import { EAVEntityAttributeValue } from '@rahino/database/models/eav/eav-entity-
 import { EAVAttribute } from '@rahino/database/models/eav/eav-attribute.entity';
 import { EAVAttributeValue } from '@rahino/database/models/eav/eav-attribute-value';
 import { InjectModel } from '@nestjs/sequelize';
+import { SortOrder } from '@rahino/query-filter';
 
 @Injectable()
 export class ProductQueryBuilderService {
@@ -535,12 +536,12 @@ export class ProductQueryBuilderService {
       .offset(filter.offset)
       .order({ orderBy: 'inventoryStatusId', sortOrder: 'ASC' });
     queryResultBuilder = await this.parseOrder(filter, queryResultBuilder);
-    // queryResultBuilder = queryResultBuilder.order([
-    //   { model: ECInventory, as: 'inventories' },
-    //   { model: ECVendor, as: 'vendor' },
-    //   'priorityOrder',
-    //   'asc',
-    // ]);
+    queryResultBuilder = queryResultBuilder.order([
+      { model: ECInventory, as: 'inventories' },
+      { model: ECInventoryPrice, as: 'firstPrice' },
+      'price',
+      'asc',
+    ]);
     return {
       resultQuery: queryResultBuilder.build(),
       countQuery: queryBuilder.build(),
@@ -579,12 +580,20 @@ export class ProductQueryBuilderService {
           }
         }
       }
+      console.log(orders);
       const orderItem: OrderItem = orders as OrderItem;
       queryBuilder = queryBuilder.order(orderItem);
     }
     if (filter.orderBy.startsWith('randomize')) {
       // this is very expensive
+      const orders = [];
+
+      let orderItemAssociation = { model: Attachment, as: 'attachments' };
+
+      orders.push(...[orderItemAssociation, 'id', 'ASC']);
+      const orderItemV2: OrderItem = orders as OrderItem;
       queryBuilder = queryBuilder.order(Sequelize.literal('NEWID()'));
+      queryBuilder = queryBuilder.order(orderItemV2);
     } else {
       queryBuilder = queryBuilder.order({
         orderBy: filter.orderBy,

apps/eav/src/admin/entity-type/dto/entity-type.dto.ts

@@ -72,4 +72,14 @@ export class EntityTypeDto {
     description: 'metaDescription',
   })
   public metaDescription?: string;
+
+  @AutoMap()
+  @IsOptional()
+  @IsString()
+  @ApiProperty({
+    required: true,
+    type: String,
+    description: 'description',
+  })
+  public description?: string;
 }