From 9065d176313e8d6c18a98879c48052fb362c700f Mon Sep 17 00:00:00 2001 From: vaananart Date: Thu, 7 Jan 2021 10:11:37 +1100 Subject: [PATCH] Relocated PokeHandRules in Logics folder --- .../PlayerModelExtension.cs | 3 +- .../PokerHandDomainModels.Extensions.csproj | 2 +- .../CardsLookupBuilder.cs | 0 .../ModelExtensions/CardModelExtension.cs | 0 .../PokerHandLogicRuleHandlers.csproj | 11 ++++++++ .../RankFinders/DoublePairFinder.cs | 0 .../RankFinders/FlushFinder.cs | 0 .../RankFinders/FourOfAKindFinder.cs | 0 .../RankFinders/FullHouseFinder.cs | 0 .../RankFinders/HighestValueFinder.cs | 0 .../RankFinders/PairFinder.cs | 0 .../RankFinders/RoyalFlushFinder.cs | 0 .../RankFinders/StraightFinder.cs | 0 .../RankFinders/StraightFlushFinder.cs | 0 .../RankFinders/ThreeOfAKindFinder.cs | 0 .../Utils/ListExtension.cs | 0 .../PokerHandConsole.csproj | 2 +- .../PokerHandConsoleSolution.sln | 28 +++++++++---------- .../GameServices.csproj | 12 -------- .../GameServices/GameServices.csproj} | 2 +- .../PokerHand/PokerHandService.cs | 0 .../PokerHandLogicHandlersTests.csproj | 3 +- .../PokerHandSorterServiceTests.csproj | 3 +- .../SetupAllMatchesMethodTests.cs | 6 +--- .../SetupMatchMethodTests.cs | 2 -- 25 files changed, 32 insertions(+), 42 deletions(-) rename PokerHandSorterConsoleApp/{ => Logics}/PokerHandLogicHandler/CardsLookupBuilder.cs (100%) rename PokerHandSorterConsoleApp/{ => Logics}/PokerHandLogicHandler/ModelExtensions/CardModelExtension.cs (100%) create mode 100644 PokerHandSorterConsoleApp/Logics/PokerHandLogicHandler/PokerHandLogicRuleHandlers.csproj rename PokerHandSorterConsoleApp/{ => Logics}/PokerHandLogicHandler/RankFinders/DoublePairFinder.cs (100%) rename PokerHandSorterConsoleApp/{ => Logics}/PokerHandLogicHandler/RankFinders/FlushFinder.cs (100%) rename PokerHandSorterConsoleApp/{ => Logics}/PokerHandLogicHandler/RankFinders/FourOfAKindFinder.cs (100%) rename PokerHandSorterConsoleApp/{ => Logics}/PokerHandLogicHandler/RankFinders/FullHouseFinder.cs (100%) rename PokerHandSorterConsoleApp/{ => Logics}/PokerHandLogicHandler/RankFinders/HighestValueFinder.cs (100%) rename PokerHandSorterConsoleApp/{ => Logics}/PokerHandLogicHandler/RankFinders/PairFinder.cs (100%) rename PokerHandSorterConsoleApp/{ => Logics}/PokerHandLogicHandler/RankFinders/RoyalFlushFinder.cs (100%) rename PokerHandSorterConsoleApp/{ => Logics}/PokerHandLogicHandler/RankFinders/StraightFinder.cs (100%) rename PokerHandSorterConsoleApp/{ => Logics}/PokerHandLogicHandler/RankFinders/StraightFlushFinder.cs (100%) rename PokerHandSorterConsoleApp/{ => Logics}/PokerHandLogicHandler/RankFinders/ThreeOfAKindFinder.cs (100%) rename PokerHandSorterConsoleApp/{ => Logics}/PokerHandLogicHandler/Utils/ListExtension.cs (100%) delete mode 100644 PokerHandSorterConsoleApp/PokerHanderSorterService/GameServices.csproj rename PokerHandSorterConsoleApp/{PokerHandLogicHandler/PokerHandLogicRuleHandlers.csproj => Services/GameServices/GameServices.csproj} (60%) rename PokerHandSorterConsoleApp/{PokerHanderSorterService => Services/GameServices}/PokerHand/PokerHandService.cs (100%) diff --git a/PokerHandSorterConsoleApp/GameModels/PokerHands/PokerHandDomainModels.Extensions/PlayerModelExtension.cs b/PokerHandSorterConsoleApp/GameModels/PokerHands/PokerHandDomainModels.Extensions/PlayerModelExtension.cs index 26d11b4..6b300a5 100644 --- a/PokerHandSorterConsoleApp/GameModels/PokerHands/PokerHandDomainModels.Extensions/PlayerModelExtension.cs +++ b/PokerHandSorterConsoleApp/GameModels/PokerHands/PokerHandDomainModels.Extensions/PlayerModelExtension.cs @@ -1,5 +1,4 @@ -using System; -using System.Linq; +using System.Linq; using PokerHandLogicHandlers.Finders; diff --git a/PokerHandSorterConsoleApp/GameModels/PokerHands/PokerHandDomainModels.Extensions/PokerHandDomainModels.Extensions.csproj b/PokerHandSorterConsoleApp/GameModels/PokerHands/PokerHandDomainModels.Extensions/PokerHandDomainModels.Extensions.csproj index b2abefb..d5c0951 100644 --- a/PokerHandSorterConsoleApp/GameModels/PokerHands/PokerHandDomainModels.Extensions/PokerHandDomainModels.Extensions.csproj +++ b/PokerHandSorterConsoleApp/GameModels/PokerHands/PokerHandDomainModels.Extensions/PokerHandDomainModels.Extensions.csproj @@ -5,7 +5,7 @@ - + diff --git a/PokerHandSorterConsoleApp/PokerHandLogicHandler/CardsLookupBuilder.cs b/PokerHandSorterConsoleApp/Logics/PokerHandLogicHandler/CardsLookupBuilder.cs similarity index 100% rename from PokerHandSorterConsoleApp/PokerHandLogicHandler/CardsLookupBuilder.cs rename to PokerHandSorterConsoleApp/Logics/PokerHandLogicHandler/CardsLookupBuilder.cs diff --git a/PokerHandSorterConsoleApp/PokerHandLogicHandler/ModelExtensions/CardModelExtension.cs b/PokerHandSorterConsoleApp/Logics/PokerHandLogicHandler/ModelExtensions/CardModelExtension.cs similarity index 100% rename from PokerHandSorterConsoleApp/PokerHandLogicHandler/ModelExtensions/CardModelExtension.cs rename to PokerHandSorterConsoleApp/Logics/PokerHandLogicHandler/ModelExtensions/CardModelExtension.cs diff --git a/PokerHandSorterConsoleApp/Logics/PokerHandLogicHandler/PokerHandLogicRuleHandlers.csproj b/PokerHandSorterConsoleApp/Logics/PokerHandLogicHandler/PokerHandLogicRuleHandlers.csproj new file mode 100644 index 0000000..a6c78f9 --- /dev/null +++ b/PokerHandSorterConsoleApp/Logics/PokerHandLogicHandler/PokerHandLogicRuleHandlers.csproj @@ -0,0 +1,11 @@ + + + + net5.0 + + + + + + + diff --git a/PokerHandSorterConsoleApp/PokerHandLogicHandler/RankFinders/DoublePairFinder.cs b/PokerHandSorterConsoleApp/Logics/PokerHandLogicHandler/RankFinders/DoublePairFinder.cs similarity index 100% rename from PokerHandSorterConsoleApp/PokerHandLogicHandler/RankFinders/DoublePairFinder.cs rename to PokerHandSorterConsoleApp/Logics/PokerHandLogicHandler/RankFinders/DoublePairFinder.cs diff --git a/PokerHandSorterConsoleApp/PokerHandLogicHandler/RankFinders/FlushFinder.cs b/PokerHandSorterConsoleApp/Logics/PokerHandLogicHandler/RankFinders/FlushFinder.cs similarity index 100% rename from PokerHandSorterConsoleApp/PokerHandLogicHandler/RankFinders/FlushFinder.cs rename to PokerHandSorterConsoleApp/Logics/PokerHandLogicHandler/RankFinders/FlushFinder.cs diff --git a/PokerHandSorterConsoleApp/PokerHandLogicHandler/RankFinders/FourOfAKindFinder.cs b/PokerHandSorterConsoleApp/Logics/PokerHandLogicHandler/RankFinders/FourOfAKindFinder.cs similarity index 100% rename from PokerHandSorterConsoleApp/PokerHandLogicHandler/RankFinders/FourOfAKindFinder.cs rename to PokerHandSorterConsoleApp/Logics/PokerHandLogicHandler/RankFinders/FourOfAKindFinder.cs diff --git a/PokerHandSorterConsoleApp/PokerHandLogicHandler/RankFinders/FullHouseFinder.cs b/PokerHandSorterConsoleApp/Logics/PokerHandLogicHandler/RankFinders/FullHouseFinder.cs similarity index 100% rename from PokerHandSorterConsoleApp/PokerHandLogicHandler/RankFinders/FullHouseFinder.cs rename to PokerHandSorterConsoleApp/Logics/PokerHandLogicHandler/RankFinders/FullHouseFinder.cs diff --git a/PokerHandSorterConsoleApp/PokerHandLogicHandler/RankFinders/HighestValueFinder.cs b/PokerHandSorterConsoleApp/Logics/PokerHandLogicHandler/RankFinders/HighestValueFinder.cs similarity index 100% rename from PokerHandSorterConsoleApp/PokerHandLogicHandler/RankFinders/HighestValueFinder.cs rename to PokerHandSorterConsoleApp/Logics/PokerHandLogicHandler/RankFinders/HighestValueFinder.cs diff --git a/PokerHandSorterConsoleApp/PokerHandLogicHandler/RankFinders/PairFinder.cs b/PokerHandSorterConsoleApp/Logics/PokerHandLogicHandler/RankFinders/PairFinder.cs similarity index 100% rename from PokerHandSorterConsoleApp/PokerHandLogicHandler/RankFinders/PairFinder.cs rename to PokerHandSorterConsoleApp/Logics/PokerHandLogicHandler/RankFinders/PairFinder.cs diff --git a/PokerHandSorterConsoleApp/PokerHandLogicHandler/RankFinders/RoyalFlushFinder.cs b/PokerHandSorterConsoleApp/Logics/PokerHandLogicHandler/RankFinders/RoyalFlushFinder.cs similarity index 100% rename from PokerHandSorterConsoleApp/PokerHandLogicHandler/RankFinders/RoyalFlushFinder.cs rename to PokerHandSorterConsoleApp/Logics/PokerHandLogicHandler/RankFinders/RoyalFlushFinder.cs diff --git a/PokerHandSorterConsoleApp/PokerHandLogicHandler/RankFinders/StraightFinder.cs b/PokerHandSorterConsoleApp/Logics/PokerHandLogicHandler/RankFinders/StraightFinder.cs similarity index 100% rename from PokerHandSorterConsoleApp/PokerHandLogicHandler/RankFinders/StraightFinder.cs rename to PokerHandSorterConsoleApp/Logics/PokerHandLogicHandler/RankFinders/StraightFinder.cs diff --git a/PokerHandSorterConsoleApp/PokerHandLogicHandler/RankFinders/StraightFlushFinder.cs b/PokerHandSorterConsoleApp/Logics/PokerHandLogicHandler/RankFinders/StraightFlushFinder.cs similarity index 100% rename from PokerHandSorterConsoleApp/PokerHandLogicHandler/RankFinders/StraightFlushFinder.cs rename to PokerHandSorterConsoleApp/Logics/PokerHandLogicHandler/RankFinders/StraightFlushFinder.cs diff --git a/PokerHandSorterConsoleApp/PokerHandLogicHandler/RankFinders/ThreeOfAKindFinder.cs b/PokerHandSorterConsoleApp/Logics/PokerHandLogicHandler/RankFinders/ThreeOfAKindFinder.cs similarity index 100% rename from PokerHandSorterConsoleApp/PokerHandLogicHandler/RankFinders/ThreeOfAKindFinder.cs rename to PokerHandSorterConsoleApp/Logics/PokerHandLogicHandler/RankFinders/ThreeOfAKindFinder.cs diff --git a/PokerHandSorterConsoleApp/PokerHandLogicHandler/Utils/ListExtension.cs b/PokerHandSorterConsoleApp/Logics/PokerHandLogicHandler/Utils/ListExtension.cs similarity index 100% rename from PokerHandSorterConsoleApp/PokerHandLogicHandler/Utils/ListExtension.cs rename to PokerHandSorterConsoleApp/Logics/PokerHandLogicHandler/Utils/ListExtension.cs diff --git a/PokerHandSorterConsoleApp/PokerHandConsoleApp/PokerHandConsole.csproj b/PokerHandSorterConsoleApp/PokerHandConsoleApp/PokerHandConsole.csproj index 459063d..a96185d 100644 --- a/PokerHandSorterConsoleApp/PokerHandConsoleApp/PokerHandConsole.csproj +++ b/PokerHandSorterConsoleApp/PokerHandConsoleApp/PokerHandConsole.csproj @@ -10,7 +10,7 @@ - + diff --git a/PokerHandSorterConsoleApp/PokerHandConsoleSolution.sln b/PokerHandSorterConsoleApp/PokerHandConsoleSolution.sln index 92e85dc..0c1a114 100644 --- a/PokerHandSorterConsoleApp/PokerHandConsoleSolution.sln +++ b/PokerHandSorterConsoleApp/PokerHandConsoleSolution.sln @@ -3,10 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.30804.86 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GameServices", "PokerHanderSorterService\GameServices.csproj", "{F69F2713-5791-42A6-B850-F40CE612738C}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PokerHandLogicRuleHandlers", "PokerHandLogicHandler\PokerHandLogicRuleHandlers.csproj", "{ADE26051-852B-44EC-AAD3-9F7F689E0220}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{F1697E6C-9248-4530-8CD6-97963E74A3B4}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Interfaces", "Interfaces", "{28B1A074-245B-4D37-B269-88BCA51C84DF}" @@ -35,20 +31,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PokerHandDomainModels", "Ga EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PokerHandDomainModels.Extensions", "GameModels\PokerHands\PokerHandDomainModels.Extensions\PokerHandDomainModels.Extensions.csproj", "{6621CC38-90A6-459A-99A9-00AD20A261A0}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GameServices", "Services\GameServices\GameServices.csproj", "{C3ADB6A1-254A-4D88-9956-1BC880FCA6F1}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PokerHandLogicRuleHandlers", "Logics\PokerHandLogicHandler\PokerHandLogicRuleHandlers.csproj", "{7455EFED-E7A1-40D9-868A-FC2D9C4F288B}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {F69F2713-5791-42A6-B850-F40CE612738C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F69F2713-5791-42A6-B850-F40CE612738C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F69F2713-5791-42A6-B850-F40CE612738C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F69F2713-5791-42A6-B850-F40CE612738C}.Release|Any CPU.Build.0 = Release|Any CPU - {ADE26051-852B-44EC-AAD3-9F7F689E0220}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ADE26051-852B-44EC-AAD3-9F7F689E0220}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ADE26051-852B-44EC-AAD3-9F7F689E0220}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ADE26051-852B-44EC-AAD3-9F7F689E0220}.Release|Any CPU.Build.0 = Release|Any CPU {FCFBE5D4-8ADC-4498-AEB6-454FE4EE3B0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {FCFBE5D4-8ADC-4498-AEB6-454FE4EE3B0E}.Debug|Any CPU.Build.0 = Debug|Any CPU {FCFBE5D4-8ADC-4498-AEB6-454FE4EE3B0E}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -73,13 +65,19 @@ Global {6621CC38-90A6-459A-99A9-00AD20A261A0}.Debug|Any CPU.Build.0 = Debug|Any CPU {6621CC38-90A6-459A-99A9-00AD20A261A0}.Release|Any CPU.ActiveCfg = Release|Any CPU {6621CC38-90A6-459A-99A9-00AD20A261A0}.Release|Any CPU.Build.0 = Release|Any CPU + {C3ADB6A1-254A-4D88-9956-1BC880FCA6F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C3ADB6A1-254A-4D88-9956-1BC880FCA6F1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C3ADB6A1-254A-4D88-9956-1BC880FCA6F1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C3ADB6A1-254A-4D88-9956-1BC880FCA6F1}.Release|Any CPU.Build.0 = Release|Any CPU + {7455EFED-E7A1-40D9-868A-FC2D9C4F288B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7455EFED-E7A1-40D9-868A-FC2D9C4F288B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7455EFED-E7A1-40D9-868A-FC2D9C4F288B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7455EFED-E7A1-40D9-868A-FC2D9C4F288B}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {F69F2713-5791-42A6-B850-F40CE612738C} = {F19BAA81-46CD-4736-8AE3-2E62B93C723E} - {ADE26051-852B-44EC-AAD3-9F7F689E0220} = {2240E6A7-3D12-45AD-9262-B2BA7AD8DEEE} {BA5E61AE-7917-4AF8-9F56-505EBD8A44EF} = {D4555EBA-DE48-4BC2-A173-01F92CC09079} {B14EF8D3-E4CF-4296-B462-1B21B64DF1C6} = {F1697E6C-9248-4530-8CD6-97963E74A3B4} {2240E6A7-3D12-45AD-9262-B2BA7AD8DEEE} = {EABBA59C-09F4-48D1-9C37-8F20E0C93992} @@ -88,6 +86,8 @@ Global {3F6A6023-D23A-4081-8FF3-FF1E2211046C} = {B14EF8D3-E4CF-4296-B462-1B21B64DF1C6} {861A40F5-6AE7-44FE-87F2-999E78020F76} = {BA5E61AE-7917-4AF8-9F56-505EBD8A44EF} {6621CC38-90A6-459A-99A9-00AD20A261A0} = {BA5E61AE-7917-4AF8-9F56-505EBD8A44EF} + {C3ADB6A1-254A-4D88-9956-1BC880FCA6F1} = {F19BAA81-46CD-4736-8AE3-2E62B93C723E} + {7455EFED-E7A1-40D9-868A-FC2D9C4F288B} = {2240E6A7-3D12-45AD-9262-B2BA7AD8DEEE} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {1DDA806A-1A88-432B-84BD-03C8200EF17C} diff --git a/PokerHandSorterConsoleApp/PokerHanderSorterService/GameServices.csproj b/PokerHandSorterConsoleApp/PokerHanderSorterService/GameServices.csproj deleted file mode 100644 index 5527c0f..0000000 --- a/PokerHandSorterConsoleApp/PokerHanderSorterService/GameServices.csproj +++ /dev/null @@ -1,12 +0,0 @@ - - - - net5.0 - - - - - - - - diff --git a/PokerHandSorterConsoleApp/PokerHandLogicHandler/PokerHandLogicRuleHandlers.csproj b/PokerHandSorterConsoleApp/Services/GameServices/GameServices.csproj similarity index 60% rename from PokerHandSorterConsoleApp/PokerHandLogicHandler/PokerHandLogicRuleHandlers.csproj rename to PokerHandSorterConsoleApp/Services/GameServices/GameServices.csproj index 204489f..f4e5a33 100644 --- a/PokerHandSorterConsoleApp/PokerHandLogicHandler/PokerHandLogicRuleHandlers.csproj +++ b/PokerHandSorterConsoleApp/Services/GameServices/GameServices.csproj @@ -5,7 +5,7 @@ - + diff --git a/PokerHandSorterConsoleApp/PokerHanderSorterService/PokerHand/PokerHandService.cs b/PokerHandSorterConsoleApp/Services/GameServices/PokerHand/PokerHandService.cs similarity index 100% rename from PokerHandSorterConsoleApp/PokerHanderSorterService/PokerHand/PokerHandService.cs rename to PokerHandSorterConsoleApp/Services/GameServices/PokerHand/PokerHandService.cs diff --git a/PokerHandSorterConsoleApp/Tests/PokerHandLogicHandlerTests/PokerHandLogicHandlersTests.csproj b/PokerHandSorterConsoleApp/Tests/PokerHandLogicHandlerTests/PokerHandLogicHandlersTests.csproj index f893f4d..e729caa 100644 --- a/PokerHandSorterConsoleApp/Tests/PokerHandLogicHandlerTests/PokerHandLogicHandlersTests.csproj +++ b/PokerHandSorterConsoleApp/Tests/PokerHandLogicHandlerTests/PokerHandLogicHandlersTests.csproj @@ -20,8 +20,7 @@ - - + diff --git a/PokerHandSorterConsoleApp/Tests/PokerHandSorterServiceTests/PokerHandSorterServiceTests.csproj b/PokerHandSorterConsoleApp/Tests/PokerHandSorterServiceTests/PokerHandSorterServiceTests.csproj index 225ca4a..cd11f1f 100644 --- a/PokerHandSorterConsoleApp/Tests/PokerHandSorterServiceTests/PokerHandSorterServiceTests.csproj +++ b/PokerHandSorterConsoleApp/Tests/PokerHandSorterServiceTests/PokerHandSorterServiceTests.csproj @@ -37,8 +37,7 @@ - - + diff --git a/PokerHandSorterConsoleApp/Tests/PokerHandSorterServiceTests/SetupAllMatchesMethodTests.cs b/PokerHandSorterConsoleApp/Tests/PokerHandSorterServiceTests/SetupAllMatchesMethodTests.cs index bf6469c..1a2ff16 100644 --- a/PokerHandSorterConsoleApp/Tests/PokerHandSorterServiceTests/SetupAllMatchesMethodTests.cs +++ b/PokerHandSorterConsoleApp/Tests/PokerHandSorterServiceTests/SetupAllMatchesMethodTests.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Linq; -using System.Text; +using System.Linq; using GameService; diff --git a/PokerHandSorterConsoleApp/Tests/PokerHandSorterServiceTests/SetupMatchMethodTests.cs b/PokerHandSorterConsoleApp/Tests/PokerHandSorterServiceTests/SetupMatchMethodTests.cs index 37918bf..e050494 100644 --- a/PokerHandSorterConsoleApp/Tests/PokerHandSorterServiceTests/SetupMatchMethodTests.cs +++ b/PokerHandSorterConsoleApp/Tests/PokerHandSorterServiceTests/SetupMatchMethodTests.cs @@ -1,5 +1,3 @@ -using System; -using System.Diagnostics; using System.Linq; using GameService;