From 10784b6e242b941b76ce21186c4279bcd4037789 Mon Sep 17 00:00:00 2001
From: Hayden <64056131+hay-kot@users.noreply.github.com>
Date: Sun, 3 Apr 2022 16:32:58 -0800
Subject: [PATCH] feat: support require_all property for cookbooks (#1130)

* add direction prop for icon position

* add support for require_all properties on cookbook

* update type annotations

* add and - or filter support

* update cookbook API

* generate types

* implement editor for additional options

* update version number
---
 ...62_add_require_all_for_cookbook_filters.py | 45 +++++++++++++++++++
 frontend/components/global/HelpIcon.vue       |  6 ++-
 frontend/pages/group/cookbooks.vue            | 23 +++++++++-
 frontend/types/api-types/cookbook.ts          | 15 +++++++
 frontend/types/api-types/recipe.ts            |  2 +-
 mealie/db/db_setup.py                         |  4 +-
 mealie/db/models/group/cookbook.py            |  5 +++
 mealie/db/models/recipe/recipe.py             |  4 +-
 mealie/repos/repository_recipes.py            | 26 +++++++++--
 mealie/routes/groups/controller_cookbooks.py  |  7 ++-
 mealie/schema/cookbook/cookbook.py            |  3 ++
 .../backup_v2_tests/test_alchemy_exporter.py  |  2 +-
 12 files changed, 129 insertions(+), 13 deletions(-)
 create mode 100644 alembic/versions/2022-04-03-10.48.51_09dfc897ad62_add_require_all_for_cookbook_filters.py

diff --git a/alembic/versions/2022-04-03-10.48.51_09dfc897ad62_add_require_all_for_cookbook_filters.py b/alembic/versions/2022-04-03-10.48.51_09dfc897ad62_add_require_all_for_cookbook_filters.py
new file mode 100644
index 000000000000..f58414d29b5e
--- /dev/null
+++ b/alembic/versions/2022-04-03-10.48.51_09dfc897ad62_add_require_all_for_cookbook_filters.py
@@ -0,0 +1,45 @@
+"""add require_all for cookbook filters
+
+Revision ID: 09dfc897ad62
+Revises: 59eb59135381
+Create Date: 2022-04-03 10:48:51.379968
+
+"""
+import sqlalchemy as sa
+
+import mealie.db.migration_types  # noqa: F401
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "09dfc897ad62"
+down_revision = "59eb59135381"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column("cookbooks", sa.Column("require_all_categories", sa.Boolean(), nullable=True))
+    op.add_column("cookbooks", sa.Column("require_all_tags", sa.Boolean(), nullable=True))
+    op.add_column("cookbooks", sa.Column("require_all_tools", sa.Boolean(), nullable=True))
+
+    # Set Defaults for Existing Cookbooks
+    op.execute(
+        """
+        UPDATE cookbooks
+        SET require_all_categories = TRUE,
+            require_all_tags = TRUE,
+            require_all_tools = TRUE
+        """
+    )
+
+    # ### end Alembic commands ###
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column("cookbooks", "require_all_tools")
+    op.drop_column("cookbooks", "require_all_tags")
+    op.drop_column("cookbooks", "require_all_categories")
+    # ### end Alembic commands ###
diff --git a/frontend/components/global/HelpIcon.vue b/frontend/components/global/HelpIcon.vue
index 4c19ee81f17a..95649cb6647a 100644
--- a/frontend/components/global/HelpIcon.vue
+++ b/frontend/components/global/HelpIcon.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="text-center">
-    <v-menu top offset-y left open-on-hover>
+    <v-menu top offset-y :right="right" :left="!right" open-on-hover>
       <template #activator="{ on, attrs }">
         <v-btn :small="small" icon v-bind="attrs" v-on="on" @click.stop>
           <v-icon :small="small"> {{ $globals.icons.help }} </v-icon>
@@ -24,6 +24,10 @@ export default defineComponent({
       type: Boolean,
       default: false,
     },
+    right: {
+      type: Boolean,
+      default: false,
+    },
   },
 });
 </script>
diff --git a/frontend/pages/group/cookbooks.vue b/frontend/pages/group/cookbooks.vue
index 4f22ea6794b9..64791860ddcc 100644
--- a/frontend/pages/group/cookbooks.vue
+++ b/frontend/pages/group/cookbooks.vue
@@ -41,16 +41,35 @@
                 :items="allCategories || []"
                 selector-type="category"
               />
+
               <RecipeOrganizerSelector v-model="cookbooks[index].tags" :items="allTags || []" selector-type="tag" />
               <RecipeOrganizerSelector v-model="cookbooks[index].tools" :items="tools || []" selector-type="tool" />
-              <v-switch v-model="cookbooks[index].public">
+              <v-switch v-model="cookbooks[index].public" hide-details single-line>
                 <template #label>
                   Public Cookbook
-                  <HelpIcon class="ml-4">
+                  <HelpIcon small right class="ml-2">
                     Public Cookbooks can be shared with non-mealie users and will be displayed on your groups page.
                   </HelpIcon>
                 </template>
               </v-switch>
+              <div class="mt-4">
+                <h3 class="text-subtitle-1 d-flex align-center mb-0 pb-0">
+                  Filter Options
+                  <HelpIcon right small class="ml-2">
+                    When require all is selected the cookbook will only include recipes that have all of the items
+                    selected. This applies to each subset of selectors and not a cross section of the selected items.
+                  </HelpIcon>
+                </h3>
+                <v-switch v-model="cookbooks[index].requireAllCategories" class="mt-0" hide-details single-line>
+                  <template #label> Require All Categories </template>
+                </v-switch>
+                <v-switch v-model="cookbooks[index].requireAllTags" hide-details single-line>
+                  <template #label> Require All Tags </template>
+                </v-switch>
+                <v-switch v-model="cookbooks[index].requireAllTools" hide-details single-line>
+                  <template #label> Require All Tools </template>
+                </v-switch>
+              </div>
             </v-card-text>
             <v-card-actions>
               <v-spacer></v-spacer>
diff --git a/frontend/types/api-types/cookbook.ts b/frontend/types/api-types/cookbook.ts
index 30384778d897..a6fa7ff84e90 100644
--- a/frontend/types/api-types/cookbook.ts
+++ b/frontend/types/api-types/cookbook.ts
@@ -19,6 +19,9 @@ export interface CreateCookBook {
   categories?: CategoryBase[];
   tags?: TagBase[];
   tools?: RecipeTool[];
+  requireAllCategories?: boolean;
+  requireAllTags?: boolean;
+  requireAllTools?: boolean;
 }
 export interface TagBase {
   name: string;
@@ -40,6 +43,9 @@ export interface ReadCookBook {
   categories?: CategoryBase[];
   tags?: TagBase[];
   tools?: RecipeTool[];
+  requireAllCategories?: boolean;
+  requireAllTags?: boolean;
+  requireAllTools?: boolean;
   groupId: string;
   id: string;
 }
@@ -52,6 +58,9 @@ export interface RecipeCookBook {
   categories?: CategoryBase[];
   tags?: TagBase[];
   tools?: RecipeTool[];
+  requireAllCategories?: boolean;
+  requireAllTags?: boolean;
+  requireAllTools?: boolean;
   groupId: string;
   id: string;
   recipes: RecipeSummary[];
@@ -138,6 +147,9 @@ export interface SaveCookBook {
   categories?: CategoryBase[];
   tags?: TagBase[];
   tools?: RecipeTool[];
+  requireAllCategories?: boolean;
+  requireAllTags?: boolean;
+  requireAllTools?: boolean;
   groupId: string;
 }
 export interface UpdateCookBook {
@@ -149,6 +161,9 @@ export interface UpdateCookBook {
   categories?: CategoryBase[];
   tags?: TagBase[];
   tools?: RecipeTool[];
+  requireAllCategories?: boolean;
+  requireAllTags?: boolean;
+  requireAllTools?: boolean;
   groupId: string;
   id: string;
 }
diff --git a/frontend/types/api-types/recipe.ts b/frontend/types/api-types/recipe.ts
index 824738269663..71b638cd4a8e 100644
--- a/frontend/types/api-types/recipe.ts
+++ b/frontend/types/api-types/recipe.ts
@@ -229,7 +229,7 @@ export interface RecipeCommentOut {
   user: UserBase;
 }
 export interface UserBase {
-  id: number;
+  id: string;
   username?: string;
   admin: boolean;
 }
diff --git a/mealie/db/db_setup.py b/mealie/db/db_setup.py
index 31a5b9692816..84b9b9f9b22c 100644
--- a/mealie/db/db_setup.py
+++ b/mealie/db/db_setup.py
@@ -1,3 +1,5 @@
+from collections.abc import Generator
+
 import sqlalchemy as sa
 from sqlalchemy.orm import sessionmaker
 from sqlalchemy.orm.session import Session
@@ -32,7 +34,7 @@ def create_session() -> Session:
     return SessionLocal()
 
 
-def generate_session() -> Session:
+def generate_session() -> Generator[Session, None, None]:
     global SessionLocal
     db = SessionLocal()
     try:
diff --git a/mealie/db/models/group/cookbook.py b/mealie/db/models/group/cookbook.py
index 845b86e217ab..0809ea2caa97 100644
--- a/mealie/db/models/group/cookbook.py
+++ b/mealie/db/models/group/cookbook.py
@@ -21,8 +21,13 @@ class CookBook(SqlAlchemyBase, BaseMixins):
     public = Column(Boolean, default=False)
 
     categories = orm.relationship(Category, secondary=cookbooks_to_categories, single_parent=True)
+    require_all_categories = Column(Boolean, default=True)
+
     tags = orm.relationship(Tag, secondary=cookbooks_to_tags, single_parent=True)
+    require_all_tags = Column(Boolean, default=True)
+
     tools = orm.relationship(Tool, secondary=cookbooks_to_tools, single_parent=True)
+    require_all_tools = Column(Boolean, default=True)
 
     @auto_init()
     def __init__(self, **_) -> None:
diff --git a/mealie/db/models/recipe/recipe.py b/mealie/db/models/recipe/recipe.py
index c016efb5ef91..76b442ef92a8 100644
--- a/mealie/db/models/recipe/recipe.py
+++ b/mealie/db/models/recipe/recipe.py
@@ -20,7 +20,7 @@ from .note import Note
 from .nutrition import Nutrition
 from .settings import RecipeSettings
 from .shared import RecipeShareTokenModel
-from .tag import Tag, recipes_to_tags
+from .tag import recipes_to_tags
 from .tool import recipes_to_tools
 
 
@@ -99,7 +99,7 @@ class RecipeModel(SqlAlchemyBase, BaseMixins):
 
     # Mealie Specific
     settings = orm.relationship("RecipeSettings", uselist=False, cascade="all, delete-orphan")
-    tags: list[Tag] = orm.relationship("Tag", secondary=recipes_to_tags, back_populates="recipes")
+    tags = orm.relationship("Tag", secondary=recipes_to_tags, back_populates="recipes")
     notes: list[Note] = orm.relationship("Note", cascade="all, delete-orphan")
     rating = sa.Column(sa.Integer)
     org_url = sa.Column(sa.String)
diff --git a/mealie/repos/repository_recipes.py b/mealie/repos/repository_recipes.py
index 3986b818e168..09a58f1eb043 100644
--- a/mealie/repos/repository_recipes.py
+++ b/mealie/repos/repository_recipes.py
@@ -130,6 +130,9 @@ class RepositoryRecipes(RepositoryGeneric[Recipe, RecipeModel]):
         categories: list[CategoryBase] | None = None,
         tags: list[TagBase] | None = None,
         tools: list[RecipeTool] | None = None,
+        require_all_categories: bool = True,
+        require_all_tags: bool = True,
+        require_all_tools: bool = True,
     ) -> list:
         fltr = [
             RecipeModel.group_id == self.group_id,
@@ -137,15 +140,25 @@ class RepositoryRecipes(RepositoryGeneric[Recipe, RecipeModel]):
 
         if categories:
             cat_ids = [x.id for x in categories]
-            fltr.extend(RecipeModel.recipe_category.any(Category.id.is_(cat_id)) for cat_id in cat_ids)
+            if require_all_categories:
+                fltr.extend(RecipeModel.recipe_category.any(Category.id.is_(cat_id)) for cat_id in cat_ids)
+            else:
+                fltr.append(RecipeModel.recipe_category.any(Category.id.in_(cat_ids)))
 
         if tags:
             tag_ids = [x.id for x in tags]
-            fltr.extend(RecipeModel.tags.any(Tag.id.is_(tag_id)) for tag_id in tag_ids)  # type:ignore
+            if require_all_tags:
+                fltr.extend(RecipeModel.tags.any(Tag.id.is_(tag_id)) for tag_id in tag_ids)
+            else:
+                fltr.append(RecipeModel.tags.any(Tag.id.in_(tag_ids)))
 
         if tools:
             tool_ids = [x.id for x in tools]
-            fltr.extend(RecipeModel.tools.any(Tool.id.is_(tool_id)) for tool_id in tool_ids)
+
+            if require_all_tools:
+                fltr.extend(RecipeModel.tools.any(Tool.id.is_(tool_id)) for tool_id in tool_ids)
+            else:
+                fltr.append(RecipeModel.tools.any(Tool.id.in_(tool_ids)))
 
         return fltr
 
@@ -154,8 +167,13 @@ class RepositoryRecipes(RepositoryGeneric[Recipe, RecipeModel]):
         categories: list[CategoryBase] | None = None,
         tags: list[TagBase] | None = None,
         tools: list[RecipeTool] | None = None,
+        require_all_categories: bool = True,
+        require_all_tags: bool = True,
+        require_all_tools: bool = True,
     ) -> list[Recipe]:
-        fltr = self._category_tag_filters(categories, tags, tools)
+        fltr = self._category_tag_filters(
+            categories, tags, tools, require_all_categories, require_all_tags, require_all_tools
+        )
 
         return [self.schema.from_orm(x) for x in self.session.query(RecipeModel).filter(*fltr).all()]
 
diff --git a/mealie/routes/groups/controller_cookbooks.py b/mealie/routes/groups/controller_cookbooks.py
index 01ccf20f3d26..09ed6d27336d 100644
--- a/mealie/routes/groups/controller_cookbooks.py
+++ b/mealie/routes/groups/controller_cookbooks.py
@@ -64,7 +64,12 @@ class GroupCookbookController(BaseUserController):
         return cookbook.cast(
             RecipeCookBook,
             recipes=self.repos.recipes.by_group(self.group_id).by_category_and_tags(
-                cookbook.categories, cookbook.tags, cookbook.tools
+                cookbook.categories,
+                cookbook.tags,
+                cookbook.tools,
+                cookbook.require_all_categories,
+                cookbook.require_all_tags,
+                cookbook.require_all_tools,
             ),
         )
 
diff --git a/mealie/schema/cookbook/cookbook.py b/mealie/schema/cookbook/cookbook.py
index 641e83dc5247..63a032fdcecc 100644
--- a/mealie/schema/cookbook/cookbook.py
+++ b/mealie/schema/cookbook/cookbook.py
@@ -16,6 +16,9 @@ class CreateCookBook(MealieModel):
     categories: list[CategoryBase] = []
     tags: list[TagBase] = []
     tools: list[RecipeTool] = []
+    require_all_categories: bool = True
+    require_all_tags: bool = True
+    require_all_tools: bool = True
 
     @validator("public", always=True, pre=True)
     def validate_public(public: bool | None, values: dict) -> bool:  # type: ignore
diff --git a/tests/unit_tests/services_tests/backup_v2_tests/test_alchemy_exporter.py b/tests/unit_tests/services_tests/backup_v2_tests/test_alchemy_exporter.py
index 484a31e2750d..2f0bc5a71fb3 100644
--- a/tests/unit_tests/services_tests/backup_v2_tests/test_alchemy_exporter.py
+++ b/tests/unit_tests/services_tests/backup_v2_tests/test_alchemy_exporter.py
@@ -4,7 +4,7 @@ from mealie.core.config import get_app_settings
 from mealie.services.backups_v2.alchemy_exporter import AlchemyExporter
 
 ALEMBIC_VERSIONS = [
-    {"version_num": "59eb59135381"},
+    {"version_num": "09dfc897ad62"},
 ]