From 509dc203d4e35fdeb99d006aed946d1471d6bda1 Mon Sep 17 00:00:00 2001
From: crupest <crupest@outlook.com>
Date: Sun, 21 Apr 2019 22:39:42 +0800
Subject: Remove unnecessary columns in database query.

---
 Timeline/Entities/UserInfo.cs | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

(limited to 'Timeline/Entities')

diff --git a/Timeline/Entities/UserInfo.cs b/Timeline/Entities/UserInfo.cs
index a1860552..c9bcde5b 100644
--- a/Timeline/Entities/UserInfo.cs
+++ b/Timeline/Entities/UserInfo.cs
@@ -17,25 +17,32 @@ namespace Timeline.Entities
             Roles = roles;
         }
 
-        public UserInfo(User user)
+        public static UserInfo Create(User user)
         {
             if (user == null)
                 throw new ArgumentNullException(nameof(user));
-
-            Username = user.Name;
-
-            if (user.RoleString == null)
-                Roles = null;
-            else
-                Roles = user.RoleString.Split(',').Select(r => r.Trim()).ToArray();
+            return Create(user.Name, user.RoleString);
         }
 
+        public static UserInfo Create(string username, string roleString) => new UserInfo
+        {
+            Username = username,
+            Roles = RolesFromString(roleString)
+        };
+
         public string Username { get; set; }
         public string[] Roles { get; set; }
 
         public static IEqualityComparer<UserInfo> EqualityComparer { get; } = new EqualityComparerImpl();
         public static IComparer<UserInfo> Comparer { get; } = Comparer<UserInfo>.Create(Compare);
 
+        private static string[] RolesFromString(string roleString)
+        {
+            if (roleString == null)
+                return null;
+            return roleString.Split(',').Select(r => r.Trim()).ToArray();
+        }
+
         private class EqualityComparerImpl : IEqualityComparer<UserInfo>
         {
             bool IEqualityComparer<UserInfo>.Equals(UserInfo x, UserInfo y)
-- 
cgit v1.2.3