diff options
18 files changed, 6 insertions, 267 deletions
diff --git a/src/Data/DevHive.Data.Models/Chat.cs b/src/Data/DevHive.Data.Models/Chat.cs deleted file mode 100644 index d68981f..0000000 --- a/src/Data/DevHive.Data.Models/Chat.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace DevHive.Data.Models -{ - public class Chat - { - public HashSet<User> ChatMembers { get; set; } - - public List<Message> Messages { get; set; } - - public string ChatName { get; set; } - } -} diff --git a/src/Data/DevHive.Data.Models/Message.cs b/src/Data/DevHive.Data.Models/Message.cs deleted file mode 100644 index 89592f8..0000000 --- a/src/Data/DevHive.Data.Models/Message.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; - -namespace DevHive.Data.Models -{ - public class Message - { - public User Creator { get; set; } - - public string Content { get; set; } - - public DateTime TimeCreated { get; set; } - - public Chat Chat { get; set; } - } -} diff --git a/src/Data/DevHive.Data/DevHiveContext.cs b/src/Data/DevHive.Data/DevHiveContext.cs index b841bca..ece3439 100644 --- a/src/Data/DevHive.Data/DevHiveContext.cs +++ b/src/Data/DevHive.Data/DevHiveContext.cs @@ -19,7 +19,6 @@ namespace DevHive.Data public DbSet<Rating> Rating { get; set; } public DbSet<RatedPost> RatedPost { get; set; } public DbSet<UserRate> UserRate { get; set; } - public DbSet<Message> Message { get; set; } protected override void OnModelCreating(ModelBuilder builder) { diff --git a/src/Data/DevHive.Data/Interfaces/IChatRepository.cs b/src/Data/DevHive.Data/Interfaces/IChatRepository.cs deleted file mode 100644 index c4faf54..0000000 --- a/src/Data/DevHive.Data/Interfaces/IChatRepository.cs +++ /dev/null @@ -1,9 +0,0 @@ -using DevHive.Data.Models; -using DevHive.Data.Repositories.Interfaces; - -namespace DevHive.Data.Interfaces -{ - public interface IChatRepository : IRepository<Chat> - { - } -} diff --git a/src/Data/DevHive.Data/Interfaces/IMessageRepository.cs b/src/Data/DevHive.Data/Interfaces/IMessageRepository.cs deleted file mode 100644 index f694bc0..0000000 --- a/src/Data/DevHive.Data/Interfaces/IMessageRepository.cs +++ /dev/null @@ -1,10 +0,0 @@ -using DevHive.Data.Models; -using DevHive.Data.Repositories.Interfaces; - -namespace DevHive.Data.Interfaces -{ - public interface IMessageRepository : IRepository<Message> - { - - } -} diff --git a/src/Data/DevHive.Data/Repositories/MessageRepository.cs b/src/Data/DevHive.Data/Repositories/MessageRepository.cs deleted file mode 100644 index 9697c97..0000000 --- a/src/Data/DevHive.Data/Repositories/MessageRepository.cs +++ /dev/null @@ -1,16 +0,0 @@ -using DevHive.Data.Interfaces; -using DevHive.Data.Models; - -namespace DevHive.Data.Repositories -{ - public class MessageRepository : BaseRepository<Message>, IMessageRepository - { - private readonly DevHiveContext _context; - - public MessageRepository(DevHiveContext context) - : base(context) - { - this._context = context; - } - } -} diff --git a/src/Services/DevHive.Services.Models/DevHive.Services.Models.csproj b/src/Services/DevHive.Services.Models/DevHive.Services.Models.csproj index 11d95aa..914efe0 100644 --- a/src/Services/DevHive.Services.Models/DevHive.Services.Models.csproj +++ b/src/Services/DevHive.Services.Models/DevHive.Services.Models.csproj @@ -3,10 +3,10 @@ <TargetFramework>net5.0</TargetFramework> </PropertyGroup> <ItemGroup> - <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" /> - <PackageReference Include="SonarAnalyzer.CSharp" Version="8.18.0.27296" /> + <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2"/> + <PackageReference Include="SonarAnalyzer.CSharp" Version="8.18.0.27296"/> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\..\Common\DevHive.Common.Models\DevHive.Common.csproj" /> + <ProjectReference Include="..\..\Common\DevHive.Common.Models\DevHive.Common.csproj"/> </ItemGroup> </Project>
\ No newline at end of file diff --git a/src/Services/DevHive.Services.Models/Message/CreateMessageServiceModel.cs b/src/Services/DevHive.Services.Models/Message/CreateMessageServiceModel.cs deleted file mode 100644 index 4206975..0000000 --- a/src/Services/DevHive.Services.Models/Message/CreateMessageServiceModel.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System; - -namespace DevHive.Services.Models.Message -{ - public class CreateMessageServiceModel - { - public string Content { get; set; } - - public Guid CreatorId { get; set; } - - public Guid ChatId { get; set; } - } -} diff --git a/src/Services/DevHive.Services.Models/Message/ReadMessageServiceModel.cs b/src/Services/DevHive.Services.Models/Message/ReadMessageServiceModel.cs deleted file mode 100644 index 1eaf9db..0000000 --- a/src/Services/DevHive.Services.Models/Message/ReadMessageServiceModel.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System; -using DevHive.Services.Models.User; - -namespace DevHive.Services.Models.Message -{ - public class ReadMessageServiceModel - { - public Guid Id { get; set; } - - public Guid ChatId { get; set; } - - public string Content { get; set; } - - public DateTime TimeCreated { get; set; } - - public UserServiceModel Creator { get; set; } - } -} diff --git a/src/Services/DevHive.Services/Configurations/Mapping/MessageMappings.cs b/src/Services/DevHive.Services/Configurations/Mapping/MessageMappings.cs deleted file mode 100644 index c727ea4..0000000 --- a/src/Services/DevHive.Services/Configurations/Mapping/MessageMappings.cs +++ /dev/null @@ -1,16 +0,0 @@ -using AutoMapper; -using DevHive.Data.Models; -using DevHive.Services.Models.Message; - -namespace DevHive.Services.Configurations.Mapping -{ - public class MessageMappings : Profile - { - public MessageMappings() - { - CreateMap<CreateMessageServiceModel, Message>(); - - CreateMap<Message, ReadMessageServiceModel>(); - } - } -} diff --git a/src/Services/DevHive.Services/Interfaces/IMessageService.cs b/src/Services/DevHive.Services/Interfaces/IMessageService.cs deleted file mode 100644 index a0fd155..0000000 --- a/src/Services/DevHive.Services/Interfaces/IMessageService.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System; -using System.Threading.Tasks; -using DevHive.Services.Models.Message; - -namespace DevHive.Services.Interfaces -{ - public interface IMessageService - { - Task<Guid> CreateMessage(CreateMessageServiceModel createMessageServiceModel); - - Task<ReadMessageServiceModel> GetMessageById(Guid id); - } -} diff --git a/src/Services/DevHive.Services/Services/MessageService.cs b/src/Services/DevHive.Services/Services/MessageService.cs deleted file mode 100644 index d61d64d..0000000 --- a/src/Services/DevHive.Services/Services/MessageService.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System; -using System.Threading.Tasks; -using DevHive.Data.Repositories; -using DevHive.Services.Interfaces; -using DevHive.Services.Models.Message; - -namespace DevHive.Services.Services -{ - public class MessageService : IMessageService - { - private readonly MessageRepository _messageRepository; - - public MessageService(MessageRepository messageRepository) - { - this._messageRepository = messageRepository; - } - - public Task<Guid> CreateMessage(CreateMessageServiceModel createMessageServiceModel) - { - throw new NotImplementedException(); - } - - public Task<ReadMessageServiceModel> GetMessageById(Guid id) - { - throw new NotImplementedException(); - } - } -} diff --git a/src/Web/DevHive.Web.Models/DevHive.Web.Models.csproj b/src/Web/DevHive.Web.Models/DevHive.Web.Models.csproj index 686fc6f..64d0bd0 100644 --- a/src/Web/DevHive.Web.Models/DevHive.Web.Models.csproj +++ b/src/Web/DevHive.Web.Models/DevHive.Web.Models.csproj @@ -3,10 +3,10 @@ <TargetFramework>net5.0</TargetFramework> </PropertyGroup> <ItemGroup> - <ProjectReference Include="..\..\Common\DevHive.Common.Models\DevHive.Common.csproj" /> + <ProjectReference Include="..\..\Common\DevHive.Common.Models\DevHive.Common.csproj"/> </ItemGroup> <ItemGroup> - <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" /> - <PackageReference Include="SonarAnalyzer.CSharp" Version="8.18.0.27296" /> + <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2"/> + <PackageReference Include="SonarAnalyzer.CSharp" Version="8.18.0.27296"/> </ItemGroup> </Project>
\ No newline at end of file diff --git a/src/Web/DevHive.Web.Models/Message/CreateMessageWebModel.cs b/src/Web/DevHive.Web.Models/Message/CreateMessageWebModel.cs deleted file mode 100644 index b3c1740..0000000 --- a/src/Web/DevHive.Web.Models/Message/CreateMessageWebModel.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System; - -namespace DevHive.Web.Models.Message -{ - public class CreateMessageWebModel - { - public string Content { get; set; } - - public Guid ChatId { get; set; } - } -} diff --git a/src/Web/DevHive.Web.Models/Message/ReadMessageWebModel.cs b/src/Web/DevHive.Web.Models/Message/ReadMessageWebModel.cs deleted file mode 100644 index a92a1e9..0000000 --- a/src/Web/DevHive.Web.Models/Message/ReadMessageWebModel.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System; - -namespace DevHive.Web.Models.Message -{ - public class ReadMessageWebModel - { - public Guid Id { get; set; } - - public string CreatorFirstName { get; set; } - - public string CreatorLastName { get; set; } - - public string CreatorUsername { get; set; } - - public DateTime TimeCreated { get; set; } - - public string Content { get; set; } - } -} diff --git a/src/Web/DevHive.Web/Configurations/Extensions/ConfigureDependencyInjection.cs b/src/Web/DevHive.Web/Configurations/Extensions/ConfigureDependencyInjection.cs index 2f1f3a1..c547951 100644 --- a/src/Web/DevHive.Web/Configurations/Extensions/ConfigureDependencyInjection.cs +++ b/src/Web/DevHive.Web/Configurations/Extensions/ConfigureDependencyInjection.cs @@ -19,8 +19,6 @@ namespace DevHive.Web.Configurations.Extensions services.AddTransient<ICommentRepository, CommentRepository>(); services.AddTransient<IFeedRepository, FeedRepository>(); services.AddTransient<IRatingRepository, RatingRepository>(); - services.AddTransient<IMessageRepository, MessageRepository>(); - //services.AddTransient<IChatRepository, ChatRepository>(); services.AddTransient<ILanguageService, LanguageService>(); services.AddTransient<IRoleService, RoleService>(); @@ -35,8 +33,6 @@ namespace DevHive.Web.Configurations.Extensions apiKey: configuration.GetSection("Cloud").GetSection("apiKey").Value, apiSecret: configuration.GetSection("Cloud").GetSection("apiSecret").Value)); services.AddTransient<IRateService, RateService>(); - services.AddTransient<IMessageService, MessageService>(); - //services.AddTransient<IChatService, ChatService>(); } } } diff --git a/src/Web/DevHive.Web/Configurations/Mapping/MessageMapping.cs b/src/Web/DevHive.Web/Configurations/Mapping/MessageMapping.cs deleted file mode 100644 index 71ed6b6..0000000 --- a/src/Web/DevHive.Web/Configurations/Mapping/MessageMapping.cs +++ /dev/null @@ -1,19 +0,0 @@ -using AutoMapper; -using DevHive.Services.Models.Message; -using DevHive.Web.Models.Message; - -namespace DevHive.Web.Configurations.Mapping -{ - public class MessageMapping : Profile - { - public MessageMapping() - { - CreateMap<CreateMessageWebModel, CreateMessageServiceModel>(); - - CreateMap<ReadMessageServiceModel, ReadMessageWebModel>() - .ForMember(dest => dest.CreatorFirstName, src => src.MapFrom(p => p.Creator.FirstName)) - .ForMember(dest => dest.CreatorLastName, src => src.MapFrom(p => p.Creator.LastName)) - .ForMember(dest => dest.CreatorUsername, src => src.MapFrom(p => p.Creator.UserName)); - } - } -} diff --git a/src/Web/DevHive.Web/Controllers/MessageController.cs b/src/Web/DevHive.Web/Controllers/MessageController.cs deleted file mode 100644 index 092c7fa..0000000 --- a/src/Web/DevHive.Web/Controllers/MessageController.cs +++ /dev/null @@ -1,52 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Threading.Tasks; -using DevHive.Services.Services; -using DevHive.Web.Models.Message; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Mvc; - -namespace DevHive.Web.Controllers -{ - [Route("api/[controller]")] - [ApiController] - public class MessageController : ControllerBase - { - private readonly MessageService _messageService; - - public MessageController(MessageService messageService) - { - this._messageService = messageService; - } - - [HttpPost] - [Authorize(Roles = "User,Admin")] - public async Task<IActionResult> Create(Guid userId, [FromBody] CreateMessageWebModel createMessageWebModel, [FromHeader] string authorization) - { - throw new NotImplementedException(); - } - - [HttpGet] - [Authorize(Roles = "User,Admin")] - public async Task<IActionResult> Read(Guid id) - { - throw new NotImplementedException(); - } - - [HttpPut] - [Authorize(Roles = "User,Admin")] - public async Task<IActionResult> Update(Guid userId, [FromBody] object updateMessageWebModel, [FromHeader] string authorization) - { - //TODO: Authorize user - throw new NotImplementedException(); - } - - [HttpDelete] - [Authorize(Roles = "User,Admin")] - public async Task<IActionResult> Delete(Guid id, [FromHeader] string authorization) - { - //TODO: Authorize user - throw new NotImplementedException(); - } - } -} |