From aea79b8052f87e3fb793477ca03cbcad00e0da07 Mon Sep 17 00:00:00 2001 From: "Collin M. Barrett" Date: Mon, 16 Nov 2020 11:33:10 -0600 Subject: [PATCH] =?UTF-8?q?fix(directory):=20=F0=9F=90=9B=20convert=20IOrd?= =?UTF-8?q?eredEnumerable=20->=20IEnumerable=20in=20projections?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ref https://github.com/dotnet/EntityFramework.Docs/issues/2823 --- .../Queries/GetLanguages.cs | 2 +- .../Queries/GetLicenses.cs | 2 +- .../Queries/GetListDetails.cs | 22 +++++++++---------- .../Queries/GetLists.cs | 8 +++---- .../Queries/GetMaintainers.cs | 2 +- .../Queries/GetSoftware.cs | 2 +- .../Queries/GetSyntaxes.cs | 4 ++-- .../Queries/GetTags.cs | 2 +- 8 files changed, 22 insertions(+), 22 deletions(-) diff --git a/services/Directory/FilterLists.Directory.Application/Queries/GetLanguages.cs b/services/Directory/FilterLists.Directory.Application/Queries/GetLanguages.cs index 4fc4327d1..4f3b36989 100644 --- a/services/Directory/FilterLists.Directory.Application/Queries/GetLanguages.cs +++ b/services/Directory/FilterLists.Directory.Application/Queries/GetLanguages.cs @@ -47,7 +47,7 @@ public LanguageVmProfile() CreateMap() .ForMember(l => l.FilterListIds, o => o.MapFrom(l => - l.FilterListLanguages.Select(fll => fll.FilterListId).OrderBy(flid => flid))); + l.FilterListLanguages.Select(fll => fll.FilterListId).OrderBy(flid => flid).AsEnumerable())); } } diff --git a/services/Directory/FilterLists.Directory.Application/Queries/GetLicenses.cs b/services/Directory/FilterLists.Directory.Application/Queries/GetLicenses.cs index d314a276d..0ec56b8bf 100644 --- a/services/Directory/FilterLists.Directory.Application/Queries/GetLicenses.cs +++ b/services/Directory/FilterLists.Directory.Application/Queries/GetLicenses.cs @@ -47,7 +47,7 @@ public LicenseVmProfile() CreateMap() .ForMember(l => l.FilterListIds, o => o.MapFrom(l => - l.FilterLists.Select(fl => fl.Id).OrderBy(flid => flid))); + l.FilterLists.Select(fl => fl.Id).OrderBy(flid => flid).AsEnumerable())); } } diff --git a/services/Directory/FilterLists.Directory.Application/Queries/GetListDetails.cs b/services/Directory/FilterLists.Directory.Application/Queries/GetListDetails.cs index 0f810d5b1..286de46f8 100644 --- a/services/Directory/FilterLists.Directory.Application/Queries/GetListDetails.cs +++ b/services/Directory/FilterLists.Directory.Application/Queries/GetListDetails.cs @@ -51,37 +51,37 @@ public ListDetailsVmProfile() CreateMap() .ForMember(fl => fl.SyntaxIds, o => o.MapFrom(fl => - fl.FilterListSyntaxes.Select(fls => fls.SyntaxId).OrderBy(sid => sid))) + fl.FilterListSyntaxes.Select(fls => fls.SyntaxId).OrderBy(sid => sid).AsEnumerable())) .ForMember(fl => fl.Iso6391s, o => o.MapFrom(fl => - fl.FilterListLanguages.Select(fls => fls.Iso6391).OrderBy(i => i))) + fl.FilterListLanguages.Select(fls => fls.Iso6391).OrderBy(i => i).AsEnumerable())) .ForMember(fl => fl.TagIds, o => o.MapFrom(fl => - fl.FilterListTags.Select(flt => flt.TagId).OrderBy(tid => tid))) + fl.FilterListTags.Select(flt => flt.TagId).OrderBy(tid => tid).AsEnumerable())) .ForMember(fl => fl.ViewUrls, o => o.MapFrom(fl => - fl.ViewUrls.OrderBy(u => u.SegmentNumber).ThenBy(u => u.Primariness))) + fl.ViewUrls.OrderBy(u => u.SegmentNumber).ThenBy(u => u.Primariness).AsEnumerable())) .ForMember(fl => fl.MaintainerIds, o => o.MapFrom(fl => - fl.FilterListMaintainers.Select(flm => flm.MaintainerId).OrderBy(mid => mid))) + fl.FilterListMaintainers.Select(flm => flm.MaintainerId).OrderBy(mid => mid).AsEnumerable())) .ForMember(fl => fl.UpstreamFilterListIds, o => o.MapFrom(fl => - fl.UpstreamFilterLists.Select(ufl => ufl.UpstreamFilterListId).OrderBy(flid => flid))) + fl.UpstreamFilterLists.Select(ufl => ufl.UpstreamFilterListId).OrderBy(flid => flid).AsEnumerable())) .ForMember(fl => fl.ForkFilterListIds, o => o.MapFrom(fl => - fl.ForkFilterLists.Select(ffl => ffl.ForkFilterListId).OrderBy(flid => flid))) + fl.ForkFilterLists.Select(ffl => ffl.ForkFilterListId).OrderBy(flid => flid).AsEnumerable())) .ForMember(fl => fl.IncludedInFilterListIds, o => o.MapFrom(fl => - fl.IncludedInFilterLists.Select(iifl => iifl.IncludedInFilterListId).OrderBy(flid => flid))) + fl.IncludedInFilterLists.Select(iifl => iifl.IncludedInFilterListId).OrderBy(flid => flid).AsEnumerable())) .ForMember(fl => fl.IncludesFilterListIds, o => o.MapFrom(fl => - fl.IncludesFilterLists.Select(ifl => ifl.IncludesFilterListId).OrderBy(flid => flid))) + fl.IncludesFilterLists.Select(ifl => ifl.IncludesFilterListId).OrderBy(flid => flid).AsEnumerable())) .ForMember(fl => fl.DependencyFilterListIds, o => o.MapFrom(fl => - fl.DependencyFilterLists.Select(dfl => dfl.DependencyFilterListId).OrderBy(flid => flid))) + fl.DependencyFilterLists.Select(dfl => dfl.DependencyFilterListId).OrderBy(flid => flid).AsEnumerable())) .ForMember(fl => fl.DependentFilterListIds, o => o.MapFrom(fl => - fl.DependentFilterLists.Select(dfl => dfl.DependentFilterListId).OrderBy(flid => flid))); + fl.DependentFilterLists.Select(dfl => dfl.DependentFilterListId).OrderBy(flid => flid).AsEnumerable())); } } diff --git a/services/Directory/FilterLists.Directory.Application/Queries/GetLists.cs b/services/Directory/FilterLists.Directory.Application/Queries/GetLists.cs index d01f848fa..b2bfe1e0b 100644 --- a/services/Directory/FilterLists.Directory.Application/Queries/GetLists.cs +++ b/services/Directory/FilterLists.Directory.Application/Queries/GetLists.cs @@ -47,16 +47,16 @@ public ListVmProfile() CreateMap() .ForMember(fl => fl.SyntaxIds, o => o.MapFrom(fl => - fl.FilterListSyntaxes.Select(fls => fls.SyntaxId).OrderBy(sid => sid))) + fl.FilterListSyntaxes.Select(fls => fls.SyntaxId).OrderBy(sid => sid).AsEnumerable())) .ForMember(fl => fl.Iso6391s, o => o.MapFrom(fl => - fl.FilterListLanguages.Select(fls => fls.Iso6391).OrderBy(i => i))) + fl.FilterListLanguages.Select(fls => fls.Iso6391).OrderBy(i => i).AsEnumerable())) .ForMember(fl => fl.TagIds, o => o.MapFrom(fl => - fl.FilterListTags.Select(flt => flt.TagId).OrderBy(tid => tid))) + fl.FilterListTags.Select(flt => flt.TagId).OrderBy(tid => tid).AsEnumerable())) .ForMember(fl => fl.MaintainerIds, o => o.MapFrom(fl => - fl.FilterListMaintainers.Select(flm => flm.MaintainerId).OrderBy(mid => mid))); + fl.FilterListMaintainers.Select(flm => flm.MaintainerId).OrderBy(mid => mid).AsEnumerable())); } } } diff --git a/services/Directory/FilterLists.Directory.Application/Queries/GetMaintainers.cs b/services/Directory/FilterLists.Directory.Application/Queries/GetMaintainers.cs index 84719a1ec..82fe86e64 100644 --- a/services/Directory/FilterLists.Directory.Application/Queries/GetMaintainers.cs +++ b/services/Directory/FilterLists.Directory.Application/Queries/GetMaintainers.cs @@ -47,7 +47,7 @@ public MaintainerVmProfile() CreateMap() .ForMember(m => m.FilterListIds, o => o.MapFrom(m => - m.FilterListMaintainers.Select(flm => flm.FilterListId).OrderBy(flid => flid))); + m.FilterListMaintainers.Select(flm => flm.FilterListId).OrderBy(flid => flid).AsEnumerable())); } } diff --git a/services/Directory/FilterLists.Directory.Application/Queries/GetSoftware.cs b/services/Directory/FilterLists.Directory.Application/Queries/GetSoftware.cs index 5976491f9..e8b2feeed 100644 --- a/services/Directory/FilterLists.Directory.Application/Queries/GetSoftware.cs +++ b/services/Directory/FilterLists.Directory.Application/Queries/GetSoftware.cs @@ -47,7 +47,7 @@ public SoftwareVmProfile() CreateMap() .ForMember(s => s.SyntaxIds, o => o.MapFrom(s => - s.SoftwareSyntaxes.Select(ss => ss.SyntaxId).OrderBy(sid => sid))); + s.SoftwareSyntaxes.Select(ss => ss.SyntaxId).OrderBy(sid => sid).AsEnumerable())); } } diff --git a/services/Directory/FilterLists.Directory.Application/Queries/GetSyntaxes.cs b/services/Directory/FilterLists.Directory.Application/Queries/GetSyntaxes.cs index 98c361495..b5aa12e4c 100644 --- a/services/Directory/FilterLists.Directory.Application/Queries/GetSyntaxes.cs +++ b/services/Directory/FilterLists.Directory.Application/Queries/GetSyntaxes.cs @@ -47,10 +47,10 @@ public SyntaxVmProfile() CreateMap() .ForMember(s => s.FilterListIds, o => o.MapFrom(s => - s.FilterListSyntaxes.Select(sls => sls.FilterListId).OrderBy(flid => flid))) + s.FilterListSyntaxes.Select(sls => sls.FilterListId).OrderBy(flid => flid).AsEnumerable())) .ForMember(s => s.SoftwareIds, o => o.MapFrom(s => - s.SoftwareSyntaxes.Select(ss => ss.SoftwareId).OrderBy(sid => sid))); + s.SoftwareSyntaxes.Select(ss => ss.SoftwareId).OrderBy(sid => sid).AsEnumerable())); } } diff --git a/services/Directory/FilterLists.Directory.Application/Queries/GetTags.cs b/services/Directory/FilterLists.Directory.Application/Queries/GetTags.cs index f3792f7fc..610e3cf62 100644 --- a/services/Directory/FilterLists.Directory.Application/Queries/GetTags.cs +++ b/services/Directory/FilterLists.Directory.Application/Queries/GetTags.cs @@ -46,7 +46,7 @@ public TagVmProfile() CreateMap() .ForMember(t => t.FilterListIds, o => o.MapFrom(t => - t.FilterListTags.Select(flt => flt.FilterListId).OrderBy(flid => flid))); + t.FilterListTags.Select(flt => flt.FilterListId).OrderBy(flid => flid).AsEnumerable())); } }