Merge pull request #64 from bcgov/2.3

2.3 to master
bcgov · Sep 5, 2019 · 5f13aa5 · 5f13aa5
2 parents 857cfaa + 6417091
commit 5f13aa5
Show file tree

Hide file tree

Showing 80 changed files with 2,624 additions and 959 deletions.
diff --git a/.leu b/.leu
diff --git a/DatabaseMigrations/2.3.sql b/DatabaseMigrations/2.3.sql
@@ -0,0 +1,56 @@
+DELETE FROM TRA_ACTIVITY WHERE NAME = 'Low';
+DELETE FROM TRA_ACTIVITY WHERE NAME = 'Medium';
+DELETE FROM TRA_ACTIVITY WHERE NAME = 'High';
+
+INSERT INTO TRA_ACTIVITY ([NAME], [DESCRIPTION], [INTENSITY], [DB_CREATE_TIMESTAMP], [DB_CREATE_USERID], [DB_LAST_UPDATE_TIMESTAMP], [DB_LAST_UPDATE_USERID], [CONCURRENCY_CONTROL_NUMBER])
+VALUES ('Walking', 'Walking Low Intensity', 1, GETDATE(), 'Transaction_Dev', GETDATE(), 'Transaction_Dev', 1)
+INSERT INTO TRA_ACTIVITY ([NAME], [DESCRIPTION], [INTENSITY], [DB_CREATE_TIMESTAMP], [DB_CREATE_USERID], [DB_LAST_UPDATE_TIMESTAMP], [DB_LAST_UPDATE_USERID], [CONCURRENCY_CONTROL_NUMBER])
+VALUES ('Gardening', 'Gardening Low Intensity', 1, GETDATE(), 'Transaction_Dev', GETDATE(), 'Transaction_Dev', 1)
+INSERT INTO TRA_ACTIVITY ([NAME], [DESCRIPTION], [INTENSITY], [DB_CREATE_TIMESTAMP], [DB_CREATE_USERID], [DB_LAST_UPDATE_TIMESTAMP], [DB_LAST_UPDATE_USERID], [CONCURRENCY_CONTROL_NUMBER])
+VALUES ('Yoga', 'Yoga Low Intensity', 1, GETDATE(), 'Transaction_Dev', GETDATE(), 'Transaction_Dev', 1)
+INSERT INTO TRA_ACTIVITY ([NAME], [DESCRIPTION], [INTENSITY], [DB_CREATE_TIMESTAMP], [DB_CREATE_USERID], [DB_LAST_UPDATE_TIMESTAMP], [DB_LAST_UPDATE_USERID], [CONCURRENCY_CONTROL_NUMBER])
+VALUES ('Kayaking', 'Kayaking Low Intensity', 1, GETDATE(), 'Transaction_Dev', GETDATE(), 'Transaction_Dev', 1)
+INSERT INTO TRA_ACTIVITY ([NAME], [DESCRIPTION], [INTENSITY], [DB_CREATE_TIMESTAMP], [DB_CREATE_USERID], [DB_LAST_UPDATE_TIMESTAMP], [DB_LAST_UPDATE_USERID], [CONCURRENCY_CONTROL_NUMBER])
+VALUES ('Pilates', 'Pilates Low Intensity', 1, GETDATE(), 'Transaction_Dev', GETDATE(), 'Transaction_Dev', 1)
+INSERT INTO TRA_ACTIVITY ([NAME], [DESCRIPTION], [INTENSITY], [DB_CREATE_TIMESTAMP], [DB_CREATE_USERID], [DB_LAST_UPDATE_TIMESTAMP], [DB_LAST_UPDATE_USERID], [CONCURRENCY_CONTROL_NUMBER])
+VALUES ('Swimming', 'Swimming Low Intensity', 1, GETDATE(), 'Transaction_Dev', GETDATE(), 'Transaction_Dev', 1)
+INSERT INTO TRA_ACTIVITY ([NAME], [DESCRIPTION], [INTENSITY], [DB_CREATE_TIMESTAMP], [DB_CREATE_USERID], [DB_LAST_UPDATE_TIMESTAMP], [DB_LAST_UPDATE_USERID], [CONCURRENCY_CONTROL_NUMBER])
+VALUES ('Other', 'Other Low Intensity', 1, GETDATE(), 'Transaction_Dev', GETDATE(), 'Transaction_Dev', 1)
+
+INSERT INTO TRA_ACTIVITY ([NAME], [DESCRIPTION], [INTENSITY], [DB_CREATE_TIMESTAMP], [DB_CREATE_USERID], [DB_LAST_UPDATE_TIMESTAMP], [DB_LAST_UPDATE_USERID], [CONCURRENCY_CONTROL_NUMBER])
+VALUES ('Brisk Walking', 'Brisk Walking Medium Intensity', 2, GETDATE(), 'Transaction_Dev', GETDATE(), 'Transaction_Dev', 1)
+INSERT INTO TRA_ACTIVITY ([NAME], [DESCRIPTION], [INTENSITY], [DB_CREATE_TIMESTAMP], [DB_CREATE_USERID], [DB_LAST_UPDATE_TIMESTAMP], [DB_LAST_UPDATE_USERID], [CONCURRENCY_CONTROL_NUMBER])
+VALUES ('Water Aerobics', 'Water Aerobics Medium Intensity', 2, GETDATE(), 'Transaction_Dev', GETDATE(), 'Transaction_Dev', 1)
+INSERT INTO TRA_ACTIVITY ([NAME], [DESCRIPTION], [INTENSITY], [DB_CREATE_TIMESTAMP], [DB_CREATE_USERID], [DB_LAST_UPDATE_TIMESTAMP], [DB_LAST_UPDATE_USERID], [CONCURRENCY_CONTROL_NUMBER])
+VALUES ('Jogging', 'Jogging Medium Intensity', 2, GETDATE(), 'Transaction_Dev', GETDATE(), 'Transaction_Dev', 1)
+INSERT INTO TRA_ACTIVITY ([NAME], [DESCRIPTION], [INTENSITY], [DB_CREATE_TIMESTAMP], [DB_CREATE_USERID], [DB_LAST_UPDATE_TIMESTAMP], [DB_LAST_UPDATE_USERID], [CONCURRENCY_CONTROL_NUMBER])
+VALUES ('Hiking', 'Hiking Medium Intensity', 2, GETDATE(), 'Transaction_Dev', GETDATE(), 'Transaction_Dev', 1)
+INSERT INTO TRA_ACTIVITY ([NAME], [DESCRIPTION], [INTENSITY], [DB_CREATE_TIMESTAMP], [DB_CREATE_USERID], [DB_LAST_UPDATE_TIMESTAMP], [DB_LAST_UPDATE_USERID], [CONCURRENCY_CONTROL_NUMBER])
+VALUES ('Cycling', 'Cycling Medium Intensity', 2, GETDATE(), 'Transaction_Dev', GETDATE(), 'Transaction_Dev', 1)
+INSERT INTO TRA_ACTIVITY ([NAME], [DESCRIPTION], [INTENSITY], [DB_CREATE_TIMESTAMP], [DB_CREATE_USERID], [DB_LAST_UPDATE_TIMESTAMP], [DB_LAST_UPDATE_USERID], [CONCURRENCY_CONTROL_NUMBER])
+VALUES ('Dancing', 'Dancing Medium Intensity', 2, GETDATE(), 'Transaction_Dev', GETDATE(), 'Transaction_Dev', 1)
+INSERT INTO TRA_ACTIVITY ([NAME], [DESCRIPTION], [INTENSITY], [DB_CREATE_TIMESTAMP], [DB_CREATE_USERID], [DB_LAST_UPDATE_TIMESTAMP], [DB_LAST_UPDATE_USERID], [CONCURRENCY_CONTROL_NUMBER])
+VALUES ('Other', 'Other Medium Intensity', 2, GETDATE(), 'Transaction_Dev', GETDATE(), 'Transaction_Dev', 1)
+
+INSERT INTO TRA_ACTIVITY ([NAME], [DESCRIPTION], [INTENSITY], [DB_CREATE_TIMESTAMP], [DB_CREATE_USERID], [DB_LAST_UPDATE_TIMESTAMP], [DB_LAST_UPDATE_USERID], [CONCURRENCY_CONTROL_NUMBER])
+VALUES ('Running', 'Running High Intensity', 3, GETDATE(), 'Transaction_Dev', GETDATE(), 'Transaction_Dev', 1)
+INSERT INTO TRA_ACTIVITY ([NAME], [DESCRIPTION], [INTENSITY], [DB_CREATE_TIMESTAMP], [DB_CREATE_USERID], [DB_LAST_UPDATE_TIMESTAMP], [DB_LAST_UPDATE_USERID], [CONCURRENCY_CONTROL_NUMBER])
+VALUES ('Rowing', 'Rowing High Intensity', 3, GETDATE(), 'Transaction_Dev', GETDATE(), 'Transaction_Dev', 1)
+INSERT INTO TRA_ACTIVITY ([NAME], [DESCRIPTION], [INTENSITY], [DB_CREATE_TIMESTAMP], [DB_CREATE_USERID], [DB_LAST_UPDATE_TIMESTAMP], [DB_LAST_UPDATE_USERID], [CONCURRENCY_CONTROL_NUMBER])
+VALUES ('Hot Yoga', 'Hot Yoga High Intensity', 3, GETDATE(), 'Transaction_Dev', GETDATE(), 'Transaction_Dev', 1)
+INSERT INTO TRA_ACTIVITY ([NAME], [DESCRIPTION], [INTENSITY], [DB_CREATE_TIMESTAMP], [DB_CREATE_USERID], [DB_LAST_UPDATE_TIMESTAMP], [DB_LAST_UPDATE_USERID], [CONCURRENCY_CONTROL_NUMBER])
+VALUES ('Soccer', 'Soccer High Intensity', 3, GETDATE(), 'Transaction_Dev', GETDATE(), 'Transaction_Dev', 1)
+INSERT INTO TRA_ACTIVITY ([NAME], [DESCRIPTION], [INTENSITY], [DB_CREATE_TIMESTAMP], [DB_CREATE_USERID], [DB_LAST_UPDATE_TIMESTAMP], [DB_LAST_UPDATE_USERID], [CONCURRENCY_CONTROL_NUMBER])
+VALUES ('Aerobics', 'Aerobics High Intensity', 3, GETDATE(), 'Transaction_Dev', GETDATE(), 'Transaction_Dev', 1)
+INSERT INTO TRA_ACTIVITY ([NAME], [DESCRIPTION], [INTENSITY], [DB_CREATE_TIMESTAMP], [DB_CREATE_USERID], [DB_LAST_UPDATE_TIMESTAMP], [DB_LAST_UPDATE_USERID], [CONCURRENCY_CONTROL_NUMBER])
+VALUES ('Squash', 'Squash High Intensity', 3, GETDATE(), 'Transaction_Dev', GETDATE(), 'Transaction_Dev', 1)
+INSERT INTO TRA_ACTIVITY ([NAME], [DESCRIPTION], [INTENSITY], [DB_CREATE_TIMESTAMP], [DB_CREATE_USERID], [DB_LAST_UPDATE_TIMESTAMP], [DB_LAST_UPDATE_USERID], [CONCURRENCY_CONTROL_NUMBER])
+VALUES ('Strength Training', 'Strength Training High Intensity', 3, GETDATE(), 'Transaction_Dev', GETDATE(), 'Transaction_Dev', 1)
+INSERT INTO TRA_ACTIVITY ([NAME], [DESCRIPTION], [INTENSITY], [DB_CREATE_TIMESTAMP], [DB_CREATE_USERID], [DB_LAST_UPDATE_TIMESTAMP], [DB_LAST_UPDATE_USERID], [CONCURRENCY_CONTROL_NUMBER])
+VALUES ('Basketball', 'Basketball High Intensity', 3, GETDATE(), 'Transaction_Dev', GETDATE(), 'Transaction_Dev', 1)
+INSERT INTO TRA_ACTIVITY ([NAME], [DESCRIPTION], [INTENSITY], [DB_CREATE_TIMESTAMP], [DB_CREATE_USERID], [DB_LAST_UPDATE_TIMESTAMP], [DB_LAST_UPDATE_USERID], [CONCURRENCY_CONTROL_NUMBER])
+VALUES ('CrossFit', 'CrossFit High Intensity', 3, GETDATE(), 'Transaction_Dev', GETDATE(), 'Transaction_Dev', 1)
+INSERT INTO TRA_ACTIVITY ([NAME], [DESCRIPTION], [INTENSITY], [DB_CREATE_TIMESTAMP], [DB_CREATE_USERID], [DB_LAST_UPDATE_TIMESTAMP], [DB_LAST_UPDATE_USERID], [CONCURRENCY_CONTROL_NUMBER])
+VALUES ('Volleyball', 'Volleyball High Intensity', 3, GETDATE(), 'Transaction_Dev', GETDATE(), 'Transaction_Dev', 1)
+INSERT INTO TRA_ACTIVITY ([NAME], [DESCRIPTION], [INTENSITY], [DB_CREATE_TIMESTAMP], [DB_CREATE_USERID], [DB_LAST_UPDATE_TIMESTAMP], [DB_LAST_UPDATE_USERID], [CONCURRENCY_CONTROL_NUMBER])
+VALUES ('Other', 'Other High Intensity', 3, GETDATE(), 'Transaction_Dev', GETDATE(), 'Transaction_Dev', 1)
diff --git a/TransAction.API/Controllers/ActivityController.cs b/TransAction.API/Controllers/ActivityController.cs
@@ -9,6 +9,7 @@
 using TransAction.Data.Repositories.Interfaces;
 using AutoMapper;
 using TransAction.API.Responses;
+using TransAction.API.Authorization;
 
 namespace TransAction.API.Controllers
 {
@@ -21,7 +22,7 @@ public ActivityController(IHttpContextAccessor httpContextAccessor, ILogger<Acti
         { }
 
         [HttpGet()]
-        public IActionResult GetActivities(int page = 1, int pageSize = 25)
+        public IActionResult GetActivities(int page = 1, int pageSize = 100)
         {
             var activities = _unitOfWork.Activity.GetAll(page, pageSize);
             var getActivities = _mapper.Map<IEnumerable<ActivityDto>>(activities);
@@ -54,6 +55,7 @@ public IActionResult GetActivityById(int id)
 
         }
 
+        [ClaimRequirement(AuthorizationTypes.ADMIN_CLAIM)]
         [HttpPost()]
         public IActionResult CreateActivity([FromBody] ActivityCreateDto createActivity)
         {
@@ -65,55 +67,72 @@ public IActionResult CreateActivity([FromBody] ActivityCreateDto createActivity)
             {
                 return BadRequest(new TransActionResponse(ModelState));
             }
-            if (_unitOfWork.Activity.ActivityExists(createActivity.Name))
+            if (_unitOfWork.Activity.Exists(createActivity.Name, createActivity.Intensity))
             {
                 return BadRequest(new TransActionResponse("Activity already exists."));
             }
 
             var newActivity = _mapper.Map<TraActivity>(createActivity);
 
-
             _unitOfWork.Activity.Create(newActivity);
 
             if (!_unitOfWork.Save())
             {
                 return StatusCode(500, new TransActionResponse("A problem happened while handling your request."));
-                // return StatusCode(500, "A problem happened while handling your request.");
             }
 
             var createActivityResult = _mapper.Map<ActivityDto>(newActivity);
-            return CreatedAtRoute("GetActivity", new { id = createActivityResult.ActivityId }, new TransActionResponse(createActivity));
+            return CreatedAtRoute("GetActivity", new { id = createActivityResult.ActivityId }, new TransActionResponse(createActivityResult));
 
 
         }
 
+        [ClaimRequirement(AuthorizationTypes.ADMIN_CLAIM)]
         [HttpPut("{id}")]
         public IActionResult UpdateActivity(int id, [FromBody] ActivityUpdateDto updateActivity)
         {
             if (!ModelState.IsValid)
             {
                 return BadRequest(new TransActionResponse(ModelState));
             }
-            string userGuid = UserHelper.GetUserGuid(_httpContextAccessor);
-            var getUser = _unitOfWork.User.GetByGuid(userGuid);
-            if (getUser.TeamId == null)
-            {
-                return BadRequest(new TransActionResponse("User is not in a team."));
-            }
 
             var activityEntity = _unitOfWork.Activity.GetById(id);
             if (activityEntity == null) return StatusCode(404, new TransActionResponse("Activity does not exist"));
 
             _mapper.Map(updateActivity, activityEntity);
             _unitOfWork.Activity.Update(activityEntity);
 
-            if (!!_unitOfWork.Save())
+            if (!_unitOfWork.Save())
             {
                 return StatusCode(500, new TransActionResponse("A problem happened while handling your request."));
             }
 
-            return StatusCode(StatusCodes.Status204NoContent, new TransActionResponse());
+            return Ok(_mapper.Map<ActivityDto>(activityEntity));
         }
 
+        [ClaimRequirement(AuthorizationTypes.ADMIN_CLAIM)]
+        [HttpDelete("{id}")]
+        public IActionResult DeleteActivity(int id)
+        {
+            if (!ModelState.IsValid)
+            {
+                return BadRequest(new TransActionResponse(ModelState));
+            }
+
+            var activityEntity = _unitOfWork.Activity.GetById(id);
+            if (activityEntity == null) return StatusCode(404, new TransActionResponse("Activity does not exist"));
+
+            if (_unitOfWork.UserActivity.CountByActivityType(activityEntity.ActivityId) > 0)
+                return StatusCode(400, new TransActionResponse("Cannot delete activity type.  Activity type is in use."));
+
+            _unitOfWork.Activity.Delete(activityEntity);
+
+            if (!_unitOfWork.Save())
+            {
+                return StatusCode(500, new TransActionResponse("A problem happened while handling your request."));
+            }
+
+            return StatusCode(StatusCodes.Status204NoContent, new TransActionResponse());
+        }
     }
 }
diff --git a/TransAction.API/Controllers/AdminController.cs b/TransAction.API/Controllers/AdminController.cs
@@ -2,6 +2,8 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
+using System.Collections.Generic;
+using System.Linq;
 using TransAction.API.Authorization;
 using TransAction.API.Responses;
 using TransAction.Data.Models;
@@ -19,10 +21,10 @@ public AdminController(IHttpContextAccessor httpContextAccessor, ILogger<Activit
         { }
 
         [ClaimRequirement(AuthorizationTypes.ADMIN_CLAIM)]
-        [HttpPost("user/role")]
-        public IActionResult UpdateUserRole([FromBody] UserRoleUpdateDto userRoleUpdate)
+        [HttpPut("users/{userId}/role")]
+        public IActionResult UpdateUserRole(int userId, [FromBody] UserRoleUpdateDto userRoleUpdate)
         {
-            var user = _unitOfWork.User.GetById(userRoleUpdate.UserId);
+            var user = _unitOfWork.User.GetById(userId);
             user.TraImage = null;
             user.Role = null;
             if (user == null)
@@ -34,11 +36,33 @@ public IActionResult UpdateUserRole([FromBody] UserRoleUpdateDto userRoleUpdate)
 
             user.RoleId = role.RoleId;
 
+            // Make sure the user can't revoke his own admin role if he is the only admin
+            var adminRole = _unitOfWork.Role.GetAllRoles().Where(x => x.Name.ToLower() == "admin").FirstOrDefault();
+            var adminUsers = _unitOfWork.User.GetAdmins(adminRole.RoleId);
+
+            if (role != adminRole && adminUsers.Count() == 1 && user == adminUsers.FirstOrDefault())
+            {
+                return StatusCode(400, new TransActionResponse("Cannot change the only admin's role"));
+            }
+
             _unitOfWork.User.Update(user);
             if (!_unitOfWork.Save())
                 return StatusCode(500, new TransActionResponse("Error occurred while updating user role"));
 
             return CreatedAtRoute("GetUser", new { controller = "user", id = user.UserId }, _mapper.Map<UserDto>(user));
         }
+
+        [ClaimRequirement(AuthorizationTypes.ADMIN_CLAIM)]
+        [HttpGet("users")]
+        public IActionResult GetAdminUsers()
+        {
+            var adminRole = _unitOfWork.Role.GetAllRoles().Where(x => x.Name.ToLower() == "admin").FirstOrDefault();
+            if (adminRole == null)
+                return StatusCode(404, new TransActionResponse("Role not found"));
+
+            var users = _unitOfWork.User.GetAdmins(adminRole.RoleId);
+
+            return Ok(new TransActionResponse(_mapper.Map<IEnumerable<UserDto>>(users)));
+        }
     }
 }
diff --git a/TransAction.API/Controllers/EventController.cs b/TransAction.API/Controllers/EventController.cs
@@ -21,11 +21,11 @@ public EventController(IHttpContextAccessor httpContextAccessor, ILogger<Activit
 
 
         [HttpGet()]
-        public IActionResult GetEvents(string name, int page = 1, int pageSize = 25)
+        public IActionResult GetEvents(string name, int page = 1, int pageSize = 25, bool isActive = true)
         {
-            var events = _unitOfWork.Event.GetAll(page, pageSize, name);
+            var events = _unitOfWork.Event.GetAll(page, pageSize, name, isActive);
             var getEvents = _mapper.Map<IEnumerable<EventDto>>(events);
-            int count = _unitOfWork.Event.Count(name);
+            int count = _unitOfWork.Event.Count(name, isActive);
             return StatusCode(200, new TransActionPagedResponse(getEvents, page, pageSize, count));
 
         }

diff --git a/TransAction.API/Controllers/MessageBoardController.cs b/TransAction.API/Controllers/MessageBoardController.cs
@@ -64,6 +64,7 @@ public IActionResult CreateTopic([FromBody] TopicCreateDto createTopic)
             string userGuid = UserHelper.GetUserGuid(_httpContextAccessor);
             var getUser = _unitOfWork.User.GetByGuid(userGuid);
             newTopic.UserId = getUser.UserId;
+            newTopic.LastMessageTimestamp = DateTime.Now;
 
             _unitOfWork.Topic.Create(newTopic);
             if (!_unitOfWork.Save())
@@ -192,6 +193,7 @@ public IActionResult CreateMessage([FromBody] MessageCreateDto createMessage)
 
             var topic = _unitOfWork.Topic.GetTopicById(newMessage.TopicId);
             topic.DbLastUpdateTimestamp = DateTime.Now;
+            topic.LastMessageTimestamp = DateTime.Now;
 
             if (!_unitOfWork.Save())
             {

diff --git a/TransAction.API/Controllers/RoleController.cs b/TransAction.API/Controllers/RoleController.cs
@@ -21,11 +21,11 @@ public RoleController(IHttpContextAccessor httpContextAccessor, ILogger<Activity
         { }
 
         [HttpGet()]
-        public IActionResult GetRoles(int page = 1, int pageSize = 25)
+        public IActionResult GetRoles()
         {
-            var roles = _unitOfWork.Role.GetAllRoles(page, pageSize);
+            var roles = _unitOfWork.Role.GetAllRoles();
             var getRoles = _mapper.Map<IEnumerable<RoleDto>>(roles);
-            return StatusCode(200, new TransActionPagedResponse(getRoles, page, pageSize, _unitOfWork.Role.Count()));
+            return StatusCode(200, new TransActionResponse(getRoles));
 
         }
 

diff --git a/TransAction.API/Controllers/TeamRequestController.cs b/TransAction.API/Controllers/TeamRequestController.cs
@@ -8,6 +8,7 @@
 using TransAction.Data.Repositories.Interfaces;
 using AutoMapper;
 using TransAction.API.Responses;
+using TransAction.API.Helpers;
 
 namespace TransAction.API.Controllers
 {
@@ -20,15 +21,17 @@ public TeamRequestController(IHttpContextAccessor httpContextAccessor, ILogger<A
         { }
 
         [HttpGet()]
-        public IActionResult GetRequests(int page = 1, int pageSize = 25)
+        public IActionResult GetRequests()
         {
-            var request = _unitOfWork.Request.GetAllReq(page, pageSize);
+            var guid = UserHelper.GetUserGuid(_httpContextAccessor);
+            var user = _unitOfWork.User.GetByGuid(guid);
+            var request = _unitOfWork.Request.GetByUserId(user.UserId);
             var getRequest = _mapper.Map<IEnumerable<MemberReqDto>>(request);
-            return StatusCode(200, new TransActionPagedResponse(getRequest, page, pageSize, _unitOfWork.Request.Count()));
+            return StatusCode(200, new TransActionResponse(getRequest));
         }
 
         [HttpGet("{id}", Name = "GetMemberReq")]
-        public IActionResult GetUserActivityById(int id)
+        public IActionResult GetmemberRequestById(int id)
         {
             try
             {
@@ -40,8 +43,8 @@ public IActionResult GetUserActivityById(int id)
                 }
                 var getRequest = _unitOfWork.Request.GetReqById(id);
                 var getUserResult = _mapper.Map<MemberReqDto>(getRequest);
-                return StatusCode(200, new TransActionResponse(getUserResult));
 
+                return StatusCode(200, new TransActionResponse(getUserResult));
             }
 
             catch (Exception)
@@ -111,8 +114,8 @@ public IActionResult UpdateRequest(int id, [FromBody] MemberReqUpdateDto updateR
         [HttpGet("team/{teamId}")]
         public IActionResult CurrentTeamRequests(int teamId)
         {
-            var result = _unitOfWork.Request.CurrentTeamReq(teamId);
-            return StatusCode(200, new TransActionResponse(result));
+            var result = _unitOfWork.Request.GetByTeamId(teamId);
+            return StatusCode(200, new TransActionResponse(_mapper.Map<IEnumerable<MemberReqDto>>(result)));
         }
     }
 }