Merge pull request #248 from Open-MBEE/feature/244

Feature/244
Open-MBEE · May 25, 2023 · 9ba2192 · 9ba2192
2 parents 99cd478 + 0e850d4
commit 9ba2192
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/crud/src/main/java/org/openmbee/mms/crud/services/DefaultBranchService.java b/crud/src/main/java/org/openmbee/mms/crud/services/DefaultBranchService.java
@@ -114,7 +114,12 @@ public RefsResponse getBranch(String projectId, String id) {
     public RefJson createBranch(String projectId, RefJson branch) {
         Instant now = Instant.now();
         ContextHolder.setContext(projectId);
-        Branch b = new Branch();
+
+        Optional<Branch> branchesOption = this.branchRepository.findByBranchId(branch.getId());
+        Branch b = branchesOption.orElseGet(Branch::new);
+        if (b.isDeleted()) {
+            throw new BadRequestException("Bad Request Error: Branch was previously deleted.");
+        }
 
         b.setBranchId(branch.getId());
         b.setBranchName(branch.getName());