Add flavorProfile to smws scraping

apps/server/src/jobs/scrapeSMWS.test.ts

@@ -18,20 +18,23 @@ test("bottle list", async ({ axiosMock }) => {
   await fn;
 
   expect(items.length).toBe(128);
-  expect(items[0]).toEqual({
-    name: "RW3.6 Truly a flavour bomb",
-    brand: {
-      name: "The Scotch Malt Whisky Society",
-    },
-    bottler: {
-      name: "The Scotch Malt Whisky Society",
-    },
-    category: "rye",
-    distillers: [
-      {
-        name: "New York Distilling Co.",
+  expect(items[0]).toMatchInlineSnapshot(`
+    {
+      "bottler": {
+        "name": "The Scotch Malt Whisky Society",
       },
-    ],
-    statedAge: 5,
-  });
+      "brand": {
+        "name": "The Scotch Malt Whisky Society",
+      },
+      "category": "rye",
+      "distillers": [
+        {
+          "name": "New York Distilling Co.",
+        },
+      ],
+      "flavorProfile": null,
+      "name": "RW3.6 Truly a flavour bomb",
+      "statedAge": 5,
+    }
+  `);
 });

apps/server/src/jobs/scrapeSMWS.ts

@@ -1,5 +1,8 @@
 import { getUrl } from "@peated/server/lib/scraper";
-import { parseDetailsFromName } from "@peated/server/lib/smws";
+import {
+  parseDetailsFromName,
+  parseFlavorProfile,
+} from "@peated/server/lib/smws";
 import { trpcClient } from "@peated/server/lib/trpc/server";
 import { type BottleInputSchema } from "@peated/server/schemas";
 import { type z } from "zod";
@@ -38,6 +41,7 @@ type SMWSPayload = {
     name: string;
     age: number | null;
     cask_no: string;
+    categories: string[];
   }[];
 };
 
@@ -67,6 +71,15 @@ export async function scrapeBottles(
       return;
     }
 
+    const flavorProfileRaw = item.categories.find((c) => {
+      return c.startsWith("All Whisky/Flavour Profiles/");
+    });
+    const flavorProfile = flavorProfileRaw
+      ? parseFlavorProfile(
+          flavorProfileRaw.split("All Whisky/Flavour Profiles/")[1],
+        )
+      : null;
+
     await cb({
       name: details.name,
       category: details.category,
@@ -82,6 +95,7 @@ export async function scrapeBottles(
           name: details.distiller,
         },
       ],
+      flavorProfile,
     });
   });
 }

apps/server/src/jobs/scrapeSMWSA.test.ts

@@ -16,20 +16,23 @@ test("bottle list", async ({ axiosMock }) => {
   await fn;
 
   expect(items.length).toBe(35);
-  expect(items[0]).toEqual({
-    name: "41.176 Baristaliscious",
-    brand: {
-      name: "The Scotch Malt Whisky Society",
-    },
-    bottler: {
-      name: "The Scotch Malt Whisky Society",
-    },
-    category: "single_malt",
-    distillers: [
-      {
-        name: "Dailuaine",
+  expect(items[0]).toMatchInlineSnapshot(`
+    {
+      "bottler": {
+        "name": "The Scotch Malt Whisky Society",
       },
-    ],
-    statedAge: 17,
-  });
+      "brand": {
+        "name": "The Scotch Malt Whisky Society",
+      },
+      "category": "single_malt",
+      "distillers": [
+        {
+          "name": "Dailuaine",
+        },
+      ],
+      "flavorProfile": "juicy_oak_vanilla",
+      "name": "41.176 Baristaliscious",
+      "statedAge": 17,
+    }
+  `);
 });

apps/server/src/jobs/scrapeSMWSA.ts

@@ -1,5 +1,8 @@
 import { getUrl } from "@peated/server/lib/scraper";
-import { parseDetailsFromName } from "@peated/server/lib/smws";
+import {
+  parseDetailsFromName,
+  parseFlavorProfile,
+} from "@peated/server/lib/smws";
 import { trpcClient } from "@peated/server/lib/trpc/server";
 import { type BottleInputSchema } from "@peated/server/schemas";
 import { load as cheerio } from "cheerio";
@@ -77,6 +80,9 @@ export async function scrapeBottles(
     const ageSpec = specList.find(([name]) => name === "Age:");
     const statedAge = ageSpec ? Number(ageSpec[1].split(" ")[0]) : null;
 
+    const flavorSpec = specList.find(([name]) => name === "Flavour:");
+    const flavorProfile = flavorSpec ? parseFlavorProfile(flavorSpec[1]) : null;
+
     const details = parseDetailsFromName(`${itemType} ${caskName}`);
     if (!details?.distiller) {
       console.error(`Cannot find distiller: ${itemType}`);
@@ -98,6 +104,7 @@ export async function scrapeBottles(
         name: "The Scotch Malt Whisky Society",
       },
       distillers: [{ name: details.distiller }],
+      flavorProfile,
     });
   }
 }

apps/server/src/lib/smws.ts

@@ -1,5 +1,5 @@
 import { CATEGORY_LIST } from "@peated/server/constants";
-import { type Category } from "@peated/server/types";
+import type { Category, FlavorProfile } from "@peated/server/types";
 
 // This needs moved into the database and needs to be editable by the community/mods
 // https://www.whiskysaga.com/smws-codes
@@ -312,3 +312,39 @@ export function parseDetailsFromName(name: string): SMWSCaskDetails | null {
     distiller: SMWS_DISTILLERY_CODES[distillerNo],
   };
 }
+
+export function parseFlavorProfile(name: string): FlavorProfile | null {
+  name = name.replace("&", "&").replace(",", "");
+
+  switch (name) {
+    case "Young & Spritely":
+      return "young_spritely";
+    case "Sweet Fruit & Mellow":
+    case "Sweet Fruity & Mellow":
+      return "sweet_fruit_mellow";
+    case "Spicy & Sweet":
+      return "spicy_sweet";
+    case "Spicy & Dry":
+      return "spicy_dry";
+    case "Deep Rich & Dried Fruit":
+    case "Deep Rich & Dried Fruits":
+      return "deep_rich_dried_fruit";
+    case "Old & Dignified":
+      return "old_dignified";
+    case "Light & Delicate":
+      return "light_delicate";
+    case "Juicy Oak & Vanilla":
+      return "juicy_oak_vanilla";
+    case "Oily & Coastal":
+      return "oily_coastal";
+    case "Lightly Peated":
+      return "lightly_peated";
+    case "Peated":
+      return "peated";
+    case "Heavily Peated":
+      return "heavily_peated";
+    default:
+      console.error(`Unknown flavor profile: ${name}`);
+      return null;
+  }
+}

apps/server/src/trpc/routes/bottleCreate.test.ts

@@ -1,3 +1,4 @@
+import { FLAVOR_PROFILES } from "@peated/server/constants";
 import { db } from "@peated/server/db";
 import {
   bottles,
@@ -63,6 +64,7 @@ test("creates a new bottle with all params", async ({ defaults, fixtures }) => {
     bottler: distiller.id,
     distillers: [distiller.id],
     statedAge: 12,
+    flavorProfile: FLAVOR_PROFILES[0],
   });
 
   expect(data.id).toBeDefined();
@@ -74,6 +76,7 @@ test("creates a new bottle with all params", async ({ defaults, fixtures }) => {
   expect(bottle.name).toEqual("Delicious Wood 12-year-old");
   expect(bottle.brandId).toEqual(brand.id);
   expect(bottle.statedAge).toEqual(12);
+  expect(bottle.flavorProfile).toEqual(FLAVOR_PROFILES[0]);
   expect(bottle.createdById).toBe(defaults.user.id);
   const distillers = await db
     .select({ distillerId: bottlesToDistillers.distillerId })

apps/server/src/trpc/routes/bottleCreate.ts

@@ -94,6 +94,7 @@ export async function bottleCreate({
         .values({
           name,
           fullName,
+          flavorProfile: input.flavorProfile,
           statedAge: statedAge,
           category: input.category || null,
           brandId: brand.id,