Removed JobId columns (#364)

* Removed JobId columns in the tables: ChannelOperationRequest, Nodes, WalletWithdrawalRequest. * Update src/Pages/Nodes.razor Co-authored-by: Rodrigo <[email protected]> --------- Co-authored-by: Rodrigo <[email protected]>
Elenpay · Feb 1, 2024 · b164516 · b164516
1 parent fb7a48c
commit b164516
Show file tree

Hide file tree

Showing 14 changed files with 1,332 additions and 50 deletions.
diff --git a/src/Data/Models/ChannelOperationRequest.cs b/src/Data/Models/ChannelOperationRequest.cs
@@ -150,11 +150,6 @@ public decimal Amount
         [NotMapped]
         public int NumberOfSignaturesCollected => ChannelOperationRequestPsbts == null ? 0 : ChannelOperationRequestPsbts.Count(x => !x.IsFinalisedPSBT && !x.IsTemplatePSBT && !x.IsInternalWalletPSBT);
 
-        /// <summary>
-        /// This is the JobId provided by Quartz of the job executing this request.
-        /// </summary>
-        public string? JobId { get; set; }
-
         /// <summary>
         /// This indicates if the user requested a changeless operation by selecting UTXOs
         /// </summary>

diff --git a/src/Data/Models/Node.cs b/src/Data/Models/Node.cs
@@ -68,11 +68,6 @@ public class Node : Entity
         public ICollection<ChannelOperationRequest> ChannelOperationRequestsAsDestination { get; set; }
 
         public ICollection<ApplicationUser> Users { get; set; }
-
-        /// <summary>
-        /// This is the JobId provided by Quartz of the job running the subscription to get the info of the node.
-        /// </summary>
-        public string? JobId { get; set; }
 
         #endregion Relationships
     }

diff --git a/src/Data/Models/WalletWithdrawalRequest.cs b/src/Data/Models/WalletWithdrawalRequest.cs
@@ -110,11 +110,6 @@ public class WalletWithdrawalRequest : Entity, IEquatable<WalletWithdrawalReques
                 : WalletWithdrawalRequestPSBTs.Count(x =>
                     !x.IsTemplatePSBT && !x.IsFinalisedPSBT && !x.IsInternalWalletPSBT);
 
-        /// <summary>
-        /// This is the JobId provided by Quartz of the job executing this request.
-        /// </summary>
-        public string? JobId { get; set; }
-
         /// <summary>
         /// This indicates if the user requested a changeless operation by selecting UTXOs
         /// </summary>

diff --git a/src/Data/Repositories/ChannelRepository.cs b/src/Data/Repositories/ChannelRepository.cs
@@ -165,9 +165,6 @@ public async Task<List<Channel>> GetAll()
             var job = RetriableJob.Create<ChannelCloseJob>(map, closeRequest.Id.ToString(), retryList);
             await scheduler.ScheduleJob(job.Job, job.Trigger);
 
-            // TODO: Check job id
-            closeRequest.JobId = job.Job.Key.ToString();
-
             var jobUpdateResult = _channelOperationRequestRepository.Update(closeRequest);
             if (!jobUpdateResult.Item1)
             {

diff --git a/src/Jobs/MonitorChannelsJob.cs b/src/Jobs/MonitorChannelsJob.cs
@@ -35,12 +35,10 @@ public async Task Execute(IJobExecutionContext context)
                     var job = SimpleJob.Create<ChannelMonitorJob>(map, managedNode.Id.ToString());
                     await scheduler.ScheduleJob(job.Job, job.Trigger);
 
-                    var jobId = job.Job.Key.ToString();
-                    managedNode.JobId = jobId;
                     var jobUpateResult = _nodeRepository.Update(managedNode);
                     if (!jobUpateResult.Item1)
                     {
-                        _logger.LogWarning("Couldn't update Node {NodeId} with JobId {JobId}", managedNode.Id, jobId);
+                        _logger.LogWarning("Couldn't update Node {NodeId}", managedNode.Id);
                     }
                 }
             }

diff --git a/src/Jobs/NodeSubscriptorJob.cs b/src/Jobs/NodeSubscriptorJob.cs
@@ -36,7 +36,6 @@ public async Task Execute(IJobExecutionContext context)
                     var job = SimpleJob.Create<NodeChannelSuscribeJob>(map, managedNode.Id.ToString());
                     await scheduler.ScheduleJob(job.Job, job.Trigger);
 
-                    managedNode.JobId = job.Job.Key.ToString();
                     var jobUpateResult = _nodeRepository.Update(managedNode);
                 }
             }