Refactoring of report processors

MarkBurt · Jul 5, 2022 · 53e439d · 53e439d
1 parent 67a775a
commit 53e439d
Show file tree

Hide file tree

Showing 14 changed files with 44 additions and 46 deletions.
diff --git a/src/Zeus.Infrastructure/Configuration/Modules/PlcModule.cs b/src/Zeus.Infrastructure/Configuration/Modules/PlcModule.cs
diff --git a/src/Zeus.Infrastructure/Configuration/Modules/ReportModule.cs b/src/Zeus.Infrastructure/Configuration/Modules/ReportModule.cs
@@ -1,13 +1,33 @@
 using Autofac;
+using Zeus.Enums.Plcs;
 using Zeus.Enums.Reports;
-using Zeus.Infrastructure.Reports;
-using Zeus.Infrastructure.Reports.Base;
+using Zeus.Infrastructure.Reports.Plcs;
+using Zeus.Infrastructure.Reports.Plcs.Base;
+using Zeus.Infrastructure.Reports.Types;
+using Zeus.Infrastructure.Reports.Types.Base;
 
 namespace Zeus.Infrastructure.Configuration.Modules
 {
    internal sealed class ReportModule : Module
    {
       protected override void Load(ContainerBuilder builder)
+      {
+         RegisterPlcProcessors(builder);
+         RegisterTypeProcessors(builder);
+      }
+
+      private static void RegisterPlcProcessors(ContainerBuilder builder)
+      {
+         builder
+            .RegisterType<MeterPlcProcessor>()
+            .Keyed<IPlcProcessor>(PlcType.Meter);
+
+         builder
+            .RegisterType<Rvd145PlcProcessor>()
+            .Keyed<IPlcProcessor>(PlcType.Rvd145);
+      }
+
+      private static void RegisterTypeProcessors(ContainerBuilder builder)
       {
          builder
             .RegisterType<DayReportProcessor>()

diff --git a/src/Zeus.Infrastructure/Configuration/ZeusModule.cs b/src/Zeus.Infrastructure/Configuration/ZeusModule.cs
@@ -30,7 +30,6 @@ private void RegisterMappers(ContainerBuilder builder)
       private void RegisterModules(ContainerBuilder builder)
       {
          builder.RegisterModule<MongoModule>();
-         builder.RegisterModule<PlcModule>();
          builder.RegisterModule<ReportModule>();
          builder.RegisterModule<MediatorModule>();
          builder.RegisterModule(new SettingsModule(_configuration));

diff --git a/src/Zeus.Infrastructure/Handlers/Reports/Queries/GetReportHandler.cs b/src/Zeus.Infrastructure/Handlers/Reports/Queries/GetReportHandler.cs
@@ -13,8 +13,8 @@
 using Zeus.Infrastructure.Extensions;
 using Zeus.Infrastructure.Handlers.Base;
 using Zeus.Infrastructure.Mongo;
-using Zeus.Infrastructure.Plc.Base;
-using Zeus.Infrastructure.Reports.Base;
+using Zeus.Infrastructure.Reports.Plcs.Base;
+using Zeus.Infrastructure.Reports.Types.Base;
 using Zeus.Infrastructure.Repositories;
 using Zeus.Models.Devices.Dto;
 using Zeus.Models.Locations.Dto;

diff --git a/...frastructure/Plc/Base/BasePlcProcessor.cs → ...ure/Reports/Plcs/Base/BasePlcProcessor.cs b/...frastructure/Plc/Base/BasePlcProcessor.cs → ...ure/Reports/Plcs/Base/BasePlcProcessor.cs
@@ -7,12 +7,12 @@
 using MongoDB.Driver;
 using MongoDB.Driver.Linq;
 using Zeus.Domain.Base;
-using Zeus.Infrastructure.Reports.Base;
+using Zeus.Infrastructure.Reports.Types.Base;
 using Zeus.Models.Base.Dto;
 using Zeus.Models.Devices.Dto;
 using Zeus.Models.Utilities;
 
-namespace Zeus.Infrastructure.Plc.Base
+namespace Zeus.Infrastructure.Reports.Plcs.Base
 {
    internal abstract class BasePlcProcessor
    {

diff --git a/....Infrastructure/Plc/Base/IPlcProcessor.cs → ...ucture/Reports/Plcs/Base/IPlcProcessor.cs b/....Infrastructure/Plc/Base/IPlcProcessor.cs → ...ucture/Reports/Plcs/Base/IPlcProcessor.cs
@@ -4,11 +4,11 @@
 using System.Threading.Tasks;
 using AutoMapper;
 using OfficeOpenXml;
-using Zeus.Infrastructure.Reports.Base;
+using Zeus.Infrastructure.Reports.Types.Base;
 using Zeus.Infrastructure.Repositories;
 using Zeus.Models.Devices.Dto;
 
-namespace Zeus.Infrastructure.Plc.Base
+namespace Zeus.Infrastructure.Reports.Plcs.Base
 {
    internal interface IPlcProcessor
    {

diff --git a/...s.Infrastructure/Plc/MeterPlcProcessor.cs → ...ructure/Reports/Plcs/MeterPlcProcessor.cs b/...s.Infrastructure/Plc/MeterPlcProcessor.cs → ...ructure/Reports/Plcs/MeterPlcProcessor.cs
@@ -10,15 +10,15 @@
 using OfficeOpenXml;
 using Zeus.Domain.Plcs.Meters;
 using Zeus.Infrastructure.Mongo;
-using Zeus.Infrastructure.Plc.Base;
-using Zeus.Infrastructure.Reports.Base;
+using Zeus.Infrastructure.Reports.Plcs.Base;
+using Zeus.Infrastructure.Reports.Types.Base;
 using Zeus.Infrastructure.Repositories;
 using Zeus.Models.Devices.Dto;
 using Zeus.Models.Plcs.Meters.Dto;
 using Zeus.Models.Utilities;
 using Zeus.Utilities.Extensions;
 
-namespace Zeus.Infrastructure.Plc
+namespace Zeus.Infrastructure.Reports.Plcs
 {
    internal sealed class MeterPlcProcessor : BasePlcProcessor, IPlcProcessor
    {

diff --git a/....Infrastructure/Plc/Rvd145PlcProcessor.cs → ...ucture/Reports/Plcs/Rvd145PlcProcessor.cs b/....Infrastructure/Plc/Rvd145PlcProcessor.cs → ...ucture/Reports/Plcs/Rvd145PlcProcessor.cs
@@ -8,14 +8,14 @@
 using MongoDB.Driver;
 using OfficeOpenXml;
 using Zeus.Domain.Plcs.Rvds;
-using Zeus.Infrastructure.Plc.Base;
-using Zeus.Infrastructure.Reports.Base;
+using Zeus.Infrastructure.Reports.Plcs.Base;
+using Zeus.Infrastructure.Reports.Types.Base;
 using Zeus.Infrastructure.Repositories;
 using Zeus.Models.Devices.Dto;
 using Zeus.Models.Plcs.Rvds.Dto;
 using Zeus.Utilities.Extensions;
 
-namespace Zeus.Infrastructure.Plc
+namespace Zeus.Infrastructure.Reports.Plcs
 {
    internal sealed class Rvd145PlcProcessor : BasePlcProcessor, IPlcProcessor
    {

diff --git a/...cture/Reports/Base/BaseReportProcessor.cs → ...Reports/Types/Base/BaseReportProcessor.cs b/...cture/Reports/Base/BaseReportProcessor.cs → ...Reports/Types/Base/BaseReportProcessor.cs
@@ -1,7 +1,7 @@
 using System;
 using Zeus.Models.Utilities;
 
-namespace Zeus.Infrastructure.Reports.Base
+namespace Zeus.Infrastructure.Reports.Types.Base
 {
    internal abstract class BaseReportProcessor
    {

diff --git a/...tructure/Reports/Base/IReportProcessor.cs → ...re/Reports/Types/Base/IReportProcessor.cs b/...tructure/Reports/Base/IReportProcessor.cs → ...re/Reports/Types/Base/IReportProcessor.cs
@@ -4,7 +4,7 @@
 using Zeus.Enums.Reports;
 using Zeus.Models.Utilities;
 
-namespace Zeus.Infrastructure.Reports.Base
+namespace Zeus.Infrastructure.Reports.Types.Base
 {
    internal interface IReportProcessor
    {

diff --git a/...cture/Reports/DayOfYearReportProcessor.cs → ...Reports/Types/DayOfYearReportProcessor.cs b/...cture/Reports/DayOfYearReportProcessor.cs → ...Reports/Types/DayOfYearReportProcessor.cs
@@ -2,10 +2,10 @@
 using System.Linq.Expressions;
 using Zeus.Domain.Base;
 using Zeus.Enums.Reports;
-using Zeus.Infrastructure.Reports.Base;
+using Zeus.Infrastructure.Reports.Types.Base;
 using Zeus.Models.Utilities;
 
-namespace Zeus.Infrastructure.Reports
+namespace Zeus.Infrastructure.Reports.Types
 {
    internal sealed class DayOfYearReportProcessor : BaseReportProcessor, IReportProcessor
    {

diff --git a/...rastructure/Reports/DayReportProcessor.cs → ...cture/Reports/Types/DayReportProcessor.cs b/...rastructure/Reports/DayReportProcessor.cs → ...cture/Reports/Types/DayReportProcessor.cs
@@ -2,10 +2,10 @@
 using System.Linq.Expressions;
 using Zeus.Domain.Base;
 using Zeus.Enums.Reports;
-using Zeus.Infrastructure.Reports.Base;
+using Zeus.Infrastructure.Reports.Types.Base;
 using Zeus.Models.Utilities;
 
-namespace Zeus.Infrastructure.Reports
+namespace Zeus.Infrastructure.Reports.Types
 {
    internal sealed class DayReportProcessor : BaseReportProcessor, IReportProcessor
    {

diff --git a/...structure/Reports/MonthReportProcessor.cs → ...ure/Reports/Types/MonthReportProcessor.cs b/...structure/Reports/MonthReportProcessor.cs → ...ure/Reports/Types/MonthReportProcessor.cs
@@ -2,10 +2,10 @@
 using System.Linq.Expressions;
 using Zeus.Domain.Base;
 using Zeus.Enums.Reports;
-using Zeus.Infrastructure.Reports.Base;
+using Zeus.Infrastructure.Reports.Types.Base;
 using Zeus.Models.Utilities;
 
-namespace Zeus.Infrastructure.Reports
+namespace Zeus.Infrastructure.Reports.Types
 {
    internal sealed class MonthReportProcessor : BaseReportProcessor, IReportProcessor
    {

diff --git a/...astructure/Reports/YearReportProcessor.cs → ...ture/Reports/Types/YearReportProcessor.cs b/...astructure/Reports/YearReportProcessor.cs → ...ture/Reports/Types/YearReportProcessor.cs
@@ -2,10 +2,10 @@
 using System.Linq.Expressions;
 using Zeus.Domain.Base;
 using Zeus.Enums.Reports;
-using Zeus.Infrastructure.Reports.Base;
+using Zeus.Infrastructure.Reports.Types.Base;
 using Zeus.Models.Utilities;
 
-namespace Zeus.Infrastructure.Reports
+namespace Zeus.Infrastructure.Reports.Types
 {
    internal sealed class YearReportProcessor : BaseReportProcessor, IReportProcessor
    {