Skip to content

Feature/244 #248

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
HuiJun merged 10 commits into from
May 25, 2023
Merged

Feature/244 #248

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a10553e
Merge pull request #197 from Open-MBEE/release/4.0.9
HuiJun Aug 31, 2022
a42ef79
Merge pull request #201 from Open-MBEE/release/4.0.10
HuiJun Sep 16, 2022
74245ae
Merge pull request #205 from Open-MBEE/release/4.0.11
HuiJun Oct 6, 2022
2722f1b
Merge pull request #210 from Open-MBEE/release/4.0.12
HuiJun Oct 7, 2022
df54e9a
Merge pull request #218 from Open-MBEE/release/4.0.13
HuiJun Oct 24, 2022
1347ffd
Merge pull request #222 from Open-MBEE/develop
dlamoris Nov 7, 2022
376ac8b
Merge pull request #228 from Open-MBEE/develop
dlamoris Dec 9, 2022
823a299
Merge pull request #234 from Open-MBEE/release/4.0.16
HuiJun Mar 21, 2023
30751d8
Merge pull request #240 from Open-MBEE/release/4.0.17
HuiJun Mar 31, 2023
0e850d4
Return error message when trying to recreate a deleted branch.
HuiJun May 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion crud/src/main/java/org/openmbee/mms/crud/services/DefaultBranchService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down