fix: restore missing line and remove duplication after resolving merg…

…e conflicts
ComPlat · Nov 18, 2024 · 6adfa08 · 6adfa08
1 parent 4a4a35c
commit 6adfa08
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/app/api/entities/reaction_material_entity.rb b/app/api/entities/reaction_material_entity.rb
@@ -9,7 +9,6 @@ class ReactionMaterialEntity < ApplicationEntity
     expose! :reference
     expose! :show_label
     expose! :waste
-    expose! :waste
     expose! :conversion_rate
 
     expose! :sample, using: 'Entities::SampleEntity', merge: true

diff --git a/app/usecases/reactions/update_materials.rb b/app/usecases/reactions/update_materials.rb
@@ -192,6 +192,7 @@ def associate_sample_with_reaction(sample, modified_sample, material_group)
             waste: sample.waste,
             coefficient: sample.coefficient,
             position: sample.position,
+            type: reactions_sample_klass,
             conversion_rate: sample.conversion_rate,
           )
         end