Merge remote-tracking branch 'upstream/main' into 3067-add-indicator-fields-to-partner-export

Sukhpreet-s · Sukhpreet-s · commit f3250ca908d6 · 2024-12-13T02:35:49.000Z
- Kept both changes by fixing errors
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -401,7 +401,7 @@ GEM
       timeout
     net-smtp (0.5.0)
       net-protocol
-    newrelic_rpm (9.13.0)
+    newrelic_rpm (9.16.0)
     nio4r (2.7.3)
     nokogiri (1.16.7-arm64-darwin)
       racc (~> 1.4)
diff --git a/app/controllers/audits_controller.rb b/app/controllers/audits_controller.rb
@@ -10,7 +10,7 @@ def index
   end
 
   def show
-    @items = View::Inventory.items_for_location(@audit.storage_location)
+    @items = View::Inventory.items_for_location(@audit.storage_location, include_omitted: true)
   end
 
   def edit
@@ -93,7 +93,7 @@ def set_storage_locations
   end
 
   def set_items
-    @items = current_organization.items.alphabetized
+    @items = current_organization.items.where(active: true).alphabetized
   end
 
   def save_audit_status_and_redirect(params)
diff --git a/app/controllers/distributions_controller.rb b/app/controllers/distributions_controller.rb
@@ -50,7 +50,7 @@ def index
     @items = current_organization.items.alphabetized.select(:id, :name)
     @item_categories = current_organization.item_categories.select(:id, :name)
     @storage_locations = current_organization.storage_locations.active_locations.alphabetized.select(:id, :name)
-    @partners = Partner.joins(:distributions).where(distributions: @distributions).distinct.order(:name).select(:id, :name)
+    @partners = current_organization.partners.active.alphabetized.select(:id, :name)
     @selected_item = filter_params[:by_item_id].presence
     @distribution_totals = DistributionTotalsService.new(current_organization.distributions, scope_filters)
     @total_value_all_distributions = @distribution_totals.total_value
@@ -117,7 +117,7 @@ def create
       elsif request_id
         @distribution.initialize_request_items
       end
-      @items = current_organization.items.alphabetized
+      @items = current_organization.items.active.alphabetized
       @partner_list = current_organization.partners.where.not(status: 'deactivated').alphabetized
 
       inventory = View::Inventory.new(@distribution.organization_id)
@@ -147,7 +147,7 @@ def new
       @distribution.line_items.build
       @distribution.copy_from_donation(params[:donation_id], params[:storage_location_id])
     end
-    @items = current_organization.items.alphabetized
+    @items = current_organization.items.active.alphabetized
     @partner_list = current_organization.partners.where.not(status: 'deactivated').alphabetized
 
     inventory = View::Inventory.new(current_organization.id)
@@ -173,7 +173,7 @@ def edit
     if (!@distribution.complete? && @distribution.future?) ||
         current_user.has_role?(Role::ORG_ADMIN, current_organization)
       @distribution.line_items.build if @distribution.line_items.size.zero?
-      @items = current_organization.items.alphabetized
+      @items = current_organization.items.active.alphabetized
       @partner_list = current_organization.partners.alphabetized
       @audit_warning = current_organization.audits
         .where(storage_location_id: @distribution.storage_location_id)
@@ -204,7 +204,7 @@ def update
       flash[:error] = insufficient_error_message(result.error.message)
       @distribution.line_items.build if @distribution.line_items.size.zero?
       @distribution.initialize_request_items
-      @items = current_organization.items.alphabetized
+      @items = current_organization.items.active.alphabetized
       @storage_locations = current_organization.storage_locations.active_locations.alphabetized
       render :edit
     end
diff --git a/app/models/item.rb b/app/models/item.rb
@@ -143,7 +143,7 @@ def is_in_kit?(kits = nil)
   end
 
   def can_delete?(inventory = nil, kits = nil)
-    can_deactivate_or_delete?(inventory, kits) && line_items.none? && !barcode_count&.positive? && !in_request?
+    can_deactivate_or_delete?(inventory, kits) && line_items.none? && !barcode_count&.positive? && !in_request? && kit.blank?
   end
 
   # @return [Boolean]
diff --git a/app/models/partner.rb b/app/models/partner.rb
@@ -186,6 +186,7 @@ def self.csv_export_headers
       "Contact Phone",
       "Contact Email",
       "Notes",
+      "Counties Served",
       "Providing Diapers",
       "Providing Period Supplies"
     ]
@@ -205,6 +206,7 @@ def csv_export_attributes
       contact_person[:phone],
       contact_person[:email],
       notes,
+      profile.county_list_by_region,
       providing_diapers,
       providing_period_supplies
     ]
diff --git a/app/models/partners/profile.rb b/app/models/partners/profile.rb
@@ -91,6 +91,7 @@ class Profile < Base
 
     has_many :served_areas, foreign_key: "partner_profile_id", class_name: "Partners::ServedArea", dependent: :destroy, inverse_of: :partner_profile
 
+    has_many :counties, through: :served_areas
     accepts_nested_attributes_for :served_areas, allow_destroy: true
 
     has_many_attached :documents
@@ -125,6 +126,11 @@ def split_pick_up_emails
       pick_up_email.split(/,|\s+/).compact_blank
     end
 
+    def county_list_by_region
+      # provides a county list in case insensitive alpha order, by region, then county name
+      counties.order(%w(lower(region) lower(name))).pluck(:name).join("; ")
+    end
+
     private
 
     def check_social_media
diff --git a/app/views/audits/_form.html.erb b/app/views/audits/_form.html.erb
@@ -14,7 +14,7 @@
               </div>
               <div class="box-body">
                 <%= simple_form_for @audit, data: { controller: "form-input" }, html: {class: "storage-location-required"} do |f| %>
-                  <%= render partial: "storage_locations/source", object: f, locals: { label: "Storage location", error: "What storage location are you auditing?" } %>
+                  <%= render partial: "storage_locations/source", object: f, locals: { label: "Storage location", error: "What storage location are you auditing?", include_omitted_items: true } %>
                   <fieldset style="margin-bottom: 2rem;">
                     <legend>Items in this audit</legend>
                     <div id="audit_line_items" class="line-item-fields" data-capture-barcode="true">
diff --git a/db/seeds.rb b/db/seeds.rb
@@ -739,7 +739,8 @@ def seed_quantity(item_name, organization, storage_location, quantity)
 Flipper::Adapters::ActiveRecord::Feature.find_or_create_by(key: "new_logo")
 Flipper::Adapters::ActiveRecord::Feature.find_or_create_by(key: "read_events")
 Flipper.enable(:read_events)
-
+Flipper::Adapters::ActiveRecord::Feature.find_or_create_by(key: "partner_step_form")
+Flipper.enable(:partner_step_form)
 # ----------------------------------------------------------------------------
 # Account Requests
 # ----------------------------------------------------------------------------
diff --git a/spec/factories/partners.rb b/spec/factories/partners.rb
@@ -40,6 +40,10 @@
       status { :awaiting_review }
     end
 
+    trait :deactivated do
+      status { :deactivated }
+    end
+
     after(:create) do |partner, evaluator|
       next if evaluator.try(:without_profile)
 
diff --git a/spec/models/item_spec.rb b/spec/models/item_spec.rb
@@ -481,4 +481,47 @@
   describe "versioning" do
     it { is_expected.to be_versioned }
   end
+
+  describe "kit items" do
+    context "with kit and regular items" do
+      let(:organization) { create(:organization) }
+      let(:kit) { create(:kit, organization: organization) }
+      let(:kit_item) { create(:item, kit: kit, organization: organization) }
+      let(:regular_item) { create(:item, organization: organization) }
+
+      describe "#can_delete?" do
+        it "returns false for kit items" do
+          expect(kit_item.can_delete?).to be false
+        end
+
+        it "returns true for regular items" do
+          expect(regular_item.can_delete?).to be true
+        end
+      end
+
+      describe "#deactivate!" do
+        it "deactivates both the kit item and its associated kit" do
+          kit_item.deactivate!
+          expect(kit_item.reload.active).to be false
+          expect(kit.reload.active).to be false
+        end
+
+        it "only deactivates regular items" do
+          regular_item.deactivate!
+          expect(regular_item.reload.active).to be false
+        end
+      end
+
+      describe "#validate_destroy" do
+        it "prevents deletion of kit items" do
+          expect { kit_item.destroy! }.to raise_error(ActiveRecord::RecordNotDestroyed)
+          expect(kit_item.errors[:base]).to include("Cannot delete item - it has already been used!")
+        end
+
+        it "allows deletion of regular items" do
+          expect { regular_item.destroy! }.not_to raise_error
+        end
+      end
+    end
+  end
 end
diff --git a/spec/models/partner_spec.rb b/spec/models/partner_spec.rb
@@ -319,7 +319,16 @@
       partner.update(notes: notes)
     end
 
-    it "should has the info in the columns order" do
+    it "should have the expected info in the columns order" do
+      county_1 = create(:county, name: "High County, Maine", region: "Maine")
+      county_2 = create(:county, name: "laRue County, Louisiana", region: "Louisiana")
+      county_3 = create(:county, name: "Ste. Anne County, Louisiana", region: "Louisiana")
+      create(:partners_served_area, partner_profile: partner.profile, county: county_1, client_share: 50)
+      create(:partners_served_area, partner_profile: partner.profile, county: county_2, client_share: 40)
+      create(:partners_served_area, partner_profile: partner.profile, county: county_3, client_share: 10)
+      partner.profile.reload # not sure if this is needed
+      # county ordering is a bit esoteric -- it is human alphabetical by county within region (region is state)
+      correctly_ordered_counties = "laRue County, Louisiana; Ste. Anne County, Louisiana; High County, Maine"
       expect(partner.csv_export_attributes).to eq([
         partner.name,
         partner.email,
@@ -333,6 +342,7 @@
         contact_phone,
         contact_email,
         notes,
+        correctly_ordered_counties,
         providing_diapers,
         providing_period_supplies
       ])
diff --git a/spec/models/partners/profile_spec.rb b/spec/models/partners/profile_spec.rb
@@ -307,6 +307,25 @@
     end
   end
 
+  describe "county_list" do
+    it "provides a county list in human-alpha by county within region order" do
+      county_1 = create(:county, name: "High County, Maine", region: "Maine")
+      county_2 = create(:county, name: "laRue County, Louisiana", region: "Louisiana")
+      county_3 = create(:county, name: "Ste. Anne County, Louisiana", region: "Louisiana")
+      county_4 = create(:county, name: "Other County, Louisiana", region: "Louisiana")
+      profile = create(:partner_profile)
+      profile_2 = create(:partner_profile)
+      create(:partners_served_area, partner_profile: profile, county: county_1, client_share: 50)
+      create(:partners_served_area, partner_profile: profile, county: county_2, client_share: 40)
+      create(:partners_served_area, partner_profile: profile, county: county_3, client_share: 10)
+      create(:partners_served_area, partner_profile: profile_2, county: county_4)
+      profile.reload
+      profile_2.reload
+      ## This is human-alpha by county within region (i.e. state)
+      expect(profile.county_list_by_region).to eq("laRue County, Louisiana; Ste. Anne County, Louisiana; High County, Maine")
+    end
+  end
+
   describe "versioning" do
     it { is_expected.to be_versioned }
   end
diff --git a/spec/requests/audits_requests_spec.rb b/spec/requests/audits_requests_spec.rb
@@ -50,6 +50,21 @@
         get new_audit_path
         expect(response).to be_successful
       end
+
+      it 'only includes active items in the line item select dropdown' do
+        create(:item, name: "TestActiveItem", organization: organization)
+        create(:item, name: "TestInactiveItem", organization: organization, active: false)
+
+        get new_audit_path
+        expect(response).to have_http_status(:ok)
+
+        html = Nokogiri::HTML(response.body)
+        options = html.css('select[name="audit[line_items_attributes][0][item_id]"] option')
+        option_values = options.map { |option| option.text.strip }
+
+        expect(option_values).to include('TestActiveItem')
+        expect(option_values).not_to include('TestInactiveItem')
+      end
     end
 
     describe "GET #edit" do
diff --git a/spec/requests/distributions_requests_spec.rb b/spec/requests/distributions_requests_spec.rb
@@ -104,6 +104,24 @@
         end
       end
 
+      context "with filters" do
+        it "shows all active partners in dropdown filter unrestricted by current filter" do
+          inactive_partner_name = create(:partner, :deactivated, organization:).name
+          active_partner_name = distribution.partner.name
+
+          # Filter by date with no distributions
+          params = { filters: { date_range: "January 1,9999 - January 1,9999"} }
+
+          get distributions_path, params: params
+          page = Nokogiri::HTML(response.body)
+          partner_select = page.at_css("select[name='filters[by_partner]']")
+
+          expect(partner_select).to be_present
+          expect(partner_select.text).to include(active_partner_name)
+          expect(partner_select.text).not_to include(inactive_partner_name)
+        end
+      end
+
       context "when filtering by item id" do
         let!(:item_2) { create(:item, value_in_cents: 100, organization: organization) }
         let(:params) { { filters: { by_item_id: item.id } } }
@@ -215,6 +233,20 @@
         expect(response).to have_error
       end
 
+      it "renders #new on failure with only active items in dropdown" do
+        create(:item, organization: organization, name: 'Active Item')
+        create(:item, :inactive, organization: organization, name: 'Inactive Item')
+
+        post distributions_path(distribution: { comment: nil, partner_id: nil, storage_location_id: nil }, format: :turbo_stream)
+        expect(response).to have_http_status(400)
+
+        page = Nokogiri::HTML(response.body)
+        selectable_items = page.at_css("select.line_item_name").text.split("\n")
+
+        expect(selectable_items).to include("Active Item")
+        expect(selectable_items).not_to include("Inactive Item")
+      end
+
       context "Deactivated partners should not be displayed in partner dropdown" do
         before do
           create(:partner, name: 'Active Partner', organization: organization, status: "approved")
@@ -257,6 +289,18 @@
         expect(page.css('#distribution_storage_location_id option[selected]')).to be_empty
       end
 
+      it "should only show active items in item dropdown" do
+        create(:item, :inactive, organization: organization, name: 'Inactive Item')
+
+        get new_distribution_path(default_params)
+
+        page = Nokogiri::HTML(response.body)
+        selectable_items = page.at_css("select#barcode_item_barcodeable_id").text.split("\n")
+
+        expect(selectable_items).to include("Item 1", "Item 2")
+        expect(selectable_items).not_to include("Inactive Item")
+      end
+
       context "with org default but no partner default" do
         it "selects org default" do
           organization.update!(default_storage_location: storage_location.id)
@@ -554,6 +598,19 @@
         expect(response.body).to include("Active Partner")
       end
 
+      it "should only show active items in item dropdown" do
+        create(:item, organization: organization, name: 'Active Item')
+        create(:item, :inactive, organization: organization, name: 'Inactive Item')
+
+        get edit_distribution_path(id: distribution.id)
+
+        page = Nokogiri::HTML(response.body)
+        selectable_items = page.at_css("select#barcode_item_barcodeable_id").text.split("\n")
+
+        expect(selectable_items).to include("Active Item")
+        expect(selectable_items).not_to include("Inactive Item")
+      end
+
       context 'with units' do
         let!(:request) {
           create(:request,
diff --git a/spec/system/audit_system_spec.rb b/spec/system/audit_system_spec.rb
@@ -68,6 +68,36 @@
           end
         end
 
+        it "allows auditing items that are not in a storage location", :js do
+          item = create(:item, name: "TestItemNotInStorageLocation", organization: organization)
+          audit_quantity = 1234
+          visit new_audit_path
+
+          await_select2("#audit_line_items_attributes_0_item_id") do
+            select storage_location.name, from: "Storage location"
+          end
+          select item.name, from: "audit_line_items_attributes_0_item_id"
+          fill_in "audit_line_items_attributes_0_quantity", with: audit_quantity
+
+          accept_confirm do
+            click_button "Confirm Audit"
+          end
+          expect(page.find(".alert-info")).to have_content "Audit is confirmed"
+          expect(page).to have_content(item.name)
+          expect(page).to have_content(audit_quantity)
+
+          accept_confirm do
+            click_link "Finalize Audit"
+          end
+          expect(page.find(".alert-info")).to have_content "Audit is Finalized"
+
+          event = Event.last
+          expect(event.type).to eq "AuditEvent"
+          event_line_item = Event.last.data.items.first
+          expect(event_line_item.item_id).to eq item.id
+          expect(event_line_item.quantity).to eq audit_quantity
+        end
+
         it "allows user to add items that do not yet have a barcode", :js do
           item_without_barcode = create(:item)
           new_barcode = "00000000"
