diff --git a/app/furniture/marketplace/routes.rb b/app/furniture/marketplace/routes.rb
index d8bb9061d..52ae8e6e0 100644
--- a/app/furniture/marketplace/routes.rb
+++ b/app/furniture/marketplace/routes.rb
@@ -16,6 +16,7 @@ def self.append_routes(router)
router.resources :products
router.resource :stripe_account, only: [:show, :new, :create]
router.resources :stripe_events
+ router.resources :tags
router.resources :tax_rates
router.resources :vendor_representatives
router.resources :payment_settings, only: [:index]
diff --git a/app/furniture/marketplace/tag.rb b/app/furniture/marketplace/tag.rb
new file mode 100644
index 000000000..709a893fd
--- /dev/null
+++ b/app/furniture/marketplace/tag.rb
@@ -0,0 +1,12 @@
+class Marketplace
+ class Tag < Record
+ self.table_name = "marketplace_tags"
+
+ belongs_to :bazaar, inverse_of: :tags
+ has_many :product_tags, inverse_of: :tag, dependent: :destroy
+ has_many :products, through: :product_tags, inverse_of: :tags
+
+ attr_accessor :marketplace
+ location(parent: :marketplace)
+ end
+end
diff --git a/app/furniture/marketplace/tag_policy.rb b/app/furniture/marketplace/tag_policy.rb
new file mode 100644
index 000000000..cd43c1be4
--- /dev/null
+++ b/app/furniture/marketplace/tag_policy.rb
@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+class Marketplace
+ class TagPolicy < Policy
+ alias_method :tag, :object
+ def space
+ tag.bazaar
+ end
+
+ def permitted_attributes(_params = nil)
+ %i[label]
+ end
+
+ def update?
+ return false unless current_person.authenticated?
+
+ super
+ end
+
+ alias_method :create?, :update?
+
+ def show?
+ true
+ end
+
+ class Scope < ApplicationScope
+ def resolve
+ scope.all
+ end
+ end
+ end
+end
diff --git a/app/furniture/marketplace/tags/_form.html.erb b/app/furniture/marketplace/tags/_form.html.erb
new file mode 100644
index 000000000..acd3ab69e
--- /dev/null
+++ b/app/furniture/marketplace/tags/_form.html.erb
@@ -0,0 +1,6 @@
+<%= form_with(model: tag.location) do |form| %>
+
+<%= render "text_field", attribute: :label, form: form %>
+
+<%= form.submit %>
+<%- end %>
diff --git a/app/furniture/marketplace/tags/index.html.erb b/app/furniture/marketplace/tags/index.html.erb
new file mode 100644
index 000000000..61832ff4c
--- /dev/null
+++ b/app/furniture/marketplace/tags/index.html.erb
@@ -0,0 +1,20 @@
+<%- breadcrumb :marketplace_tags, marketplace %>
+
+<%= render CardComponent.new do |card| %>
+
+ <%- marketplace.tags.each do |tag| %>
+ <%- tag.marketplace = marketplace %>
+
+
+ <%= tag.label %>
+
+
+ <%- end %>
+
+ <%- card.with_footer(variant: :action_bar) do %>
+ <%- new_tag = bazaar.tags.new %>
+ <%- if policy(new_tag).create? %>
+ <%= link_to t("marketplace.tags.new.link_to"), marketplace.location(:new, child: :tag), class: "button w-full" %>
+ <%- end %>
+ <%- end %>
+<%- end %>
diff --git a/app/furniture/marketplace/tags/new.html.erb b/app/furniture/marketplace/tags/new.html.erb
new file mode 100644
index 000000000..d5e9383ef
--- /dev/null
+++ b/app/furniture/marketplace/tags/new.html.erb
@@ -0,0 +1,2 @@
+<%- breadcrumb :new_marketplace_tag, mtag %>
+<%= render "form", tag: mtag %>
diff --git a/app/furniture/marketplace/tags_controller.rb b/app/furniture/marketplace/tags_controller.rb
new file mode 100644
index 000000000..8e25ffb8a
--- /dev/null
+++ b/app/furniture/marketplace/tags_controller.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+class Marketplace
+ class TagsController < Controller
+ # Apparently, `tag` is used inside of `turbo_frame_tag`, so if we define a
+ # helper_method named `tag` our method gets called when it really shouldn't
+ # be... so `mtag` it is. For now.
+ expose :mtag, scope: -> { tags }, model: Tag
+ expose :tags, -> { policy_scope(bazaar.tags.create_with(marketplace: marketplace)) }
+
+ def new
+ authorize(mtag)
+ end
+
+ def create
+ if authorize(mtag).save
+ redirect_to marketplace.location(child: :tags)
+ else
+ render :new
+ end
+ end
+
+ def index
+ skip_authorization
+ end
+
+ def mtag_params
+ policy(Tag).permit(params.require(:tag))
+ end
+ end
+end
diff --git a/db/migrate/20240208025354_create_marketplace_product_tags.rb b/db/migrate/20240208025354_create_marketplace_product_tags.rb
new file mode 100644
index 000000000..4e1fcfaad
--- /dev/null
+++ b/db/migrate/20240208025354_create_marketplace_product_tags.rb
@@ -0,0 +1,17 @@
+class CreateMarketplaceProductTags < ActiveRecord::Migration[7.1]
+ def change
+ create_table :marketplace_tags, id: :uuid do |t|
+ t.references :bazaar, type: :uuid
+ t.string :label
+
+ t.timestamps
+ end
+
+ create_table :marketplace_product_tags, id: :uuid do |t|
+ t.references :product, type: :uuid, foreign_key: {to_table: :marketplace_products}
+ t.references :tag, type: :uuid, foreign_key: {to_table: :marketplace_tags}
+
+ t.timestamps
+ end
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 378aa23c1..c1fdcaeb2 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -202,6 +202,15 @@
t.index ["shopper_id"], name: "index_marketplace_orders_on_shopper_id"
end
+ create_table "marketplace_product_tags", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+ t.uuid "product_id"
+ t.uuid "tag_id"
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
+ t.index ["product_id"], name: "index_marketplace_product_tags_on_product_id"
+ t.index ["tag_id"], name: "index_marketplace_product_tags_on_tag_id"
+ end
+
create_table "marketplace_product_tax_rates", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
t.uuid "tax_rate_id"
t.uuid "product_id"
@@ -231,6 +240,14 @@
t.index ["person_id"], name: "index_marketplace_shoppers_on_person_id", unique: true
end
+ create_table "marketplace_tags", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+ t.uuid "bazaar_id"
+ t.string "label"
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
+ t.index ["bazaar_id"], name: "index_marketplace_tags_on_bazaar_id"
+ end
+
create_table "marketplace_tax_rates", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
t.float "tax_rate"
t.string "label"
@@ -337,6 +354,8 @@
add_foreign_key "marketplace_notification_methods", "furnitures", column: "marketplace_id"
add_foreign_key "marketplace_orders", "marketplace_delivery_areas", column: "delivery_area_id"
add_foreign_key "marketplace_orders", "marketplace_shoppers", column: "shopper_id"
+ add_foreign_key "marketplace_product_tags", "marketplace_products", column: "product_id"
+ add_foreign_key "marketplace_product_tags", "marketplace_tags", column: "tag_id"
add_foreign_key "marketplace_product_tax_rates", "marketplace_products", column: "product_id"
add_foreign_key "marketplace_product_tax_rates", "marketplace_tax_rates", column: "tax_rate_id"
add_foreign_key "marketplace_products", "furnitures", column: "marketplace_id"
diff --git a/spec/furniture/marketplace/product_tags_system_spec.rb b/spec/furniture/marketplace/product_tags_system_spec.rb
index 1954ce1ab..a4b642844 100644
--- a/spec/furniture/marketplace/product_tags_system_spec.rb
+++ b/spec/furniture/marketplace/product_tags_system_spec.rb
@@ -25,6 +25,9 @@
click_link("⚙️ Edit")
end
+ check("🚫🌾 Gluten Free")
+ click_button("Save")
+
visit(marketplace)
within(muffins) do
From d5f0cb075b08f383c7caaca3e8c4b7e2ba5ecb39 Mon Sep 17 00:00:00 2001
From: Zee Spencer <50284+zspencer@users.noreply.github.com>
Date: Wed, 6 Mar 2024 18:34:06 -0800
Subject: [PATCH 3/3] =?UTF-8?q?=E2=9C=A8=20`Tag`=20labels=20are=20case=20i?=
=?UTF-8?q?nsensitive?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/furniture/marketplace/tag.rb | 2 ++
spec/furniture/marketplace/tag_spec.rb | 5 +++++
2 files changed, 7 insertions(+)
create mode 100644 spec/furniture/marketplace/tag_spec.rb
diff --git a/app/furniture/marketplace/tag.rb b/app/furniture/marketplace/tag.rb
index 709a893fd..9d8e98db2 100644
--- a/app/furniture/marketplace/tag.rb
+++ b/app/furniture/marketplace/tag.rb
@@ -6,6 +6,8 @@ class Tag < Record
has_many :product_tags, inverse_of: :tag, dependent: :destroy
has_many :products, through: :product_tags, inverse_of: :tags
+ validates :label, uniqueness: {case_sensitive: false, scope: :bazaar_id}
+
attr_accessor :marketplace
location(parent: :marketplace)
end
diff --git a/spec/furniture/marketplace/tag_spec.rb b/spec/furniture/marketplace/tag_spec.rb
new file mode 100644
index 000000000..82d0d9849
--- /dev/null
+++ b/spec/furniture/marketplace/tag_spec.rb
@@ -0,0 +1,5 @@
+require "rails_helper"
+
+RSpec.describe Marketplace::Tag, type: :model do
+ it { is_expected.to validate_uniqueness_of(:label).case_insensitive.scoped_to(:bazaar_id) }
+end