From e1a09e48a101988d429d375393bb541060c1ae84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Sun, 21 Aug 2022 11:32:46 +0300
Subject: [PATCH] Refactor: Re-order methods.

---
 .../IPermissionDefinitionSerializer.cs        | 10 +--
 .../PermissionDefinitionSerializer.cs         | 82 +++++++++----------
 2 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/IPermissionDefinitionSerializer.cs b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/IPermissionDefinitionSerializer.cs
index ce76afc10c..8ed09a4380 100644
--- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/IPermissionDefinitionSerializer.cs
+++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/IPermissionDefinitionSerializer.cs
@@ -7,13 +7,13 @@ namespace Volo.Abp.PermissionManagement;
 
 public interface IPermissionDefinitionSerializer
 {
-    Task<PermissionDefinitionRecord> SerializeAsync(
-        PermissionDefinition permission,
-        [CanBeNull] PermissionGroupDefinition permissionGroup);
+    Task<(PermissionGroupDefinitionRecord[], PermissionDefinitionRecord[])>
+        SerializeAsync(IEnumerable<PermissionGroupDefinition> permissionGroups);
 
     Task<PermissionGroupDefinitionRecord> SerializeAsync(
         PermissionGroupDefinition permissionGroup);
 
-    Task<(PermissionGroupDefinitionRecord[], PermissionDefinitionRecord[])>
-        SerializeAsync(IEnumerable<PermissionGroupDefinition> permissionGroups);
+    Task<PermissionDefinitionRecord> SerializeAsync(
+        PermissionDefinition permission,
+        [CanBeNull] PermissionGroupDefinition permissionGroup);
 }
\ No newline at end of file
diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/PermissionDefinitionSerializer.cs b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/PermissionDefinitionSerializer.cs
index c99ee51f24..49104c85b6 100644
--- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/PermissionDefinitionSerializer.cs
+++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/PermissionDefinitionSerializer.cs
@@ -27,34 +27,26 @@ public class PermissionDefinitionSerializer : IPermissionDefinitionSerializer, I
         GuidGenerator = guidGenerator;
         StringLocalizerFactory = stringLocalizerFactory;
     }
-    
-    public Task<PermissionDefinitionRecord> SerializeAsync(
-        PermissionDefinition permission,
-        PermissionGroupDefinition permissionGroup)
+
+    public async Task<(PermissionGroupDefinitionRecord[], PermissionDefinitionRecord[])> 
+        SerializeAsync(IEnumerable<PermissionGroupDefinition> permissionGroups)
     {
-        using (CultureHelper.Use(CultureInfo.InvariantCulture))
+        var permissionGroupRecords = new List<PermissionGroupDefinitionRecord>();
+        var permissionRecords = new List<PermissionDefinitionRecord>();
+        
+        foreach (var permissionGroup in permissionGroups)
         {
-            var permissionRecord = new PermissionDefinitionRecord(
-                GuidGenerator.Create(),
-                permissionGroup?.Name,
-                permission.Name,
-                permission.Parent?.Name,
-                permission.DisplayName.Localize(StringLocalizerFactory),
-                permission.IsEnabled,
-                permission.MultiTenancySide,
-                SerializeProviders(permission.Providers),
-                SerializeStateCheckers(permission.StateCheckers)
-            );
-
-            foreach (var property in permission.Properties)
+            permissionGroupRecords.Add(await SerializeAsync(permissionGroup));
+            
+            foreach (var permission in permissionGroup.GetPermissionsWithChildren())
             {
-                permissionRecord.SetProperty(property.Key, property.Value);
+                permissionRecords.Add(await SerializeAsync(permission, permissionGroup));
             }
-            
-            return Task.FromResult(permissionRecord);
         }
-    }
 
+        return (permissionGroupRecords.ToArray(), permissionRecords.ToArray());
+    }
+    
     public Task<PermissionGroupDefinitionRecord> SerializeAsync(PermissionGroupDefinition permissionGroup)
     {
         using (CultureHelper.Use(CultureInfo.InvariantCulture))
@@ -73,35 +65,43 @@ public class PermissionDefinitionSerializer : IPermissionDefinitionSerializer, I
             return Task.FromResult(permissionGroupRecord);
         }
     }
-
-    public async Task<(PermissionGroupDefinitionRecord[], PermissionDefinitionRecord[])> 
-        SerializeAsync(IEnumerable<PermissionGroupDefinition> permissionGroups)
+    
+    public Task<PermissionDefinitionRecord> SerializeAsync(
+        PermissionDefinition permission,
+        PermissionGroupDefinition permissionGroup)
     {
-        var permissionGroupRecords = new List<PermissionGroupDefinitionRecord>();
-        var permissionRecords = new List<PermissionDefinitionRecord>();
-        
-        foreach (var permissionGroup in permissionGroups)
+        using (CultureHelper.Use(CultureInfo.InvariantCulture))
         {
-            permissionGroupRecords.Add(await SerializeAsync(permissionGroup));
-            
-            foreach (var permission in permissionGroup.GetPermissionsWithChildren())
+            var permissionRecord = new PermissionDefinitionRecord(
+                GuidGenerator.Create(),
+                permissionGroup?.Name,
+                permission.Name,
+                permission.Parent?.Name,
+                permission.DisplayName.Localize(StringLocalizerFactory),
+                permission.IsEnabled,
+                permission.MultiTenancySide,
+                SerializeProviders(permission.Providers),
+                SerializeStateCheckers(permission.StateCheckers)
+            );
+
+            foreach (var property in permission.Properties)
             {
-                permissionRecords.Add(await SerializeAsync(permission, permissionGroup));
+                permissionRecord.SetProperty(property.Key, property.Value);
             }
+            
+            return Task.FromResult(permissionRecord);
         }
-
-        return (permissionGroupRecords.ToArray(), permissionRecords.ToArray());
-    }
-
-    protected virtual string SerializeStateCheckers(List<ISimpleStateChecker<PermissionDefinition>> stateCheckers)
-    {
-        return StateCheckerSerializer.Serialize(stateCheckers);
     }
-
+    
     protected virtual string SerializeProviders(ICollection<string> providers)
     {
         return providers.Any()
             ? providers.JoinAsString(",")
             : null;
     }
+
+    protected virtual string SerializeStateCheckers(List<ISimpleStateChecker<PermissionDefinition>> stateCheckers)
+    {
+        return StateCheckerSerializer.Serialize(stateCheckers);
+    }
 }
\ No newline at end of file