Skip to content

Update the Reservation Car Demo #102

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

Merged
VenyaBrodetskiy merged 12 commits into from
May 4, 2025
Merged

Update the Reservation Car Demo #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
c982d72
Update test and demo project to .NET 9, Update NuGet packages for Dap…
alonf Apr 20, 2025
a00917f
Remove OpenTelemetry logs from saga test files
alonf Apr 24, 2025
acf7172
Add a UI for the Car Reservation Demo
alonf Apr 28, 2025
9d9799e
Add car reservation UI and update related services
alonf Apr 28, 2025
cd0beee
Refactor actors and enhance saga log handling
alonf Apr 28, 2025
f7ef71c
Enhance reservation system with new features and UI updates
alonf Apr 28, 2025
fcd602c
Reduce TTL and improve error handling in endpoints
alonf Apr 29, 2025
3a69d65
Added Demo UI
alonf May 1, 2025
3bb8980
Refactor reservation system for improved responsiveness
alonf May 2, 2025
be19cde
Add car inventory management endpoints and refactor
alonf May 2, 2025
6c64fd5
Enhance reservations and inventory management
alonf May 3, 2025
fd2e511
Refactor billing and reservation logic for improvements
alonf May 4, 2025
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
4 changes: 2 additions & 2 deletions .github/workflows/IntegrationTest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ jobs:
rm ./dapr/components/dapr-secretstore.json
echo "{\"SignalRConnectionString\": \"${{ secrets.SAGAWAY_SIGNALR_CONNECTION_STRING }}\"}" > ./dapr/components/dapr-secretstore.json
- name: Setup .NET
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: |
8.0.x
9.0.x
- name: Sagaway Core Tests
run: dotnet test --verbosity normal --configuration Debug Sagaway.Tests/Sagaway.Tests.csproj
- name: Docker Compose Up
Expand Down
9 changes: 8 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,4 +360,11 @@ MigrationBackup/
.ionide/

# Fody - auto-generated XML schema
FodyWeavers.xsd
FodyWeavers.xsd
/Sagaway.IntegrationTests/Sagaway.IntegrationTests.TestProject/ApprovalFiles/test_a_1_failed_wait10_2_failed_b_1_success.received.txt
Copy link
Collaborator

@VenyaBrodetskiy VenyaBrodetskiy May 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why tests results are in gitignore? is it right?

/Sagaway.IntegrationTests/Sagaway.IntegrationTests.TestProject/ApprovalFiles/test_a_1_failed_wait5_2_success_b_1_failed_wait5_2_failed.received.txt
/Sagaway.IntegrationTests/Sagaway.IntegrationTests.TestProject/ApprovalFiles/test_a_failed_on_2_no_callback_revert.received.txt

#web artifacrs
/Sagaway.ReservationDemo/Sagaway.ReservationDemo.ReservationUI/wwwroot/lib
/Sagaway.ReservationDemo/Sagaway.ReservationDemo.ReservationUI/wwwroot/css/app.Output.css
4 changes: 2 additions & 2 deletions Sagaway.Callback.Propagator/Sagaway.Callback.Propagator.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Dapr.AspNetCore" Version="1.15.0-rc02" />
<PackageReference Include="Dapr.Client" Version="1.15.0-rc02" />
<PackageReference Include="Dapr.AspNetCore" Version="1.15.3" />
<PackageReference Include="Dapr.Client" Version="1.15.3" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down
6 changes: 3 additions & 3 deletions Sagaway.Callback.Router/Sagaway.Callback.Router.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,13 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Dapr.Client" Version="1.15.0-rc02" />
<PackageReference Include="Dapr.Actors.AspNetCore" Version="1.15.0-rc02" />
<PackageReference Include="Dapr.Client" Version="1.15.3" />
<PackageReference Include="Dapr.Actors.AspNetCore" Version="1.15.3" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Polly" Version="8.4.1" />
<PackageReference Include="Polly" Version="8.5.2" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion Sagaway.Hosts.DaprActorHost/Sagaway.Hosts.DaprActorHost.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Dapr.Actors.AspNetCore" Version="1.15.0-rc02" />
<PackageReference Include="Dapr.Actors.AspNetCore" Version="1.15.3" />
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="8.0.8" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
<PrivateAssets>all</PrivateAssets>
Expand Down
4 changes: 2 additions & 2 deletions Sagaway.IntegrationTests/Sagaway.IntegrationTests.OrchestrationService/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging.

FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base
USER app
WORKDIR /app
EXPOSE 8080
EXPOSE 8081

FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
ARG BUILD_CONFIGURATION=Release
WORKDIR /src
COPY ["Sagaway.IntegrationTests/Sagaway.IntegrationTests.OrchestrationService/Sagaway.IntegrationTests.OrchestrationService.csproj", "Sagaway.IntegrationTests/Sagaway.IntegrationTests.OrchestrationService/"]
Expand Down
24 changes: 12 additions & 12 deletions ...ntegrationTests.OrchestrationService/Sagaway.IntegrationTests.OrchestrationService.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<InvariantGlobalization>true</InvariantGlobalization>
Expand All @@ -12,17 +12,17 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Dapr.Client" Version="1.15.0-rc02" />
<PackageReference Include="Dapr.AspNetCore" Version="1.15.0-rc02" />
<PackageReference Include="Dapr.Actors" Version="1.15.0-rc02" />
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.8" />
<PackageReference Include="OpenTelemetry.Exporter.Zipkin" Version="1.9.0" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.9.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.9.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.9.0" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.7.3" />
<PackageReference Include="Microsoft.Azure.SignalR.Management" Version="1.27.0" />
<PackageReference Include="Dapr.Client" Version="1.15.3" />
<PackageReference Include="Dapr.AspNetCore" Version="1.15.3" />
<PackageReference Include="Dapr.Actors" Version="1.15.3" />
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.4" />
<PackageReference Include="OpenTelemetry.Exporter.Zipkin" Version="1.11.2" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.11.2" />
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.11.1" />
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.11.1" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.2" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="8.1.1" />
<PackageReference Include="Microsoft.Azure.SignalR.Management" Version="1.30.2" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions Sagaway.IntegrationTests/Sagaway.IntegrationTests.StepRecorderTestService/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging.

# This stage is used when running from VS in fast mode (Default for Debug configuration)
FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base
USER app
WORKDIR /app
EXPOSE 8080
EXPOSE 8081


# This stage is used to build the service project
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
ARG BUILD_CONFIGURATION=Release
WORKDIR /src
COPY ["Sagaway.IntegrationTests/Sagaway.IntegrationTests.StepRecorderTestService/Sagaway.IntegrationTests.StepRecorderTestService.csproj", "Sagaway.IntegrationTests/Sagaway.IntegrationTests.StepRecorderTestService/"]
Expand Down
22 changes: 11 additions & 11 deletions ...tionTests.StepRecorderTestService/Sagaway.IntegrationTests.StepRecorderTestService.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,24 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
<DockerfileContext>..\..</DockerfileContext>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Dapr.Client" Version="1.15.0-rc02" />
<PackageReference Include="Dapr.AspNetCore" Version="1.15.0-rc02" />
<PackageReference Include="Dapr.Actors" Version="1.15.0-rc02" />
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.8" />
<PackageReference Include="OpenTelemetry.Exporter.Zipkin" Version="1.9.0" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.9.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.9.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.9.0" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.7.3" />
<PackageReference Include="Dapr.Client" Version="1.15.3" />
<PackageReference Include="Dapr.AspNetCore" Version="1.15.3" />
<PackageReference Include="Dapr.Actors" Version="1.15.3" />
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.4" />
<PackageReference Include="OpenTelemetry.Exporter.Zipkin" Version="1.11.2" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.11.2" />
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.11.1" />
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.11.1" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.2" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="8.1.1" />
</ItemGroup>

<ItemGroup>
Expand Down
32 changes: 16 additions & 16 deletions ...nTests.TestProject/ApprovalFiles/test_a_1_failed_wait10_2_failed_b_1_success.approved.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@ Saga Log:
[*time*][CallA]: Registering reminder CallA:Retry for CallA with interval 00:00:10
[*time*]The Saga is deactivated.
[*time*]The Saga is activated.
[*time*][CallB]: CallB Success
Copy link
Collaborator

@VenyaBrodetskiy VenyaBrodetskiy May 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

are these changes ok?

[*time*]The Saga is deactivated.
[*time*]The Saga is activated.
[*time*][CallA]: Wake by a reminder
[*time*][CallA]: OnReminderAsync: Validation for CallA returned false, retrying action.
[*time*][CallA]: Retry CallA. Retry count: 2
[*time*][CallA]: Start Executing CallA
[*time*][CallA]: Registering reminder CallA:Retry for CallA with interval 00:00:10
[*time*]The Saga is deactivated.
[*time*]The Saga is activated.
[*time*][CallB]: CallB Success
[*time*]The Saga is deactivated.
[*time*]The Saga is activated.
[*time*]The Saga is deactivated.
[*time*]The Saga is activated.
[*time*][CallA]: CallA Failed. Retries exhausted.
Expand Down Expand Up @@ -113,8 +113,8 @@ Open Telemetry:
}
},
{
"TraceId": "id-10",
"ParentId": "id-11",
"TraceId": "id-1",
"ParentId": "id-10",
"Kind": "SERVER",
"Name": "name-4",
"LocalEndpoint": {
Expand All @@ -128,33 +128,33 @@ Open Telemetry:
}
},
{
"TraceId": "id-1",
"TraceId": "id-11",
"ParentId": "id-12",
"Kind": null,
"Name": "name-13",
"Kind": "SERVER",
"Name": "name-4",
"LocalEndpoint": {
"ServiceName": "orchestrationservice.sagaway"
},
"Tags": {
"operation.name": "CallA",
"otel.library.name": "OrchestrationService.Sagaway",
"otel.scope.name": "OrchestrationService.Sagaway",
"saga.id": "id-3"
"saga.id": "id-3",
"saga.type": "SagaTestActorOperations"
}
},
{
"TraceId": "id-1",
"ParentId": "id-14",
"Kind": "SERVER",
"Name": "name-4",
"ParentId": "id-13",
"Kind": null,
"Name": "name-14",
"LocalEndpoint": {
"ServiceName": "orchestrationservice.sagaway"
},
"Tags": {
"operation.name": "CallA",
"otel.library.name": "OrchestrationService.Sagaway",
"otel.scope.name": "OrchestrationService.Sagaway",
"saga.id": "id-3",
"saga.type": "SagaTestActorOperations"
"saga.id": "id-3"
}
},
{
Expand Down Expand Up @@ -203,7 +203,7 @@ Open Telemetry:
}
},
{
"TraceId": "id-10",
"TraceId": "id-11",
"ParentId": "id-20",
"Kind": "SERVER",
"Name": "name-4",
Expand Down
76 changes: 72 additions & 4 deletions ...ject/ApprovalFiles/test_a_1_failed_wait5_2_success_b_1_failed_wait5_2_failed.approved.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,17 @@ Saga Log:
[*time*][CallB]: Registering reminder CallB:Retry for CallB with interval 00:00:30
[*time*]The Saga is deactivated.
[*time*]The Saga is activated.
[*time*][CallA]: Wake by a reminder
[*time*][CallA]: OnReminderAsync: Validation for CallA returned false, retrying action.
[*time*][CallA]: CallA Failed. Retries exhausted.
[*time*][CallA]: CallA Success
Copy link
Collaborator

@VenyaBrodetskiy VenyaBrodetskiy May 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

are these changes ok?

[*time*]The Saga is deactivated.
[*time*]The Saga is activated.
[*time*]The Saga is deactivated.
[*time*]The Saga is activated.
[*time*][CallB]: Retry CallB. Retry count: 2
[*time*][CallB]: Start Executing CallB
[*time*][CallB]: Registering reminder CallB:Retry for CallB with interval 00:00:30
[*time*]The Saga is deactivated.
[*time*]The Saga is activated.
[*time*][CallB]: CallB Failed. Retries exhausted.
[*time*][CallA]: Start Executing Revert CallA
[*time*][CallA]: No undo operation for CallA. Marking as reverted
[*time*][CallB]: Start Executing Revert CallB
Expand Down Expand Up @@ -170,13 +178,73 @@ Open Telemetry:
}
},
{
"TraceId": "id-16",
"TraceId": "id-1",
"ParentId": "id-16",
"Kind": "SERVER",
"Name": "name-4",
"LocalEndpoint": {
"ServiceName": "orchestrationservice.sagaway"
},
"Tags": {
"otel.library.name": "OrchestrationService.Sagaway",
"otel.scope.name": "OrchestrationService.Sagaway",
"saga.id": "id-3",
"saga.type": "SagaTestActorOperations"
}
},
{
"TraceId": "id-10",
"ParentId": "id-17",
"Kind": "SERVER",
"Name": "name-4",
"LocalEndpoint": {
"ServiceName": "orchestrationservice.sagaway"
},
"Tags": {
"otel.library.name": "OrchestrationService.Sagaway",
"otel.scope.name": "OrchestrationService.Sagaway",
"saga.id": "id-3",
"saga.type": "SagaTestActorOperations"
}
},
{
"TraceId": "id-1",
"ParentId": "id-18",
"Kind": "SERVER",
"Name": "name-4",
"LocalEndpoint": {
"ServiceName": "orchestrationservice.sagaway"
},
"Tags": {
"otel.library.name": "OrchestrationService.Sagaway",
"otel.scope.name": "OrchestrationService.Sagaway",
"saga.id": "id-3",
"saga.type": "SagaTestActorOperations"
}
},
{
"TraceId": "id-1",
"ParentId": "id-19",
"Kind": null,
"Name": "name-20",
"LocalEndpoint": {
"ServiceName": "orchestrationservice.sagaway"
},
"Tags": {
"operation.name": "CallB",
"otel.library.name": "OrchestrationService.Sagaway",
"otel.scope.name": "OrchestrationService.Sagaway",
"saga.id": "id-3"
}
},
{
"TraceId": "id-1",
"ParentId": "id-21",
"Kind": "SERVER",
"Name": "name-4",
"LocalEndpoint": {
"ServiceName": "orchestrationservice.sagaway"
},
"Tags": {
"otel.library.name": "OrchestrationService.Sagaway",
"otel.scope.name": "OrchestrationService.Sagaway",
Expand Down
6 changes: 2 additions & 4 deletions ...grationTests.TestProject/ApprovalFiles/test_a_failed_on_2_no_callback_revert.approved.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ Saga Log:
[*time*][CallA]: Registering reminder CallA:Retry for Revert CallA with interval 00:00:05
[*time*]The Saga is deactivated.
[*time*]The Saga is activated.
Copy link
Collaborator

@VenyaBrodetskiy VenyaBrodetskiy May 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

are these changes ok?

[*time*][CallA]: Wake by a reminder
[*time*][CallA]: OnReminderAsync: Revert CallA passed validation successfully.
[*time*][CallA]: Revert CallA Success

Open Telemetry:
Expand Down Expand Up @@ -147,8 +145,8 @@ Open Telemetry:
}
},
{
"TraceId": "id-15",
"ParentId": "id-16",
"TraceId": "id-1",
"ParentId": "id-15",
"Kind": "SERVER",
"Name": "name-4",
"LocalEndpoint": {
Expand Down
Loading
Loading