dscf-credit 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab8778ae93f1e301f3f98e4715c341f177f6e12e47ab00a042355c098bdb4945
-  data.tar.gz: cfa7f52505d8cfae80563bb1d2790346dd9f115af2db68b5339b3a65af33e709
+  metadata.gz: 3c8471bd555308d0b88c282f893299234859a46f02ae02c003f02b147115e1ae
+  data.tar.gz: 3becd29b404c498ff195e300afa0c313a00155cb20d2ec600f39da1d36e1a45e
 SHA512:
-  metadata.gz: a5385b0be9ebdce8e6e763a14f40476f707c2860d2fdb83d2134b5cfd944967a6eda0e590ada5fdabff8d931ef79dbc6d1544078641e5dc31d2ea588af4c2192
-  data.tar.gz: 6b4dcca19fd39513f9048c1e699be0838246e284c5a4e881cf6345e8127688fe305e74a58d042ddcf37ceb3623300f72c5718a1aa7a82e852183fbd3056b3b25
+  metadata.gz: c205f203030be0f10872f4dcc1dac30b3ad797abe5a006a071bd579459bd13bf95fb821144d86f96c021e8eb1b7494e1544b6a046eb7b67150484cfeb7910116
+  data.tar.gz: 4910b18be7d23f314940a74e70b2cf1e032b8134e50903ed1770283e5a363af87b5986f32d0308799620326fda211c123a735747d4d9eedd240c958153b87d66

data/app/controllers/dscf/credit/facilitator_applications_controller.rb

@@ -102,7 +102,7 @@ module Dscf::Credit
     end
 
     def eager_loaded_associations
-      [ :user, :bank, reviews: { reviewed_by: :user_profile } ]
+      [ :user, :bank, { user: { businesses: :business_type } }, reviews: { reviewed_by: :user_profile } ]
     end
 
     def allowed_order_columns
@@ -111,7 +111,7 @@ module Dscf::Credit
 
     def default_serializer_includes
       {
-        default: [ :user, :bank, reviews: { reviewed_by: :user_profile } ]
+        default: [ :user, :bank, { user: { businesses: :business_type } }, reviews: { reviewed_by: :user_profile } ]
       }
     end
   end

data/app/controllers/dscf/credit/facilitators_controller.rb

@@ -10,7 +10,9 @@ module Dscf::Credit
     end
 
     def eager_loaded_associations
-      [ :facilitator_application, reviews: { reviewed_by: :user_profile } ]
+      [
+        { facilitator_application: { user: { businesses: :business_type } } },
+        reviews: { reviewed_by: :user_profile } ]
     end
 
     def allowed_order_columns
@@ -19,8 +21,10 @@ module Dscf::Credit
 
     def default_serializer_includes
       {
-        index: [ :facilitator_application, reviews: { reviewed_by: :user_profile } ],
-        show: [ :facilitator_application, reviews: { reviewed_by: :user_profile } ],
+        index: [ { facilitator_application: { user: { businesses: :business_type } } },
+                 reviews: { reviewed_by: :user_profile } ],
+        show: [ { facilitator_application: { user: { businesses: :business_type } } },
+                reviews: { reviewed_by: :user_profile } ],
         create: [ :reviews ],
         update: [ :facilitator_application, reviews: { reviewed_by: :user_profile } ]
       }

data/app/controllers/dscf/credit/scoring_parameters_controller.rb

@@ -62,7 +62,7 @@ module Dscf::Credit
 
     def default_serializer_includes
       {
-        index: [ :bank, :category, :parameter_normalizers, reviews: { reviewed_by: :user_profile } ],
+        index: [ :bank, :category, :parameter_normalizers, :scoring_param_type, reviews: { reviewed_by: :user_profile } ],
         show: [
           :bank, :category, :created_by, :scoring_param_type, :previous_version, :parameter_normalizers,
           reviews: { reviewed_by: :user_profile }

data/app/controllers/dscf/credit/users_controller.rb

@@ -16,15 +16,28 @@ module Dscf::Credit
             )
           end
 
-          rejected_user_ids = Dscf::Credit::FacilitatorApplication.joins(:reviews)
-                                                                 .where(dscf_core_reviews: { status: "rejected" })
-                                                                 .pluck(:user_id)
-                                                                 .uniq
+          users = @clazz
+            .joins(businesses: :business_type)
+            .where(dscf_core_business_types: { id: business_type.id })
+            .where(
+              <<-SQL.squish
+                NOT EXISTS (
+                  SELECT 1
+                  FROM dscf_credit_facilitator_applications fa
+                  WHERE fa.user_id = dscf_core_users.id
+                  AND NOT EXISTS (
+                    SELECT 1
+                    FROM dscf_core_reviews r
+                    WHERE r.reviewable_type = 'Dscf::Credit::FacilitatorApplication'
+                      AND r.reviewable_id = fa.id
+                      AND r.status = 'rejected'
+                  )
+                )
+              SQL
+            )
+            .distinct
 
-          @clazz.joins(businesses: :business_type)
-                .where(dscf_core_business_types: { name: business_type_name })
-                .where(id: rejected_user_ids)
-                .distinct
+          users
         else
           @clazz.all
         end

data/app/services/dscf/credit/credit_scoring_engine.rb

@@ -107,41 +107,47 @@ module Dscf::Credit
     end
 
     def extract_parameter_value(parameter)
-      param_type_name = parameter.scoring_param_type.name
       parameter_id = parameter.id.to_s
 
-      # Get the appropriate JSON field based on parameter type
-      json_field = get_json_field_for_param_type(param_type_name)
-      return nil unless json_field
+      all_json_fields = {
+        user_info: loan_application.user_info || {},
+        bank_info: loan_application.bank_info || {},
+        facilitator_info: loan_application.facilitator_info || {},
+        field_assessment: loan_application.field_assessment || {}
+      }
+
+      param_data = nil
+      found_in_field = nil
+
+      all_json_fields.each do |field_name, field_data|
+        if field_data.key?(parameter_id)
+          param_data = field_data[parameter_id]
+          found_in_field = field_name
+          break  # Stop at first match (IDs should be unique across fields)
+        end
+      end
+
+      if param_data.nil?
+        Rails.logger.warn "Parameter #{parameter_id} (#{parameter.name}) not found in any JSON field for loan_app #{loan_application.id}"
+        return nil
+      end
 
-      # Extract value using parameter ID as key
-      param_data = json_field[parameter_id]
-      return nil unless param_data.is_a?(Hash)
+      unless param_data.is_a?(Hash)
+        Rails.logger.warn "Invalid param_data for #{parameter_id} in #{found_in_field}: expected Hash, got #{param_data.class}"
+        return nil
+      end
 
-      # Validate that the param_name matches (optional safety check)
+      # Validate param_name matches (optional safety check)
       expected_param_name = param_data["param_name"]
       if expected_param_name && expected_param_name != parameter.name
-        Rails.logger.warn "Parameter name mismatch for ID #{parameter_id}: expected '#{parameter.name}', got '#{expected_param_name}'"
+        Rails.logger.warn "Parameter name mismatch for ID #{parameter_id} in #{found_in_field}: expected '#{parameter.name}', got '#{expected_param_name}'"
       end
 
-      param_data["value"]
+      raw_value = param_data["value"]
+      Rails.logger.debug "Extracted #{parameter.name} (ID #{parameter_id}) from #{found_in_field}: value=#{raw_value}"
+      raw_value
     end
 
-    def get_json_field_for_param_type(param_type_name)
-      case param_type_name.downcase
-      when "user_info"
-        loan_application.user_info || {}
-      when "bank_info"
-        loan_application.bank_info || {}
-      when "facilitator_info"
-        loan_application.facilitator_info || {}
-      when "field_assessment"
-        loan_application.field_assessment || {}
-      else
-        Rails.logger.warn "Unknown parameter type: #{param_type_name}"
-        nil
-      end
-    end
 
     def normalize_parameter_value(parameter, raw_value)
       return 0.0 if raw_value.nil?

data/lib/dscf/credit/version.rb

@@ -1,5 +1,5 @@
 module Dscf
   module Credit
-    VERSION = "0.2.0"
+    VERSION = "0.2.2"
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: dscf-credit
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Adoniyas
 bindir: bin
 cert_chain: []
-date: 2025-10-05 00:00:00.000000000 Z
+date: 2025-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dscf-core