Skip to content

Commit 842953b

Browse files
heuveaheuvea
authored
FUND-2136: ZRC/BRC and DRC replace last RabbitMQ by Hangfire (#113)
* initial * cleanup old rabbitmqconsumers, etc * finished * ZGW.Documenten.Messaging Project removed * oss preparation * Zsdms CreateOrPatchSubscription uses separate hangfire queue * oss part implemented * configuration adjusted (temporary) * Hangfire dashboard only on local usage * NRC subscription deleted if client id will be removed * finished last part * added migration to extend field auth of table abonnementen * some co-pilot findings fixed * own review findings * removed PgAdnin form yml file * cleanup code * GetCachedTokenAsync gives also expiration back * field length adjusted and some cleanup * removed ZgwTokenIntrospectionEndpoint entry from appsettings * some fixes * assembly name and namesapce of Documenten.Jobs of OSS fixed * code review point * fixed local auth Hangfire dashbord in docker * SendNotificationAsyncCancellation token as last praram. Added overloads * auth entry removed from appsettings * some copilot hints fixed * initial * cleanup old rabbitmqconsumers, etc * finished * ZGW.Documenten.Messaging Project removed * oss preparation * Zsdms CreateOrPatchSubscription uses separate hangfire queue * oss part implemented * configuration adjusted (temporary) * Hangfire dashboard only on local usage * NRC subscription deleted if client id will be removed * finished last part * added migration to extend field auth of table abonnementen * some co-pilot findings fixed * own review findings * removed PgAdnin form yml file * cleanup code * GetCachedTokenAsync gives also expiration back * field length adjusted and some cleanup * removed ZgwTokenIntrospectionEndpoint entry from appsettings * some fixes * assembly name and namesapce of Documenten.Jobs of OSS fixed * code review point * fixed local auth Hangfire dashbord in docker * SendNotificationAsyncCancellation token as last praram. Added overloads * auth entry removed from appsettings * some copilot hints fixed * updated pipeline
1 parent 136eefc commit 842953b

File tree

81 files changed

+1621
-1053
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+1621
-1053
lines changed

‎.github/workflows/cd-besluiten.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ on:
1212
- 'src/OneGround.ZGW.Autorisaties.ServiceAgent/**'
1313
- 'src/OneGround.ZGW.Besluiten.Contracts/**'
1414
- 'src/OneGround.ZGW.Besluiten.DataModel/**'
15+
- 'src/OneGround.ZGW.Besluiten.ServiceAgent/**'
1516
- 'src/OneGround.ZGW.Besluiten.Web/**'
1617
- 'src/OneGround.ZGW.Besluiten.WebApi/**'
1718
- 'src/OneGround.ZGW.Catalogi.Contracts/**'
@@ -25,7 +26,6 @@ on:
2526
- 'src/OneGround.ZGW.Common/**'
2627
- 'src/OneGround.ZGW.DataAccess/**'
2728
- 'src/OneGround.ZGW.Documenten.Contracts/**'
28-
- 'src/OneGround.ZGW.Documenten.Messaging.Contracts/**'
2929
- 'src/OneGround.ZGW.Documenten.ServiceAgent/**'
3030
- 'src/OneGround.ZGW.Notificaties.Contracts/**'
3131
- 'src/OneGround.ZGW.Notificaties.ServiceAgent/**'

‎.github/workflows/cd-documenten.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ on:
2626
- 'src/OneGround.ZGW.DataAccess/**'
2727
- 'src/OneGround.ZGW.Documenten.Contracts/**'
2828
- 'src/OneGround.ZGW.Documenten.DataModel/**'
29-
- 'src/OneGround.ZGW.Documenten.Messaging.Contracts/**'
29+
- 'src/OneGround.ZGW.Documenten.Jobs/**'
3030
- 'src/OneGround.ZGW.Documenten.Messaging.Listener/**'
3131
- 'src/OneGround.ZGW.Documenten.Messaging/**'
3232
- 'src/OneGround.ZGW.Documenten.ServiceAgent/**'

‎.github/workflows/cd-zaken.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ on:
2323
- 'src/OneGround.ZGW.Common/**'
2424
- 'src/OneGround.ZGW.DataAccess/**'
2525
- 'src/OneGround.ZGW.Documenten.Contracts/**'
26-
- 'src/OneGround.ZGW.Documenten.Messaging.Contracts/**'
2726
- 'src/OneGround.ZGW.Documenten.ServiceAgent/**'
2827
- 'src/OneGround.ZGW.Notificaties.Contracts/**'
2928
- 'src/OneGround.ZGW.Notificaties.ServiceAgent/**'

‎getting-started/docker-compose/default.env‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,4 @@ Services__NRC__Api="https://notificaties.oneground.local/api/v1/"
2020
Services__RL__Api="https://referentielijsten.oneground.local/api/v1/"
2121
Services__ZRC__Api="https://zaken.oneground.local/api/v1/"
2222
Services__ZTC__Api="https://catalogi.oneground.local/api/v1/"
23+
Services__DRC_LISTENER__Api="https://documentlistener.oneground.local/api"

‎getting-started/docker-compose/docker-compose.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,7 @@ services:
253253
ASPNETCORE_URLS: "http://*:${ASPNETCORE_INTERNAL_PORT}"
254254
ConnectionStrings__UserConnectionString: "Host=${POSTGRES_HOST};Port=${POSTGRES_PORT};Database=${POSTGRES_DRC_DB};Username=${POSTGRES_USER};Password=${POSTGRES_USER_PASSWORD}"
255255
ConnectionStrings__AdminConnectionString: "Host=${POSTGRES_HOST};Port=${POSTGRES_PORT};Database=${POSTGRES_DRC_DB};Username=${POSTGRES_ADMIN};Password=${POSTGRES_ADMIN_PASSWORD}"
256+
ConnectionStrings__HangfireConnectionString: "Host=${POSTGRES_HOST};Port=${POSTGRES_PORT};Database=${POSTGRES_DRC_DB};Username=${POSTGRES_ADMIN};Password=${POSTGRES_ADMIN_PASSWORD}"
256257
networks:
257258
- oneground
258259

‎localdev/default.env‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,4 @@ Services__NRC__Api="https://notificaties.oneground.local/api/v1/"
2020
Services__RL__Api="https://referentielijsten.oneground.local/api/v1/"
2121
Services__ZRC__Api="https://zaken.oneground.local/api/v1/"
2222
Services__ZTC__Api="https://catalogi.oneground.local/api/v1/"
23+
Services__DRC_LISTENER__Api="https://documentlistener.oneground.local/api"

‎localdev/docker-compose.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,7 @@ services:
276276
ASPNETCORE_URLS: "http://*:${ASPNETCORE_INTERNAL_PORT}"
277277
ConnectionStrings__UserConnectionString: "Host=${POSTGRES_HOST};Port=${POSTGRES_PORT};Database=${POSTGRES_DRC_DB};Username=${POSTGRES_USER};Password=${POSTGRES_USER_PASSWORD}"
278278
ConnectionStrings__AdminConnectionString: "Host=${POSTGRES_HOST};Port=${POSTGRES_PORT};Database=${POSTGRES_DRC_DB};Username=${POSTGRES_ADMIN};Password=${POSTGRES_ADMIN_PASSWORD}"
279+
ConnectionStrings__HangfireConnectionString: "Host=${POSTGRES_HOST};Port=${POSTGRES_PORT};Database=${POSTGRES_DRC_DB};Username=${POSTGRES_ADMIN};Password=${POSTGRES_ADMIN_PASSWORD}"
279280
networks:
280281
- oneground
281282

‎src/Directory.Packages.props‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<PackageVersion Include="FluentValidation.DependencyInjectionExtensions" Version="12.0.0" />
1616
<PackageVersion Include="Hangfire" Version="1.8.20" />
1717
<PackageVersion Include="Hangfire.Console.Extensions" Version="2.1.0" />
18+
<PackageVersion Include="Hangfire.Core" Version="1.8.20" />
1819
<PackageVersion Include="Hangfire.PostgreSql" Version="1.20.12" />
1920
<PackageVersion Include="MassTransit" Version="8.4.1" />
2021
<PackageVersion Include="MassTransit.Hangfire" Version="8.4.1" />
@@ -64,4 +65,4 @@
6465
<PackageVersion Include="Swashbuckle.AspNetCore.Filters" Version="8.0.3" />
6566
<PackageVersion Include="Swashbuckle.AspNetCore.Newtonsoft" Version="8.1.1" />
6667
</ItemGroup>
67-
</Project>
68+
</Project>

‎src/OneGround.ZGW.Besluiten.ServiceAgent/v1/BesluitenServiceAgent.cs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,10 @@ GetAllBesluitInformatieObjectenQueryParameters parameters
3737
{
3838
return await GetAsync<BesluitInformatieObjectResponseDto>("/besluitinformatieobjecten", parameters);
3939
}
40+
41+
public async Task<ServiceAgentResponse> DeleteBesluitInformatieObjectByIdAsync(Guid besluitInformatieObjectId)
42+
{
43+
var url = new Uri($"/besluitinformatieobjecten/{besluitInformatieObjectId}", UriKind.Relative);
44+
return await DeleteAsync(url);
45+
}
4046
}

‎src/OneGround.ZGW.Besluiten.ServiceAgent/v1/IBesluitenServiceAgent.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
using System;
12
using System.Collections.Generic;
23
using System.Threading.Tasks;
34
using OneGround.ZGW.Besluiten.Contracts.v1.Queries;
@@ -12,4 +13,5 @@ public interface IBesluitenServiceAgent
1213
Task<ServiceAgentResponse<IEnumerable<BesluitInformatieObjectResponseDto>>> GetBesluitInformatieObjectenAsync(
1314
GetAllBesluitInformatieObjectenQueryParameters parameters
1415
);
16+
Task<ServiceAgentResponse> DeleteBesluitInformatieObjectByIdAsync(Guid besluitInformatieObjectId);
1517
}

0 commit comments

Comments
 (0)