Merge pull request 'Deploy to production' (#85) from staging into production

Reviewed-on: #85

auto-bid-admin/src/components/bid/bid-modal.tsx

@@ -104,6 +104,7 @@ export default function BidModal({
       setLoading(true);
 
       const metadata = valuesToMetadata(values as IBid & Record<string, any>);
+
       const result = await createBid({
         url,
         max_price,

auto-bid-server/bot-data/metadata.json

@@ -1 +1 @@
-{"createdAt":1748825131474}
+{"createdAt":1752455341798}

auto-bid-server/src/modules/bids/bids.module.ts

@@ -90,6 +90,7 @@ import { AdminBidMetadataController } from './controllers/admin/admin-bid-metada
     ConfigsService,
     DashboardService,
     HotItemApi,
+    WebBidsService,
   ],
 })
 export class BidsModule {}

auto-bid-server/src/modules/scraps/controllers/client/scrap-items.controller.ts

@@ -3,6 +3,7 @@ import { ScrapConfigsService } from '../../services/scrap-config.service';
 import { ScrapItemsService } from '../../services/scrap-item-config.service';
 import { UpsertScrapItemDto } from '../../dto/scrap-items/upsert-scrap-item.dto';
 import { ScrapItem } from '../../entities/scrap-item.entity';
+import { Paginate, PaginateQuery } from 'nestjs-paginate';
 
 @Controller('scrap-items')
 export class ClientScrapItemsController {
@@ -14,4 +15,9 @@ export class ClientScrapItemsController {
       data as ScrapItem[],
     );
   }
+
+  @Get()
+  async index(@Paginate() query: PaginateQuery) {
+    return await this.scrapItemsService.index(query);
+  }
 }

auto-bid-server/src/modules/scraps/entities/scrap-item.entity.ts

@@ -18,13 +18,13 @@ export class ScrapItem extends Timestamp {
   @Column()
   name: string;
 
-  @Column()
+  @Column({ type: 'text' })
   url: string;
 
   @Column()
   model: string;
 
-  @Column({ nullable: true, default: null })
+  @Column({ nullable: true, default: null, type: 'text' })
   image_url: string | null;
 
   @Column({ nullable: true, default: null })

auto-bid-server/src/modules/scraps/services/scrap-item-config.service.ts

@@ -3,12 +3,21 @@ import { InjectRepository } from '@nestjs/typeorm';
 import { Repository } from 'typeorm';
 import { ScrapItem } from '../entities/scrap-item.entity';
 import AppResponse from '@/response/app-response';
+import {
+  FilterOperator,
+  FilterSuffix,
+  paginate,
+  PaginateQuery,
+} from 'nestjs-paginate';
+import { Column } from 'nestjs-paginate/lib/helper';
+import { WebBidsService } from '@/modules/bids/services/web-bids.service';
 
 @Injectable()
 export class ScrapItemsService {
   constructor(
     @InjectRepository(ScrapItem)
     readonly scrapItemRepo: Repository<ScrapItem>,
+    private readonly webService: WebBidsService,
   ) {}
 
   async upsertScrapItems(items: ScrapItem[]) {
@@ -67,4 +76,27 @@ export class ScrapItemsService {
 
     return AppResponse.toResponse(rs);
   }
+
+  async index(query: PaginateQuery) {
+    const data = await paginate(query, this.scrapItemRepo, {
+      sortableColumns: ['id'],
+      searchableColumns: ['id'],
+      defaultLimit: 15,
+      filterableColumns: {
+        'scrap_config.web_bid.origin_url': true,
+      },
+      defaultSortBy: [['updated_at', 'DESC']],
+      maxLimit: 100,
+    });
+
+    const sources = await this.webService.webBidRepo.find({
+      select: { origin_url: true },
+    });
+
+    return AppResponse.toPagination<ScrapItem>(
+      { ...data, bonus: { sources } },
+      true,
+      ScrapItem,
+    );
+  }
 }

auto-bid-server/src/response/app-response.ts

@@ -25,7 +25,7 @@ export default class AppResponse {
   }
 
   public static toPagination<M>(
-    { data, meta }: Paginated<M>,
+    { data, meta, bonus }: Paginated<M> & { bonus?: Record<string, any> },
     transform = true,
     dtoClass?: new () => M,
   ) {
@@ -45,6 +45,7 @@ export default class AppResponse {
         last_page: meta.totalPages,
         per_page: meta.itemsPerPage,
         total: meta.totalItems,
+        ...bonus,
       },
     });
   }