diff --git a/src/services/cardService.ts b/src/services/cardService.ts index 6e70f29..11a6e7f 100644 --- a/src/services/cardService.ts +++ b/src/services/cardService.ts @@ -1,4 +1,4 @@ -import { Query } from '../interfaces/query'; +import { Parameter } from '../interfaces/parameter'; import { Card } from '../interfaces/card'; import { Type } from '../enums/type'; import { Supertype } from '../enums/supertype'; @@ -12,17 +12,16 @@ export async function findCardByID(id: string): Promise { return response; } -export async function findCardsByQueries(params: Query[]): Promise { +export async function findCardsByQueries(params: Parameter): Promise { const client: Client = Client.getInstance(); const response: Card[] = await client.get('cards', params); return response; } export async function getAllCards(): Promise { - const param = 'pageSize:250'; - + const params: Parameter = { pageSize: 250 }; const client: Client = Client.getInstance(); - const response: Card[] = await client.get('cards', param); + const response: Card[] = await client.get('cards', params); return response; } diff --git a/src/services/setService.ts b/src/services/setService.ts index 1de196e..b8b4591 100644 --- a/src/services/setService.ts +++ b/src/services/setService.ts @@ -1,4 +1,4 @@ -import { Query } from '../interfaces/query'; +import { Parameter } from '../interfaces/parameter'; import { Set } from '../interfaces/set'; import { Client } from '../client'; @@ -8,16 +8,16 @@ export async function findSetByID(id: string): Promise { return response; } -export async function findSetsByQueries(params: Query[]): Promise { +export async function findSetsByQueries(params: Parameter): Promise { const client: Client = Client.getInstance(); const response: Set[] = await client.get('sets', params); return response; } export async function getAllSets(): Promise { - const param = 'pageSize:250'; + const params: Parameter = { pageSize: 250 }; const client: Client = Client.getInstance(); - const response: Set[] = await client.get('sets', param); + const response: Set[] = await client.get('sets', params); return response; } diff --git a/test/cardService.test.ts b/test/cardService.test.ts index d148372..fdab088 100644 --- a/test/cardService.test.ts +++ b/test/cardService.test.ts @@ -1,5 +1,5 @@ import { findCardByID, findCardsByQueries, getAllCards, getSupertypes, getSubtypes, getTypes, getRarities } from "../src/services/cardService"; -import { Query } from "../src/interfaces/query"; +import { Parameter } from "../src/interfaces/parameter"; import { Card } from "../src/interfaces/card"; import { Type } from '../src/enums/type'; import { Supertype } from '../src/enums/supertype'; @@ -8,10 +8,7 @@ import { Rarity } from '../src/enums/rarity'; describe('Card Service', () => { it('should get a single card using query parameters', async () => { - const params: Query[] = [{ - name: 'id', - value: 'xy7-54' - }] + const params: Parameter = { q: 'id:xy7-54' } const result: Card[] = await findCardsByQueries(params); expect(result[0].name).toEqual('Gardevoir'); diff --git a/test/setService.test.ts b/test/setService.test.ts index 30425be..4ee4c02 100644 --- a/test/setService.test.ts +++ b/test/setService.test.ts @@ -1,13 +1,10 @@ import { findSetByID, findSetsByQueries, getAllSets } from '../src/services/setService'; -import { Query } from "../src/interfaces/query"; +import { Parameter } from "../src/interfaces/parameter"; import { Set } from "../src/interfaces/set"; describe('Set Service', () => { it('should get a single set using query parameters', async () => { - const params: Query[] = [{ - name: 'name', - value: 'Base' - }]; + const params: Parameter = { q: 'name:Base' }; const result: Set[] = await findSetsByQueries(params); expect(result[0].name).toEqual('Base');