Skip to content

Commit a1b1dd3

Browse files
committed
exceptions
1 parent f99b7c5 commit a1b1dd3

File tree

11 files changed

+48
-14
lines changed

11 files changed

+48
-14
lines changed
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
using System;
2+
3+
namespace WorkflowCore.Exceptions
4+
{
5+
public class NotFoundException : Exception
6+
{
7+
8+
public NotFoundException() : base()
9+
{
10+
11+
}
12+
13+
public NotFoundException(string message) : base(message)
14+
{
15+
//
16+
}
17+
}
18+
}
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
using System;
2+
3+
namespace WorkflowCore.Exceptions
4+
{
5+
public class WorkflowLockedException : Exception
6+
{
7+
public WorkflowLockedException(): base()
8+
{
9+
//
10+
}
11+
}
12+
}

src/WorkflowCore/Services/ActivityController.cs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using System.Threading;
66
using System.Threading.Tasks;
77
using Newtonsoft.Json;
8+
using WorkflowCore.Exceptions;
89
using WorkflowCore.Interface;
910
using WorkflowCore.Models;
1011

@@ -96,11 +97,14 @@ private async Task SubmitActivityResult(string token, object result)
9697
{
9798
var tokenObj = Token.Decode(token);
9899
var sub = await _subscriptionRepository.GetSubscription(tokenObj.SubscriptionId);
100+
if (sub == null)
101+
throw new NotFoundException();
102+
99103
if (sub.ExternalToken != token)
100-
throw new InvalidOperationException("Token mismatch");
104+
throw new NotFoundException("Token mismatch");
101105

102106
if (!await _lockProvider.AcquireLock(sub.WorkflowId, CancellationToken.None))
103-
throw new InvalidOperationException("Workflow is locked");
107+
throw new WorkflowLockedException();
104108

105109
try
106110
{

src/WorkflowCore/WorkflowCore.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
1616
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
1717
<Description>Workflow Core is a light weight workflow engine targeting .NET Standard.</Description>
18-
<Version>2.2.0</Version>
19-
<AssemblyVersion>3.0.0.0</AssemblyVersion>
20-
<FileVersion>3.0.0.0</FileVersion>
18+
<Version>3.0.1</Version>
19+
<AssemblyVersion>3.0.1.0</AssemblyVersion>
20+
<FileVersion>3.0.1.0</FileVersion>
2121
<PackageReleaseNotes></PackageReleaseNotes>
2222
<PackageIconUrl>https://github.com/danielgerlag/workflow-core/raw/master/src/logo.png</PackageIconUrl>
2323
<PackageVersion>3.0.0</PackageVersion>

src/providers/WorkflowCore.Persistence.EntityFramework/WorkflowCore.Persistence.EntityFramework.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
1515
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
1616
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
17-
<Version>2.2.0</Version>
17+
<Version>3.0.0</Version>
1818
<Description>Base package for Workflow-core peristence providers using entity framework</Description>
1919
<AssemblyVersion>3.0.0.0</AssemblyVersion>
2020
<FileVersion>3.0.0.0</FileVersion>

src/providers/WorkflowCore.Persistence.MongoDB/Services/MongoPersistenceProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ public async Task TerminateSubscription(string eventSubscriptionId)
177177
public async Task<EventSubscription> GetSubscription(string eventSubscriptionId)
178178
{
179179
var result = await EventSubscriptions.FindAsync(x => x.Id == eventSubscriptionId);
180-
return await result.FirstAsync();
180+
return await result.FirstOrDefaultAsync();
181181
}
182182

183183
public async Task<EventSubscription> GetFirstOpenSubscription(string eventName, string eventKey, DateTime asOf)

src/providers/WorkflowCore.Persistence.MongoDB/WorkflowCore.Persistence.MongoDB.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
1515
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
1616
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
17-
<Version>2.2.0</Version>
17+
<Version>3.0.1</Version>
1818
<Description>Provides support to persist workflows running on Workflow Core to a MongoDB database.</Description>
19-
<AssemblyVersion>3.0.0.0</AssemblyVersion>
20-
<FileVersion>3.0.0.0</FileVersion>
19+
<AssemblyVersion>3.0.1.0</AssemblyVersion>
20+
<FileVersion>3.0.1.0</FileVersion>
2121
<PackageVersion>3.0.0</PackageVersion>
2222
</PropertyGroup>
2323

src/providers/WorkflowCore.Persistence.PostgreSQL/WorkflowCore.Persistence.PostgreSQL.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
1616
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
1717
<Description>Provides support to persist workflows running on Workflow Core to a PostgreSQL database.</Description>
18-
<Version>2.2.0</Version>
18+
<Version>3.0.0</Version>
1919
<AssemblyVersion>3.0.0.0</AssemblyVersion>
2020
<FileVersion>3.0.0.0</FileVersion>
2121
<PackageVersion>3.0.0</PackageVersion>

src/providers/WorkflowCore.Persistence.SqlServer/WorkflowCore.Persistence.SqlServer.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
1616
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
1717
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
18-
<Version>2.2.0</Version>
18+
<Version>3.0.0</Version>
1919
<Description>Provides support to persist workflows running on Workflow Core to a SQL Server database.</Description>
2020
<AssemblyVersion>3.0.0.0</AssemblyVersion>
2121
<FileVersion>3.0.0.0</FileVersion>

src/providers/WorkflowCore.Providers.AWS/WorkflowCore.Providers.AWS.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<PackageProjectUrl>https://github.com/danielgerlag/workflow-core</PackageProjectUrl>
1212
<RepositoryUrl>https://github.com/danielgerlag/workflow-core.git</RepositoryUrl>
1313
<RepositoryType>git</RepositoryType>
14-
<Version>2.2.0</Version>
14+
<Version>3.0.0</Version>
1515
<AssemblyVersion>3.0.0.0</AssemblyVersion>
1616
<PackageVersion>3.0.0</PackageVersion>
1717
</PropertyGroup>

0 commit comments

Comments
 (0)