Merge pull request #134 from AppliedIS/fix-esignature

Restored AddSignature

DOL.WHD.Section14c.Api/App_Start/DependencyResolutionConfig.cs

@@ -41,6 +41,7 @@ public static void Register()
             container.Register<IEmployeeValidator, EmployeeValidator>(Lifestyle.Singleton);
             container.Register<IWIOAWorkerValidator, WIOAWorkerValidator>(Lifestyle.Singleton);
             container.Register<IAddressValidatorNoCounty, AddressValidatorNoCounty>(Lifestyle.Singleton);
+            container.Register<ISignatureValidator, SignatureValidator>(Lifestyle.Singleton);
 
             // This is an extension method from the integration package.
             container.RegisterWebApiControllers(GlobalConfiguration.Configuration);

DOL.WHD.Section14c.Business/DOL.WHD.Section14c.Business.csproj

@@ -80,6 +80,7 @@
     <Compile Include="Validators\IAlternateWageDataValidator.cs" />
     <Compile Include="Validators\IEmployeeValidator.cs" />
     <Compile Include="Validators\IPrevailingWageSurveyInfoValidator.cs" />
+    <Compile Include="Validators\ISignatureValidator.cs" />
     <Compile Include="Validators\ISourceEmployerValidator.cs" />
     <Compile Include="Validators\IWIOAValidator.cs" />
     <Compile Include="Validators\IWIOAWorkerValidator.cs" />
@@ -92,6 +93,7 @@
     <Compile Include="Validators\IPieceRateWageInfoValidator.cs" />
     <Compile Include="Validators\IHourlyWageInfoValidator.cs" />
     <Compile Include="Validators\PrevailingWageSurveyInfoValidator.cs" />
+    <Compile Include="Validators\SignatureValidator.cs" />
     <Compile Include="Validators\SourceEmployerValidator.cs" />
     <Compile Include="Validators\WageTypeInfoValidator.cs" />
     <Compile Include="Validators\WIOAValidator.cs" />

DOL.WHD.Section14c.Business/Validators/ApplicationSubmissionValidator.cs

@@ -7,11 +7,14 @@ namespace DOL.WHD.Section14c.Business.Validators
 {
     public class ApplicationSubmissionValidator : BaseValidator<ApplicationSubmission>, IApplicationSubmissionValidator
     {
-        public ApplicationSubmissionValidator(IEmployerValidator employerValidator, IHourlyWageInfoValidator hourlyWageInfoValidator, IPieceRateWageInfoValidator pieceRateWageInfoValidator, IWorkSiteValidator workSiteValidator, IWIOAValidator wioaValidator)
+        public ApplicationSubmissionValidator(ISignatureValidator signatureValidator, IEmployerValidator employerValidator, IHourlyWageInfoValidator hourlyWageInfoValidator, IPieceRateWageInfoValidator pieceRateWageInfoValidator, IWorkSiteValidator workSiteValidator, IWIOAValidator wioaValidator)
         {
             // required
             RuleFor(a => a.EIN).NotEmpty();
             RuleFor(a => a.ApplicationTypeId).NotNull().InclusiveBetween(ResponseIds.ApplicationType.Initial, ResponseIds.ApplicationType.Renewal);
+            RuleFor(a => a.Signature).NotNull().SetValidator(signatureValidator);
+            RuleFor(a => a.ApplicationTypeId).NotNull().GreaterThanOrEqualTo(1).LessThanOrEqualTo(2);
+
             RuleFor(a => a.HasPreviousApplication).NotNull();
             RuleFor(a => a.HasPreviousCertificate).NotNull();
             RuleFor(a => a.EstablishmentType).NotNull().Must(et => et.Any() && !et.Any(x => x.EstablishmentTypeId < ResponseIds.EstablishmentType.WorkCenter) && !et.Any(x => x.EstablishmentTypeId > ResponseIds.EstablishmentType.BusinessEstablishment));

DOL.WHD.Section14c.Business/Validators/ISignatureValidator.cs

@@ -0,0 +1,9 @@
+using DOL.WHD.Section14c.Domain.Models.Submission;
+using FluentValidation;
+
+namespace DOL.WHD.Section14c.Business.Validators
+{
+    public interface ISignatureValidator : IValidator<Signature>
+    {
+    }
+}

DOL.WHD.Section14c.Business/Validators/SignatureValidator.cs

@@ -0,0 +1,16 @@
+using DOL.WHD.Section14c.Domain.Models.Submission;
+using FluentValidation;
+
+namespace DOL.WHD.Section14c.Business.Validators
+{
+    public class SignatureValidator : AbstractValidator<Signature>, ISignatureValidator
+    {
+        public SignatureValidator()
+        {
+            RuleFor(s => s.Agreement).Equal(true);
+            RuleFor(s => s.FullName).NotEmpty();
+            RuleFor(s => s.Title).NotEmpty();
+            RuleFor(s => s.Date).NotEmpty();
+        }
+    }
+}

DOL.WHD.Section14c.DataAccess/ApplicationDbContext.cs

@@ -120,6 +120,11 @@ protected override void OnModelCreating(DbModelBuilder modelBuilder)
             modelBuilder.Entity<Response>().Property(a => a.QuestionKey).IsRequired();
             modelBuilder.Entity<Response>().Property(a => a.Display).IsRequired();
             modelBuilder.Entity<Response>().Property(a => a.IsActive).IsRequired();
+            // Signature
+            modelBuilder.Entity<Signature>().Property(a => a.Agreement).IsRequired();
+            modelBuilder.Entity<Signature>().Property(a => a.FullName).IsRequired();
+            modelBuilder.Entity<Signature>().Property(a => a.Title).IsRequired();
+            modelBuilder.Entity<Signature>().Property(a => a.Date).IsRequired();
             // SourceEmployer
             modelBuilder.Entity<SourceEmployer>().Property(a => a.EmployerName).IsRequired();
             modelBuilder.Entity<SourceEmployer>().Property(a => a.Phone).IsRequired();

DOL.WHD.Section14c.DataAccess/DOL.WHD.Section14c.DataAccess.csproj

@@ -221,6 +221,10 @@
     <Compile Include="Migrations\201611081954473_RemoveRequiredCounty.Designer.cs">
       <DependentUpon>201611081954473_RemoveRequiredCounty.cs</DependentUpon>
     </Compile>
+    <Compile Include="Migrations\201611101838282_AddSignature.cs" />
+    <Compile Include="Migrations\201611101838282_AddSignature.Designer.cs">
+      <DependentUpon>201611101838282_AddSignature.cs</DependentUpon>
+    </Compile>
     <Compile Include="Migrations\Configuration.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Repositories\ApplicationRepository.cs" />
@@ -325,6 +329,9 @@
     <EmbeddedResource Include="Migrations\201611081954473_RemoveRequiredCounty.resx">
       <DependentUpon>201611081954473_RemoveRequiredCounty.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Migrations\201611101838282_AddSignature.resx">
+      <DependentUpon>201611101838282_AddSignature.cs</DependentUpon>
+    </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

DOL.WHD.Section14c.DataAccess/Migrations/201611101838282_AddSignature.cs

@@ -0,0 +1,43 @@
+namespace DOL.WHD.Section14c.DataAccess.Migrations
+{
+    using System;
+    using System.Data.Entity.Migrations;
+
+    public partial class AddSignature : DbMigration
+    {
+        public override void Up()
+        {
+            CreateTable(
+                "dbo.Signatures",
+                c => new
+                    {
+                        Id = c.Guid(nullable: false),
+                        Agreement = c.Boolean(nullable: false),
+                        FullName = c.String(nullable: false),
+                        Title = c.String(nullable: false),
+                        Date = c.DateTime(nullable: false),
+                        CreatedBy_Id = c.String(),
+                        CreatedAt = c.DateTime(nullable: false),
+                        LastModifiedBy_Id = c.String(maxLength: 128),
+                        LastModifiedAt = c.DateTime(nullable: false),
+                    })
+                .PrimaryKey(t => t.Id)
+                .ForeignKey("dbo.Users", t => t.LastModifiedBy_Id)
+                .Index(t => t.LastModifiedBy_Id);
+
+            AddColumn("dbo.ApplicationSubmissions", "Signature_Id", c => c.Guid());
+            CreateIndex("dbo.ApplicationSubmissions", "Signature_Id");
+            AddForeignKey("dbo.ApplicationSubmissions", "Signature_Id", "dbo.Signatures", "Id");
+        }
+
+        public override void Down()
+        {
+            DropForeignKey("dbo.ApplicationSubmissions", "Signature_Id", "dbo.Signatures");
+            DropForeignKey("dbo.Signatures", "LastModifiedBy_Id", "dbo.Users");
+            DropIndex("dbo.Signatures", new[] { "LastModifiedBy_Id" });
+            DropIndex("dbo.ApplicationSubmissions", new[] { "Signature_Id" });
+            DropColumn("dbo.ApplicationSubmissions", "Signature_Id");
+            DropTable("dbo.Signatures");
+        }
+    }
+}

DOL.WHD.Section14c.Domain/DOL.WHD.Section14c.Domain.csproj

@@ -90,6 +90,7 @@
     <Compile Include="Models\Submission\PieceRateWageInfo.cs" />
     <Compile Include="Models\Submission\PrevailingWageSurveyInfo.cs" />
     <Compile Include="Models\Submission\Response.cs" />
+    <Compile Include="Models\Submission\Signature.cs" />
     <Compile Include="Models\Submission\SourceEmployer.cs" />
     <Compile Include="Models\Submission\WageTypeInfo.cs" />
     <Compile Include="Models\Submission\WIOA.cs" />

DOL.WHD.Section14c.Domain/Models/Submission/ApplicationSubmission.cs

@@ -13,6 +13,12 @@ public ApplicationSubmission()
 
         public Guid Id { get; set; }
 
+        #region Assurances
+
+        public Signature Signature { get; set; }
+
+        #endregion
+
         #region Application Info
 
         public string EIN { get; set; }

DOL.WHD.Section14c.Domain/Models/Submission/Signature.cs

@@ -0,0 +1,18 @@
+using System;
+
+namespace DOL.WHD.Section14c.Domain.Models.Submission
+{
+    public class Signature : BaseEntity
+    {
+        public Signature()
+        {
+            Id = Guid.NewGuid();
+        }
+
+        public Guid Id { get; set; }
+        public bool? Agreement { get; set; }
+        public string FullName { get; set; }
+        public string Title { get; set; }
+        public DateTime Date { get; set; }
+    }
+}

DOL.WHD.Section14c.Test/Business/Validators/SignatureValidatorTests.cs

@@ -0,0 +1,41 @@
+using System;
+using DOL.WHD.Section14c.Business.Validators;
+using FluentValidation.TestHelper;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace DOL.WHD.Section14c.Test.Business.Validators
+{
+    [TestClass]
+    public class SignatureValidatorTests
+    {
+        private ISignatureValidator _signatureValidator;
+        public SignatureValidatorTests()
+        {
+            _signatureValidator = new SignatureValidator();
+        }
+
+        [TestMethod]
+        public void Should_Require_Agreement()
+        {
+            _signatureValidator.ShouldHaveValidationErrorFor(x => x.Agreement, null as bool?);
+        }
+
+        [TestMethod]
+        public void Should_Require_FullName()
+        {
+            _signatureValidator.ShouldHaveValidationErrorFor(x => x.FullName, "");
+        }
+
+        [TestMethod]
+        public void Should_Require_Title()
+        {
+            _signatureValidator.ShouldHaveValidationErrorFor(x => x.Title, "");
+        }
+
+        [TestMethod]
+        public void Should_Require_Date()
+        {
+            _signatureValidator.ShouldHaveValidationErrorFor(x => x.Date, default(DateTime));
+        }
+    }
+}

DOL.WHD.Section14c.Test/DOL.WHD.Section14c.Test.csproj

@@ -106,6 +106,7 @@
     <Compile Include="Business\Validators\HourlyWageInfoValidatorTests.cs" />
     <Compile Include="Business\Validators\PieceRateWageInfoValidatorTests.cs" />
     <Compile Include="Business\Validators\PrevailingWageSurveyInfoValidatorTests.cs" />
+    <Compile Include="Business\Validators\SignatureValidatorTests.cs" />
     <Compile Include="Business\Validators\SourceEmployerValidatorTests.cs" />
     <Compile Include="Business\Validators\WIOAValidatorTests.cs" />
     <Compile Include="Business\Validators\WIOAWorkerValidatorTests.cs" />
@@ -125,6 +126,7 @@
     <Compile Include="Domain\Models\Submission\PieceRateWageInfoTests.cs" />
     <Compile Include="Domain\Models\Submission\PrevailingWageSurveyInfoTests.cs" />
     <Compile Include="Domain\Models\Submission\ResponseTests.cs" />
+    <Compile Include="Domain\Models\Submission\SignatureTests.cs" />
     <Compile Include="Domain\Models\Submission\WIOAWorkerTests.cs" />
     <Compile Include="Domain\Models\Submission\WorkSiteTests.cs" />
     <Compile Include="Domain\ViewModels\AccountDetailsViewModelTests.cs" />

DOL.WHD.Section14c.Test/Domain/Models/Submission/SignatureTests.cs

@@ -0,0 +1,32 @@
+using System;
+using DOL.WHD.Section14c.Domain.Models.Submission;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace DOL.WHD.Section14c.Test.Domain.Models.Submission
+{
+    [TestClass]
+    public class SignatureTests
+    {
+        [TestMethod]
+        public void Signature_PublicProperties()
+        {
+            var agreement = true;
+            var fullName = "Full Name";
+            var title = "Title";
+            var date = DateTime.Now;
+
+            var model = new Signature
+            {
+                Agreement = agreement,
+                FullName = fullName,
+                Title = title,
+                Date = date
+            };
+
+            Assert.AreEqual(agreement, model.Agreement);
+            Assert.AreEqual(fullName, model.FullName);
+            Assert.AreEqual(title, model.Title);
+            Assert.AreEqual(date, model.Date);
+        }
+    }
+}