diff --git a/MyCore.Devices/Class1.cs b/MyCore.Devices/Class1.cs new file mode 100644 index 0000000..fb507bb --- /dev/null +++ b/MyCore.Devices/Class1.cs @@ -0,0 +1,8 @@ +using System; + +namespace MyCore.Devices +{ + public class Class1 + { + } +} diff --git a/MyCore.Devices/MyCore.Devices.csproj b/MyCore.Devices/MyCore.Devices.csproj new file mode 100644 index 0000000..d4c395e --- /dev/null +++ b/MyCore.Devices/MyCore.Devices.csproj @@ -0,0 +1,7 @@ + + + + netstandard2.1 + + + diff --git a/MyCore.sln b/MyCore.sln index 86f9d5f..fd470d6 100644 --- a/MyCore.sln +++ b/MyCore.sln @@ -1,9 +1,11 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.28307.168 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29709.97 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyCore", "MyCore\MyCore.csproj", "{017065F0-FC61-4566-A432-F414FC217AAA}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCore", "MyCore\MyCore.csproj", "{017065F0-FC61-4566-A432-F414FC217AAA}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyCore.Devices", "MyCore.Devices\MyCore.Devices.csproj", "{7B9FE719-FBF7-42D5-BCF5-BDA31B05D66D}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -15,6 +17,10 @@ Global {017065F0-FC61-4566-A432-F414FC217AAA}.Debug|Any CPU.Build.0 = Debug|Any CPU {017065F0-FC61-4566-A432-F414FC217AAA}.Release|Any CPU.ActiveCfg = Release|Any CPU {017065F0-FC61-4566-A432-F414FC217AAA}.Release|Any CPU.Build.0 = Release|Any CPU + {7B9FE719-FBF7-42D5-BCF5-BDA31B05D66D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7B9FE719-FBF7-42D5-BCF5-BDA31B05D66D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7B9FE719-FBF7-42D5-BCF5-BDA31B05D66D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7B9FE719-FBF7-42D5-BCF5-BDA31B05D66D}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/MyCore/Controllers/Devices/DeviceController.cs b/MyCore/Controllers/Devices/DeviceController.cs index efaae18..6ba322c 100644 --- a/MyCore/Controllers/Devices/DeviceController.cs +++ b/MyCore/Controllers/Devices/DeviceController.cs @@ -27,9 +27,9 @@ namespace MyCore.Controllers.Devices public DeviceController(DeviceDatabaseService DeviceDatabaseService, ProviderDatabaseService ProviderDatabaseService, LocationDatabaseService LocationDatabaseService) { - _DeviceDatabaseService = DeviceDatabaseService; - _ProviderDatabaseService = ProviderDatabaseService; - _LocationDatabaseService = LocationDatabaseService; + this._DeviceDatabaseService = DeviceDatabaseService; + this._ProviderDatabaseService = ProviderDatabaseService; + this._LocationDatabaseService = LocationDatabaseService; } // GET: Devices @@ -88,7 +88,7 @@ namespace MyCore.Controllers.Devices if (deviceDetailDTO == null) throw new KeyNotFoundException("Device is null"); - DeviceDetailDTO deviceCreated = DeviceService.CreateOrUpdate(deviceDetailDTO, true); + DeviceDetailDTO deviceCreated = DeviceService.CreateOrUpdate(this._DeviceDatabaseService, this._ProviderDatabaseService, this._LocationDatabaseService, deviceDetailDTO, true); return new OkObjectResult(deviceCreated); @@ -117,7 +117,7 @@ namespace MyCore.Controllers.Devices if (userId == null && UserService.IsExist(userId)) throw new KeyNotFoundException("User not found"); - Provider provider = ProviderService.GetProviderById(userId, providerId); + Provider provider = ProviderService.GetProviderById(this._ProviderDatabaseService, userId, providerId); if (provider != null) throw new KeyNotFoundException("Provider id is null"); @@ -150,7 +150,7 @@ namespace MyCore.Controllers.Devices if (!_DeviceDatabaseService.IsExist(deviceId)) throw new KeyNotFoundException("Device does not exist"); - DeviceDetailDTO deviceUpdated = DeviceService.CreateOrUpdate(deviceDetailDTO, false); + DeviceDetailDTO deviceUpdated = DeviceService.CreateOrUpdate(this._DeviceDatabaseService, this._ProviderDatabaseService, this._LocationDatabaseService, deviceDetailDTO, false); return new OkObjectResult(deviceUpdated); } diff --git a/MyCore/Controllers/Devices/ProviderController.cs b/MyCore/Controllers/Devices/ProviderController.cs index 9569220..21d5dba 100644 --- a/MyCore/Controllers/Devices/ProviderController.cs +++ b/MyCore/Controllers/Devices/ProviderController.cs @@ -22,6 +22,16 @@ namespace MyCore.Controllers.Devices [ApiController] public class ProviderController : ControllerBase { + private readonly DeviceDatabaseService _DeviceDatabaseService; + private readonly ProviderDatabaseService _ProviderDatabaseService; + private readonly LocationDatabaseService _LocationDatabaseService; + + public ProviderController(DeviceDatabaseService DeviceDatabaseService, ProviderDatabaseService ProviderDatabaseService, LocationDatabaseService LocationDatabaseService) + { + this._DeviceDatabaseService = DeviceDatabaseService; + this._ProviderDatabaseService = ProviderDatabaseService; + this._LocationDatabaseService = LocationDatabaseService; + } // GET: Devices /// @@ -33,7 +43,7 @@ namespace MyCore.Controllers.Devices { try { - List providers = ProviderService.GetAll(userId); + List providers = ProviderService.GetAll(this._ProviderDatabaseService, userId); List providersDTO = providers.Select(p => p.ToDTO()).ToList(); @@ -63,7 +73,7 @@ namespace MyCore.Controllers.Devices if (providerDTO == null) throw new KeyNotFoundException("Provider is null"); - ProviderDTO providerCreated = ProviderService.CreateOrUpdate(userId, providerDTO, true); + ProviderDTO providerCreated = ProviderService.CreateOrUpdate(this._ProviderDatabaseService, userId, providerDTO, true); return new OkObjectResult(providerCreated); @@ -92,10 +102,10 @@ namespace MyCore.Controllers.Devices if (userId == null && UserService.IsExist(userId)) throw new KeyNotFoundException("User not found"); - if (!ProviderService.IsExist(userId, providerDTO.Id)) + if (!ProviderService.IsExist(this._ProviderDatabaseService, userId, providerDTO.Id)) throw new KeyNotFoundException("Provider does not exist"); - ProviderDTO providerUpdated = ProviderService.CreateOrUpdate(userId, providerDTO, false); + ProviderDTO providerUpdated = ProviderService.CreateOrUpdate(this._ProviderDatabaseService, userId, providerDTO, false); return new OkObjectResult(providerUpdated); } diff --git a/MyCore/MyCore.csproj b/MyCore/MyCore.csproj index ecb61a8..33c3b78 100644 --- a/MyCore/MyCore.csproj +++ b/MyCore/MyCore.csproj @@ -1,7 +1,7 @@  - netcoreapp2.1 + netcoreapp3.1 Linux 6d53b0c4-74d6-41aa-8816-2ec3cf42767a diff --git a/MyCore/Services/Devices/DeviceService.cs b/MyCore/Services/Devices/DeviceService.cs index c04d94a..c29c6e5 100644 --- a/MyCore/Services/Devices/DeviceService.cs +++ b/MyCore/Services/Devices/DeviceService.cs @@ -12,18 +12,8 @@ namespace MyCore.Services.Devices { public class DeviceService { - private static DeviceDatabaseService _DeviceDatabaseService; - private static ProviderDatabaseService _ProviderDatabaseService; - private static LocationDatabaseService _LocationDatabaseService; - public DeviceService(DeviceDatabaseService DeviceDatabaseService, ProviderDatabaseService ProviderDatabaseService, LocationDatabaseService LocationDatabaseService) - { - _DeviceDatabaseService = DeviceDatabaseService; - _ProviderDatabaseService = ProviderDatabaseService; - _LocationDatabaseService = LocationDatabaseService; - } - - public static DeviceDetailDTO CreateOrUpdate(DeviceDetailDTO deviceDetailDTO, bool create) + public static DeviceDetailDTO CreateOrUpdate(DeviceDatabaseService _DeviceDatabaseService, ProviderDatabaseService _ProviderDatabaseService, LocationDatabaseService _LocationDatabaseService, DeviceDetailDTO deviceDetailDTO, bool create) { Device device; if (create) diff --git a/MyCore/Services/MyControlPanel/ProviderService.cs b/MyCore/Services/MyControlPanel/ProviderService.cs index 037b7af..a3d79fc 100644 --- a/MyCore/Services/MyControlPanel/ProviderService.cs +++ b/MyCore/Services/MyControlPanel/ProviderService.cs @@ -17,24 +17,17 @@ namespace MyCore.Services.MyControlPanel "ZigBee" }; - private readonly ProviderDatabaseService _ProviderDatabaseService; - - public ProviderService(ProviderDatabaseService ProviderDatabaseService) - { - _ProviderDatabaseService = ProviderDatabaseService; - } - - public static bool IsExist(string userId, string providerId) + public static bool IsExist(ProviderDatabaseService _ProviderDatabaseService, string userId, string providerId) { return _ProviderDatabaseService.GetById(userId, providerId) != null ? true : false; } - public static List GetAll(string userId) + public static List GetAll(ProviderDatabaseService _ProviderDatabaseService, string userId) { return _ProviderDatabaseService.GetAll(userId); } - public static ProviderDTO CreateOrUpdate(string userId, ProviderDTO providerDTO, bool create) + public static ProviderDTO CreateOrUpdate(ProviderDatabaseService _ProviderDatabaseService, string userId, ProviderDTO providerDTO, bool create) { Provider provider; if (create) @@ -59,7 +52,7 @@ namespace MyCore.Services.MyControlPanel return _ProviderDatabaseService.Update(provider.Id, provider).ToDTO(); } - public static Provider GetProviderById(string userId, string providerId) + public static Provider GetProviderById(ProviderDatabaseService _ProviderDatabaseService, string userId, string providerId) { return _ProviderDatabaseService.GetById(userId, providerId); }