From 8c096c82c9a074382255600265f7e973e06268bb Mon Sep 17 00:00:00 2001
From: Hylston Barbosa <hylstonnb@gmail.com>
Date: Fri, 28 Jul 2023 17:18:13 -0300
Subject: [PATCH] BranchService circular dependencies fix

---
 .../mojito/service/branch/BranchService.java  | 17 -------
 .../service/branch/DeleteBranchJob.java       |  9 ++--
 .../service/branch/DeleteBranchService.java   | 44 +++++++++++++++++++
 3 files changed, 50 insertions(+), 20 deletions(-)
 create mode 100644 webapp/src/main/java/com/box/l10n/mojito/service/branch/DeleteBranchService.java

diff --git a/webapp/src/main/java/com/box/l10n/mojito/service/branch/BranchService.java b/webapp/src/main/java/com/box/l10n/mojito/service/branch/BranchService.java
index 99e83ac025..6fcd388b08 100644
--- a/webapp/src/main/java/com/box/l10n/mojito/service/branch/BranchService.java
+++ b/webapp/src/main/java/com/box/l10n/mojito/service/branch/BranchService.java
@@ -7,7 +7,6 @@
 import com.box.l10n.mojito.entity.security.user.User;
 import com.box.l10n.mojito.quartz.QuartzJobInfo;
 import com.box.l10n.mojito.quartz.QuartzPollableTaskScheduler;
-import com.box.l10n.mojito.service.asset.AssetService;
 import com.box.l10n.mojito.service.pollableTask.PollableFuture;
 import java.text.MessageFormat;
 import java.util.Set;
@@ -30,8 +29,6 @@ public class BranchService {
 
   @Autowired BranchRepository branchRepository;
 
-  @Autowired AssetService assetService;
-
   @Autowired QuartzPollableTaskScheduler quartzPollableTaskScheduler;
 
   public Branch createBranch(
@@ -84,18 +81,4 @@ public PollableFuture<Void> asyncDeleteBranch(Long repositoryId, Long branchId)
             .build();
     return quartzPollableTaskScheduler.scheduleJob(quartzJobInfo);
   }
-
-  public void deleteBranch(Long repositoryId, Long branchId) {
-    deleteBranchAsset(branchId, repositoryId);
-
-    Branch branch = branchRepository.findById(branchId).orElse(null);
-    logger.debug("Mark branch {} as deleted", branch.getName());
-    branch.setDeleted(true);
-    branchRepository.save(branch);
-  }
-
-  public void deleteBranchAsset(Long branchId, Long repositoryId) {
-    Set<Long> assetIds = assetService.findAllAssetIds(repositoryId, null, false, false, branchId);
-    assetService.deleteAssetsOfBranch(assetIds, branchId);
-  }
 }
diff --git a/webapp/src/main/java/com/box/l10n/mojito/service/branch/DeleteBranchJob.java b/webapp/src/main/java/com/box/l10n/mojito/service/branch/DeleteBranchJob.java
index 4d277f8ff2..6ec6bbbf2b 100644
--- a/webapp/src/main/java/com/box/l10n/mojito/service/branch/DeleteBranchJob.java
+++ b/webapp/src/main/java/com/box/l10n/mojito/service/branch/DeleteBranchJob.java
@@ -3,7 +3,6 @@
 import com.box.l10n.mojito.quartz.QuartzPollableJob;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 /** @author jaurambault */
@@ -13,12 +12,16 @@ public class DeleteBranchJob extends QuartzPollableJob<DeleteBranchJobInput, Voi
   /** logger */
   static Logger logger = LoggerFactory.getLogger(DeleteBranchJob.class);
 
-  @Autowired BranchService branchService;
+  private final DeleteBranchService deleteBranchService;
+
+  public DeleteBranchJob(DeleteBranchService deleteBranchService) {
+    this.deleteBranchService = deleteBranchService;
+  }
 
   @Override
   public Void call(DeleteBranchJobInput input) throws Exception {
     logger.debug("DeleteAssetsOfBranchJob");
-    branchService.deleteBranch(input.getRepositoryId(), input.getBranchId());
+    deleteBranchService.deleteBranch(input.getRepositoryId(), input.getBranchId());
     return null;
   }
 }
diff --git a/webapp/src/main/java/com/box/l10n/mojito/service/branch/DeleteBranchService.java b/webapp/src/main/java/com/box/l10n/mojito/service/branch/DeleteBranchService.java
new file mode 100644
index 0000000000..f6810e2b46
--- /dev/null
+++ b/webapp/src/main/java/com/box/l10n/mojito/service/branch/DeleteBranchService.java
@@ -0,0 +1,44 @@
+package com.box.l10n.mojito.service.branch;
+
+import static org.slf4j.LoggerFactory.getLogger;
+
+import com.box.l10n.mojito.entity.Branch;
+import com.box.l10n.mojito.service.asset.AssetService;
+import java.util.Set;
+import org.slf4j.Logger;
+import org.springframework.stereotype.Service;
+
+/**
+ * Service to manage deletion of {@link Branch}es.
+ *
+ * @author jeanaurambault
+ */
+@Service
+public class DeleteBranchService {
+
+  /** logger */
+  static Logger logger = getLogger(DeleteBranchService.class);
+
+  private final BranchRepository branchRepository;
+
+  private final AssetService assetService;
+
+  public DeleteBranchService(BranchRepository branchRepository, AssetService assetService) {
+    this.branchRepository = branchRepository;
+    this.assetService = assetService;
+  }
+
+  public void deleteBranch(Long repositoryId, Long branchId) {
+    deleteBranchAsset(branchId, repositoryId);
+
+    Branch branch = branchRepository.findById(branchId).orElse(null);
+    logger.debug("Mark branch {} as deleted", branch.getName());
+    branch.setDeleted(true);
+    branchRepository.save(branch);
+  }
+
+  public void deleteBranchAsset(Long branchId, Long repositoryId) {
+    Set<Long> assetIds = assetService.findAllAssetIds(repositoryId, null, false, false, branchId);
+    assetService.deleteAssetsOfBranch(assetIds, branchId);
+  }
+}