Skip to content

Commit

Permalink
Merge branch 'dev' into issue-#231
Browse files Browse the repository at this point in the history
  • Loading branch information
Ankit Bhanvadia committed Mar 7, 2017
2 parents 5598758 + 178d3bb commit 5f9db06
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 22 deletions.
35 changes: 17 additions & 18 deletions Slack.Automation/Promact.Core.Repository/ScrumRepository/ScrumBotRepository.cs
View file
Expand Up @@ -37,7 +37,6 @@ public class ScrumBotRepository : RepositoryBase, IScrumBotRepository
private readonly IStringConstantRepository _stringConstant;
private readonly IBotQuestionRepository _botQuestionRepository;
private readonly IMapper _mapper;
private readonly DateTime _today;
private readonly ILogger _logger;


Expand Down Expand Up @@ -70,7 +69,6 @@ public class ScrumBotRepository : RepositoryBase, IScrumBotRepository
_botQuestionRepository = botQuestionRepository;
_applicationUser = applicationUser;
_mapper = mapper;
_today = DateTime.UtcNow.Date;
}


Expand All @@ -90,7 +88,7 @@ public class ScrumBotRepository : RepositoryBase, IScrumBotRepository
/// <returns>reply message</returns>
public async Task<string> ProcessMessagesAsync(string slackUserId, string slackChannelId, string message, string scrumBotId)
{
_logger.Info(_today);
_logger.Info(DateTime.UtcNow.Date);
string replyText = string.Empty;
SlackUserDetailAc slackUserDetail = await _slackUserDetailRepository.GetByIdAsync(slackUserId);
SlackChannelDetails slackChannelDetail = await _slackChannelRepository.GetByIdAsync(slackChannelId);
Expand All @@ -116,19 +114,13 @@ public async Task<string> ProcessMessagesAsync(string slackUserId, string slackC
{
_scrumDataRepository.Delete(scrum.Id);
int scrumDelete = await _scrumDataRepository.SaveChangesAsync();
if (scrumDelete == 1)
replyText += "scrum has been deleted\n";
else
replyText += "scrum has not been deleted\n";
replyText += "scrum has been deleted\n";
TemporaryScrumDetails temp = _tempScrumDetailsDataRepository.FirstOrDefault(x => x.ScrumId == scrum.Id);
if (temp != null)
{
_tempScrumDetailsDataRepository.Delete(temp.Id);
int deleteTemp = await _tempScrumDetailsDataRepository.SaveChangesAsync();
if (deleteTemp == 1)
replyText += "temp data has been deleted\n";
else
replyText += "temp data has not been deleted\n";
replyText += "temp data has been deleted\n";
}
}
else
Expand Down Expand Up @@ -229,8 +221,9 @@ public async Task<string> ProcessMessagesAsync(string slackUserId, string slackC
}
else
{
DateTime date = DateTime.UtcNow.Date;
Scrum scrum = await _scrumDataRepository.FirstOrDefaultAsync(x => String.Compare(x.SlackChannelId, slackChannelId, StringComparison.OrdinalIgnoreCase) == 0 &&
DbFunctions.TruncateTime(x.ScrumDate) == _today);
DbFunctions.TruncateTime(x.ScrumDate) == date);
_logger.Info(scrum?.ScrumDate);
if (await IsScrumStartLeaveCommandAsync(scrumBotId, message, messageArray)
|| String.Compare(message, _stringConstant.ScrumHalt, StringComparison.OrdinalIgnoreCase) == 0
Expand Down Expand Up @@ -293,7 +286,8 @@ public async Task AddTemporaryScrumDetailsAsync(int scrumId, string slackUserId,
/// <returns>object of TemporaryScrumDetails</returns>
private async Task<TemporaryScrumDetails> FetchTemporaryScrumDetailsAsync(int scrumId)
{
TemporaryScrumDetails temporaryScrumDetails = await _tempScrumDetailsDataRepository.FirstOrDefaultAsync(x => DbFunctions.TruncateTime(x.CreatedOn) == _today
DateTime date = DateTime.UtcNow.Date;
TemporaryScrumDetails temporaryScrumDetails = await _tempScrumDetailsDataRepository.FirstOrDefaultAsync(x => DbFunctions.TruncateTime(x.CreatedOn) == date
&& x.ScrumId == scrumId);
return temporaryScrumDetails;
}
Expand All @@ -306,8 +300,9 @@ private async Task<TemporaryScrumDetails> FetchTemporaryScrumDetailsAsync(int sc
/// <returns></returns>
private async Task RemoveTemporaryScrumDetailsAsync(int scrumId)
{
DateTime date = DateTime.UtcNow.Date;
TemporaryScrumDetails temporaryScrumDetails = await _tempScrumDetailsDataRepository.FirstOrDefaultAsync(x => x.ScrumId == scrumId
&& DbFunctions.TruncateTime(x.CreatedOn) == _today);
&& DbFunctions.TruncateTime(x.CreatedOn) == date);
if (temporaryScrumDetails != null)
{
_tempScrumDetailsDataRepository.Delete(temporaryScrumDetails.Id);
Expand Down Expand Up @@ -350,8 +345,9 @@ private async Task<SlackUserDetailAc> GetSlackUserAsync(int scrumId, List<User>
/// <param name="questionId">Id of last question asked to the user</param>
private async Task UpdateTemporaryScrumDetailsAsync(string slackUserId, int scrumId, List<User> users, int? questionId)
{
DateTime date = DateTime.UtcNow.Date;
TemporaryScrumDetails temporaryScrumDetails = await _tempScrumDetailsDataRepository.FirstOrDefaultAsync(x => x.ScrumId == scrumId
&& DbFunctions.TruncateTime(x.CreatedOn) == _today);
&& DbFunctions.TruncateTime(x.CreatedOn) == date);
if (temporaryScrumDetails != null)
{
User user = users.FirstOrDefault(x => x.SlackUserId == slackUserId);
Expand Down Expand Up @@ -431,8 +427,9 @@ private async Task<bool> IsScrumStartLeaveCommandAsync(string scrumBotId, string
/// <returns>Object of Scrum</returns>
private async Task<Scrum> GetScrumAsync(string slackChannelId)
{
DateTime date = DateTime.UtcNow.Date;
var scrum = await _scrumDataRepository.FirstOrDefaultAsync(x => String.Compare(x.SlackChannelId, slackChannelId, StringComparison.OrdinalIgnoreCase) == 0 &&
DbFunctions.TruncateTime(x.ScrumDate) == _today);
DbFunctions.TruncateTime(x.ScrumDate) == date);
_logger.Info(scrum?.ScrumDate);
return scrum;
}
Expand Down Expand Up @@ -1209,9 +1206,10 @@ private async Task<Question> FetchQuestionAsync(int questionId)
private string FetchPreviousDayStatus(string userId, int projectId, List<Question> questions)
{
string previousDayStatus = string.Empty;
DateTime date = DateTime.UtcNow.Date;
//previous scrums' Ids of this channel(project)
List<int> scrumIdList = _scrumDataRepository.FetchAsync(x => x.ProjectId == projectId
&& DbFunctions.TruncateTime(x.ScrumDate) < _today).Result.Select(x => x.Id).ToList();
&& DbFunctions.TruncateTime(x.ScrumDate) < date).Result.Select(x => x.Id).ToList();
//answers in which user was not on leave.
List<ScrumAnswer> scrumAnswers = _scrumAnswerDataRepository.FetchAsync(x => scrumIdList.Contains(x.ScrumId) && x.EmployeeId == userId && x.ScrumAnswerStatus == ScrumAnswerStatus.Answered).Result.OrderByDescending(x => x.AnswerDate).ToList();
if (scrumAnswers.Any() && questions.Any())
Expand Down Expand Up @@ -1260,8 +1258,9 @@ private async Task<ScrumStatus> FetchScrumStatusAsync(ProjectAc project, List<Us
questions = await _botQuestionRepository.GetQuestionsByTypeAsync(BotQuestionType.Scrum);
if (questions.Any())
{
DateTime date = DateTime.UtcNow.Date;
Scrum scrum = await _scrumDataRepository.FirstOrDefaultAsync(x => String.Compare(x.SlackChannelId, slackChannelId, StringComparison.OrdinalIgnoreCase) == 0 && x.ProjectId == project.Id
&& DbFunctions.TruncateTime(x.ScrumDate) == _today);
&& DbFunctions.TruncateTime(x.ScrumDate) == date);
if (scrum != null)
{
_logger.Info(scrum?.ScrumDate);
Expand Down
10 changes: 8 additions & 2 deletions Slack.Automation/Promact.Erp.Core/Controllers/HomeController.cs
View file
Expand Up @@ -19,18 +19,19 @@ namespace Promact.Erp.Core.Controllers
public class HomeController : MVCBaseController
{
#region Private Variables

private readonly ApplicationSignInManager _signInManager;
private readonly ApplicationUserManager _userManager;

private readonly IOAuthLoginRepository _oAuthLoginRepository;
private readonly IEnvironmentVariableRepository _envVariableRepository;
private readonly IGroupRepository _groupRepository;
private readonly ILogger _logger;

private readonly IMd5Service _md5Service;

#endregion

#region Constructor

public HomeController(ApplicationUserManager userManager, IStringConstantRepository stringConstant,
ApplicationSignInManager signInManager, IOAuthLoginRepository oAuthLoginRepository,
IEnvironmentVariableRepository envVariableRepository, IMd5Service md5Service, IGroupRepository groupRepository) : base(stringConstant)
Expand All @@ -43,6 +44,7 @@ public class HomeController : MVCBaseController
_md5Service = md5Service;
_groupRepository = groupRepository;
}

#endregion

#region Public Methods
Expand All @@ -59,6 +61,7 @@ public class HomeController : MVCBaseController
*/
public ActionResult Index()
{
_logger.Info("Index: Today " + DateTime.Today+"\n Today's Date :"+ DateTime.Today.Date);
_logger.Debug("User is login :" + User.Identity.IsAuthenticated);
if (User.Identity.IsAuthenticated)
{
Expand All @@ -81,9 +84,11 @@ public ActionResult Index()
[Authorize]
public async Task<ActionResult> AfterLogIn()
{
_logger.Info("AfterLogIn: Today " + DateTime.Today + "\n Today's Date :" + DateTime.Today.Date);
string userId = GetUserId(User.Identity);
//for check login user is already added in slack
ViewBag.userEmail = await _oAuthLoginRepository.CheckUserSlackInformation(userId);

//this for get login user email address and encrypt hash code.
ApplicationUser user = await _userManager.FindByIdAsync(userId);
EmailHashCodeAC emailHaseCodeAC = new EmailHashCodeAC(_md5Service.GetMD5HashData(user.Email.ToLower()));
Expand All @@ -107,6 +112,7 @@ public async Task<ActionResult> AfterLogIn()
*/
public ActionResult SlackAuthorize(string message)
{
_logger.Info("SlackAuthorize: Today " + DateTime.Today + "\n Today's Date :" + DateTime.Today.Date);
ViewBag.Message = message;
return View();
}
Expand Down
2 changes: 1 addition & 1 deletion Slack.Automation/Promact.Erp.Web/App_Start/AutofacConfig.cs
View file
Expand Up @@ -19,7 +19,7 @@
using Promact.Core.Repository.OauthCallsRepository;
using Promact.Core.Repository.ScrumReportRepository;
using Promact.Core.Repository.ScrumRepository;
using Promact.Core.Repository.ServiceRepository;
using Promact.Core.Repository.ServiceRepository;
using Promact.Core.Repository.SlackChannelRepository;
using Promact.Core.Repository.SlackRepository;
using Promact.Core.Repository.SlackUserRepository;
Expand Down
2 changes: 1 addition & 1 deletion Slack.Automation/Promact.Erp.Web/app/Group/GroupAdd/groupAdd.html
View file
Expand Up @@ -10,7 +10,7 @@
<div [hidden]="!(isExistsGroupName)" class="error">Group name already exists</div>
</div>
<div class="half-width">
<label>Emails:</label>{{groupModel.Emails}}
<label>Emails:</label>
<md2-chips [(ngModel)]="groupModel.Emails"
[isRemovable]="true"
[readonly]="false"
Expand Down

0 comments on commit 5f9db06

Please sign in to comment.