fixed sonar issues (#938)

orso-co · May 17, 2024 · a5ed210 · a5ed210
1 parent d3c7456
commit a5ed210
Show file tree

Hide file tree

Showing 23 changed files with 90 additions and 64 deletions.
diff --git a/.sonarlint/Orso.Arpa.Api.json b/.sonarlint/Orso.Arpa.Api.json
@@ -0,0 +1,4 @@
+{
+    "sonarCloudOrganization": "orso-co",
+    "projectKey": "orso-co_Orso.Arpa.Api"
+}
diff --git a/Orso.Arpa.Api/Program.cs b/Orso.Arpa.Api/Program.cs
@@ -6,6 +6,7 @@
 using NLog.Web;
 using Orso.Arpa.Api.Middleware;
 using Orso.Arpa.Api.ModelBinding;
+using Orso.Arpa.Domain._General.Errors;
 using LogLevel = Microsoft.Extensions.Logging.LogLevel;
 
 namespace Orso.Arpa.Api
@@ -28,7 +29,7 @@ public static void Main(string[] args)
             catch (Exception exception)
             {
                 logger.Error(exception, "Stopped program because of exception");
-                throw;
+                throw new SystemStartException("Stopped program because of exception", exception);
             }
             finally
             {

diff --git a/Orso.Arpa.Api/Startup.cs b/Orso.Arpa.Api/Startup.cs
@@ -92,6 +92,7 @@
 using Orso.Arpa.Application.UserApplication.Services;
 using Orso.Arpa.Application.VenueApplication.Interfaces;
 using Orso.Arpa.Application.VenueApplication.Services;
+using Orso.Arpa.Domain._General.Errors;
 using Orso.Arpa.Domain.AuditLogDomain.Model;
 using Orso.Arpa.Domain.General.Configuration;
 using Orso.Arpa.Domain.General.Interfaces;
@@ -626,7 +627,7 @@ protected virtual void EnsureDatabaseMigrations(IApplicationBuilder app)
             {
                 ILogger<Startup> logger = services.GetRequiredService<ILogger<Startup>>();
                 logger.LogError(ex, "An error occured during database migration");
-                throw;
+                throw new SystemStartException("An error occured during database migration", ex);
             }
         }
 
@@ -642,8 +643,8 @@ protected void PreloadTranslationsFromDb(IApplicationBuilder app)
             catch (Exception ex)
             {
                 ILogger<Startup> logger = services.GetRequiredService<ILogger<Startup>>();
-                logger.LogError(ex, "Error during localization of data");
-                throw;
+                logger.LogError(ex, "Error during preload of localization data from database");
+                throw new SystemStartException("Error during preload of localization data from database", ex);
             }
         }
     }

diff --git a/Orso.Arpa.Api/Swagger/SwaggerAuthorizeOperationFilter.cs b/Orso.Arpa.Api/Swagger/SwaggerAuthorizeOperationFilter.cs
@@ -31,14 +31,7 @@ private static void HandleRoleAttributes(OpenApiOperation operation, IEnumerable
                 operation.Responses.Add("403 a", new OpenApiResponse
                 {
                     Description = $"If current user does not have the role of '{string.Join(", ", roleAttributes)}'",
-                    Content = new Dictionary<string, OpenApiMediaType>()
-                    {
-                        { "application/json", new OpenApiMediaType() { Schema = new OpenApiSchema() { Type = "object", Properties = new Dictionary<string, OpenApiSchema>() {
-                            { "title", new OpenApiSchema() { Type = "string" } },
-                            { "description", new OpenApiSchema() {Type="string" } },
-                            { "status", new OpenApiSchema() { Type = "integer" } }
-                        } } } }
-                    }
+                    Content = CreateContent()
                 });
             }
         }
@@ -55,16 +48,21 @@ private static void HandlePolicyAttributes(OpenApiOperation operation, IEnumerab
                 operation.Responses.Add("403 b", new OpenApiResponse
                 {
                     Description = $"If current user does not meet policy '{string.Join(", ", policyAttributes)}'",
-                    Content = new Dictionary<string, OpenApiMediaType>()
+                    Content = CreateContent()
+                });
+            }
+        }
+
+        private static Dictionary<string, OpenApiMediaType> CreateContent()
+        {
+            return new Dictionary<string, OpenApiMediaType>()
                     {
                         { "application/json", new OpenApiMediaType() { Schema = new OpenApiSchema() { Type = "object", Properties = new Dictionary<string, OpenApiSchema>() {
                             { "title", new OpenApiSchema() { Type = "string" } },
                             { "description", new OpenApiSchema() {Type="string" } },
                             { "status", new OpenApiSchema() { Type = "integer" } }
                         } } } }
-                    }
-                });
-            }
+                    };
         }
     }
 }
diff --git a/Orso.Arpa.Domain/AppointmentDomain/Commands/AddProjectToAppointment.cs b/Orso.Arpa.Domain/AppointmentDomain/Commands/AddProjectToAppointment.cs
@@ -70,10 +70,10 @@ public Handler(
 
             public async Task<Unit> Handle(Command request, CancellationToken cancellationToken)
             {
-                Appointment existingAppointment = await _arpaContext.Appointments.FindAsync(new object[] { request.Id }, cancellationToken);
-                Project existingProject = await _arpaContext.Projects.FindAsync(new object[] { request.ProjectId }, cancellationToken);
+                Appointment existingAppointment = await _arpaContext.Appointments.FindAsync([request.Id], cancellationToken);
+                Project existingProject = await _arpaContext.Projects.FindAsync([request.ProjectId], cancellationToken);
 
-                _arpaContext.ProjectAppointments.Add(new ProjectAppointment(null, existingProject, existingAppointment));
+                await _arpaContext.ProjectAppointments.AddAsync(new ProjectAppointment(null, existingProject, existingAppointment), cancellationToken);
 
                 if (await _arpaContext.SaveChangesAsync(cancellationToken) > 0)
                 {

diff --git a/Orso.Arpa.Domain/AppointmentDomain/Commands/AddRoomToAppointment.cs b/Orso.Arpa.Domain/AppointmentDomain/Commands/AddRoomToAppointment.cs
@@ -70,12 +70,12 @@ public Handler(
 
             public async Task<Unit> Handle(Command request, CancellationToken cancellationToken)
             {
-                Appointment existingAppointment = await _arpaContext.Appointments.FindAsync(new object[] { request.Id }, cancellationToken);
-                Room existingRoom = await _arpaContext.Rooms.FindAsync(new object[] { request.RoomId }, cancellationToken);
+                Appointment existingAppointment = await _arpaContext.Appointments.FindAsync([request.Id], cancellationToken);
+                Room existingRoom = await _arpaContext.Rooms.FindAsync([request.RoomId], cancellationToken);
 
                 var appointmentRoom = new AppointmentRoom(null, existingAppointment, existingRoom);
 
-                _arpaContext.AppointmentRooms.Add(appointmentRoom);
+                await _arpaContext.AppointmentRooms.AddAsync(appointmentRoom, cancellationToken);
 
                 if (await _arpaContext.SaveChangesAsync(cancellationToken) > 0)
                 {

diff --git a/Orso.Arpa.Domain/AppointmentDomain/Commands/AddSectionToAppointment.cs b/Orso.Arpa.Domain/AppointmentDomain/Commands/AddSectionToAppointment.cs
@@ -51,8 +51,8 @@ public Validator(IArpaContext arpaContext)
                 RuleFor(d => d.SectionId)
                     .EntityExists<Command, Section>(arpaContext)
 
-                    .MustAsync(async (dto, sectionId, cancellation) => !(await arpaContext.SectionAppointments
-                        .AnyAsync(sa => sa.SectionId == sectionId && sa.AppointmentId == dto.Id, cancellation)))
+                    .MustAsync(async (dto, sectionId, cancellation) => !await arpaContext.SectionAppointments
+                        .AnyAsync(sa => sa.SectionId == sectionId && sa.AppointmentId == dto.Id, cancellation))
                     .WithMessage("The section is already linked to the appointment");
             }
         }
@@ -68,10 +68,10 @@ public Handler(
 
             public async Task<Unit> Handle(Command request, CancellationToken cancellationToken)
             {
-                Appointment existingAppointment = await _arpaContext.Appointments.FindAsync(new object[] { request.Id }, cancellationToken);
-                Section existingSection = await _arpaContext.Sections.FindAsync(new object[] { request.SectionId }, cancellationToken);
+                Appointment existingAppointment = await _arpaContext.Appointments.FindAsync([request.Id], cancellationToken);
+                Section existingSection = await _arpaContext.Sections.FindAsync([request.SectionId], cancellationToken);
 
-                _arpaContext.SectionAppointments.Add(new SectionAppointment(null, existingSection, existingAppointment));
+                await _arpaContext.SectionAppointments.AddAsync(new SectionAppointment(null, existingSection, existingAppointment), cancellationToken);
 
                 if (await _arpaContext.SaveChangesAsync(cancellationToken) > 0)
                 {

diff --git a/Orso.Arpa.Domain/AppointmentDomain/Commands/SendAppointmentChangedNotification.cs b/Orso.Arpa.Domain/AppointmentDomain/Commands/SendAppointmentChangedNotification.cs
@@ -81,7 +81,8 @@ public async Task<Unit> Handle(Command request, CancellationToken cancellationTo
                     .Select(a => a.Id)
                     .ToListAsync(cancellationToken);
 
-                if(personIds.Count == 0) {
+                if (personIds.Count == 0)
+                {
                     throw new ValidationException([new ValidationFailure(nameof(request.AppointmentId), "No persons are eligible for this appointment. Cannot send email to empty recipient list.")]);
                 }
 
@@ -101,8 +102,8 @@ public async Task<Unit> Handle(Command request, CancellationToken cancellationTo
                     ClubPhoneNumber = _clubConfiguration.Phone,
                     AppointmentName = appointment.ToString(),
                     DateAndTime = $"{appointment.StartTime.ToGermanDateTimeString()} - {appointment.EndTime.ToGermanTimeString()}",
-                    PublicDetails = appointment.PublicDetails ?? "- ohne -",
-                    Venue = appointment.Venue?.ToString() ?? "- ohne -",
+                    PublicDetails = appointment.PublicDetails,
+                    Venue = appointment.Venue?.ToString(),
                     ArpaUrl = _jwtConfiguration.Audience,
                     Status = appointment.Status.ToString(),
                     Sections = string.Join(", ", appointment.SectionAppointments.Select(sa => sa.Section.ToString()))

diff --git a/....Arpa.Domain/AppointmentDomain/Queries/ListAppointmentParticipationsForMusicianProfile.cs b/....Arpa.Domain/AppointmentDomain/Queries/ListAppointmentParticipationsForMusicianProfile.cs
@@ -47,26 +47,27 @@ public Handler(IArpaContext arpaContext)
 
             public async Task<IEnumerable<AppointmentParticipation>> Handle(Query request, CancellationToken cancellationToken)
             {
-                Guid personId = (await _arpaContext.FindAsync<MusicianProfile>(new object[] { request.MusicianProfileId }, cancellationToken)).PersonId;
+                Guid personId = (await _arpaContext.FindAsync<MusicianProfile>([request.MusicianProfileId], cancellationToken)).PersonId;
 
                 IQueryable<AppointmentParticipation> appointmentParticipations = _arpaContext.AppointmentParticipations
                     .Where(ap => ap.PersonId.Equals(personId));
 
-                if (appointmentParticipations.Any() && request.StartTime.HasValue)
+                if (await appointmentParticipations.AnyAsync(cancellationToken) && request.StartTime.HasValue)
                 {
                     var normalizedTime = new DateTime(request.StartTime.Value.Ticks, DateTimeKind.Unspecified);
                     appointmentParticipations = appointmentParticipations.Where(ap => ap.Appointment.StartTime.Equals(normalizedTime));
                 }
 
-                if (appointmentParticipations.Any() && request.EndTime.HasValue)
+                if (await appointmentParticipations.AnyAsync(cancellationToken) && request.EndTime.HasValue)
                 {
                     var normalizedTime = new DateTime(request.EndTime.Value.Ticks, DateTimeKind.Unspecified);
                     appointmentParticipations = appointmentParticipations.Where(ap => ap.Appointment.EndTime.Equals(normalizedTime));
                 }
 
-                if (appointmentParticipations.Any() && request.ProjectId.HasValue)
+                if (await appointmentParticipations.AnyAsync(cancellationToken) && request.ProjectId.HasValue)
                 {
-                    appointmentParticipations = appointmentParticipations.Where(ap => ap.Appointment.ProjectAppointments.Any(pa => pa.ProjectId.Equals(request.ProjectId)));
+                    appointmentParticipations = appointmentParticipations.Where(ap =>
+                        ap.Appointment.ProjectAppointments.Any(pa => pa.ProjectId.Equals(request.ProjectId)));
                 }
 
                 return await appointmentParticipations.ToListAsync(cancellationToken);

diff --git a/Orso.Arpa.Domain/AppointmentDomain/Queries/ListMyAppointments.cs b/Orso.Arpa.Domain/AppointmentDomain/Queries/ListMyAppointments.cs
@@ -58,7 +58,10 @@ public Handler(IArpaContext arpaContext, IDateTimeProvider dateTimeProvider)
                         .Where(appointment => appointmentIds.Contains(appointment.Id) && appointment.EndTime > _dateTimeProvider.GetUtcNow())
                         .OrderBy(p => p.StartTime);
 
-                return (await userAppointments.Skip(request.Offset ?? 0).Take(request.Limit ?? count).ToListAsync(cancellationToken), userAppointments.Count());
+                return (
+                    await userAppointments.Skip(request.Offset ?? 0).Take(request.Limit ?? count).ToListAsync(cancellationToken),
+                    await userAppointments.CountAsync(cancellationToken)
+                );
             }
         }
     }

diff --git a/Orso.Arpa.Domain/MusicianProfileDomain/Commands/AddDocumentToMyMusicianProfile.cs b/Orso.Arpa.Domain/MusicianProfileDomain/Commands/AddDocumentToMyMusicianProfile.cs
@@ -49,7 +49,7 @@ public async Task<Unit> Handle(Command request, CancellationToken cancellationTo
             {
                 var availableDocument = new MusicianProfileDocument(request.Id, request.DocumentId);
 
-                _arpaContext.MusicianProfileDocuments.Add(availableDocument);
+                await _arpaContext.MusicianProfileDocuments.AddAsync(availableDocument, cancellationToken);
 
                 if (await _arpaContext.SaveChangesAsync(cancellationToken) > 0)
                 {

diff --git a/Orso.Arpa.Domain/PersonDomain/Commands/AddStakeholderGroupToPerson.cs b/Orso.Arpa.Domain/PersonDomain/Commands/AddStakeholderGroupToPerson.cs
@@ -59,12 +59,12 @@ public Handler(
 
             public async Task<Unit> Handle(Command request, CancellationToken cancellationToken)
             {
-                Person existingPerson = await _arpaContext.Persons.FindAsync(new object[] { request.Id }, cancellationToken);
-                Section existingSection = await _arpaContext.Sections.FindAsync(new object[] { request.StakeholderGroupId }, cancellationToken);
+                Person existingPerson = await _arpaContext.Persons.FindAsync([request.Id], cancellationToken);
+                Section existingSection = await _arpaContext.Sections.FindAsync([request.StakeholderGroupId], cancellationToken);
 
                 var personSection = new PersonSection(null, existingPerson, existingSection);
 
-                _ = _arpaContext.Set<PersonSection>().Add(personSection);
+                _ = await _arpaContext.Set<PersonSection>().AddAsync(personSection, cancellationToken);
 
                 return await _arpaContext.SaveChangesAsync(cancellationToken) > 0
                     ? Unit.Value

diff --git a/Orso.Arpa.Domain/ProjectDomain/Commands/AddRoleToUrl.cs b/Orso.Arpa.Domain/ProjectDomain/Commands/AddRoleToUrl.cs
@@ -56,7 +56,7 @@ public Validator(IArpaContext arpaContext, RoleManager<Role> roleManager)
                     .WithErrorCode("404")
                     .WithMessage("Role could not be found.")
 
-                    .MustAsync(async (dto, roleId, cancellation) => !(await arpaContext.EntityExistsAsync<UrlRole>(ar => ar.RoleId == roleId && ar.UrlId == dto.UrlId, cancellation)))
+                    .MustAsync(async (dto, roleId, cancellation) => !await arpaContext.EntityExistsAsync<UrlRole>(ar => ar.RoleId == roleId && ar.UrlId == dto.UrlId, cancellation))
                     .WithMessage("The role is already linked to the url")
 
                     .MustAsync(async (roleId, cancellation) => !await roleManager.Roles.AnyAsync(r => r.Id == roleId && r.Name == RoleNames.Admin, cancellation))
@@ -79,12 +79,12 @@ public Handler(
 
             public async Task<Unit> Handle(Command request, CancellationToken cancellationToken)
             {
-                Url existingUrl = await _arpaContext.Urls.FindAsync(new object[] { request.UrlId }, cancellationToken);
+                Url existingUrl = await _arpaContext.Urls.FindAsync([request.UrlId], cancellationToken);
                 Role existingRole = await _roleManager.Roles.SingleAsync(r => r.Id == request.RoleId, cancellationToken);
 
                 var urlRole = new UrlRole(null, existingUrl, existingRole);
 
-                _arpaContext.UrlRoles.Add(urlRole);
+                await _arpaContext.UrlRoles.AddAsync(urlRole, cancellationToken);
 
                 if (await _arpaContext.SaveChangesAsync(cancellationToken) > 0)
                 {

diff --git a/Orso.Arpa.Domain/ProjectDomain/Notifications/ProjectParticipationChangedNotification.cs b/Orso.Arpa.Domain/ProjectDomain/Notifications/ProjectParticipationChangedNotification.cs
@@ -88,13 +88,13 @@ public async Task Handle(ProjectParticipationChangedNotification notification, C
             var template = new ProjectParticipationChangedByStaffTemplate
             {
                 ArpaLogo = _jwtConfiguration.ArpaLogo,
-                CommentByStaff = notification.ProjectParticipation.CommentByStaffInner ?? "- ohne -",
-                Comment = notification.ProjectParticipation.CommentByPerformerInner ?? "- ohne -",
+                CommentByStaff = notification.ProjectParticipation.CommentByStaffInner,
+                Comment = notification.ProjectParticipation.CommentByPerformerInner,
                 DisplayName = musician.DisplayName,
-                ParticipationStatusInner = notification.ProjectParticipation.ParticipationStatusInner?.ToString() ?? "- ohne -",
-                ParticipationStatusInternal = notification.ProjectParticipation.ParticipationStatusInternal?.ToString() ?? "- ohne -",
+                ParticipationStatusInner = notification.ProjectParticipation.ParticipationStatusInner?.ToString(),
+                ParticipationStatusInternal = notification.ProjectParticipation.ParticipationStatusInternal?.ToString(),
 
-                InvitationStatus = notification.ProjectParticipation?.InvitationStatus?.ToString() ?? "- ohne -",
+                InvitationStatus = notification.ProjectParticipation?.InvitationStatus?.ToString(),
                 ProjectName = notification.ProjectParticipation.Project.ToString(),
 
                 ClubAddress = _clubConfiguration.Address,

diff --git a/Orso.Arpa.Domain/UserDomain/Commands/RegisterUser.cs b/Orso.Arpa.Domain/UserDomain/Commands/RegisterUser.cs
@@ -101,7 +101,7 @@ public async Task<Unit> Handle(Command request, CancellationToken cancellationTo
                         break;
                     default:
                         throw new ValidationException(
-                            new ValidationFailure[] { new(nameof(Command.Email), "Multiple persons found with this email address. Registration aborted. Please contact your system admin.") });
+                            [new(nameof(Command.Email), "Multiple persons found with this email address. Registration aborted. Please contact your system admin.")]);
                 }
 
                 var user = new User
@@ -119,13 +119,13 @@ public async Task<Unit> Handle(Command request, CancellationToken cancellationTo
                     throw new IdentityException("Problem creating user", result.Errors);
                 }
 
-                _arpaContext.Set<PersonSection>().AddRange(request.StakeholderGroupIds.Select(sg => new PersonSection(null, person.Id, sg)));
-                _ = _arpaContext.Set<ContactDetail>().Add(new ContactDetail(null, new CreateContactDetail.Command
+                await _arpaContext.Set<PersonSection>().AddRangeAsync(request.StakeholderGroupIds.Select(sg => new PersonSection(null, person.Id, sg)), cancellationToken);
+                _ = await _arpaContext.Set<ContactDetail>().AddAsync(new ContactDetail(null, new CreateContactDetail.Command
                 {
                     Key = ContactDetailKey.EMail,
                     PersonId = person.Id,
                     Value = request.Email,
-                }));
+                }), cancellationToken);
 
                 return (await _arpaContext.SaveChangesAsync(cancellationToken)) < request.StakeholderGroupIds.Count + 1
                     ? throw new AffectedRowCountMismatchException(nameof(PersonSection))