diff --git a/src/dotnet/APIView/APIViewWeb/Controllers/UsageSampleController.cs b/src/dotnet/APIView/APIViewWeb/Controllers/UsageSampleController.cs deleted file mode 100644 index f4b78913749e..000000000000 --- a/src/dotnet/APIView/APIViewWeb/Controllers/UsageSampleController.cs +++ /dev/null @@ -1,47 +0,0 @@ -using System; -using System.Threading.Tasks; -using APIViewWeb.Models; -using APIViewWeb.Repositories; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Mvc; - -namespace APIViewWeb.Controllers -{ - [Authorize("RequireOrganization")] - public class UsageSampleController: Controller - { - private readonly UsageSampleManager _sampleManager; - private readonly ReviewManager _reviewManager; - - public UsageSampleController(UsageSampleManager sampleManager, ReviewManager reviewManager) - { - _sampleManager = sampleManager; - _reviewManager = reviewManager; - } - - [HttpPost] - public async Task Add(string reviewId, string sampleText) - { - await _sampleManager.CreateReviewUsageSampleAsync(reviewId, sampleText); - var review = await _reviewManager.GetReviewAsync(User, reviewId); - - } - - //[HttpPost] - //public async Task Update(string reviewId, string commentId, string commentText) - //{ - // var comment = await _commentsManager.UpdateCommentAsync(User, reviewId, commentId, commentText); - - // return await CommentPartialAsync(reviewId, comment.ElementId); - //} - - //[HttpPost] - //public async Task Delete(string reviewId, string commentId, string elementId) - //{ - // await _commentsManager.DeleteCommentAsync(User, reviewId, commentId); - - // return await CommentPartialAsync(reviewId, elementId); - //} - - } -} diff --git a/src/dotnet/APIView/APIViewWeb/Models/UsageSampleFileModel.cs b/src/dotnet/APIView/APIViewWeb/Models/UsageSampleFileModel.cs new file mode 100644 index 000000000000..7da5007b1d15 --- /dev/null +++ b/src/dotnet/APIView/APIViewWeb/Models/UsageSampleFileModel.cs @@ -0,0 +1,14 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +using System; + +namespace APIViewWeb +{ + public class UsageSampleFileModel + { + public string UsageSampleFileId { get; set; } = IdHelper.GenerateId(); + + public DateTime CreationDate { get; set; } = DateTime.Now; + } +} diff --git a/src/dotnet/APIView/APIViewWeb/Models/UsageSampleModel.cs b/src/dotnet/APIView/APIViewWeb/Models/UsageSampleModel.cs index 9e0d2e006920..55015b266b08 100644 --- a/src/dotnet/APIView/APIViewWeb/Models/UsageSampleModel.cs +++ b/src/dotnet/APIView/APIViewWeb/Models/UsageSampleModel.cs @@ -10,29 +10,14 @@ namespace APIViewWeb public class UsageSampleModel { [JsonProperty("id")] - public string SampleId { get; set; } + public string SampleId { get; set; } = IdHelper.GenerateId(); + public string ReviewId { get; set; } + public string UsageSampleFileId { get; set; } - public string SampleContent { get; set; } - - public string UsageSampleFileId { get; set; } = IdHelper.GenerateId(); - - public UsageSampleModel(string revId, Stream sampleContent) - { - SampleId = revId; - if (sampleContent != null) - { - String content = sampleContent.ToString(); // Write to file later. - SampleContent = parseMDtoHTML(content); - } - else - { - SampleContent = null; - } - } - - private string parseMDtoHTML(string md) + public UsageSampleModel(string revId, string fileId) { - return md; + ReviewId = revId; + UsageSampleFileId = fileId; } } diff --git a/src/dotnet/APIView/APIViewWeb/Models/UsageSampleUploadModel.cs b/src/dotnet/APIView/APIViewWeb/Models/UsageSampleUploadModel.cs new file mode 100644 index 000000000000..b36ce2f363b3 --- /dev/null +++ b/src/dotnet/APIView/APIViewWeb/Models/UsageSampleUploadModel.cs @@ -0,0 +1,20 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc; + +namespace APIViewWeb.Pages.Assemblies +{ + public class UsageSampleUploadModel + { + [BindProperty] + public string sampleString { get; set; } + + [BindProperty] + public string ReviewId { get; set; } + + [BindProperty] + public IFormFile File { get; set; } + } +} diff --git a/src/dotnet/APIView/APIViewWeb/Pages/Assemblies/Samples.cshtml b/src/dotnet/APIView/APIViewWeb/Pages/Assemblies/Samples.cshtml index 97745eab66c1..b72b1f0f5470 100644 --- a/src/dotnet/APIView/APIViewWeb/Pages/Assemblies/Samples.cshtml +++ b/src/dotnet/APIView/APIViewWeb/Pages/Assemblies/Samples.cshtml @@ -8,7 +8,7 @@
- @if (Model.Sample.SampleContent == null) + @if (Model.Sample == null || Model.SampleContent == "No Sample.") {
There is no sample present in the review.
@@ -17,7 +17,15 @@ else {
-

There is a sample but you haven't coded this yet

+ +
+ + + +
+
+
+

@Model.SampleContent

}
@@ -53,21 +61,22 @@
-
- +
- +
+
+
- - + +
diff --git a/src/dotnet/APIView/APIViewWeb/Pages/Assemblies/Samples.cshtml.cs b/src/dotnet/APIView/APIViewWeb/Pages/Assemblies/Samples.cshtml.cs index fdbf935334ad..b2bf0016637a 100644 --- a/src/dotnet/APIView/APIViewWeb/Pages/Assemblies/Samples.cshtml.cs +++ b/src/dotnet/APIView/APIViewWeb/Pages/Assemblies/Samples.cshtml.cs @@ -19,7 +19,7 @@ public class UsageSamplePageModel : PageModel public string Endpoint { get; } public ReviewModel Review { get; private set; } public UsageSampleModel Sample { get; private set; } - public string NewSampleContent { get; set; } + public string SampleContent { get; set; } public UsageSamplePageModel( IConfiguration configuration, @@ -32,13 +32,14 @@ public UsageSamplePageModel( } [FromForm] - public UploadModel Upload { get; set; } + public UsageSampleUploadModel Upload { get; set; } public async Task OnGetAsync(string id) { TempData["Page"] = "samples"; Review = await _reviewManager.GetReviewAsync(User, id); Sample = await _samplesManager.GetReviewUsageSampleAsync(id); + SampleContent = await _samplesManager.GetUsageSampleContentAsync(Sample.UsageSampleFileId); return Page(); } @@ -49,16 +50,22 @@ public async Task OnPostUploadAsync() return RedirectToPage(); } - var file = Upload.Files.SingleOrDefault(); + var file = Upload.File; + var sampleString = Upload.sampleString; + var reviewId = Upload.ReviewId; if (file != null) { using (var openReadStream = file.OpenReadStream()) { - var reviewModel = await _samplesManager.CreateReviewUsageSampleAsync(Review.ReviewId, openReadStream); + await _samplesManager.CreateReviewUsageSampleAsync(reviewId, openReadStream); return RedirectToPage(); } } + else if (sampleString != null) + { + await _samplesManager.CreateReviewUsageSampleAsync(reviewId, sampleString); + } return RedirectToPage(); } diff --git a/src/dotnet/APIView/APIViewWeb/Repositories/BlobUsageSampleRepository.cs b/src/dotnet/APIView/APIViewWeb/Repositories/BlobUsageSampleRepository.cs new file mode 100644 index 000000000000..bf48429f57f8 --- /dev/null +++ b/src/dotnet/APIView/APIViewWeb/Repositories/BlobUsageSampleRepository.cs @@ -0,0 +1,52 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +using System.IO; +using System.Threading.Tasks; +using Azure.Storage.Blobs; +using Microsoft.Extensions.Configuration; +using System.Text; + +namespace APIViewWeb +{ + public class BlobUsageSampleRepository + { + private BlobContainerClient _container; + + public BlobUsageSampleRepository(IConfiguration configuration) + { + var connectionString = configuration["Blob:ConnectionString"]; + _container = new BlobContainerClient(connectionString, "usagesamples"); + } + + public async Task GetUsageSampleAsync(string sampleFileId) + { + try + { + var info = await GetBlobClient(sampleFileId).DownloadAsync(); + return info.Value.Content; + } + catch + { + await UploadUsageSampleAsync(sampleFileId, new MemoryStream(Encoding.UTF8.GetBytes("No Sample."))); + var info = await GetBlobClient(sampleFileId).DownloadAsync(); + return info.Value.Content; + } + } + + private BlobClient GetBlobClient(string sampleFileId) + { + return _container.GetBlobClient(sampleFileId); + } + + public async Task UploadUsageSampleAsync(string sampleFileId, Stream stream) + { + await GetBlobClient(sampleFileId).UploadAsync(stream, overwrite:true); + } + + public async Task DeleteUsageSampleAsync (string sampleFileId) + { + await GetBlobClient(sampleFileId).DeleteAsync(); + } + } +} diff --git a/src/dotnet/APIView/APIViewWeb/Repositories/CosmosUsageSampleRepository.cs b/src/dotnet/APIView/APIViewWeb/Repositories/CosmosUsageSampleRepository.cs index a04ae3a12ba3..124588cec839 100644 --- a/src/dotnet/APIView/APIViewWeb/Repositories/CosmosUsageSampleRepository.cs +++ b/src/dotnet/APIView/APIViewWeb/Repositories/CosmosUsageSampleRepository.cs @@ -20,22 +20,42 @@ public class CosmosUsageSampleRepository public CosmosUsageSampleRepository(IConfiguration configuration) { var client = new CosmosClient(configuration["Cosmos:ConnectionString"]); - _samplesContainer = client.GetContainer("APIView", "usagesamples"); + _samplesContainer = client.GetContainer("APIView", "UsageSamples"); } - public async Task GetUsageSampleAsync(string sampleId) + public async Task GetUsageSampleAsync(string reviewId) { - return await _samplesContainer.ReadItemAsync(sampleId, new PartitionKey(sampleId)); + return await GetUsageSamplesFromQueryAsync($"SELECT * FROM UsageSamples c WHERE c.ReviewId = '{reviewId}'", reviewId); } public async Task DeleteUsageSampleAsync(UsageSampleModel Sample) { - await _samplesContainer.DeleteItemAsync(Sample.SampleId, new PartitionKey(Sample.SampleId)); + await _samplesContainer.DeleteItemAsync(Sample.SampleId, new PartitionKey(Sample.ReviewId)); } public async Task UpsertUsageSampleAsync(UsageSampleModel sampleModel) { - await _samplesContainer.UpsertItemAsync(sampleModel, new PartitionKey(sampleModel.SampleId)); + await _samplesContainer.UpsertItemAsync(sampleModel, new PartitionKey(sampleModel.ReviewId)); + } + + private async Task GetUsageSamplesFromQueryAsync(string query, string reviewId) + { + var itemQueryIterator = _samplesContainer.GetItemQueryIterator(query); + var result = await itemQueryIterator.ReadNextAsync(); + try + { + return result.Resource.First(); + } + catch + { + var file = new UsageSampleFileModel(); + var sample = new UsageSampleModel(reviewId, file.UsageSampleFileId); + await _samplesContainer.UpsertItemAsync(sample); + + itemQueryIterator = _samplesContainer.GetItemQueryIterator(query); + var newResult = await itemQueryIterator.ReadNextAsync(); + return newResult.Resource.First(); + } } } diff --git a/src/dotnet/APIView/APIViewWeb/Repositories/UsageSampleManager.cs b/src/dotnet/APIView/APIViewWeb/Repositories/UsageSampleManager.cs index 01186994b7ab..4804ffa04f65 100644 --- a/src/dotnet/APIView/APIViewWeb/Repositories/UsageSampleManager.cs +++ b/src/dotnet/APIView/APIViewWeb/Repositories/UsageSampleManager.cs @@ -21,48 +21,66 @@ public class UsageSampleManager { //private readonly IAuthorizationService _authorizationService; private readonly CosmosUsageSampleRepository _samplesRepository; + private readonly BlobUsageSampleRepository _sampleFilesRepository; public UsageSampleManager( //IAuthorizationService authorizationService, - CosmosUsageSampleRepository samplesRepository) + CosmosUsageSampleRepository samplesRepository, + BlobUsageSampleRepository sampleFilesRepository) { //_authorizationService = authorizationService; _samplesRepository = samplesRepository; + _sampleFilesRepository = sampleFilesRepository; } - public async Task GetReviewUsageSampleAsync(string sampleId) + public async Task GetReviewUsageSampleAsync(string reviewId) { - var sample = await _samplesRepository.GetUsageSampleAsync(sampleId); - // await _sampleFilesRepository.GetUsageSampleAsync(sample.UsageSampleFileId); + var sample = await _samplesRepository.GetUsageSampleAsync(reviewId); return sample; } - - public async Task CreateReviewUsageSampleAsync(string sampleId, string sample) + + public async Task GetUsageSampleContentAsync(string fileId) { - var stream = new MemoryStream(); - var writer = new StreamWriter(stream); - writer.Write(sample); - writer.Flush(); - stream.Position = 0; + var file = await _sampleFilesRepository.GetUsageSampleAsync(fileId); + + if(file == null) return null; + + StreamReader reader = new StreamReader(file); + string htmlString = reader.ReadToEnd(); - return await CreateReviewUsageSampleAsync(sampleId, stream); + return htmlString; } - public async Task CreateReviewUsageSampleAsync(string sampleId, Stream fileStream) + public async Task CreateReviewUsageSampleAsync(string reviewId, string sample) { - UsageSampleModel newSample = new UsageSampleModel(sampleId, fileStream); + var stream = new MemoryStream(Encoding.UTF8.GetBytes(sample)); - await _samplesRepository.UpsertUsageSampleAsync(newSample); + return await CreateReviewUsageSampleAsync(reviewId, stream); + } + + public async Task CreateReviewUsageSampleAsync(string reviewId, Stream fileStream) + { - return newSample; + UsageSampleModel sample = await _samplesRepository.GetUsageSampleAsync(reviewId); + UsageSampleFileModel SampleFile = new UsageSampleFileModel(); + + await _sampleFilesRepository.DeleteUsageSampleAsync(sample.UsageSampleFileId); + + sample.UsageSampleFileId = SampleFile.UsageSampleFileId; + + await _samplesRepository.UpsertUsageSampleAsync(sample); + await _sampleFilesRepository.UploadUsageSampleAsync(SampleFile.UsageSampleFileId, fileStream); + + return sample; } - public async Task DeleteUsageSampleAsync(string sampleId) + public async Task DeleteUsageSampleAsync(string reviewId) { - var sampleModel = await _samplesRepository.GetUsageSampleAsync(sampleId); + var sampleModel = await _samplesRepository.GetUsageSampleAsync(reviewId); await _samplesRepository.DeleteUsageSampleAsync(sampleModel); + await _sampleFilesRepository.DeleteUsageSampleAsync(sampleModel.UsageSampleFileId); } } diff --git a/src/dotnet/APIView/APIViewWeb/Startup.cs b/src/dotnet/APIView/APIViewWeb/Startup.cs index 517b4281e6e2..8f3dd43d97c6 100644 --- a/src/dotnet/APIView/APIViewWeb/Startup.cs +++ b/src/dotnet/APIView/APIViewWeb/Startup.cs @@ -79,6 +79,7 @@ public void ConfigureServices(IServiceCollection services) services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); + services.AddSingleton(); services.AddSingleton(); services.AddSingleton();