From 083e308079b2658f9ab643911d4d4bf171d46cf7 Mon Sep 17 00:00:00 2001 From: Robert Sebescen Date: Tue, 15 Mar 2016 19:50:28 +0100 Subject: [PATCH 1/5] People with first name shorter then 4 characters will be excluded. --- .../Employee.Test.Git.Merge/Services/TestService.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Employee.Test.Git.Merge/Employee.Test.Git.Merge/Services/TestService.cs b/Employee.Test.Git.Merge/Employee.Test.Git.Merge/Services/TestService.cs index 2a59180..52a49f1 100644 --- a/Employee.Test.Git.Merge/Employee.Test.Git.Merge/Services/TestService.cs +++ b/Employee.Test.Git.Merge/Employee.Test.Git.Merge/Services/TestService.cs @@ -17,7 +17,11 @@ public TestService(ITestRepository testRepository) public List PeopleNames() { - return _testRepository.GetPeopleNames(); + var peopleNames = _testRepository.GetPeopleNames(); + + List noShortFirstNames = peopleNames.Where(name => name.Split(' ')[0].Length > 3).ToList(); + + return noShortFirstNames; } } } \ No newline at end of file From ff1d588a1fa537d458ea570c57e65a491689f69d Mon Sep 17 00:00:00 2001 From: Robert Sebescen Date: Tue, 15 Mar 2016 19:51:15 +0100 Subject: [PATCH 2/5] All people names will be uppercased. --- .../Employee.Test.Git.Merge/Services/TestService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Employee.Test.Git.Merge/Employee.Test.Git.Merge/Services/TestService.cs b/Employee.Test.Git.Merge/Employee.Test.Git.Merge/Services/TestService.cs index 2a59180..8050f14 100644 --- a/Employee.Test.Git.Merge/Employee.Test.Git.Merge/Services/TestService.cs +++ b/Employee.Test.Git.Merge/Employee.Test.Git.Merge/Services/TestService.cs @@ -17,7 +17,7 @@ public TestService(ITestRepository testRepository) public List PeopleNames() { - return _testRepository.GetPeopleNames(); + return _testRepository.GetPeopleNames().Select(name => name.ToUpper()).ToList(); } } } \ No newline at end of file From 34189a74f3221b76de027386362c825690355896 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milo=C5=A1=20Kajtez?= Date: Sun, 26 Mar 2017 19:28:41 +0200 Subject: [PATCH 3/5] Update TestService.cs --- .../Employee.Test.Git.Merge/Services/TestService.cs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Employee.Test.Git.Merge/Employee.Test.Git.Merge/Services/TestService.cs b/Employee.Test.Git.Merge/Employee.Test.Git.Merge/Services/TestService.cs index 814d33a..30f8506 100644 --- a/Employee.Test.Git.Merge/Employee.Test.Git.Merge/Services/TestService.cs +++ b/Employee.Test.Git.Merge/Employee.Test.Git.Merge/Services/TestService.cs @@ -17,12 +17,11 @@ public TestService(ITestRepository testRepository) public List PeopleNames() { - var peopleNames = _testRepository.GetPeopleNames().Select(name => name.ToUpper()).ToList(); - List noShortFirstNames = peopleNames.Where(name => name.Split(' ')[0].Length > 3).ToList(); - - return noShortFirstNames; + + + return noShortFirstNames.Select(name => name.ToUpper()).ToList() } } -} \ No newline at end of file +} From 8dc997387012a8a688adfca719565e9c68df0aa8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milo=C5=A1=20Kajtez?= Date: Sun, 26 Mar 2017 19:32:35 +0200 Subject: [PATCH 4/5] Update TestService.cs --- .../Employee.Test.Git.Merge/Services/TestService.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/Employee.Test.Git.Merge/Employee.Test.Git.Merge/Services/TestService.cs b/Employee.Test.Git.Merge/Employee.Test.Git.Merge/Services/TestService.cs index 30f8506..d95f291 100644 --- a/Employee.Test.Git.Merge/Employee.Test.Git.Merge/Services/TestService.cs +++ b/Employee.Test.Git.Merge/Employee.Test.Git.Merge/Services/TestService.cs @@ -17,6 +17,7 @@ public TestService(ITestRepository testRepository) public List PeopleNames() { + var peopleNames = _testRepository.GetPeopleNames() List noShortFirstNames = peopleNames.Where(name => name.Split(' ')[0].Length > 3).ToList(); From a598a773fe0bab7b2865ca6d3e683a6ffb0da47b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milo=C5=A1=20Kajtez?= Date: Wed, 29 Mar 2017 15:07:27 +0200 Subject: [PATCH 5/5] Update TestService.cs --- .../Employee.Test.Git.Merge/Services/TestService.cs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Employee.Test.Git.Merge/Employee.Test.Git.Merge/Services/TestService.cs b/Employee.Test.Git.Merge/Employee.Test.Git.Merge/Services/TestService.cs index d95f291..d1a59f2 100644 --- a/Employee.Test.Git.Merge/Employee.Test.Git.Merge/Services/TestService.cs +++ b/Employee.Test.Git.Merge/Employee.Test.Git.Merge/Services/TestService.cs @@ -17,11 +17,10 @@ public TestService(ITestRepository testRepository) public List PeopleNames() { - var peopleNames = _testRepository.GetPeopleNames() + var peopleNames = _testRepository.GetPeopleNames(); List noShortFirstNames = peopleNames.Where(name => name.Split(' ')[0].Length > 3).ToList(); - - - return noShortFirstNames.Select(name => name.ToUpper()).ToList() + + return noShortFirstNames.Select(name => name.ToUpper()).ToList(); } }