Merge pull request #13235 from demarche-numerique/push-nxrnqluquupo

feat: expose the champs changed in a correction via a traitement checkpoint

Author: tchak

app/components/dossiers/changes_component.rb

@@ -0,0 +1,84 @@
+# frozen_string_literal: true
+
+class Dossiers::ChangesComponent < ApplicationComponent
+  attr_reader :changed_columns
+
+  def initialize(changed_columns:)
+    @changed_columns = changed_columns
+  end
+
+  def render? = changed_columns.present?
+
+  private
+
+  def change_content(changed_column)
+    case changed_column.type
+    when :geojson
+      tag.em(t('.geojson_changed'))
+    when :attachments
+      attachments_change(changed_column)
+    when :enums
+      enums_change(changed_column)
+    else
+      simple_change(changed_column)
+    end
+  end
+
+  def simple_change(changed_column)
+    value = changed_column.value
+    return tag.em(t('.removed')) if value.nil?
+
+    tag.strong(format_value(changed_column, value))
+  end
+
+  def format_value(column, value)
+    case column.type
+    when :boolean
+      value ? t('utils.yes') : t('utils.no')
+    when :enum
+      column.label_for_value(value)
+    when :date
+      value = Date.parse(value) if value.is_a?(String)
+      I18n.l(value, format: :short)
+    when :datetime
+      value = Time.zone.parse(value) if value.is_a?(String)
+      I18n.l(value, format: :short_with_time)
+    else
+      value.to_s
+    end
+  end
+
+  def attachments_change(changed_column)
+    current = attachment_filenames(changed_column.value)
+    previous = attachment_filenames(changed_column.previous_value)
+
+    diff_list(added: current - previous, removed: previous - current)
+  end
+
+  def enums_change(changed_column)
+    current = Array(changed_column.value)
+    previous = Array(changed_column.previous_value)
+
+    diff_list(
+      added: (current - previous).map { changed_column.label_for_value(it) },
+      removed: (previous - current).map { changed_column.label_for_value(it) }
+    )
+  end
+
+  def diff_list(added:, removed:)
+    lines = []
+    lines << diff_line(t('.added'), added) if added.present?
+    lines << diff_line(t('.removed_values'), removed) if removed.present?
+    return tag.em(t('.changed')) if lines.empty?
+
+    safe_join(lines, tag.br)
+  end
+
+  def diff_line(label, values)
+    safe_join([label, ' ', tag.strong(values.to_sentence)])
+  end
+
+  def attachment_filenames(value)
+    Array(value).map { it.blob.filename.to_s }
+  end
+end

app/components/dossiers/changes_component/changes_component.en.yml

@@ -0,0 +1,6 @@
+en:
+  removed: The value has been removed
+  changed: The value has been changed
+  geojson_changed: The geographic area has been changed
+  added: "Added:"
+  removed_values: "Removed:"

app/components/dossiers/changes_component/changes_component.fr.yml

@@ -0,0 +1,6 @@
+fr:
+  removed: La valeur a été supprimée
+  changed: La valeur a été modifiée
+  geojson_changed: La zone géographique a été modifiée
+  added: "Ajouté :"
+  removed_values: "Retiré :"

app/components/dossiers/changes_component/changes_component.html.erb

@@ -0,0 +1,6 @@
+<dl class="fr-mb-0">
+  <% changed_columns.each do |changed_column| %>
+    <dt><%= changed_column.label %> :</dt>
+    <dd><%= change_content(changed_column) %></dd>
+  <% end %>
+</dl>

app/controllers/users/dossiers_controller.rb

@@ -316,7 +316,6 @@ def submit_en_construction
 
       if dossier.errors.blank? && dossier.can_passer_en_construction?
         dossier.submitted_with_france_connect = current_user.loged_in_with_france_connect.present?
-        dossier.merge_user_buffer_stream!
         dossier.usager_submit_en_construction!
 
         redirect_to dossier_path(dossier)

app/graphql/api/v2/schema.rb

@@ -137,7 +137,8 @@ def self.resolve_type(type_definition, object, ctx)
     Types::Columns::EnumColumnType,
     Types::Columns::EnumsColumnType,
     Types::Columns::IntegerColumnType,
-    Types::Columns::TextColumnType
+    Types::Columns::TextColumnType,
+    Types::Columns::GeoJSONColumnType
 
   def self.unauthorized_object(error)
     # Add a top-level error to the response instead of returning nil:

app/graphql/api/v2/stored_query.rb

@@ -778,6 +778,17 @@ def self.get(query_id)
         ...FileFragment
       }
     }
+    ... on GeoJSONColumn {
+      value {
+        geometry @include(if: $includeGeometry) {
+          type
+          coordinates
+        }
+        properties {
+          description
+        }
+      }
+    }
   }
   GRAPHQL
 

app/graphql/schema.graphql

@@ -3379,6 +3379,35 @@ type GeoJSON {
   type: String!
 }
 
+type GeoJSONColumn implements Column {
+  id: ID!
+
+  """
+  Libellé de la colonne.
+  """
+  label: String!
+
+  """
+  La valeur de la colonne sous forme texte.
+  """
+  stringValue: String
+  value: [GeoJSONFeature!]!
+}
+
+type GeoJSONFeature {
+  geometry: GeoJSONGeometry!
+  properties: GeoJSONFeatureProperties!
+}
+
+type GeoJSONFeatureProperties {
+  description: String
+}
+
+type GeoJSONGeometry {
+  coordinates: Coordinates!
+  type: String!
+}
+
 """
 Un groupe instructeur
 """
@@ -5396,6 +5425,10 @@ enum TitreIdentiteGrantType {
 }
 
 type Traitement {
+  """
+  Liste des changements par colonne
+  """
+  changedColumns: [Column!]!
   dateTraitement: ISO8601DateTime!
   emailAgentTraitant: String
   event: TraitementEvent!

app/graphql/types/champ_type.rb

@@ -19,6 +19,8 @@ def string_value
     def columns
       if object.repetition?
         []
+      elsif object.carte?
+        object.type_de_champ.value_columns(procedure_id: object.procedure.id)
       else
         object.type_de_champ.columns(procedure_id: object.procedure.id)
       end

app/graphql/types/column_type.rb

@@ -40,6 +40,8 @@ def resolve_type(object, context)
           Types::Columns::EnumsColumnType
         when :attachments
           Types::Columns::AttachmentsColumnType
+        when :geojson
+          Types::Columns::GeoJSONColumnType
         else
           Types::Columns::TextColumnType
         end