4682 sort partners alphabetical (#4963)

* sorting partners by name + category dropdown disappearing fix

* Update ordering tests

* Remove controller test file and add request test

---------

Co-authored-by: Bella Deanhardt <[email protected]>

Author: tatheerf02

app/controllers/admin/partners_controller.rb

@@ -1,6 +1,6 @@
 class Admin::PartnersController < AdminController
   def index
-    @partners = Partner.all.includes(:organization)
+    @partners = Partner.all.includes(:organization).order("LOWER(name)")
   end
 
   def show

app/controllers/items_controller.rb

@@ -44,7 +44,8 @@ def create
       @base_items = BaseItem.without_kit.alphabetized
       # Define a @item to be used in the `new` action to be rendered with
       # the provided parameters. This is required to render the page again
-      # with the error + the invalid parameters
+      # with the error + the invalid parameters.
+      @item_categories = current_organization.item_categories.order('name ASC') # Load categories here
       @item = current_organization.items.new(item_params)
       flash.now[:error] = result.error.record.errors.full_messages.to_sentence
       render action: :new

spec/requests/admin/partners_requests_spec.rb

@@ -8,35 +8,42 @@
       sign_in(create(:super_admin, organization: nil))
     end
 
-    let(:partner) { create(:partner) }
+    let!(:partner1) { create(:partner, name: "Bravo", organization: organization) }
+    let!(:partner2) { create(:partner, name: "alpha", organization: organization) }
+    let!(:partner3) { create(:partner, name: "Zeus", organization: organization) }
 
     describe "GET #index" do
       it "returns http success" do
         get admin_partners_path
         expect(response).to be_successful
       end
+
+      it "assigns partners ordered by name (case-insensitive)" do
+        get admin_partners_path
+        expect(assigns(:partners)).to eq([partner2, partner1, partner3])
+      end
     end
 
     describe "GET #show" do
       it "returns http success" do
-        get admin_partner_path(id: partner.id)
+        get admin_partner_path(id: partner1.id)
         expect(response).to be_successful
       end
     end
 
     describe "GET #edit" do
       it "returns http success" do
-        get edit_admin_partner_path(id: partner.id)
+        get edit_admin_partner_path(id: partner1.id)
         expect(response).to be_successful
       end
     end
 
     describe "PUT #update" do
       context "successful save" do
-        subject { put admin_partner_path(id: partner.id, partner: { name: "Bar" }) }
+        subject { put admin_partner_path(id: partner1.id, partner: { name: "Bar" }) }
 
         it "updates partner" do
-          expect { subject }.to change { partner.reload.name }.to "Bar"
+          expect { subject }.to change { partner1.reload.name }.to "Bar"
         end
 
         it "redirects" do
@@ -46,7 +53,7 @@
       end
 
       context "unsuccessful save due to empty params" do
-        subject { put admin_partner_path(id: partner.id, partner: { name: "" }) }
+        subject { put admin_partner_path(id: partner1.id, partner: { name: "" }) }
 
         it "renders #edit template with error message" do
           expect(subject).to render_template(:edit)

spec/requests/items_requests_spec.rb

@@ -111,6 +111,7 @@
 
     describe "CREATE #create" do
       let!(:existing_item) { create(:item, organization: organization, name: "Really Good Item") }
+      let!(:item_category) { create(:item_category, organization: organization, name: "Test Category") }
 
       describe "with an already existing item name" do
         let(:item_params) do
@@ -134,6 +135,42 @@
       end
     end
 
+    describe "with invalid parameters" do
+      let(:invalid_item_params) do
+        {
+          item: {
+            name: "",  # Invalid name
+            partner_key: create(:base_item).partner_key,
+            value_in_cents: -100,  # Invalid value
+            package_size: nil,
+            distribution_quantity: nil
+          }
+        }
+      end
+
+      let!(:category1) { FactoryBot.create(:item_category, name: 'Bananas', organization: organization) }
+      let!(:category2) { FactoryBot.create(:item_category, name: 'Apples', organization: organization) }
+      let!(:category3) { FactoryBot.create(:item_category, name: 'Umbrella', organization: organization) }
+
+      let(:item_categories) { [category1, category2, category3] }
+
+      it "loads and displays the item categories when rendering new" do
+        # Attempt to create an item with invalid parameters
+        post items_path, params: invalid_item_params
+
+        # Expect to render the new template
+        expect(response).to render_template(:new)
+
+        # Ensure the item categories are assigned in the controller
+        expect(assigns(:item_categories)).to eq([category2, category1, category3])
+
+        # Verify the categories are included in the response body
+        item_categories.each do |category|
+          expect(response.body).to include("<option value=\"#{category.id}\">#{category.name}</option>")
+        end
+      end
+    end
+
     describe 'GET #index' do
       let(:storage_location) { create(:storage_location, organization: organization) }
       let!(:item) { create(:item, organization: organization, name: "ACTIVEITEM") }