added endpoint for download of ALL appointments via ICS-file

Orso.Arpa.Api/Orso.Arpa.Api.csproj

@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Content Remove="appsettings.Test.json" />
+    <Content Remove="appsettings.Test.json"/>
   </ItemGroup>
 
   <ItemGroup>

Orso.Arpa.Api/appsettings.Development.json

@@ -18,8 +18,12 @@
         "internalLogLevel": "Info",
         "internalLogFile": "${basedir}/internal-nlog.txt",
         "extensions": [
-            { "assembly": "NLog.Extensions.Logging" },
-            { "assembly": "NLog.Web.AspNetCore" }
+            {
+                "assembly": "NLog.Extensions.Logging"
+            },
+            {
+                "assembly": "NLog.Web.AspNetCore"
+            }
         ],
         "default-wrapper": {
             "type": "AsyncWrapper",
@@ -47,7 +51,7 @@
     "EmailConfiguration": {
         "From": "dev@arpa.orso.co",
         "SmtpServer": "localhost",
-        "Port": 25,
+        "Port": 8025,
         "Username": "",
         "Password": "",
         "DefaultSubject": "Message from ARPA"
@@ -100,7 +104,10 @@
     "IpRateLimiting": {
         "EnableEndpointRateLimiting": true,
         "StackBlockedRequests": true,
-        "EndpointWhitelist": [ "options:*", "post:/graphql" ],
+        "EndpointWhitelist": [
+            "options:*",
+            "post:/graphql"
+        ],
         "HttpStatusCode": 429,
         "GeneralRules": [
             {

Orso.Arpa.Application/AppointmentApplication/Interfaces/IAppointmentService.cs

@@ -5,38 +5,47 @@
 using Orso.Arpa.Application.AppointmentParticipationApplication.Model;
 using Orso.Arpa.Domain.AppointmentDomain.Enums;
 
-namespace Orso.Arpa.Application.AppointmentApplication.Interfaces
+namespace Orso.Arpa.Application.AppointmentApplication.Interfaces;
+
+public interface IAppointmentService
 {
-    public interface IAppointmentService
-    {
-        Task<IEnumerable<AppointmentListDto>> GetAsync(DateTime? date, DateRange range);
+    Task<IEnumerable<AppointmentListDto>> GetAsync(DateTime? date, DateRange? range);
+
+    Task<AppointmentDto> GetByIdAsync(Guid id, bool includeParticipations);
+
+    Task<AppointmentDto> CreateAsync(AppointmentCreateDto appointmentCreateDto);
+
+    Task ModifyAsync(AppointmentModifyDto appointmentModifyDto);
 
-        Task<AppointmentDto> GetByIdAsync(Guid id, bool includeParticipations);
+    Task RemoveRoomAsync(AppointmentRemoveRoomDto removeRoomDto);
 
-        Task<AppointmentDto> CreateAsync(AppointmentCreateDto appointmentCreateDto);
+    Task AddRoomAsync(AppointmentAddRoomDto addRoomDto);
 
-        Task ModifyAsync(AppointmentModifyDto appointmentModifyDto);
+    Task<AppointmentDto> AddProjectAsync(AppointmentAddProjectDto addProjectDto,
+        bool includeParticipations);
 
-        Task RemoveRoomAsync(AppointmentRemoveRoomDto removeRoomDto);
+    Task<AppointmentDto> AddSectionAsync(AppointmentAddSectionDto addSectionDto,
+        bool includeParticipations);
 
-        Task AddRoomAsync(AppointmentAddRoomDto addRoomDto);
+    Task<AppointmentDto> RemoveSectionAsync(AppointmentRemoveSectionDto removeSectionDto,
+        bool includeParticipations);
 
-        Task<AppointmentDto> AddProjectAsync(AppointmentAddProjectDto addProjectDto, bool includeParticipations);
+    Task<AppointmentDto> RemoveProjectAsync(AppointmentRemoveProjectDto removeProjectDto,
+        bool includeParticipations);
 
-        Task<AppointmentDto> AddSectionAsync(AppointmentAddSectionDto addSectionDto, bool includeParticipations);
+    Task SetVenueAsync(AppointmentSetVenueDto setVenueDto);
 
-        Task<AppointmentDto> RemoveSectionAsync(AppointmentRemoveSectionDto removeSectionDto, bool includeParticipations);
+    Task<AppointmentDto> SetDatesAsync(AppointmentSetDatesDto setDatesDto);
 
-        Task<AppointmentDto> RemoveProjectAsync(AppointmentRemoveProjectDto removeProjectDto, bool includeParticipations);
+    Task DeleteAsync(Guid id);
 
-        Task SetVenueAsync(AppointmentSetVenueDto setVenueDto);
+    Task SetParticipationResultAsync(AppointmentParticipationSetResultDto setParticipationResult);
 
-        Task<AppointmentDto> SetDatesAsync(AppointmentSetDatesDto setDatesDto);
+    Task SetParticipationPredictionAsync(
+        AppointmentParticipationSetPredictionDto setParticipationPrediction);
 
-        Task DeleteAsync(Guid id);
+    Task SendAppointmentChangedNotificationAsync(
+        SendAppointmentChangedNotificationDto sendAppointmentChangedNotificationDto);
 
-        Task SetParticipationResultAsync(AppointmentParticipationSetResultDto setParticipationResult);
-        Task SetParticipationPredictionAsync(AppointmentParticipationSetPredictionDto setParticipationPrediction);
-        Task SendAppointmentChangedNotificationAsync(SendAppointmentChangedNotificationDto sendAppointmentChangedNotificationDto);
-    }
+    Task<string> ExportAppointmentsToIcsAsync();
 }

Orso.Arpa.Application/AppointmentApplication/Services/AppointmentService.cs

@@ -18,139 +18,171 @@
 using Orso.Arpa.Domain.SectionDomain.Model;
 using Orso.Arpa.Domain.SectionDomain.Queries;
 
-namespace Orso.Arpa.Application.AppointmentApplication.Services
+namespace Orso.Arpa.Application.AppointmentApplication.Services;
+
+public class AppointmentService : BaseService<
+    AppointmentDto,
+    Appointment,
+    AppointmentCreateDto,
+    CreateAppointment.Command,
+    AppointmentModifyDto,
+    AppointmentModifyBodyDto,
+    ModifyAppointment.Command>, IAppointmentService
 {
-    public class AppointmentService : BaseService<
-        AppointmentDto,
-        Appointment,
-        AppointmentCreateDto,
-        CreateAppointment.Command,
-        AppointmentModifyDto,
-        AppointmentModifyBodyDto,
-        ModifyAppointment.Command>, IAppointmentService
-    {
-        public AppointmentService(IMediator mediator, IMapper mapper) : base(mediator, mapper)
-        {
-        }
+    public AppointmentService(IMediator mediator, IMapper mapper) : base(mediator, mapper)
+    {
+    }
 
-        public async Task<AppointmentDto> AddProjectAsync(AppointmentAddProjectDto addProjectDto, bool includeParticipations)
-        {
-            AddProjectToAppointment.Command command = _mapper.Map<AddProjectToAppointment.Command>(addProjectDto);
-            await _mediator.Send(command);
-            return await GetByIdAsync(addProjectDto.Id, includeParticipations);
-        }
+    public async Task<AppointmentDto> AddProjectAsync(AppointmentAddProjectDto addProjectDto,
+        bool includeParticipations)
+    {
+        AddProjectToAppointment.Command command =
+            _mapper.Map<AddProjectToAppointment.Command>(addProjectDto);
+        await _mediator.Send(command);
+        return await GetByIdAsync(addProjectDto.Id, includeParticipations);
+    }
 
-        public async Task<AppointmentDto> AddSectionAsync(AppointmentAddSectionDto addSectionDto, bool includeParticipations)
-        {
-            AddSectionToAppointment.Command command = _mapper.Map<AddSectionToAppointment.Command>(addSectionDto);
-            await _mediator.Send(command);
-            return await GetByIdAsync(addSectionDto.Id, includeParticipations);
-        }
+    public async Task<AppointmentDto> AddSectionAsync(AppointmentAddSectionDto addSectionDto,
+        bool includeParticipations)
+    {
+        AddSectionToAppointment.Command command =
+            _mapper.Map<AddSectionToAppointment.Command>(addSectionDto);
+        await _mediator.Send(command);
+        return await GetByIdAsync(addSectionDto.Id, includeParticipations);
+    }
 
-        public async Task AddRoomAsync(AppointmentAddRoomDto addRoomDto)
-        {
-            AddRoomToAppointment.Command command = _mapper.Map<AddRoomToAppointment.Command>(addRoomDto);
-            await _mediator.Send(command);
-        }
+    public async Task AddRoomAsync(AppointmentAddRoomDto addRoomDto)
+    {
+        AddRoomToAppointment.Command
+            command = _mapper.Map<AddRoomToAppointment.Command>(addRoomDto);
+        await _mediator.Send(command);
+    }
 
-        public async Task<IEnumerable<AppointmentListDto>> GetAsync(DateTime? date, DateRange range)
+    public async Task<IEnumerable<AppointmentListDto>> GetAsync(DateTime? date, DateRange? range)
+    {
+        if (range.HasValue)
         {
             date ??= DateTime.Today;
+            DateTime rangeStartTime = DateHelper.GetStartTime(date.Value, range.Value);
+            DateTime rangeEndTime = DateHelper.GetEndTime(date.Value, range.Value);
 
-            DateTime rangeStartTime = DateHelper.GetStartTime(date.Value, range);
-            DateTime rangeEndTime = DateHelper.GetEndTime(date.Value, range);
+            IQueryable<Appointment> entities = await _mediator.Send(new List.Query<Appointment>(
+                a => (a.EndTime <= rangeEndTime && a.EndTime >= rangeStartTime) ||
+                     (a.EndTime > rangeEndTime && a.StartTime <= rangeEndTime),
+                asSplitQuery: true));
 
+            return _mapper.ProjectTo<AppointmentListDto>(entities);
+        }
+        else
+        {
             IQueryable<Appointment> entities = await _mediator.Send(new List.Query<Appointment>(
-                predicate: a =>
-                    (a.EndTime <= rangeEndTime && a.EndTime >= rangeStartTime)
-                    || (a.EndTime > rangeEndTime && a.StartTime <= rangeEndTime),
                 asSplitQuery: true));
 
-            return [.. _mapper.ProjectTo<AppointmentListDto>(entities)];
+            return _mapper.ProjectTo<AppointmentListDto>(entities);
         }
+    }
 
-        public async Task<AppointmentDto> GetByIdAsync(Guid id, bool includeParticipations)
+    public async Task<AppointmentDto> GetByIdAsync(Guid id, bool includeParticipations)
+    {
+        Appointment appointment = await _mediator.Send(new Details.Query<Appointment>(id));
+        AppointmentDto dto = _mapper.Map<AppointmentDto>(appointment);
+        if (includeParticipations)
         {
-            Appointment appointment = await _mediator.Send(new Details.Query<Appointment>(id));
-            AppointmentDto dto = _mapper.Map<AppointmentDto>(appointment);
-            if (includeParticipations)
-            {
-                var treeQuery = new ListFlattenedSectionTree.Query();
-                IEnumerable<ITree<Section>> flattenedTree = await _mediator.Send(treeQuery);
-                await AddParticipationsAsync(dto, appointment, flattenedTree);
-            }
-            return dto;
+            var treeQuery = new ListFlattenedSectionTree.Query();
+            IEnumerable<ITree<Section>> flattenedTree = await _mediator.Send(treeQuery);
+            await AddParticipationsAsync(dto, appointment, flattenedTree);
         }
 
-        private async Task AddParticipationsAsync(
-            AppointmentDto dto,
-            Appointment appointment,
-            IEnumerable<ITree<Section>> flattenedTree)
-        {
-            var query = new ListParticipationsForAppointment.Query
-            {
-                Appointment = appointment,
-                SectionTree = flattenedTree,
-            };
+        return dto;
+    }
 
-            IEnumerable<ListParticipationsForAppointment.PersonGrouping> personGrouping = await _mediator.Send(query);
+    public async Task<AppointmentDto> RemoveProjectAsync(
+        AppointmentRemoveProjectDto removeProjectDto, bool includeParticipations)
+    {
+        RemoveProjectFromAppointment.Command command =
+            _mapper.Map<RemoveProjectFromAppointment.Command>(removeProjectDto);
+        await _mediator.Send(command);
+        return await GetByIdAsync(removeProjectDto.Id, includeParticipations);
+    }
 
-            dto.Participations = _mapper.Map<IList<AppointmentParticipationListItemDto>>(personGrouping);
-        }
+    public async Task<AppointmentDto> RemoveSectionAsync(
+        AppointmentRemoveSectionDto removeSectionDto, bool includeParticipations)
+    {
+        RemoveSectionFromAppointment.Command command =
+            _mapper.Map<RemoveSectionFromAppointment.Command>(removeSectionDto);
+        await _mediator.Send(command);
+        return await GetByIdAsync(removeSectionDto.Id, includeParticipations);
+    }
 
-        public async Task<AppointmentDto> RemoveProjectAsync(AppointmentRemoveProjectDto removeProjectDto, bool includeParticipations)
-        {
-            RemoveProjectFromAppointment.Command command = _mapper.Map<RemoveProjectFromAppointment.Command>(removeProjectDto);
-            await _mediator.Send(command);
-            return await GetByIdAsync(removeProjectDto.Id, includeParticipations);
-        }
+    public async Task RemoveRoomAsync(AppointmentRemoveRoomDto removeRoomDto)
+    {
+        RemoveRoomFromAppointment.Command command =
+            _mapper.Map<RemoveRoomFromAppointment.Command>(removeRoomDto);
+        await _mediator.Send(command);
+    }
 
-        public async Task<AppointmentDto> RemoveSectionAsync(AppointmentRemoveSectionDto removeSectionDto, bool includeParticipations)
-        {
-            RemoveSectionFromAppointment.Command command = _mapper.Map<RemoveSectionFromAppointment.Command>(removeSectionDto);
-            await _mediator.Send(command);
-            return await GetByIdAsync(removeSectionDto.Id, includeParticipations);
-        }
+    public async Task<AppointmentDto> SetDatesAsync(AppointmentSetDatesDto setDatesDto)
+    {
+        SetDates.Command command = _mapper.Map<SetDates.Command>(setDatesDto);
+        Appointment appointment = await _mediator.Send(command);
+        AppointmentDto dto = _mapper.Map<AppointmentDto>(appointment);
+        var treeQuery = new ListFlattenedSectionTree.Query();
+        IEnumerable<ITree<Section>> flattenedTree = await _mediator.Send(treeQuery);
+        await AddParticipationsAsync(dto, appointment, flattenedTree);
+        return dto;
+    }
 
-        public async Task RemoveRoomAsync(AppointmentRemoveRoomDto removeRoomDto)
-        {
-            RemoveRoomFromAppointment.Command command = _mapper.Map<RemoveRoomFromAppointment.Command>(removeRoomDto);
-            await _mediator.Send(command);
-        }
+    public async Task SetVenueAsync(AppointmentSetVenueDto setVenueDto)
+    {
+        SetVenue.Command command = _mapper.Map<SetVenue.Command>(setVenueDto);
+        await _mediator.Send(command);
+    }
 
-        public async Task<AppointmentDto> SetDatesAsync(AppointmentSetDatesDto setDatesDto)
-        {
-            SetDates.Command command = _mapper.Map<SetDates.Command>(setDatesDto);
-            Appointment appointment = await _mediator.Send(command);
-            AppointmentDto dto = _mapper.Map<AppointmentDto>(appointment);
-            var treeQuery = new ListFlattenedSectionTree.Query();
-            IEnumerable<ITree<Section>> flattenedTree = await _mediator.Send(treeQuery);
-            await AddParticipationsAsync(dto, appointment, flattenedTree);
-            return dto;
-        }
+    public async Task SetParticipationResultAsync(
+        AppointmentParticipationSetResultDto setParticipationResult)
+    {
+        SetAppointmentParticipationResult.Command command =
+            _mapper.Map<SetAppointmentParticipationResult.Command>(setParticipationResult);
+        await _mediator.Send(command);
+    }
 
-        public async Task SetVenueAsync(AppointmentSetVenueDto setVenueDto)
-        {
-            SetVenue.Command command = _mapper.Map<SetVenue.Command>(setVenueDto);
-            await _mediator.Send(command);
-        }
+    public async Task SetParticipationPredictionAsync(
+        AppointmentParticipationSetPredictionDto setParticipationPrediction)
+    {
+        SetAppointmentParticipationPrediction.Command command =
+            _mapper.Map<SetAppointmentParticipationPrediction.Command>(setParticipationPrediction);
+        await _mediator.Send(command);
+    }
 
-        public async Task SetParticipationResultAsync(AppointmentParticipationSetResultDto setParticipationResult)
-        {
-            SetAppointmentParticipationResult.Command command = _mapper.Map<SetAppointmentParticipationResult.Command>(setParticipationResult);
-            await _mediator.Send(command);
-        }
+    public async Task SendAppointmentChangedNotificationAsync(
+        SendAppointmentChangedNotificationDto sendAppointmentChangedNotificationDto)
+    {
+        SendAppointmentChangedNotification.Command command =
+            _mapper.Map<SendAppointmentChangedNotification.Command>(
+                sendAppointmentChangedNotificationDto);
+        await _mediator.Send(command);
+    }
 
-        public async Task SetParticipationPredictionAsync(AppointmentParticipationSetPredictionDto setParticipationPrediction)
+    private async Task AddParticipationsAsync(
+        AppointmentDto dto,
+        Appointment appointment,
+        IEnumerable<ITree<Section>> flattenedTree)
+    {
+        var query = new ListParticipationsForAppointment.Query
         {
-            SetAppointmentParticipationPrediction.Command command = _mapper.Map<SetAppointmentParticipationPrediction.Command>(setParticipationPrediction);
-            await _mediator.Send(command);
-        }
+            Appointment = appointment, SectionTree = flattenedTree
+        };
 
-        public async Task SendAppointmentChangedNotificationAsync(SendAppointmentChangedNotificationDto sendAppointmentChangedNotificationDto)
-        {
-            SendAppointmentChangedNotification.Command command = _mapper.Map<SendAppointmentChangedNotification.Command>(sendAppointmentChangedNotificationDto);
-            await _mediator.Send(command);
-        }
+        IEnumerable<ListParticipationsForAppointment.PersonGrouping> personGrouping =
+            await _mediator.Send(query);
+
+        dto.Participations =
+            _mapper.Map<IList<AppointmentParticipationListItemDto>>(personGrouping);
+    }
+
+    public async Task<string> ExportAppointmentsToIcsAsync()
+    {
+        var command = new ExportAppointmentsToIcs.Command();
+        return await _mediator.Send(command);
     }
 }

Orso.Arpa.Application/Orso.Arpa.Application.csproj

@@ -9,4 +9,5 @@
     <ProjectReference Include="..\Orso.Arpa.Infrastructure\Orso.Arpa.Infrastructure.csproj" />
     <ProjectReference Include="..\Orso.Arpa.Persistence\Orso.Arpa.Persistence.csproj" />
   </ItemGroup>
-</Project>
+
+</Project>