Fix recipe obtaining ignoring tags

Author: Su5eD

src/service/content/ingestor_metadata.cc

@@ -14,7 +14,7 @@ namespace content {
 
     Task<PreparationResult> MetadataSubIngestor::prepare() {
         const auto docsRoot = project_.getRootDirectory();
-        const auto workbenchesFile = docsRoot / ".data" / "workbenches.json";
+        const auto workbenchesFile = project_.getFormat().getWorkbenchesPath();
 
         if (exists(workbenchesFile)) {
             const ProjectFileIssueCallback fileIssues{issues_, workbenchesFile};

src/service/database/database.cc

@@ -360,10 +360,21 @@ namespace service {
                                        JOIN project_version ver ON pitem.version_id = ver.id \
                                        JOIN item ON pitem.item_id = item.id \
                                        LEFT JOIN project_item_page pip ON pitem.id = pip.item_id \
-                                       WHERE NOT ri.input AND EXISTS ( \
-                                           SELECT 1 FROM recipe_ingredient_item ri_sub \
-                                           JOIN item i ON ri_sub.item_id = i.id \
-                                           WHERE ri_sub.recipe_id = r.id AND i.loc = $1 AND ri_sub.input)";
+                                       WHERE NOT ri.input AND ( \
+                                           EXISTS ( \
+                                               SELECT 1 FROM recipe_ingredient_item ri_sub \
+                                               JOIN item i ON ri_sub.item_id = i.id \
+                                               WHERE ri_sub.recipe_id = r.id AND i.loc = $1 AND ri_sub.input \
+                                           ) \
+                                           OR EXISTS( \
+                                               SELECT 1 FROM recipe_ingredient_tag rt_sub \
+                                               JOIN project_tag pt ON pt.tag_id = rt_sub.tag_id \
+                                               JOIN tag_item_flat flat ON flat.parent = pt.id \
+                                               JOIN project_item pit on pit.id = flat.child \
+                                               JOIN item i ON pit.item_id = i.id \
+                                               WHERE rt_sub.recipe_id = r.id AND i.loc = $1 AND rt_sub.input \
+                                           ) \
+                                       )";
 
         const auto [res, err] = co_await handleDatabaseOperation<std::vector<ContentUsage>>(
             [item](const DbClientPtr &client) -> Task<std::vector<ContentUsage>> {

src/service/project/format.cc

@@ -9,6 +9,7 @@
 #define CONTENT_DIR_PATH ".content"
 #define FOLDER_META_FILE "_meta.json"
 #define PROPERTIES_PATH ".data/properties.json"
+#define WORKBENCHES_PATH ".data/workbenches.json"
 #define WIKI_META_FILE "sinytra-wiki.json"
 
 namespace fs = std::filesystem;
@@ -67,6 +68,10 @@ namespace service {
         return getLocalizedFilePath(PROPERTIES_PATH);
     }
 
+    fs::path ProjectFormat::getWorkbenchesPath() const {
+        return root_ / WORKBENCHES_PATH;
+    }
+
     fs::path ProjectFormat::getAssetPath(const ResourceLocation &location) const {
         const auto ext = location.path_.find('.') != std::string::npos ? "" : ".png";
         const auto path = ASSETS_DIR_PATH "/" + location.namespace_ + "/" + location.path_ + ext;

src/service/project/format.h

@@ -22,6 +22,7 @@ namespace service {
         std::filesystem::path getLocalizedFilePath(const std::string &path) const;
         std::filesystem::path getFolderMetaFilePath(const std::filesystem::path &dir) const;
         std::filesystem::path getItemPropertiesPath() const;
+        std::filesystem::path getWorkbenchesPath() const;
         std::filesystem::path getAssetPath(const ResourceLocation &location) const;
         std::filesystem::path getLanguageFilePath(const std::string &namespace_) const;
     private: