From 2baed3056f340d9be7efc3720be595136a95bdae Mon Sep 17 00:00:00 2001 From: Rob Pearson Date: Fri, 7 Jul 2017 13:44:22 +1000 Subject: [PATCH 1/3] Added new filter parameter --- .../Repositories/Async/ProjectRepository.cs | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/source/Octopus.Client/Repositories/Async/ProjectRepository.cs b/source/Octopus.Client/Repositories/Async/ProjectRepository.cs index 060fa9e50..980c35488 100644 --- a/source/Octopus.Client/Repositories/Async/ProjectRepository.cs +++ b/source/Octopus.Client/Repositories/Async/ProjectRepository.cs @@ -10,14 +10,7 @@ namespace Octopus.Client.Repositories.Async public interface IProjectRepository : IFindByName, IGet, ICreate, IModify, IDelete, IGetAll { - /// - /// - /// - /// - /// Number of records to skip - /// Number of records to take (First supported in Server 3.14.15) - /// - Task> GetReleases(ProjectResource project, int skip = 0, int? take = null); + Task> GetReleases(ProjectResource project, int skip = 0, int? take = null, string filter = null); Task> GetAllReleases(ProjectResource project); Task GetReleaseByVersion(ProjectResource project, string version); Task> GetChannels(ProjectResource project); @@ -35,9 +28,9 @@ public ProjectRepository(IOctopusAsyncClient client) { } - public Task> GetReleases(ProjectResource project, int skip = 0, int? take = null) + public Task> GetReleases(ProjectResource project, int skip = 0, int? take = null, string filter = null) { - return Client.List(project.Link("Releases"), new { skip, take }); + return Client.List(project.Link("Releases"), new { skip, take, filter }); } public Task> GetAllReleases(ProjectResource project) From 8fe79886cbd6f380066d4c998b3b28a496e5cb93 Mon Sep 17 00:00:00 2001 From: Rob Pearson Date: Fri, 7 Jul 2017 14:14:46 +1000 Subject: [PATCH 2/3] Updated sync repo and fixed tests. --- ...urfaceAreaShouldNotRegress..NETCore.approved.txt | 2 +- ...eAreaShouldNotRegress..NETFramework.approved.txt | 4 ++-- .../Repositories/Async/ProjectRepository.cs | 2 +- .../Repositories/ProjectRepository.cs | 13 +++---------- 4 files changed, 7 insertions(+), 14 deletions(-) diff --git a/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETCore.approved.txt b/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETCore.approved.txt index 5ce70d54d..7308de563 100644 --- a/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETCore.approved.txt +++ b/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETCore.approved.txt @@ -3762,7 +3762,7 @@ Octopus.Client.Repositories.Async Task> GetChannels(Octopus.Client.Model.ProjectResource) Task GetProgression(Octopus.Client.Model.ProjectResource) Task GetReleaseByVersion(Octopus.Client.Model.ProjectResource, String) - Task> GetReleases(Octopus.Client.Model.ProjectResource, Int32, Nullable) + Task> GetReleases(Octopus.Client.Model.ProjectResource, Int32, Nullable, String) Task> GetTriggers(Octopus.Client.Model.ProjectResource) Task SetLogo(Octopus.Client.Model.ProjectResource, String, Stream) } diff --git a/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETFramework.approved.txt b/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETFramework.approved.txt index 3aa5b305c..0c17a1bb9 100644 --- a/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETFramework.approved.txt +++ b/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETFramework.approved.txt @@ -4168,7 +4168,7 @@ Octopus.Client.Repositories Octopus.Client.Model.ResourceCollection GetChannels(Octopus.Client.Model.ProjectResource) Octopus.Client.Model.ProgressionResource GetProgression(Octopus.Client.Model.ProjectResource) Octopus.Client.Model.ReleaseResource GetReleaseByVersion(Octopus.Client.Model.ProjectResource, String) - Octopus.Client.Model.ResourceCollection GetReleases(Octopus.Client.Model.ProjectResource, Int32, Nullable) + Octopus.Client.Model.ResourceCollection GetReleases(Octopus.Client.Model.ProjectResource, Int32, Nullable, String) Octopus.Client.Model.ResourceCollection GetTriggers(Octopus.Client.Model.ProjectResource) void SetLogo(Octopus.Client.Model.ProjectResource, String, Stream) } @@ -4612,7 +4612,7 @@ Octopus.Client.Repositories.Async Task> GetChannels(Octopus.Client.Model.ProjectResource) Task GetProgression(Octopus.Client.Model.ProjectResource) Task GetReleaseByVersion(Octopus.Client.Model.ProjectResource, String) - Task> GetReleases(Octopus.Client.Model.ProjectResource, Int32, Nullable) + Task> GetReleases(Octopus.Client.Model.ProjectResource, Int32, Nullable, String) Task> GetTriggers(Octopus.Client.Model.ProjectResource) Task SetLogo(Octopus.Client.Model.ProjectResource, String, Stream) } diff --git a/source/Octopus.Client/Repositories/Async/ProjectRepository.cs b/source/Octopus.Client/Repositories/Async/ProjectRepository.cs index 980c35488..96dd92df1 100644 --- a/source/Octopus.Client/Repositories/Async/ProjectRepository.cs +++ b/source/Octopus.Client/Repositories/Async/ProjectRepository.cs @@ -33,7 +33,7 @@ public Task> GetReleases(ProjectResource pro return Client.List(project.Link("Releases"), new { skip, take, filter }); } - public Task> GetAllReleases(ProjectResource project) + public Task> GetAllReleases(ProjectResource project) { return Client.ListAll(project.Link("Releases")); } diff --git a/source/Octopus.Client/Repositories/ProjectRepository.cs b/source/Octopus.Client/Repositories/ProjectRepository.cs index 503448570..7a6814c18 100644 --- a/source/Octopus.Client/Repositories/ProjectRepository.cs +++ b/source/Octopus.Client/Repositories/ProjectRepository.cs @@ -8,14 +8,7 @@ namespace Octopus.Client.Repositories { public interface IProjectRepository : IFindByName, IGet, ICreate, IModify, IDelete, IGetAll { - /// - /// - /// - /// - /// Number of records to skip - /// Number of records to take (First supported in Server 3.14.159) - /// - ResourceCollection GetReleases(ProjectResource project, int skip = 0, int? take = null); + ResourceCollection GetReleases(ProjectResource project, int skip = 0, int? take = null, string filter = null); IReadOnlyList GetAllReleases(ProjectResource project); ReleaseResource GetReleaseByVersion(ProjectResource project, string version); ResourceCollection GetChannels(ProjectResource project); @@ -33,9 +26,9 @@ public ProjectRepository(IOctopusClient client) { } - public ResourceCollection GetReleases(ProjectResource project, int skip = 0, int? take = null) + public ResourceCollection GetReleases(ProjectResource project, int skip = 0, int? take = null, string filter = null) { - return Client.List(project.Link("Releases"), new { skip, take }); + return Client.List(project.Link("Releases"), new { skip, take, filter }); } public IReadOnlyList GetAllReleases(ProjectResource project) From 716ed5bda7fa0deea41db3f369e13b7f62b84ec9 Mon Sep 17 00:00:00 2001 From: Rob Pearson Date: Tue, 11 Jul 2017 13:00:30 +1000 Subject: [PATCH 3/3] Renamed filter to searchByVersion for clarity. --- .../Octopus.Client/Repositories/Async/ProjectRepository.cs | 7 +++---- source/Octopus.Client/Repositories/ProjectRepository.cs | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/source/Octopus.Client/Repositories/Async/ProjectRepository.cs b/source/Octopus.Client/Repositories/Async/ProjectRepository.cs index 96dd92df1..82b15053e 100644 --- a/source/Octopus.Client/Repositories/Async/ProjectRepository.cs +++ b/source/Octopus.Client/Repositories/Async/ProjectRepository.cs @@ -1,4 +1,3 @@ -using System; using System.IO; using System.Collections.Generic; using System.Threading.Tasks; @@ -10,7 +9,7 @@ namespace Octopus.Client.Repositories.Async public interface IProjectRepository : IFindByName, IGet, ICreate, IModify, IDelete, IGetAll { - Task> GetReleases(ProjectResource project, int skip = 0, int? take = null, string filter = null); + Task> GetReleases(ProjectResource project, int skip = 0, int? take = null, string searchByVersion = null); Task> GetAllReleases(ProjectResource project); Task GetReleaseByVersion(ProjectResource project, string version); Task> GetChannels(ProjectResource project); @@ -28,9 +27,9 @@ public ProjectRepository(IOctopusAsyncClient client) { } - public Task> GetReleases(ProjectResource project, int skip = 0, int? take = null, string filter = null) + public Task> GetReleases(ProjectResource project, int skip = 0, int? take = null, string searchByVersion = null) { - return Client.List(project.Link("Releases"), new { skip, take, filter }); + return Client.List(project.Link("Releases"), new { skip, take, searchByVersion }); } public Task> GetAllReleases(ProjectResource project) diff --git a/source/Octopus.Client/Repositories/ProjectRepository.cs b/source/Octopus.Client/Repositories/ProjectRepository.cs index 7a6814c18..6ad2b945b 100644 --- a/source/Octopus.Client/Repositories/ProjectRepository.cs +++ b/source/Octopus.Client/Repositories/ProjectRepository.cs @@ -1,4 +1,3 @@ -using System; using System.Collections.Generic; using System.IO; using Octopus.Client.Editors; @@ -8,7 +7,7 @@ namespace Octopus.Client.Repositories { public interface IProjectRepository : IFindByName, IGet, ICreate, IModify, IDelete, IGetAll { - ResourceCollection GetReleases(ProjectResource project, int skip = 0, int? take = null, string filter = null); + ResourceCollection GetReleases(ProjectResource project, int skip = 0, int? take = null, string searchByVersion = null); IReadOnlyList GetAllReleases(ProjectResource project); ReleaseResource GetReleaseByVersion(ProjectResource project, string version); ResourceCollection GetChannels(ProjectResource project); @@ -26,9 +25,9 @@ public ProjectRepository(IOctopusClient client) { } - public ResourceCollection GetReleases(ProjectResource project, int skip = 0, int? take = null, string filter = null) + public ResourceCollection GetReleases(ProjectResource project, int skip = 0, int? take = null, string searchByVersion = null) { - return Client.List(project.Link("Releases"), new { skip, take, filter }); + return Client.List(project.Link("Releases"), new { skip, take, searchByVersion }); } public IReadOnlyList GetAllReleases(ProjectResource project)