Added condition to mapping for layouts, so that additional properties…

… could be checked for phatboyg#58
ahives · Sep 4, 2018 · 010ac95 · 010ac95
1 parent 9ab4cb5
commit 010ac95
Show file tree

Hide file tree

Showing 12 changed files with 49 additions and 26 deletions.
diff --git a/src/Machete.HL7/Configuration/HL7LayoutMap.cs b/src/Machete.HL7/Configuration/HL7LayoutMap.cs
@@ -13,7 +13,7 @@ public abstract class HL7LayoutMap<TLayout, TSchema> :
         where TSchema : HL7Entity
         where TLayout : HL7Layout
     {
-        protected void Segment<T>(Expression<Func<TLayout, Segment<T>>> propertyExpression, int position, Action<IEntityConfigurator<T>> configure = null)
+        protected void Segment<T>(Expression<Func<TLayout, Segment<T>>> propertyExpression, int position, Action<IEntityLayoutConfigurator<TSchema, T>> configure = null)
             where T : TSchema, HL7Segment
         {
             var propertyInfo = propertyExpression.GetPropertyInfo();
@@ -25,7 +25,7 @@ protected void Segment<T>(Expression<Func<TLayout, Segment<T>>> propertyExpressi
             Specification.Add(propertyInfo.Name, specification);
         }
 
-        protected void Segment<T>(Expression<Func<TLayout, SegmentList<T>>> propertyExpression, int position, Action<IEntityConfigurator<T>> configure = null)
+        protected void Segment<T>(Expression<Func<TLayout, SegmentList<T>>> propertyExpression, int position, Action<IEntityLayoutConfigurator<TSchema, T>> configure = null)
             where T : TSchema, HL7Segment
         {
             var propertyInfo = propertyExpression.GetPropertyInfo();

diff --git a/src/Machete.X12/Configuration/X12LayoutMap.cs b/src/Machete.X12/Configuration/X12LayoutMap.cs
@@ -13,7 +13,7 @@ public abstract class X12LayoutMap<TLayout, TSchema> :
         where TSchema : X12Entity
         where TLayout : X12Layout
     {
-        protected void Segment<T>(Expression<Func<TLayout, Segment<T>>> propertyExpression, int position, Action<IEntityConfigurator<T>> configure = null)
+        protected void Segment<T>(Expression<Func<TLayout, Segment<T>>> propertyExpression, int position, Action<IEntityLayoutConfigurator<TSchema, T>> configure = null)
             where T : TSchema, X12Segment
         {
             var propertyInfo = propertyExpression.GetPropertyInfo();
@@ -25,7 +25,7 @@ protected void Segment<T>(Expression<Func<TLayout, Segment<T>>> propertyExpressi
             Specification.Add(propertyInfo.Name, specification);
         }
 
-        protected void Segment<T>(Expression<Func<TLayout, SegmentList<T>>> propertyExpression, int position, Action<IEntityConfigurator<T>> configure = null)
+        protected void Segment<T>(Expression<Func<TLayout, SegmentList<T>>> propertyExpression, int position, Action<IEntityLayoutConfigurator<TSchema, T>> configure = null)
             where T : TSchema, X12Segment
         {
             var propertyInfo = propertyExpression.GetPropertyInfo();

diff --git a/src/Machete.X12Schema/Generated/V5010/Layouts/Maps/L1000A_835Map.cs b/src/Machete.X12Schema/Generated/V5010/Layouts/Maps/L1000A_835Map.cs
@@ -16,8 +16,8 @@ public L1000A_835Map()
             Segment(x => x.Address, 1, x => x.IsRequired());
             Segment(x => x.GeographicInformation, 2, x => x.IsRequired());
             Segment(x => x.AdditionalIdentification, 3);
-            Segment(x => x.BusinessContactInformation, 4);
-            Segment(x => x.TechnicalContactInformation, 5, x => x.IsRequired());
+            Segment(x => x.BusinessContactInformation, 4, x => x.Condition = parser => parser.Where(p => p.ContactFunctionCode.IsEqualTo("CX")));
+            Segment(x => x.TechnicalContactInformation, 5, x => x.IsRequired().Condition = parser => parser.Where(p => p.ContactFunctionCode.IsEqualTo("BL")));
             Segment(x => x.PayerWebsite, 6);
         }
     }

diff --git a/src/Machete/Configuration/EntityConfiguratorExtensions.cs b/src/Machete/Configuration/EntityConfiguratorExtensions.cs
@@ -8,8 +8,9 @@ public static class EntityConfiguratorExtensions
         /// <summary>
         /// Sets <paramref name="configurator"/> Required to true
         /// </summary>
-        public static IEntityConfigurator<T> IsRequired<T>(this IEntityConfigurator<T> configurator)
-            where T : Entity
+        public static IEntityLayoutConfigurator<TSchema, T> IsRequired<TSchema, T>(this IEntityLayoutConfigurator<TSchema, T> configurator)
+            where TSchema : Entity
+            where T : TSchema
         {
             configurator.Required = true;
 
@@ -19,8 +20,9 @@ public static IEntityConfigurator<T> IsRequired<T>(this IEntityConfigurator<T> c
         /// <summary>
         /// Sets <paramref name="configurator"/> Required to false
         /// </summary>
-        public static IEntityConfigurator<T> IsOptional<T>(this IEntityConfigurator<T> configurator)
-            where T : Entity
+        public static IEntityLayoutConfigurator<TSchema, T> IsOptional<TSchema, T>(this IEntityLayoutConfigurator<TSchema, T> configurator)
+            where TSchema : Entity
+            where T : TSchema
         {
             configurator.Required = false;
 

diff --git a/src/Machete/Configuration/LayoutMap.cs b/src/Machete/Configuration/LayoutMap.cs
@@ -21,7 +21,7 @@ protected LayoutMap()
             Specification = new LayoutSpecification<TLayout, TSchema>();
         }
 
-        protected void Entity<T>(Expression<Func<TLayout, Entity<T>>> propertyExpression, int position, Action<IEntityConfigurator<T>> configure = null)
+        protected void Entity<T>(Expression<Func<TLayout, Entity<T>>> propertyExpression, int position, Action<IEntityLayoutConfigurator<TSchema, T>> configure = null)
             where T : TSchema
         {
             var propertyInfo = propertyExpression.GetPropertyInfo();
@@ -33,7 +33,7 @@ protected void Entity<T>(Expression<Func<TLayout, Entity<T>>> propertyExpression
             Specification.Add(propertyInfo.Name, specification);
         }
 
-        protected void Entity<T>(Expression<Func<TLayout, EntityList<T>>> propertyExpression, int position, Action<IEntityConfigurator<T>> configure = null)
+        protected void Entity<T>(Expression<Func<TLayout, EntityList<T>>> propertyExpression, int position, Action<IEntityLayoutConfigurator<TSchema, T>> configure = null)
             where T : TSchema
         {
             var propertyInfo = propertyExpression.GetPropertyInfo();

diff --git a/src/Machete/Configuration/SchemaConfiguration/EntityLayoutCondition.cs b/src/Machete/Configuration/SchemaConfiguration/EntityLayoutCondition.cs
@@ -0,0 +1,6 @@
+namespace Machete.SchemaConfiguration
+{
+    public delegate IParser<TSchema, TEntity> EntityLayoutCondition<TSchema, TEntity>(IQueryParser<TSchema, TEntity> parser)
+        where TSchema : Entity
+        where TEntity : TSchema;
+}
diff --git a/src/Machete/Configuration/SchemaConfiguration/IEntityConfigurator.cs b/src/Machete/Configuration/SchemaConfiguration/IEntityConfigurator.cs
@@ -3,13 +3,6 @@
     using Builders;
 
 
-    public interface IEntityConfigurator<out TEntity>
-        where TEntity : Entity
-    {
-        bool Required { set; }
-    }
-
-
     /// <summary>
     /// Entity Configuration
     /// </summary>

diff --git a/src/Machete/Configuration/SchemaConfiguration/IEntityLayoutConfigurator.cs b/src/Machete/Configuration/SchemaConfiguration/IEntityLayoutConfigurator.cs
@@ -0,0 +1,11 @@
+namespace Machete.SchemaConfiguration
+{
+    public interface IEntityLayoutConfigurator<TSchema, TEntity>
+        where TSchema : Entity
+        where TEntity : TSchema
+    {
+        bool Required { set; }
+
+        EntityLayoutCondition<TSchema, TEntity> Condition { set; }
+    }
+}
diff --git a/...ete/Configuration/SchemaConfiguration/Specifications/EntityLayoutPropertySpecification.cs b/...ete/Configuration/SchemaConfiguration/Specifications/EntityLayoutPropertySpecification.cs
@@ -16,7 +16,7 @@
     /// <typeparam name="TProperty"></typeparam>
     public class EntityLayoutPropertySpecification<TLayout, TSchema, TEntity, TProperty> :
         ILayoutPropertySpecification<TLayout, TSchema>,
-        IEntityConfigurator<TEntity>
+        IEntityLayoutConfigurator<TSchema, TEntity>
         where TLayout : Layout
         where TSchema : Entity
         where TEntity : TSchema
@@ -52,11 +52,12 @@ public IEnumerable<Type> GetReferencedEntityTypes()
 
         public void Apply(ILayoutBuilder<TLayout, TSchema> builder)
         {
-            var property = new EntityLayoutProperty<TLayout, TSchema, TEntity, TProperty>(_property, Required, _propertyConverter);
+            var property = new EntityLayoutProperty<TLayout, TSchema, TEntity, TProperty>(_property, Required, _propertyConverter, Condition);
 
             builder.Add(property);
         }
 
         public bool Required { private get; set; }
+        public EntityLayoutCondition<TSchema, TEntity> Condition { private get; set; }
     }
 }
diff --git a/...Configuration/SchemaConfiguration/Specifications/EntityListLayoutPropertySpecification.cs b/...Configuration/SchemaConfiguration/Specifications/EntityListLayoutPropertySpecification.cs
@@ -9,7 +9,7 @@
 
     public class EntityListLayoutPropertySpecification<TLayout, TSchema, TEntity, TProperty> :
         ILayoutPropertySpecification<TLayout, TSchema>,
-        IEntityConfigurator<TEntity>
+        IEntityLayoutConfigurator<TSchema, TEntity>
         where TLayout : Layout
         where TSchema : Entity
         where TEntity : TSchema
@@ -44,11 +44,12 @@ public IEnumerable<Type> GetReferencedEntityTypes()
 
         public void Apply(ILayoutBuilder<TLayout, TSchema> builder)
         {
-            var property = new EntityListLayoutProperty<TLayout, TSchema, TEntity, TProperty>(_property, Required, _propertyConverter);
+            var property = new EntityListLayoutProperty<TLayout, TSchema, TEntity, TProperty>(_property, Required, _propertyConverter, Condition);
 
             builder.Add(property);
         }
 
         public bool Required { get; set; }
+        public EntityLayoutCondition<TSchema, TEntity> Condition { get; set; }
     }
 }
diff --git a/src/Machete/Layouts/LayoutProperties/EntityLayoutProperty.cs b/src/Machete/Layouts/LayoutProperties/EntityLayoutProperty.cs
@@ -4,6 +4,7 @@
     using System.Reflection;
     using Internals.Reflection;
     using Parsers;
+    using SchemaConfiguration;
 
 
     public class EntityLayoutProperty<TLayout, TSchema, TEntity, TProperty> :
@@ -17,17 +18,22 @@ public class EntityLayoutProperty<TLayout, TSchema, TEntity, TProperty> :
         readonly bool _required;
         readonly Func<Entity<TEntity>, TProperty> _propertyConverter;
         readonly IWriteProperty<TLayout, TProperty> _property;
+        readonly EntityLayoutCondition<TSchema, TEntity> _condition;
 
-        public EntityLayoutProperty(PropertyInfo property, bool required, Func<Entity<TEntity>, TProperty> propertyConverter)
+        public EntityLayoutProperty(PropertyInfo property, bool required, Func<Entity<TEntity>, TProperty> propertyConverter,
+            EntityLayoutCondition<TSchema, TEntity> condition = null)
         {
             _required = required;
             _propertyConverter = propertyConverter;
+            _condition = condition;
             _property = WritePropertyCache<TLayout>.GetProperty<TProperty>(property.Name);
         }
 
         public IParser<TSchema, LayoutMatch<TLayout>> CreateQuery(LayoutParserOptions options, IQueryBuilder<TSchema> queryBuilder)
         {
-            IParser<TSchema, TEntity> parser = queryBuilder.Select<TEntity>().Parser;
+            IQueryParser<TSchema, TEntity> queryParser = queryBuilder.Select<TEntity>();
+
+            IParser<TSchema, TEntity> parser = _condition != null ? _condition(queryParser) : queryParser.Parser;
             if (_required == false)
                 parser = parser.Optional();
 

diff --git a/src/Machete/Layouts/LayoutProperties/EntityListLayoutProperty.cs b/src/Machete/Layouts/LayoutProperties/EntityListLayoutProperty.cs
@@ -4,6 +4,7 @@
     using System.Reflection;
     using Internals.Reflection;
     using Parsers;
+    using SchemaConfiguration;
 
 
     public class EntityListLayoutProperty<TLayout, TSchema, TEntity, TProperty> :
@@ -17,11 +18,13 @@ public class EntityListLayoutProperty<TLayout, TSchema, TEntity, TProperty> :
         readonly bool _required;
         readonly Func<EntityList<TEntity>, TProperty> _propertyConverter;
         readonly IWriteProperty<TLayout, TProperty> _property;
+        readonly EntityLayoutCondition<TSchema, TEntity> _condition;
 
-        public EntityListLayoutProperty(PropertyInfo property, bool required, Func<EntityList<TEntity>, TProperty> propertyConverter)
+        public EntityListLayoutProperty(PropertyInfo property, bool required, Func<EntityList<TEntity>, TProperty> propertyConverter, EntityLayoutCondition<TSchema, TEntity> condition)
         {
             _required = required;
             _propertyConverter = propertyConverter;
+            _condition = condition;
             _property =  WritePropertyCache<TLayout>.GetProperty<TProperty>(property.Name);
         }