Fix intake storage location

Author: coalest

app/controllers/admin/organizations_controller.rb

@@ -69,6 +69,7 @@ def show
     @organization = Organization.find(params[:id])
     @header_link = admin_dashboard_path
     @default_storage_location = StorageLocation.find_by(id: @organization.default_storage_location) if @organization.default_storage_location
+    @intake_storage_location = StorageLocation.find_by(id: @organization.storage_locations) if @organization.intake_location
     @users = @organization.users.with_discarded.includes(:roles, :organization).alphabetized
   end
 

app/controllers/organizations_controller.rb

@@ -7,6 +7,7 @@ def show
     @organization = current_organization
     @header_link = dashboard_path
     @default_storage_location = StorageLocation.find_by(id: @organization.default_storage_location) if @organization.default_storage_location
+    @intake_storage_location = StorageLocation.find_by(id: @organization.intake_location) if @organization.intake_location
     @users = @organization.users.with_discarded.includes(:roles, :organization).alphabetized
   end
 

app/views/organizations/_details.html.erb

@@ -80,7 +80,7 @@
                 <h3 class='font-bold'>Default Intake Location</h3>
                 <p>
                   <%= fa_icon "building" %>
-                  <%= @default_storage_location&.name || "Not defined" %>
+                  <%= @intake_storage_location&.name || "Not defined" %>
                 </p>
               </div>
               <div class="mb-4">

spec/requests/admin/organizations_requests_spec.rb

@@ -166,6 +166,18 @@
         expect(response).to be_successful
       end
 
+      it "displays the correct organization details" do
+        intake_storage_location = create(:storage_location, organization:, name: "Intake Center")
+        default_storage_location = create(:storage_location, organization:, name: "Default Center")
+
+        organization.update!(intake_location: intake_storage_location.id, default_storage_location: default_storage_location.id)
+
+        get admin_organization_path({ id: organization.id })
+
+        expect(response.body).to include("Intake Center")
+        expect(response.body).to include("Default Center")
+      end
+
       context "with an organization user" do
         let!(:user) { create(:user, organization: organization) }
 

spec/requests/organization_requests_spec.rb

@@ -47,6 +47,19 @@
         expect(html.text).to include("Receive email when partner makes a request:")
       end
 
+      it "displays the correct organization details" do
+        intake_storage_location = create(:storage_location, organization:, name: "Intake Center")
+        default_storage_location = create(:storage_location, organization:, name: "Default Center")
+
+        organization.update!(intake_location: intake_storage_location.id, default_storage_location: default_storage_location.id)
+
+        get organization_path
+
+        html = Nokogiri::HTML(response.body)
+        expect(html.text).to include("Intake Center")
+        expect(html.text).to include("Default Center")
+      end
+
       context "when enable_packs flipper is on" do
         it "displays organization's custom units" do
           Flipper.enable(:enable_packs)