Merge pull request #44 from SSchulze1989/develop

v 0.6.2
SSchulze1989 · May 4, 2023 · 2accbb2 · 2accbb2
2 parents f833fe3 + b8b7db9
commit 2accbb2
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 11 deletions.
diff --git a/src/iRLeagueApiCore.Common/LeagueRoleValue.cs b/src/iRLeagueApiCore.Common/LeagueRoleValue.cs
@@ -14,7 +14,9 @@ internal LeagueRoleValue(string value)
     internal LeagueRoleValue(string value, IEnumerable<LeagueRoleValue> implicitRoles)
     {
         this.value = value;
-        this.implicitRoles = implicitRoles.ToArray();
+        this.implicitRoles = implicitRoles
+            .SelectMany(x => new[] { x }.Concat(x.GetImplicitRoles()))
+            .ToArray();
     }
 
     public static implicit operator string(LeagueRoleValue role) => role.value;

diff --git a/src/iRLeagueApiCore.Common/LeagueRoles.cs b/src/iRLeagueApiCore.Common/LeagueRoles.cs
@@ -27,13 +27,20 @@ public static class LeagueRoles
     /// Administrator of the league with full privileges
     /// </summary>
     public const string Admin = "Admin";
-    public static LeagueRoleValue AdminValue { get; } = new(Admin, new[] { OrganizerValue, StewardValue, MemberValue });
+    public static LeagueRoleValue AdminValue { get; } = new(Admin, new[] { OrganizerValue, StewardValue });
+    /// <summary>
+    /// Owner of the league
+    /// Full privilige including right to delete
+    /// </summary>
+    public const string Owner = "Owner";
+    public static LeagueRoleValue OwnerValue { get; } = new(Owner, new[] { AdminValue });
 
     /// <summary>
     /// Array of all available league roles
     /// </summary>
     public static LeagueRoleValue[] RolesAvailable { get; } = new[]
     {
+        OwnerValue,
         AdminValue,
         OrganizerValue,
         StewardValue,

diff --git a/src/iRLeagueApiCore.Common/iRLeagueApiCore.Common.csproj b/src/iRLeagueApiCore.Common/iRLeagueApiCore.Common.csproj
@@ -18,7 +18,7 @@
 		<OutputType>Library</OutputType>
 		<TargetFramework>net6.0</TargetFramework>
 		<PackageId>iRLeagueApiCore.Common</PackageId>
-		<Version>0.6.1</Version>
+		<Version>0.6.2</Version>
 		<Authors>Simon Schulze</Authors>
 		<Company>Simon Schulze</Company>
 		<ImplicitUsings>enable</ImplicitUsings>

diff --git a/test/iRLeagueApiCore.Common.Tests/LeagueRolesTests.cs b/test/iRLeagueApiCore.Common.Tests/LeagueRolesTests.cs
@@ -3,11 +3,13 @@ namespace iRLeagueApiCore.Common.Tests;
 public class LeagueRolesTests
 {
     [Theory]
-    [InlineData("Admin", true, true, true, true)]
-    [InlineData("Organizer", false, true, false, true)]
-    [InlineData("Steward", false, false, true, true)]
-    [InlineData("Member", false, false, false, true)]
+    [InlineData(LeagueRoles.Owner, true, true, true, true, true)]
+    [InlineData(LeagueRoles.Admin, false, true, true, true, true)]
+    [InlineData(LeagueRoles.Organizer, false, false, true, false, true)]
+    [InlineData(LeagueRoles.Steward, false, false, false, true, true)]
+    [InlineData(LeagueRoles.Member, false, false, false, false, true)]
     public void ShouldHaveRoles(string roleName,
+        bool owner,
         bool admin,
         bool organizer,
         bool steward,
@@ -17,17 +19,19 @@ public void ShouldHaveRoles(string roleName,
         var role = LeagueRoles.GetRoleValue(roleName);
         var roles = new[] { role };
 
+        LeagueRoles.CheckRole(LeagueRoles.OwnerValue, roles).Should().Be(owner);
         LeagueRoles.CheckRole(LeagueRoles.AdminValue, roles).Should().Be(admin);
         LeagueRoles.CheckRole(LeagueRoles.OrganizerValue, roles).Should().Be(organizer);
         LeagueRoles.CheckRole(LeagueRoles.StewardValue, roles).Should().Be(steward);
         LeagueRoles.CheckRole(LeagueRoles.MemberValue, roles).Should().Be(member);
     }
 
     [Theory]
-    [InlineData("Admin", new string[0])]
-    [InlineData("Organizer", new[] { "Admin" })]
-    [InlineData("Steward", new[] { "Admin" })]
-    [InlineData("Member", new[] { "Admin", "Organizer", "Steward" })]
+    [InlineData(LeagueRoles.Owner, new string[0])]
+    [InlineData(LeagueRoles.Admin, new[] { LeagueRoles.Owner })]
+    [InlineData(LeagueRoles.Organizer, new[] { LeagueRoles.Owner, LeagueRoles.Admin })]
+    [InlineData(LeagueRoles.Steward, new[] { LeagueRoles.Owner, LeagueRoles.Admin })]
+    [InlineData(LeagueRoles.Member, new[] { LeagueRoles.Owner, LeagueRoles.Admin, LeagueRoles.Organizer, LeagueRoles.Steward })]
     public void ShouldBeImplicitOf(string roleName, string[] implicitOfRoleNames)
     {
         // Setup