Skip to content
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

Jump to bottom

bugfix/AP-6712 Can't open a BPMN model by double clicking on the name… #2150

Merged
merged 1 commit into from
Jun 7, 2022
Merged

bugfix/AP-6712 Can't open a BPMN model by double clicking on the name… #2150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 8 additions & 7 deletions ...mponents/Apromore-Manager/src/main/java/org/apromore/service/impl/ProcessServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -652,13 +652,14 @@ public void deleteProcessModel(final List<ProcessData> models, final User user)
List<ProcessModelVersion> pmvs = pvid.getProcessBranch().getProcessModelVersions();
deleteProcessModelVersion(pmvs, pvid, branch);

// Delete corresponding draft version of current user
ProcessModelVersion draft = getProcessModelVersionByUser(pvid.getProcessBranch().getProcess().getId(),
DRAFT_BRANCH_NAME, pvid.getVersionNumber(), user.getId());
if (draft != null) {
ProcessBranch draftBranch = draft.getProcessBranch();
List<ProcessModelVersion> draft_pmvs = draftBranch.getProcessModelVersions();
deleteProcessModelVersion(draft_pmvs, draft, draftBranch);
// Delete corresponding draft version of all users
List<ProcessModelVersion> draftPmvsToDelete =
processModelVersionRepo.getProcessModelVersions(process.getId(), DRAFT_BRANCH_NAME,
pvid.getVersionNumber());
for (ProcessModelVersion draftPmv : draftPmvsToDelete) {
ProcessBranch draftBranch = draftPmv.getProcessBranch();
List<ProcessModelVersion> draftPmvs = draftBranch.getProcessModelVersions();
deleteProcessModelVersion(draftPmvs, draftPmv, draftBranch);
}
LOGGER.debug("Main branch has {} versions", pvid.getProcessBranch().getProcessModelVersions().size());
// Delete the process only when main branch is empty
Expand Down
8 changes: 3 additions & 5 deletions .../Apromore-Manager/src/test/java/org/apromore/service/impl/ProcessServiceImplUnitTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1198,10 +1198,9 @@ void testDeleteProcessModel_BranchHasMoreThanOnePMV() throws Exception {
.andReturn(pmvs);
expect(processBranchRepo.save((ProcessBranch) anyObject())).andReturn(branch).times(2);
processModelVersionRepo.delete(anyObject());
processModelVersionRepo.delete(anyObject());
expect(processModelVersionRepo.countByStorageId(storage.getId())).andReturn(1L).times(2);
expect(processModelVersionRepo.getProcessModelVersionByUser(processId, DRAFT_BRANCH_NAME, "1.0",
user.getId())).andReturn(draft_pmv10);
expect(processModelVersionRepo.getProcessModelVersions(processId, DRAFT_BRANCH_NAME, "1.0")).andReturn(Collections.singletonList(draft_pmv10));
processModelVersionRepo.delete(anyObject());
replayAll();

// Mock Call
Expand Down Expand Up @@ -1252,8 +1251,7 @@ void testDeleteProcessModel_BranchHasOnlyOnePMV() throws Exception {
processModelVersionRepo.delete(anyObject());
processModelVersionRepo.delete(anyObject());
expect(processModelVersionRepo.countByStorageId(storage.getId())).andReturn(1L).times(2);
expect(processModelVersionRepo.getProcessModelVersionByUser(processId, DRAFT_BRANCH_NAME, "1.0",
user.getId())).andReturn(draft_pmv10);
expect(processModelVersionRepo.getProcessModelVersions(processId, DRAFT_BRANCH_NAME, "1.0")).andReturn(Collections.singletonList(draft_pmv10));
processRepo.delete(process);

replayAll();
Expand Down
11 changes: 11 additions & 0 deletions Apromore-Database/src/main/java/org/apromore/dao/ProcessModelVersionRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,17 @@ public interface ProcessModelVersionRepository extends JpaRepository<ProcessMode
ProcessModelVersion getProcessModelVersionByUser(Integer processId, String branchName, String versionNumber,
Integer userId);

/**
* Find a list of process model version for the process id branch and version.
* @param processId the process id.
* @param branchName the branch name.
* @param versionNumber the pmv version number.
* @return a list of processModelVersion we found or null.
*/
@Query("SELECT pmv FROM ProcessModelVersion pmv JOIN pmv.processBranch pb JOIN pb.process p " +
"WHERE p.id = ?1 AND pb.branchName = ?2 AND pmv.versionNumber = ?3")
List<ProcessModelVersion> getProcessModelVersions(Integer processId, String branchName, String versionNumber);

/**
* find the current process model version for the process and version details provided.
* Used in File-portal-plugin and deleteProcessModel
Expand Down