From 0e850d4095c6fdee11f295ab022312281a048540 Mon Sep 17 00:00:00 2001
From: Jason Han <jason.han@jpl.nasa.gov>
Date: Thu, 25 May 2023 10:49:11 -0700
Subject: [PATCH] Return error message when trying to recreate a deleted
 branch.

---
 .../openmbee/mms/crud/services/DefaultBranchService.java   | 7 ++++++-
 1 file changed, 6 insertions(+), 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
index 72201fb06..365bc3379 100644
--- 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());