Skip to content

Commit 5f13aa5

Browse files
BcGovNealBcGovNeal
authored
Merge pull request #64 from bcgov/2.3
2.3 to master
2 parents 857cfaa + 6417091 commit 5f13aa5

File tree

80 files changed

+2624
-959
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+2624
-959
lines changed

‎.leu

+1
Large diffs are not rendered by default.

‎DatabaseMigrations/2.3.sql

+56
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
DELETE FROM TRA_ACTIVITY WHERE NAME = 'Low';
2+
DELETE FROM TRA_ACTIVITY WHERE NAME = 'Medium';
3+
DELETE FROM TRA_ACTIVITY WHERE NAME = 'High';
4+
5+
INSERT INTO TRA_ACTIVITY ([NAME], [DESCRIPTION], [INTENSITY], [DB_CREATE_TIMESTAMP], [DB_CREATE_USERID], [DB_LAST_UPDATE_TIMESTAMP], [DB_LAST_UPDATE_USERID], [CONCURRENCY_CONTROL_NUMBER])
6+
VALUES ('Walking', 'Walking Low Intensity', 1, GETDATE(), 'Transaction_Dev', GETDATE(), 'Transaction_Dev', 1)
7+
INSERT INTO TRA_ACTIVITY ([NAME], [DESCRIPTION], [INTENSITY], [DB_CREATE_TIMESTAMP], [DB_CREATE_USERID], [DB_LAST_UPDATE_TIMESTAMP], [DB_LAST_UPDATE_USERID], [CONCURRENCY_CONTROL_NUMBER])
8+
VALUES ('Gardening', 'Gardening Low Intensity', 1, GETDATE(), 'Transaction_Dev', GETDATE(), 'Transaction_Dev', 1)
9+
INSERT INTO TRA_ACTIVITY ([NAME], [DESCRIPTION], [INTENSITY], [DB_CREATE_TIMESTAMP], [DB_CREATE_USERID], [DB_LAST_UPDATE_TIMESTAMP], [DB_LAST_UPDATE_USERID], [CONCURRENCY_CONTROL_NUMBER])
10+
VALUES ('Yoga', 'Yoga Low Intensity', 1, GETDATE(), 'Transaction_Dev', GETDATE(), 'Transaction_Dev', 1)
11+
INSERT INTO TRA_ACTIVITY ([NAME], [DESCRIPTION], [INTENSITY], [DB_CREATE_TIMESTAMP], [DB_CREATE_USERID], [DB_LAST_UPDATE_TIMESTAMP], [DB_LAST_UPDATE_USERID], [CONCURRENCY_CONTROL_NUMBER])
12+
VALUES ('Kayaking', 'Kayaking Low Intensity', 1, GETDATE(), 'Transaction_Dev', GETDATE(), 'Transaction_Dev', 1)
13+
INSERT INTO TRA_ACTIVITY ([NAME], [DESCRIPTION], [INTENSITY], [DB_CREATE_TIMESTAMP], [DB_CREATE_USERID], [DB_LAST_UPDATE_TIMESTAMP], [DB_LAST_UPDATE_USERID], [CONCURRENCY_CONTROL_NUMBER])
14+
VALUES ('Pilates', 'Pilates Low Intensity', 1, GETDATE(), 'Transaction_Dev', GETDATE(), 'Transaction_Dev', 1)
15+
INSERT INTO TRA_ACTIVITY ([NAME], [DESCRIPTION], [INTENSITY], [DB_CREATE_TIMESTAMP], [DB_CREATE_USERID], [DB_LAST_UPDATE_TIMESTAMP], [DB_LAST_UPDATE_USERID], [CONCURRENCY_CONTROL_NUMBER])
16+
VALUES ('Swimming', 'Swimming Low Intensity', 1, GETDATE(), 'Transaction_Dev', GETDATE(), 'Transaction_Dev', 1)
17+
INSERT INTO TRA_ACTIVITY ([NAME], [DESCRIPTION], [INTENSITY], [DB_CREATE_TIMESTAMP], [DB_CREATE_USERID], [DB_LAST_UPDATE_TIMESTAMP], [DB_LAST_UPDATE_USERID], [CONCURRENCY_CONTROL_NUMBER])
18+
VALUES ('Other', 'Other Low Intensity', 1, GETDATE(), 'Transaction_Dev', GETDATE(), 'Transaction_Dev', 1)
19+
20+
INSERT INTO TRA_ACTIVITY ([NAME], [DESCRIPTION], [INTENSITY], [DB_CREATE_TIMESTAMP], [DB_CREATE_USERID], [DB_LAST_UPDATE_TIMESTAMP], [DB_LAST_UPDATE_USERID], [CONCURRENCY_CONTROL_NUMBER])
21+
VALUES ('Brisk Walking', 'Brisk Walking Medium Intensity', 2, GETDATE(), 'Transaction_Dev', GETDATE(), 'Transaction_Dev', 1)
22+
INSERT INTO TRA_ACTIVITY ([NAME], [DESCRIPTION], [INTENSITY], [DB_CREATE_TIMESTAMP], [DB_CREATE_USERID], [DB_LAST_UPDATE_TIMESTAMP], [DB_LAST_UPDATE_USERID], [CONCURRENCY_CONTROL_NUMBER])
23+
VALUES ('Water Aerobics', 'Water Aerobics Medium Intensity', 2, GETDATE(), 'Transaction_Dev', GETDATE(), 'Transaction_Dev', 1)
24+
INSERT INTO TRA_ACTIVITY ([NAME], [DESCRIPTION], [INTENSITY], [DB_CREATE_TIMESTAMP], [DB_CREATE_USERID], [DB_LAST_UPDATE_TIMESTAMP], [DB_LAST_UPDATE_USERID], [CONCURRENCY_CONTROL_NUMBER])
25+
VALUES ('Jogging', 'Jogging Medium Intensity', 2, GETDATE(), 'Transaction_Dev', GETDATE(), 'Transaction_Dev', 1)
26+
INSERT INTO TRA_ACTIVITY ([NAME], [DESCRIPTION], [INTENSITY], [DB_CREATE_TIMESTAMP], [DB_CREATE_USERID], [DB_LAST_UPDATE_TIMESTAMP], [DB_LAST_UPDATE_USERID], [CONCURRENCY_CONTROL_NUMBER])
27+
VALUES ('Hiking', 'Hiking Medium Intensity', 2, GETDATE(), 'Transaction_Dev', GETDATE(), 'Transaction_Dev', 1)
28+
INSERT INTO TRA_ACTIVITY ([NAME], [DESCRIPTION], [INTENSITY], [DB_CREATE_TIMESTAMP], [DB_CREATE_USERID], [DB_LAST_UPDATE_TIMESTAMP], [DB_LAST_UPDATE_USERID], [CONCURRENCY_CONTROL_NUMBER])
29+
VALUES ('Cycling', 'Cycling Medium Intensity', 2, GETDATE(), 'Transaction_Dev', GETDATE(), 'Transaction_Dev', 1)
30+
INSERT INTO TRA_ACTIVITY ([NAME], [DESCRIPTION], [INTENSITY], [DB_CREATE_TIMESTAMP], [DB_CREATE_USERID], [DB_LAST_UPDATE_TIMESTAMP], [DB_LAST_UPDATE_USERID], [CONCURRENCY_CONTROL_NUMBER])
31+
VALUES ('Dancing', 'Dancing Medium Intensity', 2, GETDATE(), 'Transaction_Dev', GETDATE(), 'Transaction_Dev', 1)
32+
INSERT INTO TRA_ACTIVITY ([NAME], [DESCRIPTION], [INTENSITY], [DB_CREATE_TIMESTAMP], [DB_CREATE_USERID], [DB_LAST_UPDATE_TIMESTAMP], [DB_LAST_UPDATE_USERID], [CONCURRENCY_CONTROL_NUMBER])
33+
VALUES ('Other', 'Other Medium Intensity', 2, GETDATE(), 'Transaction_Dev', GETDATE(), 'Transaction_Dev', 1)
34+
35+
INSERT INTO TRA_ACTIVITY ([NAME], [DESCRIPTION], [INTENSITY], [DB_CREATE_TIMESTAMP], [DB_CREATE_USERID], [DB_LAST_UPDATE_TIMESTAMP], [DB_LAST_UPDATE_USERID], [CONCURRENCY_CONTROL_NUMBER])
36+
VALUES ('Running', 'Running High Intensity', 3, GETDATE(), 'Transaction_Dev', GETDATE(), 'Transaction_Dev', 1)
37+
INSERT INTO TRA_ACTIVITY ([NAME], [DESCRIPTION], [INTENSITY], [DB_CREATE_TIMESTAMP], [DB_CREATE_USERID], [DB_LAST_UPDATE_TIMESTAMP], [DB_LAST_UPDATE_USERID], [CONCURRENCY_CONTROL_NUMBER])
38+
VALUES ('Rowing', 'Rowing High Intensity', 3, GETDATE(), 'Transaction_Dev', GETDATE(), 'Transaction_Dev', 1)
39+
INSERT INTO TRA_ACTIVITY ([NAME], [DESCRIPTION], [INTENSITY], [DB_CREATE_TIMESTAMP], [DB_CREATE_USERID], [DB_LAST_UPDATE_TIMESTAMP], [DB_LAST_UPDATE_USERID], [CONCURRENCY_CONTROL_NUMBER])
40+
VALUES ('Hot Yoga', 'Hot Yoga High Intensity', 3, GETDATE(), 'Transaction_Dev', GETDATE(), 'Transaction_Dev', 1)
41+
INSERT INTO TRA_ACTIVITY ([NAME], [DESCRIPTION], [INTENSITY], [DB_CREATE_TIMESTAMP], [DB_CREATE_USERID], [DB_LAST_UPDATE_TIMESTAMP], [DB_LAST_UPDATE_USERID], [CONCURRENCY_CONTROL_NUMBER])
42+
VALUES ('Soccer', 'Soccer High Intensity', 3, GETDATE(), 'Transaction_Dev', GETDATE(), 'Transaction_Dev', 1)
43+
INSERT INTO TRA_ACTIVITY ([NAME], [DESCRIPTION], [INTENSITY], [DB_CREATE_TIMESTAMP], [DB_CREATE_USERID], [DB_LAST_UPDATE_TIMESTAMP], [DB_LAST_UPDATE_USERID], [CONCURRENCY_CONTROL_NUMBER])
44+
VALUES ('Aerobics', 'Aerobics High Intensity', 3, GETDATE(), 'Transaction_Dev', GETDATE(), 'Transaction_Dev', 1)
45+
INSERT INTO TRA_ACTIVITY ([NAME], [DESCRIPTION], [INTENSITY], [DB_CREATE_TIMESTAMP], [DB_CREATE_USERID], [DB_LAST_UPDATE_TIMESTAMP], [DB_LAST_UPDATE_USERID], [CONCURRENCY_CONTROL_NUMBER])
46+
VALUES ('Squash', 'Squash High Intensity', 3, GETDATE(), 'Transaction_Dev', GETDATE(), 'Transaction_Dev', 1)
47+
INSERT INTO TRA_ACTIVITY ([NAME], [DESCRIPTION], [INTENSITY], [DB_CREATE_TIMESTAMP], [DB_CREATE_USERID], [DB_LAST_UPDATE_TIMESTAMP], [DB_LAST_UPDATE_USERID], [CONCURRENCY_CONTROL_NUMBER])
48+
VALUES ('Strength Training', 'Strength Training High Intensity', 3, GETDATE(), 'Transaction_Dev', GETDATE(), 'Transaction_Dev', 1)
49+
INSERT INTO TRA_ACTIVITY ([NAME], [DESCRIPTION], [INTENSITY], [DB_CREATE_TIMESTAMP], [DB_CREATE_USERID], [DB_LAST_UPDATE_TIMESTAMP], [DB_LAST_UPDATE_USERID], [CONCURRENCY_CONTROL_NUMBER])
50+
VALUES ('Basketball', 'Basketball High Intensity', 3, GETDATE(), 'Transaction_Dev', GETDATE(), 'Transaction_Dev', 1)
51+
INSERT INTO TRA_ACTIVITY ([NAME], [DESCRIPTION], [INTENSITY], [DB_CREATE_TIMESTAMP], [DB_CREATE_USERID], [DB_LAST_UPDATE_TIMESTAMP], [DB_LAST_UPDATE_USERID], [CONCURRENCY_CONTROL_NUMBER])
52+
VALUES ('CrossFit', 'CrossFit High Intensity', 3, GETDATE(), 'Transaction_Dev', GETDATE(), 'Transaction_Dev', 1)
53+
INSERT INTO TRA_ACTIVITY ([NAME], [DESCRIPTION], [INTENSITY], [DB_CREATE_TIMESTAMP], [DB_CREATE_USERID], [DB_LAST_UPDATE_TIMESTAMP], [DB_LAST_UPDATE_USERID], [CONCURRENCY_CONTROL_NUMBER])
54+
VALUES ('Volleyball', 'Volleyball High Intensity', 3, GETDATE(), 'Transaction_Dev', GETDATE(), 'Transaction_Dev', 1)
55+
INSERT INTO TRA_ACTIVITY ([NAME], [DESCRIPTION], [INTENSITY], [DB_CREATE_TIMESTAMP], [DB_CREATE_USERID], [DB_LAST_UPDATE_TIMESTAMP], [DB_LAST_UPDATE_USERID], [CONCURRENCY_CONTROL_NUMBER])
56+
VALUES ('Other', 'Other High Intensity', 3, GETDATE(), 'Transaction_Dev', GETDATE(), 'Transaction_Dev', 1)

‎TransAction.API/Controllers/ActivityController.cs

+32-13
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
using TransAction.Data.Repositories.Interfaces;
1010
using AutoMapper;
1111
using TransAction.API.Responses;
12+
using TransAction.API.Authorization;
1213

1314
namespace TransAction.API.Controllers
1415
{
@@ -21,7 +22,7 @@ public ActivityController(IHttpContextAccessor httpContextAccessor, ILogger<Acti
2122
{ }
2223

2324
[HttpGet()]
24-
public IActionResult GetActivities(int page = 1, int pageSize = 25)
25+
public IActionResult GetActivities(int page = 1, int pageSize = 100)
2526
{
2627
var activities = _unitOfWork.Activity.GetAll(page, pageSize);
2728
var getActivities = _mapper.Map<IEnumerable<ActivityDto>>(activities);
@@ -54,6 +55,7 @@ public IActionResult GetActivityById(int id)
5455

5556
}
5657

58+
[ClaimRequirement(AuthorizationTypes.ADMIN_CLAIM)]
5759
[HttpPost()]
5860
public IActionResult CreateActivity([FromBody] ActivityCreateDto createActivity)
5961
{
@@ -65,55 +67,72 @@ public IActionResult CreateActivity([FromBody] ActivityCreateDto createActivity)
6567
{
6668
return BadRequest(new TransActionResponse(ModelState));
6769
}
68-
if (_unitOfWork.Activity.ActivityExists(createActivity.Name))
70+
if (_unitOfWork.Activity.Exists(createActivity.Name, createActivity.Intensity))
6971
{
7072
return BadRequest(new TransActionResponse("Activity already exists."));
7173
}
7274

7375
var newActivity = _mapper.Map<TraActivity>(createActivity);
7476

75-
7677
_unitOfWork.Activity.Create(newActivity);
7778

7879
if (!_unitOfWork.Save())
7980
{
8081
return StatusCode(500, new TransActionResponse("A problem happened while handling your request."));
81-
// return StatusCode(500, "A problem happened while handling your request.");
8282
}
8383

8484
var createActivityResult = _mapper.Map<ActivityDto>(newActivity);
85-
return CreatedAtRoute("GetActivity", new { id = createActivityResult.ActivityId }, new TransActionResponse(createActivity));
85+
return CreatedAtRoute("GetActivity", new { id = createActivityResult.ActivityId }, new TransActionResponse(createActivityResult));
8686

8787

8888
}
8989

90+
[ClaimRequirement(AuthorizationTypes.ADMIN_CLAIM)]
9091
[HttpPut("{id}")]
9192
public IActionResult UpdateActivity(int id, [FromBody] ActivityUpdateDto updateActivity)
9293
{
9394
if (!ModelState.IsValid)
9495
{
9596
return BadRequest(new TransActionResponse(ModelState));
9697
}
97-
string userGuid = UserHelper.GetUserGuid(_httpContextAccessor);
98-
var getUser = _unitOfWork.User.GetByGuid(userGuid);
99-
if (getUser.TeamId == null)
100-
{
101-
return BadRequest(new TransActionResponse("User is not in a team."));
102-
}
10398

10499
var activityEntity = _unitOfWork.Activity.GetById(id);
105100
if (activityEntity == null) return StatusCode(404, new TransActionResponse("Activity does not exist"));
106101

107102
_mapper.Map(updateActivity, activityEntity);
108103
_unitOfWork.Activity.Update(activityEntity);
109104

110-
if (!!_unitOfWork.Save())
105+
if (!_unitOfWork.Save())
111106
{
112107
return StatusCode(500, new TransActionResponse("A problem happened while handling your request."));
113108
}
114109

115-
return StatusCode(StatusCodes.Status204NoContent, new TransActionResponse());
110+
return Ok(_mapper.Map<ActivityDto>(activityEntity));
116111
}
117112

113+
[ClaimRequirement(AuthorizationTypes.ADMIN_CLAIM)]
114+
[HttpDelete("{id}")]
115+
public IActionResult DeleteActivity(int id)
116+
{
117+
if (!ModelState.IsValid)
118+
{
119+
return BadRequest(new TransActionResponse(ModelState));
120+
}
121+
122+
var activityEntity = _unitOfWork.Activity.GetById(id);
123+
if (activityEntity == null) return StatusCode(404, new TransActionResponse("Activity does not exist"));
124+
125+
if (_unitOfWork.UserActivity.CountByActivityType(activityEntity.ActivityId) > 0)
126+
return StatusCode(400, new TransActionResponse("Cannot delete activity type. Activity type is in use."));
127+
128+
_unitOfWork.Activity.Delete(activityEntity);
129+
130+
if (!_unitOfWork.Save())
131+
{
132+
return StatusCode(500, new TransActionResponse("A problem happened while handling your request."));
133+
}
134+
135+
return StatusCode(StatusCodes.Status204NoContent, new TransActionResponse());
136+
}
118137
}
119138
}

‎TransAction.API/Controllers/AdminController.cs

+27-3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
using Microsoft.AspNetCore.Http;
33
using Microsoft.AspNetCore.Mvc;
44
using Microsoft.Extensions.Logging;
5+
using System.Collections.Generic;
6+
using System.Linq;
57
using TransAction.API.Authorization;
68
using TransAction.API.Responses;
79
using TransAction.Data.Models;
@@ -19,10 +21,10 @@ public AdminController(IHttpContextAccessor httpContextAccessor, ILogger<Activit
1921
{ }
2022

2123
[ClaimRequirement(AuthorizationTypes.ADMIN_CLAIM)]
22-
[HttpPost("user/role")]
23-
public IActionResult UpdateUserRole([FromBody] UserRoleUpdateDto userRoleUpdate)
24+
[HttpPut("users/{userId}/role")]
25+
public IActionResult UpdateUserRole(int userId, [FromBody] UserRoleUpdateDto userRoleUpdate)
2426
{
25-
var user = _unitOfWork.User.GetById(userRoleUpdate.UserId);
27+
var user = _unitOfWork.User.GetById(userId);
2628
user.TraImage = null;
2729
user.Role = null;
2830
if (user == null)
@@ -34,11 +36,33 @@ public IActionResult UpdateUserRole([FromBody] UserRoleUpdateDto userRoleUpdate)
3436

3537
user.RoleId = role.RoleId;
3638

39+
// Make sure the user can't revoke his own admin role if he is the only admin
40+
var adminRole = _unitOfWork.Role.GetAllRoles().Where(x => x.Name.ToLower() == "admin").FirstOrDefault();
41+
var adminUsers = _unitOfWork.User.GetAdmins(adminRole.RoleId);
42+
43+
if (role != adminRole && adminUsers.Count() == 1 && user == adminUsers.FirstOrDefault())
44+
{
45+
return StatusCode(400, new TransActionResponse("Cannot change the only admin's role"));
46+
}
47+
3748
_unitOfWork.User.Update(user);
3849
if (!_unitOfWork.Save())
3950
return StatusCode(500, new TransActionResponse("Error occurred while updating user role"));
4051

4152
return CreatedAtRoute("GetUser", new { controller = "user", id = user.UserId }, _mapper.Map<UserDto>(user));
4253
}
54+
55+
[ClaimRequirement(AuthorizationTypes.ADMIN_CLAIM)]
56+
[HttpGet("users")]
57+
public IActionResult GetAdminUsers()
58+
{
59+
var adminRole = _unitOfWork.Role.GetAllRoles().Where(x => x.Name.ToLower() == "admin").FirstOrDefault();
60+
if (adminRole == null)
61+
return StatusCode(404, new TransActionResponse("Role not found"));
62+
63+
var users = _unitOfWork.User.GetAdmins(adminRole.RoleId);
64+
65+
return Ok(new TransActionResponse(_mapper.Map<IEnumerable<UserDto>>(users)));
66+
}
4367
}
4468
}

‎TransAction.API/Controllers/EventController.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ public EventController(IHttpContextAccessor httpContextAccessor, ILogger<Activit
2121

2222

2323
[HttpGet()]
24-
public IActionResult GetEvents(string name, int page = 1, int pageSize = 25)
24+
public IActionResult GetEvents(string name, int page = 1, int pageSize = 25, bool isActive = true)
2525
{
26-
var events = _unitOfWork.Event.GetAll(page, pageSize, name);
26+
var events = _unitOfWork.Event.GetAll(page, pageSize, name, isActive);
2727
var getEvents = _mapper.Map<IEnumerable<EventDto>>(events);
28-
int count = _unitOfWork.Event.Count(name);
28+
int count = _unitOfWork.Event.Count(name, isActive);
2929
return StatusCode(200, new TransActionPagedResponse(getEvents, page, pageSize, count));
3030

3131
}

‎TransAction.API/Controllers/MessageBoardController.cs

+2
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ public IActionResult CreateTopic([FromBody] TopicCreateDto createTopic)
6464
string userGuid = UserHelper.GetUserGuid(_httpContextAccessor);
6565
var getUser = _unitOfWork.User.GetByGuid(userGuid);
6666
newTopic.UserId = getUser.UserId;
67+
newTopic.LastMessageTimestamp = DateTime.Now;
6768

6869
_unitOfWork.Topic.Create(newTopic);
6970
if (!_unitOfWork.Save())
@@ -192,6 +193,7 @@ public IActionResult CreateMessage([FromBody] MessageCreateDto createMessage)
192193

193194
var topic = _unitOfWork.Topic.GetTopicById(newMessage.TopicId);
194195
topic.DbLastUpdateTimestamp = DateTime.Now;
196+
topic.LastMessageTimestamp = DateTime.Now;
195197

196198
if (!_unitOfWork.Save())
197199
{

‎TransAction.API/Controllers/RoleController.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ public RoleController(IHttpContextAccessor httpContextAccessor, ILogger<Activity
2121
{ }
2222

2323
[HttpGet()]
24-
public IActionResult GetRoles(int page = 1, int pageSize = 25)
24+
public IActionResult GetRoles()
2525
{
26-
var roles = _unitOfWork.Role.GetAllRoles(page, pageSize);
26+
var roles = _unitOfWork.Role.GetAllRoles();
2727
var getRoles = _mapper.Map<IEnumerable<RoleDto>>(roles);
28-
return StatusCode(200, new TransActionPagedResponse(getRoles, page, pageSize, _unitOfWork.Role.Count()));
28+
return StatusCode(200, new TransActionResponse(getRoles));
2929

3030
}
3131

‎TransAction.API/Controllers/TeamRequestController.cs

+10-7
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
using TransAction.Data.Repositories.Interfaces;
99
using AutoMapper;
1010
using TransAction.API.Responses;
11+
using TransAction.API.Helpers;
1112

1213
namespace TransAction.API.Controllers
1314
{
@@ -20,15 +21,17 @@ public TeamRequestController(IHttpContextAccessor httpContextAccessor, ILogger<A
2021
{ }
2122

2223
[HttpGet()]
23-
public IActionResult GetRequests(int page = 1, int pageSize = 25)
24+
public IActionResult GetRequests()
2425
{
25-
var request = _unitOfWork.Request.GetAllReq(page, pageSize);
26+
var guid = UserHelper.GetUserGuid(_httpContextAccessor);
27+
var user = _unitOfWork.User.GetByGuid(guid);
28+
var request = _unitOfWork.Request.GetByUserId(user.UserId);
2629
var getRequest = _mapper.Map<IEnumerable<MemberReqDto>>(request);
27-
return StatusCode(200, new TransActionPagedResponse(getRequest, page, pageSize, _unitOfWork.Request.Count()));
30+
return StatusCode(200, new TransActionResponse(getRequest));
2831
}
2932

3033
[HttpGet("{id}", Name = "GetMemberReq")]
31-
public IActionResult GetUserActivityById(int id)
34+
public IActionResult GetmemberRequestById(int id)
3235
{
3336
try
3437
{
@@ -40,8 +43,8 @@ public IActionResult GetUserActivityById(int id)
4043
}
4144
var getRequest = _unitOfWork.Request.GetReqById(id);
4245
var getUserResult = _mapper.Map<MemberReqDto>(getRequest);
43-
return StatusCode(200, new TransActionResponse(getUserResult));
4446

47+
return StatusCode(200, new TransActionResponse(getUserResult));
4548
}
4649

4750
catch (Exception)
@@ -111,8 +114,8 @@ public IActionResult UpdateRequest(int id, [FromBody] MemberReqUpdateDto updateR
111114
[HttpGet("team/{teamId}")]
112115
public IActionResult CurrentTeamRequests(int teamId)
113116
{
114-
var result = _unitOfWork.Request.CurrentTeamReq(teamId);
115-
return StatusCode(200, new TransActionResponse(result));
117+
var result = _unitOfWork.Request.GetByTeamId(teamId);
118+
return StatusCode(200, new TransActionResponse(_mapper.Map<IEnumerable<MemberReqDto>>(result)));
116119
}
117120
}
118121
}

0 commit comments

Comments
 (0)