Feature get all revision #23
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,18 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <configuration> | ||
| <connectionStrings> | ||
| <add name="MongoDBStorage" connectionString="mongodb://localhost/brCounterTest" /> | ||
| </connectionStrings> | ||
| <runtime> | ||
| <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> | ||
| <dependentAssembly> | ||
| <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" /> | ||
| <bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" /> | ||
| </dependentAssembly> | ||
| <dependentAssembly> | ||
| <assemblyIdentity name="System.Web.Http.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" /> | ||
| <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" /> | ||
| </dependentAssembly> | ||
| </assemblyBinding> | ||
| </runtime> | ||
| </configuration> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,10 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <packages> | ||
| <package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net451" /> | ||
| <package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net451" /> | ||
| <package id="MongoDB.Bson" version="2.0.0" targetFramework="net451" /> | ||
| <package id="MongoDB.Driver" version="2.0.0" targetFramework="net451" /> | ||
| <package id="MongoDB.Driver.Core" version="2.0.0" targetFramework="net451" /> | ||
| <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net451" /> | ||
| <package id="NUnit" version="2.6.4" targetFramework="net451" /> | ||
| </packages> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,7 @@ | ||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Net; | ||
| using System.Threading; | ||
| using System.Threading.Tasks; | ||
| using System.Web.Http; | ||
| using BuildRevisionCounter.Interfaces; | ||
|
|
@@ -27,6 +29,39 @@ public CounterController(IMongoDBStorage mongoDbStorage) | |
| _mongoDbStorage = mongoDbStorage; | ||
| } | ||
|
|
||
| [HttpGet] | ||
| [Route("")] | ||
| [Authorize(Roles = "admin, editor, anonymous")] | ||
| public async Task<IReadOnlyCollection<RevisionModel>> GetAllRevision([FromUri] Int32 pageSize=20, [FromUri] Int32 pageNumber=1) | ||
| { | ||
| if (pageSize < 1 || pageNumber < 1) | ||
| throw new HttpResponseException(HttpStatusCode.BadRequest); | ||
|
Owner
There was a problem hiding this comment. Надо просто граничить максимальный размер страницы до 1000 например. |
||
|
|
||
| CancellationTokenSource cts = new CancellationTokenSource(); | ||
|
Owner
There was a problem hiding this comment. CancellationToken можно разместить в аргументе метода. |
||
| var task = _mongoDbStorage.Revisions | ||
| .Find(r => true) | ||
| .Skip(pageSize * (pageNumber - 1)) | ||
| .Limit(pageSize) | ||
| .ToListAsync(cts.Token); | ||
|
|
||
| // запустим паралельно 2 таска, второй таск в роли таймаута (30 сек) | ||
| const int timeout = 30*1000; | ||
| if (await Task.WhenAny(task, Task.Delay(timeout, cts.Token)) != task) | ||
| { | ||
| // посылаем команду прервать поток поиска | ||
| cts.Cancel(); | ||
| // генерируем сообщение о том что не дождались ответа от монги | ||
| throw new HttpResponseException(HttpStatusCode.GatewayTimeout); | ||
| } | ||
| // прерываем поток таймаута | ||
| cts.Cancel(); | ||
|
|
||
| if (task.Result == null) | ||
| throw new HttpResponseException(HttpStatusCode.NotFound); | ||
|
|
||
| return task.Result; | ||
| } | ||
|
Owner
There was a problem hiding this comment. А если... клиент укажет pageSize = 2147483647 ? |
||
|
|
||
| [HttpGet] | ||
| [Route("{revisionName}")] | ||
| [Authorize(Roles = "admin, editor, anonymous")] | ||
|
|
@@ -46,6 +81,42 @@ public async Task<long> Current([FromUri] string revisionName) | |
| [Route("{revisionName}")] | ||
| [Authorize(Roles = "buildserver")] | ||
| public async Task<long> Bumping([FromUri] string revisionName) | ||
| { | ||
| // попробуем обновить документ | ||
| var result = await FindOneAndUpdateRevisionModelAsync(revisionName); | ||
|
|
||
| if (result == null) | ||
| { | ||
|
Owner
There was a problem hiding this comment. В общем случае - плохое решение. |
||
| // если не получилось, значит документ еще не был создан | ||
| // создадим его с начальным значением 0 | ||
| try | ||
| { | ||
| await _mongoDbStorage.Revisions | ||
| .InsertOneAsync(new RevisionModel | ||
| { | ||
| Id = revisionName, | ||
| NextNumber = 0, | ||
| Created = DateTime.UtcNow | ||
| }); | ||
| return 0; | ||
| } | ||
| catch (MongoWriteException) | ||
| { | ||
| // если прои вставке произошла ошибка значит мы не успели и запись там уже есть | ||
|
Owner
There was a problem hiding this comment. MongoWriteException может произойти по разным причинам. Пропущено определение нарушение unique индекса. |
||
| // и теперь попытка обновления должна пройти без ошибок | ||
| result = FindOneAndUpdateRevisionModelAsync(revisionName).Result; | ||
|
Owner
There was a problem hiding this comment. Блокирующее ожидание в асинхронном методе. |
||
| } | ||
| } | ||
|
|
||
| return result.NextNumber; | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// Инкриментит каунтер в БД | ||
| /// </summary> | ||
| /// <param name="revisionName"></param> | ||
| /// <returns></returns> | ||
| private async Task<RevisionModel> FindOneAndUpdateRevisionModelAsync(string revisionName) | ||
| { | ||
| var result = await _mongoDbStorage.Revisions | ||
| .FindOneAndUpdateAsync<RevisionModel>( | ||
|
|
@@ -56,12 +127,11 @@ public async Task<long> Bumping([FromUri] string revisionName) | |
| .Set(r => r.Updated, DateTime.UtcNow), | ||
| new FindOneAndUpdateOptions<RevisionModel> | ||
| { | ||
| IsUpsert = false, | ||
| ReturnDocument = ReturnDocument.After | ||
| }); | ||
|
|
||
| return result; | ||
| } | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Почему это решение не распространено на остальные случаи?