add draft status for scope disabling check + exclude current authoriz…

…ation request from the check
etalab · May 15, 2024 · 373485c · 373485c
1 parent 6d2f895
commit 373485c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/app/helpers/authorization_requests_helpers.rb b/app/helpers/authorization_requests_helpers.rb
@@ -53,8 +53,10 @@ def authorization_request_can_be_updated?(authorization_request)
     authorization_request.filling?
   end
 
-  def hubee_dila_selected_scopes_for_current_organization
-    authorization_requests = AuthorizationRequest.where(type: 'AuthorizationRequest::HubEEDila', organization: current_organization.id, state: %w[validated submitted changes_requested],)
+  def hubee_dila_selected_scopes_for_current_organization(authorization_request = nil)
+    authorization_requests = AuthorizationRequest.where(type: 'AuthorizationRequest::HubEEDila', organization: current_organization.id, state: %w[draft validated submitted changes_requested])
+
+    authorization_requests = authorization_requests.where.not(id: authorization_request.id) if authorization_request.present?
 
     authorization_requests.map(&:scopes).flatten.uniq.join(', ')
   end

diff --git a/app/models/authorization_request/hubee_dila.rb b/app/models/authorization_request/hubee_dila.rb
@@ -14,7 +14,7 @@ def unique_scope_request
       .where(
         organization:,
         type: 'AuthorizationRequest::HubEEDila',
-        state: %w[validated submitted changes_requested]
+        state: %w[draft validated submitted changes_requested]
       )
 
     existing_scopes = existing_requests.map(&:scopes).flatten.uniq

diff --git a/app/policies/concerns/common_authorization_models_policies.rb b/app/policies/concerns/common_authorization_models_policies.rb
@@ -37,7 +37,7 @@ def hubee_scope_uniqueness_constraint?
   end
 
   def requested_scopes?
-    existing_requests = current_organization&.active_authorization_requests&.where(type: authorization_request_class, state: %w[validated submitted changes_requested])
+    existing_requests = current_organization&.active_authorization_requests&.where(type: authorization_request_class, state: %w[draft validated submitted changes_requested])
 
     return false unless existing_requests.any?
 

diff --git a/app/views/authorization_request_forms/shared/_scopes.html.erb b/app/views/authorization_request_forms/shared/_scopes.html.erb
@@ -20,7 +20,7 @@
 
     <div class="scopes-group__grid">
       <% scopes.each do |scope| %>
-        <% if hubee_dila_selected_scopes_for_current_organization.include? scope.value %>
+        <% if hubee_dila_selected_scopes_for_current_organization(@authorization_request).include? scope.value %>
           <%= f.dsfr_scope(scope, disabled: true) %>
         <% else %>
           <%= f.dsfr_scope scope %>