+ Success! Your new masterpiece was created! +
+` + +const CREATE_ERROR_HTML = ` ++ Uh oh! Something went wrong when creating your recipe. Please try again. %s +
+` + func CreateRecipe(ctx *gin.Context) { - // deps := ctx.MustGet("deps").(*domain.InjectedDependencies) - - title := ctx.PostForm("title") - description := ctx.PostForm("description") - preparation := ctx.PostForm("preparation-time") - cook := ctx.PostForm("cook-time") - serving := ctx.PostForm("serving-size") - category := ctx.PostForm("category") - difficulty := ctx.PostForm("difficulty") - ingredients := ctx.PostFormArray("ingredients") - quantity := ctx.PostFormArray("quantity") - instructions := ctx.PostFormArray("instructions") - tags := ctx.PostForm("tags") // this is a list of strings split with a comma (,) - - // Have to get the image differently - image, err := ctx.FormFile("image") + deps := ctx.MustGet("deps").(*domain.InjectedDependencies) + _, err := deps.RecipeService.CreateRecipe(ctx) if err != nil { - ctx.JSON(http.StatusOK, gin.H{"error": err.Error()}) + ctx.String(http.StatusOK, CREATE_ERROR_HTML, err.Error()) return } - - ctx.JSON(http.StatusOK, gin.H{ - "title": title, - "description": description, - "cook time": cook, - "preparation time": preparation, - "serving size": serving, - "category": category, - "difficulty": difficulty, - "ingredients": ingredients, - "quantity": quantity, - "instructions": instructions, - "tags": tags, - "image": image.Filename, - }) - - // deps.RecipeService.CreateRecipe(ctx) - // ctx.JSON(http.StatusCreated, gin.H{"recipe": recipe}) + ctx.String(http.StatusOK, CREATE_SUCCESS_HTML) } diff --git a/internal/app/service/recipe_service.go b/internal/app/service/recipe_service.go index dcfa557..b0d302b 100644 --- a/internal/app/service/recipe_service.go +++ b/internal/app/service/recipe_service.go @@ -1,11 +1,16 @@ package service import ( + "errors" + "fmt" "net/http" + "strconv" + "strings" "time" "github.com/gin-gonic/gin" domain "github.com/haydenhargreaves/Potion/internal/domain/recipe" + domainServer "github.com/haydenhargreaves/Potion/internal/domain/server" ) // RecipeService implements the domain.RecipeService defined in the domain module. @@ -22,45 +27,85 @@ func NewRecipeService(recipeRepository domain.RecipeRepository) domain.RecipeSer return &RecipeService{recipeRepository: recipeRepository} } -func (s *RecipeService) CreateRecipe(ctx *gin.Context) domain.Recipe { - // TODO: Implement +func (s *RecipeService) CreateRecipe(ctx *gin.Context) (*domain.Recipe, error) { + // Ensure user is logged in + if !domainServer.IsLoggedIn(ctx) { + return nil, fmt.Errorf("User is not logged in.") + } + title := ctx.PostForm("title") + description := ctx.PostForm("description") + preparation := ctx.PostForm("preparation-time") + cook := ctx.PostForm("cook-time") + serving := ctx.PostForm("serving-size") + category := ctx.PostForm("category") + difficulty := ctx.PostForm("difficulty") + ingredients := ctx.PostFormArray("ingredients") + quantity := ctx.PostFormArray("quantity") + instructions := ctx.PostFormArray("instructions") + tags := strings.Split(ctx.PostForm("tags"), ",") + userId := ctx.MustGet("userId").(int) + + // Have to get the image differently + image, err := ctx.FormFile("image") + if err != nil && !errors.Is(err, http.ErrMissingFile) { + // Error getting image + } + + // Convert to proper values + servingInt, _ := strconv.Atoi(serving) + difficultyInt, _ := strconv.Atoi(difficulty) + prepInt, _ := strconv.Atoi(preparation) + cookInt, _ := strconv.Atoi(cook) + + var ingredientSlice []domain.RecipeIngredient + for i := range len(ingredients) { + if strings.TrimSpace(ingredients[i]) != "" { + ins := domain.RecipeIngredient{ + Name: ingredients[i], + Quantity: quantity[i], + } + + ingredientSlice = append(ingredientSlice, ins) + } + } + + var instructionSlice []string + for _, ins := range instructions { + if ins != "" { + instructionSlice = append(instructionSlice, ins) + } + } + + // Create the recipe recipe := domain.Recipe{ - Title: "Delicious Go Curry", - Description: "A savory and easy-to-make curry, perfect for weeknights.", - Instructions: []string{ - "Chop all vegetables.", - "Sauté onions and garlic until fragrant.", - "Add curry paste and stir for 1 minute.", - "Add coconut milk and vegetables, simmer until cooked.", - "Serve with rice.", - }, - Serves: 4, - Difficulty: 3, + Title: title, + Description: description, + Instructions: instructionSlice, + Serves: servingInt, + Difficulty: difficultyInt, Duration: domain.RecipeDuration{ - Total: 45, - Prep: 15, - Cook: 30, + Total: prepInt + cookInt, + Prep: prepInt, + Cook: cookInt, }, - Category: domain.MealDinner, // Using our EMeal type. Ensure this matches an updated enum value. - Ingredients: []domain.RecipeIngredient{ - {Name: "Onion", Quantity: "1 large"}, - {Name: "Garlic", Quantity: "3 cloves"}, - {Name: "Curry Paste", Quantity: "2 tbsp"}, - {Name: "Coconut Milk", Quantity: "400ml can"}, - {Name: "Broccoli", Quantity: "1 head"}, - {Name: "Bell Pepper", Quantity: "1 red"}, - {Name: "Rice", Quantity: "As needed"}, - }, - UserId: 3, - Created: time.Now(), + Category: domain.RecipeMeal(category), + Ingredients: ingredientSlice, + UserId: userId, + Created: time.Now(), } if err := s.recipeRepository.CreateRecipe(&recipe); err != nil { - ctx.JSON(http.StatusOK, gin.H{"err": err.Error()}) - return domain.Recipe{} + return &recipe, err } - ctx.JSON(http.StatusCreated, gin.H{"recipe": recipe}) - return recipe + // TODO: Upload the image + if image != nil { + } + + // TODO: Create the tags in the database + if len(tags) > 0 { + } + + return &recipe, nil } diff --git a/internal/domain/recipe/service.go b/internal/domain/recipe/service.go index f11282e..c05649d 100644 --- a/internal/domain/recipe/service.go +++ b/internal/domain/recipe/service.go @@ -3,6 +3,5 @@ package domain import "github.com/gin-gonic/gin" type RecipeService interface { - CreateRecipe(ctx *gin.Context) Recipe + CreateRecipe(ctx *gin.Context) (*Recipe, error) } - diff --git a/internal/templates/pages/create.templ b/internal/templates/pages/create.templ index 73edb4b..25e874c 100644 --- a/internal/templates/pages/create.templ +++ b/internal/templates/pages/create.templ @@ -13,7 +13,6 @@ templ CreatePage() { templ Page() { @components.BannerText("Create Your Masterpiece") -Welcome to the Recipe Creation Wizard! Simply fill in the details about your culinary creation, @@ -24,7 +23,13 @@ templ Page() { button to share your masterpiece!
-+ Please enter at least one ingredient. +
++ Please provide a quantity. +
+