Skip to content

Commit

Permalink
update GroupRepository.cs and IGroupRepository.cs and also GroupContr…
Browse files Browse the repository at this point in the history 
…oller.cs
  • Loading branch information
ankit authored and ankit committed Mar 6, 2017
1 parent a5a20bd commit d8ab8db
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 26 deletions.
26 changes: 13 additions & 13 deletions Slack.Automation/Promact.Core.Repository/GroupRepository/GroupRepository.cs
View file
Expand Up @@ -48,7 +48,7 @@ public async Task<int> AddGroupAsync(GroupAC groupAC)
group.CreatedOn = DateTime.UtcNow;
_groupRepository.Insert(group);
await _groupRepository.SaveChangesAsync();
await AddGroupEmailMapping(groupAC.Emails, group.Id);
await AddGroupEmailMappingAsync(groupAC.Emails, group.Id);
return group.Id;
}

Expand All @@ -65,7 +65,7 @@ public async Task<int> UpdateGroupAsync(GroupAC groupAC)
_groupRepository.Update(group);
await _groupRepository.SaveChangesAsync();
_groupEmailMappingRepository.RemoveRange(x => x.GroupId == groupAC.Id);
await AddGroupEmailMapping(groupAC.Emails, groupAC.Id);
await AddGroupEmailMappingAsync(groupAC.Emails, groupAC.Id);
return groupAC.Id;
}

Expand All @@ -83,7 +83,7 @@ public async Task<GroupAC> GetGroupByIdAsync(int id)
List<string> listOfEmails = new List<string>();
groupAc = _mapper.Map(group, groupAc);
//get active user email list
List<string> listOfActiveUserEmail = await GetActiveUserEmailList();
List<string> listOfActiveUserEmail = await GetActiveUserEmailListAsync();
List<GroupEmailMapping> groupEmailMappings = group.GroupEmailMapping.ToList();
foreach (var groupEmailMapping in groupEmailMappings)
{
Expand All @@ -108,7 +108,7 @@ public async Task<GroupAC> GetGroupByIdAsync(int id)
/// <param name="groupName">passs group name</param>
/// <param name="isUpdate">pass group id When check group name is exists at update time
/// other wise pass 0</param>
/// <returns></returns>
/// <returns>group name is exists then retrun true or false</returns></returns>
public async Task<bool> CheckGroupNameIsExistsAsync(string groupName, int groupId)
{
if (groupId == 0)
Expand All @@ -133,7 +133,7 @@ public async Task<List<GroupAC>> GetListOfGroupACAsync()
/// </summary>
/// <param name="id">pass group id</param>
/// <returns>true</returns>
public async Task<bool> DeleteGroupById(int id)
public async Task<bool> DeleteGroupByIdAsync(int id)
{
_groupRepository.Delete(id);
await _groupRepository.SaveChangesAsync();
Expand All @@ -150,19 +150,19 @@ public async Task AddDynamicGroupAsync()
if (userEmailListAc != null)
{
//create team leader group
await InsertDynamicGroup(_stringConstantRepository.TeamLeaderGroup, userEmailListAc.TeamLeader);
await InsertDynamicGroupAsync(_stringConstantRepository.TeamLeaderGroup, userEmailListAc.TeamLeader);
//create team member group
await InsertDynamicGroup(_stringConstantRepository.TeamMembersGroup, userEmailListAc.TamMemeber);
await InsertDynamicGroupAsync(_stringConstantRepository.TeamMembersGroup, userEmailListAc.TamMemeber);
//create managment group
await InsertDynamicGroup(_stringConstantRepository.ManagementGroup, userEmailListAc.Management);
await InsertDynamicGroupAsync(_stringConstantRepository.ManagementGroup, userEmailListAc.Management);
}
}

/// <summary>
/// This method used for get active user email list. - an
/// </summary>
/// <returns>list of active user email list</returns>
public async Task<List<string>> GetActiveUserEmailList()
public async Task<List<string>> GetActiveUserEmailListAsync()
{
UserEmailListAc userEmailListAc = await _oauthCallsRepository.GetUserEmailListBasedOnRoleAsync();
List<string> listOfEmails = new List<string>();
Expand All @@ -182,7 +182,7 @@ public async Task<List<string>> GetActiveUserEmailList()
/// <param name="listOfEmails">pass list of emails</param>
/// <param name="groupId">pass group id</param>
/// <returns></returns>
private async Task AddGroupEmailMapping(List<string> listOfEmails, int groupId)
private async Task AddGroupEmailMappingAsync(List<string> listOfEmails, int groupId)
{
foreach (var email in listOfEmails)
{
Expand All @@ -203,7 +203,7 @@ private async Task AddGroupEmailMapping(List<string> listOfEmails, int groupId)
/// <param name="groupName">pass group name</param>
/// <param name="listOfEmails">pass list of email</param>
/// <returns></returns>
private async Task InsertDynamicGroup(string groupName, List<string> listOfEmails)
private async Task InsertDynamicGroupAsync(string groupName, List<string> listOfEmails)
{
var group = await _groupRepository.FirstOrDefaultAsync(x => x.Name == groupName && x.Type == 1);
if (group == null) //added group
Expand All @@ -215,13 +215,13 @@ private async Task InsertDynamicGroup(string groupName, List<string> listOfEmail
_groupRepository.Insert(newGroup);
await _groupRepository.SaveChangesAsync();
if (listOfEmails.Count > 0)
await AddGroupEmailMapping(listOfEmails, newGroup.Id);
await AddGroupEmailMappingAsync(listOfEmails, newGroup.Id);

}//update group
else
{
_groupEmailMappingRepository.RemoveRange(x => x.GroupId == group.Id);
await AddGroupEmailMapping(listOfEmails, group.Id);
await AddGroupEmailMappingAsync(listOfEmails, group.Id);
}
}

Expand Down
6 changes: 3 additions & 3 deletions Slack.Automation/Promact.Core.Repository/GroupRepository/IGroupRepository.cs
View file
Expand Up @@ -34,7 +34,7 @@ public interface IGroupRepository
/// <param name="groupName">passs group name</param>
/// <param name="groupId">pass group id When check group name is exists at update time
/// other wise pass 0</param>
/// <returns></returns>
/// <returns>group name is exists then retrun true or false</returns>
Task<bool> CheckGroupNameIsExistsAsync(string groupName, int groupId);

/// <summary>
Expand All @@ -48,7 +48,7 @@ public interface IGroupRepository
/// </summary>
/// <param name="id">pass group id</param>
/// <returns>true</returns>
Task<bool> DeleteGroupById(int id);
Task<bool> DeleteGroupByIdAsync(int id);


/// <summary>
Expand All @@ -61,6 +61,6 @@ public interface IGroupRepository
/// This method used for get active user email list. - an
/// </summary>
/// <returns>list of active user email list</returns>
Task<List<string>> GetActiveUserEmailList();
Task<List<string>> GetActiveUserEmailListAsync();
}
}
4 changes: 2 additions & 2 deletions Slack.Automation/Promact.Core.Test/GroupRepositoryTest.cs
View file
Expand Up @@ -161,7 +161,7 @@ public async Task GetListOfGroupACAsync()
public async Task DeleteGroupByIdAsync()
{
int id = await CreateGroupAsync();
bool isDeleted = await _groupRepository.DeleteGroupById(id);
bool isDeleted = await _groupRepository.DeleteGroupByIdAsync(id);
Assert.Equal(isDeleted, true);
}

Expand Down Expand Up @@ -201,7 +201,7 @@ public async Task UpdateDynamicGroup()
public async Task GetActiveUserEmailList()
{
await CreateUserAndMockingHttpContextToReturnAccessToken();
List<string> listOfActiveEmail = await _groupRepository.GetActiveUserEmailList();
List<string> listOfActiveEmail = await _groupRepository.GetActiveUserEmailListAsync();
Assert.NotEqual(listOfActiveEmail.Count, 0);
}

Expand Down
16 changes: 8 additions & 8 deletions Slack.Automation/Promact.Erp.Core/Controllers/GroupController.cs
View file
Expand Up @@ -133,15 +133,15 @@ public async Task<IHttpActionResult> UpdateGroupAsync(int id, GroupAC groupAC)
}

/**
* @api {put} api/group/available/:groupName/:available/id
* @api {put} api/group/available/:name/:id
* @apiVersion 1.0.0
* @apiName CheckCheckGroupNameIsExistsAsync
* @apiName CheckGroupNameIsExistsAsync
* @apiGroup Group
* @apiParam {int,int} groupName,groupId
* @apiParam {int,int} name,id
* @apiParamExample
* {
* "groupName":"Group1"
* "groupId":"1"
* "name":"Group1"
* "id":"1"
* }
* @apiSuccessExample {json} Success-Response:
* HTTP/1.1 200 OK
Expand All @@ -151,7 +151,7 @@ public async Task<IHttpActionResult> UpdateGroupAsync(int id, GroupAC groupAC)
*/
[HttpGet]
[Route("available/{name}/{id:int}")]
public async Task<IHttpActionResult> CheckCheckGroupNameIsExistsAsync(string name, int id)
public async Task<IHttpActionResult> CheckGroupNameIsExistsAsync(string name, int id)
{
return Ok(await _groupRepository.CheckGroupNameIsExistsAsync(name, id));
}
Expand All @@ -177,7 +177,7 @@ public async Task<IHttpActionResult> CheckCheckGroupNameIsExistsAsync(string nam
[Route("delete/{id:int}")]
public async Task<IHttpActionResult> DeleteGroupByIdAsync(int id)
{
return Ok(await _groupRepository.DeleteGroupById(id));
return Ok(await _groupRepository.DeleteGroupByIdAsync(id));
}


Expand All @@ -196,7 +196,7 @@ public async Task<IHttpActionResult> DeleteGroupByIdAsync(int id)
[Route("email")]
public async Task<IHttpActionResult> GetActiveUserEmailList()
{
return Ok(await _groupRepository.GetActiveUserEmailList());
return Ok(await _groupRepository.GetActiveUserEmailListAsync());
}

#endregion
Expand Down

0 comments on commit d8ab8db

Please sign in to comment.