diff --git a/Back/skydiveLogs-api.Business/ImageService.cs b/Back/skydiveLogs-api.Business/ImageService.cs index 10899f6..4b2848a 100644 --- a/Back/skydiveLogs-api.Business/ImageService.cs +++ b/Back/skydiveLogs-api.Business/ImageService.cs @@ -15,8 +15,9 @@ namespace skydiveLogs_api.Business _imageRepository = imageRepository; } - public void AddNewImage(Image newImage) + public void AddNewImage(Image newImage, User connectedUser) { + newImage.User = connectedUser; _imageRepository.Add(newImage); } diff --git a/Back/skydiveLogs-api.Business/Interface/IImageService.cs b/Back/skydiveLogs-api.Business/Interface/IImageService.cs index 84212a6..e87ceb1 100644 --- a/Back/skydiveLogs-api.Business/Interface/IImageService.cs +++ b/Back/skydiveLogs-api.Business/Interface/IImageService.cs @@ -11,9 +11,9 @@ namespace skydiveLogs_api.Business.Interface Image GetImageById(int id); - void AddNewImage(Image Image); + void AddNewImage(Image image, User connectedUser); - void UpdateImage(int id, Image Image); + void UpdateImage(int id, Image image); void DeleteImageById(int id); } diff --git a/Back/skydiveLogs-api.Data/LiteDbProvider.cs b/Back/skydiveLogs-api.Data/LiteDbProvider.cs index f5f66f2..7ad3405 100644 --- a/Back/skydiveLogs-api.Data/LiteDbProvider.cs +++ b/Back/skydiveLogs-api.Data/LiteDbProvider.cs @@ -15,7 +15,7 @@ namespace skydiveLogs_api.Data BsonMapper.Global.Entity().DbRef(x => x.DropZone, "DropZone"); BsonMapper.Global.Entity().DbRef(x => x.Gear, "Gear"); - BsonMapper.Global.Entity().DbRef(x => x.UserId, "User"); + BsonMapper.Global.Entity().DbRef(x => x.User, "User"); } public ILiteCollection GetCollection() diff --git a/Back/skydiveLogs-api.Model/Image.cs b/Back/skydiveLogs-api.Model/Image.cs index 0e09075..7064853 100644 --- a/Back/skydiveLogs-api.Model/Image.cs +++ b/Back/skydiveLogs-api.Model/Image.cs @@ -8,6 +8,6 @@ public string Data { get; set; } - public int UserId { get; set; } + public User User { get; set; } } } diff --git a/Back/skydiveLogs-api.Model/User.cs b/Back/skydiveLogs-api.Model/User.cs index c2e9599..e122861 100644 --- a/Back/skydiveLogs-api.Model/User.cs +++ b/Back/skydiveLogs-api.Model/User.cs @@ -15,7 +15,5 @@ namespace skydiveLogs_api.Model public string Login { get; set; } public string Password { get; set; } - - public IEnumerable Images { get; set; } } } diff --git a/Back/skydiveLogs-api/Controllers/ImageController.cs b/Back/skydiveLogs-api/Controllers/ImageController.cs index 56c2697..9d9ba94 100644 --- a/Back/skydiveLogs-api/Controllers/ImageController.cs +++ b/Back/skydiveLogs-api/Controllers/ImageController.cs @@ -43,7 +43,7 @@ namespace skydiveLogs_api.Controllers [EnableCors] public void Post([FromBody] ImageReq value) { - _imageService.AddNewImage(_mapper.Map(value)); + _imageService.AddNewImage(_mapper.Map(value), ConnectedUser); } // PUT: api/Image/5 diff --git a/Back/skydiveLogs-api/Data/JumpsDb.db b/Back/skydiveLogs-api/Data/JumpsDb.db index aee3ee3..60e9773 100644 Binary files a/Back/skydiveLogs-api/Data/JumpsDb.db and b/Back/skydiveLogs-api/Data/JumpsDb.db differ