Merge pull request #33 from AnselmMarie/fix/amarie/resolving-issues

Fix/amarie/resolving issues

Author: AnselmMarie

.claude/settings.local.json

@@ -33,6 +33,9 @@ npm-debug.log
 yarn-error.log
 testem.log
 /typings
+.claude
+.gemini
+.vscode
 
 # System Files
 .DS_Store

.gemini/settings.json

@@ -0,0 +1,3 @@
+.claude/worktrees
+.gemini
+.vscode

.gitignore

@@ -25,7 +25,7 @@ export const deleteCartItemService = async (id: string) => {
   currentCartData.counter = currentCartData.counter - dataToRemove[0]?.quantity;
   currentCartData.total = currentCartData.total - totalPrice;
 
-  if (keySplice) {
+  if (keySplice !== null) {
     data.splice(keySplice, 1);
   }
   currentCartData.data = data;

.nxignore

@@ -37,15 +37,16 @@ const doesItemExistKeyFn = (
 };
 
 const getSpeciesDetail = async (id: string) => {
-  return Promise.all([
-    await getPokemonSpeciesService({ id }).catch(() => 'err'),
-    await getPokemonDetailService({ id }).catch(() => 'err'),
-  ]).then((data) => {
-    if (data[0] === 'err' || data[1] === 'err') {
-      return 'err';
-    }
-    return { ...data[0], ...data[1] };
-  });
+  const [speciesResult, detailResult] = await Promise.all([
+    getPokemonSpeciesService({ id }).catch(() => 'err' as const),
+    getPokemonDetailService({ id }).catch(() => 'err' as const),
+  ]);
+
+  if (speciesResult === 'err' || detailResult === 'err') {
+    return 'err' as const;
+  }
+
+  return { ...speciesResult, ...detailResult };
 };
 
 export const updateCartItemService = async (payload: CartPayload) => {
@@ -74,6 +75,10 @@ export const updateCartItemService = async (payload: CartPayload) => {
     throw errFormat500ResponseUtil();
   });
 
+  if (speciesData === 'err') {
+    throw errFormat500ResponseUtil();
+  }
+
   const evolutionChainSplit = speciesData?.evolution_chain?.url?.split('/');
 
   const evolutionData = await getPokemonEvolutionChainService({
@@ -122,7 +127,7 @@ export const updateCartItemService = async (payload: CartPayload) => {
     name: speciesData?.name,
     price: pokemonPrice,
     quantity: 1,
-    image: speciesData?.sprites?.other?.['official-artwork']?.front_default,
+    image: speciesData?.sprites?.other?.['official-artwork']?.front_default ?? '',
     isLegendary: speciesData?.is_legendary,
     isMythical: speciesData?.is_mythical,
     types: speciesData?.types,