feat: Incorporate "Gas Scheme" feature in reaction variations table

CHANGELOG.md

@@ -1,6 +1,9 @@
 # Chemotion_ELN Changelog
 ## Latest
 
+* Features and enhancements
+  * Reaction variations table can now represent gaseous materials
+
 ## [v1.10.3]
 > (2024-10-02)
 

app/api/entities/reaction_variation_entity.rb

@@ -20,28 +20,28 @@ def properties
       end
     end
 
-    def materials(material_type)
+    def materials(material_type, entity)
       {}.tap do |materials|
         object[material_type]&.each do |k, v|
-          materials[k] = ReactionVariationMaterialEntity.represent(v)
+          materials[k] = entity.represent(v)
         end
       end
     end
 
     def starting_materials
-      materials(:startingMaterials)
+      materials(:startingMaterials, StartingMaterialEntity)
     end
 
     def reactants
-      materials(:reactants)
+      materials(:reactants, StartingMaterialEntity)
     end
 
     def products
-      materials(:products)
+      materials(:products, ProductMaterialEntity)
     end
 
     def solvents
-      materials(:solvents)
+      materials(:solvents, SolventMaterialEntity)
     end
   end
 
@@ -52,10 +52,33 @@ class ReactionVariationPropertyEntity < ApplicationEntity
     )
   end
 
-  class ReactionVariationMaterialEntity < ApplicationEntity
+  class SolventMaterialEntity < ApplicationEntity
+    expose :volume, using: 'Entities::ReactionVariationMaterialEntryEntity'
+
+    expose :aux, using: 'Entities::ReactionVariationMaterialAuxEntity'
+  end
+
+  class ProductMaterialEntity < ApplicationEntity
     expose :mass, using: 'Entities::ReactionVariationMaterialEntryEntity'
     expose :amount, using: 'Entities::ReactionVariationMaterialEntryEntity'
-    expose :volume, using: 'Entities::ReactionVariationMaterialEntryEntity'
+    expose :yield, using: 'Entities::ReactionVariationMaterialEntryEntity'
+
+    expose :duration, if: lambda { |object, _| object[:aux][:gasType] == 'gas' }, using: 'Entities::ReactionVariationMaterialEntryEntity'
+    expose :temperature, if: lambda { |object, _| object[:aux][:gasType] == 'gas' }, using: 'Entities::ReactionVariationMaterialEntryEntity'
+    expose :concentration, if: lambda { |object, _| object[:aux][:gasType] == 'gas' }, using: 'Entities::ReactionVariationMaterialEntryEntity'
+    expose :turnoverNumber, if: lambda { |object, _| object[:aux][:gasType] == 'gas' }, using: 'Entities::ReactionVariationMaterialEntryEntity'
+    expose :turnoverFrequency, if: lambda { |object, _| object[:aux][:gasType] == 'gas' }, using: 'Entities::ReactionVariationMaterialEntryEntity'
+
+    expose :aux, using: 'Entities::ReactionVariationMaterialAuxEntity'
+  end
+
+  class StartingMaterialEntity < ApplicationEntity
+    expose :mass, using: 'Entities::ReactionVariationMaterialEntryEntity'
+    expose :amount, using: 'Entities::ReactionVariationMaterialEntryEntity'
+    expose :equivalent, using: 'Entities::ReactionVariationMaterialEntryEntity'
+
+    expose :volume, if: lambda { |object, _| (object[:aux][:gasType] == 'feedstock') }, using: 'Entities::ReactionVariationMaterialEntryEntity'
+
     expose :aux, using: 'Entities::ReactionVariationMaterialAuxEntity'
   end
 
@@ -68,8 +91,9 @@ class ReactionVariationMaterialAuxEntity < ApplicationEntity
       :molarity,
       :molecularWeight,
       :sumFormula,
-      :yield,
-      :equivalent,
+      :gasType,
+      :vesselVolume,
+      :materialType,
     )
   end