Loans: signing_date not null, Divisions: second level

seedcommons · May 28, 2024 · eed6912 · eed6912
1 parent c181939
commit eed6912
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/app/controllers/api/v1/divisions_controller.rb b/app/controllers/api/v1/divisions_controller.rb
@@ -2,8 +2,10 @@ module Api
   module V1
     class DivisionsController < ApplicationController
       def index
-        seed_commons_id = Division.find_by(name: "Seed Commons").id
-        divisions = Division.includes(address: [:country, :geo_state]).where(parent_id: seed_commons_id, public: true)
+        #seed_commons_id = Division.find_by(name: "Seed Commons").id
+        seed_commons_division_ids = Division.find_by(name: "Seed Commons").self_and_descendants.pluck(:id)
+        #divisions = Division.includes(address: [:country, :geo_state]).where(parent_id: seed_commons_id, public: true)
+        divisions = Division.includes(address: [:country, :geo_state]).where(parent_id: seed_commons_division_ids, public: true)
         render json: divisions.map { |division| format_division(division) }
       end
 

diff --git a/app/controllers/api/v1/loans_controller.rb b/app/controllers/api/v1/loans_controller.rb
@@ -3,7 +3,11 @@ module V1
     class LoansController < ApplicationController
       def index
         seed_commons_division_ids = Division.find_by(name: "Seed Commons").descendants.where(public: true).pluck(:id)
-        loans = Loan.includes(:division, organization: [address: [:country, :geo_state]]).where(division_id: seed_commons_division_ids).where.not(public_level_value: "hidden")
+        #loans = Loan.includes(:division, organization: [address: [:country, :geo_state]]).where(division_id: seed_commons_division_ids).where.not(public_level_value: "hidden")
+        loans = Loan.includes(:division, organization: [address: [:country, :geo_state]])
+                    .where(division_id: seed_commons_division_ids)
+                    .where.not(public_level_value: "hidden")
+                    .where.not(signing_date: nil)
         render json: loans.map { |loan| format_loan(loan) }
       end