From d3da412fa7e10db8c721846152a2c056dd4ccbcf Mon Sep 17 00:00:00 2001
From: crupest <crupest@outlook.com>
Date: Thu, 12 Nov 2020 23:21:31 +0800
Subject: ...

---
 BackEnd/Timeline/Services/TimelineService.cs | 14 +++++++-------
 BackEnd/Timeline/Services/UserService.cs     |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'BackEnd/Timeline/Services')

diff --git a/BackEnd/Timeline/Services/TimelineService.cs b/BackEnd/Timeline/Services/TimelineService.cs
index 4bcae596..04870dcf 100644
--- a/BackEnd/Timeline/Services/TimelineService.cs
+++ b/BackEnd/Timeline/Services/TimelineService.cs
@@ -414,12 +414,12 @@ namespace Timeline.Services
         /// Remember to include Members when query.
         private async Task<Models.Timeline> MapTimelineFromEntity(TimelineEntity entity)
         {
-            var owner = await _userService.GetUserById(entity.OwnerId);
+            var owner = await _userService.GetUser(entity.OwnerId);
 
             var members = new List<User>();
             foreach (var memberEntity in entity.Members)
             {
-                members.Add(await _userService.GetUserById(memberEntity.UserId));
+                members.Add(await _userService.GetUser(memberEntity.UserId));
             }
 
             var name = entity.Name ?? ("@" + owner.Username);
@@ -441,7 +441,7 @@ namespace Timeline.Services
 
         private async Task<TimelinePost> MapTimelinePostFromEntity(TimelinePostEntity entity, string timelineName)
         {
-            User? author = entity.AuthorId.HasValue ? await _userService.GetUserById(entity.AuthorId.Value) : null;
+            User? author = entity.AuthorId.HasValue ? await _userService.GetUser(entity.AuthorId.Value) : null;
 
             ITimelinePostContent? content = null;
 
@@ -699,7 +699,7 @@ namespace Timeline.Services
             var timelineId = await FindTimelineId(timelineName);
             var timelineEntity = await _database.Timelines.Where(t => t.Id == timelineId).SingleAsync();
 
-            var author = await _userService.GetUserById(authorId);
+            var author = await _userService.GetUser(authorId);
 
             var currentTime = _clock.GetCurrentTime();
             var finalTime = time ?? currentTime;
@@ -742,7 +742,7 @@ namespace Timeline.Services
             var timelineId = await FindTimelineId(timelineName);
             var timelineEntity = await _database.Timelines.Where(t => t.Id == timelineId).SingleAsync();
 
-            var author = await _userService.GetUserById(authorId);
+            var author = await _userService.GetUser(authorId);
 
             var imageFormat = await _imageValidator.Validate(data);
 
@@ -1098,14 +1098,14 @@ namespace Timeline.Services
 
             ValidateTimelineName(name, nameof(name));
 
-            var user = await _userService.GetUserById(owner);
+            var user = await _userService.GetUser(owner);
 
             var conflict = await _database.Timelines.AnyAsync(t => t.Name == name);
 
             if (conflict)
                 throw new EntityAlreadyExistException(EntityNames.Timeline, null, ExceptionTimelineNameConflict);
 
-            var newEntity = CreateNewTimelineEntity(name, user.Id!.Value);
+            var newEntity = CreateNewTimelineEntity(name, user.Id);
 
             _database.Timelines.Add(newEntity);
             await _database.SaveChangesAsync();
diff --git a/BackEnd/Timeline/Services/UserService.cs b/BackEnd/Timeline/Services/UserService.cs
index ed637ba3..b925742e 100644
--- a/BackEnd/Timeline/Services/UserService.cs
+++ b/BackEnd/Timeline/Services/UserService.cs
@@ -17,7 +17,7 @@ namespace Timeline.Services
     /// <summary>
     /// Null means not change.
     /// </summary>
-    public record ModifyUserParams(string? Username, string? Password, string? Nickname);
+    public record ModifyUserParams(string? Username = null, string? Password = null, string? Nickname = null);
 
     public interface IUserService
     {
@@ -74,7 +74,7 @@ namespace Timeline.Services
         /// <param name="id">The id of the user.</param>
         /// <param name="param">The new information.</param>
         /// <returns>The new user info.</returns>
-        /// <exception cref="ArgumentException">Thrown when some fields in <paramref name="info"/> is bad.</exception>
+        /// <exception cref="ArgumentException">Thrown when some fields in <paramref name="param"/> is bad.</exception>
         /// <exception cref="UserNotExistException">Thrown when user with given id does not exist.</exception>
         /// <remarks>
         /// Version will increase if password is changed.
-- 
cgit v1.2.3