Merge pull request #161

tuananh
anhnmt · Aug 27, 2021 · 0037c5d · 0037c5d
2 parents c646ab8 + e185d44
commit 0037c5d
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 20 deletions.
diff --git a/Backend/Areas/Admin/Controllers/ChequesController.cs b/Backend/Areas/Admin/Controllers/ChequesController.cs
@@ -435,11 +435,8 @@ public ActionResult ChequeExec(ChequesExecViewModel chequeExec)
                         var newNotifications = CreateNotifications(newTransaction);
 
                         transaction.Commit();
-
-                        // using (var chatHub = new ChatHub())
-                        // {
-                        //     chatHub.SendNotifications(newNotifications);
-                        // }
+
+                        ChatHub.Instance().SendNotifications(newNotifications);
 
                         return Json(new
                         {

diff --git a/Backend/Controllers/TransactionsController.cs b/Backend/Controllers/TransactionsController.cs
@@ -110,6 +110,7 @@ private JsonResult HandlerTransfer()
                                     {
                                         goto PlusMoney;
                                     }
+
                                     var minusError1 = MinusMoney(tran, sourceBankAccount, errors);
                                     if (minusError1 != null)
                                     {
@@ -134,7 +135,7 @@ private JsonResult HandlerTransfer()
 
                                 // Plus money
                                 PlusMoney:
-                                
+
                                 receiverBankAccount = _context.BankAccounts.FirstOrDefault(x => x.Name == tran.ToId);
 
                                 var plusError = PlusMoney(tran, receiverBankAccount, errors);
@@ -150,15 +151,17 @@ private JsonResult HandlerTransfer()
                                 var newNotifications = CreateNotifications(newTransaction);
 
                                 transaction.Commit();
-
+
+                                ChatHub.Instance().SendNotifications(newNotifications);
+
                                 return Json(new
                                 {
                                     data = "Successful transfer",
                                     message = "Success",
                                     statusCode = 200
                                 });
                             }
-                            catch (Exception)
+                            catch (Exception ex)
                             {
                                 transaction.Rollback();
                             }
@@ -198,9 +201,10 @@ private JsonResult CheckTransactionRequestModels(TransactionRequestModels tran,
                     statusCode = 404
                 }, JsonRequestBehavior.AllowGet);
             }
+
             var sourceBankAccount = bankAccounts.Get(x => x.Name == tran.FromId).FirstOrDefault();
             var receiverBankAccount = bankAccounts.Get(x => x.Name == tran.ToId).FirstOrDefault();
-           
+
 
             if (tran.Amount <= 0)
             {
@@ -246,6 +250,7 @@ private JsonResult CheckTransactionRequestModels(TransactionRequestModels tran,
                     statusCode = 404
                 }, JsonRequestBehavior.AllowGet);
             }
+
             if (sourceBankAccount.BankAccountId == receiverBankAccount.BankAccountId)
             {
                 errors.Add("ToId", "The number of the receiving account and the sending account is the same");

diff --git a/Backend/Hubs/ChatHub.cs b/Backend/Hubs/ChatHub.cs
@@ -187,22 +187,24 @@ public string ReadNotification(int notificationId)
             }
         }
 
-        public async Task SendNotifications(List<Notifications> notifications)
+        public void SendNotifications(List<Notifications> notifications)
         {
             try
             {
-                IHubContext context = GlobalHost.ConnectionManager.GetHubContext<ChatHub>();
-                notifications.ForEach(async x =>
+                var context = GlobalHost.ConnectionManager.GetHubContext<ChatHub>();
+
+                notifications.ForEach(x =>
                 {
-                    var pkObject = transactionDetailRepo
-                        .Get().FirstOrDefault(y => y.TransactionDetailId == x.PkId);
+                    var pkObject = transactionDetailRepo.Get()
+                        .FirstOrDefault(y => y.TransactionDetailId == x.PkId);
 
-                    await context.Clients.Group("user-" + x.AccountId)
+                    context.Clients.Group("user-" + x.AccountId)
                         .newNotification(new NotificationViewModel(x, pkObject));
+                    // await context.Clients.Group("user-" + x.AccountId)
+                    //     .historyNotifications(GetNotificationsHistory(GetIntegerAccountId()));
                 });
-                await context.Clients.All.reloadChatData();
             }
-            catch (Exception)
+            catch (Exception ex)
             {
                 Clients.Caller.onError("Notification can't not send!");
             }
@@ -239,7 +241,8 @@ public override Task OnConnected()
                         userViewModel.CurrentChannelId = channel.ChannelId;
                         Groups.Add(connectionId, "channel-" + channel.ChannelId);
                         Clients.Client(connectionId).historyMessages(GetMessageHistory(channel.ChannelId));
-                        Clients.Client(connectionId).historyNotifications(GetNotificationsHistory(GetIntegerAccountId()));
+                        Clients.Client(connectionId)
+                            .historyNotifications(GetNotificationsHistory(GetIntegerAccountId()));
                     }
 
                     var tempAccount = Connections.FirstOrDefault(u => u.AccountId == accountId);

diff --git a/Backend/Web.config b/Backend/Web.config
@@ -63,8 +63,8 @@
 		</assemblyBinding>
 	</runtime>
 	<connectionStrings>
-		<!--<add name="DBConnectionString" connectionString="server=.;database=OnlineBanking;uid=sa;pwd=123456aA@;MultipleActiveResultSets=true" providerName="System.Data.SqlClient" />-->
-		<add name="DBConnectionString" connectionString="server=14.231.185.26;database=OnlineBanking;uid=sa;pwd=123456aA@;MultipleActiveResultSets=true" providerName="System.Data.SqlClient" />
+		<add name="DBConnectionString" connectionString="server=.;database=OnlineBanking;uid=sa;pwd=123456aA@;MultipleActiveResultSets=true" providerName="System.Data.SqlClient" />
+		<!-- <add name="DBConnectionString" connectionString="server=14.231.185.26;database=OnlineBanking;uid=sa;pwd=123456aA@;MultipleActiveResultSets=true" providerName="System.Data.SqlClient" /> -->
 	</connectionStrings>
 	<entityFramework>
 		<defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework" />