Fixes #145

[R] Expresion-body methods

Author: i4004

src/Simplify.Web/AsyncController{T}.cs

@@ -38,7 +38,12 @@ public virtual T Model
 		/// </summary>
 		public virtual async Task ReadModelAsync()
 		{
-			_model = await Resolver.Resolve<IModelHandler>().ProcessAsync<T>(Resolver);
+			var handler = Resolver.Resolve<IModelHandler>();
+
+			if (!handler.Processed)
+				await handler.ProcessAsync<T>(Resolver);
+
+			_model = handler.GetModel<T>();
 		}
 	}
 }

src/Simplify.Web/Controller{T}.cs

@@ -38,7 +38,12 @@ public virtual T Model
 		/// </summary>
 		public virtual async Task ReadModelAsync()
 		{
-			_model = await Resolver.Resolve<IModelHandler>().ProcessAsync<T>(Resolver);
+			var handler = Resolver.Resolve<IModelHandler>();
+
+			if (!handler.Processed)
+				await handler.ProcessAsync<T>(Resolver);
+
+			_model = handler.GetModel<T>();
 		}
 	}
 }

src/Simplify.Web/Model/Binding/ModelBinderEventArgs.cs

@@ -14,10 +14,7 @@ public class ModelBinderEventArgs<T> : EventArgs
 		/// Initializes a new instance of the <see cref="ModelBinderEventArgs{T}"/> class.
 		/// </summary>
 		/// <param name="context">The context.</param>
-		public ModelBinderEventArgs(IWebContext context)
-		{
-			Context = context;
-		}
+		public ModelBinderEventArgs(IWebContext context) => Context = context;
 
 		/// <summary>
 		/// Gets the model.

src/Simplify.Web/Model/HttpModelHandler.cs

@@ -16,14 +16,13 @@ public class HttpModelHandler : IModelHandler
 	{
 		private readonly IWebContext _context;
 
+		private object? _model;
+
 		/// <summary>
 		/// Initializes a new instance of the <see cref="HttpModelHandler"/> class.
 		/// </summary>
 		/// <param name="context">The context.</param>
-		public HttpModelHandler(IWebContext context)
-		{
-			_context = context;
-		}
+		public HttpModelHandler(IWebContext context) => _context = context;
 
 		/// <summary>
 		/// Gets the model binders types.
@@ -54,33 +53,34 @@ public HttpModelHandler(IWebContext context)
 			typeof (ValidationAttributesExecutor)
 		};
 
+		/// <summary>
+		/// Gets a value indicating whether model has been processed (parsed/validated).
+		/// </summary>
+		public bool Processed { get; private set; }
+
 		/// <summary>
 		/// Adds the model binder into model binders list, this type should be registered in Simplify.DI container.
 		/// </summary>
 		/// <typeparam name="T"></typeparam>
 		public static void RegisterModelBinder<T>()
-			where T : IModelBinder
-		{
+			where T : IModelBinder =>
 			ModelBindersTypes.Add(typeof(T));
-		}
 
 		/// <summary>
 		/// Adds the model validator into model validators list, this type should be registered in Simplify.DI container.
 		/// </summary>
 		/// <typeparam name="T"></typeparam>
 		public static void RegisterModelValidator<T>()
-			where T : IModelValidator
-		{
+			where T : IModelValidator =>
 			ModelValidatorsTypes.Add(typeof(T));
-		}
 
 		/// <summary>
 		/// Parses model and validates it asynchronously
 		/// </summary>
 		/// <typeparam name="T">Model type</typeparam>
 		/// <param name="resolver">The resolver.</param>
 		/// <returns></returns>
-		public async Task<T> ProcessAsync<T>(IDIResolver resolver)
+		public async Task ProcessAsync<T>(IDIResolver resolver)
 		{
 			var args = new ModelBinderEventArgs<T>(_context);
 
@@ -93,12 +93,29 @@ public async Task<T> ProcessAsync<T>(IDIResolver resolver)
 
 				Validate(args, resolver);
 
-				return args.Model;
+				_model = args.Model;
+				Processed = true;
+
+				return;
 			}
 
 			throw new ModelBindingException($"Unrecognized request content type for binding: {_context.Request.ContentType}");
 		}
 
+		/// <summary>
+		/// Gets the model.
+		/// </summary>
+		/// <typeparam name="T">The model</typeparam>
+		/// <returns></returns>
+		/// <exception cref="InvalidOperationException">Error getting model, model should be processed via ProcessAsync&lt;T&gt; method first</exception>
+		public T GetModel<T>()
+		{
+			if (_model == null)
+				throw new InvalidOperationException("Error getting model, model should be processed via ProcessAsync<T> method first");
+
+			return (T)_model;
+		}
+
 		private static void Validate<T>(ModelBinderEventArgs<T> args, IDIResolver resolver)
 		{
 			foreach (var validator in ModelValidatorsTypes.Select(x => (IModelValidator)resolver.Resolve(x)))

src/Simplify.Web/Model/IModelHandler.cs

@@ -8,12 +8,23 @@ namespace Simplify.Web.Model
 	/// </summary>
 	public interface IModelHandler
 	{
+		/// <summary>
+		/// Gets a value indicating whether model has been processed (parsed/validated).
+		/// </summary>
+		bool Processed { get; }
+
 		/// <summary>
 		/// Parses model and validates it asynchronously
 		/// </summary>
 		/// <typeparam name="T">Model type</typeparam>
 		/// <param name="resolver">The resolver.</param>
 		/// <returns></returns>
-		Task<T> ProcessAsync<T>(IDIResolver resolver);
+		Task ProcessAsync<T>(IDIResolver resolver);
+
+		/// <summary>
+		/// Gets the model.
+		/// </summary>
+		/// <typeparam name="T">The model</typeparam>
+		T GetModel<T>();
 	}
 }