Refactor Code

Author: gmartincor

app/controllers/posts_controller.rb

@@ -6,10 +6,14 @@ class PostsController <  ApplicationController
   def index
     context = model.active.of_active_members
 
-    if current_organization.present?
-      context = context.where(
-        organization_id: current_organization.id
-      )
+    if current_user.present? && current_organization.present?
+      if params[:show_allied].present?
+      allied_org_ids = current_organization.allied_organizations.pluck(:id)
+      org_ids = [current_organization.id] + allied_org_ids
+      context = context.by_organizations(org_ids)
+      elsif !params[:org].present?
+      context = context.by_organization(current_organization.id)
+      end
     end
 
     posts = apply_scopes(context)
@@ -98,15 +102,6 @@ def post_params
     end
   end
 
-  # TODO: remove this horrible hack ASAP
-  #
-  # This hack set the current organization to the post's
-  # organization, both in session and controller instance variable.
-  #
-  # Before changing the current organization it's important to check that
-  # the current_user is an active member of the organization.
-  #
-  # @param organization [Organization]
   def update_current_organization!(organization)
     return unless current_user && current_user.active?(organization)
 

app/models/organization.rb

@@ -84,6 +84,12 @@ def rejected_alliances
     source_alliances.rejected.or(target_alliances.rejected)
   end
 
+  def allied_organizations
+    source_org_ids = source_alliances.accepted.pluck(:target_organization_id)
+    target_org_ids = target_alliances.accepted.pluck(:source_organization_id)
+    Organization.where(id: source_org_ids + target_org_ids)
+  end
+
   def ensure_reg_number_seq!
     update_column(:reg_number_seq, members.maximum(:member_uid))
   end

app/views/shared/_post_filters.html.erb

@@ -37,5 +37,40 @@
         </ul>
       </li>
     </ul>
+<<<<<<< HEAD
+=======
+    <ul class="nav navbar-nav d-none d-sm-flex">
+      <li class="dropdown nav-item">
+        <a class="dropdown-toggle nav-link text-primary" href="#" data-bs-toggle="dropdown" role="button" aria-expanded="false">
+          <%= selected_org ? selected_org.name : t("activerecord.models.organization.other") %>
+        </a>
+        <ul class="dropdown-menu" role="menu">
+          <li>
+            <% 
+              query_params = {}
+              query_params[:show_allied] = true
+              query_params[:cat] = params[:cat] if params[:cat].present?
+              link_path = "#{base_path}?#{query_params.to_query}"
+            %>
+            <%= link_to "× #{t('global.all')}", link_path, class: "dropdown-item" %>
+          </li>
+          <% allied_organizations.each do |org| %>
+            <% next if org.id.to_s == params[:org] %>
+            <li>
+              <% 
+                query_params = {}
+                query_params[:org] = org.id
+                query_params[:cat] = params[:cat] if params[:cat].present?
+                link_path = "#{base_path}?#{query_params.to_query}"
+              %>
+              <%= link_to link_path, class: "dropdown-item" do %>
+                <%= org.name %>
+              <% end %>
+            </li>
+          <% end %>
+        </ul>
+      </li>
+    </ul>
+>>>>>>> 66663daa (refactor code)
   </form>
 </div>