feat: Add serving size scraping and customisation

package.json

@@ -42,7 +42,7 @@
     "class-variance-authority": "^0.7.0",
     "clsx": "^2.0.0",
     "cmdk": "^1.0.0",
-    "drizzle-orm": "^0.30.6",
+    "drizzle-orm": "^0.30.9",
     "jsdom": "^23.0.1",
     "lucide-react": "^0.368.0",
     "next": "^14.0.3",
@@ -75,7 +75,7 @@
     "@typescript-eslint/parser": "^7.4.0",
     "autoprefixer": "^10.4.14",
     "dotenv-cli": "^7.3.0",
-    "drizzle-kit": "^0.20.14",
+    "drizzle-kit": "^0.20.17",
     "eslint": "^8.57.0",
     "eslint-config-next": "13.0.0",
     "eslint-config-prettier": "^8.8.0",

src/app/(dashboard)/recipes/[id]/recipeForm.tsx

@@ -13,6 +13,14 @@ import { Controller, FormProvider, useForm } from "react-hook-form"
 import { toast } from "sonner"
 
 import { Button } from "~/components/ui/button"
+import {
+  FormControl,
+  FormField,
+  FormItem,
+  FormLabel,
+  FormMessage,
+} from "~/components/ui/form"
+import { Input } from "~/components/ui/input"
 import { IngredientTable } from "~/components/ingredient-table"
 import { RecipeTitleInput } from "~/components/recipe-title-input"
 
@@ -52,9 +60,10 @@ function RecipeFormInner({
         }
       }),
       recipeName: recipe.name,
-      method: recipe.steps || undefined,
-      imageUrl: recipe.imageUrl || undefined,
+      method: recipe.steps ?? undefined,
+      imageUrl: recipe.imageUrl ?? undefined,
       recipeBuddyRecipeId: recipe.id,
+      servings: recipe.servings ?? undefined,
     },
   })
 
@@ -81,6 +90,19 @@ function RecipeFormInner({
             name="recipeName"
             control={form.control}
           />
+          <FormField
+            render={({ field }) => (
+              <FormItem className="flex items-center gap-2">
+                <FormLabel>Servings</FormLabel>
+                <FormControl>
+                  <Input className="max-w-[70px]" type="number" {...field} />
+                </FormControl>
+                <FormMessage />
+              </FormItem>
+            )}
+            name="servings"
+            control={form.control}
+          />
           <Link
             href={recipe.url}
             className="text-muted-foreground pl-1 text-lg"

src/server/api/modules/grocy/procedures/createRecipeInGrocy.ts

@@ -58,6 +58,7 @@ export const createRecipeInGrocyProcedure = protectedProcedure
       name: input.recipeName,
       description: input.method,
       picture_file_name: imageFilename,
+      base_servings: input.servings,
     }
 
     const recipeResponse = await grocyFetch("/objects/recipes", {

src/server/api/modules/grocy/procedures/createRecipeInGrocySchema.ts

@@ -21,12 +21,27 @@ const IngredientSchema = z.union([
   UnignoredIngredientSchema,
   IgnoredIngredientSchema,
 ])
+
+const numberLike = z.union([z.number(), z.string()])
+const numberLikeToNumberAtLeastOne = numberLike
+  .pipe(
+    z.coerce
+      .number()
+      .int("Must be a whole number")
+      .min(0, "Must be a positive number")
+  )
+  .transform((a) => {
+    if (a < 1) return 1
+    return a
+  })
+
 export const CreateRecipeInGrocyCommandSchema = z.object({
   recipeBuddyRecipeId: z.number(),
   recipeName: z.string().trim().min(1),
   ingredients: IngredientSchema.array(),
   method: z.string().optional(),
   imageUrl: z.string().url().optional(),
+  servings: numberLikeToNumberAtLeastOne.optional(),
 })
 
 export type CreateRecipeInGrocyCommand = z.infer<

src/server/api/modules/recipes/service/schemas.ts

@@ -18,5 +18,23 @@ export const RecipeImageUrlSchema = z
   })
 
 export const JsonLdRecipeSchema = z.object({
-  "@type": z.string(),
+  "@type": z.union([z.string(), z.tuple([z.string()]).transform((a) => a[0])]),
+})
+
+export const ExtractNumberSchema = z.coerce.string().transform((val, ctx) => {
+  const numberRegex = /\d+/g
+
+  const regexResult = numberRegex.exec(val)
+
+  if (!regexResult) {
+    ctx.addIssue({
+      message: "No numbers found in servings",
+      code: "custom",
+    })
+    return z.NEVER
+  }
+
+  const [first] = regexResult
+
+  return parseInt(first)
 })

src/server/api/modules/recipes/service/scraper.ts

@@ -1,5 +1,6 @@
 import { TRPCError } from "@trpc/server"
 import {
+  ExtractNumberSchema,
   JsonLdRecipeSchema,
   RecipeImageUrlSchema,
   RecipeStepSchema,
@@ -62,6 +63,7 @@ function getSchemaRecipeFromNodeList(nodeList: NodeList) {
     }
 
     if (Array.isArray(parsedNodeContent)) {
+      console.log("its an array")
       for (const metadataObject of parsedNodeContent) {
         if (jsonObjectIsRecipe(metadataObject)) {
           return metadataObject
@@ -106,11 +108,14 @@ export async function hydrateRecipe(url: string) {
     (a) => ({ scrapedName: a })
   )
 
+  const servings = ExtractNumberSchema.safeParse(recipeData.recipeYield)
+
   const recipe: InsertRecipe = {
     name: recipeData.name,
     url,
     steps: steps.data.join("\n"),
     imageUrl: image.success ? image.data : undefined,
+    servings: servings.success ? servings.data : undefined,
   }
 
   return { recipe, ingredients: ings }

src/server/db/drizzle/0001_worthless_aqueduct.sql

@@ -0,0 +1 @@
+ALTER TABLE `recipe-buddy_recipe` ADD `servings` integer;