fix(webhooks): normalize Poracle Pokemon payloads

src/features/webhooks/Manage.jsx

@@ -92,7 +92,12 @@ export function Manage() {
   React.useEffect(() => {
     if (!addNew.open && addNew.save && category !== 'human') {
       const { tempFilters } = useWebhookStore.getState()
-      const values = Poracle.processor(
+      const values = Poracle.toLocalState(
+        category,
+        Object.values(tempFilters || {}).filter((x) => x && x.enabled),
+        useWebhookStore.getState().context.ui[category].defaults,
+      )
+      const payload = Poracle.toApiPayload(
         category,
         Object.values(tempFilters || {}).filter((x) => x && x.enabled),
         useWebhookStore.getState().context.ui[category].defaults,
@@ -102,7 +107,7 @@ export function Manage() {
         mutation: Query.webhook(category.toUpperCase()),
         variables: {
           category,
-          data: values,
+          data: payload,
           status: 'POST',
         },
         refetchQueries: [ALL_PROFILES],

src/features/webhooks/services/Poracle.js

@@ -177,7 +177,7 @@ export class Poracle {
     return reactMapFriendly
   }
 
-  static processor(category, entries, defaults) {
+  static processPokemon(entries, defaults, includeUiState = false) {
     const pvpFields = [
       'pvp_ranking_league',
       'pvp_ranking_best',
@@ -194,6 +194,70 @@ export class Poracle {
       'pvpEntry',
     ]
     const dupes = {}
+
+    return entries
+      .map((pokemon) => {
+        const normalized = pokemon.allForms
+          ? { ...pokemon, form: defaults.form }
+          : pokemon
+        const fields = [
+          'uid',
+          'pokemon_id',
+          'form',
+          'clean',
+          'distance',
+          'min_time',
+          'template',
+          'profile_no',
+          'ping',
+          'gender',
+          'rarity',
+          'max_rarity',
+          'size',
+          'max_size',
+        ]
+        const newPokemon = {}
+
+        if (pokemon.allForms) {
+          if (dupes[pokemon.pokemon_id]) {
+            return null
+          }
+          dupes[pokemon.pokemon_id] = true
+        }
+
+        if (pokemon.pvpEntry) {
+          fields.push(...pvpFields)
+        } else {
+          fields.push(
+            ...Object.keys(normalized).filter(
+              (key) => !pvpFields.includes(key) && !ignoredFields.includes(key),
+            ),
+          )
+        }
+
+        new Set(fields).forEach((field) => {
+          newPokemon[field] =
+            normalized[field] === undefined
+              ? defaults[field]
+              : normalized[field]
+        })
+
+        if (includeUiState) {
+          newPokemon.allForms = !!pokemon.allForms
+          newPokemon.byDistance = !!pokemon.byDistance
+          newPokemon.noIv = !!pokemon.noIv
+          newPokemon.pvpEntry = !!pokemon.pvpEntry
+          newPokemon.xs = !!pokemon.xs
+          newPokemon.xl = !!pokemon.xl
+        }
+
+        return newPokemon
+      })
+      .filter((pokemon) => pokemon)
+  }
+
+  static processor(category, entries, defaults) {
+    const dupes = {}
     switch (category) {
       case 'egg':
         return entries.map((egg) => ({
@@ -255,49 +319,103 @@ export class Poracle {
           })
           .filter((quest) => quest)
       default:
-        return entries
-          .map((pkmn) => {
-            const fields = [
-              'pokemon_id',
-              'form',
-              'clean',
-              'distance',
-              'min_time',
-              'template',
-              'profile_no',
-              'gender',
-              'rarity',
-              'max_rarity',
-              'size',
-              'max_size',
-            ]
-            const newPokemon = {}
-            if (pkmn.allForms) {
-              pkmn.form = 0
-              if (dupes[pkmn.pokemon_id]) {
-                return null
-              }
-              dupes[pkmn.pokemon_id] = true
-            }
-            if (pkmn.pvpEntry) {
-              fields.push(...pvpFields)
-            } else {
-              fields.push(
-                ...Object.keys(pkmn).filter(
-                  (key) =>
-                    !pvpFields.includes(key) && !ignoredFields.includes(key),
-                ),
-              )
-            }
-            new Set(fields).forEach(
-              (field) =>
-                (newPokemon[field] =
-                  pkmn[field] === undefined ? defaults[field] : pkmn[field]),
-            )
-            return newPokemon
-          })
-          .filter((pokemon) => pokemon)
+        return Poracle.processPokemon(entries, defaults)
+    }
+  }
+
+  static toLocalState(category, entries, defaults) {
+    if (category !== 'pokemon') {
+      return Poracle.processor(category, entries, defaults)
+    }
+
+    return Poracle.processPokemon(entries, defaults, true)
+  }
+
+  static toUpdatePayload(category, entries, defaults) {
+    const processed = Poracle.toLocalState(category, entries, defaults)
+    if (category !== 'pokemon') {
+      return processed
     }
+
+    const requiredFields = [
+      'uid',
+      'pokemon_id',
+      'form',
+      'profile_no',
+      'template',
+    ]
+    const scalarFields = ['clean', 'distance', 'gender', 'min_time']
+    const rangeGroups = [
+      ['min_cp', 'max_cp'],
+      ['min_level', 'max_level'],
+      ['atk', 'max_atk'],
+      ['def', 'max_def'],
+      ['sta', 'max_sta'],
+      ['rarity', 'max_rarity'],
+      ['size', 'max_size'],
+      ['min_weight', 'max_weight'],
+    ]
+    const pvpFields = [
+      'pvp_ranking_league',
+      'pvp_ranking_best',
+      'pvp_ranking_worst',
+      'pvp_ranking_min_cp',
+      'pvp_ranking_cap',
+    ]
+
+    return processed.map((pokemon) => {
+      const payload = {}
+
+      requiredFields.forEach((field) => {
+        if (pokemon[field] !== undefined) {
+          payload[field] = pokemon[field]
+        }
+      })
+
+      if (pokemon.ping !== undefined) {
+        payload.ping = pokemon.ping
+      }
+
+      scalarFields.forEach((field) => {
+        payload[field] =
+          pokemon[field] === undefined ? defaults[field] : pokemon[field]
+      })
+
+      payload.min_iv =
+        pokemon.min_iv === undefined ? defaults.min_iv : pokemon.min_iv
+      payload.max_iv =
+        pokemon.max_iv === undefined ? defaults.max_iv : pokemon.max_iv
+
+      rangeGroups.forEach(([low, high]) => {
+        payload[low] = pokemon[low] === undefined ? defaults[low] : pokemon[low]
+        payload[high] =
+          pokemon[high] === undefined ? defaults[high] : pokemon[high]
+      })
+
+      pvpFields.forEach((field) => {
+        payload[field] =
+          pokemon.pvpEntry && pokemon.pvp_ranking_league
+            ? pokemon[field] === undefined
+              ? defaults[field]
+              : pokemon[field]
+            : defaults[field]
+      })
+
+      return payload
+    })
+  }
+
+  static toApiPayload(category, entries, defaults) {
+    const processed = Poracle.toUpdatePayload(category, entries, defaults)
+    if (category !== 'pokemon') {
+      return processed
+    }
+
+    return processed.map((pokemon) => {
+      const payload = { ...pokemon }
+      delete payload.uid
+      return payload
+    })
   }
 
   /**

src/features/webhooks/tiles/TrackedTile.jsx

@@ -32,19 +32,19 @@ export function TrackedTile({ index }) {
       useWebhookStore.setState((prev) => ({
         tempFilters: {
           ...prev.tempFilters,
-          [id]: { ...item, byDistance: !!item.distance },
+          [id]: { ...defaults, ...item, byDistance: !!item.distance },
         },
       }))
     }
-  }, [advOpen, id, item])
+  }, [advOpen, defaults, id, item])
 
   const onClose = React.useCallback(
     (newFilter, save) => {
       if (save) {
         apolloClient.mutate({
           mutation: webhookNodes[category.toUpperCase()],
           variables: {
-            data: Poracle.processor(category, [newFilter], defaults),
+            data: Poracle.toUpdatePayload(category, [newFilter], defaults),
             status: 'POST',
             category,
           },