From 95bb8d4e6e74be0f28240d30d647a45af7b74bb1 Mon Sep 17 00:00:00 2001
From: "Collin M. Barrett" <collinbarrett@users.noreply.github.com>
Date: Sun, 25 Feb 2018 13:21:12 -0600
Subject: [PATCH] add Maintainers to List Details API endpoint

---
 FilterLists.sln.DotSettings                      | 16 +++++++++++-----
 .../FilterListService/FilterListDetailsDto.cs    |  2 ++
 .../FilterListService/MaintainerDto.cs           | 11 +++++++++++
 .../FilterListService/MappingProfiles.cs         |  5 ++++-
 4 files changed, 28 insertions(+), 6 deletions(-)
 create mode 100644 src/FilterLists.Services/FilterListService/MaintainerDto.cs

diff --git a/FilterLists.sln.DotSettings b/FilterLists.sln.DotSettings
index 863f9fba2..df867e7bb 100644
--- a/FilterLists.sln.DotSettings
+++ b/FilterLists.sln.DotSettings
@@ -1,7 +1,4 @@
-<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                        xmlns:s="clr-namespace:System;assembly=mscorlib"
-                        xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml"
-                        xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/GeneratedFilesAndFolders/=6B3E6765_002D5B8B_002D4A23_002DAD12_002D7E2BC5F4D2E6_002Fd_003Awwwroot/@EntryIndexedValue"></s:String>
 	<s:Boolean x:Key="/Default/CodeInspection/ExcludedFiles/GeneratedFilesAndFolders/=6B3E6765_002D5B8B_002D4A23_002DAD12_002D7E2BC5F4D2E6_002Fd_003Awwwroot/@EntryIndexRemoved">True</s:Boolean>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/GeneratedFilesAndFolders/=6B3E6765_002D5B8B_002D4A23_002DAD12_002D7E2BC5F4D2E6_002Fd_003Awwwroot_002Fd_003Adist/@EntryIndexedValue">6B3E6765-5B8B-4A23-AD12-7E2BC5F4D2E6/d:wwwroot/d:dist</s:String>
@@ -9,11 +6,20 @@
 	<s:Boolean x:Key="/Default/CodeInspection/GeneratedCode/GeneratedFileMasks/=_002A_002EDesigner_002Ecs/@EntryIndexRemoved">True</s:Boolean>
   <s:String x:Key="/Default/CodeInspection/JsInspections/LanguageLevel/@EntryValue">ECMAScript 2015</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_CALLS_CHAIN/@EntryValue">True</s:Boolean>
-	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_SIMPLE_EMBEDDED_STATEMENT_ON_SAME_LINE/@EntryValue">NEVER</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_ACCESSORHOLDER_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
+	
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_AFTER_TYPECAST_PARENTHESES/@EntryValue">False</s:Boolean>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_CHAINED_BINARY_EXPRESSIONS/@EntryValue">CHOP_IF_LONG</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_CHAINED_METHOD_CALLS/@EntryValue">CHOP_IF_LONG</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateInstanceFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FMODULE_005FLOCAL/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpAttributeForSingleLineMethodUpgrade/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpRenamePlacementToArrangementMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
 	</wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/src/FilterLists.Services/FilterListService/FilterListDetailsDto.cs b/src/FilterLists.Services/FilterListService/FilterListDetailsDto.cs
index 04799d522..212fae25c 100644
--- a/src/FilterLists.Services/FilterListService/FilterListDetailsDto.cs
+++ b/src/FilterLists.Services/FilterListService/FilterListDetailsDto.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using FilterLists.Data.Entities;
 
 namespace FilterLists.Services.FilterListService
 {
@@ -15,6 +16,7 @@ public class FilterListDetailsDto
         public string HomeUrl { get; set; }
         public string IssuesUrl { get; set; }
         public IEnumerable<string> Languages { get; set; }
+        public IEnumerable<MaintainerDto> Maintainers { get; set; }
         public string Name { get; set; }
         public string PolicyUrl { get; set; }
         public DateTime? PublishedDate { get; set; }
diff --git a/src/FilterLists.Services/FilterListService/MaintainerDto.cs b/src/FilterLists.Services/FilterListService/MaintainerDto.cs
new file mode 100644
index 000000000..e4b1589ba
--- /dev/null
+++ b/src/FilterLists.Services/FilterListService/MaintainerDto.cs
@@ -0,0 +1,11 @@
+namespace FilterLists.Services.FilterListService
+{
+    public class MaintainerDto
+    {
+        public int Id { get; set; }
+        public string EmailAddress { get; set; }
+        public string HomeUrl { get; set; }
+        public string Name { get; set; }
+        public string TwitterHandle { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/FilterLists.Services/FilterListService/MappingProfiles.cs b/src/FilterLists.Services/FilterListService/MappingProfiles.cs
index f7d07f68f..8a5e563d0 100644
--- a/src/FilterLists.Services/FilterListService/MappingProfiles.cs
+++ b/src/FilterLists.Services/FilterListService/MappingProfiles.cs
@@ -11,7 +11,10 @@ public MappingProfiles()
             CreateMap<FilterList, FilterListDetailsDto>()
                 .ForMember(dto => dto.Languages,
                     conf => conf.MapFrom(list =>
-                        list.FilterListLanguages.Select(listLangs => listLangs.Language.Name)));
+                        list.FilterListLanguages.Select(listLangs => listLangs.Language.Name)))
+                .ForMember(dto => dto.Maintainers,
+                    conf => conf.MapFrom(list =>
+                        list.FilterListMaintainers.Select(listMaints => listMaints.Maintainer)));
 
             //TODO: improve performance (https://stackoverflow.com/q/48897083/2343739)
             CreateMap<FilterList, FilterListSummaryDto>()