dscf-credit 0.2.0 → 0.2.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/dscf/credit/facilitator_applications_controller.rb +2 -2
  3. data/app/controllers/dscf/credit/facilitators_controller.rb +7 -3
  4. data/app/controllers/dscf/credit/scoring_parameters_controller.rb +1 -1
  5. data/app/controllers/dscf/credit/users_controller.rb +21 -8
  6. data/lib/dscf/credit/version.rb +1 -1
  7. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: ab8778ae93f1e301f3f98e4715c341f177f6e12e47ab00a042355c098bdb4945
4
- data.tar.gz: cfa7f52505d8cfae80563bb1d2790346dd9f115af2db68b5339b3a65af33e709
3
+ metadata.gz: d6af7d6aeb34ec3aa7d630f441bdfc54657b07640135bb862cc3d9b0eccd03c9
4
+ data.tar.gz: 15b37f5d6cfc2462b31267c16e5d85e738326d1479861abedf127362bfd7d42f
5
5
  SHA512:
6
- metadata.gz: a5385b0be9ebdce8e6e763a14f40476f707c2860d2fdb83d2134b5cfd944967a6eda0e590ada5fdabff8d931ef79dbc6d1544078641e5dc31d2ea588af4c2192
7
- data.tar.gz: 6b4dcca19fd39513f9048c1e699be0838246e284c5a4e881cf6345e8127688fe305e74a58d042ddcf37ceb3623300f72c5718a1aa7a82e852183fbd3056b3b25
6
+ metadata.gz: 7815d27fc10a061438a37b46a77506a83ef5fab2c08bf5f04fe4b517b52ed7354b0e7a08ba292803a95f79b991a13f1ff8ac966aeb121b2118c40ccfdaa0c493
7
+ data.tar.gz: fa2684a66f074ab72be71ed458d717b4fd8e04d920440808ce0b3638b914fc2bf3bcc2fdc80881acb7596e1a3fbd0c70b4d0905b2674c677abbe2838eda713cf
data/app/controllers/dscf/credit/facilitator_applications_controller.rb CHANGED
@@ -102,7 +102,7 @@ module Dscf::Credit
102
102
  end
103
103
 
104
104
  def eager_loaded_associations
105
- [ :user, :bank, reviews: { reviewed_by: :user_profile } ]
105
+ [ :user, :bank, { user: { businesses: :business_type } }, reviews: { reviewed_by: :user_profile } ]
106
106
  end
107
107
 
108
108
  def allowed_order_columns
@@ -111,7 +111,7 @@ module Dscf::Credit
111
111
 
112
112
  def default_serializer_includes
113
113
  {
114
- default: [ :user, :bank, reviews: { reviewed_by: :user_profile } ]
114
+ default: [ :user, :bank, { user: { businesses: :business_type } }, reviews: { reviewed_by: :user_profile } ]
115
115
  }
116
116
  end
117
117
  end
data/app/controllers/dscf/credit/facilitators_controller.rb CHANGED
@@ -10,7 +10,9 @@ module Dscf::Credit
10
10
  end
11
11
 
12
12
  def eager_loaded_associations
13
- [ :facilitator_application, reviews: { reviewed_by: :user_profile } ]
13
+ [
14
+ { facilitator_application: { user: { businesses: :business_type } } },
15
+ reviews: { reviewed_by: :user_profile } ]
14
16
  end
15
17
 
16
18
  def allowed_order_columns
@@ -19,8 +21,10 @@ module Dscf::Credit
19
21
 
20
22
  def default_serializer_includes
21
23
  {
22
- index: [ :facilitator_application, reviews: { reviewed_by: :user_profile } ],
23
- show: [ :facilitator_application, reviews: { reviewed_by: :user_profile } ],
24
+ index: [ { facilitator_application: { user: { businesses: :business_type } } },
25
+ reviews: { reviewed_by: :user_profile } ],
26
+ show: [ { facilitator_application: { user: { businesses: :business_type } } },
27
+ reviews: { reviewed_by: :user_profile } ],
24
28
  create: [ :reviews ],
25
29
  update: [ :facilitator_application, reviews: { reviewed_by: :user_profile } ]
26
30
  }
data/app/controllers/dscf/credit/scoring_parameters_controller.rb CHANGED
@@ -62,7 +62,7 @@ module Dscf::Credit
62
62
 
63
63
  def default_serializer_includes
64
64
  {
65
- index: [ :bank, :category, :parameter_normalizers, reviews: { reviewed_by: :user_profile } ],
65
+ index: [ :bank, :category, :parameter_normalizers, :scoring_param_type, reviews: { reviewed_by: :user_profile } ],
66
66
  show: [
67
67
  :bank, :category, :created_by, :scoring_param_type, :previous_version, :parameter_normalizers,
68
68
  reviews: { reviewed_by: :user_profile }
data/app/controllers/dscf/credit/users_controller.rb CHANGED
@@ -16,15 +16,28 @@ module Dscf::Credit
16
16
  )
17
17
  end
18
18
 
19
- rejected_user_ids = Dscf::Credit::FacilitatorApplication.joins(:reviews)
20
- .where(dscf_core_reviews: { status: "rejected" })
21
- .pluck(:user_id)
22
- .uniq
19
+ users = @clazz
20
+ .joins(businesses: :business_type)
21
+ .where(dscf_core_business_types: { id: business_type.id })
22
+ .where(
23
+ <<-SQL.squish
24
+ NOT EXISTS (
25
+ SELECT 1
26
+ FROM dscf_credit_facilitator_applications fa
27
+ WHERE fa.user_id = dscf_core_users.id
28
+ AND NOT EXISTS (
29
+ SELECT 1
30
+ FROM dscf_core_reviews r
31
+ WHERE r.reviewable_type = 'Dscf::Credit::FacilitatorApplication'
32
+ AND r.reviewable_id = fa.id
33
+ AND r.status = 'rejected'
34
+ )
35
+ )
36
+ SQL
37
+ )
38
+ .distinct
23
39
 
24
- @clazz.joins(businesses: :business_type)
25
- .where(dscf_core_business_types: { name: business_type_name })
26
- .where(id: rejected_user_ids)
27
- .distinct
40
+ users
28
41
  else
29
42
  @clazz.all
30
43
  end
data/lib/dscf/credit/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Dscf
2
2
  module Credit
3
- VERSION = "0.2.0"
3
+ VERSION = "0.2.1"
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: dscf-credit
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.0
4
+ version: 0.2.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Adoniyas
8
8
  bindir: bin
9
9
  cert_chain: []
10
- date: 2025-10-05 00:00:00.000000000 Z
10
+ date: 2025-10-06 00:00:00.000000000 Z
11
11
  dependencies:
12
12
  - !ruby/object:Gem::Dependency
13
13
  name: dscf-core