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

feat(stack-scheduler): SDK add update Job #616

Merged
merged 11 commits into from
May 15, 2023
Merged

feat(stack-scheduler): SDK add update Job #616

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
30f0d59
feat(scheduler) : SchedulerJob supports job status notify
wzh425 Mar 16, 2023
1510c5c
Merge remote-tracking branch 'origin/main' into feature/scheduler-sdk
wzh425 May 15, 2023
26e07b8
feat(stack-scheduler): SDK add update Job
wzh425 May 15, 2023
5977e16
style : Remove blank lines
wzh425 May 15, 2023
0c7a28e
reactor : Reduce duplicate code
wzh425 May 15, 2023
36060b9
fix : Unit Test Adjustment
wzh425 May 15, 2023
37b5d88
reactor : Dealing with bad code smell
wzh425 May 15, 2023
fb41348
reactor : Dealing with bad code smell
wzh425 May 15, 2023
8d19bfd
reactor : Dealing with bad code smell
wzh425 May 15, 2023
03b6e87
fix : Unit Test Adjustment
wzh425 May 15, 2023
dc6c4ec
fix : Unit Test Adjustment
wzh425 May 15, 2023
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
2 changes: 1 addition & 1 deletion ...locks/StackSdks/Masa.BuildingBlocks.StackSdks.Scheduler/Request/AddSchedulerJobRequest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

namespace Masa.BuildingBlocks.StackSdks.Scheduler.Request;

public class AddSchedulerJobRequest
public class UpsertSchedulerJobRequest
{
public string ProjectIdentity { get; set; } = string.Empty;

Expand Down
4 changes: 3 additions & 1 deletion ...gBlocks/StackSdks/Masa.BuildingBlocks.StackSdks.Scheduler/Service/ISchedulerJobService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ namespace Masa.BuildingBlocks.StackSdks.Scheduler.Service;

public interface ISchedulerJobService
{
Task<Guid> AddAsync(AddSchedulerJobRequest job);
Task<Guid> AddAsync(UpsertSchedulerJobRequest job);

Task UpdateAsync(Guid id, UpsertSchedulerJobRequest job);

Task<bool> StartAsync(SchedulerJobRequestBase request);

Expand Down
48 changes: 29 additions & 19 deletions src/Contrib/StackSdks/Masa.Contrib.StackSdks.Scheduler/Services/SchedulerJobService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,28 +14,20 @@ public SchedulerJobService(ICaller caller)
_caller = caller;
}

public async Task<Guid> AddAsync(AddSchedulerJobRequest request)
public async Task<Guid> AddAsync(UpsertSchedulerJobRequest job)
{
if (string.IsNullOrWhiteSpace(request.ProjectIdentity))
{
throw new ArgumentNullException(nameof(request.ProjectIdentity));
}
ValidateUpsertSchedulerJobRequest(job);

switch (request.JobType)
{
case JobTypes.JobApp:
ArgumentNullException.ThrowIfNull(request.JobAppConfig, nameof(request.JobAppConfig));
break;
case JobTypes.Http:
ArgumentNullException.ThrowIfNull(request.HttpConfig, nameof(request.HttpConfig));
break;
case JobTypes.DaprServiceInvocation:
ArgumentNullException.ThrowIfNull(request.DaprServiceInvocationConfig, nameof(request.DaprServiceInvocationConfig));
break;
}

var requestUri = $"{API}/addSchedulerJobBySdk";
return await _caller.PostAsync<AddSchedulerJobRequest, Guid>(requestUri, request);
return await _caller.PostAsync<UpsertSchedulerJobRequest, Guid>(requestUri, job);
}

public async Task UpdateAsync(Guid id, UpsertSchedulerJobRequest job)
{
ValidateUpsertSchedulerJobRequest(job);

var requestUri = $"{API}/{id}/updateSchedulerJobBySdk";
await _caller.PutAsync<UpsertSchedulerJobRequest>(requestUri, job);
}

public async Task<bool> DisableAsync(SchedulerJobRequestBase request)
Expand Down Expand Up @@ -83,4 +75,22 @@ public async Task<bool> StartAsync(SchedulerJobRequestBase request)
await _caller.PutAsync(requestUri, request);
return true;
}

private static void ValidateUpsertSchedulerJobRequest(UpsertSchedulerJobRequest job)
{
MasaArgumentException.ThrowIfNull(job.ProjectIdentity, nameof(job.ProjectIdentity));

switch (job.JobType)
{
case JobTypes.JobApp:
MasaArgumentException.ThrowIfNull(job.JobAppConfig, nameof(job.JobAppConfig));
break;
case JobTypes.Http:
MasaArgumentException.ThrowIfNull(job.HttpConfig, nameof(job.HttpConfig));
break;
case JobTypes.DaprServiceInvocation:
MasaArgumentException.ThrowIfNull(job.DaprServiceInvocationConfig, nameof(job.DaprServiceInvocationConfig));
break;
}
}
}
58 changes: 21 additions & 37 deletions ...Contrib/StackSdks/Tests/Masa.Contrib.StackSdks.Scheduler.Tests/SchedulerJobServiceTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public class SchedulerJobServiceTest
[TestMethod]
public async Task TestAddSchedulerHttpJobAsync()
{
var requestData = new AddSchedulerJobRequest()
var requestData = new UpsertSchedulerJobRequest()
{
Name = "TestJob",
JobType = JobTypes.Http,
Expand Down Expand Up @@ -51,18 +51,18 @@ public async Task TestAddSchedulerHttpJobAsync()

var requestUri = $"{API}/addSchedulerJobBySdk";
var caller = new Mock<ICaller>();
caller.Setup(provider => provider.PostAsync<AddSchedulerJobRequest, Guid>(requestUri, requestData, default)).ReturnsAsync(Guid.NewGuid()).Verifiable();
caller.Setup(provider => provider.PostAsync<UpsertSchedulerJobRequest, Guid>(requestUri, requestData, default)).ReturnsAsync(Guid.NewGuid()).Verifiable();
var schedulerClient = new SchedulerClient(caller.Object);
var result = await schedulerClient.SchedulerJobService.AddAsync(requestData);
caller.Verify(provider => provider.PostAsync<AddSchedulerJobRequest, Guid>(requestUri, requestData, default), Times.Once);
caller.Verify(provider => provider.PostAsync<UpsertSchedulerJobRequest, Guid>(requestUri, requestData, default), Times.Once);

Assert.AreNotEqual<Guid>(Guid.Empty, result);
}

[TestMethod]
public async Task TestAddSchedulerJobApp()
{
var requestData = new AddSchedulerJobRequest()
var requestData = new UpsertSchedulerJobRequest()
{
Name = "TestJob",
JobType = JobTypes.JobApp,
Expand Down Expand Up @@ -90,18 +90,18 @@ public async Task TestAddSchedulerJobApp()

var requestUri = $"{API}/addSchedulerJobBySdk";
var caller = new Mock<ICaller>();
caller.Setup(provider => provider.PostAsync<AddSchedulerJobRequest, Guid>(requestUri, requestData, default)).ReturnsAsync(Guid.NewGuid()).Verifiable();
caller.Setup(provider => provider.PostAsync<UpsertSchedulerJobRequest, Guid>(requestUri, requestData, default)).ReturnsAsync(Guid.NewGuid()).Verifiable();
var schedulerClient = new SchedulerClient(caller.Object);
var result = await schedulerClient.SchedulerJobService.AddAsync(requestData);
caller.Verify(provider => provider.PostAsync<AddSchedulerJobRequest, Guid>(requestUri, requestData, default), Times.Once);
caller.Verify(provider => provider.PostAsync<UpsertSchedulerJobRequest, Guid>(requestUri, requestData, default), Times.Once);

Assert.AreNotEqual<Guid>(Guid.Empty, result);
}

[TestMethod]
public async Task TestAddSchedulerDaprServiceInvocationJob()
{
var requestData = new AddSchedulerJobRequest()
var requestData = new UpsertSchedulerJobRequest()
{
Name = "TestJob",
JobType = JobTypes.DaprServiceInvocation,
Expand All @@ -128,53 +128,37 @@ public async Task TestAddSchedulerDaprServiceInvocationJob()

var requestUri = $"{API}/addSchedulerJobBySdk";
var caller = new Mock<ICaller>();
caller.Setup(provider => provider.PostAsync<AddSchedulerJobRequest, Guid>(requestUri, requestData, default)).ReturnsAsync(Guid.NewGuid()).Verifiable();
caller.Setup(provider => provider.PostAsync<UpsertSchedulerJobRequest, Guid>(requestUri, requestData, default)).ReturnsAsync(Guid.NewGuid()).Verifiable();
var schedulerClient = new SchedulerClient(caller.Object);
var result = await schedulerClient.SchedulerJobService.AddAsync(requestData);
caller.Verify(provider => provider.PostAsync<AddSchedulerJobRequest, Guid>(requestUri, requestData, default), Times.Once);
caller.Verify(provider => provider.PostAsync<UpsertSchedulerJobRequest, Guid>(requestUri, requestData, default), Times.Once);

Assert.AreNotEqual<Guid>(Guid.Empty, result);
}

[TestMethod]
public async Task TestAddSchedulerJobArgumentNullException()
{
var requestData = new AddSchedulerJobRequest()
var requestData = new UpsertSchedulerJobRequest()
{
Name = "TestJob",
JobType = JobTypes.Http,
CronExpression = "",
JobIdentity = "masa-mc-sync-job",
HttpConfig = new SchedulerJobHttpConfig()
{
RequestUrl = "www.baidu.com",
HttpVerifyType = HttpVerifyTypes.CustomStatusCode,
HttpBody = "",
HttpHeaders = new List<KeyValuePair<string, string>>()
{
new KeyValuePair<string, string>("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/102.0.0.0 Safari/537.36")
},
HttpMethod = HttpMethods.GET,
VerifyContent = "200",
HttpParameters = new List<KeyValuePair<string, string>>()
{
new KeyValuePair<string, string>("ie", "utf-8"),
}
},
OperatorId = Guid.NewGuid()
};

var requestUri = $"{API}/addSchedulerJobBySdk";
var caller = new Mock<ICaller>();
caller.Setup(provider => provider.PostAsync<AddSchedulerJobRequest, Guid>(requestUri, requestData, default)).ReturnsAsync(Guid.NewGuid()).Verifiable();
caller.Setup(provider => provider.PostAsync<UpsertSchedulerJobRequest, Guid>(requestUri, requestData, default)).ReturnsAsync(Guid.NewGuid()).Verifiable();
var schedulerClient = new SchedulerClient(caller.Object);
await Assert.ThrowsExceptionAsync<ArgumentNullException>(async () => await schedulerClient.SchedulerJobService.AddAsync(requestData));
await Assert.ThrowsExceptionAsync<MasaArgumentException>(async () => await schedulerClient.SchedulerJobService.AddAsync(requestData));
}

[TestMethod]
public async Task TestAddSchedulerHttpJobArgumentNullException()
{
var requestData = new AddSchedulerJobRequest()
var requestData = new UpsertSchedulerJobRequest()
{
Name = "TestJob",
JobType = JobTypes.Http,
Expand All @@ -184,15 +168,15 @@ public async Task TestAddSchedulerHttpJobArgumentNullException()

var requestUri = $"{API}/addSchedulerJobBySdk";
var caller = new Mock<ICaller>();
caller.Setup(provider => provider.PostAsync<AddSchedulerJobRequest, Guid>(requestUri, requestData, default)).ReturnsAsync(Guid.NewGuid()).Verifiable();
caller.Setup(provider => provider.PostAsync<UpsertSchedulerJobRequest, Guid>(requestUri, requestData, default)).ReturnsAsync(Guid.NewGuid()).Verifiable();
var schedulerClient = new SchedulerClient(caller.Object);
await Assert.ThrowsExceptionAsync<ArgumentNullException>(async () => await schedulerClient.SchedulerJobService.AddAsync(requestData));
await Assert.ThrowsExceptionAsync<MasaArgumentException>(async () => await schedulerClient.SchedulerJobService.AddAsync(requestData));
}

[TestMethod]
public async Task TestAddSchedulerJobAppArgumentNullException()
{
var requestData = new AddSchedulerJobRequest()
var requestData = new UpsertSchedulerJobRequest()
{
Name = "TestJob",
JobType = JobTypes.JobApp,
Expand All @@ -202,15 +186,15 @@ public async Task TestAddSchedulerJobAppArgumentNullException()

var requestUri = $"{API}/addSchedulerJobBySdk";
var caller = new Mock<ICaller>();
caller.Setup(provider => provider.PostAsync<AddSchedulerJobRequest, Guid>(requestUri, requestData, default)).ReturnsAsync(Guid.NewGuid()).Verifiable();
caller.Setup(provider => provider.PostAsync<UpsertSchedulerJobRequest, Guid>(requestUri, requestData, default)).ReturnsAsync(Guid.NewGuid()).Verifiable();
var schedulerClient = new SchedulerClient(caller.Object);
await Assert.ThrowsExceptionAsync<ArgumentNullException>(async () => await schedulerClient.SchedulerJobService.AddAsync(requestData));
await Assert.ThrowsExceptionAsync<MasaArgumentException>(async () => await schedulerClient.SchedulerJobService.AddAsync(requestData));
}

[TestMethod]
public async Task TestAddSchedulerDaprInvocationJobArgumentNullException()
{
var requestData = new AddSchedulerJobRequest()
var requestData = new UpsertSchedulerJobRequest()
{
Name = "TestJob",
JobType = JobTypes.DaprServiceInvocation,
Expand All @@ -220,9 +204,9 @@ public async Task TestAddSchedulerDaprInvocationJobArgumentNullException()

var requestUri = $"{API}/addSchedulerJobBySdk";
var caller = new Mock<ICaller>();
caller.Setup(provider => provider.PostAsync<AddSchedulerJobRequest, Guid>(requestUri, requestData, default)).ReturnsAsync(Guid.NewGuid()).Verifiable();
caller.Setup(provider => provider.PostAsync<UpsertSchedulerJobRequest, Guid>(requestUri, requestData, default)).ReturnsAsync(Guid.NewGuid()).Verifiable();
var schedulerClient = new SchedulerClient(caller.Object);
await Assert.ThrowsExceptionAsync<ArgumentNullException>(async () => await schedulerClient.SchedulerJobService.AddAsync(requestData));
await Assert.ThrowsExceptionAsync<MasaArgumentException>(async () => await schedulerClient.SchedulerJobService.AddAsync(requestData));
}

[TestMethod]
Expand Down