General update & bug fixes

.gitignore

@@ -360,4 +360,8 @@ MigrationBackup/
 .ionide/
 
 # Fody - auto-generated XML schema
-FodyWeavers.xsd
+FodyWeavers.xsd
+
+docker-compose/
+
+postgres-data/

MethodologyMain.API/Controllers/UserController.cs

@@ -0,0 +1,83 @@
+using MethodologyMain.Application.DTO;
+using Microsoft.AspNetCore.Mvc;
+using MethodologyMain.Application.Interface;
+using AuthMetodology.Infrastructure.Models;
+using Serilog.Events;
+using RabbitMqPublisher.Interface;
+using Microsoft.AspNetCore.Cors;
+
+namespace MethodologyMain.API.Controllers
+{
+    [ApiController]
+    [EnableCors("AllowFrontend")]
+    [Route("api/main/[controller]")]
+    public class UserController : ControllerBase
+    {
+        private readonly IUserService userService;
+        private readonly IRabbitMqPublisherBase<RabbitMqLogPublish> logPublishService;
+        public UserController(IUserService userService, IRabbitMqPublisherBase<RabbitMqLogPublish> logPublishService)
+        {
+            this.userService = userService;
+            this.logPublishService = logPublishService;
+        }
+
+        [HttpGet]
+        public async Task<ActionResult<List<GetUserDto>>> GetUsers(CancellationToken token)
+        {
+            _ = logPublishService.SendEventAsync(new RabbitMqLogPublish
+            {
+                ServiceName = "Main service",
+                LogLevel = LogEventLevel.Information,
+                Message = "GET api/main/User was called",
+                TimeStamp = DateTime.UtcNow
+            });
+            var users = await userService.GetUsersAllAsync(token);
+            //var team = await teamService.CreateTeamAsync(dto.Name, dto.Description, currentUserId, dto.EventId, token);
+            return Ok(users);
+        }
+
+        [HttpGet("{id}")]
+        public async Task<ActionResult<GetUserDto>> GetUsersById([FromRoute] Guid id, CancellationToken token)
+        {
+            _ = logPublishService.SendEventAsync(new RabbitMqLogPublish
+            {
+                ServiceName = "Main service",
+                LogLevel = LogEventLevel.Information,
+                Message = "GET api/main/User was called",
+                TimeStamp = DateTime.UtcNow
+            });
+            var user = await userService.GetUserByIdAsync(id, token);
+            //var team = await teamService.CreateTeamAsync(dto.Name, dto.Description, currentUserId, dto.EventId, token);
+            return Ok(user);
+        }
+        [HttpPost]
+        public async Task<ActionResult<GetUserDto>> CreateUser([FromBody] GetUserDto dto, CancellationToken token)
+        {
+            _ = logPublishService.SendEventAsync(new RabbitMqLogPublish
+            {
+                ServiceName = "Main service",
+                LogLevel = LogEventLevel.Information,
+                Message = "POST api/main/User was called",
+                TimeStamp = DateTime.UtcNow
+            });
+            var user = await userService.CreateUserAsync(dto, token);
+            //var team = await teamService.CreateTeamAsync(dto.Name, dto.Description, currentUserId, dto.EventId, token);
+            return Ok(user);
+        }
+
+        [HttpPut]
+        public async Task<ActionResult> UpdateUser([FromBody] GetUserDto dto, CancellationToken token)
+        {
+            _ = logPublishService.SendEventAsync(new RabbitMqLogPublish
+            {
+                ServiceName = "Main service",
+                LogLevel = LogEventLevel.Information,
+                Message = "PUT api/main/User was called",
+                TimeStamp = DateTime.UtcNow
+            });
+            await userService.UpdateUserAsync(dto, token);
+            //var team = await teamService.CreateTeamAsync(dto.Name, dto.Description, currentUserId, dto.EventId, token);
+            return Ok();
+        }
+    }
+}

MethodologyMain.API/Dockerfile.original

@@ -0,0 +1,30 @@
+# См. статью по ссылке https://aka.ms/customizecontainer, чтобы узнать как настроить контейнер отладки и как Visual Studio использует этот Dockerfile для создания образов для ускорения отладки.
+
+# Этот этап используется при запуске из VS в быстром режиме (по умолчанию для конфигурации отладки)
+FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
+USER $APP_UID
+WORKDIR /app
+EXPOSE 8080
+EXPOSE 8081
+
+
+# Этот этап используется для сборки проекта службы
+FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
+ARG BUILD_CONFIGURATION=Release
+WORKDIR /src
+COPY ["MethodTeams1/MethodTeams1.csproj", "MethodTeams1/"]
+RUN dotnet restore "./MethodTeams1/MethodTeams1.csproj"
+COPY . .
+WORKDIR "/src/MethodTeams1"
+RUN dotnet build "./MethodTeams1.csproj" -c $BUILD_CONFIGURATION -o /app/build
+
+# Этот этап используется для публикации проекта службы, который будет скопирован на последний этап
+FROM build AS publish
+ARG BUILD_CONFIGURATION=Release
+RUN dotnet publish "./MethodTeams1.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false
+
+# Этот этап используется в рабочей среде или при запуске из VS в обычном режиме (по умолчанию, когда конфигурация отладки не используется)
+FROM base AS final
+WORKDIR /app
+COPY --from=publish /app/publish .
+ENTRYPOINT ["dotnet", "MethodTeams1.dll"]

MethodologyMain.API/Extensions/AuthExtensions.cs

@@ -36,6 +36,17 @@ public static void AddApiAuthentication(
                         }
                     };
                 });
+            services.AddCors(options =>
+            {
+                options.AddPolicy("AllowFrontend", builder =>
+                {
+                    builder.WithOrigins("http://localhost:8083")
+                        .AllowCredentials()
+                        .AllowAnyHeader()
+                        .AllowAnyMethod()
+                        .WithExposedHeaders("Set-Cookie");
+                });
+            });
             services.AddAuthorizationBuilder()
                 //.AddPolicy("AdminOnly", policy => policy.RequireRole(nameof(UserRole.Admin)))
                 .AddPolicy("BearerOnly", policy => { policy.AuthenticationSchemes.Add(JwtBearerDefaults.AuthenticationScheme); policy.RequireAuthenticatedUser(); });

MethodologyMain.API/MethodologyMain.API.csproj

@@ -20,6 +20,8 @@
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.11" />
     <PackageReference Include="Serilog" Version="4.2.0" />
+    <PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
+    <PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="8.1.0" />
   </ItemGroup>
 

MethodologyMain.API/Middleware/ExceptionMiddleware.cs

@@ -27,7 +27,7 @@ public async Task InvokeAsync(HttpContext context)
                 {
                     ServiceName = "Main service",
                     LogLevel = LogEventLevel.Error,
-                    Message = $"Exception was thrown.\nMessage: {ex.Message}\nSource: {ex.Source}",
+                    Message = $"Exception was thrown.\nMessage: {ex.Message}, {ex.InnerException}\nSource: {ex.Source}",
                     TimeStamp = DateTime.UtcNow
                 });
 

MethodologyMain.API/Program.cs

@@ -8,7 +8,6 @@
 using MethodologyMain.Infrastructure.Services;
 using MethodologyMain.Persistence.Interfaces;
 using MethodologyMain.Persistence.Repository;
-using MethodTeams.DTO;
 using System.Reflection;
 using MethodologyMain.Application.Profiles;
 using Microsoft.EntityFrameworkCore;
@@ -20,9 +19,19 @@
 using Microsoft.Extensions.Options;
 using RabbitMqListener.Interfaces;
 using MethodologyMain.Infrastructure.Listeners;
+using MethodologyMain.Application.DTO;
+using MethodologyMain.Logic.Entities;
+using Serilog;
 
 var builder = WebApplication.CreateBuilder(args);
 
+var logger = new LoggerConfiguration()
+    .WriteTo.Console()
+    .CreateLogger();
+
+builder.Logging.ClearProviders();
+builder.Logging.AddSerilog(logger);
+
 builder.Services.AddControllers();
 builder.Services.AddControllers()
         .AddJsonOptions(options =>
@@ -35,10 +44,21 @@
 var configuration = new MapperConfiguration(static cfg =>
 {
     cfg.AddMaps(Assembly.GetExecutingAssembly());
+    cfg.CreateMap<TeamEntity, GetTeamDto>()
+    .ForMember(dto => dto.CreatedBy, conf => conf.MapFrom(t => t.CaptainId))
+    .ForMember(dto => dto.Members, conf => conf.MapFrom(t => t.Members.Select(s => s.User.UserName).ToList()))
+    .ForMember(dto => dto.Tags, conf => conf.MapFrom(t => t.Tags.Select(s => s.Tag.TagName).ToList()))
+    .ForMember(dto => dto.CreatedAt, conf => conf.MapFrom(t => t.TeamCreatedAt));
+    cfg.CreateMap<UserMainEntity, GetUserDto>()
+    .ForMember(dto => dto.Tags, conf => conf.MapFrom(t => t.Tags.Select(s => s.Tag.TagName).ToList()))
+    .ForMember(dto => dto.Name, conf => conf.MapFrom(t => t.UserName))
+    .ForMember(dto => dto.Bio, conf => conf.MapFrom(t => t.Education));
+
     cfg.AllowNullCollections = true;
     cfg.AddGlobalIgnore("Item");
 }
 );
+configuration.AssertConfigurationIsValid();
 IMapper mapper = configuration.CreateMapper();
 builder.Services.AddSingleton(mapper);
 
@@ -48,9 +68,12 @@
 builder.Services.AddApiAuthentication(builder.Services.BuildServiceProvider().GetRequiredService<IOptions<JWTOptions>>());
 
 builder.Services.AddScoped<ITeamService, TeamService>();
+builder.Services.AddScoped<IUserService, UserService>();
 builder.Services.AddAutoMapper(typeof(TeamProfile).Assembly, typeof(TeamInfoDto).Assembly);
+builder.Services.AddScoped<ITagRepository, TagRepository>();
 builder.Services.AddScoped<ITeamRepository, TeamRepository>();
 builder.Services.AddScoped<IUserRepository, UserRepository>();
+builder.Services.AddScoped<IHackathonRepository, HackathonRepository>();
 builder.Services.AddScoped<ITeamValidationService, TeamValidationService>();
 builder.Services.AddSingleton<IRabbitMqPublisherBase<RabbitMqLogPublish>, LogQueueService>();
 
@@ -70,6 +93,7 @@
 
 app.UseHttpsRedirection();
 
+app.UseCors("AllowFrontend");
 app.UseAuthorization();
 app.UseAuthentication();
 

MethodologyMain.API/Properties/serviceDependencies.local.json

@@ -1,3 +1,21 @@
 {
-  "dependencies": {}
+  "dependencies": {
+    "rabbitmq1": {
+      "containerPorts": "5672:5672,15672:15672",
+      "secretStore": "LocalSecretsFile",
+      "containerName": "rabbitmq",
+      "containerImage": "rabbitmq:3-management-alpine",
+      "type": "rabbitmq.container",
+      "connectionId": "QueueConnection"
+    },
+    "postgresql1": {
+      "containerPorts": "5432:5432",
+      "secretStore": "LocalSecretsFile",
+      "containerName": "postgresql",
+      "containerImage": "postgres",
+      "resourceId": null,
+      "type": "postgresql.container",
+      "connectionId": "ConnectionStrings:DatabaseConnection"
+    }
+  }
 }

MethodologyMain.Application/DTO/CreateTeamDto.cs

@@ -2,8 +2,12 @@
 {
     public class CreateTeamDto
     {
+        public Guid HackathonId { get; set; }
         public required string Name { get; set; }
-        public required string Description { get; set; }
-        public Guid EventId { get; set; }
+        public string Description { get; set; } = string.Empty;
+        public List<string> Tags { get; set; } = null!;
+        public List<string> Members { get; set; } = null!;
+        public required int MaxMembers { get; set; }
+        public Guid CreatedBy { get; set; }
     }
 }

MethodologyMain.Application/DTO/GetHackathonDto.cs

@@ -0,0 +1,23 @@
+using MethodologyMain.Logic.Models;
+
+namespace MethodologyMain.Application.DTO
+{
+    public class GetHackathonDto
+    {
+        public Guid Id { get; set; }
+        public required string Name { get; set; }
+        public string Description { get; set; } = string.Empty;
+        public required DateOnly StartDate { get; set; }
+        public required DateOnly EndDate { get; set; }
+        public string Location { get; set; } = string.Empty;
+        public List<string> Tags { get; set; } = null!;
+        public string ImageUrl { get; set; } = string.Empty;
+        public string OrganizerName { get; set; } = string.Empty;
+        public string OrganizerLogo { get; set; } = string.Empty;
+        public TeamSize TeamSize { get; set; } = null!;
+        public string Website { get; set; } = string.Empty;
+        public List<Prize> Prizes { get; set; } = null!;
+        public List<ScheduleItem> Schedule { get; set; } = null!;
+
+    }
+}

MethodologyMain.Application/DTO/GetTeamDto.cs

@@ -0,0 +1,15 @@
+namespace MethodologyMain.Application.DTO
+{
+    public class GetTeamDto
+    {
+        public Guid Id { get; set; }
+        public Guid HackathonId { get; set; }
+        public required string Name { get; set; }
+        public string Description { get; set; } = string.Empty;
+        public List<string> Tags { get; set; } = null!;
+        public List<string> Members { get; set; } = null!;
+        public int MaxMembers { get; set; }
+        public Guid CreatedBy { get; set; }
+        public DateTime CreatedAt { get; set; }
+    }
+}

MethodologyMain.Application/DTO/GetUserDto.cs

@@ -0,0 +1,19 @@
+
+
+namespace MethodologyMain.Application.DTO
+{
+    public class GetUserDto
+    {
+        public Guid Id { get; set; }
+        public required string Name { get; set; }
+        public string Email { get; set; } = string.Empty;
+        public string Bio { get; set; } = string.Empty;
+        public List<string> Tags { get; set; } = null!;
+        public string PhotoUrl { get; set; } = string.Empty;
+        public DateTime CreatedAt { get; set; }
+        public string Location { get; set; } = string.Empty;
+        public string Github { get; set; } = string.Empty;
+        public string Website { get; set; } = string.Empty;
+        public string Skills { get; set; } = string.Empty;
+    }
+}

MethodologyMain.Application/DTO/HackathonFilterDto.cs

@@ -10,9 +10,9 @@ public class HackathonFilterDto
 
         public int? MaxTeamSize { get; set; }
 
-        public DateTime? StartDateFrom { get; set; }
+        public DateOnly? StartDateFrom { get; set; }
 
-        public DateTime? StartDateTo { get; set; }
+        public DateOnly? StartDateTo { get; set; }
         public int Page { get; set; } = 1;
         public int PageSize { get; set; } = 10;
     }

MethodologyMain.Application/DTO/TeamInfoDto.cs

@@ -1,11 +1,11 @@
-namespace MethodTeams.DTO
+namespace MethodologyMain.Application.DTO
 {
 
     // DTO для информации о команде
     public class TeamInfoDto
     {
         public Guid Id { get; set; }
-        public string Name { get; set; }
+        public required string Name { get; set; }
         public string? Description { get; set; }
         public Guid CaptainId { get; set; }
         public Guid HackathonId { get; set; }

MethodologyMain.Application/DTO/UpdateTeamDto.cs

@@ -0,0 +1,10 @@
+namespace MethodologyMain.Application.DTO
+{
+    public class UpdateTeamDto
+    {
+        public Guid Id { get; set; }
+        public string? Name { get; set; }
+        public string? Description { get; set; }
+        public Guid? HackathonId { get; set; }
+    }
+}

MethodologyMain.Application/DTO/UserInfoDto.cs

@@ -0,0 +1,17 @@
+using MethodologyMain.Logic.Entities;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MethodologyMain.Application.DTO
+{
+    public class UserInfoDto
+    {
+        public Guid Id { get; set; }
+        public required string UserName { get; set; }
+        public string? Education { get; set; }
+        public List<UserTagEntity>? Tags { get; set; }
+    }
+}