From c37fde42c755fd330604ee512a3421b9ba2c3c30 Mon Sep 17 00:00:00 2001 From: sweta kumari Date: Wed, 3 Jan 2018 11:31:42 +0530 Subject: [PATCH] socioboard 3.0 update socioboard 3.0 update --- .vs/Socioboard/v14/.suo | Bin 319488 -> 335872 bytes .../Controllers/FacebookController.cs | 28 ++++++ .../Controllers/NotificationsController.cs | 60 ++++++++++- .../controllers/facebookfeedscontroller.js | 6 -- .../controllers/facebookreportcontroller.js | 43 +------- .../controllers/fbpagedetreportcontroller.js | 58 +++++------ .../controllers/notificationallcontroller.js | 35 ++++++- .../views/reports/facebookpagedetreport.html | 6 +- .../views/reports/facebookpagereport.html | 4 +- .../views/reports/facebookreport.html | 6 +- .../views/settings/notification_all.html | 16 +-- .../FacebookReports/FacebookPageReports.cs | 95 ++++++++++++++++-- 12 files changed, 252 insertions(+), 105 deletions(-) diff --git a/.vs/Socioboard/v14/.suo b/.vs/Socioboard/v14/.suo index d8076e02c3c3adedcb9bfe49e3b228df78718433..38fae7b8cad01bed11eb143cec4818df9c0f187f 100644 GIT binary patch delta 7603 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 azIip{&J_?Y!&}7{php?uFP@WaLi`UX0jClG diff --git a/src/Api.Socioboard/Controllers/FacebookController.cs b/src/Api.Socioboard/Controllers/FacebookController.cs index 889a21911..289916426 100644 --- a/src/Api.Socioboard/Controllers/FacebookController.cs +++ b/src/Api.Socioboard/Controllers/FacebookController.cs @@ -13,6 +13,7 @@ using Socioboard.Facebook.Data; using Microsoft.AspNetCore.Cors; using Domain.Socioboard.Models.Mongo; +using MongoDB.Bson; // For more information on enabling Web API for empty projects, visit http://go.microsoft.com/fwlink/?LinkID=397860 @@ -133,7 +134,34 @@ public IActionResult ReconnectFbAccount(string accessToken, long groupId, long u int res = Api.Socioboard.Repositories.FacebookRepository.ReFacebookAccount(profile, FbUser.getFbFriends(accessToken), dbr, userId, ngrp.id, Domain.Socioboard.Enum.FbProfileType.FacebookProfile, accessToken, reconnect, _redisCache, _appSettings, _logger); if (res == 1) { + + MongoRepository repofb = new MongoRepository("FacebookPasswordChangeUserDetail", _appSettings); + try + { + var result = repofb.Find(t => t.profileId == fbacc.FbUserId ); + var task = Task.Run(async () => + { + return await result; + }); + int count = task.Result.Count; + + IList lstFbFeeds = task.Result; + if(count>0) + { + FilterDefinition filter = new BsonDocument("profileId", lstFbFeeds.FirstOrDefault().profileId); + var update = Builders.Update.Set("status", true); + repofb.Update(update, filter); + + } + } + catch (Exception ex) + { + + } + return Ok("Facebook account Reconnect Successfully"); + + } else { diff --git a/src/Api.Socioboard/Controllers/NotificationsController.cs b/src/Api.Socioboard/Controllers/NotificationsController.cs index 462e2501f..b8a5ae0c1 100644 --- a/src/Api.Socioboard/Controllers/NotificationsController.cs +++ b/src/Api.Socioboard/Controllers/NotificationsController.cs @@ -140,6 +140,64 @@ public IActionResult UpdateNotifications(long userId) } - + [HttpGet("ChangePasswordDetail")] + 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); + var task = Task.Run(async () => + { + return await result; + }); + int count = task.Result.Count; + IList lstfbpasschange = task.Result; + + + if (count>0) + { + return Ok(userDet); + } + else + { + return NotFound(); + } + } + catch (Exception ex) + { + return NotFound(); + } + + + } + + [HttpGet("getfbchangeprofile")] + public IActionResult getfbchangeprofile(long userId) + { + 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); + var task = Task.Run(async () => + { + return await result; + }); + int count = task.Result.Count; + IList lstfbpasschange = task.Result; + if (count>0) + { + return Ok(lstfbpasschange.FirstOrDefault().profileId); + } + else + { + return NotFound(); + } + } } } diff --git a/src/Socioboard/wwwroot/contents/socioboard/controllers/facebookfeedscontroller.js b/src/Socioboard/wwwroot/contents/socioboard/controllers/facebookfeedscontroller.js index c8c7fc1b9..d7c3220be 100644 --- a/src/Socioboard/wwwroot/contents/socioboard/controllers/facebookfeedscontroller.js +++ b/src/Socioboard/wwwroot/contents/socioboard/controllers/facebookfeedscontroller.js @@ -217,20 +217,14 @@ SocioboardApp.controller('FacebookFeedsController', function ($rootScope, $scope $scope.reconnect(value.fbProfileType); ac = true; } - }); - if (!ac) { $scope.reconnect(null); } - } - - }, function (reason) { $scope.error = reason.data; }); - }; $scope.confirmation = function () { diff --git a/src/Socioboard/wwwroot/contents/socioboard/controllers/facebookreportcontroller.js b/src/Socioboard/wwwroot/contents/socioboard/controllers/facebookreportcontroller.js index 7e6eed931..185fcd554 100644 --- a/src/Socioboard/wwwroot/contents/socioboard/controllers/facebookreportcontroller.js +++ b/src/Socioboard/wwwroot/contents/socioboard/controllers/facebookreportcontroller.js @@ -1,6 +1,6 @@ 'use strict'; -SocioboardApp.controller('FacebookreportController', function ($rootScope, $scope, $http, $timeout, apiDomain,domain) { +SocioboardApp.controller('FacebookreportController', function ($rootScope, $scope, $http, $timeout, apiDomain) { //alert('helo'); $scope.$on('$viewContentLoaded', function () { $('#Fbfeedsdetails').DataTable({ @@ -71,46 +71,9 @@ SocioboardApp.controller('FacebookreportController', function ($rootScope, $scop } //addaed by me end for total fans - $scope.reconnect = function (xyz) { - $http.get(domain + '/socioboard/recfbcont?id=' + $scope.selectedProfile + '&fbprofileType=' + xyz) - .then(function (response) { - window.location.href = response.data; - - }, function (reason) { - $scope.error = reason.data; - }); - - }; - - $scope.fbprofiles = function () { - - console.log($scope.selectedProfile); - $http.get(apiDomain + '/api/Facebook/GetFacebookProfilesOnlyforReconn?groupId=' + $rootScope.groupId) - .then(function (response) { - console.log(response.data) - if (response.data != null) { - var ac = false; - $scope.profiledet = response.data; - angular.forEach($scope.profiledet, function (value, key) { - if (value.fbUserId == $scope.selectedProfile) { - $scope.reconnect(value.fbProfileType); - ac = true; - } - - }); - - if (!ac) { - $scope.reconnect(null); - } - - } - - - }, function (reason) { - $scope.error = reason.data; - }); + - }; + $scope.getData = function (profileId, days) { diff --git a/src/Socioboard/wwwroot/contents/socioboard/controllers/fbpagedetreportcontroller.js b/src/Socioboard/wwwroot/contents/socioboard/controllers/fbpagedetreportcontroller.js index 1ca6bcf62..dec188214 100644 --- a/src/Socioboard/wwwroot/contents/socioboard/controllers/fbpagedetreportcontroller.js +++ b/src/Socioboard/wwwroot/contents/socioboard/controllers/fbpagedetreportcontroller.js @@ -95,45 +95,45 @@ SocioboardApp.controller('FbpagedetreportController', function ($rootScope, $sco } //for fbpage daily report details-------end - $scope.reconnect = function (xyz) { - $http.get(domain + '/socioboard/recfbcont?id=' + $stateParams.profileId + '&fbprofileType=' + xyz) - .then(function (response) { - window.location.href = response.data; + // $scope.reconnect = function (xyz) { + // $http.get(domain + '/socioboard/recfbcont?id=' + $stateParams.profileId + '&fbprofileType=' + xyz) + // .then(function (response) { + // window.location.href = response.data; - }, function (reason) { - $scope.error = reason.data; - }); + // }, function (reason) { + // $scope.error = reason.data; + // }); - }; + //}; - $scope.fbprofiles = function () { + //$scope.fbprofiles = function () { - $http.get(apiDomain + '/api/Facebook/GetFacebookProfilesOnlyforReconn?groupId=' + $rootScope.groupId) - .then(function (response) { - console.log(response.data) - if (response.data != null) { - var ac = false; - $scope.profiledet = response.data; - angular.forEach($scope.profiledet, function (value, key) { - if (value.fbUserId == $stateParams.profileId) { - $scope.reconnect(value.fbProfileType); - ac = true; - } + // $http.get(apiDomain + '/api/Facebook/GetFacebookProfilesOnlyforReconn?groupId=' + $rootScope.groupId) + // .then(function (response) { + // console.log(response.data) + // if (response.data != null) { + // var ac = false; + // $scope.profiledet = response.data; + // angular.forEach($scope.profiledet, function (value, key) { + // if (value.fbUserId == $stateParams.profileId) { + // $scope.reconnect(value.fbProfileType); + // ac = true; + // } - }); + // }); - if (!ac) { - $scope.reconnect(null); - } + // if (!ac) { + // $scope.reconnect(null); + // } - } + // } - }, function (reason) { - $scope.error = reason.data; - }); + // }, function (reason) { + // $scope.error = reason.data; + // }); - }; + //}; diff --git a/src/Socioboard/wwwroot/contents/socioboard/controllers/notificationallcontroller.js b/src/Socioboard/wwwroot/contents/socioboard/controllers/notificationallcontroller.js index f48d1e29a..55b8d4404 100644 --- a/src/Socioboard/wwwroot/contents/socioboard/controllers/notificationallcontroller.js +++ b/src/Socioboard/wwwroot/contents/socioboard/controllers/notificationallcontroller.js @@ -28,7 +28,7 @@ SocioboardApp.controller('NotificationAllController', function ($rootScope, $sco $scope.changepass = function () { - $http.get(apiDomain + '/api/Notifications/ChangePasswordDetail?userId=' + $rootScope.user.Id ) + $http.get(apiDomain + '/api/Notifications/ChangePasswordDetail?userId=' + $rootScope.user.Id+'&user' ) .then(function (response) { $scope.lstChangePass = response.data; console.log($scope.lstChangePass); @@ -44,6 +44,39 @@ SocioboardApp.controller('NotificationAllController', function ($rootScope, $sco $scope.changepass(); + + $scope.getfbprofileId = function () { + + $http.get(apiDomain + '/api/Notifications/getfbchangeprofile?userId=' + $rootScope.user.Id) + .then(function (response) { + $scope.lstfbprofile = response.data; + // console.log($scope.lstfbprofile); + //var abc = $scope.lstfbprofile; + + //$scope.notifycount = $scope.notifycount + 10; + + }, function (reason) { + $scope.error = reason.data; + }); + // end codes to load recent Feeds + } + $scope.getfbprofileId(); + + $scope.reconnect = function () { + var facebookid = $scope.lstfbprofile; + console.log($scope.lstfbprofile); + // console.log("abcd", $scope.lstfbprofile.userPrimaryEmail); + $http.get(domain + '/socioboard/recfbcont?id=' + facebookid + '&fbprofileType=' + 0) + .then(function (response) { + window.location.href = response.data; + + }, function (reason) { + $scope.error = reason.data; + }); + + }; + + // start codes to load recent Feeds $scope.loadmore = function () { $("#load_more_toggle").addClass("hide"); diff --git a/src/Socioboard/wwwroot/contents/socioboard/views/reports/facebookpagedetreport.html b/src/Socioboard/wwwroot/contents/socioboard/views/reports/facebookpagedetreport.html index a7aff713b..5c94834c4 100644 --- a/src/Socioboard/wwwroot/contents/socioboard/views/reports/facebookpagedetreport.html +++ b/src/Socioboard/wwwroot/contents/socioboard/views/reports/facebookpagedetreport.html @@ -2,11 +2,7 @@

- Showing last 90 days report ({{fromDate | date}} - {{toDate | date}}) - - Reconnect    - - + Showing last 90 days report ({{fromDate | date}} - {{toDate | date}})

diff --git a/src/Socioboard/wwwroot/contents/socioboard/views/reports/facebookpagereport.html b/src/Socioboard/wwwroot/contents/socioboard/views/reports/facebookpagereport.html index 79f870e3e..518eede12 100644 --- a/src/Socioboard/wwwroot/contents/socioboard/views/reports/facebookpagereport.html +++ b/src/Socioboard/wwwroot/contents/socioboard/views/reports/facebookpagereport.html @@ -16,9 +16,7 @@
15 30 60 - 90 - Reconnect - + 90
diff --git a/src/Socioboard/wwwroot/contents/socioboard/views/reports/facebookreport.html b/src/Socioboard/wwwroot/contents/socioboard/views/reports/facebookreport.html index acabde37a..734999d74 100644 --- a/src/Socioboard/wwwroot/contents/socioboard/views/reports/facebookreport.html +++ b/src/Socioboard/wwwroot/contents/socioboard/views/reports/facebookreport.html @@ -16,16 +16,12 @@
15 30 60 - 90 - - Reconnect    - + 90
-
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 10f020b26..f3e823b81 100644 --- a/src/Socioboard/wwwroot/contents/socioboard/views/settings/notification_all.html +++ b/src/Socioboard/wwwroot/contents/socioboard/views/settings/notification_all.html @@ -23,17 +23,19 @@
Your notifications
    -
  • +
  • -
    - - For {{lstChangePass.userPrimaryEmail}} account password has change , please reconnect your account !! -
    -
    -
    Reconnect
    +
    + '{{lstChangePass.emailId}}' facebook account password has change , please reconnect your account !!
    +     + +
    + Reconnect +
    +
  • {{notify.socialprofileName}} diff --git a/src/SocioboardDataServices/Reports/FacebookReports/FacebookPageReports.cs b/src/SocioboardDataServices/Reports/FacebookReports/FacebookPageReports.cs index df09d19a5..adbc0c5bc 100644 --- a/src/SocioboardDataServices/Reports/FacebookReports/FacebookPageReports.cs +++ b/src/SocioboardDataServices/Reports/FacebookReports/FacebookPageReports.cs @@ -22,37 +22,42 @@ public static void CreateFacebookPageReport() { try { + int c = 0; DatabaseRepository dbr = new DatabaseRepository(); List lstFbAcc = dbr.Find(t => t.IsAccessTokenActive && t.IsActive && t.FbProfileType == Domain.Socioboard.Enum.FbProfileType.FacebookPage).ToList(); - + //lstFbAcc = lstFbAcc.Where(t => t.FbUserId.Contains("790900144392091")).ToList(); foreach (var item in lstFbAcc) { - if (item.lastpagereportgenerated.AddHours(24) <= DateTime.UtcNow) - { - CreateReports(item.FbUserId, item.AccessToken, item.Is90DayDataUpdated); + //if (item.lastpagereportgenerated.AddHours(24) <= DateTime.UtcNow) + //{ + CreateReports(item.FbUserId, item.AccessToken, item.Is90DayDataUpdated,item.UserId); item.Is90DayDataUpdated = true; item.lastpagereportgenerated = DateTime.UtcNow; dbr.Update(item); cache.Delete(Domain.Socioboard.Consatants.SocioboardConsts.CacheTwitterMessageReportsByProfileId + item.FbUserId); - } + Console.WriteLine(c++); + Console.WriteLine("updated "+item.FbUserId); + + // } } Thread.Sleep(60000); } catch (Exception ex) { Console.WriteLine("issue in web api calling" + ex.StackTrace); - Thread.Sleep(600000); + Thread.Sleep(60000); } } } - public static void CreateReports(string ProfileId, string AccessToken, bool is90daysupdated) + public static void CreateReports(string ProfileId, string AccessToken, bool is90daysupdated,long userId) { int day = 1; if (!is90daysupdated) { day = 90; } + double since = SBHelper.ConvertToUnixTimestamp(DateTime.UtcNow.AddDays(-day)); double until = SBHelper.ConvertToUnixTimestamp(DateTime.UtcNow); JObject pageobj = new JObject(); @@ -80,6 +85,12 @@ public static void CreateReports(string ProfileId, string AccessToken, bool is90 JObject jofacebooksharing_typeUrlobj = new JObject(); JObject jofacebookagegenderUrlobj = new JObject(); + MongoRepository mongorepofb = new MongoRepository("FacebookPasswordChangeUserDetail"); + + string errormsg = null; + string ispasschange = null; + string msg = null; + #region likes try @@ -96,10 +107,14 @@ public static void CreateReports(string ProfileId, string AccessToken, bool is90 { string facebooknewfanUrl = "https://graph.facebook.com/v2.7/" + ProfileId + "/insights/page_fan_adds?pretty=0&since=" + since.ToString() + "&suppress_http_code=1&until=" + until.ToString() + "&access_token=" + AccessToken; string outputface = getFacebookResponse(facebooknewfanUrl); + ispasschange = outputface; likesobj = JArray.Parse(JArray.Parse(JObject.Parse(outputface)["data"].ToString())[0]["values"].ToString()); } catch (Exception ex) { + errormsg = ispasschange; + msg = getBetween(errormsg, "e\":\"", ":"); + } #endregion #region unlikes @@ -107,10 +122,12 @@ public static void CreateReports(string ProfileId, string AccessToken, bool is90 { string facebookunlikjeUrl = "https://graph.facebook.com/v2.7/" + ProfileId + "/insights/page_fan_removes?pretty=0&since=" + since.ToString() + "&suppress_http_code=1&until=" + until.ToString() + "&access_token=" + AccessToken; string outputfaceunlike = getFacebookResponse(facebookunlikjeUrl); + ispasschange = outputfaceunlike; unlikesobj = JArray.Parse(JArray.Parse(JObject.Parse(outputfaceunlike)["data"].ToString())[0]["values"].ToString()); } catch (Exception ex) { + errormsg = ispasschange; } #endregion #region impression @@ -226,6 +243,52 @@ public static void CreateReports(string ProfileId, string AccessToken, bool is90 { } + try + { + if (msg == "Error validating access token") + { + + DatabaseRepository dbr = new DatabaseRepository(); + Domain.Socioboard.Models.Facebookaccounts lstFbAcc = dbr.Single(t => t.FbUserId == ProfileId); + Domain.Socioboard.Models.User lstUser = dbr.Single(t => t.Id == lstFbAcc.UserId); + Domain.Socioboard.Models.Mongo.FacebookPasswordChangeUserDetail fbdetailpass = new Domain.Socioboard.Models.Mongo.FacebookPasswordChangeUserDetail(); + fbdetailpass.Id = ObjectId.GenerateNewId(); + fbdetailpass.strId = ObjectId.GenerateNewId().ToString(); + fbdetailpass.userId = userId; + fbdetailpass.profileId = ProfileId; + fbdetailpass.message = msg; + fbdetailpass.userPrimaryEmail = lstUser.EmailId; + fbdetailpass.dateValue = DateTime.Today.ToString(); + fbdetailpass.status = false; + + try + { + MongoRepository mongorepo = new MongoRepository("FacebookPasswordChangeUserDetail"); + var ret = mongorepo.Find(t => t.profileId == fbdetailpass.profileId); + var task = Task.Run(async () => + { + return await ret; + }); + if (task.Result != null) + { + if (task.Result.Count() < 1) + { + mongorepo.Add(fbdetailpass); + } + } + } + catch (Exception ex) + { + } + + } + } + catch (Exception ex) + { + + } + + #endregion foreach (JObject obj in likesobj) { @@ -827,7 +890,7 @@ public static void CreateReports(string ProfileId, string AccessToken, bool is90 try { MongoRepository mongorepo = new MongoRepository("FacaebookPageDailyReports"); - var ret = mongorepo.Find(t => t.date == facebookReportViewModal.date); + var ret = mongorepo.Find(t => t.date == facebookReportViewModal.date && t.pageId == facebookReportViewModal.pageId); var task = Task.Run(async () => { return await ret; @@ -850,6 +913,22 @@ public static void CreateReports(string ProfileId, string AccessToken, bool is90 } + + public static string getBetween(string strSource, string strStart, string strEnd) + { + int Start, End; + if (strSource.Contains(strStart) && strSource.Contains(strEnd)) + { + Start = strSource.IndexOf(strStart, 0) + strStart.Length; + End = strSource.IndexOf(strEnd, Start); + return strSource.Substring(Start, End - Start); + } + else + { + return ""; + } + } + public static string getFacebookResponse(string Url) { var facebooklistpagerequest = (HttpWebRequest)WebRequest.Create(Url);