Job template/Notification/Workflow revert (#585)

* Job template/Notification/Workflow revert (#585)

Author: jozefbakus

.github/workflows/build.yml

@@ -2,7 +2,8 @@ name: build
 
 on:
   pull_request:
-    branches: [develop]
+    branches:
+      - '**'
 
 jobs:
   build:

src/main/scala/za/co/absa/hyperdrive/trigger/api/rest/controllers/JobTemplateHistoryController.scala

@@ -32,6 +32,11 @@ class JobTemplateHistoryController @Inject()(jobTemplateHistoryService: JobTempl
     jobTemplateHistoryService.getHistoryForJobTemplate(jobTemplateId).toJava.toCompletableFuture
   }
 
+  @GetMapping(path = Array("/jobTemplateFromHistory"))
+  def getJobTemplateFromHistory(@RequestParam jobTemplateHistoryId: Long): CompletableFuture[JobTemplate] = {
+    jobTemplateHistoryService.getJobTemplateFromHistory(jobTemplateHistoryId).toJava.toCompletableFuture
+  }
+
   @GetMapping(path = Array("/jobTemplatesFromHistory"))
   def getJobTemplatesFromHistory(@RequestParam leftJobTemplateHistoryId: Long, @RequestParam rightJobTemplateHistoryId: Long): CompletableFuture[HistoryPair[JobTemplateHistory]] = {
     jobTemplateHistoryService.getJobTemplatesFromHistory(leftJobTemplateHistoryId, rightJobTemplateHistoryId).toJava.toCompletableFuture

src/main/scala/za/co/absa/hyperdrive/trigger/api/rest/controllers/NotificationRuleHistoryController.scala

@@ -32,6 +32,11 @@ class NotificationRuleHistoryController @Inject()(notificationRuleHistoryService
     notificationRuleHistoryService.getHistoryForNotificationRule(notificationRuleId).toJava.toCompletableFuture
   }
 
+  @GetMapping(path = Array("/notificationRuleFromHistory"))
+  def getNotificationRuleFromHistory(@RequestParam notificationRuleHistoryId: Long): CompletableFuture[NotificationRule] = {
+    notificationRuleHistoryService.getNotificationRuleFromHistory(notificationRuleHistoryId).toJava.toCompletableFuture
+  }
+
   @GetMapping(path = Array("/notificationRulesFromHistory"))
   def getNotificationRulesFromHistory(@RequestParam leftHistoryId: Long, @RequestParam rightHistoryId: Long): CompletableFuture[HistoryPair[NotificationRuleHistory]] = {
     notificationRuleHistoryService.getNotificationRulesFromHistory(leftHistoryId, rightHistoryId).toJava.toCompletableFuture

src/main/scala/za/co/absa/hyperdrive/trigger/api/rest/controllers/WorkflowHistoryController.scala

@@ -33,6 +33,11 @@ class WorkflowHistoryController @Inject()(workflowHistoryService: WorkflowHistor
     workflowHistoryService.getHistoryForWorkflow(workflowId).toJava.toCompletableFuture
   }
 
+  @GetMapping(path = Array("/workflowFromHistory"))
+  def getWorkflowFromHistory(@RequestParam workflowHistoryId: Long): CompletableFuture[WorkflowJoined] = {
+    workflowHistoryService.getWorkflowFromHistory(workflowHistoryId).toJava.toCompletableFuture
+  }
+
   @GetMapping(path = Array("/workflowsFromHistory"))
   def getWorkflowsFromHistory(@RequestParam leftWorkflowHistoryId: Long, @RequestParam rightWorkflowHistoryId: Long): CompletableFuture[HistoryPair[WorkflowHistory]] = {
     workflowHistoryService.getWorkflowsFromHistory(leftWorkflowHistoryId, rightWorkflowHistoryId).toJava.toCompletableFuture

src/main/scala/za/co/absa/hyperdrive/trigger/api/rest/services/JobTemplateHistoryService.scala

@@ -16,15 +16,16 @@
 package za.co.absa.hyperdrive.trigger.api.rest.services
 
 import org.springframework.stereotype.Service
-import za.co.absa.hyperdrive.trigger.models.{History, HistoryPair, JobTemplateHistory, WorkflowHistory}
-import za.co.absa.hyperdrive.trigger.persistance.{JobTemplateHistoryRepository, WorkflowHistoryRepository}
+import za.co.absa.hyperdrive.trigger.models.{History, HistoryPair, JobTemplate, JobTemplateHistory}
+import za.co.absa.hyperdrive.trigger.persistance.JobTemplateHistoryRepository
 
 import scala.concurrent.{ExecutionContext, Future}
 
 trait JobTemplateHistoryService {
   val jobTemplateHistoryRepository: JobTemplateHistoryRepository
 
   def getHistoryForJobTemplate(jobTemplateId: Long)(implicit ec: ExecutionContext): Future[Seq[History]]
+  def getJobTemplateFromHistory(jobTemplateHistoryId: Long)(implicit ec: ExecutionContext): Future[JobTemplate]
   def getJobTemplatesFromHistory(leftJobTemplateHistoryId: Long, rightJobTemplateHistoryId: Long)(implicit ec: ExecutionContext): Future[HistoryPair[JobTemplateHistory]]
 }
 
@@ -34,6 +35,10 @@ class JobTemplateHistoryServiceImpl(override val jobTemplateHistoryRepository: J
     jobTemplateHistoryRepository.getHistoryForJobTemplate(jobTemplateId)
   }
 
+  override def getJobTemplateFromHistory(jobTemplateHistoryId: Long)(implicit ec: ExecutionContext): Future[JobTemplate] = {
+    jobTemplateHistoryRepository.getJobTemplateFromHistory(jobTemplateHistoryId)
+  }
+
   override def getJobTemplatesFromHistory(leftJobTemplateHistoryId: Long, rightJobTemplateHistoryId: Long)(implicit ec: ExecutionContext): Future[HistoryPair[JobTemplateHistory]] = {
     jobTemplateHistoryRepository.getJobTemplatesFromHistory(leftJobTemplateHistoryId, rightJobTemplateHistoryId)
   }

src/main/scala/za/co/absa/hyperdrive/trigger/api/rest/services/NotificationRuleHistoryService.scala

@@ -16,7 +16,7 @@
 package za.co.absa.hyperdrive.trigger.api.rest.services
 
 import org.springframework.stereotype.Service
-import za.co.absa.hyperdrive.trigger.models.{History, HistoryPair, NotificationRuleHistory}
+import za.co.absa.hyperdrive.trigger.models.{History, HistoryPair, NotificationRule, NotificationRuleHistory}
 import za.co.absa.hyperdrive.trigger.persistance.NotificationRuleHistoryRepository
 
 import scala.concurrent.{ExecutionContext, Future}
@@ -25,6 +25,7 @@ trait NotificationRuleHistoryService {
   val historyRepository: NotificationRuleHistoryRepository
 
   def getHistoryForNotificationRule(workflowId: Long)(implicit ec: ExecutionContext): Future[Seq[History]]
+  def getNotificationRuleFromHistory(notificationRuleHistoryId: Long)(implicit ec: ExecutionContext): Future[NotificationRule]
   def getNotificationRulesFromHistory(leftHistoryId: Long, rightHistoryId: Long)(implicit ec: ExecutionContext): Future[HistoryPair[NotificationRuleHistory]]
 }
 
@@ -35,6 +36,10 @@ class NotificationRuleHistoryServiceImpl(override val historyRepository: Notific
     historyRepository.getHistoryForNotificationRule(notificationRuleId)
   }
 
+  override def getNotificationRuleFromHistory(notificationRuleHistoryId: Long)(implicit ec: ExecutionContext): Future[NotificationRule] = {
+    historyRepository.getNotificationRuleFromHistory(notificationRuleHistoryId)
+  }
+
   override def getNotificationRulesFromHistory(leftHistoryId: Long, rightHistoryId: Long)(implicit ec: ExecutionContext): Future[HistoryPair[NotificationRuleHistory]] = {
     historyRepository.getNotificationRulesFromHistory(leftHistoryId, rightHistoryId)
   }

src/main/scala/za/co/absa/hyperdrive/trigger/api/rest/services/WorkflowHistoryService.scala

@@ -16,7 +16,7 @@
 package za.co.absa.hyperdrive.trigger.api.rest.services
 
 import org.springframework.stereotype.Service
-import za.co.absa.hyperdrive.trigger.models.{History, HistoryPair, WorkflowHistory}
+import za.co.absa.hyperdrive.trigger.models.{History, HistoryPair, WorkflowHistory, WorkflowJoined}
 import za.co.absa.hyperdrive.trigger.persistance.WorkflowHistoryRepository
 
 import scala.concurrent.{ExecutionContext, Future}
@@ -25,6 +25,7 @@ trait WorkflowHistoryService {
   val workflowHistoryRepository: WorkflowHistoryRepository
 
   def getHistoryForWorkflow(workflowId: Long)(implicit ec: ExecutionContext): Future[Seq[History]]
+  def getWorkflowFromHistory(workflowHistoryId: Long)(implicit ec: ExecutionContext): Future[WorkflowJoined]
   def getWorkflowsFromHistory(leftWorkflowHistoryId: Long, rightWorkflowHistoryId: Long)(implicit ec: ExecutionContext): Future[HistoryPair[WorkflowHistory]]
 }
 
@@ -35,6 +36,10 @@ class WorkflowHistoryServiceImpl(override val workflowHistoryRepository: Workflo
     workflowHistoryRepository.getHistoryForWorkflow(workflowId)
   }
 
+  override def getWorkflowFromHistory(workflowHistoryId: Long)(implicit ec: ExecutionContext): Future[WorkflowJoined] = {
+    workflowHistoryRepository.getWorkflowFromHistory(workflowHistoryId)
+  }
+
   override def getWorkflowsFromHistory(leftWorkflowHistoryId: Long, rightWorkflowHistoryId: Long)(implicit ec: ExecutionContext): Future[HistoryPair[WorkflowHistory]] = {
     workflowHistoryRepository.getWorkflowsFromHistory(leftWorkflowHistoryId, rightWorkflowHistoryId)
   }

src/main/scala/za/co/absa/hyperdrive/trigger/models/tables/HistoryTableQuery.scala

@@ -38,6 +38,18 @@ trait HistoryTableQuery {
       )
     }
 
+    def getHistoryEntity(id: Long)(implicit ec: ExecutionContext): DBIOAction[T#TableElementType, NoStream, Effect.Read] = {
+      val queryResult = tableQuery
+        .filter(_.id === id)
+        .result
+
+      queryResult.map(
+        _.headOption.getOrElse(
+          throw new Exception(s"Entity with #${id} doesn't exist on ${ru.typeOf[T]}.")
+        )
+      )
+    }
+
     def getEntitiesFromHistory(leftId: Long, rightId: Long)(implicit ec: ExecutionContext): DBIOAction[HistoryPair[T#TableElementType], NoStream, Effect.Read] = {
       val queryResult = tableQuery
         .join(tableQuery).on(_.id === leftId && _.id === rightId)

src/main/scala/za/co/absa/hyperdrive/trigger/persistance/JobTemplateHistoryRepository.scala

@@ -31,6 +31,7 @@ trait JobTemplateHistoryRepository extends Repository {
   private[persistance] def delete(jobTemplate: JobTemplate, user: String)(implicit ec: ExecutionContext): DBIO[Long]
 
   def getHistoryForJobTemplate(jobTemplateId: Long)(implicit ec: ExecutionContext): Future[Seq[History]]
+  def getJobTemplateFromHistory(jobTemplateHistoryId: Long)(implicit ec: ExecutionContext): Future[JobTemplate]
   def getJobTemplatesFromHistory(leftJobTemplateHistoryId: Long, rightJobTemplateHistoryId: Long)(implicit ec: ExecutionContext): Future[HistoryPair[JobTemplateHistory]]
 }
 
@@ -68,6 +69,10 @@ class JobTemplateHistoryRepositoryImpl @Inject()(val dbProvider: DatabaseProvide
     db.run(jobTemplateHistoryTable.getHistoryForEntity(jobTemplateId))
   }
 
+  override def getJobTemplateFromHistory(jobTemplateHistoryId: Long)(implicit ec: ExecutionContext): Future[JobTemplate] = {
+    db.run(jobTemplateHistoryTable.getHistoryEntity(jobTemplateHistoryId).map(_.jobTemplate))
+  }
+
   override def getJobTemplatesFromHistory(leftJobTemplateHistoryId: Long, rightJobTemplateHistoryId: Long)(implicit ec: ExecutionContext): Future[HistoryPair[JobTemplateHistory]] = {
     db.run(jobTemplateHistoryTable.getEntitiesFromHistory(leftJobTemplateHistoryId, rightJobTemplateHistoryId))
   }

src/main/scala/za/co/absa/hyperdrive/trigger/persistance/NotificationRuleHistoryRepository.scala

@@ -31,6 +31,7 @@ trait NotificationRuleHistoryRepository extends Repository {
   private[persistance] def delete(notificationRule: NotificationRule, user: String)(implicit ec: ExecutionContext): DBIO[Long]
 
   def getHistoryForNotificationRule(notificationRuleId: Long)(implicit ec: ExecutionContext): Future[Seq[History]]
+  def getNotificationRuleFromHistory(notificationRuleHistoryId: Long)(implicit ec: ExecutionContext): Future[NotificationRule]
   def getNotificationRulesFromHistory(leftNotificationRuleHistoryId: Long, rightNotificationRuleHistoryId: Long)(implicit ec: ExecutionContext): Future[HistoryPair[NotificationRuleHistory]]
 }
 
@@ -68,6 +69,10 @@ class NotificationRuleHistoryRepositoryImpl @Inject()(val dbProvider: DatabasePr
     db.run(notificationRuleHistoryTable.getHistoryForEntity(notificationRuleId))
   }
 
+  override def getNotificationRuleFromHistory(notificationRuleHistoryId: Long)(implicit ec: ExecutionContext): Future[NotificationRule] = {
+    db.run(notificationRuleHistoryTable.getHistoryEntity(notificationRuleHistoryId).map(_.notificationRule))
+  }
+
   override def getNotificationRulesFromHistory(leftNotificationRuleHistoryId: Long, rightNotificationRuleHistoryId: Long)
   (implicit ec: ExecutionContext): Future[HistoryPair[NotificationRuleHistory]] = {
     db.run(notificationRuleHistoryTable.getEntitiesFromHistory(