Merge pull request #141 from dotnetgoo/Nozimjon

GroupAssetService added
dotnetgoo · Nov 4, 2023 · e4b2c2f · e4b2c2f
2 parents 448560c + 766a68f
commit e4b2c2f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/src/Shamsheer.Messenger.Api/Controllers/GroupAssets/GroupAssetsController.cs b/src/Shamsheer.Messenger.Api/Controllers/GroupAssets/GroupAssetsController.cs
@@ -1,6 +1,7 @@
 using Microsoft.AspNetCore.Mvc;
 using Shamsheer.Service.Configurations;
 using Shamsheer.Service.Interfaces.GroupAssets;
+using System.ComponentModel.DataAnnotations;
 
 namespace Shamsheer.Messenger.Api.Controllers.GroupAssets;
 
@@ -13,9 +14,9 @@ public GroupAssetsController(IGroupAssetService groupAssetService)
         _groupAssetService = groupAssetService;
     }
 
-    [HttpPost]
-    public async Task<IActionResult> PostAsync(IFormFile formFile)
-        => Ok(await _groupAssetService.CreateAsync(formFile));
+    [HttpPost("{group-id}")]
+    public async Task<IActionResult> PostAsync([FromRoute(Name = "group-id")] long groupId, [Required] IFormFile formFile)
+        => Ok(await _groupAssetService.CreateAsync(groupId,formFile));
 
     [HttpGet("{group-id}")]
     public async Task<IActionResult> GetAllAsync([FromQuery] PaginationParams @params, [FromRoute(Name = "groupId")] long groupId)

diff --git a/src/Shamsheer.Service/Interfaces/GroupAssets/IGroupAssetService.cs b/src/Shamsheer.Service/Interfaces/GroupAssets/IGroupAssetService.cs
@@ -9,7 +9,7 @@ namespace Shamsheer.Service.Interfaces.GroupAssets;
 public interface IGroupAssetService
 {
     Task<bool> RemoveAsync(long groupId, long id);
-    Task<GroupAssetForResultDto> CreateAsync(IFormFile formFile);
+    Task<GroupAssetForResultDto> CreateAsync(long groupId, IFormFile formFile);
     Task<GroupAssetForResultDto> RetrieveByIdAsync(long groupId, long id);
     Task<IEnumerable<GroupAssetForResultDto>> RetrieveAllAsync(long groupId, PaginationParams @params);
 }
diff --git a/src/Shamsheer.Service/Services/GroupAssets/GroupAssetService.cs b/src/Shamsheer.Service/Services/GroupAssets/GroupAssetService.cs
@@ -29,10 +29,8 @@ public GroupAssetService(IMapper mapper, IGroupRepository groupRepository, IGrou
         _groupRepository = groupRepository;
         _groupAssetRepository = groupAssetRepository;
     }
-    public async Task<GroupAssetForResultDto> CreateAsync(IFormFile formFile)
+    public async Task<GroupAssetForResultDto> CreateAsync(long groupId, IFormFile formFile)
     {
-        //Identify GroupId TODO:LOGIC
-        long groupId = 1; //Actually this one is takes from jwt token, now we need to give default value
         var group = await _groupRepository.SelectAll()
             .Where(g => g.Id == groupId)
             .FirstOrDefaultAsync();