sandre/SkydiveLogs
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename "Image*" to "UserImage*"

Browse Source
This commit is contained in:
Sébastien André
2020-12-18 16:51:49 +01:00
parent 4e3666de82
commit f2875eb969
12 changed files with 50 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -15,3 +15,4 @@
/Back/skydiveLogs-api.Data/bin
/Back/skydiveLogs-api.Business/bin
/Back/dist
/Back/skydiveLogs-api.v3.ncrunchsolution.user

20
Back/skydiveLogs-api.Business/Interface/IImageService.cs
View File

@@ -1,20 +0,0 @@
using System.Collections.Generic;
using skydiveLogs_api.Model;
namespace skydiveLogs_api.Business.Interface
{
public interface IImageService
{
IEnumerable<Image> GetAllImages(User connectedUser);
Image GetImageById(int id);
void AddNewImage(Image image, User connectedUser);
void UpdateImage(int id, Image image);
void DeleteImageById(int id);
}
}

20
Back/skydiveLogs-api.Business/Interface/IUserImageService.cs Normal file
View File

@@ -0,0 +1,20 @@
using System.Collections.Generic;
using skydiveLogs_api.Model;
namespace skydiveLogs_api.Business.Interface
{
public interface IUserImageService
{
IEnumerable<UserImage> GetAllImages(User connectedUser);
UserImage GetImageById(int id);
void AddNewImage(UserImage image, User connectedUser);
void UpdateImage(int id, UserImage image);
void DeleteImageById(int id);
}
}

14
Back/skydiveLogs-api.Business/ImageService.cs → Back/skydiveLogs-api.Business/UserImageService.cs
View File

@@ -8,14 +8,14 @@ using skydiveLogs_api.Data.Interface;
namespace skydiveLogs_api.Business
{
public class ImageService : IImageService
public class UserImageService : IUserImageService
{
public ImageService(IImageRepository imageRepository)
public UserImageService(IUserImageRepository imageRepository)
{
_imageRepository = imageRepository;
}
public void AddNewImage(Image newImage, User connectedUser)
public void AddNewImage(UserImage newImage, User connectedUser)
{
newImage.User = connectedUser;
_imageRepository.Add(newImage);
@@ -26,21 +26,21 @@ namespace skydiveLogs_api.Business
throw new NotImplementedException();
}
public Image GetImageById(int id)
public UserImage GetImageById(int id)
{
return _imageRepository.GetById(id);
}
public IEnumerable<Image> GetAllImages(User connectedUser)
public IEnumerable<UserImage> GetAllImages(User connectedUser)
{
return _imageRepository.GetAll(connectedUser);
}
public void UpdateImage(int id, Image Image)
public void UpdateImage(int id, UserImage Image)
{
throw new NotImplementedException();
}
private readonly IImageRepository _imageRepository;
private readonly IUserImageRepository _imageRepository;
}
}

2
Back/skydiveLogs-api.Data/Interface/IDataProvider.cs
View File

@@ -23,6 +23,6 @@ namespace skydiveLogs_api.Data.Interface
ILiteCollection<User> CollOfUser { get; }
ILiteCollection<Image> CollOfImage { get; }
ILiteCollection<UserImage> CollOfImage { get; }
}
}

4
Back/skydiveLogs-api.Data/Interface/IImageRepository.cs → Back/skydiveLogs-api.Data/Interface/IUserImageRepository.cs
View File

@@ -4,8 +4,8 @@ using skydiveLogs_api.Model;
namespace skydiveLogs_api.Data.Interface
{
public interface IImageRepository : IRepository<Image>
public interface IUserImageRepository : IRepository<UserImage>
{
IEnumerable<Image> GetAll(User user);
IEnumerable<UserImage> GetAll(User user);
}
}

4
Back/skydiveLogs-api.Data/LiteDbProvider.cs
View File

@@ -16,7 +16,7 @@ namespace skydiveLogs_api.Data
BsonMapper.Global.Entity<Jump>().DbRef(x => x.Gear, "Gear");
BsonMapper.Global.Entity<Jump>().DbRef(x => x.User, "User");
BsonMapper.Global.Entity<Image>().DbRef(x => x.User, "User");
BsonMapper.Global.Entity<UserImage>().DbRef(x => x.User, "User");
}
public ILiteCollection<T> GetCollection<T>()
@@ -43,6 +43,6 @@ namespace skydiveLogs_api.Data
public ILiteCollection<User> CollOfUser => _db.GetCollection<User>();
public ILiteCollection<Image> CollOfImage => _db.GetCollection<Image>();
public ILiteCollection<UserImage> CollOfImage => _db.GetCollection<UserImage>();
}
}

16
Back/skydiveLogs-api.Data/ImageRepository.cs → Back/skydiveLogs-api.Data/UserImageRepository.cs
View File

@@ -9,20 +9,20 @@ using skydiveLogs_api.Model;
namespace skydiveLogs_api.Data
{
public class ImageRepository : IImageRepository
public class UserImageRepository : IUserImageRepository
{
public ImageRepository(IDataProvider dataProvider)
public UserImageRepository(IDataProvider dataProvider)
{
_dataProvider = dataProvider;
_col = _dataProvider.CollOfImage;
}
public IEnumerable<Image> GetAll()
public IEnumerable<UserImage> GetAll()
{
throw new System.NotImplementedException();
}
public IEnumerable<Image> GetAll(User user)
public IEnumerable<UserImage> GetAll(User user)
{
return _col.Include(x => x.User)
.Query()
@@ -30,17 +30,17 @@ namespace skydiveLogs_api.Data
.ToList();
}
public Image GetById(int id)
public UserImage GetById(int id)
{
return _col.FindById(new BsonValue(id));
}
public bool Update(Image image)
public bool Update(UserImage image)
{
return _col.Update(image);
}
public bool Add(Image newImage)
public bool Add(UserImage newImage)
{
var result = true;
@@ -58,6 +58,6 @@ namespace skydiveLogs_api.Data
private readonly IDataProvider _dataProvider;
private readonly ILiteCollection<Image> _col;
private readonly ILiteCollection<UserImage> _col;
}
}

4
Back/skydiveLogs-api.Ioc/IocService.cs
View File

@@ -26,7 +26,7 @@ namespace skydiveLogs_api.Ioc
_services.AddScoped<Business.Interface.IJumpTypeService, Business.JumpTypeService>();
_services.AddScoped<Business.Interface.IStatsService, Business.StatsService>();
_services.AddScoped<Business.Interface.IUserService, Business.UserService>();
_services.AddScoped<Business.Interface.IImageService, Business.ImageService>();
_services.AddScoped<Business.Interface.IUserImageService, Business.UserImageService>();
_services.AddScoped<Data.Interface.IAircraftRepository, Data.AircraftRepository>();
_services.AddScoped<Data.Interface.IDropZoneRepository, Data.DropZoneRepository>();
@@ -34,7 +34,7 @@ namespace skydiveLogs_api.Ioc
_services.AddScoped<Data.Interface.IJumpTypeRepository, Data.JumpTypeRepository>();
_services.AddScoped<Data.Interface.IGearRepository, Data.GearRepository>();
_services.AddScoped<Data.Interface.IUserRepository, Data.UserRepository>();
_services.AddScoped<Data.Interface.IImageRepository, Data.ImageRepository>();
_services.AddScoped<Data.Interface.IUserImageRepository, Data.UserImageRepository>();
string connectionString = _configuration.GetConnectionString("DefaultConnection");
_services.AddSingleton<Data.Interface.IDataProvider>(c => new Data.LiteDbProvider(connectionString));

2
Back/skydiveLogs-api.Model/Image.cs → Back/skydiveLogs-api.Model/UserImage.cs
View File

@@ -1,6 +1,6 @@
namespace skydiveLogs_api.Model
{
public class Image
public class UserImage
{
public int Id { get; set; }

8
Back/skydiveLogs-api/Controllers/ImageController.cs
View File

@@ -13,7 +13,7 @@ namespace skydiveLogs_api.Controllers
{
public class ImageController : Base
{
public ImageController(IImageService imageService,
public ImageController(IUserImageService imageService,
IMapper mapper)
{
_imageService = imageService;
@@ -43,7 +43,7 @@ namespace skydiveLogs_api.Controllers
[EnableCors]
public void Post([FromBody] ImageReq value)
{
_imageService.AddNewImage(_mapper.Map<Image>(value), ConnectedUser);
_imageService.AddNewImage(_mapper.Map<UserImage>(value), ConnectedUser);
}
// PUT: api/Image/5
@@ -51,7 +51,7 @@ namespace skydiveLogs_api.Controllers
[EnableCors]
public void Put(int id, [FromBody] ImageReq value)
{
_imageService.UpdateImage(id, _mapper.Map<Image>(value));
_imageService.UpdateImage(id, _mapper.Map<UserImage>(value));
}
// DELETE: api/Image/5
@@ -62,7 +62,7 @@ namespace skydiveLogs_api.Controllers
_imageService.DeleteImageById(id);
}
private readonly IImageService _imageService;
private readonly IUserImageService _imageService;
private readonly IMapper _mapper;
}
}

4
Back/skydiveLogs-api/Mapper/ModelProfile.cs
View File

@@ -12,7 +12,7 @@ namespace skydiveLogs_api.Mapper
CreateMap<DataContract.DropZoneReq, Model.DropZone>();
CreateMap<DataContract.GearReq, Model.Gear>();
CreateMap<DataContract.UserReq, Model.User>();
CreateMap<DataContract.ImageReq, Model.Image>();
CreateMap<DataContract.ImageReq, Model.UserImage>();
CreateMap<Model.Gear, DataContract.GearResp>();
CreateMap<Model.Jump, DataContract.JumpResp>();
@@ -21,7 +21,7 @@ namespace skydiveLogs_api.Mapper
CreateMap<Model.DropZone ,DataContract.DropZoneResp>();
CreateMap<Model.Statistic ,DataContract.StatisticResp>();
CreateMap<Model.User, DataContract.UserResp>();
CreateMap<Model.Image, DataContract.ImageResp>();
CreateMap<Model.UserImage, DataContract.ImageResp>();
CreateMap<Model.SimpleSummary, DataContract.SimpleSummaryResp>();
}