commit

BankOperationsUpdate.WorkerService/Data/Models/BankOperationDTO.cs

@@ -26,5 +26,6 @@ public class BankOperationDTO
 	public Guid? CustomHouseItemsCollectionId { get; set; }
 	public decimal? AdvanceAmount { get; set; }
 	public decimal? BalanceAmount { get; set; }
+	public long OrderId { get; set; }
 }
 

BankOperationsUpdate.WorkerService/Data/Models/TransactionsDTO.cs

@@ -10,5 +10,6 @@ public class TransactionsDTO
 	public decimal? OutcomeAmount { get; set; }
 	public decimal BalanceAmount { get; set; }
 	public bool IsChanged { get; set; }
+	public long OperationOrderId { get; set; }
 }
 

BankOperationsUpdate.WorkerService/OperationsUpdate/UpdateOperations.cs

@@ -1,5 +1,7 @@
 
 
+using System.Security;
+
 namespace BankOperationsUpdate.WorkerService.OperationsUpdate;
 
 public  class UpdateOperations
@@ -55,12 +57,12 @@ public  class UpdateOperations
 	void SetTransactionsInitial()
 	{
 		var bankBalances = GetAllBankBalances().ToList();
-		decimal? currentBalance;
 
 		for(int i = 0; i < bankBalances.Count; i++) {
-			currentBalance = bankBalances[i].Amount;
+
 			_logger.LogDebug("Process for account {0}", bankBalances[i].Id);
-			SetTransactionsForAccount(currentBalance, bankBalances[i].BankAccountId.Value, bankBalances[i].BusinessId.Value);
+
+			SetTransactionsForAccount(bankBalances[i]!.BankAccountId.Value, bankBalances[i]!.BusinessId.Value);
 
 		}
 	}
@@ -69,38 +71,51 @@ public  class UpdateOperations
 
 	void AddConfirmedOperations()
 	{
-		var operations = GetAllConfirmedOperations().OrderBy(x => x.DocDate).ThenBy(x => x.CreatedDate).ToList();
-		var newOperations = GetAllNewOperations().OrderBy(x => x.DocDate).ThenBy(x => x.CreatedDate).ToList();
+        //get all operations with Confirmed status 
+        var operations = GetAllConfirmedOperations().OrderBy(x => x.DocDate).ThenBy(x => x.OrderId).ToList();
+		//get all operations with New status 
+		var newOperations = GetAllNewOperations().OrderBy(x => x.DocDate).ThenBy(x => x.OrderId).ToList();
+		//get all bankOperationIds that added to transactions
 		var transactiondHashSet = GetAllTransactions().Select(x => x.BankOperationId).ToHashSet();
+
 		BankAccountBalance accountBalance;
 		Transaction transaction;
 
 		foreach (var item in operations) {
 
+			//if transaction with opertion id doesn't exist then add new transatcion and change balance 
 			if (!transactiondHashSet.Contains(item.Id)) {
-				accountBalance = GetAccountBalanceByBusinessId(item.BankAccountId.Value, item.BusinessId.Value);
-				accountBalance.Amount = accountBalance.Amount!.Value + item.IncomeAmount!.Value - item.OutcomeAmount!.Value;
-
-				transaction = new Transaction {
-					Id = Guid.NewGuid(),
-					BankOperationId = item.Id,
-					IncomeAmount = item.IncomeAmount,
-					OutcomeAmount = item.OutcomeAmount,
-					BalanceAmount = item.IncomeAmount!.Value - item.OutcomeAmount!.Value,
-					ModifiedDate = item.DocDate,
-					BusinessId = item.BusinessId.Value,
-					BankAccountId = item.BankAccountId.Value,
-					CreateDate = DateTime.Now,
-					OperationCreateDate = item.CreatedDate!.Value,
-					IsChanged = true,
-				};
-
-				_logger.LogInformation(Environment.NewLine + "Created new Transaction {0}", transaction.Id);
-				_repositoryWrapper.Transaction.Create(transaction);
-				_repositoryWrapper.BankAccountBalance.Update(accountBalance);
-				_repositoryWrapper.Save();
-				_repositoryWrapper.Transaction.Detach(transaction);
-				_repositoryWrapper.BankAccountBalance.Detach(accountBalance);
+				try {
+					accountBalance = GetAccountBalanceByBusinessId(item.BankAccountId!.Value, item.BusinessId!.Value);
+					//change balance on certain amount
+					accountBalance.Amount = accountBalance.Amount!.Value + item.IncomeAmount!.Value - item.OutcomeAmount!.Value;
+
+					//create new transaction
+					transaction = new Transaction {
+						Id = Guid.NewGuid(),
+						BankOperationId = item.Id,
+						IncomeAmount = item.IncomeAmount,
+						OutcomeAmount = item.OutcomeAmount,
+						BalanceAmount = item.IncomeAmount!.Value - item.OutcomeAmount!.Value,
+						ModifiedDate = item.DocDate,
+						BusinessId = item.BusinessId.Value,
+						BankAccountId = item.BankAccountId.Value,
+						CreateDate = DateTime.Now,
+						OperationCreateDate = item.CreatedDate ?? item.DocDate!.Value,
+						IsChanged = true,
+						OperationOrderId = item.OrderId,
+					};
+
+					_logger.LogInformation(Environment.NewLine + "Created new Transaction {0}", transaction.Id);
+					_repositoryWrapper.Transaction.Create(transaction);
+					_repositoryWrapper.BankAccountBalance.Update(accountBalance);
+					_repositoryWrapper.Save();
+					_repositoryWrapper.Transaction.Detach(transaction);
+					_repositoryWrapper.BankAccountBalance.Detach(accountBalance);
+				}
+				catch(Exception ex) {
+					_logger.LogError(ex.Message);
+				}
 			
 			}
 			else if(transactiondHashSet.Contains(item.Id) && item.IsChanged == true) {
@@ -125,13 +140,16 @@ public  class UpdateOperations
 		var accountBalance = GetAccountBalanceByBusinessId(operation.BankAccountId.Value, operation.BusinessId.Value);
 		decimal incomeDifference, outcomeDifference;
 
+		//if it is bankOperation with new status that already was in transatctions
 		if (!IsChanged) {
-
+			 //get the income or outcome sum of rollBackcked transaction
 			incomeDifference = -1 * transaction.IncomeAmount.Value;
 			outcomeDifference = -1 * transaction.OutcomeAmount.Value;
 			_repositoryWrapper.Transaction.Delete(transaction);
 		}
+		//else if it is confirmed transaction that has already in transactions
 		else {
+			 //get the income or outcome difference that opertion was changed
 			incomeDifference = operation.IncomeAmount.Value - transaction.IncomeAmount.Value;
 			outcomeDifference = operation.OutcomeAmount.Value - transaction.OutcomeAmount.Value;
 
@@ -149,8 +167,16 @@ public  class UpdateOperations
 		_repositoryWrapper.BankAccountBalance.Update(accountBalance);
 		_repositoryWrapper.Save();
 		_repositoryWrapper.Transaction.Detach(transaction);
+        _repositoryWrapper.BankAccountBalance.Detach(accountBalance);
+
 
-		var transactionsList = GetTransactionsByAccountId(operation.BankAccountId.Value, operation.BusinessId.Value).Where(x => x.BusinessId == operation.BusinessId && x.BankAccountId == operation.BankAccountId && DateTime.Compare(x.ModifiedDate.Value, transaction.ModifiedDate.Value) >= 0).OrderBy(x => x.ModifiedDate).ThenBy(x => x.OperationCreateDate).ToList();
+        //get the transactions that come after modified transaction and change their balanceAmount on cahnged certain amount
+        var transactionsList = GetTransactionsByAccountId(operation.BankAccountId.Value, operation.BusinessId.Value)
+			.Where(x => x.BusinessId == operation.BusinessId && 
+				x.BankAccountId == operation.BankAccountId && 
+				DateTime.Compare(x.ModifiedDate.Value, transaction.ModifiedDate.Value) >= 0)
+			.OrderBy(x => x.ModifiedDate)
+			.ThenBy(x => x.OperationOrderId).ToList();	 
 
 		foreach(var item  in transactionsList) {
 			item.BalanceAmount = item.BalanceAmount + incomeDifference - outcomeDifference;
@@ -162,6 +188,8 @@ public  class UpdateOperations
 
 	}
 
+
+	//update all new added transactions for updating balance amount of items that comes after updated  item
 	void UpdateConfirmedTransactions()
 	{
 		var bankAccounts = GetAllBankBalances().ToList();
@@ -169,12 +197,12 @@ public  class UpdateOperations
 		decimal newValue = 0M;
 
 		foreach (var account in bankAccounts) {
-			transactions = GetTransactionsByAccountId(account.BankAccountId.Value, account.BusinessId.Value).OrderBy(x => x.ModifiedDate).ThenBy(x => x.OperationCreateDate).ToList();
+			transactions = GetTransactionsByAccountId(account.BankAccountId!.Value, account.BusinessId!.Value).OrderBy(x => x.ModifiedDate).ThenBy(x => x.OperationOrderId).ToList();
 
 			for (int i = 1; i < transactions.Count; i++) {
 				if (transactions[i].IsChanged == true) {
 					transactions[i].BalanceAmount += transactions[i - 1].BalanceAmount;
-					newValue += transactions[i].IncomeAmount.Value - transactions[i].OutcomeAmount.Value;
+					newValue += transactions[i].IncomeAmount!.Value - transactions[i].OutcomeAmount!.Value;
 					transactions[i].IsChanged = false;
 				}
 				else {
@@ -187,17 +215,31 @@ public  class UpdateOperations
 		}
 	}
 
-	void SetTransactionsForAccount(decimal? balance, Guid accountId, Guid businessId)
+
+	/// <summary>
+	/// Create transatction for each bank operation	 if they don't exist
+	/// </summary>
+	/// <param name="accountId"></param>
+	/// <param name="businessId"></param>
+	void SetTransactionsForAccount(Guid accountId, Guid businessId)
 	{
-		var operations =  GetAllConfirmedOperations(accountId, businessId).OrderBy(x => x.DocDate).ToList();
+		//get all confirmed operations by accountId and businessId and order them by DocDate
+		var operations =  GetAllConfirmedOperations(accountId, businessId).OrderBy(x => x.DocDate).ThenBy(x => x.OrderId).ToList();
+		
+		// get Unitque bankOpertionsIds from transatctions 
 		var transactionsHashSet = GetTransactionsByAccountId(accountId, businessId).Select(x => x.BankOperationId).ToHashSet();
 		Transaction transaction = new Transaction();
+
+		//get current balance by summarizing all Incomes and outcomes from transacitons
 		var currentBalance = GetTransactionsByAccountId(accountId, businessId).Sum(x => (x.IncomeAmount - x.OutcomeAmount));
 											   
 
-		for (int i = 0; i < operations.Count; i++) {
+		for (int i = 0; i < operations.Count && transactionsHashSet.Count == 0; i++) {
+
+			//if BankOperationsIds doesn't contain confirmed operations then..
+			if (!transactionsHashSet.Contains(operations[i].Id) ) {
 
-			if (!transactionsHashSet.Contains(operations[i].Id)) {
+				//change balance on certain income or outcome amount
 				currentBalance = currentBalance + operations[i].IncomeAmount!.Value - operations[i].OutcomeAmount!.Value;
 
 				transaction.Id = Guid.NewGuid();
@@ -208,8 +250,12 @@ public  class UpdateOperations
 				transaction.ModifiedDate = operations[i].DocDate;
 				transaction.BusinessId = businessId;
 				transaction.BankAccountId = accountId;
-				transaction.BalanceAmount = currentBalance??0;
+				transaction.CreateDate = DateTime.Now;
+                transaction.OperationCreateDate = operations[i].CreatedDate ?? transaction.ModifiedDate!.Value;
+                transaction.BalanceAmount = currentBalance ?? 0;
+				transaction.OperationOrderId = operations[i].OrderId;
 
+				//create transaction
 				_repositoryWrapper.Transaction.Create(transaction);
 				_repositoryWrapper.Save();
 			}

BankOperationsUpdate.WorkerService/Worker.cs

@@ -12,15 +12,18 @@ public class Worker : BackgroundService
 		_updateOperations = updateOperations;
 		refreshInterval = Int32.TryParse(config.GetSection("RefreshInterval").Value, out int minutes) ? TimeSpan.FromMinutes(5) : TimeSpan.FromMinutes(minutes);
 	}
+	
 
 	protected override async Task ExecuteAsync(CancellationToken stoppingToken)
 	{
+		_updateOperations.WhenStart();
+
 		while (!stoppingToken.IsCancellationRequested) {
 			try {
 				_updateOperations.Execute();
 			}
 			catch (Exception ex) {
-				_logger.LogError(ex.Message);
+				_logger.LogError("Message: {message} \n Source : {source} \n StackTrace: {stackTrace}", ex.Message, ex.Source, ex.StackTrace);
 				
 			}
 			

Entities/Models/BankOperation.cs

@@ -35,6 +35,7 @@ namespace Entities.Models
         public decimal? AdvanceAmount { get; set; }
         public decimal? BalanceAmount { get; set; }
         public bool? IsChanged { get; set; }
+        public long OrderId { get; set; }
 
         public virtual ICollection<Transaction> SkTransactions { get; set; }
     }

Entities/Models/Transaction.cs

@@ -12,6 +12,7 @@ namespace Entities.Models
         public decimal? IncomeAmount { get; set; }
         public decimal? OutcomeAmount { get; set; }
         public decimal BalanceAmount { get; set; }
+        public long OperationOrderId { get; set; }
         public bool IsChanged { get; set; }
         public DateTime? ModifiedDate { get; set; }
         public Guid BankAccountId { get; set; }

Entities/RepositoryContext.cs

@@ -73,7 +73,10 @@ namespace Entities
 
 				entity.Property(e => e.IsChanged).HasDefaultValue(false);
 
-			});
+                entity.Property(e => e.OrderId);
+
+
+            });
 
 			modelBuilder.Entity<Transaction>(entity => {
 				entity.ToTable("SK_Transactions", "SEPTEM");
@@ -98,7 +101,9 @@ namespace Entities
 
 				entity.HasIndex(e => e.BusinessId);
 
-				entity.HasOne(d => d.BankOperation)
+				entity.Property(e => e.OperationOrderId);
+
+                entity.HasOne(d => d.BankOperation)
 					.WithMany(p => p.SkTransactions)
 					.HasForeignKey(d => d.BankOperationId)
 					.HasForeignKey(d => d.BankAccountId);