fix: ensure forme and formeLetter are actually mapped

favware · Jan 22, 2022 · 90f5fc6 · 90f5fc6
1 parent 7caedda
commit 90f5fc6
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/__tests__/scenarios/pokemon/getFuzzyPokemon.test.ts b/__tests__/scenarios/pokemon/getFuzzyPokemon.test.ts
@@ -1187,8 +1187,8 @@ describe('getFuzzyPokemon', () => {
  game: 'Shield'
  }
  ],
- forme: null,
- formeLetter: null,
+ forme: 'Rapid-Strike-Gmax',
+ formeLetter: 'RSG',
  gender: { female: '12.5%', male: '87.5%' },
  height: 3,
  isEggObtainable: false,
@@ -1252,8 +1252,8 @@ describe('getFuzzyPokemon', () => {
  game: 'Shield'
  }
  ],
- forme: null,
- formeLetter: null,
+ forme: 'Gmax',
+ formeLetter: 'G',
  gender: { female: '50%', male: '50%' },
  height: 10,
  isEggObtainable: true,
@@ -1317,8 +1317,8 @@ describe('getFuzzyPokemon', () => {
  game: 'Shield'
  }
  ],
- forme: null,
- formeLetter: null,
+ forme: 'Gmax',
+ formeLetter: 'G',
  gender: { female: '50%', male: '50%' },
  height: 14,
  isEggObtainable: true,

diff --git a/__tests__/scenarios/pokemon/getPokemon.test.ts b/__tests__/scenarios/pokemon/getPokemon.test.ts
@@ -839,8 +839,8 @@ describe('getPokemon', () => {
  game: "Let's Go Eevee"
  }
  ],
- forme: null,
- formeLetter: null,
+ forme: 'Alola',
+ formeLetter: 'A',
  gender: {
  female: '50%',
  male: '50%'
@@ -869,8 +869,8 @@ describe('getPokemon', () => {
  game: "Let's Go Eevee"
  }
  ],
- forme: null,
- formeLetter: null,
+ forme: 'Alola',
+ formeLetter: 'A',
  gender: {
  female: '50%',
  male: '50%'

diff --git a/src/services/DexService.ts b/src/services/DexService.ts
@@ -247,6 +247,8 @@ export class DexService {
 
  addPropertyToClass(pokemonData, 'height', data.heightm, requestedFields, `${recursingAs ? `${recursingAs}.` : ''}height`);
  addPropertyToClass(pokemonData, 'weight', data.weightkg, requestedFields, `${recursingAs ? `${recursingAs}.` : ''}weight`);
+ addPropertyToClass(pokemonData, 'forme', data.forme, requestedFields, `${recursingAs ? `${recursingAs}.` : ''}forme`);
+ addPropertyToClass(pokemonData, 'formeLetter', data.formeLetter, requestedFields, `${recursingAs ? `${recursingAs}.` : ''}formeLetter`);
  addPropertyToClass(pokemonData, 'baseForme', data.baseForme, requestedFields, `${recursingAs ? `${recursingAs}.` : ''}baseForme`);
  addPropertyToClass(pokemonData, 'baseSpecies', data.baseSpecies, requestedFields, `${recursingAs ? `${recursingAs}.` : ''}baseSpecies`);
  addPropertyToClass(pokemonData, 'otherFormes', data.otherFormes, requestedFields, `${recursingAs ? `${recursingAs}.` : ''}otherFormes`);