wip

oveeernight · oveeernight · commit 41354cf80940 · 2023-03-29T22:04:03.000+03:00
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -4,6 +4,6 @@
     </PropertyGroup>
     
     <PropertyGroup>
-       <NullableReferenceTypes>enable</NullableReferenceTypes> 
+       <NullableReferenceTypes>disable</NullableReferenceTypes> 
     </PropertyGroup>
 </Project>
diff --git a/HwProj.APIGateway/HwProj.APIGateway.API/HwProj.APIGateway.API.csproj b/HwProj.APIGateway/HwProj.APIGateway.API/HwProj.APIGateway.API.csproj
@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.14" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/HwProj.AuthService/HwProj.AuthService.Client/HwProj.AuthService.Client.csproj b/HwProj.AuthService/HwProj.AuthService.Client/HwProj.AuthService.Client.csproj
@@ -15,7 +15,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/HwProj.AuthService/HwProj.AuthService.IntegrationTests/HwProj.AuthService.IntegrationTests.csproj b/HwProj.AuthService/HwProj.AuthService.IntegrationTests/HwProj.AuthService.IntegrationTests.csproj
@@ -11,12 +11,12 @@
         <PackageReference Include="FluentAssertions" Version="6.6.0" />
         <PackageReference Include="Google.Apis.Auth" Version="1.54.0" />
         <PackageReference Include="Google.Apis.Auth.AspNetCore" Version="1.54.0" />
-        <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="5.3.0" />
+        <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.14.0" />
         <PackageReference Include="Moq" Version="4.13.1" />
         <PackageReference Include="nunit" Version="3.11.0" />
         <PackageReference Include="NUnit3TestAdapter" Version="3.11.0" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
-        <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="5.3.0" />
+        <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.14.0" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/HwProj.Common/HwProj.Models/HwProj.Models.csproj b/HwProj.Common/HwProj.Models/HwProj.Models.csproj
@@ -7,8 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="7.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.14" />
+    <PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="6.0.14" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>
 
diff --git a/HwProj.Common/HwProj.Repositories/HwProj.Repositories.csproj b/HwProj.Common/HwProj.Repositories/HwProj.Repositories.csproj
@@ -5,8 +5,8 @@
     <Nullable>$(NullableReferenceTypes)</Nullable>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.14" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.14" />
     <PackageReference Include="Z.EntityFramework.Plus.EFCore" Version="6.16.1" />
   </ItemGroup>
 </Project>
diff --git a/HwProj.Common/HwProj.Utils/Configuration/StartupExtensions.cs b/HwProj.Common/HwProj.Utils/Configuration/StartupExtensions.cs
@@ -1,4 +1,5 @@
 ﻿using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Net.Sockets;
 using System.Text.Json.Serialization;
@@ -21,13 +22,13 @@
 
 namespace HwProj.Utils.Configuration;
 
-public static class StartupExtensions
+public static class  StartupExtensions
 {
     public static IServiceCollection ConfigureHwProjServices(this IServiceCollection services, string serviceName)
     {
         services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies())
             .AddCors()
-            .AddMvc()
+            .AddControllers()
             .AddJsonOptions(options =>
                 options.JsonSerializerOptions.ReferenceHandler = ReferenceHandler.IgnoreCycles);
 
@@ -37,17 +38,24 @@ public static IServiceCollection ConfigureHwProjServices(this IServiceCollection
 
             if (serviceName == "API Gateway")
             {
-                c.AddSecurityDefinition("Bearer",
-                    new OpenApiSecurityScheme
+                var securityScheme = new OpenApiSecurityScheme
+                {
+                    Name = "Bearer",
+                    Description = "Enter JWT Bearer token _only_",
+                    In = ParameterLocation.Header,
+                    Type = SecuritySchemeType.Http,
+                    Scheme = "bearer",
+                    BearerFormat = "JWT",
+                    Reference = new OpenApiReference
                     {
-                        In = ParameterLocation.Header,
-                        Description = "Please enter into field the word 'Bearer' following by space and JWT",
-                        Name = "Authorization",
-                        Type = SecuritySchemeType.ApiKey
-                    });
+                        Id = JwtBearerDefaults.AuthenticationScheme,
+                        Type = ReferenceType.SecurityScheme
+                    }
+                };
+                c.AddSecurityDefinition(securityScheme.Reference.Id, securityScheme);
                 c.AddSecurityRequirement(new OpenApiSecurityRequirement
                 {
-                    { "Bearer", Enumerable.Empty<string>() },
+                    { securityScheme, Array.Empty<string>() },
                 });
             }
         });
@@ -143,7 +151,9 @@ public static IApplicationBuilder ConfigureHwProj(this IApplicationBuilder app,
             .AllowAnyHeader()
             .SetIsOriginAllowed(origin => true)
             .AllowCredentials());
-        app.UseMvc();
+        app.UseRouting();
+        app.UseAuthorization();
+        app.UseEndpoints(endpoints => endpoints.MapControllers());
 
         return app;
     }
diff --git a/HwProj.Common/HwProj.Utils/HwProj.Utils.csproj b/HwProj.Common/HwProj.Utils/HwProj.Utils.csproj
@@ -8,8 +8,8 @@
 
   <ItemGroup>
     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.11" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.14" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.14" />
     <PackageReference Include="Swashbuckle.SwaggerConfigurationExtension" Version="2.2.0" />
   </ItemGroup>
 
diff --git a/HwProj.CoursesService/HwProj.CoursesService.API/Dockerfile b/HwProj.CoursesService/HwProj.CoursesService.API/Dockerfile
@@ -18,7 +18,7 @@ RUN dotnet build "HwProj.CoursesService.API.csproj" -c Release -o /app/build
 FROM build AS publish
 RUN dotnet publish "HwProj.CoursesService.API.csproj" -c Release -o /app/publish
 
-FROM base AS final
+FROM base AS final 
 WORKDIR /app
 COPY --from=publish /app/publish .
 ENTRYPOINT ["dotnet", "HwProj.CoursesService.API.dll"]
diff --git a/HwProj.CoursesService/HwProj.CoursesService.API/HwProj.CoursesService.API.csproj b/HwProj.CoursesService/HwProj.CoursesService.API/HwProj.CoursesService.API.csproj
@@ -12,7 +12,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.14" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\HwProj.AuthService\HwProj.AuthService.Client\HwProj.AuthService.Client.csproj" />
diff --git a/HwProj.CoursesService/HwProj.CoursesService.Client/HwProj.CoursesService.Client.csproj b/HwProj.CoursesService/HwProj.CoursesService.Client/HwProj.CoursesService.Client.csproj
@@ -11,9 +11,9 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.14" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/HwProj.CoursesService/HwProj.CoursesService.Tests/HwProj.CoursesService.Tests.csproj b/HwProj.CoursesService/HwProj.CoursesService.Tests/HwProj.CoursesService.Tests.csproj
@@ -13,7 +13,7 @@
     <ItemGroup>
         <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.0" />
         <PackageReference Include="FluentAssertions" Version="5.9.0" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.0" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.14" />
         <PackageReference Include="nunit" Version="3.11.0" />
         <PackageReference Include="NUnit3TestAdapter" Version="3.11.0" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
diff --git a/HwProj.EventBus/HwProj.EventBus.Client/HwProj.EventBus.Client.csproj b/HwProj.EventBus/HwProj.EventBus.Client/HwProj.EventBus.Client.csproj
@@ -12,10 +12,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.14" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="Polly.Extensions.Http" Version="3.0.0" />
     <PackageReference Include="RabbitMQ.Client" Version="6.4.0" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Reference Include="Microsoft.AspNetCore.DataProtection" />
+  </ItemGroup>
+
 </Project>
diff --git a/HwProj.EventBus/HwProj.EventBus.Client/Implementations/EventBusRabbitMQ.cs b/HwProj.EventBus/HwProj.EventBus.Client/Implementations/EventBusRabbitMQ.cs
@@ -3,6 +3,7 @@
 using System.Text;
 using System.Threading.Tasks;
 using HwProj.EventBus.Client.Interfaces;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Newtonsoft.Json;
 using Polly.Retry;
@@ -27,12 +28,12 @@ public class EventBusRabbitMq : IEventBus, IDisposable
 
     private readonly Dictionary<string, List<Type>> _handlers = new();
 
-    public EventBusRabbitMq(IDefaultConnection connection, IServiceProvider serviceProvider,
+    public EventBusRabbitMq(IDefaultConnection connection, IConfiguration configuration,
         IServiceScopeFactory scopeFactory, RetryPolicy policy)
     {
         _connection = connection;
         _scopeFactory = scopeFactory;
-        _queueName = serviceProvider.GetApplicationUniqueIdentifier().Split('\\').Last();
+        _queueName = configuration.GetSection("EventBus")["EventBusQueueName"];
         _policy = policy;
         _consumerChannel = CreateConsumerChannel();
     }
diff --git a/HwProj.NotificationsService/HwProj.NotificationsService.API/HwProj.NotificationsService.API.csproj b/HwProj.NotificationsService/HwProj.NotificationsService.API/HwProj.NotificationsService.API.csproj
@@ -15,7 +15,7 @@
 
   <ItemGroup>
     <PackageReference Include="MailKit" Version="3.4.2" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.14" />
     <PackageReference Include="MimeKit" Version="3.4.2" />
   </ItemGroup>
 
diff --git a/HwProj.NotificationsService/HwProj.NotificationsService.API/Services/EmailService.cs b/HwProj.NotificationsService/HwProj.NotificationsService.API/Services/EmailService.cs
@@ -1,6 +1,5 @@
 ﻿using System;
 using System.Threading.Tasks;
-using Autofac.Core;
 using HwProj.Models.NotificationsService;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
@@ -11,9 +10,9 @@ namespace HwProj.NotificationsService.API.Services;
 public class EmailService : IEmailService
 {
     private readonly IConfiguration _configuration;
-    private readonly ILogger<Service> _logger;
+    private readonly ILogger<EmailService> _logger;
 
-    public EmailService(IConfiguration configuration, ILogger<Service> logger)
+    public EmailService(IConfiguration configuration, ILogger<EmailService> logger)
     {
         _configuration = configuration;
         _logger = logger;
diff --git a/HwProj.NotificationsService/HwProj.NotificationsService.Client/HwProj.NotificationsService.Client.csproj b/HwProj.NotificationsService/HwProj.NotificationsService.Client/HwProj.NotificationsService.Client.csproj
@@ -15,8 +15,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/HwProj.NotificationsService/HwProj.NotificationsService.Tests/HwProj.NotificationsService.Tests.csproj b/HwProj.NotificationsService/HwProj.NotificationsService.Tests/HwProj.NotificationsService.Tests.csproj
@@ -11,7 +11,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.0" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.14" />
         <PackageReference Include="nunit" Version="3.13.3" />
         <PackageReference Include="NUnit3TestAdapter" Version="4.3.0" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
diff --git a/HwProj.SolutionsService/HwProj.SolutionsService.API/Controllers/SolutionsController.cs b/HwProj.SolutionsService/HwProj.SolutionsService.API/Controllers/SolutionsController.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Linq;
 using System.Net;
 using System.Threading.Tasks;
@@ -160,6 +161,8 @@ public async Task<IActionResult> GetCourseStat(long courseId, [FromQuery] string
     [HttpPost("allUnrated")]
     public async Task<SolutionPreviewDto[]> GetAllUnratedSolutionsForTasks([FromBody] long[] taskIds)
     {
+        // TODO: Fix 
+        return Array.Empty<SolutionPreviewDto>();
         var solutions = await _solutionsRepository
             .FindAll(t => taskIds.Contains(t.TaskId))
             .GroupBy(t => new { t.TaskId, t.StudentId })
diff --git a/HwProj.SolutionsService/HwProj.SolutionsService.API/Startup.cs b/HwProj.SolutionsService/HwProj.SolutionsService.API/Startup.cs
@@ -38,7 +38,7 @@ public void ConfigureServices(IServiceCollection services)
         services.ConfigureHwProjServices("Solutions API");
     }
 
-    public void Configure(IApplicationBuilder app, IHostingEnvironment env, IEventBus eventBus)
+    public void Configure(IApplicationBuilder app, IWebHostEnvironment env, IEventBus eventBus)
     {
         app.ConfigureHwProj(env, "Solutions API");
     }
diff --git a/HwProj.SolutionsService/HwProj.SolutionsService.Client/HwProj.SolutionsService.Client.csproj b/HwProj.SolutionsService/HwProj.SolutionsService.Client/HwProj.SolutionsService.Client.csproj
@@ -11,8 +11,8 @@
 
     <ItemGroup>
       <PackageReference Include="Google.Apis.Core" Version="1.54.0" />
-      <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
-      <PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
+      <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
+      <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
     </ItemGroup>
 
     <ItemGroup>
