From 5ff57a9fc00bdb9c0135f7cc9b0a61d571545416 Mon Sep 17 00:00:00 2001 From: Sathishkumar Date: Mon, 10 Jun 2019 17:24:43 +0530 Subject: [PATCH] Socioboard 3.0.58 --- .vs/Socioboard/v14/.suo | Bin 51200 -> 56832 bytes .../Controllers/GroupMemberController.cs | 52 ++++++- .../Controllers/NotificationsController.cs | 106 ++++++++++--- .../Models/InvitationDetails.cs | 23 +++ .../controllers/notificationallcontroller.js | 97 ++++++++++-- .../views/settings/notification_all.html | 143 +++++++++++------- .../socioboard/views/shared/header.html | 8 +- 7 files changed, 326 insertions(+), 103 deletions(-) create mode 100644 src/Domain.Socioboard/Models/InvitationDetails.cs diff --git a/.vs/Socioboard/v14/.suo b/.vs/Socioboard/v14/.suo index 6412b07bfaf0e03755a3f5e3a2c54a9bb2f88d27..6a059d8dcdca8484b6c3e7ed1766160a86a03478 100644 GIT binary patch literal 56832 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 diff --git a/src/Api.Socioboard/Controllers/GroupMemberController.cs b/src/Api.Socioboard/Controllers/GroupMemberController.cs index 41cd1a249..ef5bed76b 100644 --- a/src/Api.Socioboard/Controllers/GroupMemberController.cs +++ b/src/Api.Socioboard/Controllers/GroupMemberController.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Globalization; using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; @@ -43,7 +44,7 @@ public GroupMemberController(ILogger logger, IEmailSender emailS /// /// [HttpPost("InviteGroupMembers")] - public IActionResult InviteGroupMembers(long groupId, string members) + public IActionResult InviteGroupMembers(long groupId, string members) { List lstGrpMembers = new List(); if (string.IsNullOrEmpty(members)) @@ -53,7 +54,7 @@ public IActionResult InviteGroupMembers(long groupId, string members) else { string[] lstmem = members.Split(';'); - foreach(var item in lstmem) + foreach (var item in lstmem) { if (!string.IsNullOrEmpty(item)) { @@ -100,6 +101,26 @@ public IActionResult InviteGroupMembers(long groupId, string members) if (temp == null) { dbr.Add(member); + + var savedMembers = dbr.Find(t => t.groupid == groupId && t.email == member.email).FirstOrDefault(); + + var lstnotifications = dbr.Single(t => t.MsgId == savedMembers.id); + + if (lstnotifications == null && savedMembers != null) + { + var notify = new Notifications + { + MsgId = savedMembers.id, + MsgStatus = "Invited", + notificationtime = DateTime.UtcNow.ToString(CultureInfo.InvariantCulture), + NotificationType = grp.groupName, + ReadOrUnread = "Unread", + UserId = member.userId + }; + dbr.Add(notify); + } + + _redisCache.Delete(Domain.Socioboard.Consatants.SocioboardConsts.CacheGroupMembers + groupId); string path = _appEnv.WebRootPath + "\\views\\mailtemplates\\groupinvitation.html"; string html = System.IO.File.ReadAllText(path); @@ -121,7 +142,7 @@ public IActionResult GetGroupMembers(long groupId) return Ok(GroupMembersRepository.getGroupMembers(groupId, _redisCache, dbr)); } - [HttpGet ("GetGroupAdmin")] + [HttpGet("GetGroupAdmin")] public IActionResult GetGroupAdmin(long groupId) { DatabaseRepository dbr = new DatabaseRepository(_logger, _appEnv); @@ -146,10 +167,10 @@ public IActionResult LeaveGroup(long groupId, long userId) public IActionResult ActivateGroupMember(string code, string email) { DatabaseRepository dbr = new DatabaseRepository(_logger, _appEnv); - Domain.Socioboard.Models.Groupmembers grpMember = dbr.Find(t => t.email.Equals(email)&&t.memberCode.Equals(code)).FirstOrDefault(); - if(grpMember != null) + Domain.Socioboard.Models.Groupmembers grpMember = dbr.Find(t => t.email.Equals(email) && t.memberCode.Equals(code)).FirstOrDefault(); + if (grpMember != null) { - if(grpMember.userId == 0) + if (grpMember.userId == 0) { User inMemUser = _redisCache.Get(email.Trim()); if (inMemUser == null) @@ -169,6 +190,25 @@ public IActionResult ActivateGroupMember(string code, string email) } } + + /// + /// + /// + /// + /// + /// + [HttpPost("DeclineGroupMember")] + public IActionResult DeclineGroupMember(string code, string email) + { + var dbr = new DatabaseRepository(_logger, _appEnv); + var grpMember = dbr.Find(t => t.email.Equals(email) && t.memberCode.Equals(code)).FirstOrDefault(); + if (grpMember == null) + return Ok("Error!"); + + dbr.Delete(grpMember); + return Ok("deleted"); + } + [HttpPost("DeleteGroupMembers")] public IActionResult DeleteGroupMembers(string grpMmbrIdss) { diff --git a/src/Api.Socioboard/Controllers/NotificationsController.cs b/src/Api.Socioboard/Controllers/NotificationsController.cs index 5c0049eb6..ce97378de 100644 --- a/src/Api.Socioboard/Controllers/NotificationsController.cs +++ b/src/Api.Socioboard/Controllers/NotificationsController.cs @@ -47,7 +47,7 @@ public IActionResult FindNotifications(long userId) { foreach (Notifications notify in lstnotifications) { - ScheduledMessage schedulemsg = dbr.Single(t => t.id == notify.MsgId && t.userId==userId); + ScheduledMessage schedulemsg = dbr.Single(t => t.id == notify.MsgId && t.userId == userId); if (schedulemsg != null) { lstschedulemsg.Add(schedulemsg); @@ -72,7 +72,7 @@ public IActionResult FindNotifications(long userId) { return NotFound(); } - + } @@ -83,15 +83,15 @@ public IActionResult FindAllNotifications(long userId, int skip, int count) { DatabaseRepository dbr = new DatabaseRepository(_logger, _env); List lstschedulemsg = new List(); - List lstnotifications = dbr.FindWithRangeDesct(t => t.UserId == userId, skip, count, t=>t.Id).ToList(); + List lstnotifications = dbr.FindWithRangeDesct(t => t.UserId == userId && t.MsgStatus != "Invited", skip, count, t => t.Id).ToList(); foreach (Notifications notify in lstnotifications) { - ScheduledMessage schedulemsg = dbr.Single(t => t.id == notify.MsgId && t.userId==userId); - if(schedulemsg !=null) + ScheduledMessage schedulemsg = dbr.Single(t => t.id == notify.MsgId && t.userId == userId); + if (schedulemsg != null) { lstschedulemsg.Add(schedulemsg); } - + } if (lstschedulemsg != null) { @@ -102,14 +102,60 @@ public IActionResult FindAllNotifications(long userId, int skip, int count) return NotFound(); } } - catch(Exception ex) + catch (Exception ex) + { + return NotFound(); + } + + + } + + + + /// + /// + /// + /// + /// + /// + /// + [HttpGet("FindAllInvitationNotifications")] + public IActionResult FindAllInvitationNotifications(long userId, int skip, int count) + { + try + { + var dbr = new DatabaseRepository(_logger, _env); + var lstInvitations = new List(); + var notifications = dbr.FindWithRangeDesct(t => t.UserId == userId && t.MsgStatus == "Invited", skip, count, t => t.Id).ToList(); + foreach (var notify in notifications) + { + var groupMember = dbr.Single(t => t.id == notify.MsgId && t.userId == userId); + if (groupMember == null) + continue; + var invitation = new InvitationDetails + { + GroupId = groupMember.groupid, + Message = notify.NotificationType, + EmailId = groupMember.email, + MemberCode = groupMember.memberCode, + UserId = groupMember.userId, + NotifyId = notify.Id + }; + lstInvitations.Add(invitation); + + } + return Ok(lstInvitations); + } + catch (Exception ex) { return NotFound(); } - + } + + [HttpGet("UpdateNotifications")] public IActionResult UpdateNotifications(long userId) { @@ -132,12 +178,30 @@ public IActionResult UpdateNotifications(long userId) return NotFound(); } } - catch(Exception ex) + catch (Exception ex) { return NotFound(); } - + + } + + + + [HttpGet("DeleteNotifications")] + public IActionResult DeleteNotifications(long notifyId) + { + try + { + var dbr = new DatabaseRepository(_logger, _env); + var notifyObject = dbr.FindFirstMatch(t => t.Id == notifyId); + dbr.Delete(notifyObject); + return Ok("deleted"); + } + catch (Exception ex) + { + return NotFound(); + } } @@ -145,12 +209,12 @@ public IActionResult UpdateNotifications(long userId) public IActionResult ChangePasswordDetail(long userId) { try - { + { MongoRepository mongorepo = new MongoRepository("FacebookPasswordChangeUserDetail", _appSettings); DatabaseRepository dbr = new DatabaseRepository(_logger, _env); List datalst = dbr.Find(t => t.UserId == userId).ToList(); - // Domain.Socioboard.Models.User userDet = dbr.FindSingle(t => t.Id == userId); - var result = mongorepo.Find(t => t.userId == userId && t.status==false); + // Domain.Socioboard.Models.User userDet = dbr.FindSingle(t => t.Id == userId); + var result = mongorepo.Find(t => t.userId == userId && t.status == false); var task = Task.Run(async () => { return await result; @@ -158,7 +222,7 @@ public IActionResult ChangePasswordDetail(long userId) int count = task.Result.Count; IList lstfbpasschange = task.Result; List lstfab = new List(); - foreach(var lstfb in lstfbpasschange) + foreach (var lstfb in lstfbpasschange) { if (lstfb.message.Contains("password")) { @@ -171,11 +235,11 @@ public IActionResult ChangePasswordDetail(long userId) { } - + } - + } - if (count>0) + if (count > 0) { return Ok(lstfab); } @@ -199,7 +263,7 @@ public IActionResult ChangeStatus(string profileId) // DatabaseRepository dbr = new DatabaseRepository(_logger, _env); // List datalst = dbr.Find(t => t.UserId == userId).ToList(); // Domain.Socioboard.Models.User userDet = dbr.FindSingle(t => t.Id == userId); - // Domain.Socioboard.Models.Mongo.FacebookPasswordChangeUserDetail lstchanges = new Domain.Socioboard.Models.Mongo.FacebookPasswordChangeUserDetail(); + // Domain.Socioboard.Models.Mongo.FacebookPasswordChangeUserDetail lstchanges = new Domain.Socioboard.Models.Mongo.FacebookPasswordChangeUserDetail(); var result = mongorepo.Find(t => t.profileId == profileId && t.status == false); var task = Task.Run(async () => { @@ -208,7 +272,7 @@ public IActionResult ChangeStatus(string profileId) int count = task.Result.Count; if (count > 0) { - + var builders = Builders.Filter; FilterDefinition filter = builders.Eq("profileId", profileId); var update = Builders.Update.Set("status", true); @@ -229,14 +293,14 @@ public IActionResult getfbchangeprofile(long userId) DatabaseRepository dbr = new DatabaseRepository(_logger, _env); List datalst = dbr.Find(t => t.UserId == userId).ToList(); Domain.Socioboard.Models.User userDet = dbr.FindSingle(t => t.Id == userId); - var result = mongorepo.Find(t => t.userId == userId && t.status==false); + var result = mongorepo.Find(t => t.userId == userId && t.status == false); var task = Task.Run(async () => { return await result; }); int count = task.Result.Count; IList lstfbpasschange = task.Result; - if (count>0) + if (count > 0) { return Ok(lstfbpasschange); } diff --git a/src/Domain.Socioboard/Models/InvitationDetails.cs b/src/Domain.Socioboard/Models/InvitationDetails.cs new file mode 100644 index 000000000..fba972a92 --- /dev/null +++ b/src/Domain.Socioboard/Models/InvitationDetails.cs @@ -0,0 +1,23 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; + +namespace Domain.Socioboard.Models +{ + public class InvitationDetails + { + + public virtual long GroupId { get; set; } + + public virtual string Message { get; set; } + + public virtual string EmailId { get; set; } + + public virtual string MemberCode { get; set; } + + public virtual long UserId { get; set; } + + public virtual Int64 NotifyId { get; set; } + } +} diff --git a/src/Socioboard/wwwroot/contents/socioboard/controllers/notificationallcontroller.js b/src/Socioboard/wwwroot/contents/socioboard/controllers/notificationallcontroller.js index 6b0b9c212..4ffc1e40b 100644 --- a/src/Socioboard/wwwroot/contents/socioboard/controllers/notificationallcontroller.js +++ b/src/Socioboard/wwwroot/contents/socioboard/controllers/notificationallcontroller.js @@ -9,32 +9,101 @@ SocioboardApp.controller('NotificationAllController', function ($rootScope, $sco var startNotify = 0; $scope.notifycount = startNotify; $scope.LoadAllNotifications = function () { - + $http.get(apiDomain + '/api/Notifications/FindAllNotifications?userId=' + $rootScope.user.Id + '&skip=' + startNotify + '&count=' + 10) .then(function (response) { + debugger; $scope.lstnotifications = response.data; $scope.notifycount = $scope.notifycount + 10; $http.get(apiDomain + '/api/Notifications/UpdateNotifications?userId=' + $rootScope.user.Id) - .then(function (response) { - $scope.updated = response.data; - }) + .then(function (response) { + $scope.updated = response.data; + }) + .catch((error) => { + debugger; + }); }, function (reason) { $scope.error = reason.data; }); // end codes to load recent Feeds + + $http.get(apiDomain + '/api/Notifications/FindAllInvitationNotifications?userId=' + $rootScope.user.Id + '&skip=' + startNotify + '&count=' + 10) + .then(function (response) { + $scope.lstinvitationnotifications = response.data; + debugger; + }, function (reason) { + $scope.error = reason.data; + }); + } + + + $scope.acceptInviations = function (email, memberCode, notifyId) { + $http.post(apiDomain + '/api/GroupMember/ActivateGroupMember?code=' + memberCode + '&email=' + email) + .then(function (response) { + debugger; + if (response.data === "updated") { + $scope.lstinvitationnotifications = $scope.lstinvitationnotifications.filter(element => { + return element.memberCode !== memberCode && element.email !== email; + }); + } + }, function (reason) { + $scope.error = reason.data; + }) + .then(() => { + return $http.get(apiDomain + '/api/Notifications/DeleteNotifications?notifyId=' + notifyId); + }) + .then(function (response) { + debugger; + if (response.data === "deleted") { + } + }, function (reason) { + $scope.error = reason.data; + }) + .catch((error) => { + debugger; + }); + debugger; } + + $scope.declineInviations = function (email, memberCode, notifyId) { + $http.post(apiDomain + '/api/GroupMember/DeclineGroupMember?code=' + memberCode + '&email=' + email) + .then(function (response) { + debugger; + if (response.data === "deleted") { + $scope.lstinvitationnotifications = $scope.lstinvitationnotifications.filter(element => { + return element.memberCode !== memberCode && element.email !== email; + }); + } + }, function (reason) { + $scope.error = reason.data; + }) + .then(() => { + return $http.get(apiDomain + '/api/Notifications/DeleteNotifications?notifyId=' + notifyId); + }) + .then(function (response) { + debugger; + if (response.data === "deleted") { + } + }, function (reason) { + $scope.error = reason.data; + }) + .catch((error) => { + debugger; + }); + } + $scope.LoadAllNotifications(); $scope.changepass = function () { - + $http.get(apiDomain + '/api/Notifications/ChangePasswordDetail?userId=' + $rootScope.user.Id) .then(function (response) { - $scope.lstChangePass = response.data; + $scope.lstChangePass = response.data; var abc = $scope.lstChangePass; $scope.lstsinglepass = []; - angular.forEach($scope.lstChangePass, function (value, key) { - $scope.lstsinglepass.push(value.profileName); + angular.forEach($scope.lstChangePass, function (value, key) { + $scope.lstsinglepass.push(value.profileName); }); console.log($scope.lstsinglepass); if (response.data != "No Data") { @@ -43,9 +112,9 @@ SocioboardApp.controller('NotificationAllController', function ($rootScope, $sco else { $scope.notifycount = 0; } - + console.log("data", $scope.notifycount); - + }, function (reason) { $scope.error = reason.data; }); @@ -65,7 +134,7 @@ SocioboardApp.controller('NotificationAllController', function ($rootScope, $sco $http.get(apiDomain + '/api/Notifications/getfbchangeprofile?userId=' + $rootScope.user.Id) .then(function (response) { $scope.lstfbprofile = response.data; - // console.log($scope.lstfbprofile); + // console.log($scope.lstfbprofile); //var abc = $scope.lstfbprofile; //$scope.notifycount = $scope.notifycount + 10; @@ -80,7 +149,7 @@ SocioboardApp.controller('NotificationAllController', function ($rootScope, $sco $scope.reconnect = function () { var facebookid = $scope.lstfbprofile; console.log($scope.lstfbprofile); - // console.log("abcd", $scope.lstfbprofile.userPrimaryEmail); + // console.log("abcd", $scope.lstfbprofile.userPrimaryEmail); $http.get(domain + '/socioboard/recfbcont?id=' + facebookid + '&fbprofileType=' + 0) .then(function (response) { window.location.href = response.data; @@ -93,7 +162,7 @@ SocioboardApp.controller('NotificationAllController', function ($rootScope, $sco // start codes to load recent Feeds - $scope.loadmore = function () { + $scope.loadmore = function () { $("#load_more_toggle").addClass("hide"); $http.get(apiDomain + '/api/Notifications/FindAllNotifications?userId=' + $rootScope.user.Id + '&skip=' + $scope.notifycount + '&count=' + 10) .then(function (response) { @@ -106,7 +175,7 @@ SocioboardApp.controller('NotificationAllController', function ($rootScope, $sco }) }, function (reason) { $scope.error = reason.data; - }); + }); } // end codes to load recent Feeds }); diff --git a/src/Socioboard/wwwroot/contents/socioboard/views/settings/notification_all.html b/src/Socioboard/wwwroot/contents/socioboard/views/settings/notification_all.html index 75e9cc73a..c1c956191 100644 --- a/src/Socioboard/wwwroot/contents/socioboard/views/settings/notification_all.html +++ b/src/Socioboard/wwwroot/contents/socioboard/views/settings/notification_all.html @@ -1,17 +1,19 @@
@@ -22,54 +24,79 @@
Your notifications
- - +
+
+ +
+
+ + + + + +
+
+
    +
  • + Team Name: {{notify.message}} +

    Team invites you to join!!

    + + Accept + Decline + +
    • +
+ + +
+
+ - - -
diff --git a/src/Socioboard/wwwroot/contents/socioboard/views/shared/header.html b/src/Socioboard/wwwroot/contents/socioboard/views/shared/header.html index 73f58aa63..e392d2e9e 100644 --- a/src/Socioboard/wwwroot/contents/socioboard/views/shared/header.html +++ b/src/Socioboard/wwwroot/contents/socioboard/views/shared/header.html @@ -141,12 +141,12 @@

--> - + + + {{notifycount}} +