Skip to content
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

Update file name when updating revision from PR #8753

Merged
merged 1 commit into from
Aug 5, 2024
Merged

Update file name when updating revision from PR #8753

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
11 changes: 6 additions & 5 deletions src/dotnet/APIView/APIViewWeb/Controllers/PullRequestController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ private async Task CreateUpdateRevisionWithoutBaseline(PullRequestModel prModel,
// If a revision already exists for PR then just update the code file for that revision.
if (revisionAlreadyExistsForPR(prModel, false))
{
if (await UpdateExistingAPIRevisionCodeFile(apiRevisions, prModel.APIRevisionId, memoryStream, codeFile))
if (await UpdateExistingAPIRevisionCodeFile(apiRevisions, prModel.APIRevisionId, memoryStream, codeFile, originalFileName))
return;
}

Expand Down Expand Up @@ -270,12 +270,12 @@ private async Task CreateUpdateRevisionWithBaseline(PullRequestModel prModel,
bool createNewModifiedRevision = true;
if (revisionAlreadyExistsForPR(prModel, true))
{
if (await UpdateExistingAPIRevisionCodeFile(apiRevisions, prModel.APIRevisionId, baselineMemoryStream, baselineCodeFile))
if (await UpdateExistingAPIRevisionCodeFile(apiRevisions, prModel.APIRevisionId, baselineMemoryStream, baselineCodeFile, originalFileName))
createNewBaselineRevision = false;
}
if (revisionAlreadyExistsForPR(prModel, false))
{
if (await UpdateExistingAPIRevisionCodeFile(apiRevisions, prModel.APIRevisionId, memoryStream, codeFile))
if (await UpdateExistingAPIRevisionCodeFile(apiRevisions, prModel.APIRevisionId, memoryStream, codeFile, originalFileName))
createNewModifiedRevision = false;
}

Expand Down Expand Up @@ -320,16 +320,17 @@ private async Task CreateUpdateRevisionWithBaseline(PullRequestModel prModel,
/// <param name="revisionId"></param>
/// <param name="memoryStream"></param>
/// <param name="codeFile"></param>
/// <param name="originalFileName"></param>
/// <returns>true if update happened otherwise false</returns>
private async Task<bool> UpdateExistingAPIRevisionCodeFile(IEnumerable<APIRevisionListItemModel> apiRevisions, string revisionId, MemoryStream memoryStream, CodeFile codeFile)
private async Task<bool> UpdateExistingAPIRevisionCodeFile(IEnumerable<APIRevisionListItemModel> apiRevisions, string revisionId, MemoryStream memoryStream, CodeFile codeFile, string originalFileName)
{
var apiRevision = apiRevisions.FirstOrDefault(v => v.Id == revisionId);
if (apiRevision != default(APIRevisionListItemModel))
{
//Update the code file if revision already exists
var codeModel = await _codeFileManager.CreateReviewCodeFileModel(
apiRevisionId: revisionId, memoryStream: memoryStream, codeFile: codeFile);

codeModel.FileName = originalFileName;
apiRevision.Files[0] = codeModel;
await _apiRevisionsManager.UpdateAPIRevisionAsync(apiRevision);
return true;
Expand Down