From 772917fde6964562382ad5e411fc206a400824c7 Mon Sep 17 00:00:00 2001
From: Matt Dunn-Rankin <mattdunnrankin@khanacademy.org>
Date: Sat, 23 May 2020 11:48:53 -0700
Subject: [PATCH] add unknown and UC to valid pet poses

---
 .../getValidPetPoses.test.js.snap             | Bin 6284 -> 9942 bytes
 src/server/getValidPetPoses.js                |  34 ++++++++++--------
 .../SpeciesColorPair.test.js.snap             |  24 +++++++++++++
 src/server/util.js                            |  29 ++++++++++++++-
 4 files changed, 71 insertions(+), 16 deletions(-)

diff --git a/src/server/__snapshots__/getValidPetPoses.test.js.snap b/src/server/__snapshots__/getValidPetPoses.test.js.snap
index 351b19a755383be6f9191ab7c40027d489d08b64..60229d16e57d17da24855ea52d9fde1592e257cc 100644
GIT binary patch
literal 9942
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

literal 6284
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
Kp6p+A`~L$W8Q)w0

diff --git a/src/server/getValidPetPoses.js b/src/server/getValidPetPoses.js
index cda8586f..c1b97b73 100644
--- a/src/server/getValidPetPoses.js
+++ b/src/server/getValidPetPoses.js
@@ -1,6 +1,6 @@
 import connectToDb from "./db";
 
-import { getEmotion, getGenderPresentation } from "./util";
+import { getPose } from "./util";
 
 export default async function getValidPetPoses() {
   const db = await connectToDb();
@@ -17,15 +17,14 @@ export default async function getValidPetPoses() {
 
   const poseStrs = new Set();
   for (const poseTuple of poseTuples) {
-    const { species_id, color_id, mood_id, female } = poseTuple;
-    const emotion = getEmotion(mood_id);
-    const genderPresentation = getGenderPresentation(female);
-    const poseStr = `${species_id}-${color_id}-${emotion}-${genderPresentation}`;
+    const { species_id, color_id, mood_id, female, unconverted } = poseTuple;
+    const pose = getPose(mood_id, female, unconverted);
+    const poseStr = `${species_id}-${color_id}-${pose}`;
     poseStrs.add(poseStr);
   }
 
-  function hasPose(speciesId, colorId, emotion, genderPresentation) {
-    const poseStr = `${speciesId}-${colorId}-${emotion}-${genderPresentation}`;
+  function hasPose(speciesId, colorId, pose) {
+    const poseStr = `${speciesId}-${colorId}-${pose}`;
     return poseStrs.has(poseStr);
   }
 
@@ -43,17 +42,21 @@ export default async function getValidPetPoses() {
       // them first, so that they fill in the currently-empty high bits and
       // everything else stays in the same position as before!
       let byte = 0;
-      byte += hasPose(speciesId, colorId, "SICK", "FEMININE") ? 1 : 0;
+      byte += hasPose(speciesId, colorId, "UNKNOWN") ? 1 : 0;
       byte <<= 1;
-      byte += hasPose(speciesId, colorId, "SAD", "FEMININE") ? 1 : 0;
+      byte += hasPose(speciesId, colorId, "UNCONVERTED") ? 1 : 0;
       byte <<= 1;
-      byte += hasPose(speciesId, colorId, "HAPPY", "FEMININE") ? 1 : 0;
+      byte += hasPose(speciesId, colorId, "SICK_FEM") ? 1 : 0;
       byte <<= 1;
-      byte += hasPose(speciesId, colorId, "SICK", "MASCULINE") ? 1 : 0;
+      byte += hasPose(speciesId, colorId, "SAD_FEM") ? 1 : 0;
       byte <<= 1;
-      byte += hasPose(speciesId, colorId, "SAD", "MASCULINE") ? 1 : 0;
+      byte += hasPose(speciesId, colorId, "HAPPY_FEM") ? 1 : 0;
       byte <<= 1;
-      byte += hasPose(speciesId, colorId, "HAPPY", "MASCULINE") ? 1 : 0;
+      byte += hasPose(speciesId, colorId, "SICK_MASC") ? 1 : 0;
+      byte <<= 1;
+      byte += hasPose(speciesId, colorId, "SAD_MASC") ? 1 : 0;
+      byte <<= 1;
+      byte += hasPose(speciesId, colorId, "HAPPY_MASC") ? 1 : 0;
 
       buffer.writeUInt8(byte, speciesIndex * numColors + colorIndex + 2);
     }
@@ -76,8 +79,9 @@ async function getNumColors(db) {
 
 async function getPoseTuples(db) {
   const [rows, _] = await db.query(`
-    SELECT DISTINCT species_id, color_id, mood_id, female FROM pet_states
+    SELECT DISTINCT species_id, color_id, mood_id, female, unconverted
+        FROM pet_states
     INNER JOIN pet_types ON pet_types.id = pet_states.pet_type_id
-    WHERE mood_id IS NOT NULL AND female IS NOT NULL AND color_id >= 1`);
+    WHERE glitched IS false AND color_id >= 1`);
   return rows;
 }
diff --git a/src/server/query-tests/__snapshots__/SpeciesColorPair.test.js.snap b/src/server/query-tests/__snapshots__/SpeciesColorPair.test.js.snap
index 928c7e20..b613f31b 100644
--- a/src/server/query-tests/__snapshots__/SpeciesColorPair.test.js.snap
+++ b/src/server/query-tests/__snapshots__/SpeciesColorPair.test.js.snap
@@ -9675,6 +9675,14 @@ Object {
         "id": "18",
       },
     },
+    Object {
+      "color": Object {
+        "id": "108",
+      },
+      "species": Object {
+        "id": "18",
+      },
+    },
     Object {
       "color": Object {
         "id": "6",
@@ -16531,6 +16539,14 @@ Object {
         "id": "31",
       },
     },
+    Object {
+      "color": Object {
+        "id": "106",
+      },
+      "species": Object {
+        "id": "31",
+      },
+    },
     Object {
       "color": Object {
         "id": "6",
@@ -17979,6 +17995,14 @@ Object {
         "id": "34",
       },
     },
+    Object {
+      "color": Object {
+        "id": "109",
+      },
+      "species": Object {
+        "id": "34",
+      },
+    },
     Object {
       "color": Object {
         "id": "-1",
diff --git a/src/server/util.js b/src/server/util.js
index 49b7f157..72209352 100644
--- a/src/server/util.js
+++ b/src/server/util.js
@@ -26,4 +26,31 @@ function getGenderPresentation(modelPetWasFemale) {
   }
 }
 
-module.exports = { capitalize, getEmotion, getGenderPresentation };
+function getPose(moodId, modelPetWasFemale, isUnconverted) {
+  if (isUnconverted) {
+    return "UNCONVERTED";
+  } else if (moodId == null || modelPetWasFemale == null) {
+    return "UNKNOWN";
+  } else if (String(moodId) === "1" && String(modelPetWasFemale) === "0") {
+    return "HAPPY_MASC";
+  } else if (String(moodId) === "1" && String(modelPetWasFemale) === "1") {
+    return "HAPPY_FEM";
+  } else if (String(moodId) === "2" && String(modelPetWasFemale) === "0") {
+    return "SAD_MASC";
+  } else if (String(moodId) === "2" && String(modelPetWasFemale) === "1") {
+    return "SAD_FEM";
+  } else if (String(moodId) === "4" && String(modelPetWasFemale) === "0") {
+    return "SICK_MASC";
+  } else if (String(moodId) === "4" && String(modelPetWasFemale) === "1") {
+    return "SICK_FEM";
+  } else {
+    throw new Error(
+      `could not identify pose: ` +
+        `moodId=${moodId}, ` +
+        `modelPetWasFemale=${modelPetWasFemale}, ` +
+        `isUnconverted=${isUnconverted}`
+    );
+  }
+}
+
+module.exports = { capitalize, getEmotion, getGenderPresentation, getPose };