From 76ea7c9f7295f1507bc87154b36cc0f2ea22036e Mon Sep 17 00:00:00 2001 From: crupest Date: Wed, 28 Apr 2021 17:16:45 +0800 Subject: ... --- .../Controllers/BookmarkTimelineController.cs | 6 ++-- .../Controllers/HighlightTimelineController.cs | 6 ++-- BackEnd/Timeline/Controllers/TimelineController.cs | 34 +++++++++---------- .../Timeline/Controllers/TimelinePostController.cs | 38 +++++++++++----------- BackEnd/Timeline/Controllers/TokenController.cs | 4 +-- 5 files changed, 44 insertions(+), 44 deletions(-) (limited to 'BackEnd/Timeline/Controllers') diff --git a/BackEnd/Timeline/Controllers/BookmarkTimelineController.cs b/BackEnd/Timeline/Controllers/BookmarkTimelineController.cs index 80a06c17..d941013f 100644 --- a/BackEnd/Timeline/Controllers/BookmarkTimelineController.cs +++ b/BackEnd/Timeline/Controllers/BookmarkTimelineController.cs @@ -63,7 +63,7 @@ namespace Timeline.Controllers { try { - var timelineId = await _timelineService.GetTimelineIdByName(timeline); + var timelineId = await _timelineService.GetTimelineIdByNameAsync(timeline); var create = await _service.AddBookmark(this.GetUserId(), timelineId); return CommonPutResponse.Create(create); } @@ -86,7 +86,7 @@ namespace Timeline.Controllers { try { - var timelineId = await _timelineService.GetTimelineIdByName(timeline); + var timelineId = await _timelineService.GetTimelineIdByNameAsync(timeline); var delete = await _service.RemoveBookmark(this.GetUserId(), timelineId); return CommonDeleteResponse.Create(delete); } @@ -109,7 +109,7 @@ namespace Timeline.Controllers { try { - var timelineId = await _timelineService.GetTimelineIdByName(request.Timeline); + var timelineId = await _timelineService.GetTimelineIdByNameAsync(request.Timeline); await _service.MoveBookmark(this.GetUserId(), timelineId, request.NewPosition!.Value); return Ok(); } diff --git a/BackEnd/Timeline/Controllers/HighlightTimelineController.cs b/BackEnd/Timeline/Controllers/HighlightTimelineController.cs index 2f1f898e..4facc4a1 100644 --- a/BackEnd/Timeline/Controllers/HighlightTimelineController.cs +++ b/BackEnd/Timeline/Controllers/HighlightTimelineController.cs @@ -62,7 +62,7 @@ namespace Timeline.Controllers { try { - var timelineId = await _timelineService.GetTimelineIdByName(timeline); + var timelineId = await _timelineService.GetTimelineIdByNameAsync(timeline); var create = await _service.AddHighlightTimeline(timelineId, this.GetUserId()); return CommonPutResponse.Create(create); } @@ -86,7 +86,7 @@ namespace Timeline.Controllers { try { - var timelineId = await _timelineService.GetTimelineIdByName(timeline); + var timelineId = await _timelineService.GetTimelineIdByNameAsync(timeline); var delete = await _service.RemoveHighlightTimeline(timelineId, this.GetUserId()); return CommonDeleteResponse.Create(delete); } @@ -109,7 +109,7 @@ namespace Timeline.Controllers { try { - var timelineId = await _timelineService.GetTimelineIdByName(body.Timeline); + var timelineId = await _timelineService.GetTimelineIdByNameAsync(body.Timeline); await _service.MoveHighlightTimeline(timelineId, body.NewPosition!.Value); return Ok(); } diff --git a/BackEnd/Timeline/Controllers/TimelineController.cs b/BackEnd/Timeline/Controllers/TimelineController.cs index 2feea476..c6b1f9ad 100644 --- a/BackEnd/Timeline/Controllers/TimelineController.cs +++ b/BackEnd/Timeline/Controllers/TimelineController.cs @@ -113,7 +113,7 @@ namespace Timeline.Controllers } } - var timelines = await _service.GetTimelines(relationship, visibilityFilter); + var timelines = await _service.GetTimelinesAsync(relationship, visibilityFilter); var result = await Map(timelines); return result; } @@ -128,8 +128,8 @@ namespace Timeline.Controllers [ProducesResponseType(StatusCodes.Status404NotFound)] public async Task> TimelineGet([FromRoute][GeneralTimelineName] string timeline) { - var timelineId = await _service.GetTimelineIdByName(timeline); - var t = await _service.GetTimeline(timelineId); + var timelineId = await _service.GetTimelineIdByNameAsync(timeline); + var t = await _service.GetTimelineAsync(timelineId); var result = await Map(t); return result; } @@ -148,17 +148,17 @@ namespace Timeline.Controllers [ProducesResponseType(StatusCodes.Status403Forbidden)] public async Task> TimelinePatch([FromRoute][GeneralTimelineName] string timeline, [FromBody] HttpTimelinePatchRequest body) { - var timelineId = await _service.GetTimelineIdByName(timeline); + var timelineId = await _service.GetTimelineIdByNameAsync(timeline); - if (!UserHasAllTimelineManagementPermission && !await _service.HasManagePermission(timelineId, this.GetUserId())) + if (!UserHasAllTimelineManagementPermission && !await _service.HasManagePermissionAsync(timelineId, this.GetUserId())) { return StatusCode(StatusCodes.Status403Forbidden, ErrorResponse.Common.Forbid()); } try { - await _service.ChangeProperty(timelineId, _mapper.Map(body)); - var t = await _service.GetTimeline(timelineId); + await _service.ChangePropertyAsync(timelineId, _mapper.Map(body)); + var t = await _service.GetTimelineAsync(timelineId); var result = await Map(t); return result; } @@ -181,9 +181,9 @@ namespace Timeline.Controllers [ProducesResponseType(StatusCodes.Status403Forbidden)] public async Task> TimelineMemberPut([FromRoute][GeneralTimelineName] string timeline, [FromRoute][Username] string member) { - var timelineId = await _service.GetTimelineIdByName(timeline); + var timelineId = await _service.GetTimelineIdByNameAsync(timeline); - if (!UserHasAllTimelineManagementPermission && !(await _service.HasManagePermission(timelineId, this.GetUserId()))) + if (!UserHasAllTimelineManagementPermission && !(await _service.HasManagePermissionAsync(timelineId, this.GetUserId()))) { return StatusCode(StatusCodes.Status403Forbidden, ErrorResponse.Common.Forbid()); } @@ -191,7 +191,7 @@ namespace Timeline.Controllers try { var userId = await _userService.GetUserIdByUsernameAsync(member); - var create = await _service.AddMember(timelineId, userId); + var create = await _service.AddMemberAsync(timelineId, userId); return Ok(CommonPutResponse.Create(create)); } catch (UserNotExistException) @@ -213,9 +213,9 @@ namespace Timeline.Controllers [ProducesResponseType(StatusCodes.Status403Forbidden)] public async Task TimelineMemberDelete([FromRoute][GeneralTimelineName] string timeline, [FromRoute][Username] string member) { - var timelineId = await _service.GetTimelineIdByName(timeline); + var timelineId = await _service.GetTimelineIdByNameAsync(timeline); - if (!UserHasAllTimelineManagementPermission && !(await _service.HasManagePermission(timelineId, this.GetUserId()))) + if (!UserHasAllTimelineManagementPermission && !(await _service.HasManagePermissionAsync(timelineId, this.GetUserId()))) { return StatusCode(StatusCodes.Status403Forbidden, ErrorResponse.Common.Forbid()); } @@ -223,7 +223,7 @@ namespace Timeline.Controllers try { var userId = await _userService.GetUserIdByUsernameAsync(member); - var delete = await _service.RemoveMember(timelineId, userId); + var delete = await _service.RemoveMemberAsync(timelineId, userId); return Ok(CommonDeleteResponse.Create(delete)); } catch (UserNotExistException) @@ -248,7 +248,7 @@ namespace Timeline.Controllers try { - var timeline = await _service.CreateTimeline(body.Name, userId); + var timeline = await _service.CreateTimelineAsync(body.Name, userId); var result = await Map(timeline); return result; } @@ -271,16 +271,16 @@ namespace Timeline.Controllers [ProducesResponseType(StatusCodes.Status403Forbidden)] public async Task TimelineDelete([FromRoute][TimelineName] string timeline) { - var timelineId = await _service.GetTimelineIdByName(timeline); + var timelineId = await _service.GetTimelineIdByNameAsync(timeline); - if (!UserHasAllTimelineManagementPermission && !(await _service.HasManagePermission(timelineId, this.GetUserId()))) + if (!UserHasAllTimelineManagementPermission && !(await _service.HasManagePermissionAsync(timelineId, this.GetUserId()))) { return StatusCode(StatusCodes.Status403Forbidden, ErrorResponse.Common.Forbid()); } try { - await _service.DeleteTimeline(timelineId); + await _service.DeleteTimelineAsync(timelineId); return Ok(); } catch (TimelineNotExistException) diff --git a/BackEnd/Timeline/Controllers/TimelinePostController.cs b/BackEnd/Timeline/Controllers/TimelinePostController.cs index ef139201..cea873b0 100644 --- a/BackEnd/Timeline/Controllers/TimelinePostController.cs +++ b/BackEnd/Timeline/Controllers/TimelinePostController.cs @@ -71,14 +71,14 @@ namespace Timeline.Controllers [ProducesResponseType(StatusCodes.Status404NotFound)] public async Task>> List([FromRoute][GeneralTimelineName] string timeline, [FromQuery] DateTime? modifiedSince, [FromQuery] bool? includeDeleted) { - var timelineId = await _timelineService.GetTimelineIdByName(timeline); + var timelineId = await _timelineService.GetTimelineIdByNameAsync(timeline); - if (!UserHasAllTimelineManagementPermission && !await _timelineService.HasReadPermission(timelineId, this.GetOptionalUserId())) + if (!UserHasAllTimelineManagementPermission && !await _timelineService.HasReadPermissionAsync(timelineId, this.GetOptionalUserId())) { return StatusCode(StatusCodes.Status403Forbidden, ErrorResponse.Common.Forbid()); } - var posts = await _postService.GetPosts(timelineId, modifiedSince, includeDeleted ?? false); + var posts = await _postService.GetPostsAsync(timelineId, modifiedSince, includeDeleted ?? false); var result = await Map(posts, timeline); return result; @@ -96,14 +96,14 @@ namespace Timeline.Controllers [ProducesResponseType(StatusCodes.Status404NotFound)] public async Task> Get([FromRoute][GeneralTimelineName] string timeline, [FromRoute(Name = "post")] long postId) { - var timelineId = await _timelineService.GetTimelineIdByName(timeline); + var timelineId = await _timelineService.GetTimelineIdByNameAsync(timeline); - if (!UserHasAllTimelineManagementPermission && !await _timelineService.HasReadPermission(timelineId, this.GetOptionalUserId())) + if (!UserHasAllTimelineManagementPermission && !await _timelineService.HasReadPermissionAsync(timelineId, this.GetOptionalUserId())) { return StatusCode(StatusCodes.Status403Forbidden, ErrorResponse.Common.Forbid()); } - var post = await _postService.GetPost(timelineId, postId); + var post = await _postService.GetPostAsync(timelineId, postId); var result = await Map(post, timeline); return result; } @@ -142,18 +142,18 @@ namespace Timeline.Controllers [ProducesResponseType(StatusCodes.Status404NotFound)] public async Task DataGet([FromRoute][GeneralTimelineName] string timeline, [FromRoute] long post, [FromRoute(Name = "data_index")][Range(0, 100)] long dataIndex) { - var timelineId = await _timelineService.GetTimelineIdByName(timeline); + var timelineId = await _timelineService.GetTimelineIdByNameAsync(timeline); - if (!UserHasAllTimelineManagementPermission && !await _timelineService.HasReadPermission(timelineId, this.GetOptionalUserId())) + if (!UserHasAllTimelineManagementPermission && !await _timelineService.HasReadPermissionAsync(timelineId, this.GetOptionalUserId())) { return StatusCode(StatusCodes.Status403Forbidden, ErrorResponse.Common.Forbid()); } return await DataCacheHelper.GenerateActionResult(this, - () => _postService.GetPostDataDigest(timelineId, post, dataIndex), + () => _postService.GetPostDataDigestAsync(timelineId, post, dataIndex), async () => { - var data = await _postService.GetPostData(timelineId, post, dataIndex); + var data = await _postService.GetPostDataAsync(timelineId, post, dataIndex); if (data.ContentType == MimeTypes.TextMarkdown) { return new ByteData(_markdownProcessor.Process(data.Data, Url, timeline, post), data.ContentType); @@ -177,10 +177,10 @@ namespace Timeline.Controllers [ProducesResponseType(StatusCodes.Status403Forbidden)] public async Task> Post([FromRoute][GeneralTimelineName] string timeline, [FromBody] HttpTimelinePostCreateRequest body) { - var timelineId = await _timelineService.GetTimelineIdByName(timeline); + var timelineId = await _timelineService.GetTimelineIdByNameAsync(timeline); var userId = this.GetUserId(); - if (!UserHasAllTimelineManagementPermission && !await _timelineService.IsMemberOf(timelineId, userId)) + if (!UserHasAllTimelineManagementPermission && !await _timelineService.IsMemberOfAsync(timelineId, userId)) { return StatusCode(StatusCodes.Status403Forbidden, ErrorResponse.Common.Forbid()); } @@ -212,7 +212,7 @@ namespace Timeline.Controllers try { - var post = await _postService.CreatePost(timelineId, userId, createRequest); + var post = await _postService.CreatePostAsync(timelineId, userId, createRequest); var result = await Map(post, timeline); return result; } @@ -237,14 +237,14 @@ namespace Timeline.Controllers [ProducesResponseType(StatusCodes.Status403Forbidden)] public async Task> Patch([FromRoute][GeneralTimelineName] string timeline, [FromRoute] long post, [FromBody] HttpTimelinePostPatchRequest body) { - var timelineId = await _timelineService.GetTimelineIdByName(timeline); + var timelineId = await _timelineService.GetTimelineIdByNameAsync(timeline); - if (!UserHasAllTimelineManagementPermission && !await _postService.HasPostModifyPermission(timelineId, post, this.GetUserId(), true)) + if (!UserHasAllTimelineManagementPermission && !await _postService.HasPostModifyPermissionAsync(timelineId, post, this.GetUserId(), true)) { return StatusCode(StatusCodes.Status403Forbidden, ErrorResponse.Common.Forbid()); } - var entity = await _postService.PatchPost(timelineId, post, new TimelinePostPatchRequest { Time = body.Time, Color = body.Color }); + var entity = await _postService.PatchPostAsync(timelineId, post, new TimelinePostPatchRequest { Time = body.Time, Color = body.Color }); var result = await Map(entity, timeline); return Ok(result); @@ -264,14 +264,14 @@ namespace Timeline.Controllers [ProducesResponseType(StatusCodes.Status403Forbidden)] public async Task Delete([FromRoute][GeneralTimelineName] string timeline, [FromRoute] long post) { - var timelineId = await _timelineService.GetTimelineIdByName(timeline); + var timelineId = await _timelineService.GetTimelineIdByNameAsync(timeline); - if (!UserHasAllTimelineManagementPermission && !await _postService.HasPostModifyPermission(timelineId, post, this.GetUserId(), true)) + if (!UserHasAllTimelineManagementPermission && !await _postService.HasPostModifyPermissionAsync(timelineId, post, this.GetUserId(), true)) { return StatusCode(StatusCodes.Status403Forbidden, ErrorResponse.Common.Forbid()); } - await _postService.DeletePost(timelineId, post); + await _postService.DeletePostAsync(timelineId, post); return Ok(); } diff --git a/BackEnd/Timeline/Controllers/TokenController.cs b/BackEnd/Timeline/Controllers/TokenController.cs index fc19c64a..3b35fa13 100644 --- a/BackEnd/Timeline/Controllers/TokenController.cs +++ b/BackEnd/Timeline/Controllers/TokenController.cs @@ -63,7 +63,7 @@ namespace Timeline.Controllers if (request.Expire != null) expireTime = _clock.GetCurrentTime().AddDays(request.Expire.Value); - var result = await _userTokenManager.CreateToken(request.Username, request.Password, expireTime); + var result = await _userTokenManager.CreateTokenAsync(request.Username, request.Password, expireTime); _logger.LogInformation(Log.Format(LogCreateSuccess, ("Username", request.Username), @@ -108,7 +108,7 @@ namespace Timeline.Controllers try { - var result = await _userTokenManager.VerifyToken(request.Token); + var result = await _userTokenManager.VerifyTokenAsync(request.Token); _logger.LogInformation(Log.Format(LogVerifySuccess, ("Username", result.Username), ("Token", request.Token))); return new HttpVerifyTokenResponse -- cgit v1.2.3