ChurchTools services API hotfix

.github/workflows/main.yml

@@ -39,7 +39,7 @@ jobs:
     - name: Setup NodeJS
       uses: actions/setup-node@v4
       with:
-        node-version: '20'
+        node-version: '22'
     - name: Restore NPM packages
       run: npm install
       working-directory: webapp
@@ -69,7 +69,7 @@ jobs:
         username: ${{ github.actor }}
         password: ${{ secrets.GITHUB_TOKEN }}
     - name: Build and push
-      uses: docker/build-push-action@v5
+      uses: docker/build-push-action@v6
       with:
         context: .
         push: ${{ github.event_name != 'pull_request' }}

.github/workflows/release.yml

@@ -29,7 +29,7 @@ jobs:
         username: ${{ secrets.DOCKERHUB_USERNAME }}
         password: ${{ secrets.DOCKERHUB_TOKEN }}
     - name: Build and push
-      uses: docker/build-push-action@v5
+      uses: docker/build-push-action@v6
       with:
         context: .
         push: true

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:20 AS webapp
+FROM node:22 AS webapp
 WORKDIR /app
 
 # Copy package definition and restore node modules as distinct layers

README.md

@@ -165,7 +165,7 @@ The following instructions are written for Windows but generally also apply to L
 ### Frontend
 - Visual Studio Code
 - Vue Language Features (Volar) Extension
-- NodeJS 20 LTS
+- NodeJS 22 LTS
 
 During development the frontend running on the Vue CLI development server will use _http://localhost:10501_ as API endpoint.
 That means the backend can be running in Visual Studio with Debugger attached.

server/ChurchTools/Model/Service.cs

@@ -1,8 +1,10 @@
-namespace ChurchTools.Model;
+using System.Collections.Generic;
+
+namespace ChurchTools.Model;
 
 public class Service
 {
-    public Service(int id, string name, int serviceGroupId, int sortKey, string groupIds, string tagIds)
+    public Service(int id, string name, int serviceGroupId, int sortKey, List<int>? groupIds, string tagIds)
     {
         Id = id;
         Name = name;
@@ -19,7 +21,7 @@ public Service(int id, string name, int serviceGroupId, int sortKey, string grou
     /// <summary>
     /// Comma separated list of standard groups IDs
     /// </summary>
-    public string? GroupIds { get; }
+    public List<int>? GroupIds { get; }
     /// <summary>
     /// Comma separated list of person tag IDs
     /// </summary>

server/Korga.Tests/Korga.Tests.csproj

@@ -9,13 +9,13 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="8.0.7" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
     <PackageReference Include="coverlet.collector" Version="6.0.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="xunit" Version="2.9.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
+    <PackageReference Include="xunit" Version="2.9.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

server/Korga/Controllers/ServiceController.cs

@@ -84,7 +84,7 @@ private async ValueTask<IEnumerable<int>> GetServiceGroups(IEnumerable<int> serv
         foreach (Service service in services)
         {
             if (service.GroupIds == null) continue;
-            groupIds.UnionWith(service.GroupIds.Split(',', StringSplitOptions.RemoveEmptyEntries).Select(int.Parse));
+            groupIds.UnionWith(service.GroupIds);
         }
         return groupIds;
     }

server/Korga/Korga.csproj

@@ -7,18 +7,18 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MailKit" Version="4.7.1.1" />
+    <PackageReference Include="MailKit" Version="4.9.0" />
     <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="4.1.1" />
     <PackageReference Include="McMaster.Extensions.Hosting.CommandLine" Version="4.1.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.7" />
-    <PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="8.0.7" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.7">
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.11" />
+    <PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="8.0.11" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.11">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.7" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.11" />
     <PackageReference Include="Nito.AsyncEx" Version="5.1.2" />
-    <PackageReference Include="NSwag.AspNetCore" Version="14.1.0" />
+    <PackageReference Include="NSwag.AspNetCore" Version="14.2.0" />
     <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.2" />
   </ItemGroup>