feat: upgrade packages and fix api calls

Arne Dumarey · CumpsD · commit 6b4abf126aed · 2019-06-20T13:24:09.000+02:00
diff --git a/paket.dependencies b/paket.dependencies
@@ -60,11 +60,11 @@ nuget Be.Vlaanderen.Basisregisters.DataDog.Tracing.SqlStreamStore ~> 3.2
 
 nuget Be.Vlaanderen.Basisregisters.Crab ~> 1.0
 
-nuget Be.Vlaanderen.Basisregisters.GrAr.Common ~> 8.0
-nuget Be.Vlaanderen.Basisregisters.GrAr.Import ~> 8.0
-nuget Be.Vlaanderen.Basisregisters.GrAr.Legacy ~> 8.0
-nuget Be.Vlaanderen.Basisregisters.GrAr.Provenance ~> 8.0
-nuget Be.Vlaanderen.Basisregisters.GrAr.Extracts ~> 8.0
+nuget Be.Vlaanderen.Basisregisters.GrAr.Common ~> 10.0
+nuget Be.Vlaanderen.Basisregisters.GrAr.Import ~> 10.0
+nuget Be.Vlaanderen.Basisregisters.GrAr.Legacy ~> 10.0
+nuget Be.Vlaanderen.Basisregisters.GrAr.Provenance ~> 10.0
+nuget Be.Vlaanderen.Basisregisters.GrAr.Extracts ~> 10.0
 
 nuget Be.Vlaanderen.Basisregisters.Shaperon ~> 4.1
 
diff --git a/paket.lock b/paket.lock
@@ -225,13 +225,13 @@ NUGET
       Autofac.Extensions.DependencyInjection (>= 4.4)
       Be.Vlaanderen.Basisregisters.EventHandling (1.0.3)
     Be.Vlaanderen.Basisregisters.Generators.Guid.Deterministic (1.0.4)
-    Be.Vlaanderen.Basisregisters.GrAr.Common (8.0.1)
+    Be.Vlaanderen.Basisregisters.GrAr.Common (10.0.1)
       Be.Vlaanderen.Basisregisters.AggregateSource (>= 3.0 < 4.0)
       NodaTime (>= 2.4.5)
-    Be.Vlaanderen.Basisregisters.GrAr.Extracts (8.0.1)
+    Be.Vlaanderen.Basisregisters.GrAr.Extracts (10.0.1)
       Be.Vlaanderen.Basisregisters.Api (>= 7.0 < 8.0)
       Be.Vlaanderen.Basisregisters.Shaperon (>= 4.0 < 5.0)
-    Be.Vlaanderen.Basisregisters.GrAr.Import (8.0.1)
+    Be.Vlaanderen.Basisregisters.GrAr.Import (10.0.1)
       Autofac (>= 4.9.2)
       Be.Vlaanderen.Basisregisters.AggregateSource.SqlStreamStore (>= 3.0 < 4.0)
       Be.Vlaanderen.Basisregisters.CommandHandling (>= 3.0 < 4.0)
@@ -245,13 +245,13 @@ NUGET
       Serilog (>= 2.8)
       Serilog.Extensions.Logging (>= 2.0.4)
       System.Threading.Tasks.Dataflow (>= 4.9)
-    Be.Vlaanderen.Basisregisters.GrAr.Legacy (8.0.1)
+    Be.Vlaanderen.Basisregisters.GrAr.Legacy (10.0.1)
       Be.Vlaanderen.Basisregisters.Utilities.Rfc3339DateTimeOffset (>= 1.0 < 2.0)
       Newtonsoft.Json (>= 12.0.2)
-    Be.Vlaanderen.Basisregisters.GrAr.Provenance (8.0.1)
+    Be.Vlaanderen.Basisregisters.GrAr.Provenance (10.0.1)
       Be.Vlaanderen.Basisregisters.CommandHandling (>= 3.0 < 4.0)
       Be.Vlaanderen.Basisregisters.Crab (>= 1.0 < 2.0)
-      Be.Vlaanderen.Basisregisters.GrAr.Common (8.0.1)
+      Be.Vlaanderen.Basisregisters.GrAr.Common (10.0.1)
       Microsoft.CSharp (>= 4.5)
     Be.Vlaanderen.Basisregisters.ProblemDetails (3.1.1)
       Microsoft.AspNetCore.Mvc.Core (>= 2.2.2)
diff --git a/src/BuildingRegistry.Api.CrabImport/BuildingRegistry.Api.CrabImport.csproj b/src/BuildingRegistry.Api.CrabImport/BuildingRegistry.Api.CrabImport.csproj
@@ -4,6 +4,7 @@
   <PropertyGroup>
     <ServerGarbageCollection>true</ServerGarbageCollection>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <AssemblyName>BuildingRegistry.Api.CrabImport</AssemblyName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <DocumentationFile>bin\Debug\netcoreapp2.2\BuildingRegistry.Api.CrabImport.xml</DocumentationFile>
diff --git a/src/BuildingRegistry.Api.CrabImport/CrabImport/CrabImportController.cs b/src/BuildingRegistry.Api.CrabImport/CrabImport/CrabImportController.cs
@@ -19,6 +19,7 @@ namespace BuildingRegistry.Api.CrabImport.CrabImport
     using System.Linq;
     using System.Threading;
     using System.Threading.Tasks;
+    using Be.Vlaanderen.Basisregisters.GrAr.Import.Processing.Api.Messages;
     using ApiController = Infrastructure.ApiController;
     using ProblemDetails = Be.Vlaanderen.Basisregisters.BasicApiProblem.ProblemDetails;
 
@@ -106,17 +107,19 @@ await registerCrabImportList.ParallelForEachAsync(async registerCrabImports =>
             return Accepted(tags.Any() ? tags.Max() : null);
         }
 
-        [HttpGet("batch/current")]
+        [HttpGet("batch/{feed}")]
         public IActionResult GetBatchStatus(
-            [FromServices] CrabImportContext context)
+            [FromServices] CrabImportContext context,
+            [FromRoute] string feed)
         {
-            return Ok(context.LastBatch);
+            var status = context.LastBatchFor((ImportFeed)feed);
+            return Ok(status);
         }
 
-        [HttpPost("batch/current")]
+        [HttpPost("batch")]
         public IActionResult SetBatchStatus(
             [FromServices] CrabImportContext context,
-            [FromBody] ImportBatchStatus batchStatus)
+            [FromBody] BatchStatusUpdate batchStatus)
         {
             context.SetCurrent(batchStatus);
             context.SaveChanges();
diff --git a/src/BuildingRegistry.Api.CrabImport/Properties/launchSettings.json b/src/BuildingRegistry.Api.CrabImport/Properties/launchSettings.json
@@ -15,7 +15,7 @@
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
     },
-    "BuildingRegistry.Api.Oslo": {
+    "BuildingRegistry.Api.CrabImport": {
       "commandName": "Project",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
diff --git a/src/BuildingRegistry.Api.Legacy/Building/BuildingController.cs b/src/BuildingRegistry.Api.Legacy/Building/BuildingController.cs
@@ -88,6 +88,7 @@ public async Task<IActionResult> Get(
             var buildingUnits = await context
                 .BuildingUnitDetails
                 .Where(x => x.BuildingId == building.BuildingId)
+                .Where(x => x.IsComplete && !x.IsRemoved)
                 .Select(x => x.OsloId)
                 .ToListAsync(cancellationToken);
 
diff --git a/src/BuildingRegistry.Api.Legacy/Building/Responses/BuildingSyndicationResponse.cs b/src/BuildingRegistry.Api.Legacy/Building/Responses/BuildingSyndicationResponse.cs
@@ -13,7 +13,6 @@ namespace BuildingRegistry.Api.Legacy.Building.Responses
     using Microsoft.Extensions.Options;
     using Microsoft.SyndicationFeed;
     using Microsoft.SyndicationFeed.Atom;
-    using NetTopologySuite.IO;
     using Query;
     using Swashbuckle.AspNetCore.Filters;
     using System;
@@ -28,8 +27,6 @@ namespace BuildingRegistry.Api.Legacy.Building.Responses
 
     public static class BuildingSyndicationResponse
     {
-        private static readonly WKBReader WkbReader = new WKBReader();
-
         public static async Task WriteBuilding(
             this ISyndicationFeedWriter writer,
             IOptions<ResponseOptions> responseOptions,
diff --git a/src/BuildingRegistry.Api.Legacy/BuildingUnit/Query/BuildingUnitListQuery.cs b/src/BuildingRegistry.Api.Legacy/BuildingUnit/Query/BuildingUnitListQuery.cs
@@ -32,7 +32,7 @@ protected override IQueryable<BuildingUnitDetailItem> Filter(FilteringHeader<Bui
                 .Where(x => x.IsComplete && !x.IsRemoved && x.IsBuildingComplete)
                 .AsNoTracking();
 
-            if (!string.IsNullOrEmpty(filtering.Filter.AddressOsloId))
+            if (!string.IsNullOrEmpty(filtering.Filter?.AddressOsloId))
             {
                 var addressOsloIds = _syndicationContext
                     .AddressOsloIds
diff --git a/src/BuildingRegistry.Api.Legacy/Infrastructure/Modules/ApiModule.cs b/src/BuildingRegistry.Api.Legacy/Infrastructure/Modules/ApiModule.cs
@@ -3,6 +3,7 @@ namespace BuildingRegistry.Api.Legacy.Infrastructure.Modules
     using Autofac;
     using Autofac.Extensions.DependencyInjection;
     using Be.Vlaanderen.Basisregisters.DataDog.Tracing.Autofac;
+    using Grb;
     using Microsoft.Extensions.Configuration;
     using Microsoft.Extensions.DependencyInjection;
     using Microsoft.Extensions.Logging;
@@ -32,6 +33,9 @@ protected override void Load(ContainerBuilder containerBuilder)
                 .RegisterModule(new LegacyModule(_configuration, _services, _loggerFactory))
                 .RegisterModule(new SyndicationModule(_configuration, _services, _loggerFactory));
 
+            containerBuilder.RegisterType<GrbWfsClient>().AsImplementedInterfaces();
+            containerBuilder.RegisterType<GrbBuildingParcel>().AsImplementedInterfaces();
+
             containerBuilder.Populate(_services);
         }
     }
diff --git a/src/BuildingRegistry.Api.Legacy/Properties/launchSettings.json b/src/BuildingRegistry.Api.Legacy/Properties/launchSettings.json
@@ -15,7 +15,7 @@
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
     },
-    "BuildingRegistry.Api.Oslo": {
+    "BuildingRegistry.Api.Legacy": {
       "commandName": "Project",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
diff --git a/src/BuildingRegistry.Importer/App.config b/src/BuildingRegistry.Importer/App.config
@@ -13,8 +13,8 @@
   </startup>
 
   <connectionStrings>
-    <add name="CRABEntities" connectionString="metadata=res://*/Entity.CRAB.csdl|res://*/Entity.CRAB.ssdl|res://*/Entity.CRAB.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=agivsqlcrabbeta.vlm.be;initial catalog=CRAB;integrated security=True;MultipleActiveResultSets=True;App=Vbr.CrabRemoteRepo&quot;" providerName="System.Data.EntityClient"/>
-    <add name="Crab2Vbr" connectionString="Data Source=n39ixojo3n.database.windows.net;Initial Catalog=VBR-betaDB;Persist Security Info=True;User ID=vbrmgmtsvcbeta;Password=c33dfe36-2334-4741-817e-f39ce731c38d;"/>
+    <add name="CRABEntities" connectionString="metadata=res://*/Entity.CRAB.csdl|res://*/Entity.CRAB.ssdl|res://*/Entity.CRAB.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=.;initial catalog=CRAB;integrated security=True;MultipleActiveResultSets=True;App=Vbr.CrabRemoteRepo&quot;" providerName="System.Data.EntityClient"/>
+    <add name="Crab2Vbr" connectionString="Data Source=xxx.database.windows.net;Initial Catalog=VBR-betaDB;Persist Security Info=True;User ID=xxx;Password=xxx;"/>
   </connectionStrings>
   <applicationSettings>
     <BuildingRegistry.Importer.Properties.Settings>
@@ -52,10 +52,10 @@
         <value />
       </setting>
       <setting name="BaseUrl" serializeAs="String">
-        <value>http://localhost:1094</value>
+        <value>http://localhost:6000</value>
       </setting>
       <setting name="ImportBatchStatusEndpoint" serializeAs="String">
-        <value>v1/crabimport/batch/current</value>
+        <value>v1/crabimport/batch</value>
       </setting>
     </BuildingRegistry.Importer.Properties.Settings>
   </applicationSettings>
diff --git a/src/BuildingRegistry.Importer/Program.cs b/src/BuildingRegistry.Importer/Program.cs
@@ -7,6 +7,7 @@
 using System.Configuration;
 using System.Diagnostics;
 using System.Linq;
+using System.Reflection;
 
 namespace BuildingRegistry.Importer
 {
@@ -40,6 +41,7 @@ private static void Main(params string[] args)
                     .UseHttpApiProxyConfig(settings)
                     .UseCommandProcessorConfig(settings)
                     .UseDefaultSerializerSettingsForCrabImports()
+                    .ConfigureImportFeedFromAssembly(Assembly.GetExecutingAssembly())
                     .Build();
 
                 WaitForStart();
diff --git a/src/BuildingRegistry.Projections.Legacy/BuildingUnitDetail/BuildingUnitDetailProjections.cs b/src/BuildingRegistry.Projections.Legacy/BuildingUnitDetail/BuildingUnitDetailProjections.cs
@@ -62,7 +62,8 @@ await context
 
             When<Envelope<BuildingWasRetired>>(async (context, message, ct) =>
             {
-                var buildingUnits = await context.BuildingUnitDetails.Where(unit => unit.BuildingId == message.Message.BuildingId).ToListAsync(ct);
+                var buildingUnits = (await context.BuildingUnitDetails.Where(unit => unit.BuildingId == message.Message.BuildingId).ToListAsync(ct))
+                    .Union(context.BuildingUnitDetails.Local.Where(unit => unit.BuildingId == message.Message.BuildingId));
                 RetireUnitsByBuilding(buildingUnits, message.Message.BuildingUnitIdsToNotRealize, message.Message.BuildingUnitIdsToRetire, message.Message.Provenance.Timestamp);
 
                 var building = await context.BuildingUnitBuildings.FindAsync(message.Message.BuildingId, cancellationToken: ct);
@@ -71,7 +72,8 @@ await context
 
             When<Envelope<BuildingWasCorrectedToRetired>>(async (context, message, ct) =>
             {
-                var buildingUnits = await context.BuildingUnitDetails.Where(unit => unit.BuildingId == message.Message.BuildingId).ToListAsync(ct);
+                var buildingUnits = (await context.BuildingUnitDetails.Where(unit => unit.BuildingId == message.Message.BuildingId).ToListAsync(ct))
+                    .Union(context.BuildingUnitDetails.Local.Where(unit => unit.BuildingId == message.Message.BuildingId));
                 RetireUnitsByBuilding(buildingUnits, message.Message.BuildingUnitIdsToNotRealize, message.Message.BuildingUnitIdsToRetire, message.Message.Provenance.Timestamp);
 
                 var building = await context.BuildingUnitBuildings.FindAsync(message.Message.BuildingId, cancellationToken: ct);
@@ -80,7 +82,8 @@ await context
 
             When<Envelope<BuildingWasNotRealized>>(async (context, message, ct) =>
             {
-                var buildingUnits = await context.BuildingUnitDetails.Where(unit => unit.BuildingId == message.Message.BuildingId).ToListAsync(ct);
+                var buildingUnits = (await context.BuildingUnitDetails.Where(unit => unit.BuildingId == message.Message.BuildingId).ToListAsync(ct))
+                    .Union(context.BuildingUnitDetails.Local.Where(unit => unit.BuildingId == message.Message.BuildingId));
                 RetireUnitsByBuilding(buildingUnits, message.Message.BuildingUnitIdsToNotRealize, message.Message.BuildingUnitIdsToRetire, message.Message.Provenance.Timestamp);
 
                 var building = await context.BuildingUnitBuildings.FindAsync(message.Message.BuildingId, cancellationToken: ct);
@@ -89,7 +92,8 @@ await context
 
             When<Envelope<BuildingWasCorrectedToNotRealized>>(async (context, message, ct) =>
             {
-                var buildingUnits = await context.BuildingUnitDetails.Where(unit => unit.BuildingId == message.Message.BuildingId).ToListAsync(ct);
+                var buildingUnits = (await context.BuildingUnitDetails.Where(unit => unit.BuildingId == message.Message.BuildingId).ToListAsync(ct))
+                    .Union(context.BuildingUnitDetails.Local.Where(unit => unit.BuildingId == message.Message.BuildingId));
                 RetireUnitsByBuilding(buildingUnits, message.Message.BuildingUnitIdsToNotRealize, message.Message.BuildingUnitIdsToRetire, message.Message.Provenance.Timestamp);
 
                 var building = await context.BuildingUnitBuildings.FindAsync(message.Message.BuildingId, cancellationToken: ct);
@@ -98,7 +102,8 @@ await context
 
             When<Envelope<BuildingGeometryWasRemoved>>(async (context, message, ct) =>
             {
-                var buildingUnits = await context.BuildingUnitDetails.Where(unit => unit.BuildingId == message.Message.BuildingId).ToListAsync(ct);
+                var buildingUnits = (await context.BuildingUnitDetails.Where(unit => unit.BuildingId == message.Message.BuildingId).ToListAsync(ct))
+                    .Union(context.BuildingUnitDetails.Local.Where(unit => unit.BuildingId == message.Message.BuildingId));
                 foreach (var buildingUnit in buildingUnits)
                 {
                     buildingUnit.PositionMethod = null;
@@ -109,7 +114,8 @@ await context
 
             When<Envelope<BuildingBecameComplete>>(async (context, message, ct) =>
             {
-                var buildingUnits = await context.BuildingUnitDetails.Where(unit => unit.BuildingId == message.Message.BuildingId).ToListAsync(ct);
+                var buildingUnits = (await context.BuildingUnitDetails.Where(unit => unit.BuildingId == message.Message.BuildingId).ToListAsync(ct))
+                    .Union(context.BuildingUnitDetails.Local.Where(unit => unit.BuildingId == message.Message.BuildingId));
                 foreach (var buildingUnit in buildingUnits)
                 {
                     buildingUnit.IsBuildingComplete = true;
@@ -122,7 +128,8 @@ await context
 
             When<Envelope<BuildingBecameIncomplete>>(async (context, message, ct) =>
             {
-                var buildingUnits = await context.BuildingUnitDetails.Where(unit => unit.BuildingId == message.Message.BuildingId).ToListAsync(ct);
+                var buildingUnits = (await context.BuildingUnitDetails.Where(unit => unit.BuildingId == message.Message.BuildingId).ToListAsync(ct))
+                    .Union(context.BuildingUnitDetails.Local.Where(unit => unit.BuildingId == message.Message.BuildingId));
                 foreach (var buildingUnit in buildingUnits)
                 {
                     buildingUnit.IsBuildingComplete = false;
@@ -138,12 +145,11 @@ await context
                 var building = await context.BuildingUnitBuildings.FindAsync(message.Message.BuildingId, cancellationToken: ct);
                 building.BuildingOsloId = message.Message.OsloId;
 
-                foreach (var buildingUnit in context
-                    .BuildingUnitDetails
-                    .Where(unit => unit.BuildingId == message.Message.BuildingId))
-                {
+                var buildingUnits = (await context.BuildingUnitDetails.Where(unit => unit.BuildingId == message.Message.BuildingId).ToListAsync(ct))
+                    .Union(context.BuildingUnitDetails.Local.Where(unit => unit.BuildingId == message.Message.BuildingId));
+
+                foreach (var buildingUnit in buildingUnits)
                     buildingUnit.BuildingOsloId = message.Message.OsloId;
-                }
             });
             #endregion
 

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`"ASPNETCORE_ENVIRONMENT": "Development"`
`16`	`16`	`}`
`17`	`17`	`},`
`18`		`- "BuildingRegistry.Api.Oslo": {`
	`18`	`+ "BuildingRegistry.Api.CrabImport": {`
`19`	`19`	`"commandName": "Project",`
`20`	`20`	`"environmentVariables": {`
`21`	`21`	`"ASPNETCORE_ENVIRONMENT": "Development"`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ protected override IQueryable<BuildingUnitDetailItem> Filter(FilteringHeader<Bui`
`32`	`32`	`.Where(x => x.IsComplete && !x.IsRemoved && x.IsBuildingComplete)`
`33`	`33`	`.AsNoTracking();`
`34`	`34`
`35`		`- if (!string.IsNullOrEmpty(filtering.Filter.AddressOsloId))`
	`35`	`+ if (!string.IsNullOrEmpty(filtering.Filter?.AddressOsloId))`
`36`	`36`	`{`
`37`	`37`	`var addressOsloIds = _syndicationContext`
`38`	`38`	`.AddressOsloIds`