From 6b111190efaee4a5f7dc3f0ac769e78bed3ea5cb Mon Sep 17 00:00:00 2001 From: Kyle Linden Date: Wed, 26 Oct 2016 16:49:24 -0400 Subject: [PATCH 1/2] updates to required fields --- .../DOL.WHD.Section14c.DataAccess.csproj | 7 + ...262048363_RequiredFieldUpdates.Designer.cs | 29 ++++ .../201610262048363_RequiredFieldUpdates.cs | 40 ++++++ .../201610262048363_RequiredFieldUpdates.resx | 126 ++++++++++++++++++ .../Submission/ApplicationSubmission.cs | 2 - .../Models/Submission/Dto/EmployerInfoDto.cs | 5 +- .../Models/Submission/Dto/WageTypeInfoDto.cs | 1 + .../Models/Submission/Employee.cs | 1 - .../Models/Submission/EmployerInfo.cs | 3 - .../Models/Submission/WageTypeInfo.cs | 1 + .../Models/Submission/WorkSite.cs | 1 - 11 files changed, 207 insertions(+), 9 deletions(-) create mode 100644 DOL.WHD.Section14c.DataAccess/Migrations/201610262048363_RequiredFieldUpdates.Designer.cs create mode 100644 DOL.WHD.Section14c.DataAccess/Migrations/201610262048363_RequiredFieldUpdates.cs create mode 100644 DOL.WHD.Section14c.DataAccess/Migrations/201610262048363_RequiredFieldUpdates.resx diff --git a/DOL.WHD.Section14c.DataAccess/DOL.WHD.Section14c.DataAccess.csproj b/DOL.WHD.Section14c.DataAccess/DOL.WHD.Section14c.DataAccess.csproj index 51fa4091..951cd28e 100644 --- a/DOL.WHD.Section14c.DataAccess/DOL.WHD.Section14c.DataAccess.csproj +++ b/DOL.WHD.Section14c.DataAccess/DOL.WHD.Section14c.DataAccess.csproj @@ -175,6 +175,10 @@ 201610261825305_KeyUpdates.cs + + + 201610262048363_RequiredFieldUpdates.cs + @@ -246,6 +250,9 @@ 201610261825305_KeyUpdates.cs + + 201610262048363_RequiredFieldUpdates.cs + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 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 + + + dbo + + \ No newline at end of file diff --git a/DOL.WHD.Section14c.Domain/Models/Submission/ApplicationSubmission.cs b/DOL.WHD.Section14c.Domain/Models/Submission/ApplicationSubmission.cs index c2b4b351..d1c295ad 100644 --- a/DOL.WHD.Section14c.Domain/Models/Submission/ApplicationSubmission.cs +++ b/DOL.WHD.Section14c.Domain/Models/Submission/ApplicationSubmission.cs @@ -50,7 +50,6 @@ public ApplicationSubmission() [Required] public bool HasPreviousCertificate { get; set; } - // TODO: required if HasPreviousCertificate public string CertificateNumber { get; set; } [Required] @@ -96,7 +95,6 @@ public ApplicationSubmission() [Required] public int TotalNumWorkSites { get; set; } - // TODO: validation to make sure WorkSites.Count matches TotalNumWorkSites public virtual ICollection WorkSites { get; set; } #endregion diff --git a/DOL.WHD.Section14c.Domain/Models/Submission/Dto/EmployerInfoDto.cs b/DOL.WHD.Section14c.Domain/Models/Submission/Dto/EmployerInfoDto.cs index b3a6b41e..fcc5674b 100644 --- a/DOL.WHD.Section14c.Domain/Models/Submission/Dto/EmployerInfoDto.cs +++ b/DOL.WHD.Section14c.Domain/Models/Submission/Dto/EmployerInfoDto.cs @@ -11,18 +11,19 @@ public class EmployerInfoDto [Required] public bool HasTradeName { get; set; } - [Required] public string TradeName { get; set; } [Required] public bool LegalNameHasChanged { get; set; } - [Required] public string PriorLegalName { get; set; } [Required] public Address PhysicalAddress { get; set; } + [Required] + public bool HasDifferentMailingAddress { get; set; } + [Required] public bool HasParentOrg { get; set; } diff --git a/DOL.WHD.Section14c.Domain/Models/Submission/Dto/WageTypeInfoDto.cs b/DOL.WHD.Section14c.Domain/Models/Submission/Dto/WageTypeInfoDto.cs index 09e5872b..00cdac63 100644 --- a/DOL.WHD.Section14c.Domain/Models/Submission/Dto/WageTypeInfoDto.cs +++ b/DOL.WHD.Section14c.Domain/Models/Submission/Dto/WageTypeInfoDto.cs @@ -24,6 +24,7 @@ public class WageTypeInfoDto public Guid? SCAWageDeterminationId { get; set; } // Documentation + [Required] public Guid? AttachmentId { get; set; } } } diff --git a/DOL.WHD.Section14c.Domain/Models/Submission/Employee.cs b/DOL.WHD.Section14c.Domain/Models/Submission/Employee.cs index 2290a956..007afb2f 100644 --- a/DOL.WHD.Section14c.Domain/Models/Submission/Employee.cs +++ b/DOL.WHD.Section14c.Domain/Models/Submission/Employee.cs @@ -19,7 +19,6 @@ public Employee() public int PrimaryDisabilityId { get; set; } public virtual Response PrimaryDisability { get; set; } - // TODO: required if PrimaryDisability == Other public string PrimaryDisabilityOther { get; set; } [Required] diff --git a/DOL.WHD.Section14c.Domain/Models/Submission/EmployerInfo.cs b/DOL.WHD.Section14c.Domain/Models/Submission/EmployerInfo.cs index cb6a68cb..36942481 100644 --- a/DOL.WHD.Section14c.Domain/Models/Submission/EmployerInfo.cs +++ b/DOL.WHD.Section14c.Domain/Models/Submission/EmployerInfo.cs @@ -18,13 +18,11 @@ public EmployerInfo() [Required] public bool HasTradeName { get; set; } - [Required] public string TradeName { get; set; } [Required] public bool LegalNameHasChanged { get; set; } - [Required] public string PriorLegalName { get; set; } [Required] @@ -48,7 +46,6 @@ public EmployerInfo() public int EmployerStatusId { get; set; } public virtual Response EmployerStatus { get; set; } - // TODO: required if Status == Other public string EmployerStatusOther { get; set; } [Required] diff --git a/DOL.WHD.Section14c.Domain/Models/Submission/WageTypeInfo.cs b/DOL.WHD.Section14c.Domain/Models/Submission/WageTypeInfo.cs index ff62a0ef..dd6b2d28 100644 --- a/DOL.WHD.Section14c.Domain/Models/Submission/WageTypeInfo.cs +++ b/DOL.WHD.Section14c.Domain/Models/Submission/WageTypeInfo.cs @@ -33,6 +33,7 @@ public WageTypeInfo() public Attachment SCAWageDetermination { get; set; } // Documentation + [Required] public Guid? AttachmentId { get; set; } public Attachment Attachment { get; set; } } diff --git a/DOL.WHD.Section14c.Domain/Models/Submission/WorkSite.cs b/DOL.WHD.Section14c.Domain/Models/Submission/WorkSite.cs index be501783..d7b664f5 100644 --- a/DOL.WHD.Section14c.Domain/Models/Submission/WorkSite.cs +++ b/DOL.WHD.Section14c.Domain/Models/Submission/WorkSite.cs @@ -31,7 +31,6 @@ public WorkSite() [Required] public int NumEmployees { get; set; } - // TODO: validate Employees.Count == NumEmployees public virtual ICollection Employees { get; set; } } } From 96103df1867de957e4ca046d4eb45f92d15fb1f5 Mon Sep 17 00:00:00 2001 From: Kyle Linden Date: Thu, 27 Oct 2016 12:11:20 -0400 Subject: [PATCH 2/2] refactor submission controller and models Refactor the submission code to use a single set of models as opposed to using a set of DTOs. This was accomplished by moving the EF constraints to fluent API configuration and adding a couple of setter only properties to the models to handle mapping the many-to-many relationships. --- .../App_Start/AutoMapperConfiguration.cs | 39 ------- .../Controllers/ApplicationController.cs | 13 +-- .../DOL.WHD.Section14c.Api.csproj | 5 - DOL.WHD.Section14c.Api/Global.asax.cs | 3 - DOL.WHD.Section14c.Api/packages.config | 1 - .../ApplicationDbContext.cs | 105 +++++++++++++++++- .../DOL.WHD.Section14c.Domain.csproj | 13 --- .../Models/Submission/AlternateWageData.cs | 4 - .../Submission/ApplicationSubmission.cs | 50 +++++---- .../Models/Submission/Attachment.cs | 7 -- .../Submission/Dto/AlternateWageDataDto.cs | 12 -- .../Dto/ApplicationSubmissionDto.cs | 101 ----------------- .../Models/Submission/Dto/EmployeeDto.cs | 43 ------- .../Models/Submission/Dto/EmployerInfoDto.cs | 80 ------------- .../Submission/Dto/HourlyWageInfoDto.cs | 10 -- .../Submission/Dto/PieceRateWageInfoDto.cs | 19 ---- .../Dto/PrevailingWageSurveyInfoDto.cs | 18 --- .../Submission/Dto/SourceEmployerDto.cs | 36 ------ .../Models/Submission/Dto/WIOADto.cs | 17 --- .../Models/Submission/Dto/WIOAWorkerDto.cs | 13 --- .../Models/Submission/Dto/WageTypeInfoDto.cs | 30 ----- .../Models/Submission/Dto/WorkSiteDto.cs | 29 ----- .../Submission/Dto/WorkerCountInfoDto.cs | 22 ---- .../Models/Submission/Employee.cs | 12 -- .../Models/Submission/EmployerInfo.cs | 18 --- .../Models/Submission/HourlyWageInfo.cs | 6 +- .../Models/Submission/PieceRateWageInfo.cs | 9 +- .../Submission/PrevailingWageSurveyInfo.cs | 3 - .../Models/Submission/Response.cs | 12 +- .../Models/Submission/SourceEmployer.cs | 10 -- .../Models/Submission/WIOA.cs | 3 - .../Models/Submission/WIOAWorker.cs | 3 - .../Models/Submission/WageTypeInfo.cs | 6 - .../Models/Submission/WorkSite.cs | 16 +-- .../Models/Submission/WorkerCountInfo.cs | 6 - 35 files changed, 146 insertions(+), 628 deletions(-) delete mode 100644 DOL.WHD.Section14c.Api/App_Start/AutoMapperConfiguration.cs delete mode 100644 DOL.WHD.Section14c.Domain/Models/Submission/Dto/AlternateWageDataDto.cs delete mode 100644 DOL.WHD.Section14c.Domain/Models/Submission/Dto/ApplicationSubmissionDto.cs delete mode 100644 DOL.WHD.Section14c.Domain/Models/Submission/Dto/EmployeeDto.cs delete mode 100644 DOL.WHD.Section14c.Domain/Models/Submission/Dto/EmployerInfoDto.cs delete mode 100644 DOL.WHD.Section14c.Domain/Models/Submission/Dto/HourlyWageInfoDto.cs delete mode 100644 DOL.WHD.Section14c.Domain/Models/Submission/Dto/PieceRateWageInfoDto.cs delete mode 100644 DOL.WHD.Section14c.Domain/Models/Submission/Dto/PrevailingWageSurveyInfoDto.cs delete mode 100644 DOL.WHD.Section14c.Domain/Models/Submission/Dto/SourceEmployerDto.cs delete mode 100644 DOL.WHD.Section14c.Domain/Models/Submission/Dto/WIOADto.cs delete mode 100644 DOL.WHD.Section14c.Domain/Models/Submission/Dto/WIOAWorkerDto.cs delete mode 100644 DOL.WHD.Section14c.Domain/Models/Submission/Dto/WageTypeInfoDto.cs delete mode 100644 DOL.WHD.Section14c.Domain/Models/Submission/Dto/WorkSiteDto.cs delete mode 100644 DOL.WHD.Section14c.Domain/Models/Submission/Dto/WorkerCountInfoDto.cs diff --git a/DOL.WHD.Section14c.Api/App_Start/AutoMapperConfiguration.cs b/DOL.WHD.Section14c.Api/App_Start/AutoMapperConfiguration.cs deleted file mode 100644 index 9a61fa65..00000000 --- a/DOL.WHD.Section14c.Api/App_Start/AutoMapperConfiguration.cs +++ /dev/null @@ -1,39 +0,0 @@ -using System.Linq; -using AutoMapper; -using AutoMapper.Mappers; -using DOL.WHD.Section14c.Domain.Models.Submission; -using DOL.WHD.Section14c.Domain.Models.Submission.Dto; - -namespace DOL.WHD.Section14c.Api -{ - public static class AutoMapperConfiguration - { - public static void Configure() - { - Mapper.Initialize(cfg => - { - cfg.AddConditionalObjectMapper().Where((s, d) => s.Name == d.Name + "Dto"); - - // many to many relationships - cfg.CreateMap() - .AfterMap( - (src, dest) => - dest.EstablishmentType = - src.EstablishmentTypeId.Select( - x => new ApplicationSubmissionEstablishmentType {EstablishmentTypeId = x, ApplicationSubmissionId = dest.Id}).ToList()) - .AfterMap( - (src, dest) => - dest.ProvidingFacilitiesDeductionType = - src.ProvidingFacilitiesDeductionTypeId.Select( - x => new ApplicationSubmissionProvidingFacilitiesDeductionType { ProvidingFacilitiesDeductionTypeId = x, ApplicationSubmissionId = dest.Id }).ToList()); - - cfg.CreateMap() - .AfterMap( - (src, dest) => - dest.WorkSiteType = - src.WorkSiteTypeId.Select( - x => new WorkSiteWorkSiteType() { WorkSiteTypeId = x, WorkSiteId = dest.Id }).ToList()); - }); - } - } -} \ No newline at end of file diff --git a/DOL.WHD.Section14c.Api/Controllers/ApplicationController.cs b/DOL.WHD.Section14c.Api/Controllers/ApplicationController.cs index 4581a629..dd531c40 100644 --- a/DOL.WHD.Section14c.Api/Controllers/ApplicationController.cs +++ b/DOL.WHD.Section14c.Api/Controllers/ApplicationController.cs @@ -1,10 +1,7 @@ -using System; -using System.Threading.Tasks; +using System.Threading.Tasks; using System.Web.Http; -using AutoMapper; using DOL.WHD.Section14c.Business; using DOL.WHD.Section14c.Domain.Models.Submission; -using DOL.WHD.Section14c.Domain.Models.Submission.Dto; namespace DOL.WHD.Section14c.Api.Controllers { @@ -19,14 +16,8 @@ public ApplicationController(IIdentityService identityService, IApplicationServi _applicationService = applicationService; } - public async Task Submit([FromBody]ApplicationSubmissionDto submissionDto) + public async Task Submit([FromBody]ApplicationSubmission submission) { - var submission = Mapper.Map(submissionDto); - if (!ModelState.IsValid) - { - return BadRequest(ModelState); - } - // make sure user has rights to the EIN var hasEINClaim = _identityService.UserHasEINClaim(User, submission.EIN); if (!hasEINClaim) diff --git a/DOL.WHD.Section14c.Api/DOL.WHD.Section14c.Api.csproj b/DOL.WHD.Section14c.Api/DOL.WHD.Section14c.Api.csproj index 3e66b69b..75ce2334 100644 --- a/DOL.WHD.Section14c.Api/DOL.WHD.Section14c.Api.csproj +++ b/DOL.WHD.Section14c.Api/DOL.WHD.Section14c.Api.csproj @@ -48,10 +48,6 @@ true - - ..\packages\AutoMapper.5.1.1\lib\net45\AutoMapper.dll - True - ..\packages\EntityFramework6.Npgsql.3.1.1\lib\net45\EntityFramework6.Npgsql.dll True @@ -209,7 +205,6 @@ - diff --git a/DOL.WHD.Section14c.Api/Global.asax.cs b/DOL.WHD.Section14c.Api/Global.asax.cs index 19cde58f..94f4c1ce 100644 --- a/DOL.WHD.Section14c.Api/Global.asax.cs +++ b/DOL.WHD.Section14c.Api/Global.asax.cs @@ -17,9 +17,6 @@ protected void Application_Start() // use camel cased JSON in Web API GlobalConfiguration.Configuration.Formatters.JsonFormatter.SerializerSettings.ContractResolver = new CamelCasePropertyNamesContractResolver(); - - // Automapper - AutoMapperConfiguration.Configure(); } } } diff --git a/DOL.WHD.Section14c.Api/packages.config b/DOL.WHD.Section14c.Api/packages.config index 444a623f..16811e40 100644 --- a/DOL.WHD.Section14c.Api/packages.config +++ b/DOL.WHD.Section14c.Api/packages.config @@ -1,6 +1,5 @@  - diff --git a/DOL.WHD.Section14c.DataAccess/ApplicationDbContext.cs b/DOL.WHD.Section14c.DataAccess/ApplicationDbContext.cs index 5d7f1391..0ea3d240 100644 --- a/DOL.WHD.Section14c.DataAccess/ApplicationDbContext.cs +++ b/DOL.WHD.Section14c.DataAccess/ApplicationDbContext.cs @@ -7,7 +7,6 @@ using System; using System.Linq; using System.Web; -using System.Security.Claims; namespace DOL.WHD.Section14c.DataAccess { @@ -35,6 +34,110 @@ protected override void OnModelCreating(DbModelBuilder modelBuilder) { base.OnModelCreating(modelBuilder); + // data constraints + // ApplicationSubmission + modelBuilder.Entity().Property(a => a.RepresentativePayeeSocialSecurityBenefits).IsRequired(); + modelBuilder.Entity().Property(a => a.ProvidingFacilities).IsRequired(); + modelBuilder.Entity().Property(a => a.ReviewedDocumentation).IsRequired(); + modelBuilder.Entity().Property(a => a.EIN).IsRequired(); + modelBuilder.Entity().Property(a => a.ApplicationTypeId).IsRequired(); + modelBuilder.Entity().Property(a => a.HasPreviousApplication).IsRequired(); + modelBuilder.Entity().Property(a => a.HasPreviousCertificate).IsRequired(); + modelBuilder.Entity().Property(a => a.ContactName).IsRequired(); + modelBuilder.Entity().Property(a => a.ContactPhone).IsRequired(); + modelBuilder.Entity().Property(a => a.ContactEmail).IsRequired(); + modelBuilder.Entity().Property(a => a.PayTypeId).IsRequired(); + modelBuilder.Entity().Property(a => a.TotalNumWorkSites).IsRequired(); + modelBuilder.Entity().HasRequired(a => a.Employer); + modelBuilder.Entity().HasRequired(a => a.WIOA); + // Attachment + modelBuilder.Entity().Property(a => a.OriginalFileName).IsRequired().HasMaxLength(255); + modelBuilder.Entity().Property(a => a.RepositoryFilePath).IsRequired().HasMaxLength(255); + modelBuilder.Entity().Property(a => a.FileSize).IsRequired(); + modelBuilder.Entity().Property(a => a.MimeType).IsRequired().HasMaxLength(255); + // Employee + modelBuilder.Entity().Property(a => a.Name).IsRequired(); + modelBuilder.Entity().Property(a => a.PrimaryDisabilityId).IsRequired(); + modelBuilder.Entity().Property(a => a.WorkType).IsRequired(); + modelBuilder.Entity().Property(a => a.NumJobs).IsRequired(); + modelBuilder.Entity().Property(a => a.AvgWeeklyHours).IsRequired(); + modelBuilder.Entity().Property(a => a.AvgHourlyEarnings).IsRequired(); + modelBuilder.Entity().Property(a => a.PrevailingWage).IsRequired(); + modelBuilder.Entity().Property(a => a.ProductivityMeasure).IsRequired(); + modelBuilder.Entity().Property(a => a.CommensurateWageRate).IsRequired(); + modelBuilder.Entity().Property(a => a.TotalHours).IsRequired(); + modelBuilder.Entity().Property(a => a.WorkAtOtherSite).IsRequired(); + // EmployerInfo + modelBuilder.Entity().Property(a => a.LegalName).IsRequired(); + modelBuilder.Entity().Property(a => a.HasTradeName).IsRequired(); + modelBuilder.Entity().Property(a => a.LegalNameHasChanged).IsRequired(); + modelBuilder.Entity().Property(a => a.HasDifferentMailingAddress).IsRequired(); + modelBuilder.Entity().Property(a => a.HasParentOrg).IsRequired(); + modelBuilder.Entity().Property(a => a.EmployerStatusId).IsRequired(); + modelBuilder.Entity().Property(a => a.IsEducationalAgency).IsRequired(); + modelBuilder.Entity().Property(a => a.FiscalQuarterEndDate).IsRequired(); + modelBuilder.Entity().Property(a => a.PCA).IsRequired(); + modelBuilder.Entity().Property(a => a.SCAId).IsRequired(); + modelBuilder.Entity().Property(a => a.EO13658Id).IsRequired(); + modelBuilder.Entity().Property(a => a.RepresentativePayee).IsRequired(); + modelBuilder.Entity().Property(a => a.TakeCreditForCosts).IsRequired(); + modelBuilder.Entity().Property(a => a.ProvidingFacilitiesDeductionTypeId).IsRequired(); + modelBuilder.Entity().Property(a => a.TemporaryAuthority).IsRequired(); + modelBuilder.Entity().HasRequired(a => a.PhysicalAddress); + modelBuilder.Entity().HasRequired(a => a.NumSubminimalWageWorkers); + // HourlyWageInfo + modelBuilder.Entity().Property(a => a.WorkMeasurementFrequency).IsRequired(); + modelBuilder.Entity().Property(a => a.NumWorkers).IsRequired(); + modelBuilder.Entity().Property(a => a.JobName).IsRequired(); + modelBuilder.Entity().Property(a => a.JobDescription).IsRequired(); + modelBuilder.Entity().Property(a => a.PrevailingWageMethodId).IsRequired(); + modelBuilder.Entity().Property(a => a.AttachmentId).IsRequired(); + // PieceRateWageInfo + modelBuilder.Entity().Property(a => a.PieceRateWorkDescription).IsRequired(); + modelBuilder.Entity().Property(a => a.PrevailingWageDeterminedForJob).IsRequired(); + modelBuilder.Entity().Property(a => a.StandardProductivity).IsRequired(); + modelBuilder.Entity().Property(a => a.PieceRatePaidToWorkers).IsRequired(); + modelBuilder.Entity().Property(a => a.NumWorkers).IsRequired(); + modelBuilder.Entity().Property(a => a.JobName).IsRequired(); + modelBuilder.Entity().Property(a => a.JobDescription).IsRequired(); + modelBuilder.Entity().Property(a => a.PrevailingWageMethodId).IsRequired(); + modelBuilder.Entity().Property(a => a.AttachmentId).IsRequired(); + // PrevailingWageSurveyInfo + modelBuilder.Entity().Property(a => a.PrevailingWageDetermined).IsRequired(); + // Response + modelBuilder.Entity().Property(a => a.QuestionKey).IsRequired(); + modelBuilder.Entity().Property(a => a.Display).IsRequired(); + modelBuilder.Entity().Property(a => a.IsActive).IsRequired(); + // SourceEmployer + modelBuilder.Entity().Property(a => a.EmployerName).IsRequired(); + modelBuilder.Entity().Property(a => a.Phone).IsRequired(); + modelBuilder.Entity().Property(a => a.ContactName).IsRequired(); + modelBuilder.Entity().Property(a => a.ContactTitle).IsRequired(); + modelBuilder.Entity().Property(a => a.ContactDate).IsRequired(); + modelBuilder.Entity().Property(a => a.JobDescription).IsRequired(); + modelBuilder.Entity().Property(a => a.ExperiencedWorkerWageProvided).IsRequired(); + modelBuilder.Entity().Property(a => a.ConclusionWageRateNotBasedOnEntry).IsRequired(); + modelBuilder.Entity().HasRequired(a => a.Address); + // WIOA + modelBuilder.Entity().Property(a => a.HasVerfiedDocumentaion).IsRequired(); + modelBuilder.Entity().Property(a => a.HasWIOAWorkers).IsRequired(); + // WIOAWorker + modelBuilder.Entity().Property(a => a.FullName).IsRequired(); + modelBuilder.Entity().Property(a => a.WIOAWorkerVerifiedId).IsRequired(); + // WorkerCountInfo + modelBuilder.Entity().Property(a => a.Total).IsRequired(); + modelBuilder.Entity().Property(a => a.WorkCenter).IsRequired(); + modelBuilder.Entity().Property(a => a.PatientWorkers).IsRequired(); + modelBuilder.Entity().Property(a => a.SWEP).IsRequired(); + modelBuilder.Entity().Property(a => a.BusinessEstablishment).IsRequired(); + // WorkSite + modelBuilder.Entity().Property(a => a.Name).IsRequired(); + modelBuilder.Entity().Property(a => a.SCA).IsRequired(); + modelBuilder.Entity().Property(a => a.FederalContractWorkPerformed).IsRequired(); + modelBuilder.Entity().Property(a => a.NumEmployees).IsRequired(); + modelBuilder.Entity().HasRequired(a => a.Address); + + // many to many relationships modelBuilder.Entity() .ToTable("AppSubmissionEstablishmentType") .HasKey(k => new {k.ApplicationSubmissionId, k.EstablishmentTypeId}); diff --git a/DOL.WHD.Section14c.Domain/DOL.WHD.Section14c.Domain.csproj b/DOL.WHD.Section14c.Domain/DOL.WHD.Section14c.Domain.csproj index 0264a65f..40b5721e 100644 --- a/DOL.WHD.Section14c.Domain/DOL.WHD.Section14c.Domain.csproj +++ b/DOL.WHD.Section14c.Domain/DOL.WHD.Section14c.Domain.csproj @@ -74,19 +74,6 @@ - - - - - - - - - - - - - diff --git a/DOL.WHD.Section14c.Domain/Models/Submission/AlternateWageData.cs b/DOL.WHD.Section14c.Domain/Models/Submission/AlternateWageData.cs index 25ac9470..7154ddef 100644 --- a/DOL.WHD.Section14c.Domain/Models/Submission/AlternateWageData.cs +++ b/DOL.WHD.Section14c.Domain/Models/Submission/AlternateWageData.cs @@ -1,8 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace DOL.WHD.Section14c.Domain.Models.Submission { diff --git a/DOL.WHD.Section14c.Domain/Models/Submission/ApplicationSubmission.cs b/DOL.WHD.Section14c.Domain/Models/Submission/ApplicationSubmission.cs index d1c295ad..c4b0170f 100644 --- a/DOL.WHD.Section14c.Domain/Models/Submission/ApplicationSubmission.cs +++ b/DOL.WHD.Section14c.Domain/Models/Submission/ApplicationSubmission.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; +using System.Linq; namespace DOL.WHD.Section14c.Domain.Models.Submission { @@ -15,72 +15,80 @@ public ApplicationSubmission() #region Assurances - [Required] public bool RepresentativePayeeSocialSecurityBenefits { get; set; } - // TODO: required if RepresentativePayeeSocialSecurityBenefits == true public int NumEmployeesRepresentativePayee { get; set; } - [Required] public bool ProvidingFacilities { get; set; } - // TODO: required if ProvidingFacilities == true + public IEnumerable ProvidingFacilitiesDeductionTypeId + { + set + { + ProvidingFacilitiesDeductionType = value.Select( + x => + new ApplicationSubmissionProvidingFacilitiesDeductionType + { + ProvidingFacilitiesDeductionTypeId = x, + ApplicationSubmissionId = Id + }).ToList(); + } + } public ICollection ProvidingFacilitiesDeductionType { get; set; } - // TODO: required if ProvidingFacilitiesDeductionType == Other public string ProvidingFacilitiesDeductionTypeOther { get; set; } - [Required] public bool ReviewedDocumentation { get; set; } #endregion #region Application Info - [Required] public string EIN { get; set; } - [Required] public int ApplicationTypeId { get; set; } public virtual Response ApplicationType { get; set; } - [Required] public bool HasPreviousApplication { get; set; } - [Required] public bool HasPreviousCertificate { get; set; } public string CertificateNumber { get; set; } - [Required] + public IEnumerable EstablishmentTypeId + { + set + { + EstablishmentType = + value.Select( + x => + new ApplicationSubmissionEstablishmentType + { + EstablishmentTypeId = x, + ApplicationSubmissionId = Id + }).ToList(); + } + } public virtual ICollection EstablishmentType { get; set; } - [Required] public string ContactName { get; set; } - [Required] - [Phone] public string ContactPhone { get; set; } - [Phone] public string ContactFax { get; set; } - [Required] - [EmailAddress] public string ContactEmail { get; set; } #endregion #region Employer - [Required] public virtual EmployerInfo Employer { get; set; } #endregion #region Wage Data - [Required] public int PayTypeId { get; set; } public virtual Response PayType { get; set; } @@ -92,7 +100,6 @@ public ApplicationSubmission() #region Work Sites & Employees - [Required] public int TotalNumWorkSites { get; set; } public virtual ICollection WorkSites { get; set; } @@ -101,7 +108,6 @@ public ApplicationSubmission() #region WIOA - [Required] public virtual WIOA WIOA { get; set; } #endregion diff --git a/DOL.WHD.Section14c.Domain/Models/Submission/Attachment.cs b/DOL.WHD.Section14c.Domain/Models/Submission/Attachment.cs index 48e8b3b8..6e1996e3 100644 --- a/DOL.WHD.Section14c.Domain/Models/Submission/Attachment.cs +++ b/DOL.WHD.Section14c.Domain/Models/Submission/Attachment.cs @@ -18,23 +18,16 @@ public Attachment() /// /// Name of the file as uploaded by the end user /// - [Required] - [StringLength(255)] public string OriginalFileName { get; set; } /// /// Path where the file is stored in the File Repository /// - [Required] [IgnoreDataMember] - [StringLength(255)] public string RepositoryFilePath { get; set; } - [Required] public long FileSize { get; set; } - [Required] - [StringLength(255)] public string MimeType { get; set; } [IgnoreDataMember] diff --git a/DOL.WHD.Section14c.Domain/Models/Submission/Dto/AlternateWageDataDto.cs b/DOL.WHD.Section14c.Domain/Models/Submission/Dto/AlternateWageDataDto.cs deleted file mode 100644 index ff22770d..00000000 --- a/DOL.WHD.Section14c.Domain/Models/Submission/Dto/AlternateWageDataDto.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System; - -namespace DOL.WHD.Section14c.Domain.Models.Submission.Dto -{ - public class AlternateWageDataDto - { - public string AlternateWorkDescription { get; set; } - public string AlternateDataSourceUsed { get; set; } - public double PrevailingWageProvidedBySource { get; set; } - public DateTime DataRetrieved { get; set; } - } -} diff --git a/DOL.WHD.Section14c.Domain/Models/Submission/Dto/ApplicationSubmissionDto.cs b/DOL.WHD.Section14c.Domain/Models/Submission/Dto/ApplicationSubmissionDto.cs deleted file mode 100644 index ed90e15d..00000000 --- a/DOL.WHD.Section14c.Domain/Models/Submission/Dto/ApplicationSubmissionDto.cs +++ /dev/null @@ -1,101 +0,0 @@ -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; - -namespace DOL.WHD.Section14c.Domain.Models.Submission.Dto -{ - public class ApplicationSubmissionDto - { - #region Assurances - - [Required] - public bool RepresentativePayeeSocialSecurityBenefits { get; set; } - - // TODO: required if RepresentativePayeeSocialSecurityBenefits == true - public int NumEmployeesRepresentativePayee { get; set; } - - [Required] - public bool ProvidingFacilities { get; set; } - - // TODO: required if ProvidingFacilities == true - public IEnumerable ProvidingFacilitiesDeductionTypeId { get; set; } - - // TODO: required if ProvidingFacilitiesDeductionType == Other - public string ProvidingFacilitiesDeductionTypeOther { get; set; } - - [Required] - public bool ReviewedDocumentation { get; set; } - - #endregion - - #region Application Info - - [Required] - public string EIN { get; set; } - - [Required] - public int ApplicationTypeId { get; set; } - - [Required] - public bool HasPreviousApplication { get; set; } - - [Required] - public bool HasPreviousCertificate { get; set; } - - // TODO: required if HasPreviousCertificate - public string CertificateNumber { get; set; } - - [Required] - public IEnumerable EstablishmentTypeId { get; set; } - - [Required] - public string ContactName { get; set; } - - [Required] - [Phone] - public string ContactPhone { get; set; } - - [Phone] - public string ContactFax { get; set; } - - [Required] - [EmailAddress] - public string ContactEmail { get; set; } - - #endregion - - #region Employer - - [Required] - public EmployerInfoDto Employer { get; set; } - - #endregion - - #region Wage Data - - [Required] - public int PayTypeId { get; set; } - - public HourlyWageInfoDto HourlyWageInfo { get; set; } - - public PieceRateWageInfoDto PieceRateWageInfo { get; set; } - - #endregion - - #region Work Sites & Employees - - [Required] - public int TotalNumWorkSites { get; set; } - - // TODO: validation to make sure WorkSites.Count matches TotalNumWorkSites - public IEnumerable WorkSites { get; set; } - - #endregion - - #region WIOA - - [Required] - public WIOADto WIOA { get; set; } - - #endregion - } -} diff --git a/DOL.WHD.Section14c.Domain/Models/Submission/Dto/EmployeeDto.cs b/DOL.WHD.Section14c.Domain/Models/Submission/Dto/EmployeeDto.cs deleted file mode 100644 index 4295a2f9..00000000 --- a/DOL.WHD.Section14c.Domain/Models/Submission/Dto/EmployeeDto.cs +++ /dev/null @@ -1,43 +0,0 @@ -using System.ComponentModel.DataAnnotations; - -namespace DOL.WHD.Section14c.Domain.Models.Submission.Dto -{ - public class EmployeeDto - { - [Required] - public string Name { get; set; } - - [Required] - public int PrimaryDisabilityId { get; set; } - - // TODO: required if PrimaryDisability == Other - public string PrimaryDisabilityOther { get; set; } - - [Required] - public string WorkType { get; set; } - - [Required] - public int NumJobs { get; set; } - - [Required] - public double AvgWeeklyHours { get; set; } - - [Required] - public double AvgHourlyEarnings { get; set; } - - [Required] - public double PrevailingWage { get; set; } - - [Required] - public double ProductivityMeasure { get; set; } - - [Required] - public string CommensurateWageRate { get; set; } - - [Required] - public double TotalHours { get; set; } - - [Required] - public bool WorkAtOtherSite { get; set; } - } -} diff --git a/DOL.WHD.Section14c.Domain/Models/Submission/Dto/EmployerInfoDto.cs b/DOL.WHD.Section14c.Domain/Models/Submission/Dto/EmployerInfoDto.cs deleted file mode 100644 index fcc5674b..00000000 --- a/DOL.WHD.Section14c.Domain/Models/Submission/Dto/EmployerInfoDto.cs +++ /dev/null @@ -1,80 +0,0 @@ -using System; -using System.ComponentModel.DataAnnotations; - -namespace DOL.WHD.Section14c.Domain.Models.Submission.Dto -{ - public class EmployerInfoDto - { - [Required] - public string LegalName { get; set; } - - [Required] - public bool HasTradeName { get; set; } - - public string TradeName { get; set; } - - [Required] - public bool LegalNameHasChanged { get; set; } - - public string PriorLegalName { get; set; } - - [Required] - public Address PhysicalAddress { get; set; } - - [Required] - public bool HasDifferentMailingAddress { get; set; } - - [Required] - public bool HasParentOrg { get; set; } - - public string ParentLegalName { get; set; } - - public string ParentTradeName { get; set; } - - public Address ParentAddress { get; set; } - - public bool SendMailToParent { get; set; } - - [Required] - public int EmployerStatusId { get; set; } - - // TODO: required if Status == Other - public string EmployerStatusOther { get; set; } - - [Required] - public bool IsEducationalAgency { get; set; } - - [Required] - public DateTime FiscalQuarterEndDate { get; set; } - - [Required] - public WorkerCountInfoDto NumSubminimalWageWorkers { get; set; } - - [Required] - public bool PCA { get; set; } - - [Required] - public int SCAId { get; set; } - - //SCA Wage Determinations upload - public Guid? SCAAttachmentId { get; set; } - - [Required] - public int EO13658Id { get; set; } - - [Required] - public bool RepresentativePayee { get; set; } - - [Required] - public bool TakeCreditForCosts { get; set; } - - [Required] - public int ProvidingFacilitiesDeductionTypeId { get; set; } - - public string ProvidingFacilitiesDeductionTypeOther { get; set; } - - [Required] - public bool TemporaryAuthority { get; set; } - - } -} diff --git a/DOL.WHD.Section14c.Domain/Models/Submission/Dto/HourlyWageInfoDto.cs b/DOL.WHD.Section14c.Domain/Models/Submission/Dto/HourlyWageInfoDto.cs deleted file mode 100644 index 9698b292..00000000 --- a/DOL.WHD.Section14c.Domain/Models/Submission/Dto/HourlyWageInfoDto.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System.ComponentModel.DataAnnotations; - -namespace DOL.WHD.Section14c.Domain.Models.Submission.Dto -{ - public class HourlyWageInfoDto : WageTypeInfoDto - { - [Required] - public string WorkMeasurementFrequency { get; set; } - } -} diff --git a/DOL.WHD.Section14c.Domain/Models/Submission/Dto/PieceRateWageInfoDto.cs b/DOL.WHD.Section14c.Domain/Models/Submission/Dto/PieceRateWageInfoDto.cs deleted file mode 100644 index df074050..00000000 --- a/DOL.WHD.Section14c.Domain/Models/Submission/Dto/PieceRateWageInfoDto.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System.ComponentModel.DataAnnotations; - -namespace DOL.WHD.Section14c.Domain.Models.Submission.Dto -{ - public class PieceRateWageInfoDto : WageTypeInfoDto - { - [Required] - public string PieceRateWorkDescription { get; set; } - - [Required] - public double PrevailingWageDeterminedForJob { get; set; } - - [Required] - public double StandardProductivity { get; set; } - - [Required] - public double PieceRatePaidToWorkers { get; set; } - } -} diff --git a/DOL.WHD.Section14c.Domain/Models/Submission/Dto/PrevailingWageSurveyInfoDto.cs b/DOL.WHD.Section14c.Domain/Models/Submission/Dto/PrevailingWageSurveyInfoDto.cs deleted file mode 100644 index 8ac58180..00000000 --- a/DOL.WHD.Section14c.Domain/Models/Submission/Dto/PrevailingWageSurveyInfoDto.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; - -namespace DOL.WHD.Section14c.Domain.Models.Submission.Dto -{ - public class PrevailingWageSurveyInfoDto - { - [Required] - public double PrevailingWageDetermined { get; set; } - - [Required] - public IEnumerable SourceEmployers { get; set; } - - // Prevailing Wage Determination - Hourly - public Guid? AttachmentId { get; set; } - } -} diff --git a/DOL.WHD.Section14c.Domain/Models/Submission/Dto/SourceEmployerDto.cs b/DOL.WHD.Section14c.Domain/Models/Submission/Dto/SourceEmployerDto.cs deleted file mode 100644 index d87f2193..00000000 --- a/DOL.WHD.Section14c.Domain/Models/Submission/Dto/SourceEmployerDto.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System; -using System.ComponentModel.DataAnnotations; - -namespace DOL.WHD.Section14c.Domain.Models.Submission.Dto -{ - public class SourceEmployerDto - { - [Required] - public string EmployerName { get; set; } - - [Required] - public Address Address { get; set; } - - [Required] - [Phone] - public string Phone { get; set; } - - [Required] - public string ContactName { get; set; } - - [Required] - public string ContactTitle { get; set; } - - [Required] - public DateTime ContactDate { get; set; } - - [Required] - public string JobDescription { get; set; } - - [Required] - public string ExperiencedWorkerWageProvided { get; set; } - - [Required] - public string ConclusionWageRateNotBasedOnEntry { get; set; } - } -} diff --git a/DOL.WHD.Section14c.Domain/Models/Submission/Dto/WIOADto.cs b/DOL.WHD.Section14c.Domain/Models/Submission/Dto/WIOADto.cs deleted file mode 100644 index 5ae55a3e..00000000 --- a/DOL.WHD.Section14c.Domain/Models/Submission/Dto/WIOADto.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; - -namespace DOL.WHD.Section14c.Domain.Models.Submission.Dto -{ - public class WIOADto - { - [Required] - public bool HasVerfiedDocumentaion { get; set; } - - [Required] - public bool HasWIOAWorkers { get; set; } - - public IEnumerable WIOAWorkers { get; set; } - - } -} diff --git a/DOL.WHD.Section14c.Domain/Models/Submission/Dto/WIOAWorkerDto.cs b/DOL.WHD.Section14c.Domain/Models/Submission/Dto/WIOAWorkerDto.cs deleted file mode 100644 index f4dfc53c..00000000 --- a/DOL.WHD.Section14c.Domain/Models/Submission/Dto/WIOAWorkerDto.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System.ComponentModel.DataAnnotations; - -namespace DOL.WHD.Section14c.Domain.Models.Submission.Dto -{ - public class WIOAWorkerDto - { - [Required] - public string FullName { get; set; } - - [Required] - public int WIOAWorkerVerifiedId { get; set; } - } -} diff --git a/DOL.WHD.Section14c.Domain/Models/Submission/Dto/WageTypeInfoDto.cs b/DOL.WHD.Section14c.Domain/Models/Submission/Dto/WageTypeInfoDto.cs deleted file mode 100644 index 00cdac63..00000000 --- a/DOL.WHD.Section14c.Domain/Models/Submission/Dto/WageTypeInfoDto.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System; -using System.ComponentModel.DataAnnotations; - -namespace DOL.WHD.Section14c.Domain.Models.Submission.Dto -{ - public class WageTypeInfoDto - { - [Required] - public int NumWorkers { get; set; } - - [Required] - public string JobName { get; set; } - - [Required] - public string JobDescription { get; set; } - - [Required] - public int PrevailingWageMethodId { get; set; } - - public PrevailingWageSurveyInfoDto MostRecentPrevailingWageSurvey { get; set; } - - public AlternateWageDataDto AlternateWageData { get; set; } - - public Guid? SCAWageDeterminationId { get; set; } - - // Documentation - [Required] - public Guid? AttachmentId { get; set; } - } -} diff --git a/DOL.WHD.Section14c.Domain/Models/Submission/Dto/WorkSiteDto.cs b/DOL.WHD.Section14c.Domain/Models/Submission/Dto/WorkSiteDto.cs deleted file mode 100644 index 43619ba2..00000000 --- a/DOL.WHD.Section14c.Domain/Models/Submission/Dto/WorkSiteDto.cs +++ /dev/null @@ -1,29 +0,0 @@ -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; - -namespace DOL.WHD.Section14c.Domain.Models.Submission.Dto -{ - public class WorkSiteDto - { - [Required] - public IEnumerable WorkSiteTypeId { get; set; } - - [Required] - public string Name { get; set; } - - [Required] - public Address Address { get; set; } - - [Required] - public bool SCA { get; set; } - - [Required] - public bool FederalContractWorkPerformed { get; set; } - - [Required] - public int NumEmployees { get; set; } - - // TODO: validate Employees.Count == NumEmployees - public IEnumerable Employees { get; set; } - } -} diff --git a/DOL.WHD.Section14c.Domain/Models/Submission/Dto/WorkerCountInfoDto.cs b/DOL.WHD.Section14c.Domain/Models/Submission/Dto/WorkerCountInfoDto.cs deleted file mode 100644 index 86747960..00000000 --- a/DOL.WHD.Section14c.Domain/Models/Submission/Dto/WorkerCountInfoDto.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System.ComponentModel.DataAnnotations; - -namespace DOL.WHD.Section14c.Domain.Models.Submission.Dto -{ - public class WorkerCountInfoDto - { - [Required] - public int Total { get; set; } - - [Required] - public int WorkCenter { get; set; } - - [Required] - public int PatientWorkers { get; set; } - - [Required] - public int SWEP { get; set; } - - [Required] - public int BusinessEstablishment { get; set; } - } -} diff --git a/DOL.WHD.Section14c.Domain/Models/Submission/Employee.cs b/DOL.WHD.Section14c.Domain/Models/Submission/Employee.cs index 007afb2f..c1edc8a5 100644 --- a/DOL.WHD.Section14c.Domain/Models/Submission/Employee.cs +++ b/DOL.WHD.Section14c.Domain/Models/Submission/Employee.cs @@ -1,5 +1,4 @@ using System; -using System.ComponentModel.DataAnnotations; namespace DOL.WHD.Section14c.Domain.Models.Submission { @@ -12,40 +11,29 @@ public Employee() public Guid Id { get; set; } - [Required] public string Name { get; set; } - [Required] public int PrimaryDisabilityId { get; set; } public virtual Response PrimaryDisability { get; set; } public string PrimaryDisabilityOther { get; set; } - [Required] public string WorkType { get; set; } - [Required] public int NumJobs { get; set; } - [Required] public double AvgWeeklyHours { get; set; } - [Required] public double AvgHourlyEarnings { get; set; } - [Required] public double PrevailingWage { get; set; } - [Required] public double ProductivityMeasure { get; set; } - [Required] public string CommensurateWageRate { get; set; } - [Required] public double TotalHours { get; set; } - [Required] public bool WorkAtOtherSite { get; set; } } } diff --git a/DOL.WHD.Section14c.Domain/Models/Submission/EmployerInfo.cs b/DOL.WHD.Section14c.Domain/Models/Submission/EmployerInfo.cs index 36942481..15150c93 100644 --- a/DOL.WHD.Section14c.Domain/Models/Submission/EmployerInfo.cs +++ b/DOL.WHD.Section14c.Domain/Models/Submission/EmployerInfo.cs @@ -1,5 +1,4 @@ using System; -using System.ComponentModel.DataAnnotations; namespace DOL.WHD.Section14c.Domain.Models.Submission { @@ -12,26 +11,20 @@ public EmployerInfo() public Guid Id { get; set; } - [Required] public string LegalName { get; set; } - [Required] public bool HasTradeName { get; set; } public string TradeName { get; set; } - [Required] public bool LegalNameHasChanged { get; set; } public string PriorLegalName { get; set; } - [Required] public virtual Address PhysicalAddress { get; set; } - [Required] public bool HasDifferentMailingAddress { get; set; } - [Required] public bool HasParentOrg { get; set; } public string ParentLegalName { get; set; } @@ -42,25 +35,19 @@ public EmployerInfo() public bool SendMailToParent { get; set; } - [Required] public int EmployerStatusId { get; set; } public virtual Response EmployerStatus { get; set; } public string EmployerStatusOther { get; set; } - [Required] public bool IsEducationalAgency { get; set; } - [Required] public DateTime FiscalQuarterEndDate { get; set; } - [Required] public virtual WorkerCountInfo NumSubminimalWageWorkers { get; set; } - [Required] public bool PCA { get; set; } - [Required] public int SCAId { get; set; } public virtual Response SCA { get; set; } @@ -68,23 +55,18 @@ public EmployerInfo() public Guid? SCAAttachmentId { get; set; } public Attachment SCAAttachment { get; set; } - [Required] public int EO13658Id { get; set; } public virtual Response EO13658 { get; set; } - [Required] public bool RepresentativePayee { get; set; } - [Required] public bool TakeCreditForCosts { get; set; } - [Required] public int ProvidingFacilitiesDeductionTypeId { get; set; } public virtual Response ProvidingFacilitiesDeductionType { get; set; } public string ProvidingFacilitiesDeductionTypeOther { get; set; } - [Required] public bool TemporaryAuthority { get; set; } } diff --git a/DOL.WHD.Section14c.Domain/Models/Submission/HourlyWageInfo.cs b/DOL.WHD.Section14c.Domain/Models/Submission/HourlyWageInfo.cs index 12f7e93b..079017e6 100644 --- a/DOL.WHD.Section14c.Domain/Models/Submission/HourlyWageInfo.cs +++ b/DOL.WHD.Section14c.Domain/Models/Submission/HourlyWageInfo.cs @@ -1,11 +1,7 @@ -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; - -namespace DOL.WHD.Section14c.Domain.Models.Submission +namespace DOL.WHD.Section14c.Domain.Models.Submission { public class HourlyWageInfo : WageTypeInfo { - [Required] public string WorkMeasurementFrequency { get; set; } } } diff --git a/DOL.WHD.Section14c.Domain/Models/Submission/PieceRateWageInfo.cs b/DOL.WHD.Section14c.Domain/Models/Submission/PieceRateWageInfo.cs index a74c831b..9446ea3f 100644 --- a/DOL.WHD.Section14c.Domain/Models/Submission/PieceRateWageInfo.cs +++ b/DOL.WHD.Section14c.Domain/Models/Submission/PieceRateWageInfo.cs @@ -1,20 +1,13 @@ -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; - -namespace DOL.WHD.Section14c.Domain.Models.Submission +namespace DOL.WHD.Section14c.Domain.Models.Submission { public class PieceRateWageInfo : WageTypeInfo { - [Required] public string PieceRateWorkDescription { get; set; } - [Required] public double PrevailingWageDeterminedForJob { get; set; } - [Required] public double StandardProductivity { get; set; } - [Required] public double PieceRatePaidToWorkers { get; set; } } } diff --git a/DOL.WHD.Section14c.Domain/Models/Submission/PrevailingWageSurveyInfo.cs b/DOL.WHD.Section14c.Domain/Models/Submission/PrevailingWageSurveyInfo.cs index 83ed36b0..7f926e88 100644 --- a/DOL.WHD.Section14c.Domain/Models/Submission/PrevailingWageSurveyInfo.cs +++ b/DOL.WHD.Section14c.Domain/Models/Submission/PrevailingWageSurveyInfo.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; namespace DOL.WHD.Section14c.Domain.Models.Submission { @@ -13,10 +12,8 @@ public PrevailingWageSurveyInfo() public Guid Id { get; set; } - [Required] public double PrevailingWageDetermined { get; set; } - [Required] public virtual ICollection SourceEmployers { get; set; } // Prevailing Wage Determination - Hourly diff --git a/DOL.WHD.Section14c.Domain/Models/Submission/Response.cs b/DOL.WHD.Section14c.Domain/Models/Submission/Response.cs index 2b92f0be..16a57ae3 100644 --- a/DOL.WHD.Section14c.Domain/Models/Submission/Response.cs +++ b/DOL.WHD.Section14c.Domain/Models/Submission/Response.cs @@ -1,27 +1,17 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace DOL.WHD.Section14c.Domain.Models.Submission +namespace DOL.WHD.Section14c.Domain.Models.Submission { public class Response : BaseEntity { public int Id { get; set; } - [Required] public string QuestionKey { get; set; } - [Required] public string Display { get; set; } public string SubDisplay { get; set; } public string OtherValueKey { get; set; } - [Required] public bool IsActive { get; set; } } } diff --git a/DOL.WHD.Section14c.Domain/Models/Submission/SourceEmployer.cs b/DOL.WHD.Section14c.Domain/Models/Submission/SourceEmployer.cs index 1eccf990..a3c8677e 100644 --- a/DOL.WHD.Section14c.Domain/Models/Submission/SourceEmployer.cs +++ b/DOL.WHD.Section14c.Domain/Models/Submission/SourceEmployer.cs @@ -12,32 +12,22 @@ public SourceEmployer() public Guid Id { get; set; } - [Required] public string EmployerName { get; set; } - [Required] public virtual Address Address { get; set; } - [Required] - [Phone] public string Phone { get; set; } - [Required] public string ContactName { get; set; } - [Required] public string ContactTitle { get; set; } - [Required] public DateTime ContactDate { get; set; } - [Required] public string JobDescription { get; set; } - [Required] public string ExperiencedWorkerWageProvided { get; set; } - [Required] public string ConclusionWageRateNotBasedOnEntry { get; set; } } } diff --git a/DOL.WHD.Section14c.Domain/Models/Submission/WIOA.cs b/DOL.WHD.Section14c.Domain/Models/Submission/WIOA.cs index 31d82d7d..0a1ea540 100644 --- a/DOL.WHD.Section14c.Domain/Models/Submission/WIOA.cs +++ b/DOL.WHD.Section14c.Domain/Models/Submission/WIOA.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; namespace DOL.WHD.Section14c.Domain.Models.Submission { @@ -13,10 +12,8 @@ public WIOA() public Guid Id { get; set; } - [Required] public bool HasVerfiedDocumentaion { get; set; } - [Required] public bool HasWIOAWorkers { get; set; } public virtual ICollection WIOAWorkers { get; set; } diff --git a/DOL.WHD.Section14c.Domain/Models/Submission/WIOAWorker.cs b/DOL.WHD.Section14c.Domain/Models/Submission/WIOAWorker.cs index 15b2293b..b3f2c83e 100644 --- a/DOL.WHD.Section14c.Domain/Models/Submission/WIOAWorker.cs +++ b/DOL.WHD.Section14c.Domain/Models/Submission/WIOAWorker.cs @@ -1,5 +1,4 @@ using System; -using System.ComponentModel.DataAnnotations; namespace DOL.WHD.Section14c.Domain.Models.Submission { @@ -12,10 +11,8 @@ public WIOAWorker() public Guid Id { get; set; } - [Required] public string FullName { get; set; } - [Required] public int WIOAWorkerVerifiedId { get; set; } public Response WIOAWorkerVerified { get; set; } } diff --git a/DOL.WHD.Section14c.Domain/Models/Submission/WageTypeInfo.cs b/DOL.WHD.Section14c.Domain/Models/Submission/WageTypeInfo.cs index dd6b2d28..bcb4a3de 100644 --- a/DOL.WHD.Section14c.Domain/Models/Submission/WageTypeInfo.cs +++ b/DOL.WHD.Section14c.Domain/Models/Submission/WageTypeInfo.cs @@ -1,5 +1,4 @@ using System; -using System.ComponentModel.DataAnnotations; namespace DOL.WHD.Section14c.Domain.Models.Submission { @@ -12,16 +11,12 @@ public WageTypeInfo() public Guid Id { get; set; } - [Required] public int NumWorkers { get; set; } - [Required] public string JobName { get; set; } - [Required] public string JobDescription { get; set; } - [Required] public int PrevailingWageMethodId { get; set; } public virtual Response PrevailingWageMethod { get; set; } @@ -33,7 +28,6 @@ public WageTypeInfo() public Attachment SCAWageDetermination { get; set; } // Documentation - [Required] public Guid? AttachmentId { get; set; } public Attachment Attachment { get; set; } } diff --git a/DOL.WHD.Section14c.Domain/Models/Submission/WorkSite.cs b/DOL.WHD.Section14c.Domain/Models/Submission/WorkSite.cs index d7b664f5..e2caf7ce 100644 --- a/DOL.WHD.Section14c.Domain/Models/Submission/WorkSite.cs +++ b/DOL.WHD.Section14c.Domain/Models/Submission/WorkSite.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; +using System.Linq; namespace DOL.WHD.Section14c.Domain.Models.Submission { @@ -13,22 +13,24 @@ public WorkSite() public Guid Id { get; set; } - [Required] + public IEnumerable WorkSiteTypeId + { + set + { + WorkSiteType = value.Select( + x => new WorkSiteWorkSiteType {WorkSiteTypeId = x, WorkSiteId = Id}).ToList(); + } + } public virtual ICollection WorkSiteType { get; set; } - [Required] public string Name { get; set; } - [Required] public virtual Address Address { get; set; } - [Required] public bool SCA { get; set; } - [Required] public bool FederalContractWorkPerformed { get; set; } - [Required] public int NumEmployees { get; set; } public virtual ICollection Employees { get; set; } diff --git a/DOL.WHD.Section14c.Domain/Models/Submission/WorkerCountInfo.cs b/DOL.WHD.Section14c.Domain/Models/Submission/WorkerCountInfo.cs index 00f48cf6..4157f44f 100644 --- a/DOL.WHD.Section14c.Domain/Models/Submission/WorkerCountInfo.cs +++ b/DOL.WHD.Section14c.Domain/Models/Submission/WorkerCountInfo.cs @@ -1,5 +1,4 @@ using System; -using System.ComponentModel.DataAnnotations; namespace DOL.WHD.Section14c.Domain.Models.Submission { @@ -12,19 +11,14 @@ public WorkerCountInfo() public Guid Id { get; set; } - [Required] public int Total { get; set; } - [Required] public int WorkCenter { get; set; } - [Required] public int PatientWorkers { get; set; } - [Required] public int SWEP { get; set; } - [Required] public int BusinessEstablishment { get; set; } } }