Merge pull request #136 from loresoft/develop

upgrade
loresoft · Dec 28, 2022 · 950c427 · 950c427
2 parents dc3cc03 + d3fed68
commit 950c427
Show file tree

Hide file tree

Showing 40 changed files with 356 additions and 216 deletions.
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -21,14 +21,14 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
-      - name: Setup .NET 6.0
-        uses: actions/setup-dotnet@v1
+      - name: Setup .NET 7.0
+        uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: 6.0.x
+          dotnet-version: 7.0.x
 
       - name: Setup MSBuild
         uses: microsoft/[email protected]
@@ -49,14 +49,14 @@ jobs:
 
       - name: Upload WebApplication Artifact
         if: success()
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: WebApplication
           path: '${{env.BUILD_PATH}}/WebApplication'
 
       - name: Upload Database Artifact
         if: success()
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: Database
           path: '${{env.BUILD_PATH}}/Database'
@@ -68,7 +68,7 @@ jobs:
 
     steps:
       - name: Download Web Application Artifact
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           name: WebApplication
 
@@ -97,22 +97,22 @@ jobs:
 
     steps:
       - name: Download Database Artifact
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           name: Database
 
       - name: Deploy SQL Server Database to Azure Staging
         if: github.ref == 'refs/heads/develop'
-        uses: azure/sql-action@v1
+        uses: azure/sql-action@v2
         with:
-          server-name: ${{secrets.AZURE_SQL_SERVER}}
           connection-string: ${{secrets.AZURE_SQL_CONNECTION_STAGING}}
-          dacpac-package: './InstructorIQ.dacpac'
+          path: './InstructorIQ.dacpac'
+          action: 'publish'
 
       - name: Deploy SQL Server Database to Azure Production
         if: github.ref == 'refs/heads/master'
-        uses: azure/sql-action@v1
+        uses: azure/sql-action@v2
         with:
-          server-name: ${{secrets.AZURE_SQL_SERVER}}
           connection-string: ${{secrets.AZURE_SQL_CONNECTION_PRODUCTION}}
-          dacpac-package: './InstructorIQ.dacpac'
+          path: './InstructorIQ.dacpac'
+          action: 'publish'
diff --git a/service/src/InstructorIQ.Core/Behaviors/AuthenticateEntityIdentifierCommandBehavior.cs b/service/src/InstructorIQ.Core/Behaviors/AuthenticateEntityIdentifierCommandBehavior.cs
@@ -1,8 +1,10 @@
-using System.Threading;
+using System.Threading;
 using System.Threading.Tasks;
+
 using MediatR;
 using MediatR.CommandQuery.Behaviors;
 using MediatR.CommandQuery.Commands;
+
 using Microsoft.Extensions.Logging;
 
 namespace InstructorIQ.Core.Behaviors
@@ -14,10 +16,10 @@ public AuthenticateEntityIdentifierCommandBehavior(ILoggerFactory loggerFactory)
         {
         }
 
-        protected override async Task<TReadModel> Process(EntityIdentifierCommand<TKey, TReadModel> request, CancellationToken cancellationToken, RequestHandlerDelegate<TReadModel> next)
+        protected override async Task<TReadModel> Process(EntityIdentifierCommand<TKey, TReadModel> request, RequestHandlerDelegate<TReadModel> next, CancellationToken cancellationToken)
         {
             // continue pipeline
             return await next().ConfigureAwait(false);
         }
     }
-}
+}
diff --git a/service/src/InstructorIQ.Core/Behaviors/TrackChangeEntityPatchCommandBehavior.cs b/service/src/InstructorIQ.Core/Behaviors/TrackChangeEntityPatchCommandBehavior.cs
@@ -1,8 +1,10 @@
-using System.Threading;
+using System.Threading;
 using System.Threading.Tasks;
+
 using MediatR;
 using MediatR.CommandQuery.Behaviors;
 using MediatR.CommandQuery.Commands;
+
 using Microsoft.Extensions.Logging;
 
 namespace InstructorIQ.Core.Behaviors
@@ -14,11 +16,11 @@ public TrackChangeEntityPatchCommandBehavior(ILoggerFactory loggerFactory) : bas
         {
         }
 
-        protected override async Task<TReadModel> Process(EntityPatchCommand<TKey, TReadModel> request, CancellationToken cancellationToken, RequestHandlerDelegate<TReadModel> next)
+        protected override async Task<TReadModel> Process(EntityPatchCommand<TKey, TReadModel> request, RequestHandlerDelegate<TReadModel> next, CancellationToken cancellationToken)
         {
             // continue pipeline
             return await next().ConfigureAwait(false);
         }
 
     }
-}
+}
diff --git a/service/src/InstructorIQ.Core/Behaviors/TrackChangeEntityUpdateCommandBehavior.cs b/service/src/InstructorIQ.Core/Behaviors/TrackChangeEntityUpdateCommandBehavior.cs
@@ -1,8 +1,10 @@
-using System.Threading;
+using System.Threading;
 using System.Threading.Tasks;
+
 using MediatR;
 using MediatR.CommandQuery.Behaviors;
 using MediatR.CommandQuery.Commands;
+
 using Microsoft.Extensions.Logging;
 
 namespace InstructorIQ.Core.Behaviors
@@ -14,10 +16,10 @@ public TrackChangeEntityUpdateCommandBehavior(ILoggerFactory loggerFactory) : ba
         {
         }
 
-        protected override async Task<TReadModel> Process(EntityUpdateCommand<TKey, TUpdateModel, TReadModel> request, CancellationToken cancellationToken, RequestHandlerDelegate<TReadModel> next)
+        protected override async Task<TReadModel> Process(EntityUpdateCommand<TKey, TUpdateModel, TReadModel> request, RequestHandlerDelegate<TReadModel> next, CancellationToken cancellationToken)
         {
             // continue pipeline
             return await next().ConfigureAwait(false);
         }
     }
-}
+}
diff --git a/service/src/InstructorIQ.Core/Data/DataServiceModule.cs b/service/src/InstructorIQ.Core/Data/DataServiceModule.cs
@@ -1,7 +1,7 @@
-using System.Collections.Generic;
 using FluentCommand;
-using InstructorIQ.Core.Options;
-using KickStart.DependencyInjection;
+
+using Injectio.Attributes;
+
 using Microsoft.Data.SqlClient;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
@@ -10,23 +10,26 @@
 
 namespace InstructorIQ.Core.Data
 {
-    public class DataServiceModule : IDependencyInjectionRegistration
+    public class DataServiceModule
     {
-        public void Register(IServiceCollection services, IDictionary<string, object> data)
-        {
-            data.TryGetValue(ConfigurationServiceModule.ConfigurationKey, out var configurationData);
 
-            if (!(configurationData is IConfiguration configuration))
-                return;
-
-            var connectionString = configuration.GetConnectionString("InstructorIQ");
+        [RegisterServices]
+        public void Register(IServiceCollection services)
+        {
+            services.AddDbContextPool<InstructorIQContext>((provider, options) =>
+            {
+                var configuration = provider.GetRequiredService<IConfiguration>();
+                var connectionString = configuration.GetConnectionString("InstructorIQ");
+                options.UseSqlServer(connectionString, providerOptions => providerOptions.EnableRetryOnFailure());
+            });
 
-            services.AddDbContext<InstructorIQContext>(
-                options => options.UseSqlServer(connectionString, providerOptions => providerOptions.EnableRetryOnFailure()),
-                ServiceLifetime.Transient
-            );
+            services.TryAddSingleton<IDataConfiguration>(provider =>
+            {
+                var configuration = provider.GetRequiredService<IConfiguration>();
+                var connectionString = configuration.GetConnectionString("InstructorIQ");
+                return new DataConfiguration(SqlClientFactory.Instance, connectionString);
+            });
 
-            services.TryAddSingleton<IDataConfiguration>(s => new DataConfiguration(SqlClientFactory.Instance, connectionString));
             services.TryAddTransient<IDataSession, DataSession>();
         }
     }

diff --git a/service/src/InstructorIQ.Core/Domain/Attendance/AttendanceServiceRegistration.cs b/service/src/InstructorIQ.Core/Domain/Attendance/AttendanceServiceRegistration.cs
@@ -1,10 +1,15 @@
-using System;
+using System;
 using System.Collections.Generic;
+
+using Injectio.Attributes;
+
 using InstructorIQ.Core.Data.Entities;
 using InstructorIQ.Core.Domain.Handlers;
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Domain.Queries;
+
 using MediatR;
+
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 
@@ -13,7 +18,8 @@ namespace InstructorIQ.Core.Domain
 {
     public class AttendanceServiceRegistration : DomainServiceRegistrationBase
     {
-        public override void Register(IServiceCollection services, IDictionary<string, object> data)
+        [RegisterServices]
+        public override void Register(IServiceCollection services)
         {
             RegisterEntityQuery<Guid, Attendance, AttendanceReadModel>(services);
             RegisterEntityQuery<Guid, Attendance, AttendanceSessionModel>(services);
@@ -24,4 +30,4 @@ public override void Register(IServiceCollection services, IDictionary<string, o
             services.TryAddTransient<IRequestHandler<AttendanceSessionQuery, IReadOnlyCollection<AttendanceSessionModel>>, AttendanceSessionQueryHandler>();
         }
     }
-}
+}
diff --git a/...rc/InstructorIQ.Core/Domain/AuthenticationEvent/AuthenticationEventServiceRegistration.cs b/...rc/InstructorIQ.Core/Domain/AuthenticationEvent/AuthenticationEventServiceRegistration.cs
@@ -1,14 +1,19 @@
 using System;
-using System.Collections.Generic;
-using Microsoft.Extensions.DependencyInjection;
+
+using Injectio.Attributes;
+
 using InstructorIQ.Core.Domain.Models;
 
+using Microsoft.Extensions.DependencyInjection;
+
 // ReSharper disable once CheckNamespace
 namespace InstructorIQ.Core.Domain
 {
     public class AuthenticationEventServiceRegistration : DomainServiceRegistrationBase
     {
-         public override void Register(IServiceCollection services, IDictionary<string, object> data)
+
+        [RegisterServices]
+        public override void Register(IServiceCollection services)
         {
             RegisterEntityQuery<Guid, InstructorIQ.Core.Data.Entities.AuthenticationEvent, AuthenticationEventReadModel>(services);
 

diff --git a/service/src/InstructorIQ.Core/Domain/CommandQueryServiceModule.cs b/service/src/InstructorIQ.Core/Domain/CommandQueryServiceModule.cs
@@ -1,16 +1,20 @@
-using System.Collections.Generic;
-using AutoMapper;
+using Injectio.Attributes;
+
 using InstructorIQ.Core.Data;
-using KickStart.DependencyInjection;
+
 using MediatR.CommandQuery.Audit;
 using MediatR.CommandQuery.EntityFrameworkCore;
+
 using Microsoft.Extensions.DependencyInjection;
 
 namespace InstructorIQ.Core.Domain
 {
-    public class CommandQueryServiceModule : IDependencyInjectionRegistration
+
+    public class CommandQueryServiceModule
     {
-        public void Register(IServiceCollection services, IDictionary<string, object> data)
+
+        [RegisterServices]
+        public void Register(IServiceCollection services)
         {
             services.AddMediator();
             services.AddAutoMapper(typeof(InstructorIQContext).Assembly);

diff --git a/service/src/InstructorIQ.Core/Domain/Discussion/DiscussionServiceRegistration.cs b/service/src/InstructorIQ.Core/Domain/Discussion/DiscussionServiceRegistration.cs
@@ -1,11 +1,16 @@
-using System;
+using System;
 using System.Collections.Generic;
+
+using Injectio.Attributes;
+
 using InstructorIQ.Core.Data.Entities;
 using InstructorIQ.Core.Domain.Handlers;
 using InstructorIQ.Core.Domain.Models;
 using InstructorIQ.Core.Domain.Queries;
+
 using MediatR;
 using MediatR.CommandQuery.Audit;
+
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 
@@ -14,7 +19,9 @@ namespace InstructorIQ.Core.Domain
 {
     public class DiscussionServiceRegistration : DomainServiceRegistrationBase
     {
-        public override void Register(IServiceCollection services, IDictionary<string, object> data)
+
+        [RegisterServices]
+        public override void Register(IServiceCollection services)
         {
             RegisterEntityQuery<Guid, Discussion, DiscussionReadModel>(services);
             RegisterEntityCommand<Guid, Discussion, DiscussionReadModel, DiscussionCreateModel, DiscussionUpdateModel>(services);

diff --git a/service/src/InstructorIQ.Core/Domain/DomainServiceRegistrationBase.cs b/service/src/InstructorIQ.Core/Domain/DomainServiceRegistrationBase.cs
@@ -1,10 +1,6 @@
-using System.Collections.Generic;
-
 using InstructorIQ.Core.Behaviors;
 using InstructorIQ.Core.Data;
 
-using KickStart.DependencyInjection;
-
 using MediatR;
 using MediatR.CommandQuery.Commands;
 using MediatR.CommandQuery.Definitions;
@@ -14,9 +10,10 @@
 
 namespace InstructorIQ.Core.Domain
 {
-    public abstract class DomainServiceRegistrationBase : IDependencyInjectionRegistration
+    public abstract class DomainServiceRegistrationBase
     {
-        public abstract void Register(IServiceCollection services, IDictionary<string, object> data);
+
+        public abstract void Register(IServiceCollection services);
 
         protected virtual void RegisterEntityCommand<TKey, TEntity, TReadModel, TCreateModel, TUpdateModel>(IServiceCollection services)
             where TEntity : class, IHaveIdentifier<TKey>, new()

diff --git a/service/src/InstructorIQ.Core/Domain/EmailDelivery/EmailDeliveryServiceRegistration.cs b/service/src/InstructorIQ.Core/Domain/EmailDelivery/EmailDeliveryServiceRegistration.cs
@@ -1,20 +1,26 @@
-using System;
-using System.Collections.Generic;
-using Microsoft.Extensions.DependencyInjection;
+using System;
+
+using Injectio.Attributes;
+
 using InstructorIQ.Core.Data.Entities;
 using InstructorIQ.Core.Domain.Commands;
 using InstructorIQ.Core.Domain.Handlers;
 using InstructorIQ.Core.Domain.Models;
+
 using MediatR;
 using MediatR.CommandQuery.Models;
+
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 
 // ReSharper disable once CheckNamespace
 namespace InstructorIQ.Core.Domain
 {
     public class EmailDeliveryServiceRegistration : DomainServiceRegistrationBase
     {
-        public override void Register(IServiceCollection services, IDictionary<string, object> data)
+
+        [RegisterServices]
+        public override void Register(IServiceCollection services)
         {
             RegisterEntityQuery<Guid, EmailDelivery, EmailDeliveryReadModel>(services);
 
@@ -23,4 +29,4 @@ public override void Register(IServiceCollection services, IDictionary<string, o
             services.TryAddTransient<IRequestHandler<SendSummaryEmailCommand, CompleteModel>, SendSummaryEmailCommandHandler>();
         }
     }
-}
+}