aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/DevHive.Data/Interfaces/Models/IPost.cs2
-rw-r--r--src/DevHive.Data/Interfaces/Repositories/IPostRepository.cs4
-rw-r--r--src/DevHive.Data/Models/Post.cs2
-rw-r--r--src/DevHive.Data/Repositories/BaseRepository.cs6
-rw-r--r--src/DevHive.Data/Repositories/PostRepository.cs16
-rw-r--r--src/DevHive.Services/Configurations/Mapping/PostMappings.cs4
-rw-r--r--src/DevHive.Services/DevHive.Services.csproj56
-rw-r--r--src/DevHive.Services/Interfaces/ICloudService.cs13
-rw-r--r--src/DevHive.Services/Models/Cloud/CloudinaryService.cs55
-rw-r--r--src/DevHive.Services/Models/Post/Post/CreatePostServiceModel.cs4
-rw-r--r--src/DevHive.Services/Models/Post/Post/ReadPostServiceModel.cs3
-rw-r--r--src/DevHive.Services/Models/Post/Post/UpdatePostServiceModel.cs4
-rw-r--r--src/DevHive.Services/Services/PostService.cs34
-rw-r--r--src/DevHive.Web/Configurations/Extensions/ConfigureDependencyInjection.cs8
-rw-r--r--src/DevHive.Web/Models/Post/Post/CreatePostWebModel.cs4
-rw-r--r--src/DevHive.Web/Models/Post/Post/ReadPostWebModel.cs3
-rw-r--r--src/DevHive.Web/Models/Post/Post/UpdatePostWebModel.cs4
-rw-r--r--src/DevHive.Web/Startup.cs2
-rw-r--r--src/DevHive.Web/appsettings.json7
19 files changed, 186 insertions, 45 deletions
diff --git a/src/DevHive.Data/Interfaces/Models/IPost.cs b/src/DevHive.Data/Interfaces/Models/IPost.cs
index 0902465..86469a7 100644
--- a/src/DevHive.Data/Interfaces/Models/IPost.cs
+++ b/src/DevHive.Data/Interfaces/Models/IPost.cs
@@ -14,6 +14,6 @@ namespace DevHive.Data.Interfaces.Models
List<Comment> Comments { get; set; }
- //List<Files> Files
+ List<string> FileUrls { get; set; }
}
}
diff --git a/src/DevHive.Data/Interfaces/Repositories/IPostRepository.cs b/src/DevHive.Data/Interfaces/Repositories/IPostRepository.cs
index aa0afc7..5022df5 100644
--- a/src/DevHive.Data/Interfaces/Repositories/IPostRepository.cs
+++ b/src/DevHive.Data/Interfaces/Repositories/IPostRepository.cs
@@ -1,4 +1,5 @@
using System;
+using System.Collections.Generic;
using System.Threading.Tasks;
using DevHive.Data.Models;
using DevHive.Data.Repositories.Interfaces;
@@ -8,6 +9,9 @@ namespace DevHive.Data.Interfaces.Repositories
public interface IPostRepository : IRepository<Post>
{
Task<Post> GetPostByCreatorAndTimeCreatedAsync(Guid issuerId, DateTime timeCreated);
+ Task<List<string>> GetFileUrls(Guid postId);
+
Task<bool> DoesPostExist(Guid postId);
+ Task<bool> DoesPostHaveFiles(Guid postId);
}
}
diff --git a/src/DevHive.Data/Models/Post.cs b/src/DevHive.Data/Models/Post.cs
index 0ea7142..c513eb4 100644
--- a/src/DevHive.Data/Models/Post.cs
+++ b/src/DevHive.Data/Models/Post.cs
@@ -18,6 +18,6 @@ namespace DevHive.Data.Models
public List<Comment> Comments { get; set; } = new();
- // public List<string> Files { get; set; } = new();
+ public List<string> FileUrls { get; set; } = new();
}
}
diff --git a/src/DevHive.Data/Repositories/BaseRepository.cs b/src/DevHive.Data/Repositories/BaseRepository.cs
index f1e6673..cac802e 100644
--- a/src/DevHive.Data/Repositories/BaseRepository.cs
+++ b/src/DevHive.Data/Repositories/BaseRepository.cs
@@ -34,10 +34,10 @@ namespace DevHive.Data.Repositories
public virtual async Task<bool> EditAsync(Guid id, TEntity newEntity)
{
var entry = this._context.Entry(newEntity);
- if (entry.State == EntityState.Detached)
- this._context.Attach(newEntity);
+ if (entry.State == EntityState.Detached)
+ this._context.Attach(newEntity);
- entry.State = EntityState.Modified;
+ entry.State = EntityState.Modified;
return await this.SaveChangesAsync(_context);
}
diff --git a/src/DevHive.Data/Repositories/PostRepository.cs b/src/DevHive.Data/Repositories/PostRepository.cs
index 67988f2..78b40cd 100644
--- a/src/DevHive.Data/Repositories/PostRepository.cs
+++ b/src/DevHive.Data/Repositories/PostRepository.cs
@@ -1,4 +1,6 @@
using System;
+using System.Collections.Generic;
+using System.Linq;
using System.Threading.Tasks;
using DevHive.Data.Interfaces.Repositories;
using DevHive.Data.Models;
@@ -30,6 +32,11 @@ namespace DevHive.Data.Repositories
.FirstOrDefaultAsync(p => p.Creator.Id == creatorId &&
p.TimeCreated == timeCreated);
}
+
+ public async Task<List<string>> GetFileUrls(Guid postId)
+ {
+ return (await this.GetByIdAsync(postId)).FileUrls;
+ }
#endregion
#region Validations
@@ -39,6 +46,15 @@ namespace DevHive.Data.Repositories
.AsNoTracking()
.AnyAsync(r => r.Id == postId);
}
+
+ public async Task<bool> DoesPostHaveFiles(Guid postId)
+ {
+ return await this._context.Posts
+ .AsNoTracking()
+ .Where(x => x.Id == postId)
+ .Select(x => x.FileUrls)
+ .AnyAsync();
+ }
#endregion
}
}
diff --git a/src/DevHive.Services/Configurations/Mapping/PostMappings.cs b/src/DevHive.Services/Configurations/Mapping/PostMappings.cs
index d8dcc84..c7466d9 100644
--- a/src/DevHive.Services/Configurations/Mapping/PostMappings.cs
+++ b/src/DevHive.Services/Configurations/Mapping/PostMappings.cs
@@ -9,7 +9,7 @@ namespace DevHive.Services.Configurations.Mapping
public PostMappings()
{
CreateMap<CreatePostServiceModel, Post>();
- // .ForMember(dest => dest.Files, src => src.Ignore());
+ // .ForMember(dest => dest.Files, src => src.Ignore());
CreateMap<UpdatePostServiceModel, Post>()
.ForMember(dest => dest.Id, src => src.MapFrom(p => p.PostId))
// .ForMember(dest => dest.Files, src => src.Ignore())
@@ -20,7 +20,7 @@ namespace DevHive.Services.Configurations.Mapping
.ForMember(dest => dest.CreatorFirstName, src => src.Ignore())
.ForMember(dest => dest.CreatorLastName, src => src.Ignore())
.ForMember(dest => dest.CreatorUsername, src => src.Ignore());
- //TODO: Map those here /\
+ //TODO: Map those here /\
}
}
}
diff --git a/src/DevHive.Services/DevHive.Services.csproj b/src/DevHive.Services/DevHive.Services.csproj
index 52f0323..66df209 100644
--- a/src/DevHive.Services/DevHive.Services.csproj
+++ b/src/DevHive.Services/DevHive.Services.csproj
@@ -1,27 +1,29 @@
-<Project Sdk="Microsoft.NET.Sdk">
- <PropertyGroup>
- <TargetFramework>net5.0</TargetFramework>
- </PropertyGroup>
-
- <ItemGroup>
- <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
- <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.1">
- <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
- <PrivateAssets>all</PrivateAssets>
- </PackageReference>
- <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.8.0" />
- <ProjectReference Include="..\DevHive.Data\DevHive.Data.csproj" />
-
- <PackageReference Include="AutoMapper" Version="10.1.1" />
- <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.1.0" />
- </ItemGroup>
-
- <ItemGroup>
- <ProjectReference Include="..\DevHive.Common\DevHive.Common.csproj" />
- </ItemGroup>
-
- <PropertyGroup>
- <EnableNETAnalyzers>true</EnableNETAnalyzers>
- <AnalysisLevel>latest</AnalysisLevel>
- </PropertyGroup>
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+ <PropertyGroup>
+ <TargetFramework>net5.0</TargetFramework>
+ </PropertyGroup>
+
+ <ItemGroup>
+ <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
+ <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.1">
+ <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+ <PrivateAssets>all</PrivateAssets>
+ </PackageReference>
+ <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.8.0" />
+ <ProjectReference Include="..\DevHive.Data\DevHive.Data.csproj" />
+
+ <PackageReference Include="AutoMapper" Version="10.1.1" />
+ <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.1.0" />
+
+ <PackageReference Include="CloudinaryDotNet" Version="1.14.0"/>
+ </ItemGroup>
+
+ <ItemGroup>
+ <ProjectReference Include="..\DevHive.Common\DevHive.Common.csproj" />
+ </ItemGroup>
+
+ <PropertyGroup>
+ <EnableNETAnalyzers>true</EnableNETAnalyzers>
+ <AnalysisLevel>latest</AnalysisLevel>
+ </PropertyGroup>
+</Project>
diff --git a/src/DevHive.Services/Interfaces/ICloudService.cs b/src/DevHive.Services/Interfaces/ICloudService.cs
new file mode 100644
index 0000000..6616444
--- /dev/null
+++ b/src/DevHive.Services/Interfaces/ICloudService.cs
@@ -0,0 +1,13 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+
+namespace DevHive.Services.Interfaces
+{
+ public interface ICloudService
+ {
+ Task<List<string>> UploadFilesToCloud(List<IFormFile> formFiles);
+
+ Task<bool> RemoveFilesFromCloud(List<string> fileUrls);
+ }
+}
diff --git a/src/DevHive.Services/Models/Cloud/CloudinaryService.cs b/src/DevHive.Services/Models/Cloud/CloudinaryService.cs
new file mode 100644
index 0000000..a9bc9bd
--- /dev/null
+++ b/src/DevHive.Services/Models/Cloud/CloudinaryService.cs
@@ -0,0 +1,55 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Threading.Tasks;
+using CloudinaryDotNet;
+using CloudinaryDotNet.Actions;
+using DevHive.Services.Interfaces;
+using Microsoft.AspNetCore.Http;
+
+namespace DevHive.Services.Services
+{
+ public class CloudinaryService : ICloudService
+ {
+ private readonly Cloudinary _cloudinary;
+
+ public CloudinaryService(string cloudName, string apiKey, string apiSecret)
+ {
+ this._cloudinary = new Cloudinary(new Account(cloudName, apiKey, apiSecret));
+ }
+
+ public async Task<List<string>> UploadFilesToCloud(List<IFormFile> formFiles)
+ {
+ List<string> fileUrls = new();
+ foreach (var formFile in formFiles)
+ {
+ string formFileId = Guid.NewGuid().ToString();
+
+ if (formFile.Length > 0)
+ {
+ using (var ms = new MemoryStream())
+ {
+ formFile.CopyTo(ms);
+ byte[] formBytes = ms.ToArray();
+
+ ImageUploadParams imageUploadParams = new()
+ {
+ File = new FileDescription(formFileId, new MemoryStream(formBytes)),
+ PublicId = formFileId
+ };
+
+ ImageUploadResult uploadResult = await this._cloudinary.UploadAsync(imageUploadParams);
+ fileUrls.Add(uploadResult.Url.AbsoluteUri);
+ }
+ }
+ }
+
+ return fileUrls;
+ }
+
+ public async Task<bool> RemoveFilesFromCloud(List<string> fileUrls)
+ {
+ return true;
+ }
+ }
+}
diff --git a/src/DevHive.Services/Models/Post/Post/CreatePostServiceModel.cs b/src/DevHive.Services/Models/Post/Post/CreatePostServiceModel.cs
index 36f6351..8676f6c 100644
--- a/src/DevHive.Services/Models/Post/Post/CreatePostServiceModel.cs
+++ b/src/DevHive.Services/Models/Post/Post/CreatePostServiceModel.cs
@@ -1,4 +1,6 @@
using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Http;
namespace DevHive.Services.Models.Post.Post
{
@@ -8,6 +10,6 @@ namespace DevHive.Services.Models.Post.Post
public string Message { get; set; }
- // public List<IFormFile> Files { get; set; }
+ public List<IFormFile> Files { get; set; }
}
}
diff --git a/src/DevHive.Services/Models/Post/Post/ReadPostServiceModel.cs b/src/DevHive.Services/Models/Post/Post/ReadPostServiceModel.cs
index 3e673c1..f0a4fe5 100644
--- a/src/DevHive.Services/Models/Post/Post/ReadPostServiceModel.cs
+++ b/src/DevHive.Services/Models/Post/Post/ReadPostServiceModel.cs
@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using DevHive.Services.Models.Post.Comment;
+using Microsoft.Extensions.FileProviders;
namespace DevHive.Services.Models.Post.Post
{
@@ -20,6 +21,6 @@ namespace DevHive.Services.Models.Post.Post
public List<ReadCommentServiceModel> Comments { get; set; } = new();
- //public List<string> Files { get; set; }
+ public List<IFileInfo> Files { get; set; }
}
}
diff --git a/src/DevHive.Services/Models/Post/Post/UpdatePostServiceModel.cs b/src/DevHive.Services/Models/Post/Post/UpdatePostServiceModel.cs
index 8924b07..24b0b74 100644
--- a/src/DevHive.Services/Models/Post/Post/UpdatePostServiceModel.cs
+++ b/src/DevHive.Services/Models/Post/Post/UpdatePostServiceModel.cs
@@ -1,4 +1,6 @@
using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Http;
namespace DevHive.Services.Models.Post.Post
{
@@ -10,6 +12,6 @@ namespace DevHive.Services.Models.Post.Post
public string NewMessage { get; set; }
- // public List<IFormFile> Files { get; set; }
+ public List<IFormFile> Files { get; set; }
}
}
diff --git a/src/DevHive.Services/Services/PostService.cs b/src/DevHive.Services/Services/PostService.cs
index d80d815..7ce7b58 100644
--- a/src/DevHive.Services/Services/PostService.cs
+++ b/src/DevHive.Services/Services/PostService.cs
@@ -15,13 +15,15 @@ namespace DevHive.Services.Services
{
public class PostService : IPostService
{
+ private readonly ICloudService _cloudService;
private readonly IUserRepository _userRepository;
private readonly IPostRepository _postRepository;
private readonly ICommentRepository _commentRepository;
private readonly IMapper _postMapper;
- public PostService(IUserRepository userRepository, IPostRepository postRepository, ICommentRepository commentRepository, IMapper postMapper)
+ public PostService(ICloudService cloudService, IUserRepository userRepository, IPostRepository postRepository, ICommentRepository commentRepository, IMapper postMapper)
{
+ this._cloudService = cloudService;
this._userRepository = userRepository;
this._postRepository = postRepository;
this._commentRepository = commentRepository;
@@ -35,9 +37,12 @@ namespace DevHive.Services.Services
throw new ArgumentException("User does not exist!");
Post post = this._postMapper.Map<Post>(createPostServiceModel);
- post.TimeCreated = DateTime.Now;
+
+ if (createPostServiceModel.Files.Count != 0)
+ post.FileUrls = await _cloudService.UploadFilesToCloud(createPostServiceModel.Files);
post.Creator = await this._userRepository.GetByIdAsync(createPostServiceModel.CreatorId);
+ post.TimeCreated = DateTime.Now;
bool success = await this._postRepository.AddAsync(post);
if (success)
@@ -116,9 +121,23 @@ namespace DevHive.Services.Services
throw new ArgumentException("Post does not exist!");
Post post = this._postMapper.Map<Post>(updatePostServiceModel);
- post.TimeCreated = DateTime.Now;
+
+ if (updatePostServiceModel.Files.Count != 0)
+ {
+ if (await this._postRepository.DoesPostHaveFiles(updatePostServiceModel.PostId))
+ {
+ List<string> fileUrls = await this._postRepository.GetFileUrls(updatePostServiceModel.PostId);
+ bool success = await _cloudService.RemoveFilesFromCloud(fileUrls);
+ if (!success)
+ throw new InvalidCastException("Could not delete files from the post!");
+ }
+
+ post.FileUrls = await _cloudService.UploadFilesToCloud(updatePostServiceModel.Files) ??
+ throw new ArgumentNullException("Unable to upload images to cloud");
+ }
post.Creator = await this._userRepository.GetByIdAsync(updatePostServiceModel.CreatorId);
+ post.TimeCreated = DateTime.Now;
bool result = await this._postRepository.EditAsync(updatePostServiceModel.PostId, post);
@@ -155,6 +174,15 @@ namespace DevHive.Services.Services
throw new ArgumentException("Post does not exist!");
Post post = await this._postRepository.GetByIdAsync(id);
+
+ if (await this._postRepository.DoesPostHaveFiles(id))
+ {
+ List<string> fileUrls = await this._postRepository.GetFileUrls(id);
+ bool success = await _cloudService.RemoveFilesFromCloud(fileUrls);
+ if (!success)
+ throw new InvalidCastException("Could not delete files from the post. Please try again");
+ }
+
return await this._postRepository.DeleteAsync(post);
}
diff --git a/src/DevHive.Web/Configurations/Extensions/ConfigureDependencyInjection.cs b/src/DevHive.Web/Configurations/Extensions/ConfigureDependencyInjection.cs
index d7c859e..fe2c788 100644
--- a/src/DevHive.Web/Configurations/Extensions/ConfigureDependencyInjection.cs
+++ b/src/DevHive.Web/Configurations/Extensions/ConfigureDependencyInjection.cs
@@ -3,13 +3,14 @@ using DevHive.Data.Models;
using DevHive.Data.Repositories;
using DevHive.Services.Interfaces;
using DevHive.Services.Services;
+using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
namespace DevHive.Web.Configurations.Extensions
{
public static class ConfigureDependencyInjection
{
- public static void DependencyInjectionConfiguration(this IServiceCollection services)
+ public static void DependencyInjectionConfiguration(this IServiceCollection services, IConfiguration configuration)
{
services.AddTransient<ILanguageRepository, LanguageRepository>();
services.AddTransient<IRoleRepository, RoleRepository>();
@@ -25,6 +26,11 @@ namespace DevHive.Web.Configurations.Extensions
services.AddTransient<IUserService, UserService>();
services.AddTransient<IPostService, PostService>();
services.AddTransient<IFeedService, FeedService>();
+ services.AddTransient<ICloudService, CloudinaryService>(options =>
+ new CloudinaryService(
+ cloudName: configuration.GetSection("Cloud").GetSection("cloudName").Value,
+ apiKey: configuration.GetSection("Cloud").GetSection("apiKey").Value,
+ apiSecret: configuration.GetSection("Cloud").GetSection("apiSecret").Value));
}
}
}
diff --git a/src/DevHive.Web/Models/Post/Post/CreatePostWebModel.cs b/src/DevHive.Web/Models/Post/Post/CreatePostWebModel.cs
index b7b4cf4..e35a813 100644
--- a/src/DevHive.Web/Models/Post/Post/CreatePostWebModel.cs
+++ b/src/DevHive.Web/Models/Post/Post/CreatePostWebModel.cs
@@ -1,6 +1,8 @@
using System;
+using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Diagnostics.CodeAnalysis;
+using Microsoft.AspNetCore.Http;
namespace DevHive.Web.Models.Post.Post
{
@@ -10,6 +12,6 @@ namespace DevHive.Web.Models.Post.Post
[Required]
public string Message { get; set; }
- // public List<IFormFile> Files { get; set; }
+ public List<IFormFile> Files { get; set; }
}
}
diff --git a/src/DevHive.Web/Models/Post/Post/ReadPostWebModel.cs b/src/DevHive.Web/Models/Post/Post/ReadPostWebModel.cs
index 04c6275..5d4da31 100644
--- a/src/DevHive.Web/Models/Post/Post/ReadPostWebModel.cs
+++ b/src/DevHive.Web/Models/Post/Post/ReadPostWebModel.cs
@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using DevHive.Web.Models.Post.Comment;
+using Microsoft.AspNetCore.Http;
namespace DevHive.Web.Models.Post.Post
{
@@ -20,6 +21,6 @@ namespace DevHive.Web.Models.Post.Post
public List<ReadCommentWebModel> Comments { get; set; }
- //public Files[] Files { get; set; }
+ public List<IFormFile> Files { get; set; }
}
}
diff --git a/src/DevHive.Web/Models/Post/Post/UpdatePostWebModel.cs b/src/DevHive.Web/Models/Post/Post/UpdatePostWebModel.cs
index 685f08b..ac84d2c 100644
--- a/src/DevHive.Web/Models/Post/Post/UpdatePostWebModel.cs
+++ b/src/DevHive.Web/Models/Post/Post/UpdatePostWebModel.cs
@@ -1,6 +1,8 @@
using System;
+using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Diagnostics.CodeAnalysis;
+using Microsoft.AspNetCore.Http;
namespace DevHive.Web.Models.Post.Post
{
@@ -13,5 +15,7 @@ namespace DevHive.Web.Models.Post.Post
[NotNull]
[Required]
public string NewMessage { get; set; }
+
+ public List<IFormFile> Files { get; set; } = new();
}
}
diff --git a/src/DevHive.Web/Startup.cs b/src/DevHive.Web/Startup.cs
index 92d4359..dd7e852 100644
--- a/src/DevHive.Web/Startup.cs
+++ b/src/DevHive.Web/Startup.cs
@@ -32,7 +32,7 @@ namespace DevHive.Web
services.SwaggerConfiguration();
services.JWTConfiguration(Configuration);
services.AutoMapperConfiguration();
- services.DependencyInjectionConfiguration();
+ services.DependencyInjectionConfiguration(this.Configuration);
services.ExceptionHandlerMiddlewareConfiguration();
}
diff --git a/src/DevHive.Web/appsettings.json b/src/DevHive.Web/appsettings.json
index 83932a7..bcdcae7 100644
--- a/src/DevHive.Web/appsettings.json
+++ b/src/DevHive.Web/appsettings.json
@@ -4,7 +4,12 @@
},
"ConnectionStrings": {
"DEV": "Server=localhost;Port=5432;Database=API;User Id=postgres;Password=;"
- },
+ },
+ "Cloud": {
+ "cloudName": "devhive",
+ "apiKey": "488664116365813",
+ "apiSecret": ""
+ },
"Logging": {
"LogLevel": {
"Default": "Information",
generated by cgit v1.2.3 (git 2.46.0) at 2026-03-16 07:45:25 +0000