Merge pull request #57 from Informatievlaanderen/feat/cleanup_20221014

refactor: cleanup

src/AssociationRegistry.Acm.Api/Infrastructure/Modules/ApiModule.cs

@@ -3,9 +3,7 @@ namespace AssociationRegistry.Acm.Api.Infrastructure.Modules;
 using Autofac;
 using Autofac.Extensions.DependencyInjection;
 using Be.Vlaanderen.Basisregisters.Api.Exceptions;
-using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
 
 public class ApiModule : Module
 {

src/AssociationRegistry.Admin.Api/Infrastructure/Modules/ApiModule.cs

@@ -3,9 +3,7 @@ namespace AssociationRegistry.Admin.Api.Infrastructure.Modules;
 using Autofac;
 using Autofac.Extensions.DependencyInjection;
 using Be.Vlaanderen.Basisregisters.Api.Exceptions;
-using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
 
 public class ApiModule : Module
 {

src/AssociationRegistry.Public.Api/Caches/VerenigingenRepository.cs

@@ -1,13 +1,13 @@
-using System.Collections.Immutable;
+namespace AssociationRegistry.Public.Api.Caches;
+
+using System.Collections.Immutable;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
-using AssociationRegistry.Public.Api.S3;
-using AssociationRegistry.Public.Api.SearchVerenigingen;
 using Be.Vlaanderen.Basisregisters.BlobStore;
 using Newtonsoft.Json;
-
-namespace AssociationRegistry.Public.Api.Caches;
+using S3;
+using SearchVerenigingen;
 
 public interface IVerenigingenRepository
 {

src/AssociationRegistry.Public.Api/Contexts/ContextenController.cs

@@ -2,6 +2,7 @@ namespace AssociationRegistry.Public.Api.Contexts;
 
 using Be.Vlaanderen.Basisregisters.Api;
 using Constants;
+using json_ld_contexts;
 using Microsoft.AspNetCore.Mvc;
 
 [ApiVersion("1.0")]
@@ -14,6 +15,6 @@ public class ContextenController : ApiController
     [ApiExplorerSettings(IgnoreApi = true)]
     public IActionResult Detail([FromRoute] string name)
         => Content(
-            json_ld_contexts.JsonLdContexts.GetContext(name),
+            JsonLdContexts.GetContext(name),
             WellknownMediaTypes.Json);
 }

src/AssociationRegistry.Public.Api/DetailVerenigingen/DetailVerenigingenController.cs

@@ -1,13 +1,12 @@
 namespace AssociationRegistry.Public.Api.DetailVerenigingen;
 
 using System.Threading.Tasks;
-using ListVerenigingen;
 using Be.Vlaanderen.Basisregisters.Api;
 using Be.Vlaanderen.Basisregisters.Api.Exceptions;
 using Constants;
+using ListVerenigingen;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Options;
 using Swashbuckle.AspNetCore.Filters;
 
 [ApiVersion("1.0")]

src/AssociationRegistry.Public.Api/DetailVerenigingen/DetailVerenigingenResponse.cs

@@ -3,8 +3,6 @@
 using System;
 using System.Collections.Immutable;
 using System.Runtime.Serialization;
-using Infrastructure.Json;
-using Newtonsoft.Json;
 
 [DataContract]
 public record DetailVerenigingResponse(

src/AssociationRegistry.Public.Api/Extensions/ServiceCollectionExtensions.cs

@@ -4,14 +4,12 @@
 using Amazon;
 using Amazon.Runtime;
 using Amazon.S3;
-using Caches;
-using S3;
 using Be.Vlaanderen.Basisregisters.BlobStore.Aws;
+using Caches;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using json_ld_contexts;
-using IVerenigingenRepository = Caches.IVerenigingenRepository;
+using S3;
 
 public static class ServiceCollectionExtensions
 {

src/AssociationRegistry.Public.Api/InMemoryVerenigingenRepository.cs

@@ -1,11 +1,11 @@
 namespace AssociationRegistry.Public.Api;
 
 using System;
+using System.Collections.Immutable;
 using System.Linq;
+using System.Threading.Tasks;
 using DetailVerenigingen;
 using ListVerenigingen;
-using System.Collections.Immutable;
-using System.Threading.Tasks;
 
 public class InMemoryVerenigingenRepository : IVerenigingenRepository
 {

src/AssociationRegistry.Public.Api/Infrastructure/Json/DateOnlyJsonConvertor.cs

@@ -3,7 +3,6 @@ namespace AssociationRegistry.Public.Api.Infrastructure.Json;
 using System;
 using System.Globalization;
 using Newtonsoft.Json;
-using JsonSerializer = Newtonsoft.Json.JsonSerializer;
 
 public class DateOnlyJsonConvertor : JsonConverter<DateOnly>
 {

src/AssociationRegistry.Public.Api/Infrastructure/Json/NullableDateOnlyJsonConvertor.cs

@@ -3,7 +3,6 @@ namespace AssociationRegistry.Public.Api.Infrastructure.Json;
 using System;
 using System.Globalization;
 using Newtonsoft.Json;
-using JsonSerializer = Newtonsoft.Json.JsonSerializer;
 
 public class NullableDateOnlyJsonConvertor : JsonConverter<DateOnly?>
 {

src/AssociationRegistry.Public.Api/ListVerenigingen/IVerenigingenRepository.cs

@@ -1,8 +1,8 @@
-using System.Collections.Immutable;
-using System.Threading.Tasks;
-using AssociationRegistry.Public.Api.DetailVerenigingen;
+namespace AssociationRegistry.Public.Api.ListVerenigingen;
 
-namespace AssociationRegistry.Public.Api.ListVerenigingen;
+using System.Collections.Immutable;
+using System.Threading.Tasks;
+using DetailVerenigingen;
 
 public interface IVerenigingenRepository
 {

src/AssociationRegistry.Public.Api/ListVerenigingen/ListVerenigingenController.cs

@@ -1,17 +1,16 @@
+namespace AssociationRegistry.Public.Api.ListVerenigingen;
+
+using System;
 using System.Collections.Immutable;
 using System.Linq;
 using System.Threading.Tasks;
 using Be.Vlaanderen.Basisregisters.Api;
 using Be.Vlaanderen.Basisregisters.Api.Exceptions;
+using Be.Vlaanderen.Basisregisters.Api.Search.Pagination;
+using Constants;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Swashbuckle.AspNetCore.Filters;
-using System;
-using Be.Vlaanderen.Basisregisters.Api.Search.Pagination;
-
-namespace AssociationRegistry.Public.Api.ListVerenigingen;
-
-using Constants;
 
 [ApiVersion("1.0")]
 [AdvertiseApiVersions("1.0")]

src/AssociationRegistry.Public.Api/ListVerenigingen/ListVerenigingenResponse.cs

@@ -1,8 +1,8 @@
 namespace AssociationRegistry.Public.Api.ListVerenigingen;
 
+using System;
 using System.Collections.Immutable;
 using System.Runtime.Serialization;
-using System;
 
 [DataContract]
 public record ListVerenigingenResponse(

src/AssociationRegistry.Public.Api/ListVerenigingen/ListVerenigingenResponseExamples.cs

@@ -1,9 +1,8 @@
-using Swashbuckle.AspNetCore.Filters;
-
-namespace AssociationRegistry.Public.Api.ListVerenigingen;
+namespace AssociationRegistry.Public.Api.ListVerenigingen;
 
 using System;
 using System.Collections.Immutable;
+using Swashbuckle.AspNetCore.Filters;
 
 public class ListVerenigingenResponseExamples : IExamplesProvider<ListVerenigingenResponse>
 {

src/AssociationRegistry.Public.Api/Program.cs

@@ -1,8 +1,8 @@
+namespace AssociationRegistry.Public.Api;
+
 using Be.Vlaanderen.Basisregisters.Api;
 using Microsoft.AspNetCore.Hosting;
 
-namespace AssociationRegistry.Public.Api;
-
 public class Program
 {
     protected Program()

src/AssociationRegistry.Public.Api/Projections/ElasticEventHandler.cs

@@ -1,8 +1,8 @@
-namespace AssociationRegistry.Test.Public.Api.IntegrationTests.When_searching_verenigingen_by_name;
+namespace AssociationRegistry.Public.Api.Projections;
 
-using AssociationRegistry.Public.Api.SearchVerenigingen;
 using Events;
 using Nest;
+using SearchVerenigingen;
 
 public class ElasticEventHandler
 {
@@ -14,7 +14,5 @@ public ElasticEventHandler(IElasticClient elasticClient)
     }
 
     public void HandleEvent(VerenigingWerdGeregistreerd message)
-    {
-        _elasticClient.IndexDocument(new VerenigingDocument(){ VCode = message.VCode, Naam = message.Naam });
-    }
+        => _elasticClient.IndexDocument(new VerenigingDocument(message.VCode, message.Naam ));
 }

src/AssociationRegistry.Public.Api/Projections/IMartenEventsConsumer.cs

@@ -1,4 +1,4 @@
-namespace AssociationRegistry.Test.Public.Api.IntegrationTests.Fixtures;
+namespace AssociationRegistry.Public.Api.Projections;
 
 using System.Collections.Generic;
 using System.Threading.Tasks;

src/AssociationRegistry.Public.Api/Projections/MartenEventsConsumer.cs

@@ -1,11 +1,10 @@
-namespace AssociationRegistry.Test.Public.Api.IntegrationTests.Fixtures;
+namespace AssociationRegistry.Public.Api.Projections;
 
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Events;
 using Marten.Events;
-using When_searching_verenigingen_by_name;
 
 public class MartenEventsConsumer : IMartenEventsConsumer
 {

src/AssociationRegistry.Public.Api/Projections/MartenSubscription.cs

@@ -1,4 +1,4 @@
-namespace AssociationRegistry.Test.Public.Api.IntegrationTests.Fixtures;
+namespace AssociationRegistry.Public.Api.Projections;
 
 using System;
 using System.Collections.Generic;

src/AssociationRegistry.Public.Api/S3/S3BlobClientOptions.cs

@@ -1,7 +1,7 @@
-using System.Collections.Generic;
-
 namespace AssociationRegistry.Public.Api.S3;
 
+using System.Collections.Generic;
+
 public class S3BlobClientOptions
 {
     public IDictionary<string, Bucket> Buckets { get; set; } = null!;

src/AssociationRegistry.Public.Api/S3/VerenigingenBlobClient.cs

@@ -1,12 +1,12 @@
-using System;
+namespace AssociationRegistry.Public.Api.S3;
+
+using System;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
 using Be.Vlaanderen.Basisregisters.BlobStore;
 using Microsoft.Extensions.Logging;
 
-namespace AssociationRegistry.Public.Api.S3;
-
 public class VerenigingenBlobClient
 {
     private readonly S3BlobClientOptions.Bucket _bucket;

src/AssociationRegistry.Public.Api/SearchVerenigingen/Examples/GetVerenigingenResponseExamples.cs → src/AssociationRegistry.Public.Api/SearchVerenigingen/Examples/SearchVerenigingenResponseExamples.cs

@@ -1,8 +1,8 @@
+namespace AssociationRegistry.Public.Api.SearchVerenigingen.Examples;
+
 using System.Collections.Immutable;
 using Swashbuckle.AspNetCore.Filters;
 
-namespace AssociationRegistry.Public.Api.SearchVerenigingen.Examples;
-
 public class SearchVerenigingenResponseExamples : IExamplesProvider<SearchVerenigingenResponse>
 {
     public SearchVerenigingenResponse GetExamples() =>

src/AssociationRegistry.Public.Api/SearchVerenigingen/SearchVerenigingenController.cs

@@ -1,15 +1,14 @@
 namespace AssociationRegistry.Public.Api.SearchVerenigingen;
 
-using System;
 using System.Collections.Immutable;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using Caches;
-using Examples;
 using Be.Vlaanderen.Basisregisters.Api;
 using Be.Vlaanderen.Basisregisters.Api.Exceptions;
+using Caches;
 using Constants;
+using Examples;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Nest;

src/AssociationRegistry.Public.Api/SearchVerenigingen/SearchVerenigingenResponse.cs

@@ -1,8 +1,8 @@
+namespace AssociationRegistry.Public.Api.SearchVerenigingen;
+
 using System.Collections.Immutable;
 using System.Runtime.Serialization;
 
-namespace AssociationRegistry.Public.Api.SearchVerenigingen;
-
 [DataContract]
 public record SearchVerenigingenResponse(
     [property:DataMember(Name = "Verenigingen")]ImmutableArray<Vereniging> Verenigingen);

src/AssociationRegistry.Public.Api/SearchVerenigingen/Vereniging.cs

@@ -1,8 +1,8 @@
+namespace AssociationRegistry.Public.Api.SearchVerenigingen;
+
 using System.Collections.Immutable;
 using System.Runtime.Serialization;
 
-namespace AssociationRegistry.Public.Api.SearchVerenigingen;
-
 [DataContract]
 public record Vereniging(
     [property: DataMember(Name = "Id")]string Id,

src/AssociationRegistry.Public.Api/SearchVerenigingen/VerenigingDocument.cs

@@ -2,10 +2,6 @@ namespace AssociationRegistry.Public.Api.SearchVerenigingen;
 
 using Nest;
 
-public class VerenigingDocument
-{
-    [Keyword]
-    public string VCode { get; set; }
-    [Text]
-    public string Naam { get; set; }
-}
+public record VerenigingDocument(
+    [property: Keyword] string VCode,
+    [property: Text] string Naam);

src/AssociationRegistry.Public.Api/Startup.cs

@@ -2,16 +2,23 @@ namespace AssociationRegistry.Public.Api;
 
 using System;
 using System.Collections.Generic;
+using System.Collections.Immutable;
 using System.Linq;
 using System.Reflection;
+using Autofac;
+using Autofac.Extensions.DependencyInjection;
+using Be.Vlaanderen.Basisregisters.Api;
+using Constants;
 using DetailVerenigingen;
 using Extensions;
 using Infrastructure.Configuration;
+using Infrastructure.Json;
 using Infrastructure.Modules;
-using S3;
-using Autofac;
-using Autofac.Extensions.DependencyInjection;
-using Be.Vlaanderen.Basisregisters.Api;
+using ListVerenigingen;
+using Marten;
+using Marten.Events;
+using Marten.Events.Daemon.Resiliency;
+using Marten.Events.Projections;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc.ApiExplorer;
@@ -20,25 +27,16 @@ namespace AssociationRegistry.Public.Api;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Microsoft.OpenApi.Models;
-using Swashbuckle.AspNetCore.SwaggerGen;
-using System.Collections.Immutable;
-using Constants;
-using Events;
-using Infrastructure.Json;
-using ListVerenigingen;
-using Marten;
-using Marten.Events;
-using Marten.Events.Daemon.Resiliency;
-using Marten.Events.Projections;
 using Nest;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;
+using Projections;
+using S3;
 using SearchVerenigingen;
-using Test.Public.Api.IntegrationTests.Fixtures;
-using Test.Public.Api.IntegrationTests.When_searching_verenigingen_by_name;
-using Locatie = ListVerenigingen.Locatie;
+using Swashbuckle.AspNetCore.SwaggerGen;
 using ListVerenigingActiviteit = ListVerenigingen.Activiteit;
 using DetailVerenigingActiviteit = DetailVerenigingen.Activiteit;
+using Locatie = ListVerenigingen.Locatie;
 
 /// <summary>Represents the startup process for the application.</summary>
 public class Startup
@@ -184,7 +182,7 @@ public IServiceProvider ConfigureServices(IServiceCollection services)
                     {
                         Type = "string",
                         Format = "date",
-                        Pattern = "yyyy-MM-dd"
+                        Pattern = "yyyy-MM-dd",
                     });
             });