Added additional validation to model

Project.Zap/Controllers/ShiftController.cs

@@ -181,6 +181,11 @@ namespace Project.Zap.Controllers
         [ValidateAntiForgeryToken]
         public async Task<IActionResult> AddShift(SearchShiftViewModel viewModel)
         {
+            if(!ModelState.IsValid)
+            {
+                return View("Add", viewModel);
+            }
+
             List<Shift> shifts = viewModel.NewShift.Map().ToList();
 
             shifts.ForEach(async x => await this.shiftRepository.Add(x));

Project.Zap/Filters/DateLessThanAttribute.cs

@@ -0,0 +1,40 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.Reflection;
+
+namespace Project.Zap.Filters
+{
+    public class DateLessThanAttribute : ValidationAttribute
+    {
+        public string PropertyName { get; private set; }
+
+        public string GetErrorMessageKey() => "StartLessThanEnd";
+
+        public DateLessThanAttribute(string propertyName)
+        {
+            this.PropertyName = propertyName;
+        }
+
+        protected override ValidationResult IsValid(object value, ValidationContext validationContext)
+        {
+            ErrorMessage = ErrorMessageString;
+            DateTime currentValue = (DateTime)value;
+
+            PropertyInfo property = validationContext.ObjectType.GetProperty(this.PropertyName);
+
+            if (property == null)
+            {
+                throw new ArgumentException("Property with this name not found");
+            }                
+
+            DateTime comparisonValue = (DateTime)property.GetValue(validationContext.ObjectInstance);
+
+            if (currentValue > comparisonValue)
+            {
+                return new ValidationResult(ErrorMessage);
+            }                
+
+            return ValidationResult.Success;
+        }
+    }
+}

Project.Zap/Filters/DateLessThanAttributeAdapter.cs

@@ -0,0 +1,26 @@
+using Microsoft.AspNetCore.Mvc.DataAnnotations;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using Microsoft.Extensions.Localization;
+
+namespace Project.Zap.Filters
+{
+    public class DateLessThanAttributeAdapter : AttributeAdapterBase<DateLessThanAttribute>
+    {
+        private readonly IStringLocalizer stringLocalizer;
+
+        public DateLessThanAttributeAdapter(DateLessThanAttribute attribute, IStringLocalizer stringLocalizer) : base(attribute, stringLocalizer)
+        {
+            this.stringLocalizer = stringLocalizer;
+        }
+        public override void AddValidation(ClientModelValidationContext context)
+        {
+            MergeAttribute(context.Attributes, "data-val", "true");
+            MergeAttribute(context.Attributes, "data-val-datelessthan", GetErrorMessage(context));
+
+            string propertyName = Attribute.PropertyName;
+            MergeAttribute(context.Attributes, "data-val-datelessthan-property", propertyName);
+        }
+
+        public override string GetErrorMessage(ModelValidationContextBase validationContext) => this.stringLocalizer[Attribute.GetErrorMessageKey()];
+    }
+}

Project.Zap/Filters/DateLessThanAttributeAdapterProvider.cs

@@ -0,0 +1,21 @@
+using Microsoft.AspNetCore.Mvc.DataAnnotations;
+using Microsoft.Extensions.Localization;
+using System.ComponentModel.DataAnnotations;
+
+namespace Project.Zap.Filters
+{
+    public class DateLessThanAttributeAdapterProvider : IValidationAttributeAdapterProvider
+    {
+        private readonly IValidationAttributeAdapterProvider baseProvider = new ValidationAttributeAdapterProvider();
+
+        public IAttributeAdapter GetAttributeAdapter(ValidationAttribute attribute, IStringLocalizer stringLocalizer)
+        {
+            if (attribute is DateLessThanAttribute dateLessThanAttribute)
+            {
+                return new DateLessThanAttributeAdapter(dateLessThanAttribute, stringLocalizer);
+            }
+
+            return baseProvider.GetAttributeAdapter(attribute, stringLocalizer);
+        }
+    }
+}

Project.Zap/Models/ShiftViewModel.cs

@@ -1,4 +1,5 @@
 using Microsoft.AspNetCore.Mvc;
+using Project.Zap.Filters;
 using System;
 using System.ComponentModel.DataAnnotations;
 
@@ -15,6 +16,7 @@ namespace Project.Zap.Models
         [BindProperty]
         [Required]
         [Display(Name = "Start")]
+        [DateLessThan("End")]
         [DisplayFormat(DataFormatString = "{yyyy-MM-ddTHH:mm}")]
         public DateTime Start { get; set; } = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, 0, 0, 0);
 
@@ -31,11 +33,13 @@ namespace Project.Zap.Models
 
         [BindProperty]
         [Required]   
+        [Range(1, 200)]
         [Display(Name = "Quantity")]
         public int Quantity { get; set; }
 
         [BindProperty]
         [Required]
+        [Range(0, 200)]
         [Display(Name = "Available")]
         public int Available { get; set; }
 

Project.Zap/Resources/Models/ShiftViewModel.en-US.resx

@@ -129,6 +129,9 @@
   <data name="Start" xml:space="preserve">
     <value>Start</value>
   </data>
+  <data name="StartLessThanEnd" xml:space="preserve">
+    <value>Start Date and Time needs to be before End</value>
+  </data>
   <data name="StoreName" xml:space="preserve">
     <value>Store Name</value>
   </data>

Project.Zap/Startup.cs

@@ -4,6 +4,7 @@ using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Localization;
+using Microsoft.AspNetCore.Mvc.DataAnnotations;
 using Microsoft.AspNetCore.Mvc.Razor;
 using Microsoft.Azure.Cosmos;
 using Microsoft.Azure.Cosmos.Fluent;
@@ -14,6 +15,7 @@ using Microsoft.Extensions.Localization;
 using Microsoft.Graph;
 using Microsoft.Graph.Auth;
 using Microsoft.Identity.Client;
+using Project.Zap.Filters;
 using Project.Zap.Library.Models;
 using Project.Zap.Library.Services;
 using Project.Zap.Middleware;
@@ -65,7 +67,9 @@ namespace Project.Zap
             services.AddLocalization(options => options.ResourcesPath = "Resources");
             services.AddControllers().AddViewLocalization(LanguageViewLocationExpanderFormat.Suffix)
                .AddDataAnnotationsLocalization();
-            services.AddRazorPages();            
+            services.AddRazorPages();
+
+            services.AddSingleton<IValidationAttributeAdapterProvider, DateLessThanAttributeAdapterProvider>();
 
             services.AddTransient<Database>(x => this.GetCosmosDatabase().Result);
             

Project.Zap/Views/Shift/Add.cshtml

@@ -1,7 +1,7 @@
 @{
-    @using Microsoft.AspNetCore.Mvc.Localization
+                @using Microsoft.AspNetCore.Mvc.Localization
 
-    @inject IViewLocalizer Localizer
+                            @inject IViewLocalizer Localizer
 }
 
 @model Project.Zap.Models.SearchShiftViewModel
@@ -38,4 +38,23 @@
     </div>
     <input type="hidden" asp-for="@Model.NewShift.Available" />
     <button type="submit" class="btn btn-primary mb-2">@Localizer["AddButton"]</button>
-</form>
+</form>
+
+@section Scripts
+{
+    <script>
+        $.validator.addMethod('datelessthan', function (value, element, params) {
+            var compareDateId = "#NewShift_" + params[0].dataset.valDatelessthanProperty;
+            var compareValue = $(compareDateId).val()
+
+            return value < compareValue;
+
+            return true;
+        });
+
+        $.validator.unobtrusive.adapters.add('datelessthan', ['property'], function (options) {
+            options.rules['datelessthan'] = [options.element, parseInt(options.params['property'])];
+            options.messages['datelessthan'] = options.message;
+        });
+    </script>
+}