Skip to content

Ensure correct response based review/ APIRevision approval status #7953

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 27, 2024
Merged

Ensure correct response based review/ APIRevision approval status #7953

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 31 additions & 7 deletions src/dotnet/APIView/APIViewWeb/Controllers/AutoReviewController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,24 @@ public async Task<ActionResult> UploadAutoReview([FromForm] IFormFile file, stri
var codeFile = await _codeFileManager.CreateCodeFileAsync(originalName: file.FileName, fileStream: openReadStream,
runAnalysis: false, memoryStream: memoryStream);

var apiRevision = await CreateAutomaticRevisionAsync(codeFile: codeFile, label: label, originalName: file.FileName, memoryStream: memoryStream, compareAllRevisions);
(var review, var apiRevision) = await CreateAutomaticRevisionAsync(codeFile: codeFile, label: label, originalName: file.FileName, memoryStream: memoryStream, compareAllRevisions);
if (apiRevision != null)
{
apiRevision = await _apiRevisionsManager.UpdateRevisionMetadataAsync(apiRevision, packageVersion ?? codeFile.PackageVersion, label, setReleaseTag);
var reviewUrl = $"{this.Request.Scheme}://{this.Request.Host}/Assemblies/Review/{apiRevision.ReviewId}?revisionId={apiRevision.Id}";
return apiRevision.IsApproved ? Ok(reviewUrl) : StatusCode(statusCode: StatusCodes.Status201Created, reviewUrl);

if (apiRevision.IsApproved)
{
return Ok(reviewUrl);
}
else if (review.IsApproved)
{
return StatusCode(statusCode: StatusCodes.Status201Created, reviewUrl);
}
else
{
return StatusCode(statusCode: StatusCodes.Status202Accepted, reviewUrl);
}
}
};
}
Expand Down Expand Up @@ -135,18 +147,30 @@ public async Task<ActionResult> CreateApiReview(
{
return StatusCode(statusCode: StatusCodes.Status204NoContent, $"API review code file for package {packageName} is not found in DevOps pipeline artifacts.");
}
var apiRevision = await CreateAutomaticRevisionAsync(codeFile: codeFile, label: label, originalName: originalFilePath, memoryStream: memoryStream, compareAllRevisions);
(var review, var apiRevision) = await CreateAutomaticRevisionAsync(codeFile: codeFile, label: label, originalName: originalFilePath, memoryStream: memoryStream, compareAllRevisions);
if (apiRevision != null)
{
apiRevision = await _apiRevisionsManager.UpdateRevisionMetadataAsync(apiRevision, packageVersion ?? codeFile.PackageVersion, label, setReleaseTag);
var reviewUrl = $"{this.Request.Scheme}://{this.Request.Host}/Assemblies/Review/{apiRevision.ReviewId}?revisionId={apiRevision.Id}";
return apiRevision.IsApproved ? Ok(reviewUrl) : StatusCode(statusCode: StatusCodes.Status201Created, reviewUrl);

if (apiRevision.IsApproved)
{
return Ok(reviewUrl);
}
else if (review.IsApproved)
{
return StatusCode(statusCode: StatusCodes.Status201Created, reviewUrl);
}
else
{
return StatusCode(statusCode: StatusCodes.Status202Accepted, reviewUrl);
}
}
// Return internal server error for any unknown error
return StatusCode(statusCode: StatusCodes.Status500InternalServerError);
}

private async Task<APIRevisionListItemModel> CreateAutomaticRevisionAsync(CodeFile codeFile, string label, string originalName, MemoryStream memoryStream, bool compareAllRevisions = false)
private async Task<(ReviewListItemModel review, APIRevisionListItemModel apiRevision)> CreateAutomaticRevisionAsync(CodeFile codeFile, string label, string originalName, MemoryStream memoryStream, bool compareAllRevisions = false)
{
var createNewRevision = true;
var review = await _reviewManager.GetReviewAsync(packageName: codeFile.PackageName, language: codeFile.Language, isClosed: null);
Expand Down Expand Up @@ -191,7 +215,7 @@ private async Task<APIRevisionListItemModel> CreateAutomaticRevisionAsync(CodeFi
{
if (await _apiRevisionsManager.AreAPIRevisionsTheSame(approvedAPIRevision, renderedCodeFile))
{
return approvedAPIRevision;
return (review, approvedAPIRevision);
}
}
}
Expand Down Expand Up @@ -228,7 +252,7 @@ private async Task<APIRevisionListItemModel> CreateAutomaticRevisionAsync(CodeFi
}
}
}
return apiRevision;
return (review, apiRevision);
}
}
}