diff --git a/CloneDevOpsTemplate/Controllers/ProjectController.cs b/CloneDevOpsTemplate/Controllers/ProjectController.cs index 330e04a..85ff366 100644 --- a/CloneDevOpsTemplate/Controllers/ProjectController.cs +++ b/CloneDevOpsTemplate/Controllers/ProjectController.cs @@ -78,6 +78,8 @@ await Task.WhenAll( _cloneManager.CloneRepositoriesAsync(templateProjectId, cloneProjectResult.Project.Id) ); + await _cloneManager.CloneGitPullRequestsAsync(templateProjectId, cloneProjectResult.Project.Id); + return RedirectToAction("Project", new { projectId = cloneProjectResult.Project.Id }); } diff --git a/CloneDevOpsTemplate/Controllers/RepositoryController.cs b/CloneDevOpsTemplate/Controllers/RepositoryController.cs index eff4fe0..9438710 100644 --- a/CloneDevOpsTemplate/Controllers/RepositoryController.cs +++ b/CloneDevOpsTemplate/Controllers/RepositoryController.cs @@ -48,7 +48,7 @@ public async Task PullRequests(Guid projectId) return View(pullRequests.Value); } - pullRequests = await _repositoryService.GetGitPullRequest(projectId) ?? new(); + pullRequests = await _repositoryService.GetGitPullRequestAsync(projectId) ?? new(); return View(pullRequests.Value); } @@ -72,4 +72,24 @@ public async Task CloneRepository(Guid templateProjectId, Guid pr return await CloneRepository(); } + + [HttpGet] + public async Task ClonePullRequests() + { + return await CloneRepository(); + } + + [HttpPost] + public async Task ClonePullRequests(Guid templateProjectId, Guid projectId) + { + if (!ModelState.IsValid) + { + return await ClonePullRequests(); + } + + await _cloneManager.CloneGitPullRequestsAsync(templateProjectId, projectId); + ViewBag.SuccessMessage = "Success"; + + return await ClonePullRequests(); + } } \ No newline at end of file diff --git a/CloneDevOpsTemplate/IServices/IRepositoryService.cs b/CloneDevOpsTemplate/IServices/IRepositoryService.cs index 8586a43..1989060 100644 --- a/CloneDevOpsTemplate/IServices/IRepositoryService.cs +++ b/CloneDevOpsTemplate/IServices/IRepositoryService.cs @@ -10,5 +10,6 @@ public interface IRepositoryService Task DeleteRepositoryAsync(Guid projectId, Guid repositoryId); Task CreateImportRequestAsync(Guid projectId, Guid repositoryId, string sourceRepositoryRemoteUrl, Guid serviceEndpointId); Task GetImportRequestAsync(Guid projectId, Guid repositoryId, int importRequestId); - Task GetGitPullRequest(Guid projectId); + Task GetGitPullRequestAsync(Guid projectId); + Task CreateGitPullRequestAsync(Guid projectId, Guid repositoryId, GitPullRequestBase pullRequest); } diff --git a/CloneDevOpsTemplate/Managers/CloneManager.cs b/CloneDevOpsTemplate/Managers/CloneManager.cs index 551e17e..ac83b9f 100644 --- a/CloneDevOpsTemplate/Managers/CloneManager.cs +++ b/CloneDevOpsTemplate/Managers/CloneManager.cs @@ -216,4 +216,33 @@ public async Task CloneTeamIterationsAsync(Guid templateProjectId, Guid projectI } } } + + public async Task CloneGitPullRequestsAsync(Guid templateProjectId, Guid projectId) + { + var templatePullRequests = await _repositoryService.GetGitPullRequestAsync(templateProjectId) ?? new(); + var mappedRespositories = await MapRepositories(templateProjectId, projectId); + foreach (var templatePullRequest in templatePullRequests.Value) + { + var repository = mappedRespositories.GetValueOrDefault(templatePullRequest.Repository.Id); + await _repositoryService.CreateGitPullRequestAsync(projectId, repository, templatePullRequest); + } + } + + public async Task> MapRepositories(Guid templateProjectId, Guid projectId) + { + var mappedRespositories = new Dictionary(); + var repositories = await _repositoryService.GetRepositoriesAsync(projectId) ?? new(); + var templateRepositories = await _repositoryService.GetRepositoriesAsync(templateProjectId) ?? new(); + + foreach (var templateRepository in templateRepositories.Value) + { + var mappedRespository = repositories.Value.FirstOrDefault(r => r.Name == templateRepository.Name); + if (mappedRespository is not null) + { + mappedRespositories.Add(templateRepository.Id, mappedRespository.Id); + } + } + + return mappedRespositories; + } } \ No newline at end of file diff --git a/CloneDevOpsTemplate/Managers/ICloneManager.cs b/CloneDevOpsTemplate/Managers/ICloneManager.cs index 811e5f0..d00eb7c 100644 --- a/CloneDevOpsTemplate/Managers/ICloneManager.cs +++ b/CloneDevOpsTemplate/Managers/ICloneManager.cs @@ -15,4 +15,5 @@ public interface ICloneManager Task CloneTeamsAndSettingsAndBoardsAsync(Project templateProject, Project project); Task CloneTeamSettingsAsync(Guid templateProjectId, Guid projectId, Guid templateTeamId, Guid projectTeamId); Task CloneTeamIterationsAsync(Guid templateProjectId, Guid projectId, Guid templateTeamId, Guid projectTeamId); + Task CloneGitPullRequestsAsync(Guid templateProjectId, Guid projectId); } diff --git a/CloneDevOpsTemplate/Models/Identity.cs b/CloneDevOpsTemplate/Models/Identity.cs new file mode 100644 index 0000000..933d116 --- /dev/null +++ b/CloneDevOpsTemplate/Models/Identity.cs @@ -0,0 +1,11 @@ +namespace CloneDevOpsTemplate.Models; + +public class IdentityRef +{ + public string DisplayName { get; set; } = string.Empty; + public string Url { get; set; } = string.Empty; + public string Descriptor { get; set; } = string.Empty; + public string DirectoryAlias { get; set; } = string.Empty; + public string Id { get; set; } = string.Empty; + public bool IsDeletedInOrigin { get; set; } +} diff --git a/CloneDevOpsTemplate/Models/PullRequests.cs b/CloneDevOpsTemplate/Models/PullRequests.cs index 740e272..7cbf065 100644 --- a/CloneDevOpsTemplate/Models/PullRequests.cs +++ b/CloneDevOpsTemplate/Models/PullRequests.cs @@ -8,25 +8,29 @@ public class GitPullRequests public GitPullRequest[] Value { get; set; } = []; } -public class GitPullRequest +public class GitPullRequestBase +{ + public string Title { get; set; } = string.Empty; + public string Description { get; set; } = string.Empty; + public string SourceRefName { get; set; } = string.Empty; + public string TargetRefName { get; set; } = string.Empty; + public IdentityRef CreatedBy { get; set; } = new(); + public bool IsDraft { get; set; } + public IdentityRef[] Reviewers { get; set; } = []; +} + +public class GitPullRequest : GitPullRequestBase { public Repository Repository { get; set; } = new(); public int PullRequestId { get; set; } public int CodeReviewId { get; set; } public PullRequestStatus Status { get; set; } - public User CreatedBy { get; set; } = new(); public DateTime CreationDate { get; set; } - public string Title { get; set; } = string.Empty; - public string Description { get; set; } = string.Empty; - public string SourceRefName { get; set; } = string.Empty; - public string TargetRefName { get; set; } = string.Empty; public PullRequestAsyncStatus MergeStatus { get; set; } - public bool IsDraft { get; set; } public Guid MergeId { get; set; } public GitCommitRef LastMergeSourceCommit { get; set; } = new(); public GitCommitRef LastMergeTargetCommit { get; set; } = new(); public GitCommitRef LastMergeCommit { get; set; } = new(); - public User[] Reviewers { get; set; } = []; public bool SupportsIterations { get; set; } } diff --git a/CloneDevOpsTemplate/Models/Services.cs b/CloneDevOpsTemplate/Models/Services.cs index 8447266..6b0c823 100644 --- a/CloneDevOpsTemplate/Models/Services.cs +++ b/CloneDevOpsTemplate/Models/Services.cs @@ -19,19 +19,13 @@ public class ServiceModelBase public class ServiceModel : ServiceModelBase { public Guid Id { get; set; } - public User CreatedBy { get; set; } = new(); + public IdentityRef CreatedBy { get; set; } = new(); public string Description { get; set; } = string.Empty; public bool IsShared { get; set; } public bool IsOutdated { get; set; } public DateTime CreationDate { get; set; } } -public class User -{ - public string DisplayName { get; set; } = string.Empty; - public string Url { get; set; } = string.Empty; -} - public class ServiceAuthorization { public string Scheme { get; set; } = string.Empty; diff --git a/CloneDevOpsTemplate/Services/RepositoryService.cs b/CloneDevOpsTemplate/Services/RepositoryService.cs index 75f4c67..fdc4a39 100644 --- a/CloneDevOpsTemplate/Services/RepositoryService.cs +++ b/CloneDevOpsTemplate/Services/RepositoryService.cs @@ -49,8 +49,13 @@ public Task DeleteRepositoryAsync(Guid projectId, Guid repo return _client.GetFromJsonAsync($"{projectId}/_apis/git/repositories/{repositoryId}/importRequests/{importRequestId}"); } - public Task GetGitPullRequest(Guid projectId) + public Task GetGitPullRequestAsync(Guid projectId) { return _client.GetFromJsonAsync($"{projectId}/_apis/git/pullrequests"); } + + public Task CreateGitPullRequestAsync(Guid projectId, Guid repositoryId, GitPullRequestBase pullRequest) + { + return _client.PostAsJsonAsync($"{projectId}/_apis/git/repositories/{repositoryId}/pullrequests?api-version=7.1", pullRequest); + } } \ No newline at end of file diff --git a/CloneDevOpsTemplate/Views/Repository/ClonePullRequests.cshtml b/CloneDevOpsTemplate/Views/Repository/ClonePullRequests.cshtml new file mode 100644 index 0000000..e7aa999 --- /dev/null +++ b/CloneDevOpsTemplate/Views/Repository/ClonePullRequests.cshtml @@ -0,0 +1,10 @@ +@model ProjectBase[] +@{ + ViewData["Title"] = "Clone pull requests"; +} + +

Clone pull requests

+ +@{ + await Html.RenderPartialAsync("_CloneByProject", Tuple.Create(Model, "Repository", "ClonePullRequests")); +} diff --git a/CloneDevOpsTemplate/Views/Shared/_Header.cshtml b/CloneDevOpsTemplate/Views/Shared/_Header.cshtml index 880daf2..1b45ded 100644 --- a/CloneDevOpsTemplate/Views/Shared/_Header.cshtml +++ b/CloneDevOpsTemplate/Views/Shared/_Header.cshtml @@ -62,6 +62,10 @@ Repository +
  • + Pull + requests +
  • diff --git a/CloneDevOpsTemplateTest/Controllers/RepositoryControllerTest.cs b/CloneDevOpsTemplateTest/Controllers/RepositoryControllerTest.cs index 27f7a5f..4b07bf4 100644 --- a/CloneDevOpsTemplateTest/Controllers/RepositoryControllerTest.cs +++ b/CloneDevOpsTemplateTest/Controllers/RepositoryControllerTest.cs @@ -201,7 +201,6 @@ public async Task PullRequests_InvalidModelState_ReturnsDefaultView() { // Arrange _controller.ModelState.AddModelError("Error", "Invalid model state"); - var mockPullRequests = new GitPullRequests { Value = Array.Empty() }; // Act var result = await _controller.PullRequests(Guid.NewGuid()); @@ -219,7 +218,7 @@ public async Task PullRequests_ReturnsViewWithPullRequests() var projectId = Guid.NewGuid(); var mockPullRequests = new GitPullRequests { Value = Array.Empty() }; _mockRepositoryService - .Setup(service => service.GetGitPullRequest(projectId)) + .Setup(service => service.GetGitPullRequestAsync(projectId)) .ReturnsAsync(mockPullRequests); // Act @@ -236,7 +235,7 @@ public async Task PullRequests_ReturnsViewWithEmptyPullRequests_WhenServiceRetur // Arrange var projectId = Guid.NewGuid(); _mockRepositoryService - .Setup(service => service.GetGitPullRequest(projectId)) + .Setup(service => service.GetGitPullRequestAsync(projectId)) .ReturnsAsync((GitPullRequests?)null); // Act @@ -247,4 +246,77 @@ public async Task PullRequests_ReturnsViewWithEmptyPullRequests_WhenServiceRetur var viewModel = Assert.IsType(viewResult.Model); Assert.Empty(viewModel); } + + [Fact] + public async Task ClonePullRequests_Get_ReturnsViewWithProjects() + { + // Arrange + var mockProjects = new Projects { Value = Array.Empty() }; + _mockProjectService + .Setup(service => service.GetAllProjectsAsync()) + .ReturnsAsync(mockProjects); + + // Act + var result = await _controller.ClonePullRequests(); + + // Assert + var viewResult = Assert.IsType(result); + Assert.Equal(mockProjects.Value, viewResult.Model); + } + + [Fact] + public async Task ClonePullRequests_Get_ReturnsViewWithEmptyProjects_WhenServiceReturnsNull() + { + // Arrange + _mockProjectService + .Setup(service => service.GetAllProjectsAsync()) + .ReturnsAsync((Projects?)null); + + // Act + var result = await _controller.ClonePullRequests(); + + // Assert + var viewResult = Assert.IsType(result); + var viewModel = Assert.IsType(viewResult.Model); + Assert.Empty(viewModel); + } + + [Fact] + public async Task ClonePullRequests_Post_InvalidModelState_ReturnsViewWithProjects() + { + // Arrange + _controller.ModelState.AddModelError("Error", "Invalid model state"); + var mockProjects = new Projects { Value = Array.Empty() }; + _mockProjectService + .Setup(service => service.GetAllProjectsAsync()) + .ReturnsAsync(mockProjects); + + // Act + var result = await _controller.ClonePullRequests(Guid.NewGuid(), Guid.NewGuid()); + + // Assert + var viewResult = Assert.IsType(result); + Assert.Equal(mockProjects.Value, viewResult.Model); + } + + [Fact] + public async Task ClonePullRequests_Post_ValidModelState_ClonesPullRequestsAndReturnsViewWithProjects() + { + // Arrange + var templateProjectId = Guid.NewGuid(); + var projectId = Guid.NewGuid(); + var mockProjects = new Projects { Value = Array.Empty() }; + _mockProjectService + .Setup(service => service.GetAllProjectsAsync()) + .ReturnsAsync(mockProjects); + + // Act + var result = await _controller.ClonePullRequests(templateProjectId, projectId); + + // Assert + _mockCloneManager.Verify(manager => manager.CloneGitPullRequestsAsync(templateProjectId, projectId), Times.Once); + var viewResult = Assert.IsType(result); + Assert.Equal(mockProjects.Value, viewResult.Model); + Assert.Equal("Success", _controller.ViewBag.SuccessMessage); + } } \ No newline at end of file diff --git a/CloneDevOpsTemplateTest/Managers/CloneManagerTest.cs b/CloneDevOpsTemplateTest/Managers/CloneManagerTest.cs index eb493ba..cb6558a 100644 --- a/CloneDevOpsTemplateTest/Managers/CloneManagerTest.cs +++ b/CloneDevOpsTemplateTest/Managers/CloneManagerTest.cs @@ -484,4 +484,43 @@ public async Task CloneClassificationNodes_ShouldCloneNodesCorrectly() _mockIterationService.Verify(s => s.GetAllAsync(templateProjectId, structureGroup), Times.Once); _mockIterationService.Verify(s => s.CreateAsync(projectId, templateClassificationNodes, structureGroup, ""), Times.Once); } + + [Fact] + public async Task CloneGitPullRequestsAsync_ShouldClonePullRequests() + { + // Arrange + var templateProjectId = Guid.NewGuid(); + var projectId = Guid.NewGuid(); + + var templateRepositoryId = Guid.NewGuid(); + var mappedRepositoryId = Guid.NewGuid(); + + var templatePullRequests = new GitPullRequests + { + Value = + [ + new GitPullRequest + { + Repository = new Repository { Id = templateRepositoryId }, + Title = "Sample Pull Request" + } + ] + }; + + _mockRepositoryService.Setup(s => s.GetGitPullRequestAsync(templateProjectId)) + .ReturnsAsync(templatePullRequests); + + _mockRepositoryService.Setup(s => s.GetRepositoriesAsync(templateProjectId)) + .ReturnsAsync(new Repositories { Value = [new Repository { Name = "Repo1", Id = templateRepositoryId }] }); + + _mockRepositoryService.Setup(s => s.GetRepositoriesAsync(projectId)) + .ReturnsAsync(new Repositories { Value = [new Repository { Name = "Repo1", Id = mappedRepositoryId }] }); + + // Act + await _cloneManager.CloneGitPullRequestsAsync(templateProjectId, projectId); + + // Assert + _mockRepositoryService.Verify(s => s.GetGitPullRequestAsync(templateProjectId), Times.Once); + _mockRepositoryService.Verify(s => s.CreateGitPullRequestAsync(projectId, mappedRepositoryId, It.IsAny()), Times.Once); + } } \ No newline at end of file diff --git a/CloneDevOpsTemplateTest/Services/RepositoryServiceTest.cs b/CloneDevOpsTemplateTest/Services/RepositoryServiceTest.cs index 7682e76..f15870d 100644 --- a/CloneDevOpsTemplateTest/Services/RepositoryServiceTest.cs +++ b/CloneDevOpsTemplateTest/Services/RepositoryServiceTest.cs @@ -250,7 +250,7 @@ public async Task GetGitPullRequest_ReturnsGitPullRequests() }); // Act - var result = await _repositoryService.GetGitPullRequest(projectId); + var result = await _repositoryService.GetGitPullRequestAsync(projectId); // Assert Assert.NotNull(result); @@ -277,6 +277,70 @@ public async Task GetGitPullRequest_ReturnsNullOnFailure() }); // Act & Assert - await Assert.ThrowsAsync(() => _repositoryService.GetGitPullRequest(projectId)); + await Assert.ThrowsAsync(() => _repositoryService.GetGitPullRequestAsync(projectId)); + } + + [Fact] + public async Task CreateGitPullRequestAsync_ReturnsHttpResponseMessage() + { + // Arrange + var projectId = Guid.NewGuid(); + var repositoryId = Guid.NewGuid(); + var pullRequest = new GitPullRequestBase + { + Title = "New Pull Request", + Description = "This is a test pull request", + SourceRefName = "refs/heads/feature-branch", + TargetRefName = "refs/heads/main" + }; + var httpResponse = new HttpResponseMessage + { + StatusCode = HttpStatusCode.Created + }; + + _httpMessageHandlerMock.Protected() + .Setup>( + "SendAsync", + ItExpr.IsAny(), + ItExpr.IsAny() + ) + .ReturnsAsync(httpResponse); + + // Act + var result = await _repositoryService.CreateGitPullRequestAsync(projectId, repositoryId, pullRequest); + + // Assert + Assert.NotNull(result); + Assert.Equal(HttpStatusCode.Created, result.StatusCode); + } + + [Fact] + public async Task CreateGitPullRequestAsync_ThrowsExceptionOnFailure() + { + // Arrange + var projectId = Guid.NewGuid(); + var repositoryId = Guid.NewGuid(); + var pullRequest = new GitPullRequestBase + { + Title = "New Pull Request", + Description = "This is a test pull request", + SourceRefName = "refs/heads/feature-branch", + TargetRefName = "refs/heads/main" + }; + + _httpMessageHandlerMock.Protected() + .Setup>( + "SendAsync", + ItExpr.IsAny(), + ItExpr.IsAny() + ) + .ReturnsAsync(new HttpResponseMessage + { + StatusCode = HttpStatusCode.BadRequest + }); + + // Act + var response = await _repositoryService.CreateGitPullRequestAsync(projectId, repositoryId, pullRequest); + Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode); } } \ No newline at end of file