From b4544cd83b257609961495741ee6bb52f68016f6 Mon Sep 17 00:00:00 2001 From: Albert Chae Date: Wed, 30 Dec 2020 15:42:51 -0800 Subject: [PATCH 01/21] PartnerGroup and PartnerGroupMembership models - migrations - factories - validation specs --- .../api/v1/partner_requests_controller.rb | 1 + app/models/organization.rb | 1 + app/models/partner_group.rb | 18 ++++++++++ app/models/partner_group_membership.rb | 30 ++++++++++++++++ .../20201230233305_create_partner_groups.rb | 10 ++++++ ...233349_create_partner_group_memberships.rb | 10 ++++++ db/schema.rb | 21 +++++++++++ spec/factories/partner_group_memberships.rb | 17 +++++++++ spec/factories/partner_groups.rb | 17 +++++++++ spec/models/partner_group_membership_spec.rb | 36 +++++++++++++++++++ spec/models/partner_group_spec.rb | 28 +++++++++++++++ 11 files changed, 189 insertions(+) create mode 100644 app/models/partner_group.rb create mode 100644 app/models/partner_group_membership.rb create mode 100644 db/migrate/20201230233305_create_partner_groups.rb create mode 100644 db/migrate/20201230233349_create_partner_group_memberships.rb create mode 100644 spec/factories/partner_group_memberships.rb create mode 100644 spec/factories/partner_groups.rb create mode 100644 spec/models/partner_group_membership_spec.rb create mode 100644 spec/models/partner_group_spec.rb diff --git a/app/controllers/api/v1/partner_requests_controller.rb b/app/controllers/api/v1/partner_requests_controller.rb index b79be2463f..096f574cd4 100644 --- a/app/controllers/api/v1/partner_requests_controller.rb +++ b/app/controllers/api/v1/partner_requests_controller.rb @@ -22,6 +22,7 @@ def show return head :forbidden unless api_key_valid? organization = Organization.find(params[:id]) + # replace this with items from partner group render json: organization.valid_items, status: :ok rescue ActiveRecord::RecordNotFound => e render json: { error: e.message }, status: :bad_request diff --git a/app/models/organization.rb b/app/models/organization.rb index eb957faac5..fdacbdab06 100644 --- a/app/models/organization.rb +++ b/app/models/organization.rb @@ -45,6 +45,7 @@ class Organization < ApplicationRecord has_many :donations has_many :manufacturers has_many :partners + has_many :partner_groups has_many :purchases has_many :requests has_many :storage_locations diff --git a/app/models/partner_group.rb b/app/models/partner_group.rb new file mode 100644 index 0000000000..b1e0e3e51e --- /dev/null +++ b/app/models/partner_group.rb @@ -0,0 +1,18 @@ +# == Schema Information +# +# Table name: partner_groups +# +# id :bigint not null, primary key +# name :string +# created_at :datetime not null +# updated_at :datetime not null +# organization_id :bigint +# +class PartnerGroup < ApplicationRecord + belongs_to :organization + has_many :partner_group_memberships + has_many :partners, through: :partner_group_memberships + + validates :organization, presence: true + validates :name, presence: true, uniqueness: { scope: :organization } +end diff --git a/app/models/partner_group_membership.rb b/app/models/partner_group_membership.rb new file mode 100644 index 0000000000..da4b802535 --- /dev/null +++ b/app/models/partner_group_membership.rb @@ -0,0 +1,30 @@ +# == Schema Information +# +# Table name: partner_group_memberships +# +# id :bigint not null, primary key +# created_at :datetime not null +# updated_at :datetime not null +# partner_group_id :bigint +# partner_id :bigint +# +class PartnerGroupMembership < ApplicationRecord + belongs_to :partner_group + belongs_to :partner + has_one :organization, through: :partner_group + + validates :partner_group, presence: true + validates :partner, presence: true, uniqueness: { scope: :partner_group } + + validate :partner_belongs_to_partner_group_organization + + private + + def partner_belongs_to_partner_group_organization + return if organization.nil? + + unless organization == partner.organization + errors.add :partner, "partner must belong to same organization as partner_group" + end + end +end diff --git a/db/migrate/20201230233305_create_partner_groups.rb b/db/migrate/20201230233305_create_partner_groups.rb new file mode 100644 index 0000000000..61f1350370 --- /dev/null +++ b/db/migrate/20201230233305_create_partner_groups.rb @@ -0,0 +1,10 @@ +class CreatePartnerGroups < ActiveRecord::Migration[6.0] + def change + create_table :partner_groups do |t| + t.references :organization, foreign_key: true + t.string :name + + t.timestamps + end + end +end diff --git a/db/migrate/20201230233349_create_partner_group_memberships.rb b/db/migrate/20201230233349_create_partner_group_memberships.rb new file mode 100644 index 0000000000..aa4f3dd64d --- /dev/null +++ b/db/migrate/20201230233349_create_partner_group_memberships.rb @@ -0,0 +1,10 @@ +class CreatePartnerGroupMemberships < ActiveRecord::Migration[6.0] + def change + create_table :partner_group_memberships do |t| + t.references :partner_group, foreign_key: true + t.references :partner, foreign_key: true + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 516c2483ab..78cf8c0a12 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,6 +11,7 @@ # It's strongly recommended that you check this file into your version control system. ActiveRecord::Schema.define(version: 20_210_107_175_100) do + # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -289,6 +290,23 @@ t.index ["short_name"], name: "index_organizations_on_short_name" end + create_table "partner_group_memberships", force: :cascade do |t| + t.bigint "partner_group_id" + t.bigint "partner_id" + t.datetime "created_at", precision: 6, null: false + t.datetime "updated_at", precision: 6, null: false + t.index ["partner_group_id"], name: "index_partner_group_memberships_on_partner_group_id" + t.index ["partner_id"], name: "index_partner_group_memberships_on_partner_id" + end + + create_table "partner_groups", force: :cascade do |t| + t.bigint "organization_id" + t.string "name" + t.datetime "created_at", precision: 6, null: false + t.datetime "updated_at", precision: 6, null: false + t.index ["organization_id"], name: "index_partner_groups_on_organization_id" + end + create_table "partners", id: :serial, force: :cascade do |t| t.string "name" t.string "email" @@ -418,6 +436,9 @@ add_foreign_key "kits", "organizations" add_foreign_key "manufacturers", "organizations" add_foreign_key "organizations", "account_requests" + add_foreign_key "partner_group_memberships", "partner_groups" + add_foreign_key "partner_group_memberships", "partners" + add_foreign_key "partner_groups", "organizations" add_foreign_key "requests", "organizations" add_foreign_key "requests", "partners" end diff --git a/spec/factories/partner_group_memberships.rb b/spec/factories/partner_group_memberships.rb new file mode 100644 index 0000000000..028a68b72d --- /dev/null +++ b/spec/factories/partner_group_memberships.rb @@ -0,0 +1,17 @@ +# == Schema Information +# +# Table name: partner_group_memberships +# +# id :bigint not null, primary key +# created_at :datetime not null +# updated_at :datetime not null +# partner_group_id :bigint +# partner_id :bigint +# + +FactoryBot.define do + factory :partner_group_membership do + partner_group + partner + end +end diff --git a/spec/factories/partner_groups.rb b/spec/factories/partner_groups.rb new file mode 100644 index 0000000000..bdf52b9fad --- /dev/null +++ b/spec/factories/partner_groups.rb @@ -0,0 +1,17 @@ +# == Schema Information +# +# Table name: partner_groups +# +# id :bigint not null, primary key +# name :string +# created_at :datetime not null +# updated_at :datetime not null +# organization_id :bigint +# + +FactoryBot.define do + factory :partner_group do + sequence(:name) { |n| "Group #{n}" } + organization { Organization.try(:first) || create(:organization) } + end +end diff --git a/spec/models/partner_group_membership_spec.rb b/spec/models/partner_group_membership_spec.rb new file mode 100644 index 0000000000..bc53474833 --- /dev/null +++ b/spec/models/partner_group_membership_spec.rb @@ -0,0 +1,36 @@ +# == Schema Information +# +# Table name: partner_group_memberships +# +# id :bigint not null, primary key +# created_at :datetime not null +# updated_at :datetime not null +# partner_group_id :bigint +# partner_id :bigint +# +RSpec.describe PartnerGroupMembership, type: :model do + context "Validations >" do + it "must belong to a partner_group" do + expect(build(:partner_group_membership, partner_group_id: nil)).not_to be_valid + end + + it "must belong to a partner" do + expect(build(:partner_group_membership, partner_id: nil)).not_to be_valid + end + + it "a partner can only be a member of a partner_group once" do + membership = create(:partner_group_membership) + expect(build(:partner_group_membership, + partner_group: membership.partner_group, + partner: membership.partner)).not_to be_valid + end + + it "a partner must belong to the same organization as the partner_group" do + partner_group = create(:partner_group, organization: create(:organization)) + partner = create(:partner, organization: create(:organization)) + expect(build(:partner_group_membership, + partner_group: partner_group, + partner: partner)).not_to be_valid + end + end +end diff --git a/spec/models/partner_group_spec.rb b/spec/models/partner_group_spec.rb new file mode 100644 index 0000000000..8ce9cbf937 --- /dev/null +++ b/spec/models/partner_group_spec.rb @@ -0,0 +1,28 @@ +# == Schema Information +# +# Table name: partner_groups +# +# id :bigint not null, primary key +# name :string +# created_at :datetime not null +# updated_at :datetime not null +# organization_id :bigint +# +RSpec.describe PartnerGroup, type: :model do + context "Validations >" do + it "must belong to an organization" do + expect(build(:partner_group, organization_id: nil)).not_to be_valid + end + + it "requires a unique name within an organization" do + expect(build(:partner_group, name: nil)).not_to be_valid + create(:partner_group, name: "Foo") + expect(build(:partner_group, name: "Foo")).not_to be_valid + end + + it "does not require a unique name between organizations" do + create(:partner, name: "Foo") + expect(build(:partner, name: "Foo", organization: build(:organization))).to be_valid + end + end +end From bc90be3fcc4a79be0c7222510a9ebf4f99e93e27 Mon Sep 17 00:00:00 2001 From: Albert Chae Date: Wed, 30 Dec 2020 22:46:39 -0800 Subject: [PATCH 02/21] Basic CRUD for PartnerGroups TODO: add tests TODO: need to be able to add partners --- app/controllers/partner_groups_controller.rb | 56 +++++++++++++++ app/views/layouts/_lte_sidebar.html.erb | 7 ++ app/views/partner_groups/_form.html.erb | 29 ++++++++ app/views/partner_groups/edit.html.erb | 25 +++++++ app/views/partner_groups/index.html.erb | 67 ++++++++++++++++++ app/views/partner_groups/new.html.erb | 25 +++++++ app/views/partner_groups/show.html.erb | 71 ++++++++++++++++++++ config/routes.rb | 3 + 8 files changed, 283 insertions(+) create mode 100644 app/controllers/partner_groups_controller.rb create mode 100644 app/views/partner_groups/_form.html.erb create mode 100644 app/views/partner_groups/edit.html.erb create mode 100644 app/views/partner_groups/index.html.erb create mode 100644 app/views/partner_groups/new.html.erb create mode 100644 app/views/partner_groups/show.html.erb diff --git a/app/controllers/partner_groups_controller.rb b/app/controllers/partner_groups_controller.rb new file mode 100644 index 0000000000..c6a83c5c58 --- /dev/null +++ b/app/controllers/partner_groups_controller.rb @@ -0,0 +1,56 @@ +class PartnerGroupsController < ApplicationController + def index + @partner_groups = current_organization.partner_groups + + respond_to do |format| + format.html + end + end + + def show + @partner_group = current_organization.partner_groups.find(params[:id]) + + respond_to do |format| + format.html + end + end + + def new + @partner_group = current_organization.partner_groups.new + end + + def create + @partner_group = current_organization.partner_groups.new(partner_group_params) + if @partner_group.save + redirect_to partner_groups_path, notice: "Partner group added!" + else + flash[:error] = "Something didn't work quite right -- try again?" + render action: :new + end + end + + def edit + @partner_group = current_organization.partner_groups.find(params[:id]) + end + + def update + @partner_group = current_organization.partner_groups.find(params[:id]) + if @partner_group.update(partner_group_params) + redirect_to partner_group_path(@partner_group), notice: "#{@partner_group.name} updated!" + else + flash[:error] = "Something didn't work quite right -- try again?" + render action: :edit + end + end + + def destroy + current_organization.partner_groups.find(params[:id]).destroy + redirect_to partner_groups_path + end + + private + + def partner_group_params + params.require(:partner_group).permit(:name) + end +end diff --git a/app/views/layouts/_lte_sidebar.html.erb b/app/views/layouts/_lte_sidebar.html.erb index f885165b87..29319cf12d 100644 --- a/app/views/layouts/_lte_sidebar.html.erb +++ b/app/views/layouts/_lte_sidebar.html.erb @@ -96,6 +96,13 @@ <% end %> +
  • + <%= link_to(partner_groups_path, class: "nav-link #{"active" if current_page?(partner_groups_path)}") do %> + +

    Partner Groups

    + <% end %> +
    • +
  • diff --git a/app/views/partner_groups/_form.html.erb b/app/views/partner_groups/_form.html.erb new file mode 100644 index 0000000000..55cd681462 --- /dev/null +++ b/app/views/partner_groups/_form.html.erb @@ -0,0 +1,29 @@ +<%= simple_form_for @partner_group, html: {class: 'form-horizontal'} do |f| %> +
    +
    +
    + +
    + +
    + + +
    + <%= f.input :name, label: "Name", wrapper: :input_group do %> + + <%= f.input_field :name, class: "form-control" %> + <% end %> +
    + +
    + <%= submit_button(submit_btn_options) %> +
    +
    + +
    + +
    + +
    +
    +<% end %> diff --git a/app/views/partner_groups/edit.html.erb b/app/views/partner_groups/edit.html.erb new file mode 100644 index 0000000000..8fe26553a6 --- /dev/null +++ b/app/views/partner_groups/edit.html.erb @@ -0,0 +1,25 @@ +
    +
    +
    +
    + <% content_for :title, "Edit - Partner Groups - #{@partner_group.name} - #{current_organization.name}" %> +

    + Updating Partner Group + for <%= current_organization.name %> +

    +
    +
    +
      +
    1. <%= link_to(dashboard_path) do %> + Home + <% end %> +
      2. +
    2. <%= link_to "All Partner Groups", (partner_groups_path) %>
      3. +
    3. Updating <%= @partner_group.name %>
      4. +
    +
    +
    +
    +
    + +<%= render partial: "form", object: @partner_group, locals: { submit_btn_options: { text: "Update Partner Group" } } %> diff --git a/app/views/partner_groups/index.html.erb b/app/views/partner_groups/index.html.erb new file mode 100644 index 0000000000..c250a0ec1c --- /dev/null +++ b/app/views/partner_groups/index.html.erb @@ -0,0 +1,67 @@ +
    +
    +
    +
    + <% content_for :title, "Partner Groups - #{current_organization.name}" %> +

    + Partner Groups + for <%= current_organization.name %> +

    +
    +
    +
      +
    1. <%= link_to(dashboard_path) do %> + Home + <% end %> +
      2. +
    2. Partner Groups
      3. +
    +
    +
    +
    +
    + +
    +
    +
    +
    +
    +
    +
    + <%= new_button_to new_partner_group_path(organization_id: current_organization), {text: "New Partner Group"} %> +
    +
    +
    + +
    +
    + +
    + +
    +
    +
    + +
    +
    + + + + + + + + + <% @partner_groups.each do |partner_group| %> + + + + + <% end %> + +
    Partner Group NameNumber of partners in group
    <%= link_to partner_group.name, partner_group_path(partner_group) %><%= partner_group.partners.count %>
    +
    +
    +
    +
    +
    diff --git a/app/views/partner_groups/new.html.erb b/app/views/partner_groups/new.html.erb new file mode 100644 index 0000000000..359b4d37c3 --- /dev/null +++ b/app/views/partner_groups/new.html.erb @@ -0,0 +1,25 @@ +
    +
    +
    +
    + <% content_for :title, "New - Partner Groups - #{current_organization.name}" %> +

    + New Partner Group + for <%= current_organization.name %> +

    +
    +
    +
      +
    1. <%= link_to(dashboard_path) do %> + Home + <% end %> +
      2. +
    2. <%= link_to "All Partners", (partners_path) %>
      3. +
    3. New Partner
      4. +
    +
    +
    +
    +
    + +<%= render partial: "form", object: @partner_group, locals: { submit_btn_options: { text: "Add Partner Group" } } %> diff --git a/app/views/partner_groups/show.html.erb b/app/views/partner_groups/show.html.erb new file mode 100644 index 0000000000..714f36c093 --- /dev/null +++ b/app/views/partner_groups/show.html.erb @@ -0,0 +1,71 @@ +
    +
    +
    +
    + <% content_for :title, "Partner Groups - #{@partner_group.name} - #{current_organization.name}" %> +

    + Partner Group info + for <%= @partner_group.name %> +

    +
    +
    +
      +
    1. <%= link_to(dashboard_path) do %> + Home + <% end %> +
      2. +
    2. <%= link_to "Partner Groups", (partner_groups_path) %>
      3. +
    3. <%= @partner_group.name %>
      4. +
    +
    +
    +
    +
    + +
    +
    +
    +
    +
    +
    + <%= edit_button_to edit_partner_group_path(@partner_group) %> + <%= delete_button_to partner_group_path(@partner_group), {confirm: confirm_delete_msg(@partner_group.name)} %> +
    +
    +
    +
    +
    +
    + +
    +
    +
    +
    + +
    +
    +

    Partners in this group

    +
    +
    +
    + + + + + + + + + + + + + <%= render partial: "partners/partner_row", collection: @partner_group.partners %> +
    PartnerE-mailMonthly LimitStatusAction 
    +
    +
    +
    +
    +
    +
    +
    diff --git a/config/routes.rb b/config/routes.rb index c86f5d1f02..78e11166d3 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -142,6 +142,9 @@ def set_up_flipper end end + resources :partner_groups do + end + resources :diaper_drives resources :donations do # collection do From e433eebce69c962a3be91ca0592ebdcffe51c5b0 Mon Sep 17 00:00:00 2001 From: Albert Chae Date: Thu, 31 Dec 2020 00:21:18 -0800 Subject: [PATCH 03/21] Add partner to group via modal with dropdown change partners display in group Implement remove partner from partner group --- .../partner_group_memberships_controller.rb | 18 ++++++++ app/controllers/partner_groups_controller.rb | 2 + app/views/partner_groups/show.html.erb | 44 +++++++++++++++++-- config/routes.rb | 1 + 4 files changed, 61 insertions(+), 4 deletions(-) create mode 100644 app/controllers/partner_group_memberships_controller.rb diff --git a/app/controllers/partner_group_memberships_controller.rb b/app/controllers/partner_group_memberships_controller.rb new file mode 100644 index 0000000000..10d3feadf5 --- /dev/null +++ b/app/controllers/partner_group_memberships_controller.rb @@ -0,0 +1,18 @@ +class PartnerGroupMembershipsController < ApplicationController + def create + @partner_group = current_organization.partner_groups.find(params[:partner_group_id]) + @partner = current_organization.partners.find(params[:partner_id]) + if @partner_group.partner_group_memberships.create(partner: @partner) + redirect_to partner_group_path(@partner_group), notice: "Partner #{@partner.name} added to group!" + else + flash[:error] = "Something didn't work quite right -- try again?" + redirect_to partner_group_path(@partner_group) + end + end + + def destroy + @partner_group = current_organization.partner_groups.find(params[:partner_group_id]) + @partner_group.partner_group_memberships.find(params[:id]).destroy + redirect_to partner_group_path(@partner_group) + end +end diff --git a/app/controllers/partner_groups_controller.rb b/app/controllers/partner_groups_controller.rb index c6a83c5c58..adf5951b1e 100644 --- a/app/controllers/partner_groups_controller.rb +++ b/app/controllers/partner_groups_controller.rb @@ -10,6 +10,8 @@ def index def show @partner_group = current_organization.partner_groups.find(params[:id]) + @partners_not_in_group = current_organization.partners.alphabetized - @partner_group.partners + respond_to do |format| format.html end diff --git a/app/views/partner_groups/show.html.erb b/app/views/partner_groups/show.html.erb index 714f36c093..8c8189cae6 100644 --- a/app/views/partner_groups/show.html.erb +++ b/app/views/partner_groups/show.html.erb @@ -30,6 +30,7 @@
    <%= edit_button_to edit_partner_group_path(@partner_group) %> <%= delete_button_to partner_group_path(@partner_group), {confirm: confirm_delete_msg(@partner_group.name)} %> + <%= modal_button_to("#addPartnerModal", {text: "Add Partner to group", size: "xs"}) if can_administrate? %>
    @@ -53,14 +54,22 @@ Partner E-mail - Monthly Limit - Status - Action   - <%= render partial: "partners/partner_row", collection: @partner_group.partners %> + <% @partner_group.partner_group_memberships.each do |partner_group_membership| %> + <% partner = partner_group_membership.partner %> + + <%= link_to partner.name, partner_path(partner) %> + <%= link_to partner.email, "mailto:#{partner.email}" %> + <%= delete_button_to( + partner_group_membership_path(partner_group_id: @partner_group.id, id: partner_group_membership.id), + {confirm: confirm_delete_msg("#{partner.name} from this group")} + ) %> + + + <% end %> @@ -68,4 +77,31 @@ + diff --git a/config/routes.rb b/config/routes.rb index 78e11166d3..6d8cc9ccfd 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -143,6 +143,7 @@ def set_up_flipper end resources :partner_groups do + resources :memberships, controller: :partner_group_memberships, only: %i(create destroy) end resources :diaper_drives From cb18458b456264f6c0ca1b3ab5f4f46547014ad3 Mon Sep 17 00:00:00 2001 From: Albert Chae Date: Sat, 16 Jan 2021 12:28:31 -0800 Subject: [PATCH 04/21] Implement tagging items with partner groups --- .../partner_group_items_controller.rb | 18 +++++ app/controllers/partner_groups_controller.rb | 1 + app/models/partner_group.rb | 5 +- app/models/partner_group_item.rb | 14 ++++ app/views/partner_groups/show.html.erb | 68 +++++++++++++++++++ config/routes.rb | 1 + ...210116200129_create_partner_group_items.rb | 10 +++ db/schema.rb | 11 +++ 8 files changed, 127 insertions(+), 1 deletion(-) create mode 100644 app/controllers/partner_group_items_controller.rb create mode 100644 app/models/partner_group_item.rb create mode 100644 db/migrate/20210116200129_create_partner_group_items.rb diff --git a/app/controllers/partner_group_items_controller.rb b/app/controllers/partner_group_items_controller.rb new file mode 100644 index 0000000000..3af0ec2b86 --- /dev/null +++ b/app/controllers/partner_group_items_controller.rb @@ -0,0 +1,18 @@ +class PartnerGroupItemsController < ApplicationController + def create + @partner_group = current_organization.partner_groups.find(params[:partner_group_id]) + @item = current_organization.items.find(params[:item_id]) + if @partner_group.partner_group_items.create(item: @item) + redirect_to partner_group_path(@partner_group), notice: "Item #{@item.name} added to group!" + else + flash[:error] = "Something didn't work quite right -- try again?" + redirect_to partner_group_path(@partner_group) + end + end + + def destroy + @partner_group = current_organization.partner_groups.find(params[:partner_group_id]) + @partner_group.partner_group_items.find(params[:id]).destroy + redirect_to partner_group_path(@partner_group) + end +end diff --git a/app/controllers/partner_groups_controller.rb b/app/controllers/partner_groups_controller.rb index adf5951b1e..a11ad8f880 100644 --- a/app/controllers/partner_groups_controller.rb +++ b/app/controllers/partner_groups_controller.rb @@ -11,6 +11,7 @@ def show @partner_group = current_organization.partner_groups.find(params[:id]) @partners_not_in_group = current_organization.partners.alphabetized - @partner_group.partners + @items_not_in_group = current_organization.items.alphabetized - @partner_group.items respond_to do |format| format.html diff --git a/app/models/partner_group.rb b/app/models/partner_group.rb index b1e0e3e51e..e56c4a00a5 100644 --- a/app/models/partner_group.rb +++ b/app/models/partner_group.rb @@ -10,9 +10,12 @@ # class PartnerGroup < ApplicationRecord belongs_to :organization - has_many :partner_group_memberships + has_many :partner_group_memberships, dependent: :destroy has_many :partners, through: :partner_group_memberships + has_many :partner_group_items, dependent: :destroy + has_many :items, through: :partner_group_items + validates :organization, presence: true validates :name, presence: true, uniqueness: { scope: :organization } end diff --git a/app/models/partner_group_item.rb b/app/models/partner_group_item.rb new file mode 100644 index 0000000000..994779525f --- /dev/null +++ b/app/models/partner_group_item.rb @@ -0,0 +1,14 @@ +# == Schema Information +# +# Table name: partner_group_items +# +# id :bigint not null, primary key +# created_at :datetime not null +# updated_at :datetime not null +# item_id :bigint not null +# partner_group_id :bigint not null +# +class PartnerGroupItem < ApplicationRecord + belongs_to :partner_group + belongs_to :item +end diff --git a/app/views/partner_groups/show.html.erb b/app/views/partner_groups/show.html.erb index 8c8189cae6..c5a95e578e 100644 --- a/app/views/partner_groups/show.html.erb +++ b/app/views/partner_groups/show.html.erb @@ -38,6 +38,74 @@ +
    +
    +
    +
    + +
    +
    +

    Items requestable by this partner group

    + <%= modal_button_to("#addItemModal", {text: "Add Item to group", size: "xs"}) if can_administrate? %> +
    +
    +
    + + + + + + + + + <% @partner_group.partner_group_items.each do |partner_group_item| %> + <% item = partner_group_item.item %> + + + + + + <% end %> +
    Item nameBase item name
    <%= item.name %><%= item.base_item.name %><%= delete_button_to( + partner_group_item_path(partner_group_id: @partner_group.id, id: partner_group_item.id), + {confirm: confirm_delete_msg("#{item.name} from this group")} + ) %> +
    +
    +
    +
    +
    +
    +
    + +
    +
    diff --git a/config/routes.rb b/config/routes.rb index 6d8cc9ccfd..a250b32f0b 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -144,6 +144,7 @@ def set_up_flipper resources :partner_groups do resources :memberships, controller: :partner_group_memberships, only: %i(create destroy) + resources :items, controller: :partner_group_items, only: %i(create destroy) end resources :diaper_drives diff --git a/db/migrate/20210116200129_create_partner_group_items.rb b/db/migrate/20210116200129_create_partner_group_items.rb new file mode 100644 index 0000000000..9c51ca3b91 --- /dev/null +++ b/db/migrate/20210116200129_create_partner_group_items.rb @@ -0,0 +1,10 @@ +class CreatePartnerGroupItems < ActiveRecord::Migration[6.0] + def change + create_table :partner_group_items do |t| + t.references :partner_group, foreign_key: true, null: false + t.references :item, foreign_key: true, null: false + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 78cf8c0a12..bbede7e82f 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -290,6 +290,15 @@ t.index ["short_name"], name: "index_organizations_on_short_name" end + create_table "partner_group_items", force: :cascade do |t| + t.bigint "partner_group_id", null: false + t.bigint "item_id", null: false + t.datetime "created_at", precision: 6, null: false + t.datetime "updated_at", precision: 6, null: false + t.index ["item_id"], name: "index_partner_group_items_on_item_id" + t.index ["partner_group_id"], name: "index_partner_group_items_on_partner_group_id" + end + create_table "partner_group_memberships", force: :cascade do |t| t.bigint "partner_group_id" t.bigint "partner_id" @@ -436,6 +445,8 @@ add_foreign_key "kits", "organizations" add_foreign_key "manufacturers", "organizations" add_foreign_key "organizations", "account_requests" + add_foreign_key "partner_group_items", "items" + add_foreign_key "partner_group_items", "partner_groups" add_foreign_key "partner_group_memberships", "partner_groups" add_foreign_key "partner_group_memberships", "partners" add_foreign_key "partner_groups", "organizations" From 6f72acee252b65591e9fd678e0c9e14f928d8335 Mon Sep 17 00:00:00 2001 From: Albert Chae Date: Sun, 17 Jan 2021 01:34:10 -0800 Subject: [PATCH 05/21] Implement PartnerRequestableItemsService - if the partner is not in any groups, return all items in organization - if the partner is a member in some groups, returns items tagged by those groups --- .../api/v1/partner_requests_controller.rb | 5 ++-- app/models/partner.rb | 4 +++ .../partner_requestable_items_service.rb | 30 +++++++++++++++++++ 3 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 app/services/partner_requestable_items_service.rb diff --git a/app/controllers/api/v1/partner_requests_controller.rb b/app/controllers/api/v1/partner_requests_controller.rb index 096f574cd4..ed7040fb60 100644 --- a/app/controllers/api/v1/partner_requests_controller.rb +++ b/app/controllers/api/v1/partner_requests_controller.rb @@ -21,9 +21,8 @@ def create def show return head :forbidden unless api_key_valid? - organization = Organization.find(params[:id]) - # replace this with items from partner group - render json: organization.valid_items, status: :ok + items = PartnerRequestableItemsService.new(organization_id: params[:id], partner_id: params[:partner_id]).call + render json: items, status: :ok rescue ActiveRecord::RecordNotFound => e render json: { error: e.message }, status: :bad_request end diff --git a/app/models/partner.rb b/app/models/partner.rb index 5469acaac1..405926a736 100644 --- a/app/models/partner.rb +++ b/app/models/partner.rb @@ -30,6 +30,10 @@ class Partner < ApplicationRecord has_many :requests, dependent: :destroy + has_many :partner_group_memberships, dependent: :destroy + has_many :partner_groups, through: :partner_group_memberships + has_many :requestable_items, through: :partner_groups, source: :items + has_many_attached :documents validates :organization, presence: true diff --git a/app/services/partner_requestable_items_service.rb b/app/services/partner_requestable_items_service.rb new file mode 100644 index 0000000000..a2c69dc259 --- /dev/null +++ b/app/services/partner_requestable_items_service.rb @@ -0,0 +1,30 @@ +class PartnerRequestableItemsService + def initialize(organization_id:, partner_id:) + @organization_id = organization_id + @partner_id = partner_id + end + + def call + return organization.valid_items if partner.partner_groups.empty? + + partner.requestable_items.active.visible.map do |item| + { + id: item.id, + partner_key: item.partner_key, + name: item.name + } + end + end + + private + + attr_reader :organization_id, :partner_id + + def organization + @organization ||= Organization.find(organization_id) + end + + def partner + @partner ||= Partner.find(partner_id) + end +end From 07354aba2dc50aec993125ddcc8f476ba1efd606 Mon Sep 17 00:00:00 2001 From: Edwin Date: Wed, 28 Jul 2021 19:37:33 -0500 Subject: [PATCH 06/21] Update migrations to utilize different data structure --- ...233349_create_partner_group_memberships.rb | 10 --- ...210116200129_create_partner_group_items.rb | 10 --- ...e_and_organization_id_in_partner_groups.rb | 7 ++ ...nce_between_partners_and_partner_groups.rb | 7 ++ ...tween_partner_groups_to_item_categories.rb | 10 +++ db/schema.rb | 67 ++++++++----------- 6 files changed, 53 insertions(+), 58 deletions(-) delete mode 100644 db/migrate/20201230233349_create_partner_group_memberships.rb delete mode 100644 db/migrate/20210116200129_create_partner_group_items.rb create mode 100644 db/migrate/20210729003044_add_uniquness_idx_on_name_and_organization_id_in_partner_groups.rb create mode 100644 db/migrate/20210729003314_add_reference_between_partners_and_partner_groups.rb create mode 100644 db/migrate/20210729003516_add_join_table_between_partner_groups_to_item_categories.rb diff --git a/db/migrate/20201230233349_create_partner_group_memberships.rb b/db/migrate/20201230233349_create_partner_group_memberships.rb deleted file mode 100644 index aa4f3dd64d..0000000000 --- a/db/migrate/20201230233349_create_partner_group_memberships.rb +++ /dev/null @@ -1,10 +0,0 @@ -class CreatePartnerGroupMemberships < ActiveRecord::Migration[6.0] - def change - create_table :partner_group_memberships do |t| - t.references :partner_group, foreign_key: true - t.references :partner, foreign_key: true - - t.timestamps - end - end -end diff --git a/db/migrate/20210116200129_create_partner_group_items.rb b/db/migrate/20210116200129_create_partner_group_items.rb deleted file mode 100644 index 9c51ca3b91..0000000000 --- a/db/migrate/20210116200129_create_partner_group_items.rb +++ /dev/null @@ -1,10 +0,0 @@ -class CreatePartnerGroupItems < ActiveRecord::Migration[6.0] - def change - create_table :partner_group_items do |t| - t.references :partner_group, foreign_key: true, null: false - t.references :item, foreign_key: true, null: false - - t.timestamps - end - end -end diff --git a/db/migrate/20210729003044_add_uniquness_idx_on_name_and_organization_id_in_partner_groups.rb b/db/migrate/20210729003044_add_uniquness_idx_on_name_and_organization_id_in_partner_groups.rb new file mode 100644 index 0000000000..3c889334b4 --- /dev/null +++ b/db/migrate/20210729003044_add_uniquness_idx_on_name_and_organization_id_in_partner_groups.rb @@ -0,0 +1,7 @@ +class AddUniqunessIdxOnNameAndOrganizationIdInPartnerGroups < ActiveRecord::Migration[6.1] + disable_ddl_transaction! + + def change + add_index :partner_groups, [:name, :organization_id], unique: true, algorithm: :concurrently + end +end diff --git a/db/migrate/20210729003314_add_reference_between_partners_and_partner_groups.rb b/db/migrate/20210729003314_add_reference_between_partners_and_partner_groups.rb new file mode 100644 index 0000000000..48b07bdc65 --- /dev/null +++ b/db/migrate/20210729003314_add_reference_between_partners_and_partner_groups.rb @@ -0,0 +1,7 @@ +class AddReferenceBetweenPartnersAndPartnerGroups < ActiveRecord::Migration[6.1] + disable_ddl_transaction! + + def change + add_reference :partners, :partner_group, index: { algorithm: :concurrently } + end +end diff --git a/db/migrate/20210729003516_add_join_table_between_partner_groups_to_item_categories.rb b/db/migrate/20210729003516_add_join_table_between_partner_groups_to_item_categories.rb new file mode 100644 index 0000000000..0b15a6748c --- /dev/null +++ b/db/migrate/20210729003516_add_join_table_between_partner_groups_to_item_categories.rb @@ -0,0 +1,10 @@ +class AddJoinTableBetweenPartnerGroupsToItemCategories < ActiveRecord::Migration[6.1] + def change + create_table :partner_groups_item_categories do |t| + t.references :partner, foreign_key: true + t.references :item_categories, foreign_key: true + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 00b3d55586..ce42d75be4 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,8 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20_210_107_175_100) do - +ActiveRecord::Schema.define(version: 20_210_729_003_516) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -33,7 +32,7 @@ t.bigint "record_id", null: false t.datetime "created_at", null: false t.datetime "updated_at", null: false - t.index ["record_type", "record_id", "name"], name: "index_action_text_rich_texts_uniqueness", unique: true + t.index %w(record_type record_id name), name: "index_action_text_rich_texts_uniqueness", unique: true end create_table "active_storage_attachments", force: :cascade do |t| @@ -43,7 +42,7 @@ t.bigint "blob_id", null: false t.datetime "created_at", null: false t.index ["blob_id"], name: "index_active_storage_attachments_on_blob_id" - t.index ["record_type", "record_id", "name", "blob_id"], name: "index_active_storage_attachments_uniqueness", unique: true + t.index %w(record_type record_id name blob_id), name: "index_active_storage_attachments_uniqueness", unique: true end create_table "active_storage_blobs", force: :cascade do |t| @@ -63,7 +62,7 @@ t.string "variation_digest", null: false t.datetime "created_at", precision: 6, null: false t.datetime "updated_at", precision: 6, null: false - t.index ["blob_id", "variation_digest"], name: "index_active_storage_variant_records_uniqueness", unique: true + t.index %w(blob_id variation_digest), name: "index_active_storage_variant_records_uniqueness", unique: true end create_table "adjustments", id: :serial, force: :cascade do |t| @@ -100,7 +99,7 @@ t.datetime "updated_at", null: false t.integer "organization_id" t.string "barcodeable_type", default: "Item" - t.index ["barcodeable_type", "barcodeable_id"], name: "index_barcode_items_on_barcodeable_type_and_barcodeable_id" + t.index %w(barcodeable_type barcodeable_id), name: "index_barcode_items_on_barcodeable_type_and_barcodeable_id" t.index ["organization_id"], name: "index_barcode_items_on_organization_id" end @@ -137,7 +136,7 @@ t.string "business_name" t.float "latitude" t.float "longitude" - t.index ["latitude", "longitude"], name: "index_diaper_drive_participants_on_latitude_and_longitude" + t.index %w(latitude longitude), name: "index_diaper_drive_participants_on_latitude_and_longitude" end create_table "diaper_drives", force: :cascade do |t| @@ -176,7 +175,7 @@ t.integer "organization_id" t.float "latitude" t.float "longitude" - t.index ["latitude", "longitude"], name: "index_donation_sites_on_latitude_and_longitude" + t.index %w(latitude longitude), name: "index_donation_sites_on_latitude_and_longitude" t.index ["organization_id"], name: "index_donation_sites_on_organization_id" end @@ -213,7 +212,7 @@ t.string "value" t.datetime "created_at", null: false t.datetime "updated_at", null: false - t.index ["feature_key", "key", "value"], name: "index_flipper_gates_on_feature_key_and_key_and_value", unique: true + t.index %w(feature_key key value), name: "index_flipper_gates_on_feature_key_and_key_and_value", unique: true end create_table "inventory_items", id: :serial, force: :cascade do |t| @@ -225,12 +224,12 @@ end create_table "item_categories", force: :cascade do |t| - t.string "name" + t.string "name", null: false t.text "description" t.integer "organization_id", null: false t.datetime "created_at", precision: 6, null: false t.datetime "updated_at", precision: 6, null: false - t.index ["name", "organization_id"], name: "index_item_categories_on_name_and_organization_id", unique: true + t.index %w(name organization_id), name: "index_item_categories_on_name_and_organization_id", unique: true end create_table "items", id: :serial, force: :cascade do |t| @@ -264,7 +263,7 @@ t.boolean "active", default: true t.boolean "visible_to_partners", default: true, null: false t.integer "value_in_cents", default: 0 - t.index ["name", "organization_id"], name: "index_kits_on_name_and_organization_id", unique: true + t.index %w(name organization_id), name: "index_kits_on_name_and_organization_id", unique: true t.index ["organization_id"], name: "index_kits_on_organization_id" end @@ -275,7 +274,7 @@ t.string "itemizable_type" t.datetime "created_at", null: false t.datetime "updated_at", null: false - t.index ["itemizable_id", "itemizable_type"], name: "index_line_items_on_itemizable_id_and_itemizable_type" + t.index %w(itemizable_id itemizable_type), name: "index_line_items_on_itemizable_id_and_itemizable_type" end create_table "manufacturers", force: :cascade do |t| @@ -306,34 +305,26 @@ t.integer "default_storage_location" t.text "partner_form_fields", default: [], array: true t.integer "account_request_id" - t.index ["latitude", "longitude"], name: "index_organizations_on_latitude_and_longitude" + t.index %w(latitude longitude), name: "index_organizations_on_latitude_and_longitude" t.index ["short_name"], name: "index_organizations_on_short_name" end - create_table "partner_group_items", force: :cascade do |t| - t.bigint "partner_group_id", null: false - t.bigint "item_id", null: false + create_table "partner_groups", force: :cascade do |t| + t.bigint "organization_id" + t.string "name" t.datetime "created_at", precision: 6, null: false t.datetime "updated_at", precision: 6, null: false - t.index ["item_id"], name: "index_partner_group_items_on_item_id" - t.index ["partner_group_id"], name: "index_partner_group_items_on_partner_group_id" + t.index %w(name organization_id), name: "index_partner_groups_on_name_and_organization_id", unique: true + t.index ["organization_id"], name: "index_partner_groups_on_organization_id" end - create_table "partner_group_memberships", force: :cascade do |t| - t.bigint "partner_group_id" + create_table "partner_groups_item_categories", force: :cascade do |t| t.bigint "partner_id" + t.bigint "item_categories_id" t.datetime "created_at", precision: 6, null: false t.datetime "updated_at", precision: 6, null: false - t.index ["partner_group_id"], name: "index_partner_group_memberships_on_partner_group_id" - t.index ["partner_id"], name: "index_partner_group_memberships_on_partner_id" - end - - create_table "partner_groups", force: :cascade do |t| - t.bigint "organization_id" - t.string "name" - t.datetime "created_at", precision: 6, null: false - t.datetime "updated_at", precision: 6, null: false - t.index ["organization_id"], name: "index_partner_groups_on_organization_id" + t.index ["item_categories_id"], name: "index_partner_groups_item_categories_on_item_categories_id" + t.index ["partner_id"], name: "index_partner_groups_item_categories_on_partner_id" end create_table "partners", id: :serial, force: :cascade do |t| @@ -346,7 +337,9 @@ t.boolean "send_reminders", default: false, null: false t.text "notes" t.integer "quota" + t.bigint "partner_groups_id" t.index ["organization_id"], name: "index_partners_on_organization_id" + t.index ["partner_groups_id"], name: "index_partners_on_partner_groups_id" end create_table "purchases", force: :cascade do |t| @@ -391,7 +384,7 @@ t.float "longitude" t.integer "square_footage" t.string "warehouse_type" - t.index ["latitude", "longitude"], name: "index_storage_locations_on_latitude_and_longitude" + t.index %w(latitude longitude), name: "index_storage_locations_on_latitude_and_longitude" t.index ["organization_id"], name: "index_storage_locations_on_organization_id" end @@ -437,7 +430,7 @@ t.index ["invitation_token"], name: "index_users_on_invitation_token", unique: true t.index ["invitations_count"], name: "index_users_on_invitations_count" t.index ["invited_by_id"], name: "index_users_on_invited_by_id" - t.index ["invited_by_type", "invited_by_id"], name: "index_users_on_invited_by_type_and_invited_by_id" + t.index %w(invited_by_type invited_by_id), name: "index_users_on_invited_by" t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true end @@ -453,7 +446,7 @@ t.float "longitude" t.datetime "created_at", null: false t.datetime "updated_at", null: false - t.index ["latitude", "longitude"], name: "index_vendors_on_latitude_and_longitude" + t.index %w(latitude longitude), name: "index_vendors_on_latitude_and_longitude" end create_table "versions", force: :cascade do |t| @@ -483,11 +476,9 @@ add_foreign_key "kits", "organizations" add_foreign_key "manufacturers", "organizations" add_foreign_key "organizations", "account_requests" - add_foreign_key "partner_group_items", "items" - add_foreign_key "partner_group_items", "partner_groups" - add_foreign_key "partner_group_memberships", "partner_groups" - add_foreign_key "partner_group_memberships", "partners" add_foreign_key "partner_groups", "organizations" + add_foreign_key "partner_groups_item_categories", "item_categories", column: "item_categories_id" + add_foreign_key "partner_groups_item_categories", "partners" add_foreign_key "requests", "distributions" add_foreign_key "requests", "organizations" add_foreign_key "requests", "partners" From fc68ff7578452d88200d428cada6c0ae5755ba10 Mon Sep 17 00:00:00 2001 From: Edwin Date: Fri, 30 Jul 2021 10:32:35 -0500 Subject: [PATCH 07/21] Add associations and specs to verify them --- app/models/item_category.rb | 3 +- app/models/partner.rb | 30 ++++----- app/models/partner_group.rb | 7 +-- ...tween_partner_groups_to_item_categories.rb | 6 +- db/partners_schema.rb | 9 +-- db/schema.rb | 61 ++++++++++--------- db/seeds.rb | 14 +++++ spec/factories/item_categories.rb | 2 +- spec/factories/partners.rb | 21 ++++--- spec/factories/users.rb | 12 ++-- spec/models/item_category_spec.rb | 3 +- spec/models/partner_group_spec.rb | 5 ++ spec/models/partner_spec.rb | 31 +++++++--- 13 files changed, 120 insertions(+), 84 deletions(-) diff --git a/app/models/item_category.rb b/app/models/item_category.rb index 47e669f55b..1936b8695a 100644 --- a/app/models/item_category.rb +++ b/app/models/item_category.rb @@ -4,7 +4,7 @@ # # id :bigint not null, primary key # description :text -# name :string +# name :string not null # created_at :datetime not null # updated_at :datetime not null # organization_id :integer not null @@ -16,4 +16,5 @@ class ItemCategory < ApplicationRecord belongs_to :organization has_many :items, -> { order(name: :asc) }, inverse_of: :item_category + has_and_belongs_to_many :partner_groups end diff --git a/app/models/partner.rb b/app/models/partner.rb index 1011e3e2c5..546e43563b 100644 --- a/app/models/partner.rb +++ b/app/models/partner.rb @@ -2,16 +2,17 @@ # # Table name: partners # -# id :integer not null, primary key -# email :string -# name :string -# notes :text -# quota :integer -# send_reminders :boolean default(FALSE), not null -# status :integer default("uninvited") -# created_at :datetime not null -# updated_at :datetime not null -# organization_id :integer +# id :integer not null, primary key +# email :string +# name :string +# notes :text +# quota :integer +# send_reminders :boolean default(FALSE), not null +# status :integer default("uninvited") +# created_at :datetime not null +# updated_at :datetime not null +# organization_id :integer +# partner_group_id :bigint # class Partner < ApplicationRecord @@ -26,14 +27,13 @@ class Partner < ApplicationRecord enum status: { uninvited: 0, invited: 1, awaiting_review: 2, approved: 3, error: 4, recertification_required: 5, deactivated: 6 } belongs_to :organization - has_many :distributions, dependent: :destroy + belongs_to :partner_group, optional: true + has_many :item_categories, through: :partner_group + has_many :items, through: :item_categories + has_many :distributions, dependent: :destroy has_many :requests, dependent: :destroy - has_many :partner_group_memberships, dependent: :destroy - has_many :partner_groups, through: :partner_group_memberships - has_many :requestable_items, through: :partner_groups, source: :items - has_many_attached :documents validates :organization, presence: true diff --git a/app/models/partner_group.rb b/app/models/partner_group.rb index e56c4a00a5..50d748fad3 100644 --- a/app/models/partner_group.rb +++ b/app/models/partner_group.rb @@ -10,11 +10,8 @@ # class PartnerGroup < ApplicationRecord belongs_to :organization - has_many :partner_group_memberships, dependent: :destroy - has_many :partners, through: :partner_group_memberships - - has_many :partner_group_items, dependent: :destroy - has_many :items, through: :partner_group_items + has_many :partners + has_and_belongs_to_many :item_categories validates :organization, presence: true validates :name, presence: true, uniqueness: { scope: :organization } diff --git a/db/migrate/20210729003516_add_join_table_between_partner_groups_to_item_categories.rb b/db/migrate/20210729003516_add_join_table_between_partner_groups_to_item_categories.rb index 0b15a6748c..784875135b 100644 --- a/db/migrate/20210729003516_add_join_table_between_partner_groups_to_item_categories.rb +++ b/db/migrate/20210729003516_add_join_table_between_partner_groups_to_item_categories.rb @@ -1,8 +1,8 @@ class AddJoinTableBetweenPartnerGroupsToItemCategories < ActiveRecord::Migration[6.1] def change - create_table :partner_groups_item_categories do |t| - t.references :partner, foreign_key: true - t.references :item_categories, foreign_key: true + create_table :item_categories_partner_groups do |t| + t.references :partner_group, foreign_key: true, null: false + t.references :item_category, foreign_key: true, null: false t.timestamps end diff --git a/db/partners_schema.rb b/db/partners_schema.rb index ace7af9116..bef15ad466 100644 --- a/db/partners_schema.rb +++ b/db/partners_schema.rb @@ -10,7 +10,8 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20_200_518_010_905) do +ActiveRecord::Schema.define(version: 2020_05_18_010905) do + # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -21,7 +22,7 @@ t.bigint "blob_id", null: false t.datetime "created_at", null: false t.index ["blob_id"], name: "index_active_storage_attachments_on_blob_id" - t.index %w(record_type record_id name blob_id), name: "index_active_storage_attachments_uniqueness", unique: true + t.index ["record_type", "record_id", "name", "blob_id"], name: "index_active_storage_attachments_uniqueness", unique: true end create_table "active_storage_blobs", force: :cascade do |t| @@ -115,7 +116,7 @@ t.string "value" t.datetime "created_at", null: false t.datetime "updated_at", null: false - t.index %w(feature_key key value), name: "index_flipper_gates_on_feature_key_and_key_and_value", unique: true + t.index ["feature_key", "key", "value"], name: "index_flipper_gates_on_feature_key_and_key_and_value", unique: true end create_table "item_requests", force: :cascade do |t| @@ -261,7 +262,7 @@ t.index ["invitation_token"], name: "index_users_on_invitation_token", unique: true t.index ["invitations_count"], name: "index_users_on_invitations_count" t.index ["invited_by_id"], name: "index_users_on_invited_by_id" - t.index %w(invited_by_type invited_by_id), name: "index_users_on_invited_by_type_and_invited_by_id" + t.index ["invited_by_type", "invited_by_id"], name: "index_users_on_invited_by" t.index ["partner_id"], name: "index_users_on_partner_id" t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true end diff --git a/db/schema.rb b/db/schema.rb index ce42d75be4..63f2256300 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,8 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20_210_729_003_516) do +ActiveRecord::Schema.define(version: 2021_07_29_003516) do + # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -32,7 +33,7 @@ t.bigint "record_id", null: false t.datetime "created_at", null: false t.datetime "updated_at", null: false - t.index %w(record_type record_id name), name: "index_action_text_rich_texts_uniqueness", unique: true + t.index ["record_type", "record_id", "name"], name: "index_action_text_rich_texts_uniqueness", unique: true end create_table "active_storage_attachments", force: :cascade do |t| @@ -42,7 +43,7 @@ t.bigint "blob_id", null: false t.datetime "created_at", null: false t.index ["blob_id"], name: "index_active_storage_attachments_on_blob_id" - t.index %w(record_type record_id name blob_id), name: "index_active_storage_attachments_uniqueness", unique: true + t.index ["record_type", "record_id", "name", "blob_id"], name: "index_active_storage_attachments_uniqueness", unique: true end create_table "active_storage_blobs", force: :cascade do |t| @@ -62,7 +63,7 @@ t.string "variation_digest", null: false t.datetime "created_at", precision: 6, null: false t.datetime "updated_at", precision: 6, null: false - t.index %w(blob_id variation_digest), name: "index_active_storage_variant_records_uniqueness", unique: true + t.index ["blob_id", "variation_digest"], name: "index_active_storage_variant_records_uniqueness", unique: true end create_table "adjustments", id: :serial, force: :cascade do |t| @@ -99,7 +100,7 @@ t.datetime "updated_at", null: false t.integer "organization_id" t.string "barcodeable_type", default: "Item" - t.index %w(barcodeable_type barcodeable_id), name: "index_barcode_items_on_barcodeable_type_and_barcodeable_id" + t.index ["barcodeable_type", "barcodeable_id"], name: "index_barcode_items_on_barcodeable_type_and_barcodeable_id" t.index ["organization_id"], name: "index_barcode_items_on_organization_id" end @@ -136,7 +137,7 @@ t.string "business_name" t.float "latitude" t.float "longitude" - t.index %w(latitude longitude), name: "index_diaper_drive_participants_on_latitude_and_longitude" + t.index ["latitude", "longitude"], name: "index_diaper_drive_participants_on_latitude_and_longitude" end create_table "diaper_drives", force: :cascade do |t| @@ -175,7 +176,7 @@ t.integer "organization_id" t.float "latitude" t.float "longitude" - t.index %w(latitude longitude), name: "index_donation_sites_on_latitude_and_longitude" + t.index ["latitude", "longitude"], name: "index_donation_sites_on_latitude_and_longitude" t.index ["organization_id"], name: "index_donation_sites_on_organization_id" end @@ -212,7 +213,7 @@ t.string "value" t.datetime "created_at", null: false t.datetime "updated_at", null: false - t.index %w(feature_key key value), name: "index_flipper_gates_on_feature_key_and_key_and_value", unique: true + t.index ["feature_key", "key", "value"], name: "index_flipper_gates_on_feature_key_and_key_and_value", unique: true end create_table "inventory_items", id: :serial, force: :cascade do |t| @@ -229,7 +230,16 @@ t.integer "organization_id", null: false t.datetime "created_at", precision: 6, null: false t.datetime "updated_at", precision: 6, null: false - t.index %w(name organization_id), name: "index_item_categories_on_name_and_organization_id", unique: true + t.index ["name", "organization_id"], name: "index_item_categories_on_name_and_organization_id", unique: true + end + + create_table "item_categories_partner_groups", force: :cascade do |t| + t.bigint "partner_group_id", null: false + t.bigint "item_category_id", null: false + t.datetime "created_at", precision: 6, null: false + t.datetime "updated_at", precision: 6, null: false + t.index ["item_category_id"], name: "index_item_categories_partner_groups_on_item_category_id" + t.index ["partner_group_id"], name: "index_item_categories_partner_groups_on_partner_group_id" end create_table "items", id: :serial, force: :cascade do |t| @@ -263,7 +273,7 @@ t.boolean "active", default: true t.boolean "visible_to_partners", default: true, null: false t.integer "value_in_cents", default: 0 - t.index %w(name organization_id), name: "index_kits_on_name_and_organization_id", unique: true + t.index ["name", "organization_id"], name: "index_kits_on_name_and_organization_id", unique: true t.index ["organization_id"], name: "index_kits_on_organization_id" end @@ -274,7 +284,7 @@ t.string "itemizable_type" t.datetime "created_at", null: false t.datetime "updated_at", null: false - t.index %w(itemizable_id itemizable_type), name: "index_line_items_on_itemizable_id_and_itemizable_type" + t.index ["itemizable_id", "itemizable_type"], name: "index_line_items_on_itemizable_id_and_itemizable_type" end create_table "manufacturers", force: :cascade do |t| @@ -305,7 +315,7 @@ t.integer "default_storage_location" t.text "partner_form_fields", default: [], array: true t.integer "account_request_id" - t.index %w(latitude longitude), name: "index_organizations_on_latitude_and_longitude" + t.index ["latitude", "longitude"], name: "index_organizations_on_latitude_and_longitude" t.index ["short_name"], name: "index_organizations_on_short_name" end @@ -314,19 +324,10 @@ t.string "name" t.datetime "created_at", precision: 6, null: false t.datetime "updated_at", precision: 6, null: false - t.index %w(name organization_id), name: "index_partner_groups_on_name_and_organization_id", unique: true + t.index ["name", "organization_id"], name: "index_partner_groups_on_name_and_organization_id", unique: true t.index ["organization_id"], name: "index_partner_groups_on_organization_id" end - create_table "partner_groups_item_categories", force: :cascade do |t| - t.bigint "partner_id" - t.bigint "item_categories_id" - t.datetime "created_at", precision: 6, null: false - t.datetime "updated_at", precision: 6, null: false - t.index ["item_categories_id"], name: "index_partner_groups_item_categories_on_item_categories_id" - t.index ["partner_id"], name: "index_partner_groups_item_categories_on_partner_id" - end - create_table "partners", id: :serial, force: :cascade do |t| t.string "name" t.string "email" @@ -337,9 +338,9 @@ t.boolean "send_reminders", default: false, null: false t.text "notes" t.integer "quota" - t.bigint "partner_groups_id" + t.bigint "partner_group_id" t.index ["organization_id"], name: "index_partners_on_organization_id" - t.index ["partner_groups_id"], name: "index_partners_on_partner_groups_id" + t.index ["partner_group_id"], name: "index_partners_on_partner_group_id" end create_table "purchases", force: :cascade do |t| @@ -384,7 +385,7 @@ t.float "longitude" t.integer "square_footage" t.string "warehouse_type" - t.index %w(latitude longitude), name: "index_storage_locations_on_latitude_and_longitude" + t.index ["latitude", "longitude"], name: "index_storage_locations_on_latitude_and_longitude" t.index ["organization_id"], name: "index_storage_locations_on_organization_id" end @@ -430,7 +431,7 @@ t.index ["invitation_token"], name: "index_users_on_invitation_token", unique: true t.index ["invitations_count"], name: "index_users_on_invitations_count" t.index ["invited_by_id"], name: "index_users_on_invited_by_id" - t.index %w(invited_by_type invited_by_id), name: "index_users_on_invited_by" + t.index ["invited_by_type", "invited_by_id"], name: "index_users_on_invited_by" t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true end @@ -446,7 +447,7 @@ t.float "longitude" t.datetime "created_at", null: false t.datetime "updated_at", null: false - t.index %w(latitude longitude), name: "index_vendors_on_latitude_and_longitude" + t.index ["latitude", "longitude"], name: "index_vendors_on_latitude_and_longitude" end create_table "versions", force: :cascade do |t| @@ -457,7 +458,7 @@ t.jsonb "object" t.datetime "created_at" t.jsonb "object_changes" - t.index %w(item_type item_id), name: "index_versions_on_item_type_and_item_id" + t.index ["item_type", "item_id"], name: "index_versions_on_item_type_and_item_id" end add_foreign_key "active_storage_variant_records", "active_storage_blobs", column: "blob_id" @@ -471,14 +472,14 @@ add_foreign_key "donations", "manufacturers" add_foreign_key "donations", "storage_locations" add_foreign_key "item_categories", "organizations" + add_foreign_key "item_categories_partner_groups", "item_categories" + add_foreign_key "item_categories_partner_groups", "partner_groups" add_foreign_key "items", "item_categories" add_foreign_key "items", "kits" add_foreign_key "kits", "organizations" add_foreign_key "manufacturers", "organizations" add_foreign_key "organizations", "account_requests" add_foreign_key "partner_groups", "organizations" - add_foreign_key "partner_groups_item_categories", "item_categories", column: "item_categories_id" - add_foreign_key "partner_groups_item_categories", "partners" add_foreign_key "requests", "distributions" add_foreign_key "requests", "organizations" add_foreign_key "requests", "partners" diff --git a/db/seeds.rb b/db/seeds.rb index cd52c1a82c..5267046315 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -100,6 +100,19 @@ def random_record_for_org(org, klass) end end +# ---------------------------------------------------------------------------- +# Partner Group & Item Categories +# ---------------------------------------------------------------------------- +Organization.all.each do |org| + # Setup the Partner Group & their item categories + partner_group = FactoryBot.create(:partner_group, organization: org) + + total_item_categories_to_add = Faker::Number.between(from: 0, to: 2) + org.item_categories.sample(total_item_categories_to_add).each do |item_category| + partner_group.item_categories << item_category + end +end + # ---------------------------------------------------------------------------- # Users # ---------------------------------------------------------------------------- @@ -182,6 +195,7 @@ def random_record_for_org(org, klass) ].each do |partner_option| p = Partner.find_or_create_by!(partner_option) do |partner| partner.organization = pdx_org + partner.partner_group = pdx_org.partner_groups.first end # ---------------------------------------------------------------------------- diff --git a/spec/factories/item_categories.rb b/spec/factories/item_categories.rb index b34d2037e8..9cd3743c3c 100644 --- a/spec/factories/item_categories.rb +++ b/spec/factories/item_categories.rb @@ -4,7 +4,7 @@ # # id :bigint not null, primary key # description :text -# name :string +# name :string not null # created_at :datetime not null # updated_at :datetime not null # organization_id :integer not null diff --git a/spec/factories/partners.rb b/spec/factories/partners.rb index ea0607044d..24d5f8f718 100644 --- a/spec/factories/partners.rb +++ b/spec/factories/partners.rb @@ -2,16 +2,17 @@ # # Table name: partners # -# id :integer not null, primary key -# email :string -# name :string -# notes :text -# quota :integer -# send_reminders :boolean default(FALSE), not null -# status :integer default("uninvited") -# created_at :datetime not null -# updated_at :datetime not null -# organization_id :integer +# id :integer not null, primary key +# email :string +# name :string +# notes :text +# quota :integer +# send_reminders :boolean default(FALSE), not null +# status :integer default("uninvited") +# created_at :datetime not null +# updated_at :datetime not null +# organization_id :integer +# partner_group_id :bigint # FactoryBot.define do diff --git a/spec/factories/users.rb b/spec/factories/users.rb index 72cb9f9183..4f226616ff 100644 --- a/spec/factories/users.rb +++ b/spec/factories/users.rb @@ -2,9 +2,10 @@ # # Table name: users # -# id :bigint not null, primary key +# id :integer not null, primary key # current_sign_in_at :datetime # current_sign_in_ip :inet +# discarded_at :datetime # email :string default(""), not null # encrypted_password :string default(""), not null # invitation_accepted_at :datetime @@ -14,17 +15,20 @@ # invitation_token :string # invitations_count :integer default(0) # invited_by_type :string +# last_request_at :datetime # last_sign_in_at :datetime # last_sign_in_ip :inet -# name :string +# name :string default("CHANGEME"), not null +# organization_admin :boolean # remember_created_at :datetime # reset_password_sent_at :datetime # reset_password_token :string # sign_in_count :integer default(0), not null +# super_admin :boolean default(FALSE) # created_at :datetime not null # updated_at :datetime not null -# invited_by_id :bigint -# partner_id :bigint +# invited_by_id :integer +# organization_id :integer # FactoryBot.define do diff --git a/spec/models/item_category_spec.rb b/spec/models/item_category_spec.rb index 3455552740..2ed46cafae 100644 --- a/spec/models/item_category_spec.rb +++ b/spec/models/item_category_spec.rb @@ -4,7 +4,7 @@ # # id :bigint not null, primary key # description :text -# name :string +# name :string not null # created_at :datetime not null # updated_at :datetime not null # organization_id :integer not null @@ -24,5 +24,6 @@ describe 'assocations' do it { should belong_to(:organization) } it { should have_many(:items) } + it { should have_and_belong_to_many(:partner_groups) } end end diff --git a/spec/models/partner_group_spec.rb b/spec/models/partner_group_spec.rb index 8ce9cbf937..d8dd6923ad 100644 --- a/spec/models/partner_group_spec.rb +++ b/spec/models/partner_group_spec.rb @@ -9,6 +9,11 @@ # organization_id :bigint # RSpec.describe PartnerGroup, type: :model do + describe 'associations' do + it { should belong_to(:organization) } + it { should have_many(:partners) } + it { should have_and_belong_to_many(:item_categories) } + end context "Validations >" do it "must belong to an organization" do expect(build(:partner_group, organization_id: nil)).not_to be_valid diff --git a/spec/models/partner_spec.rb b/spec/models/partner_spec.rb index 868ca0fd84..dd20e4d7e8 100644 --- a/spec/models/partner_spec.rb +++ b/spec/models/partner_spec.rb @@ -2,19 +2,30 @@ # # Table name: partners # -# id :integer not null, primary key -# email :string -# name :string -# notes :text -# quota :integer -# send_reminders :boolean default(FALSE), not null -# status :integer default("uninvited") -# created_at :datetime not null -# updated_at :datetime not null -# organization_id :integer +# id :integer not null, primary key +# email :string +# name :string +# notes :text +# quota :integer +# send_reminders :boolean default(FALSE), not null +# status :integer default("uninvited") +# created_at :datetime not null +# updated_at :datetime not null +# organization_id :integer +# partner_group_id :bigint # RSpec.describe Partner, type: :model do + describe 'associations' do + it { should belong_to(:organization) } + it { should belong_to(:partner_group).optional } + it { should have_many(:item_categories).through(:partner_group) } + it { should have_many(:items).through(:item_categories) } + it { should have_many(:requests) } + it { should have_many(:distributions) } + it { should have_many(:requests) } + end + context "Validations >" do it "must belong to an organization" do expect(build(:partner, organization_id: nil)).not_to be_valid From d97bb89bc0c723724ee952d6bdfe67a18d351cda Mon Sep 17 00:00:00 2001 From: Edwin Date: Sat, 31 Jul 2021 09:41:22 -0500 Subject: [PATCH 08/21] Update controller actions to fetch requestable items on partner frontend --- .../partners/children_controller.rb | 11 ++++- .../individuals_requests_controller.rb | 8 ++-- .../partners/requests_controller.rb | 8 ++-- ...partner_fetch_requestable_items_service.rb | 24 +++++++++++ .../partner_requestable_items_service.rb | 30 ------------- app/views/partners/children/_form.html.erb | 2 +- .../_item_request.html.erb | 2 +- .../partners/requests/_item_request.html.erb | 2 +- db/seeds.rb | 2 + ...er_fetch_requestable_items_service_spec.rb | 43 +++++++++++++++++++ 10 files changed, 91 insertions(+), 41 deletions(-) create mode 100644 app/services/partner_fetch_requestable_items_service.rb delete mode 100644 app/services/partner_requestable_items_service.rb create mode 100644 spec/services/partner_fetch_requestable_items_service_spec.rb diff --git a/app/controllers/partners/children_controller.rb b/app/controllers/partners/children_controller.rb index c7aee0ed28..c2adcbf629 100644 --- a/app/controllers/partners/children_controller.rb +++ b/app/controllers/partners/children_controller.rb @@ -35,6 +35,11 @@ def show def new family = current_partner.families.find_by!(id: params[:family_id]) @child = family.children.new + + requestable_items = PartnerFetchRequestableItemsService.new(partner_id: current_partner.partner.id).call + @formatted_requestable_items = requestable_items.map do |rt| + [rt.name, rt.id] + end end def active @@ -45,6 +50,10 @@ def active def edit @child = current_partner.children.find_by(id: params[:id]) + requestable_items = PartnerFetchRequestableItemsService.new(partner_id: current_partner.partner.id).call + @formatted_requestable_items = requestable_items.map do |rt| + [rt.name, rt.id] + end end def create @@ -107,4 +116,4 @@ def fetch_valid_item_name(id) @valid_items.find { |vi| vi[:id] == id }&.fetch(:name) end end -end \ No newline at end of file +end diff --git a/app/controllers/partners/individuals_requests_controller.rb b/app/controllers/partners/individuals_requests_controller.rb index daee980ae9..04e4ba42d7 100644 --- a/app/controllers/partners/individuals_requests_controller.rb +++ b/app/controllers/partners/individuals_requests_controller.rb @@ -2,9 +2,11 @@ module Partners class IndividualsRequestsController < BaseController def new @request = FamilyRequest.new({}, initial_items: 1) - @requestable_items = Organization.find(current_partner.diaper_bank_id).valid_items.map do |item| - [item[:name], item[:id]] - end.sort + + requestable_items = PartnerFetchRequestableItemsService.new(partner_id: current_partner.partner.id).call + @formatted_requestable_items = requestable_items.map do |rt| + [rt.name, rt.id] + end end def create diff --git a/app/controllers/partners/requests_controller.rb b/app/controllers/partners/requests_controller.rb index e20fe77a0b..483c660595 100644 --- a/app/controllers/partners/requests_controller.rb +++ b/app/controllers/partners/requests_controller.rb @@ -11,10 +11,10 @@ def new @partner_request = Partners::Request.new @partner_request.item_requests.build - # Fetch the valid items - @requestable_items = Organization.find(current_partner.diaper_bank_id).valid_items.map do |item| - [item[:name], item[:id]] - end.sort + requestable_items = PartnerFetchRequestableItemsService.new(partner_id: current_partner.partner.id).call + @formatted_requestable_items = requestable_items.map do |rt| + [rt.name, rt.id] + end end def show diff --git a/app/services/partner_fetch_requestable_items_service.rb b/app/services/partner_fetch_requestable_items_service.rb new file mode 100644 index 0000000000..b1fbf7bdb3 --- /dev/null +++ b/app/services/partner_fetch_requestable_items_service.rb @@ -0,0 +1,24 @@ +class PartnerFetchRequestableItemsService + + def initialize(partner_id:) + @partner_id = partner_id + end + + def call + return organization.items.active.visible if partner.partner_group.blank? + + partner.items.active.visible + end + + private + + attr_reader :partner_id + + def partner + @partner ||= Partner.find(partner_id) + end + + def organization + @organization ||= partner.organization + end +end diff --git a/app/services/partner_requestable_items_service.rb b/app/services/partner_requestable_items_service.rb deleted file mode 100644 index a2c69dc259..0000000000 --- a/app/services/partner_requestable_items_service.rb +++ /dev/null @@ -1,30 +0,0 @@ -class PartnerRequestableItemsService - def initialize(organization_id:, partner_id:) - @organization_id = organization_id - @partner_id = partner_id - end - - def call - return organization.valid_items if partner.partner_groups.empty? - - partner.requestable_items.active.visible.map do |item| - { - id: item.id, - partner_key: item.partner_key, - name: item.name - } - end - end - - private - - attr_reader :organization_id, :partner_id - - def organization - @organization ||= Organization.find(organization_id) - end - - def partner - @partner ||= Partner.find(partner_id) - end -end diff --git a/app/views/partners/children/_form.html.erb b/app/views/partners/children/_form.html.erb index 6577579e87..15fddd86b2 100644 --- a/app/views/partners/children/_form.html.erb +++ b/app/views/partners/children/_form.html.erb @@ -17,7 +17,7 @@ <%= form.text_field :last_name, class: "form-control" %> <%= form.label :item_needed, "Diaper/Item Used" %> - <%= form.select :item_needed_diaperid, current_partner.organization.valid_items_for_select, + <%= form.select :item_needed_diaperid, @formatted_requestable_items, {include_blank: 'Select an item'}, {class: 'form-control'} %>
    diff --git a/app/views/partners/individuals_requests/_item_request.html.erb b/app/views/partners/individuals_requests/_item_request.html.erb index 35ae31b29e..c63830aeb9 100644 --- a/app/views/partners/individuals_requests/_item_request.html.erb +++ b/app/views/partners/individuals_requests/_item_request.html.erb @@ -1,6 +1,6 @@ <%= form.fields_for(:items) do |field| %> - <%= field.input :item_id, collection: @requestable_items, label: false, allow_blank: true, class: 'form-control' %> + <%= field.input :item_id, collection: @formatted_requestable_items, label: false, allow_blank: true, class: 'form-control' %> <%= field.number_field :person_count, as: :integer, label: false, step: 1, min: 1, class: 'form-control' %> <%= remove_item_button "Remove" %> diff --git a/app/views/partners/requests/_item_request.html.erb b/app/views/partners/requests/_item_request.html.erb index 80607ac331..a6aac1165d 100644 --- a/app/views/partners/requests/_item_request.html.erb +++ b/app/views/partners/requests/_item_request.html.erb @@ -1,6 +1,6 @@ <%= form.fields_for :item_requests, defined?(object) ? object : nil do |field| %> - <%= field.select :item_id, @requestable_items, {include_blank: 'Select an item'}, {class: 'form-control'} %> + <%= field.select :item_id, @formatted_requestable_items, {include_blank: 'Select an item'}, {class: 'form-control'} %> <%= field.number_field :quantity, label: false, step: 1, min: 1, class: 'form-control' %> <%= field.hidden_field :_destroy, as: :hidden %> diff --git a/db/seeds.rb b/db/seeds.rb index 5267046315..62849691f0 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -198,6 +198,8 @@ def random_record_for_org(org, klass) partner.partner_group = pdx_org.partner_groups.first end + + # ---------------------------------------------------------------------------- # Creating associated records within the Partnerbase database # diff --git a/spec/services/partner_fetch_requestable_items_service_spec.rb b/spec/services/partner_fetch_requestable_items_service_spec.rb new file mode 100644 index 0000000000..3fd7e2a16e --- /dev/null +++ b/spec/services/partner_fetch_requestable_items_service_spec.rb @@ -0,0 +1,43 @@ +require 'rails_helper' + +describe PartnerFetchRequestableItemsService do + + describe '#call' do + subject { described_class.new(partner_id: partner_id).call } + let(:partner_id) { partner.id } + let(:partner) { create(:partner) } + let(:organization) { partner.organization } + + context 'when the partner id does not match any Partner' do + let(:partner_id) { 0 } + + it 'raise an error indiciating the partner does not exist' do + expect { subject }.to raise_error(ActiveRecord::RecordNotFound) + end + end + + context 'when the partner is not in any partner group' do + before do + expect(partner.partner_group).to be_nil + end + + it 'should return all active and visible items' do + expect(subject).to eq(organization.items.active.visible) + end + end + + context 'when the partner is in a partner group' do + before do + pg = create(:partner_group) + pg.item_categories << create(:item_category, organization: organization) + partner.update(partner_group: pg) + end + + it 'should return all active and visible items specified by the item associated with' do + expect(subject).to eq(partner.items.active.visible) + end + end + end + + +end From 492cc234f1649bb56f021a1d0691b2469237be9a Mon Sep 17 00:00:00 2001 From: Edwin Date: Tue, 10 Aug 2021 21:07:05 -0500 Subject: [PATCH 09/21] Be able to associate Partner to PartnerGroup --- app/controllers/partners_controller.rb | 5 +- app/views/layouts/_lte_sidebar.html.erb | 6 -- app/views/partners/_form.html.erb | 9 ++- .../partners/_partner_groups_table.html.erb | 46 ++++++++++++++ app/views/partners/_partner_row.html.erb | 3 +- app/views/partners/_partners_table.html.erb | 47 +++++++++++++++ app/views/partners/index.html.erb | 60 ++++++------------- db/schema.rb | 4 +- 8 files changed, 126 insertions(+), 54 deletions(-) create mode 100644 app/views/partners/_partner_groups_table.html.erb create mode 100644 app/views/partners/_partners_table.html.erb diff --git a/app/controllers/partners_controller.rb b/app/controllers/partners_controller.rb index 6d19ea8660..e796ea95ef 100644 --- a/app/controllers/partners_controller.rb +++ b/app/controllers/partners_controller.rb @@ -7,6 +7,7 @@ class PartnersController < ApplicationController def index @unfiltered_partners_for_statuses = Partner.where(organization: current_organization) @partners = Partner.where(organization: current_organization).class_filter(filter_params).alphabetized + @partner_groups = PartnerGroup.where(organization: current_organization) respond_to do |format| format.html @@ -56,6 +57,7 @@ def show def new @partner = current_organization.partners.new + @partner_groups = current_organization.partner_groups end def approve_partner @@ -67,6 +69,7 @@ def approve_partner def edit @partner = current_organization.partners.find(params[:id]) + @partner_groups = PartnerGroup.where(organization: current_organization) end def update @@ -163,7 +166,7 @@ def autovivifying_hash end def partner_params - params.require(:partner).permit(:name, :email, :send_reminders, :quota, :notes, documents: []) + params.require(:partner).permit(:name, :email, :send_reminders, :quota, :notes, :partner_group_id, documents: []) end helper_method \ diff --git a/app/views/layouts/_lte_sidebar.html.erb b/app/views/layouts/_lte_sidebar.html.erb index f2598e2e96..5d4f6e5f46 100644 --- a/app/views/layouts/_lte_sidebar.html.erb +++ b/app/views/layouts/_lte_sidebar.html.erb @@ -88,12 +88,6 @@

    Partner Agencies

    <% end %>
    • -
  • - <%= link_to(partner_groups_path, class: "nav-link #{"active" if current_page?(partner_groups_path)}") do %> - -

    Partner Groups

    - <% end %> -
  • diff --git a/app/views/partners/_form.html.erb b/app/views/partners/_form.html.erb index 714928ecba..5f8fab670a 100644 --- a/app/views/partners/_form.html.erb +++ b/app/views/partners/_form.html.erb @@ -8,15 +8,20 @@
    -
    +
    <%= f.input :name, label: "Name", wrapper: :input_group do %> <%= f.input_field :name, class: "form-control" %> <% end %> <%= f.input :email, label: "E-mail", wrapper: :input_group do %> - <%= f.input_field :email, class: "form-control" %> + <%= f.input_field :email, class: "form-control"%> <% end %> +
    + <%= f.input :partner_group_id, label: "Group", wrapper: :input_group do %> + <%= f.input_field :partner_group_id, collection: @partner_groups, class: "form-control", include_blank: "None" %> + <% end %> +
    <%= f.input :send_reminders, label: "Send Reminders?", wrapper: :input_group do %> <%= f.check_box :send_reminders, {class: "input-group-text", id: "send_reminders"}, "true", "false" %> <% end %> diff --git a/app/views/partners/_partner_groups_table.html.erb b/app/views/partners/_partner_groups_table.html.erb new file mode 100644 index 0000000000..95676accf8 --- /dev/null +++ b/app/views/partners/_partner_groups_table.html.erb @@ -0,0 +1,46 @@ +
    +
    +
    + +
    + +
    + <%= new_button_to new_partner_group_path(organization_id: current_organization), {text: "New Partner Group"} %> +
    + +
    +
    + + + + + + + + + + + <% @partner_groups.each do |pg| %> + + + + + + <% end %> + +
    Group NameMembersActions
    <%= pg.name %> +
      + <% pg.partners.each do |partner| %> +
    • <%= partner.name %>
      • + <% end %> +
    +     		+ <%= view_button_to partner_group_path(pg) %> + <%= edit_button_to edit_partner_group_path(pg) %> +
    +
    +
    +
    +
    +
    +
    diff --git a/app/views/partners/_partner_row.html.erb b/app/views/partners/_partner_row.html.erb index 586cd3849d..9a77516160 100644 --- a/app/views/partners/_partner_row.html.erb +++ b/app/views/partners/_partner_row.html.erb @@ -1,7 +1,8 @@ <% status = partner_row.status%> - <%= link_to partner_row.name, partner_path(partner_row) %> + <%= link_to partner_row.name, partner_path(partner_row) %> <%= link_to partner_row.email, "mailto:#{partner_row.email}" %> + <%= partner_row.partner_group&.name %> <%= partner_row.quota %> <% case status %> diff --git a/app/views/partners/_partners_table.html.erb b/app/views/partners/_partners_table.html.erb new file mode 100644 index 0000000000..1b6df81644 --- /dev/null +++ b/app/views/partners/_partners_table.html.erb @@ -0,0 +1,47 @@ +
    +
    +
    +
    +

    Partner Filters

    +
    +
    +
    + <%= render partial: "statuses", object: @unfiltered_partners_for_statuses, as: :partners %> +
    +
    +
    + <%= modal_button_to("#csvImportModal", {text: "Import Partners", icon: "upload", size: "md"}) %> + <%= download_button_to(partners_path(format: :csv, filters: filter_params.merge(date_range: date_range_params)), {text: "Export Partner Agencies", size: "md"}) if @partners.any? %> + <%= new_button_to new_partner_path(organization_id: current_organization), {text: "New Partner Agency"} %> +
    +
    +
    +
    + +
    +
    + +
    +
    + + + + + + + + + + + + + + <%= render partial: "partner_row", collection: partners %> + +
    PartnerE-mailGroupQuotaStatusAction 
    +
    +
    +
    +
    +
    +
    diff --git a/app/views/partners/index.html.erb b/app/views/partners/index.html.erb index 5c8bef284e..e4f7a20fec 100644 --- a/app/views/partners/index.html.erb +++ b/app/views/partners/index.html.erb @@ -24,56 +24,32 @@
    -
    -
    -
    -

    Partner Filters

    +
    + +
    +
    +
    +
    -
    - <%= render partial: "statuses", object: @unfiltered_partners_for_statuses, as: :partners %> -
    -
    -
    - <%= modal_button_to("#csvImportModal", {text: "Import Partners", icon: "upload", size: "md"}) %> - <%= download_button_to(partners_path(format: :csv, filters: filter_params.merge(date_range: date_range_params)), {text: "Export Partner Agencies", size: "md"}) if @partners.any? %> - <%= new_button_to new_partner_path(organization_id: current_organization), {text: "New Partner Agency"} %> -
    +
    + <%= render partial: 'partners_table', locals: { partners: @partners } %> + <%= render partial: 'partner_groups_table' %>
    - -
    -
    - -
    - -
    -
    -
    - -
    -
    - - - - - - - - - - - - - <%= render partial: "partner_row", collection: @partners %> - -
    PartnerE-mailQuotaStatusAction 
    -
    -
    + <%= render( layout: "shared/csv_import_modal", locals: { diff --git a/db/schema.rb b/db/schema.rb index 63f2256300..c56b6423ac 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -160,8 +160,8 @@ t.integer "organization_id" t.datetime "issued_at" t.string "agency_rep" - t.boolean "reminder_email_enabled", default: false, null: false t.integer "state", default: 5, null: false + t.boolean "reminder_email_enabled", default: false, null: false t.integer "delivery_method", default: 0, null: false t.index ["organization_id"], name: "index_distributions_on_organization_id" t.index ["partner_id"], name: "index_distributions_on_partner_id" @@ -431,7 +431,7 @@ t.index ["invitation_token"], name: "index_users_on_invitation_token", unique: true t.index ["invitations_count"], name: "index_users_on_invitations_count" t.index ["invited_by_id"], name: "index_users_on_invited_by_id" - t.index ["invited_by_type", "invited_by_id"], name: "index_users_on_invited_by" + t.index ["invited_by_type", "invited_by_id"], name: "index_users_on_invited_by_type_and_invited_by_id" t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true end From c5929dbef29460d8b172b4686ab6626a9b723556 Mon Sep 17 00:00:00 2001 From: Edwin Date: Fri, 13 Aug 2021 05:27:18 -0500 Subject: [PATCH 10/21] Get the tabs to render properly based on URL --- app/assets/javascripts/application.js | 16 ++++++++++++++++ app/controllers/partner_groups_controller.rb | 3 ++- .../partners/_partner_groups_table.html.erb | 2 +- app/views/partners/_partners_table.html.erb | 2 +- app/views/partners/index.html.erb | 10 ++++++---- 5 files changed, 26 insertions(+), 7 deletions(-) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 735cda2321..26a6973e55 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -124,3 +124,19 @@ function load_quagga() { }; $(document).on('turbolinks:load', load_quagga); +/** + * Handle loading on specified tab in the URL parameter. In case we would like + * to direct a user to a specific tab on a page rather than the default. + */ +$(document).ready(function () { + var hash = location.hash.replace(/^#/, ''); // ^ means starting, meaning only match the first hash + if (hash) { + $('.nav-tabs a[href="#' + hash + '"]').tab('show'); + + } + + // Change hash for page-reload + $('.nav-tabs a').on('shown.bs.tab', function (e) { + window.location.hash = e.target.hash; + }) +}) diff --git a/app/controllers/partner_groups_controller.rb b/app/controllers/partner_groups_controller.rb index a11ad8f880..eebda2bf3f 100644 --- a/app/controllers/partner_groups_controller.rb +++ b/app/controllers/partner_groups_controller.rb @@ -25,7 +25,8 @@ def new def create @partner_group = current_organization.partner_groups.new(partner_group_params) if @partner_group.save - redirect_to partner_groups_path, notice: "Partner group added!" + # Redirect to groups tab in Partner page. + redirect_to partners_path + "#nav-partner-groups", notice: "Partner group added!" else flash[:error] = "Something didn't work quite right -- try again?" render action: :new diff --git a/app/views/partners/_partner_groups_table.html.erb b/app/views/partners/_partner_groups_table.html.erb index 95676accf8..9311c6cbbf 100644 --- a/app/views/partners/_partner_groups_table.html.erb +++ b/app/views/partners/_partner_groups_table.html.erb @@ -1,4 +1,4 @@ -
    +
    +
    +
    +

    Settings

    +
    +
    +
    +
    +
    +

    Partner Group:

    +
    + +
    +
    + +

    Requestable Item Categories:

    +

    You can change this through their partner group.

    + + <% if @partner.item_categories.present? %> +
      + <% @partner.item_categories.each do |ic| %> +
    • + <%= ic.name %> +
      • + <% end %> +
    + <% elsif @partner.partner_group.present? %> + No Items Requestable + <% else %> + All Items Requestable + <% end %> +
    +
    +
    +
    +

    Notes

    diff --git a/config/routes.rb b/config/routes.rb index bc9c889148..82c859f346 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -164,10 +164,7 @@ def set_up_flipper end end - resources :partner_groups do - resources :memberships, controller: :partner_group_memberships, only: %i(create destroy) - resources :items, controller: :partner_group_items, only: %i(create destroy) - end + resources :partner_groups, only: [:new, :create, :edit, :update] resources :diaper_drives resources :donations do From 462b727628433df0abc095d69babe20da2a72858 Mon Sep 17 00:00:00 2001 From: Edwin Date: Wed, 18 Aug 2021 17:47:24 -0500 Subject: [PATCH 13/21] Add basic CRUD for partner group system specs --- spec/system/partner_group_system_spec.rb | 59 ++++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 spec/system/partner_group_system_spec.rb diff --git a/spec/system/partner_group_system_spec.rb b/spec/system/partner_group_system_spec.rb new file mode 100644 index 0000000000..f471ecc94b --- /dev/null +++ b/spec/system/partner_group_system_spec.rb @@ -0,0 +1,59 @@ +RSpec.describe "Partner Group management", type: :system, js: true do + before do + sign_in(@user) + end + let!(:url_prefix) { "/#{@organization.to_param}" } + let!(:item_category_1) { create(:item_category, organization: @organization) } + let!(:item_category_2) { create(:item_category, organization: @organization) } + let!(:items_in_category_1) { create_list(:item, 3, item_category_id: item_category_1.id) } + let!(:items_in_category_2) { create_list(:item, 3, item_category_id: item_category_2.id) } + + + describe 'creating a new partner group' do + it 'should allow creating a new partner group with item categories' do + visit url_prefix + "/partners" + + click_on 'Groups' + click_on 'New Partner Group' + fill_in 'Name *', with: 'Test Group' + + # Click on the second item category + find("input#partner_group_item_category_ids_#{item_category_2.id}").click + + find_button('Add Partner Group').click + + assert page.has_content? 'Group Name' + assert page.has_content? 'Test Group' + assert page.has_content? item_category_2.name + end + end + + describe 'editing a existing partner group' do + let!(:existing_partner_group) { create(:partner_group) } + before do + existing_partner_group.item_categories << item_category_1 + end + + it 'should allow updating the partner name' do + visit url_prefix + "/partners" + + click_on 'Groups' + assert page.has_content? existing_partner_group.name + assert page.has_content? item_category_1.name + + click_on 'Edit' + fill_in 'Name *', with: 'New Group Name' + + # Unset the existing category + find("input#partner_group_item_category_ids_#{item_category_1.id}").click + # Set a new one on the category + find("input#partner_group_item_category_ids_#{item_category_2.id}").click + + find_button('Update Partner Group').click + + assert page.has_content? 'New Group Name' + refute page.has_content? item_category_1.name + assert page.has_content? item_category_2.name + end + end +end From 0f1194d21751b84bc5331f74d0f6ecf75d118c6d Mon Sep 17 00:00:00 2001 From: Edwin Date: Thu, 19 Aug 2021 07:18:44 -0500 Subject: [PATCH 14/21] Add partner association to group spec --- spec/system/partner_group_system_spec.rb | 59 ----------- spec/system/partner_system_spec.rb | 122 +++++++++++++++++++++++ 2 files changed, 122 insertions(+), 59 deletions(-) delete mode 100644 spec/system/partner_group_system_spec.rb diff --git a/spec/system/partner_group_system_spec.rb b/spec/system/partner_group_system_spec.rb deleted file mode 100644 index f471ecc94b..0000000000 --- a/spec/system/partner_group_system_spec.rb +++ /dev/null @@ -1,59 +0,0 @@ -RSpec.describe "Partner Group management", type: :system, js: true do - before do - sign_in(@user) - end - let!(:url_prefix) { "/#{@organization.to_param}" } - let!(:item_category_1) { create(:item_category, organization: @organization) } - let!(:item_category_2) { create(:item_category, organization: @organization) } - let!(:items_in_category_1) { create_list(:item, 3, item_category_id: item_category_1.id) } - let!(:items_in_category_2) { create_list(:item, 3, item_category_id: item_category_2.id) } - - - describe 'creating a new partner group' do - it 'should allow creating a new partner group with item categories' do - visit url_prefix + "/partners" - - click_on 'Groups' - click_on 'New Partner Group' - fill_in 'Name *', with: 'Test Group' - - # Click on the second item category - find("input#partner_group_item_category_ids_#{item_category_2.id}").click - - find_button('Add Partner Group').click - - assert page.has_content? 'Group Name' - assert page.has_content? 'Test Group' - assert page.has_content? item_category_2.name - end - end - - describe 'editing a existing partner group' do - let!(:existing_partner_group) { create(:partner_group) } - before do - existing_partner_group.item_categories << item_category_1 - end - - it 'should allow updating the partner name' do - visit url_prefix + "/partners" - - click_on 'Groups' - assert page.has_content? existing_partner_group.name - assert page.has_content? item_category_1.name - - click_on 'Edit' - fill_in 'Name *', with: 'New Group Name' - - # Unset the existing category - find("input#partner_group_item_category_ids_#{item_category_1.id}").click - # Set a new one on the category - find("input#partner_group_item_category_ids_#{item_category_2.id}").click - - find_button('Update Partner Group').click - - assert page.has_content? 'New Group Name' - refute page.has_content? item_category_1.name - assert page.has_content? item_category_2.name - end - end -end diff --git a/spec/system/partner_system_spec.rb b/spec/system/partner_system_spec.rb index 29f895681f..1ecf263586 100644 --- a/spec/system/partner_system_spec.rb +++ b/spec/system/partner_system_spec.rb @@ -376,6 +376,128 @@ end end end + + describe 'changing partner group association' do + before do + sign_in(@user) + visit url_prefix + "/partners/#{@partner.id}" + end + let!(:existing_partner_group) { create(:partner_group) } + + context 'when the partner has no partner group' do + before do + expect(@partner.partner_group).to be_nil + end + + it 'it should say they can request every item' do + assert page.has_content? 'All Items Requestable' + assert page.has_content? 'Settings' + expect(PartnerFetchRequestableItemsService.new(partner_id: @partner.id).call).to eq(@organization.items.active.visible) + end + end + + context 'when a partner is assigned to partner group' do + before do + assert page.has_content? 'All Items Requestable' + expect(PartnerFetchRequestableItemsService.new(partner_id: @partner.id).call).to eq(@organization.items.active.visible) + end + + context 'that has requestable item categories' do + let!(:item_category) do + ic = create(:item_category, organization: @organization) + existing_partner_group.item_categories << ic + ic + end + let!(:items_in_category) { create_list(:item, 3, item_category_id: item_category.id) } + + before do + click_on 'Edit' + select existing_partner_group.name + click_on 'Update Partner' + end + + it 'should properly indicate the requestable items and adjust the partners requestable items' do + assert page.has_content? item_category.name + expect(PartnerFetchRequestableItemsService.new(partner_id: @partner.id).call).to eq(items_in_category) + end + end + + context 'that has no requestable item categories' do + before do + expect(existing_partner_group.item_categories).to be_empty + click_on 'Edit' + select existing_partner_group.name + click_on 'Update Partner' + end + + it 'should properly indicate the requestable items and adjust the partners requestable items' do + assert page.has_content? 'No Items Requestable' + expect(PartnerFetchRequestableItemsService.new(partner_id: @partner.id).call).to eq([]) + end + end + end + end + + describe "partner group management", type: :system, js: true do + before do + sign_in(@user) + end + + let!(:url_prefix) { "/#{@organization.to_param}" } + let!(:item_category_1) { create(:item_category, organization: @organization) } + let!(:item_category_2) { create(:item_category, organization: @organization) } + let!(:items_in_category_1) { create_list(:item, 3, item_category_id: item_category_1.id) } + let!(:items_in_category_2) { create_list(:item, 3, item_category_id: item_category_2.id) } + + describe 'creating a new partner group' do + it 'should allow creating a new partner group with item categories' do + visit url_prefix + "/partners" + + click_on 'Groups' + click_on 'New Partner Group' + fill_in 'Name *', with: 'Test Group' + + # Click on the second item category + find("input#partner_group_item_category_ids_#{item_category_2.id}").click + + find_button('Add Partner Group').click + + assert page.has_content? 'Group Name' + assert page.has_content? 'Test Group' + assert page.has_content? item_category_2.name + end + end + + describe 'editing a existing partner group' do + let!(:existing_partner_group) { create(:partner_group) } + before do + existing_partner_group.item_categories << item_category_1 + end + + it 'should allow updating the partner name' do + visit url_prefix + "/partners" + + click_on 'Groups' + assert page.has_content? existing_partner_group.name + assert page.has_content? item_category_1.name + + click_on 'Edit' + fill_in 'Name *', with: 'New Group Name' + + # Unset the existing category + find("input#partner_group_item_category_ids_#{item_category_1.id}").click + # Set a new one on the category + find("input#partner_group_item_category_ids_#{item_category_2.id}").click + + find_button('Update Partner Group').click + + assert page.has_content? 'New Group Name' + refute page.has_content? item_category_1.name + assert page.has_content? item_category_2.name + end + end + end + end def visit_approval_page(table_row) From 200da94002cb7b6ae0cfb72b9cee3e6d82efd774 Mon Sep 17 00:00:00 2001 From: Edwin Date: Sun, 22 Aug 2021 10:00:39 -0500 Subject: [PATCH 15/21] Remove unused code --- .../api/v1/partner_requests_controller.rb | 43 ------------------- .../partner_group_items_controller.rb | 18 -------- .../partner_group_memberships_controller.rb | 18 -------- app/models/partner_group_item.rb | 14 ------ app/models/partner_group_membership.rb | 30 ------------- spec/factories/partner_group_memberships.rb | 17 -------- spec/models/partner_group_membership_spec.rb | 36 ---------------- 7 files changed, 176 deletions(-) delete mode 100644 app/controllers/api/v1/partner_requests_controller.rb delete mode 100644 app/controllers/partner_group_items_controller.rb delete mode 100644 app/controllers/partner_group_memberships_controller.rb delete mode 100644 app/models/partner_group_item.rb delete mode 100644 app/models/partner_group_membership.rb delete mode 100644 spec/factories/partner_group_memberships.rb delete mode 100644 spec/models/partner_group_membership_spec.rb diff --git a/app/controllers/api/v1/partner_requests_controller.rb b/app/controllers/api/v1/partner_requests_controller.rb deleted file mode 100644 index 728c9f06a6..0000000000 --- a/app/controllers/api/v1/partner_requests_controller.rb +++ /dev/null @@ -1,43 +0,0 @@ -# Creates the primary channel through which Partners submit requests, which occurs via the API -class API::V1::PartnerRequestsController < ApplicationController - skip_before_action :verify_authenticity_token - skip_before_action :authenticate_user! - skip_before_action :authorize_user - respond_to :json - - def create - return head :forbidden unless api_key_valid? - - request = Request.new(request_params) - - if request.save - NotifyPartnerJob.perform_now(request.id) - - render json: request, status: :created - else - render json: request.errors, status: :bad_request - end - end - - def show - return head :forbidden unless api_key_valid? - - items = PartnerRequestableItemsService.new(organization_id: params[:id], partner_id: params[:partner_id]).call - render json: items, status: :ok - rescue ActiveRecord::RecordNotFound => e - render json: { error: e.message }, status: :bad_request - end - - private - - def api_key_valid? - return true if Rails.env.development? - - request.headers["X-Api-Key"] == ENV["PARTNER_KEY"] - end - - def request_params - params.require(:request).permit(:organization_id, :partner_id, :comments, - request_items: [:item_id, :quantity]) - end -end diff --git a/app/controllers/partner_group_items_controller.rb b/app/controllers/partner_group_items_controller.rb deleted file mode 100644 index 3af0ec2b86..0000000000 --- a/app/controllers/partner_group_items_controller.rb +++ /dev/null @@ -1,18 +0,0 @@ -class PartnerGroupItemsController < ApplicationController - def create - @partner_group = current_organization.partner_groups.find(params[:partner_group_id]) - @item = current_organization.items.find(params[:item_id]) - if @partner_group.partner_group_items.create(item: @item) - redirect_to partner_group_path(@partner_group), notice: "Item #{@item.name} added to group!" - else - flash[:error] = "Something didn't work quite right -- try again?" - redirect_to partner_group_path(@partner_group) - end - end - - def destroy - @partner_group = current_organization.partner_groups.find(params[:partner_group_id]) - @partner_group.partner_group_items.find(params[:id]).destroy - redirect_to partner_group_path(@partner_group) - end -end diff --git a/app/controllers/partner_group_memberships_controller.rb b/app/controllers/partner_group_memberships_controller.rb deleted file mode 100644 index 10d3feadf5..0000000000 --- a/app/controllers/partner_group_memberships_controller.rb +++ /dev/null @@ -1,18 +0,0 @@ -class PartnerGroupMembershipsController < ApplicationController - def create - @partner_group = current_organization.partner_groups.find(params[:partner_group_id]) - @partner = current_organization.partners.find(params[:partner_id]) - if @partner_group.partner_group_memberships.create(partner: @partner) - redirect_to partner_group_path(@partner_group), notice: "Partner #{@partner.name} added to group!" - else - flash[:error] = "Something didn't work quite right -- try again?" - redirect_to partner_group_path(@partner_group) - end - end - - def destroy - @partner_group = current_organization.partner_groups.find(params[:partner_group_id]) - @partner_group.partner_group_memberships.find(params[:id]).destroy - redirect_to partner_group_path(@partner_group) - end -end diff --git a/app/models/partner_group_item.rb b/app/models/partner_group_item.rb deleted file mode 100644 index 994779525f..0000000000 --- a/app/models/partner_group_item.rb +++ /dev/null @@ -1,14 +0,0 @@ -# == Schema Information -# -# Table name: partner_group_items -# -# id :bigint not null, primary key -# created_at :datetime not null -# updated_at :datetime not null -# item_id :bigint not null -# partner_group_id :bigint not null -# -class PartnerGroupItem < ApplicationRecord - belongs_to :partner_group - belongs_to :item -end diff --git a/app/models/partner_group_membership.rb b/app/models/partner_group_membership.rb deleted file mode 100644 index da4b802535..0000000000 --- a/app/models/partner_group_membership.rb +++ /dev/null @@ -1,30 +0,0 @@ -# == Schema Information -# -# Table name: partner_group_memberships -# -# id :bigint not null, primary key -# created_at :datetime not null -# updated_at :datetime not null -# partner_group_id :bigint -# partner_id :bigint -# -class PartnerGroupMembership < ApplicationRecord - belongs_to :partner_group - belongs_to :partner - has_one :organization, through: :partner_group - - validates :partner_group, presence: true - validates :partner, presence: true, uniqueness: { scope: :partner_group } - - validate :partner_belongs_to_partner_group_organization - - private - - def partner_belongs_to_partner_group_organization - return if organization.nil? - - unless organization == partner.organization - errors.add :partner, "partner must belong to same organization as partner_group" - end - end -end diff --git a/spec/factories/partner_group_memberships.rb b/spec/factories/partner_group_memberships.rb deleted file mode 100644 index 028a68b72d..0000000000 --- a/spec/factories/partner_group_memberships.rb +++ /dev/null @@ -1,17 +0,0 @@ -# == Schema Information -# -# Table name: partner_group_memberships -# -# id :bigint not null, primary key -# created_at :datetime not null -# updated_at :datetime not null -# partner_group_id :bigint -# partner_id :bigint -# - -FactoryBot.define do - factory :partner_group_membership do - partner_group - partner - end -end diff --git a/spec/models/partner_group_membership_spec.rb b/spec/models/partner_group_membership_spec.rb deleted file mode 100644 index bc53474833..0000000000 --- a/spec/models/partner_group_membership_spec.rb +++ /dev/null @@ -1,36 +0,0 @@ -# == Schema Information -# -# Table name: partner_group_memberships -# -# id :bigint not null, primary key -# created_at :datetime not null -# updated_at :datetime not null -# partner_group_id :bigint -# partner_id :bigint -# -RSpec.describe PartnerGroupMembership, type: :model do - context "Validations >" do - it "must belong to a partner_group" do - expect(build(:partner_group_membership, partner_group_id: nil)).not_to be_valid - end - - it "must belong to a partner" do - expect(build(:partner_group_membership, partner_id: nil)).not_to be_valid - end - - it "a partner can only be a member of a partner_group once" do - membership = create(:partner_group_membership) - expect(build(:partner_group_membership, - partner_group: membership.partner_group, - partner: membership.partner)).not_to be_valid - end - - it "a partner must belong to the same organization as the partner_group" do - partner_group = create(:partner_group, organization: create(:organization)) - partner = create(:partner, organization: create(:organization)) - expect(build(:partner_group_membership, - partner_group: partner_group, - partner: partner)).not_to be_valid - end - end -end From 7726fff0887d92f52737f27104c81a399e4e4b68 Mon Sep 17 00:00:00 2001 From: Edwin Date: Sun, 22 Aug 2021 10:34:23 -0500 Subject: [PATCH 16/21] Fix broken specs --- .../partners/requests_controller.rb | 2 +- spec/system/partner_system_spec.rb | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/app/controllers/partners/requests_controller.rb b/app/controllers/partners/requests_controller.rb index 483c660595..5069ac05aa 100644 --- a/app/controllers/partners/requests_controller.rb +++ b/app/controllers/partners/requests_controller.rb @@ -35,7 +35,7 @@ def create else @partner_request = create_service.partner_request @errors = create_service.errors - @requestable_items = Organization.find(current_partner.diaper_bank_id).valid_items.map do |item| + @formatted_requestable_items = Organization.find(current_partner.diaper_bank_id).valid_items.map do |item| [item[:name], item[:id]] end.sort diff --git a/spec/system/partner_system_spec.rb b/spec/system/partner_system_spec.rb index 1ecf263586..c18e0d32cf 100644 --- a/spec/system/partner_system_spec.rb +++ b/spec/system/partner_system_spec.rb @@ -182,7 +182,8 @@ visit url_prefix + "/partners" - within("table > tbody > tr:nth-child(4) > td:nth-child(5)") { click_on "Invite" } + ele = find('tr', text: partner.name) + within(ele) { click_on "Invite" } invite_alert = page.driver.browser.switch_to.alert expect(invite_alert.text).to eq("Send an invitation to #{partner.name} to begin using the partner application?") @@ -191,9 +192,9 @@ end it "shows invite button only for unapproved partners" do - expect(page.find(:xpath, "//table/tbody/tr[1]/td[5]")).to have_no_content('Invite') - expect(page.find(:xpath, "//table/tbody/tr[2]/td[5]")).to have_content('Invite') - expect(page.find(:xpath, "//table/tbody/tr[3]/td[5]")).to have_no_content('Invite') + expect(page.find('tr', text: 'Abc')).to have_content('Invited') + expect(page.find('tr', text: 'Bcd')).to have_content('Invite') + expect(page.find('tr', text: 'Cde')).to have_no_content('Invite') end context "when filtering" do @@ -353,7 +354,7 @@ let!(:awaiting_review_partner) { create(:partner, name: "Beau Brummel", status: :awaiting_review) } context "when partner has :invited status" do - before { visit_approval_page(1) } + before { visit_approval_page(partner_name: invited_partner.name) } it { expect(page).to have_selector(:link_or_button, 'Approve Partner') } it { expect(page).to have_selector('span#pending-approval-request-tooltip > a.btn.btn-success.btn-md.disabled') } @@ -365,7 +366,7 @@ end context "when partner has :awaiting_review status" do - before { visit_approval_page(2) } + before { visit_approval_page(partner_name: awaiting_review_partner.name) } it { expect(page).to have_selector(:link_or_button, 'Approve Partner') } it { expect(page).not_to have_selector('span#pending-approval-request-tooltip > a.btn.btn-success.btn-md.disabled') } @@ -500,7 +501,8 @@ end -def visit_approval_page(table_row) +def visit_approval_page(partner_name:) visit url_prefix + "/partners" - within("table > tbody > tr:nth-child(#{table_row}) > td:nth-child(5)") { click_on "Review Application" } + ele = find('tr', text: partner_name) + within(ele) { click_on "Review Application" } end From e12f0ef3b4a796ee80c1729c606b22d6c6734601 Mon Sep 17 00:00:00 2001 From: Edwin Date: Sun, 22 Aug 2021 16:23:29 -0500 Subject: [PATCH 17/21] Fix rubocop complaints --- .rubocop.yml | 4 ++++ app/models/item_category.rb | 2 +- app/models/partner_group.rb | 2 +- app/services/partner_fetch_requestable_items_service.rb | 1 - 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 359646ed00..7ca9d71a54 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -11,6 +11,7 @@ AllCops: Exclude: - "vendor/**/*" - "db/schema.rb" + - "db/partners_schema.rb" - "db/seeds.rb" - "db/migrate/*" - "bin/*" @@ -440,5 +441,8 @@ Rails/WhereExists: Enabled: false Rails/WhereNot: Enabled: false +Rails/HasAndBelongsToMany: + Enabled: false Lint/EnsureReturn: # The service objects return self in an ensure block. Not using an explicit return does not do correct behavior Enabled: false + diff --git a/app/models/item_category.rb b/app/models/item_category.rb index 1936b8695a..10594bcdc6 100644 --- a/app/models/item_category.rb +++ b/app/models/item_category.rb @@ -16,5 +16,5 @@ class ItemCategory < ApplicationRecord belongs_to :organization has_many :items, -> { order(name: :asc) }, inverse_of: :item_category - has_and_belongs_to_many :partner_groups + has_many :partner_groups, dependent: :nullify end diff --git a/app/models/partner_group.rb b/app/models/partner_group.rb index 50d748fad3..a03e98421b 100644 --- a/app/models/partner_group.rb +++ b/app/models/partner_group.rb @@ -10,7 +10,7 @@ # class PartnerGroup < ApplicationRecord belongs_to :organization - has_many :partners + has_many :partners, dependent: :nullify has_and_belongs_to_many :item_categories validates :organization, presence: true diff --git a/app/services/partner_fetch_requestable_items_service.rb b/app/services/partner_fetch_requestable_items_service.rb index b1fbf7bdb3..553af625ef 100644 --- a/app/services/partner_fetch_requestable_items_service.rb +++ b/app/services/partner_fetch_requestable_items_service.rb @@ -1,5 +1,4 @@ class PartnerFetchRequestableItemsService - def initialize(partner_id:) @partner_id = partner_id end From a582437c51cb50f616a7545dc70c39487108d2ca Mon Sep 17 00:00:00 2001 From: Edwin Date: Wed, 25 Aug 2021 17:46:21 -0500 Subject: [PATCH 18/21] Fix rubocop errors --- spec/services/partner_fetch_requestable_items_service_spec.rb | 3 --- spec/system/partner_system_spec.rb | 1 - 2 files changed, 4 deletions(-) diff --git a/spec/services/partner_fetch_requestable_items_service_spec.rb b/spec/services/partner_fetch_requestable_items_service_spec.rb index 3fd7e2a16e..a479fa7ebf 100644 --- a/spec/services/partner_fetch_requestable_items_service_spec.rb +++ b/spec/services/partner_fetch_requestable_items_service_spec.rb @@ -1,7 +1,6 @@ require 'rails_helper' describe PartnerFetchRequestableItemsService do - describe '#call' do subject { described_class.new(partner_id: partner_id).call } let(:partner_id) { partner.id } @@ -38,6 +37,4 @@ end end end - - end diff --git a/spec/system/partner_system_spec.rb b/spec/system/partner_system_spec.rb index c18e0d32cf..ca2db0a43a 100644 --- a/spec/system/partner_system_spec.rb +++ b/spec/system/partner_system_spec.rb @@ -498,7 +498,6 @@ end end end - end def visit_approval_page(partner_name:) From 4dec95f76728e57a2370805581fe2b313b0d036e Mon Sep 17 00:00:00 2001 From: Edwin Date: Wed, 25 Aug 2021 17:55:47 -0500 Subject: [PATCH 19/21] Fix broken spec --- spec/system/partner_system_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/system/partner_system_spec.rb b/spec/system/partner_system_spec.rb index ca2db0a43a..3e68929bbb 100644 --- a/spec/system/partner_system_spec.rb +++ b/spec/system/partner_system_spec.rb @@ -470,7 +470,7 @@ end describe 'editing a existing partner group' do - let!(:existing_partner_group) { create(:partner_group) } + let!(:existing_partner_group) { create(:partner_group, organization: @organization) } before do existing_partner_group.item_categories << item_category_1 end From 5a73dbd9d7e617291918f65e613440ad08f87305 Mon Sep 17 00:00:00 2001 From: Edwin Date: Sat, 28 Aug 2021 17:54:05 -0500 Subject: [PATCH 20/21] Update --- app/assets/javascripts/application.js | 1 - 1 file changed, 1 deletion(-) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 26a6973e55..7aac6486af 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -132,7 +132,6 @@ $(document).ready(function () { var hash = location.hash.replace(/^#/, ''); // ^ means starting, meaning only match the first hash if (hash) { $('.nav-tabs a[href="#' + hash + '"]').tab('show'); - } // Change hash for page-reload From 88566c8d31baf87694b0ccddeb153665941a5e66 Mon Sep 17 00:00:00 2001 From: Edwin Date: Sun, 19 Sep 2021 06:01:36 -0500 Subject: [PATCH 21/21] Update items association on partners to indicate purpose --- app/models/partner.rb | 2 +- app/services/partner_fetch_requestable_items_service.rb | 2 +- spec/models/partner_spec.rb | 2 +- spec/services/partner_fetch_requestable_items_service_spec.rb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/models/partner.rb b/app/models/partner.rb index 546e43563b..b854390b12 100644 --- a/app/models/partner.rb +++ b/app/models/partner.rb @@ -29,7 +29,7 @@ class Partner < ApplicationRecord belongs_to :organization belongs_to :partner_group, optional: true has_many :item_categories, through: :partner_group - has_many :items, through: :item_categories + has_many :requestable_items, through: :item_categories, source: :items has_many :distributions, dependent: :destroy has_many :requests, dependent: :destroy diff --git a/app/services/partner_fetch_requestable_items_service.rb b/app/services/partner_fetch_requestable_items_service.rb index 553af625ef..8d76403d5b 100644 --- a/app/services/partner_fetch_requestable_items_service.rb +++ b/app/services/partner_fetch_requestable_items_service.rb @@ -6,7 +6,7 @@ def initialize(partner_id:) def call return organization.items.active.visible if partner.partner_group.blank? - partner.items.active.visible + partner.requestable_items.active.visible end private diff --git a/spec/models/partner_spec.rb b/spec/models/partner_spec.rb index dd20e4d7e8..c367564948 100644 --- a/spec/models/partner_spec.rb +++ b/spec/models/partner_spec.rb @@ -20,7 +20,7 @@ it { should belong_to(:organization) } it { should belong_to(:partner_group).optional } it { should have_many(:item_categories).through(:partner_group) } - it { should have_many(:items).through(:item_categories) } + it { should have_many(:requestable_items).through(:item_categories).source(:items) } it { should have_many(:requests) } it { should have_many(:distributions) } it { should have_many(:requests) } diff --git a/spec/services/partner_fetch_requestable_items_service_spec.rb b/spec/services/partner_fetch_requestable_items_service_spec.rb index a479fa7ebf..472bab2549 100644 --- a/spec/services/partner_fetch_requestable_items_service_spec.rb +++ b/spec/services/partner_fetch_requestable_items_service_spec.rb @@ -33,7 +33,7 @@ end it 'should return all active and visible items specified by the item associated with' do - expect(subject).to eq(partner.items.active.visible) + expect(subject).to eq(partner.requestable_items.active.visible) end end end