Skip to content

Commit 0453f8d

Browse files
committed
ECER-5270: Automapper issues resolved and enum mappings fixed
1 parent 0ee6a96 commit 0453f8d

File tree

7 files changed

+13
-28
lines changed

7 files changed

+13
-28
lines changed

src/ECER.Clients.RegistryPortal/ECER.Clients.RegistryPortal.Server/Applications/ApplicationsEndpoints.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -619,7 +619,8 @@ public enum WorkExperienceRefStage
619619
Rejected,
620620
Submitted,
621621
UnderReview,
622-
WaitingforResponse
622+
WaitingforResponse,
623+
ICRAEligibilitySubmitted
623624
}
624625

625626
public enum WorkExperienceTypes

src/ECER.Clients.RegistryPortal/ECER.Clients.RegistryPortal.Server/ICRA/ICRAEligibilityMapper.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ public class ICRAEligibilityMapper : Profile
88
public ICRAEligibilityMapper()
99
{
1010
CreateMap<ICRAEligibility, Managers.Registry.Contract.ICRA.ICRAEligibility>()
11-
.ReverseMap();
11+
.ReverseMap();
12+
13+
CreateMap<InternationalCertification, Managers.Registry.Contract.ICRA.InternationalCertification>()
14+
.ReverseMap();
1215
}
1316
}

src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/package-lock.json

Lines changed: 0 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/ECER.Managers.Registry.Contract/Applications/Contract.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,8 @@ public enum WorkExperienceRefStage
438438
Rejected,
439439
Submitted,
440440
UnderReview,
441-
WaitingforResponse
441+
WaitingforResponse,
442+
ICRAEligibilitySubmitted
442443
}
443444

444445
public enum WorkExperienceTypes

src/ECER.Managers.Registry/ICRAEligibilityMapper.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,5 @@ public ICRAEligibilityMapper()
99
{
1010
CreateMap<Contract.ICRA.ICRAEligibility, ICRAEligibility>().ReverseMap();
1111
CreateMap<Contract.ICRA.InternationalCertification, InternationalCertification>().ReverseMap();
12-
CreateMap<ECER.Resources.Documents.Applications.FileInfo, ECER.Managers.Registry.Contract.Applications.FileInfo>().ReverseMap();
1312
}
1413
}

src/ECER.Resources.Documents/Applications/IApplicationRepository.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,8 @@ public enum WorkExperienceRefStage
307307
Rejected,
308308
Submitted,
309309
UnderReview,
310-
WaitingforResponse
310+
WaitingforResponse,
311+
ICRAEligibilitySubmitted
311312
}
312313

313314
public enum WorkExperienceTypes

src/ECER.Resources.Documents/ICRA/ICRARepositoryMapper.cs

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ public ICRARepositoryMapper()
1212
CreateMap<ICRAEligibility, ecer_ICRAEligibilityAssessment>(MemberList.Source)
1313
.ForSourceMember(s => s.ApplicantId, opts => opts.DoNotValidate())
1414
.ForSourceMember(s => s.CreatedOn, opts => opts.DoNotValidate())
15+
.ForSourceMember(s => s.InternationalCertifications, opts => opts.DoNotValidate())
1516
.ForMember(d => d.Id, opts => opts.MapFrom(s => s.Id))
1617
.ForMember(d => d.ecer_PortalStage, opts => opts.MapFrom(s => s.PortalStage))
1718
.ForMember(d => d.StatusCode, opts => opts.MapFrom(s => s.Status))
@@ -26,6 +27,7 @@ public ICRARepositoryMapper()
2627
.ForSourceMember(s => s.NewFiles, opts => opts.DoNotValidate())
2728
.ForSourceMember(s => s.DeletedFiles, opts => opts.DoNotValidate())
2829
.ForSourceMember(s => s.Files, opts => opts.DoNotValidate())
30+
.ForSourceMember(s => s.CountryId, opts => opts.DoNotValidate())
2931
.ForMember(d => d.ecer_InternationalCertificationId, opts => opts.MapFrom(s => s.Id))
3032
.ForMember(d => d.ecer_AuthorityName, opts => opts.MapFrom(s => s.NameOfRegulatoryAuthority))
3133
.ForMember(d => d.ecer_AuthorityEmail, opts => opts.MapFrom(s => s.EmailOfRegulatoryAuthority))
@@ -37,7 +39,7 @@ public ICRARepositoryMapper()
3739
.ForMember(d => d.ecer_IssueDate, opts => opts.MapFrom(s => s.IssueDate))
3840
.ForMember(d => d.ecer_Expirydate, opts => opts.MapFrom(s => s.ExpiryDate));
3941

40-
CreateMap<ecer_InternationalCertification, InternationalCertification>(MemberList.Source)
42+
CreateMap<ecer_InternationalCertification, InternationalCertification>(MemberList.Destination)
4143
.ForMember(d => d.Id, opts => opts.MapFrom(s => s.ecer_InternationalCertificationId))
4244
.ForMember(d => d.CountryId, opts => opts.MapFrom(s => s.ecer_Country != null ? s.ecer_Country.Id.ToString() : null))
4345
.ForMember(d => d.NameOfRegulatoryAuthority, opts => opts.MapFrom(s => s.ecer_AuthorityName))
@@ -56,13 +58,6 @@ public ICRARepositoryMapper()
5658
CreateMap<ICRAStatus, ecer_ICRAEligibilityAssessment_StatusCode>()
5759
.ConvertUsingEnumMapping(opts => opts.MapByName(true))
5860
.ReverseMap();
59-
60-
CreateMap<bcgov_DocumentUrl, Applications.FileInfo>(MemberList.Destination)
61-
.ForMember(d => d.Id, opts => opts.MapFrom(s => s.bcgov_DocumentUrlId))
62-
.ForMember(d => d.Name, opts => opts.MapFrom(s => s.bcgov_FileName))
63-
.ForMember(d => d.Size, opts => opts.MapFrom(s => s.bcgov_FileSize))
64-
.ForMember(d => d.Url, opts => opts.MapFrom(s => s.bcgov_Url))
65-
.ForMember(d => d.Extention, opts => opts.MapFrom(s => s.bcgov_FileExtension));
6661
}
6762

6863
public static string IdOrEmpty(EntityReference? reference) =>

0 commit comments

Comments
 (0)