diff --git a/PARR.DAL/ParrDalInstaller.cs b/PARR.DAL/ParrDalInstaller.cs index 443f9368..ad24428e 100644 --- a/PARR.DAL/ParrDalInstaller.cs +++ b/PARR.DAL/ParrDalInstaller.cs @@ -33,7 +33,12 @@ namespace PARR.DAL services.AddTransient(); services.AddTransient(); services.AddTransient(); - services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); diff --git a/PARR.DAL/Services/Implementations/ApplicationInWorkService.cs b/PARR.DAL/Services/Implementations/ApplicationsInWorkService.cs similarity index 65% rename from PARR.DAL/Services/Implementations/ApplicationInWorkService.cs rename to PARR.DAL/Services/Implementations/ApplicationsInWorkService.cs index 74efb3fa..38c5b74c 100644 --- a/PARR.DAL/Services/Implementations/ApplicationInWorkService.cs +++ b/PARR.DAL/Services/Implementations/ApplicationsInWorkService.cs @@ -7,12 +7,12 @@ using PARR.DAL.Services.Interfaces; namespace PARR.DAL.Services.Implementations { - internal class ApplicationInWorkService : BaseService, IApplicationInWorkService + internal class ApplicationsInWorkService : BaseService, IApplicationsInWorkService { private readonly DataContext dataContext; - private readonly ILogger logger; + private readonly ILogger logger; - public ApplicationInWorkService(DataContext dataContext, ILogger logger) : base(logger) + public ApplicationsInWorkService(DataContext dataContext, ILogger logger) : base(logger) { this.dataContext = dataContext; this.logger = logger; diff --git a/PARR.DAL/Services/Implementations/ProcessService.cs b/PARR.DAL/Services/Implementations/ProcessService.cs new file mode 100644 index 00000000..c6c512ee --- /dev/null +++ b/PARR.DAL/Services/Implementations/ProcessService.cs @@ -0,0 +1,24 @@ +using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.Logging; +using PARR.DAL.Context; +using PARR.DAL.Models; +using PARR.DAL.Services.Abstracts; +using PARR.DAL.Services.Interfaces; + +namespace PARR.DAL.Services.Implementations +{ + internal class ProcessService : BaseService, IProcessService + { + private readonly ILogger logger; + private readonly DataContext dataContext; + + public ProcessService(ILogger logger, DataContext dataContext) : base(logger) + { + this.logger = logger; + this.dataContext = dataContext; + } + protected override DbSet EntitySet => dataContext.Processes; + + protected override DataContext EntitiContext => dataContext; + } +} diff --git a/PARR.DAL/Services/Implementations/SubprocessService.cs b/PARR.DAL/Services/Implementations/SubprocessService.cs new file mode 100644 index 00000000..2f042652 --- /dev/null +++ b/PARR.DAL/Services/Implementations/SubprocessService.cs @@ -0,0 +1,24 @@ +using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.Logging; +using PARR.DAL.Context; +using PARR.DAL.Models; +using PARR.DAL.Services.Abstracts; +using PARR.DAL.Services.Interfaces; + +namespace PARR.DAL.Services.Implementations +{ + internal class SubprocessService : BaseService, ISubprocessService + { + private readonly ILogger logger; + private readonly DataContext dataContext; + + public SubprocessService(ILogger logger, DataContext dataContext) : base(logger) + { + this.logger = logger; + this.dataContext = dataContext; + } + protected override DbSet EntitySet => dataContext.Subprocesses; + + protected override DataContext EntitiContext => dataContext; + } +} diff --git a/PARR.DAL/Services/Implementations/TnkService.cs b/PARR.DAL/Services/Implementations/TnkService.cs new file mode 100644 index 00000000..9823c757 --- /dev/null +++ b/PARR.DAL/Services/Implementations/TnkService.cs @@ -0,0 +1,24 @@ +using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.Logging; +using PARR.DAL.Context; +using PARR.DAL.Models; +using PARR.DAL.Services.Abstracts; +using PARR.DAL.Services.Interfaces; + +namespace PARR.DAL.Services.Implementations +{ + internal class TnkService : BaseService, ITnkService + { + private readonly ILogger logger; + private readonly DataContext dataContext; + + public TnkService(ILogger logger, DataContext dataContext) : base(logger) + { + this.logger = logger; + this.dataContext = dataContext; + } + protected override DbSet EntitySet => dataContext.Tnks; + + protected override DataContext EntitiContext => dataContext; + } +} diff --git a/PARR.DAL/Services/Implementations/WorkService.cs b/PARR.DAL/Services/Implementations/WorkService.cs new file mode 100644 index 00000000..edd3bc8e --- /dev/null +++ b/PARR.DAL/Services/Implementations/WorkService.cs @@ -0,0 +1,25 @@ +using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.Logging; +using PARR.DAL.Context; +using PARR.DAL.Models; +using PARR.DAL.Services.Abstracts; +using PARR.DAL.Services.Interfaces; + +namespace PARR.DAL.Services.Implementations +{ + + internal class WorkService : BaseService, IWorkService + { + private readonly DataContext dataContext; + private readonly ILogger logger; + + public WorkService(DataContext dataContext, ILogger logger) : base(logger) + { + this.dataContext = dataContext; + this.logger = logger; + } + protected override DbSet EntitySet => dataContext.Works; + + protected override DataContext EntitiContext => dataContext; + } +} diff --git a/PARR.DAL/Services/Interfaces/IApplicationsInWorkService.cs b/PARR.DAL/Services/Interfaces/IApplicationsInWorkService.cs new file mode 100644 index 00000000..4b8f38ad --- /dev/null +++ b/PARR.DAL/Services/Interfaces/IApplicationsInWorkService.cs @@ -0,0 +1,9 @@ +using PARR.DAL.Models; +using PARR.DAL.Services.Interfaces.Base; + +namespace PARR.DAL.Services.Interfaces +{ + public interface IApplicationsInWorkService : IBaseService + { + } +} diff --git a/PARR.DAL/Services/Interfaces/IApplicationInWorkService.cs b/PARR.DAL/Services/Interfaces/IProcessService.cs similarity index 60% rename from PARR.DAL/Services/Interfaces/IApplicationInWorkService.cs rename to PARR.DAL/Services/Interfaces/IProcessService.cs index a9cab74b..bb115848 100644 --- a/PARR.DAL/Services/Interfaces/IApplicationInWorkService.cs +++ b/PARR.DAL/Services/Interfaces/IProcessService.cs @@ -3,7 +3,7 @@ using PARR.DAL.Services.Interfaces.Base; namespace PARR.DAL.Services.Interfaces { - public interface IApplicationInWorkService : IBaseService + public interface IProcessService : IBaseService { } } diff --git a/PARR.DAL/Services/Interfaces/ISubprocessService.cs b/PARR.DAL/Services/Interfaces/ISubprocessService.cs new file mode 100644 index 00000000..d336c2dc --- /dev/null +++ b/PARR.DAL/Services/Interfaces/ISubprocessService.cs @@ -0,0 +1,9 @@ +using PARR.DAL.Models; +using PARR.DAL.Services.Interfaces.Base; + +namespace PARR.DAL.Services.Interfaces +{ + public interface ISubprocessService : IBaseService + { + } +} diff --git a/PARR.DAL/Services/Interfaces/ITnkService.cs b/PARR.DAL/Services/Interfaces/ITnkService.cs new file mode 100644 index 00000000..36aeff1b --- /dev/null +++ b/PARR.DAL/Services/Interfaces/ITnkService.cs @@ -0,0 +1,9 @@ +using PARR.DAL.Models; +using PARR.DAL.Services.Interfaces.Base; + +namespace PARR.DAL.Services.Interfaces +{ + public interface ITnkService : IBaseService + { + } +} diff --git a/PARR.DAL/Services/Interfaces/IWorkService.cs b/PARR.DAL/Services/Interfaces/IWorkService.cs new file mode 100644 index 00000000..53718b5a --- /dev/null +++ b/PARR.DAL/Services/Interfaces/IWorkService.cs @@ -0,0 +1,9 @@ +using PARR.DAL.Models; +using PARR.DAL.Services.Interfaces.Base; + +namespace PARR.DAL.Services.Interfaces +{ + public interface IWorkService : IBaseService + { + } +} diff --git a/PARR.MockData/Services/TemplatesInitializer.cs b/PARR.MockData/Services/TemplatesInitializer.cs index a3573d47..d17c11f9 100644 --- a/PARR.MockData/Services/TemplatesInitializer.cs +++ b/PARR.MockData/Services/TemplatesInitializer.cs @@ -1,5 +1,5 @@ -using Microsoft.Extensions.Logging; -using PARR.DAL.Contracts; +using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.Logging; using PARR.DAL.Models; using PARR.DAL.Services.Interfaces; @@ -9,243 +9,108 @@ namespace PARR.MockData.Services { private readonly ILogger logger; private readonly ITemplateService templateService; + private readonly IProcessService processService; + private readonly ISubprocessService subprocessService; + private readonly ITnkService tnkService; + private readonly IWorkService workService; public TemplatesInitializer( ILogger logger, - ITemplateService templateService + ITemplateService templateService, + IProcessService processService, + ISubprocessService subprocessService, + ITnkService tnkService, + IWorkService workService ) { this.logger = logger; this.templateService = templateService; + this.processService = processService; + this.subprocessService = subprocessService; + this.tnkService = tnkService; + this.workService = workService; } public async Task InitAsync() { - var templates = new List