Fix #1552 - Migrate jobs to infrastructure

CGI-FR · Dec 6, 2022 · 464e2f9 · 464e2f9
1 parent eddd6db
commit 464e2f9
Show file tree

Hide file tree

Showing 91 changed files with 147 additions and 112 deletions.
diff --git a/src/AzureIoTHub.Portal.Application/AzureIoTHub.Portal.Application.csproj b/src/AzureIoTHub.Portal.Application/AzureIoTHub.Portal.Application.csproj
@@ -8,6 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="AutoMapper" Version="12.0.0" />
+    <PackageReference Include="Azure.Messaging.EventHubs" Version="5.7.5" />
     <PackageReference Include="Microsoft.Azure.Devices" Version="1.38.2" />
     <PackageReference Include="Microsoft.Azure.Devices.Provisioning.Service" Version="1.18.2" />
     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.0" />

diff --git a/....Portal.Server/Services/IConfigService.cs → ...al.Application/Services/IConfigService.cs b/....Portal.Server/Services/IConfigService.cs → ...al.Application/Services/IConfigService.cs
@@ -1,7 +1,7 @@
 // Copyright (c) CGI France. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace AzureIoTHub.Portal.Server.Services
+namespace AzureIoTHub.Portal.Application.Services
 {
     using System.Collections.Generic;
     using System.Threading.Tasks;

diff --git a/.../Services/IDeviceConfigurationsService.cs → .../Services/IDeviceConfigurationsService.cs b/.../Services/IDeviceConfigurationsService.cs → .../Services/IDeviceConfigurationsService.cs
@@ -1,7 +1,7 @@
 // Copyright (c) CGI France. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace AzureIoTHub.Portal.Server.Services
+namespace AzureIoTHub.Portal.Application.Services
 {
     using AzureIoTHub.Portal.Models.v10;
     using AzureIoTHub.Portal.Shared.Models.v10;

diff --git a/...Services/IDeviceModelPropertiesService.cs → ...Services/IDeviceModelPropertiesService.cs b/...Services/IDeviceModelPropertiesService.cs → ...Services/IDeviceModelPropertiesService.cs
@@ -1,7 +1,7 @@
 // Copyright (c) CGI France. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace AzureIoTHub.Portal.Server.Services
+namespace AzureIoTHub.Portal.Application.Services
 {
     using AzureIoTHub.Portal.Domain.Entities;
     using System.Collections.Generic;

diff --git a/...al.Server/Services/IDeviceModelService.cs → ...plication/Services/IDeviceModelService.cs b/...al.Server/Services/IDeviceModelService.cs → ...plication/Services/IDeviceModelService.cs
@@ -1,7 +1,7 @@
 // Copyright (c) CGI France. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace AzureIoTHub.Portal.Server.Services
+namespace AzureIoTHub.Portal.Application.Services
 {
     using System.Collections.Generic;
     using System.Threading.Tasks;

diff --git a/...Server/Services/IDevicePropertyService.cs → ...cation/Services/IDevicePropertyService.cs b/...Server/Services/IDevicePropertyService.cs → ...cation/Services/IDevicePropertyService.cs
@@ -1,7 +1,7 @@
 // Copyright (c) CGI France. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace AzureIoTHub.Portal.Server.Services
+namespace AzureIoTHub.Portal.Application.Services
 {
     using Models.v10;
     using System.Collections.Generic;

diff --git a/....Portal.Server/Services/IDeviceService.cs → ...al.Application/Services/IDeviceService.cs b/....Portal.Server/Services/IDeviceService.cs → ...al.Application/Services/IDeviceService.cs
@@ -1,7 +1,7 @@
 // Copyright (c) CGI France. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace AzureIoTHub.Portal.Server.Services
+namespace AzureIoTHub.Portal.Application.Services
 {
     using System.Collections.Generic;
     using System.Threading.Tasks;

diff --git a/...rtal.Server/Services/IDeviceTagService.cs → ...Application/Services/IDeviceTagService.cs b/...rtal.Server/Services/IDeviceTagService.cs → ...Application/Services/IDeviceTagService.cs
@@ -1,7 +1,7 @@
 // Copyright (c) CGI France. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace AzureIoTHub.Portal.Server.Services
+namespace AzureIoTHub.Portal.Application.Services
 {
     using AzureIoTHub.Portal.Models.v10;
     using System.Collections.Generic;

diff --git a/...al.Server/Services/IEdgeDevicesService.cs → ...plication/Services/IEdgeDevicesService.cs b/...al.Server/Services/IEdgeDevicesService.cs → ...plication/Services/IEdgeDevicesService.cs
@@ -1,7 +1,7 @@
 // Copyright (c) CGI France. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace AzureIoTHub.Portal.Server.Services
+namespace AzureIoTHub.Portal.Application.Services
 {
     using System.Collections.Generic;
     using System.Threading.Tasks;

diff --git a/...rtal.Server/Services/IEdgeModelService.cs → ...Application/Services/IEdgeModelService.cs b/...rtal.Server/Services/IEdgeModelService.cs → ...Application/Services/IEdgeModelService.cs
@@ -1,7 +1,7 @@
 // Copyright (c) CGI France. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace AzureIoTHub.Portal.Server.Services
+namespace AzureIoTHub.Portal.Application.Services
 {
     using System.Collections.Generic;
     using System.Threading.Tasks;

diff --git a/...Server/Services/IExternalDeviceService.cs → ...cation/Services/IExternalDeviceService.cs b/...Server/Services/IExternalDeviceService.cs → ...cation/Services/IExternalDeviceService.cs
@@ -1,7 +1,7 @@
 // Copyright (c) CGI France. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace AzureIoTHub.Portal.Server.Services
+namespace AzureIoTHub.Portal.Application.Services
 {
     using System.Collections.Generic;
     using System.Threading.Tasks;

diff --git a/...ub.Portal.Server/Services/IIdeaService.cs → ...rtal.Application/Services/IIdeaService.cs b/...ub.Portal.Server/Services/IIdeaService.cs → ...rtal.Application/Services/IIdeaService.cs
@@ -1,7 +1,7 @@
 // Copyright (c) CGI France. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace AzureIoTHub.Portal.Server.Services
+namespace AzureIoTHub.Portal.Application.Services
 {
     using System.Threading.Tasks;
     using Shared.Models.v1._0;

diff --git a/...Server/Services/ILoRaWANCommandService.cs → ...cation/Services/ILoRaWANCommandService.cs b/...Server/Services/ILoRaWANCommandService.cs → ...cation/Services/ILoRaWANCommandService.cs
@@ -1,7 +1,7 @@
 // Copyright (c) CGI France. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace AzureIoTHub.Portal.Server.Services
+namespace AzureIoTHub.Portal.Application.Services
 {
     using System.Threading.Tasks;
     using Models.v10.LoRaWAN;

diff --git a/...r/Services/ILoRaWANConcentratorService.cs → ...n/Services/ILoRaWANConcentratorService.cs b/...r/Services/ILoRaWANConcentratorService.cs → ...n/Services/ILoRaWANConcentratorService.cs
@@ -1,7 +1,7 @@
 // Copyright (c) CGI France. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace AzureIoTHub.Portal.Server.Services
+namespace AzureIoTHub.Portal.Application.Services
 {
     using System.Threading.Tasks;
     using AzureIoTHub.Portal.Models.v10.LoRaWAN;

diff --git a/src/AzureIoTHub.Portal.Infrastructure/AzureIoTHub.Portal.Infrastructure.csproj b/src/AzureIoTHub.Portal.Infrastructure/AzureIoTHub.Portal.Infrastructure.csproj
@@ -132,6 +132,9 @@
     <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.0" />
     <PackageReference Include="Polly.Extensions.Http" Version="3.0.0" />
+    <PackageReference Include="prometheus-net" Version="7.0.0" />
+    <PackageReference Include="Quartz" Version="3.5.0" />
+    <PackageReference Include="Quartz.Extensions.DependencyInjection" Version="3.5.0" />
     <PackageReference Include="System.Linq.Dynamic.Core" Version="1.2.23" />
     <PackageReference Include="EntityFrameworkCore.Exceptions.PostgreSQL" Version="6.0.3" />
 

diff --git a/...Extensions/QuartzConfiguratorExtension.cs → ...xtenstions/QuartzConfiguratorExtension.cs b/...Extensions/QuartzConfiguratorExtension.cs → ...xtenstions/QuartzConfiguratorExtension.cs
@@ -1,7 +1,7 @@
 // Copyright (c) CGI France. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace AzureIoTHub.Portal.Server.Extensions
+namespace AzureIoTHub.Portal.Infrastructure.Extensions
 {
     using AzureIoTHub.Portal.Domain;
     using Quartz;

diff --git a/...ver/Jobs/ConcentratorMetricExporterJob.cs → ...ure/Jobs/ConcentratorMetricExporterJob.cs b/...ver/Jobs/ConcentratorMetricExporterJob.cs → ...ure/Jobs/ConcentratorMetricExporterJob.cs
@@ -1,7 +1,7 @@
 // Copyright (c) CGI France. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace AzureIoTHub.Portal.Server.Jobs
+namespace AzureIoTHub.Portal.Infrastructure.Jobs
 {
     using System.Threading.Tasks;
     using AzureIoTHub.Portal.Domain.Shared.Constants;

diff --git a/...erver/Jobs/ConcentratorMetricLoaderJob.cs → ...cture/Jobs/ConcentratorMetricLoaderJob.cs b/...erver/Jobs/ConcentratorMetricLoaderJob.cs → ...cture/Jobs/ConcentratorMetricLoaderJob.cs
@@ -1,11 +1,11 @@
 // Copyright (c) CGI France. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace AzureIoTHub.Portal.Server.Jobs
+namespace AzureIoTHub.Portal.Infrastructure.Jobs
 {
     using System.Threading.Tasks;
     using AzureIoTHub.Portal.Domain.Exceptions;
-    using AzureIoTHub.Portal.Server.Services;
+    using AzureIoTHub.Portal.Application.Services;
     using Microsoft.Extensions.Logging;
     using Quartz;
     using Shared.Models.v1._0;

diff --git a/...al.Server/Jobs/DeviceMetricExporterJob.cs → ...structure/Jobs/DeviceMetricExporterJob.cs b/...al.Server/Jobs/DeviceMetricExporterJob.cs → ...structure/Jobs/DeviceMetricExporterJob.cs
@@ -1,7 +1,7 @@
 // Copyright (c) CGI France. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace AzureIoTHub.Portal.Server.Jobs
+namespace AzureIoTHub.Portal.Infrastructure.Jobs
 {
     using System.Threading.Tasks;
     using AzureIoTHub.Portal.Domain.Shared.Constants;

diff --git a/...rtal.Server/Jobs/DeviceMetricLoaderJob.cs → ...rastructure/Jobs/DeviceMetricLoaderJob.cs b/...rtal.Server/Jobs/DeviceMetricLoaderJob.cs → ...rastructure/Jobs/DeviceMetricLoaderJob.cs
@@ -1,11 +1,11 @@
 // Copyright (c) CGI France. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace AzureIoTHub.Portal.Server.Jobs
+namespace AzureIoTHub.Portal.Infrastructure.Jobs
 {
     using System.Threading.Tasks;
     using AzureIoTHub.Portal.Domain.Exceptions;
-    using AzureIoTHub.Portal.Server.Services;
+    using AzureIoTHub.Portal.Application.Services;
     using Microsoft.Extensions.Logging;
     using Quartz;
     using Shared.Models.v1._0;

diff --git a/...erver/Jobs/EdgeDeviceMetricExporterJob.cs → ...cture/Jobs/EdgeDeviceMetricExporterJob.cs b/...erver/Jobs/EdgeDeviceMetricExporterJob.cs → ...cture/Jobs/EdgeDeviceMetricExporterJob.cs
@@ -1,7 +1,7 @@
 // Copyright (c) CGI France. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace AzureIoTHub.Portal.Server.Jobs
+namespace AzureIoTHub.Portal.Infrastructure.Jobs
 {
     using System.Threading.Tasks;
     using AzureIoTHub.Portal.Domain.Shared.Constants;

diff --git a/....Server/Jobs/EdgeDeviceMetricLoaderJob.cs → ...ructure/Jobs/EdgeDeviceMetricLoaderJob.cs b/....Server/Jobs/EdgeDeviceMetricLoaderJob.cs → ...ructure/Jobs/EdgeDeviceMetricLoaderJob.cs
@@ -1,11 +1,11 @@
 // Copyright (c) CGI France. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace AzureIoTHub.Portal.Server.Jobs
+namespace AzureIoTHub.Portal.Infrastructure.Jobs
 {
     using System.Threading.Tasks;
     using AzureIoTHub.Portal.Domain.Exceptions;
-    using AzureIoTHub.Portal.Server.Services;
+    using AzureIoTHub.Portal.Application.Services;
     using Microsoft.Extensions.Logging;
     using Quartz;
     using Shared.Models.v1._0;

diff --git a/src/AzureIoTHub.Portal.Infrastructure/Startup/IServiceCollectionExtension.cs b/src/AzureIoTHub.Portal.Infrastructure/Startup/IServiceCollectionExtension.cs
@@ -5,33 +5,36 @@ namespace AzureIoTHub.Portal.Infrastructure.Startup
 {
     using System.Net;
     using Azure.Storage.Blobs;
+    using Azure.Storage.Blobs.Models;
+    using AzureIoTHub.Portal.Application.Managers;
+    using AzureIoTHub.Portal.Application.Mappers;
     using AzureIoTHub.Portal.Application.Providers;
     using AzureIoTHub.Portal.Application.Services;
     using AzureIoTHub.Portal.Application.Wrappers;
     using AzureIoTHub.Portal.Domain;
     using AzureIoTHub.Portal.Domain.Options;
+    using AzureIoTHub.Portal.Domain.Repositories;
+    using AzureIoTHub.Portal.Infrastructure.Extensions;
+    using AzureIoTHub.Portal.Infrastructure.Jobs;
+    using AzureIoTHub.Portal.Infrastructure.Managers;
+    using AzureIoTHub.Portal.Infrastructure.Mappers;
     using AzureIoTHub.Portal.Infrastructure.Providers;
+    using AzureIoTHub.Portal.Infrastructure.Repositories;
     using AzureIoTHub.Portal.Infrastructure.Services;
     using AzureIoTHub.Portal.Infrastructure.ServicesHealthCheck;
     using AzureIoTHub.Portal.Infrastructure.Wrappers;
+    using AzureIoTHub.Portal.Models.v10;
+    using AzureIoTHub.Portal.Models.v10.LoRaWAN;
     using EntityFramework.Exceptions.PostgreSQL;
-    using Microsoft.Azure.Devices.Provisioning.Service;
     using Microsoft.Azure.Devices;
+    using Microsoft.Azure.Devices.Provisioning.Service;
     using Microsoft.EntityFrameworkCore;
+    using Microsoft.Extensions.Configuration;
     using Microsoft.Extensions.DependencyInjection;
     using Microsoft.Extensions.Options;
     using Polly;
     using Polly.Extensions.Http;
-    using AzureIoTHub.Portal.Domain.Repositories;
-    using AzureIoTHub.Portal.Infrastructure.Repositories;
-    using AzureIoTHub.Portal.Application.Mappers;
-    using AzureIoTHub.Portal.Infrastructure.Mappers;
-    using AzureIoTHub.Portal.Models.v10.LoRaWAN;
-    using AzureIoTHub.Portal.Models.v10;
-    using AzureIoTHub.Portal.Application.Managers;
-    using AzureIoTHub.Portal.Infrastructure.Managers;
-    using Azure.Storage.Blobs.Models;
-    using Microsoft.Extensions.Configuration;
+    using Quartz;
 
     public static class IServiceCollectionExtension
     {
@@ -44,7 +47,8 @@ public static IServiceCollection AddInfrastructureLayer(this IServiceCollection
                             .ConfigureDeviceRegstryDependencies(configuration)
                             .ConfigureServices()
                             .ConfigureMappers()
-                            .ConfigureHealthCheck();
+                            .ConfigureHealthCheck()
+                            .ConfigureMetricsJobs(configuration);
         }
 
         private static IServiceCollection AddLoRaWanSupport(this IServiceCollection services, ConfigHandler configuration)
@@ -181,5 +185,15 @@ private static IServiceCollection ConfigureImageBlobStorage(this IServiceCollect
                                 opts.BaseUri = container.Uri;
                             });
         }
+
+        private static IServiceCollection ConfigureMetricsJobs(this IServiceCollection services, ConfigHandler configuration)
+        {
+            return services.AddQuartz(q =>
+            {
+                q.AddMetricsService<DeviceMetricExporterJob, DeviceMetricLoaderJob>(configuration);
+                q.AddMetricsService<EdgeDeviceMetricExporterJob, EdgeDeviceMetricLoaderJob>(configuration);
+                q.AddMetricsService<ConcentratorMetricExporterJob, ConcentratorMetricLoaderJob>(configuration);
+            });
+        }
     }
 }
diff --git a/src/AzureIoTHub.Portal.Server/Controllers/v1.0/DeviceConfigurationsController.cs b/src/AzureIoTHub.Portal.Server/Controllers/v1.0/DeviceConfigurationsController.cs
@@ -6,7 +6,7 @@ namespace AzureIoTHub.Portal.Server.Controllers.v10
     using System.Collections.Generic;
     using System.Threading.Tasks;
     using AzureIoTHub.Portal.Models.v10;
-    using AzureIoTHub.Portal.Server.Services;
+    using AzureIoTHub.Portal.Application.Services;
     using Microsoft.AspNetCore.Authorization;
     using Microsoft.AspNetCore.Http;
     using Microsoft.AspNetCore.Mvc;

diff --git a/src/AzureIoTHub.Portal.Server/Controllers/v1.0/DeviceModelControllerBase.cs b/src/AzureIoTHub.Portal.Server/Controllers/v1.0/DeviceModelControllerBase.cs
@@ -5,7 +5,7 @@ namespace AzureIoTHub.Portal.Server.Controllers.V10
 {
     using System.Collections.Generic;
     using System.Threading.Tasks;
-    using Services;
+    using AzureIoTHub.Portal.Application.Services;
     using AzureIoTHub.Portal.Shared.Models;
     using Microsoft.AspNetCore.Http;
     using Microsoft.AspNetCore.Mvc;

diff --git a/src/AzureIoTHub.Portal.Server/Controllers/v1.0/DeviceModelPropertiesController.cs b/src/AzureIoTHub.Portal.Server/Controllers/v1.0/DeviceModelPropertiesController.cs
@@ -6,8 +6,8 @@ namespace AzureIoTHub.Portal.Server.Controllers.V10
     using System.Collections.Generic;
     using System.Threading.Tasks;
     using AutoMapper;
+    using AzureIoTHub.Portal.Application.Services;
     using AzureIoTHub.Portal.Models.v10;
-    using AzureIoTHub.Portal.Server.Services;
     using Microsoft.AspNetCore.Authorization;
     using Microsoft.AspNetCore.Http;
     using Microsoft.AspNetCore.Mvc;

diff --git a/src/AzureIoTHub.Portal.Server/Controllers/v1.0/DeviceModelPropertiesControllerBase.cs b/src/AzureIoTHub.Portal.Server/Controllers/v1.0/DeviceModelPropertiesControllerBase.cs
@@ -7,10 +7,10 @@ namespace AzureIoTHub.Portal.Server.Controllers.V10
     using System.Linq;
     using System.Threading.Tasks;
     using AutoMapper;
+    using AzureIoTHub.Portal.Application.Services;
     using AzureIoTHub.Portal.Domain.Entities;
     using AzureIoTHub.Portal.Domain.Exceptions;
     using AzureIoTHub.Portal.Models.v10;
-    using AzureIoTHub.Portal.Server.Services;
     using Hellang.Middleware.ProblemDetails;
     using Microsoft.AspNetCore.Http;
     using Microsoft.AspNetCore.Mvc;

diff --git a/src/AzureIoTHub.Portal.Server/Controllers/v1.0/DeviceModelsController.cs b/src/AzureIoTHub.Portal.Server/Controllers/v1.0/DeviceModelsController.cs
@@ -6,7 +6,7 @@ namespace AzureIoTHub.Portal.Server.Controllers.V10
     using System.Collections.Generic;
     using System.Threading.Tasks;
     using AzureIoTHub.Portal.Models.v10;
-    using Services;
+    using AzureIoTHub.Portal.Application.Services;
     using Microsoft.AspNetCore.Authorization;
     using Microsoft.AspNetCore.Http;
     using Microsoft.AspNetCore.Mvc;

diff --git a/src/AzureIoTHub.Portal.Server/Controllers/v1.0/DeviceTagSettingsController.cs b/src/AzureIoTHub.Portal.Server/Controllers/v1.0/DeviceTagSettingsController.cs
@@ -3,14 +3,14 @@
 
 namespace AzureIoTHub.Portal.Server.Controllers.V10
 {
-    using AzureIoTHub.Portal.Server.Services;
-    using AzureIoTHub.Portal.Models.v10;
-    using Microsoft.AspNetCore.Mvc;
-    using Microsoft.Extensions.Logging;
     using System;
     using System.Collections.Generic;
     using System.Threading.Tasks;
+    using AzureIoTHub.Portal.Application.Services;
+    using AzureIoTHub.Portal.Models.v10;
     using Microsoft.AspNetCore.Authorization;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.Extensions.Logging;
 
     [Authorize]
     [ApiController]

diff --git a/src/AzureIoTHub.Portal.Server/Controllers/v1.0/DevicesController.cs b/src/AzureIoTHub.Portal.Server/Controllers/v1.0/DevicesController.cs
@@ -5,12 +5,12 @@ namespace AzureIoTHub.Portal.Server.Controllers.V10
 {
     using System.Collections.Generic;
     using System.Threading.Tasks;
+    using AzureIoTHub.Portal.Application.Services;
     using AzureIoTHub.Portal.Models.v10;
     using AzureIoTHub.Portal.Shared.Models.v10;
     using Microsoft.AspNetCore.Authorization;
     using Microsoft.AspNetCore.Mvc;
     using Microsoft.Extensions.Logging;
-    using Services;
 
     [Authorize]
     [ApiController]

diff --git a/src/AzureIoTHub.Portal.Server/Controllers/v1.0/DevicesControllerBase.cs b/src/AzureIoTHub.Portal.Server/Controllers/v1.0/DevicesControllerBase.cs
@@ -7,14 +7,14 @@ namespace AzureIoTHub.Portal.Server.Controllers.V10
     using System.Collections.Generic;
     using System.Linq;
     using System.Threading.Tasks;
+    using AzureIoTHub.Portal.Application.Services;
     using AzureIoTHub.Portal.Shared.Models.v10;
     using Hellang.Middleware.ProblemDetails;
     using Microsoft.AspNetCore.Http;
     using Microsoft.AspNetCore.Mvc;
     using Microsoft.AspNetCore.Mvc.Routing;
     using Microsoft.Extensions.Logging;
     using Models.v10;
-    using Services;
     using Shared.Models;
 
     public abstract class DevicesControllerBase<TDto> : ControllerBase

diff --git a/src/AzureIoTHub.Portal.Server/Controllers/v1.0/EdgeDevicesController.cs b/src/AzureIoTHub.Portal.Server/Controllers/v1.0/EdgeDevicesController.cs
@@ -7,9 +7,9 @@ namespace AzureIoTHub.Portal.Server.Controllers.V10
     using System.Collections.Generic;
     using System.Linq;
     using System.Threading.Tasks;
+    using AzureIoTHub.Portal.Application.Services;
     using AzureIoTHub.Portal.Domain.Exceptions;
     using AzureIoTHub.Portal.Models.v10;
-    using AzureIoTHub.Portal.Server.Services;
     using AzureIoTHub.Portal.Shared.Models.v10;
     using Microsoft.AspNetCore.Authorization;
     using Microsoft.AspNetCore.Http;