Merge pull request #11724 from tchak/maybe-fix-perf-problem-again

champs: try to find the champ in memory before querying the database

Author: colinux

app/models/concerns/dossier_champs_concern.rb

@@ -324,19 +324,24 @@ def champ_upsert_by!(type_de_champ, row_id)
     # FIXME: This is a temporary on-demand migration. It will be removed once the full migration is over.
     Champ.where(dossier_id: id, row_id: Champ::NULL_ROW_ID).update_all(row_id: nil)
 
-    champ = Dossier.no_touching do
-      champs
-        .create_with(**type_de_champ.params_for_champ)
-        .create_or_find_by!(stable_id: type_de_champ.stable_id, row_id:, stream:)
+    # FIXME: Try to find the champ in memory before querying the database
+    champ = champs.find { _1.stream == stream && _1.public_id == type_de_champ.public_id(row_id) }
+
+    if champ.nil?
+      champ = Dossier.no_touching do
+        champs
+          .create_with(**type_de_champ.params_for_champ)
+          .create_or_find_by!(stable_id: type_de_champ.stable_id, row_id:, stream:)
+      end
     end
 
     # Needed when a revision change the champ type in this case, we reset the champ data
     if champ.class != type_de_champ.champ_class
       champ = champ.becomes!(type_de_champ.champ_class)
       champ.assign_attributes(value: nil, value_json: nil, external_id: nil, data: nil)
     elsif stream != Champ::MAIN_STREAM && champ.previously_new_record?
-      # main_stream_champ = champs.find_by(stable_id: type_de_champ.stable_id, row_id:, stream: Champ::MAIN_STREAM)
-      # champ.clone_value_from(main_stream_champ) if main_stream_champ.present?
+      main_stream_champ = champs.find_by(stable_id: type_de_champ.stable_id, row_id:, stream: Champ::MAIN_STREAM)
+      champ.clone_value_from(main_stream_champ) if main_stream_champ.present?
     end
 
     # If the champ returned from `create_or_find_by` is not the same as the one already loaded in `dossier.champs`, we need to update the association cache