added merchant filtering

src/merchants/merchant-data.service.ts

@@ -1,7 +1,8 @@
 import { Injectable } from '@nestjs/common';
-import { DataSource, Repository } from 'typeorm';
+import { DataSource, ILike, Repository } from 'typeorm';
 import { Merchant } from './entities/merchant.entity';
 import { UpdateMerchantDto } from './dto/update-merchant.dto';
+import { GetMerchantFilters } from './merchants.controller';
 
 @Injectable()
 export class MerchantDataService {
@@ -11,8 +12,14 @@ export class MerchantDataService {
     this.merchants = this.dataSource.getRepository(Merchant);
   }
 
-  public async getAll(): Promise<Merchant[]> {
+  public async get(filters: GetMerchantFilters): Promise<Merchant[]> {
-    return await this.merchants.find();
+    const idFilters = filters.ids?.map(id => { return { id }}) ?? [];
+    const nameFilters = filters.merchants?.map(tag => { return { name: ILike('%' + tag + '%') }}) ?? [];
+
+    return await this.merchants.find({
+      where: [...idFilters, ...nameFilters],
+      order: { name: filters.sort === 'desc' ? 'desc' : 'asc' },
+    });
   }
 
   public async getById(id: string): Promise<Merchant | null> {

src/merchants/merchants.controller.ts

@@ -6,6 +6,7 @@ import {
   Delete,
   Body,
   Param,
+  Query,
   HttpCode,
   HttpStatus,
   NotFoundException,
@@ -23,8 +24,12 @@ export class MerchantsController {
 
   @Get()
   @HttpCode(HttpStatus.OK)
-  public async findAll(): Promise<Merchant[]> {
+  public async find(@Query() filters: GetMerchantFilters): Promise<Merchant[]> {
-    return await this.merchantsService.findAll();
+    const ids = Array.isArray(filters.ids) ? filters.ids : filters.ids ? [filters.ids] : [];
+    const merchants = Array.isArray(filters.merchants) ? filters.merchants : filters.merchants ? [filters.merchants] : [];
+    const sort = filters.sort?.toLowerCase() === 'desc' ? 'desc' : 'asc';
+
+    return await this.merchantsService.find({ ids, merchants, sort });
   }
 
   @Get(':id')
@@ -73,3 +78,9 @@ export class MerchantsController {
     return await this.merchantsService.remove(id);
   }
 }
+
+export interface GetMerchantFilters {
+  ids?: string[];
+  merchants?: string[];
+  sort?: 'asc' | 'desc';
+}

src/merchants/merchants.service.ts

@@ -3,13 +3,14 @@ import { CreateMerchantDto } from './dto/create-merchant.dto';
 import { UpdateMerchantDto } from './dto/update-merchant.dto';
 import { MerchantDataService } from './merchant-data.service';
 import { Merchant } from './entities/merchant.entity';
+import { GetMerchantFilters } from './merchants.controller';
 
 @Injectable()
 export class MerchantsService {
   public constructor(private merchantDataService: MerchantDataService) { }
 
-  public async findAll(): Promise<Merchant[]> {
+  public async find(filters: GetMerchantFilters): Promise<Merchant[]> {
-    return await this.merchantDataService.getAll();
+    return await this.merchantDataService.get(filters);
   }
 
   public async findById(id: string): Promise<Merchant> {

src/tags/tag-data.service.ts

@@ -12,9 +12,10 @@ export class TagDataService {
     this.tags = this.dataSource.getRepository(Tag);
   }
 
-  public async getAll(filters: GetTagFilters): Promise<Tag[]> {
+  public async get(filters: GetTagFilters): Promise<Tag[]> {
     const idFilters = filters.ids?.map(id => { return { id }}) ?? [];
     const nameFilters = filters.tags?.map(tag => { return { name: ILike('%' + tag + '%') }}) ?? [];
+
     return await this.tags.find({
       where: [...idFilters, ...nameFilters],
       order: { name: filters.sort === 'desc' ? 'desc' : 'asc' },

src/tags/tags.controller.ts

@@ -24,12 +24,12 @@ export class TagsController {
 
   @Get()
   @HttpCode(HttpStatus.OK)
-  public async findAll(@Query() filters: GetTagFilters): Promise<Tag[]> {
+  public async find(@Query() filters: GetTagFilters): Promise<Tag[]> {
     const ids = Array.isArray(filters.ids) ? filters.ids : filters.ids ? [filters.ids] : [];
     const tags = Array.isArray(filters.tags) ? filters.tags : filters.tags ? [filters.tags] : [];
     const sort = filters.sort?.toLowerCase() === 'desc' ? 'desc' : 'asc';
 
-    return await this.tagsService.findAll({ ids, tags, sort });
+    return await this.tagsService.find({ ids, tags, sort });
   }
 
   @Get(':id')

src/tags/tags.service.ts

@@ -9,8 +9,8 @@ import { GetTagFilters } from './tags.controller';
 export class TagsService {
   public constructor(private tagDataService: TagDataService) { }
 
-  public async findAll(filters: GetTagFilters): Promise<Tag[]> {
+  public async find(filters: GetTagFilters): Promise<Tag[]> {
-    return await this.tagDataService.getAll(filters);
+    return await this.tagDataService.get(filters);
   }
 
   public async findById(id: string): Promise<Tag> {