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.

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

Testing BA-MBSE Persistence Refactor Merge #259

Merged
merged 66 commits into from
Apr 9, 2024
Merged
Changes from 1 commit
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
cd851b0
Decouples Federated Persistence layer from controller and service lay…
BA-MBSE Mar 17, 2023
9e17c7b
Remove redundant commit save
BA-MBSE Mar 20, 2023
240359a
CodeQL updates
BA-MBSE Mar 20, 2023
d1cd63d
More CodeQL changes
BA-MBSE Mar 20, 2023
1cc6a06
Added timeout to database delete statement
BA-MBSE Mar 22, 2023
9ddd679
Removing overarching transactional annotations
BA-MBSE Mar 27, 2023
bc41d28
Removed transactional annotations from DefaultPermissionService
BA-MBSE Mar 28, 2023
ff3d4fd
Removed @Transactional annotation from modules that are not tasked wi…
BA-MBSE Mar 28, 2023
b6a0ede
Fixes for failing crud tests
BA-MBSE Mar 29, 2023
9808317
Increased request delay for crud tests
BA-MBSE Mar 29, 2023
a9595f6
Working on fixing permissions test failures
BA-MBSE Mar 30, 2023
23848a0
increased delay in permissions test
BA-MBSE Mar 31, 2023
b07f73b
Fixing problem with bean creation for permissions delegates that was …
BA-MBSE Mar 31, 2023
307a8b9
Fixed artifacts behavior
BA-MBSE Apr 4, 2023
8eb0abb
extending artifacts test delay to 1000 ms
BA-MBSE Apr 4, 2023
a95b385
Fixing elastic test failures
BA-MBSE Apr 5, 2023
066a212
Fixing groups test failures
BA-MBSE Apr 5, 2023
87d24ad
Merge branch 'develop' into ba_persistence_refactor
BA-MBSE Apr 5, 2023
2c0daeb
Merge branch 'ba_persistence_refactor' of https://github.com/BA-MBSE/…
HuiJun Feb 7, 2024
f5ef049
Merge commit '4e4e8586b744bc371db774f2b7115647003d2965' into feature/…
Feb 13, 2024
fe50baf
fix NodePersistence.findById interface argument names
Feb 13, 2024
ceb011f
fix FederatedNodeChangeDomain superclass constructor call
Feb 13, 2024
d042a36
change CommitPersistence.elementHistory interface so DefaultCommitSer…
Feb 13, 2024
1190f31
remove redundant groups read from CameoViewService
Feb 13, 2024
8fab816
remove posted _childViews handling from CameoViewService, this was ha…
Feb 13, 2024
5db7179
continue if no permission to change project org on project update
Feb 13, 2024
1d7513f
reduce amount of commits gotten to test for new project in DefaultCom…
Feb 14, 2024
4db7311
add commitId to node get responses in DefaultNodeService and CameoNod…
Feb 14, 2024
d706aa4
removed duplicated convertJsonToMap function in DefaultNodeService, m…
Feb 14, 2024
322eb78
prevent adding change info to commit if element isn't actually being …
Feb 14, 2024
3ae6efb
fix setting initial commit of added element, prefix deleted key with _
Feb 14, 2024
7e83e9c
fix processElementDeleted
Feb 14, 2024
0340a0d
use commitDAO interface in FederatedNodeChangeDomain instead of commi…
Feb 14, 2024
f453d79
clean up unused things in FederatedNodeChangeDomain
Feb 14, 2024
cd4791e
uncomment child views handling so tests run for now
Feb 15, 2024
aaa1324
if searching by commit id doesn't work, try getting by id directly
Feb 15, 2024
9a9bd03
reduce test delay back to 500
Feb 15, 2024
cd7248f
support updating existing ref's json properties, will resurrect if pr…
Feb 21, 2024
0f5e331
fix updating org name
Feb 21, 2024
1974151
prevent project update from updating schema
Feb 21, 2024
6a49df8
fix setting commit id from commitJson id
Feb 21, 2024
9345bb5
sort commits by descending
Feb 21, 2024
7064a3c
check if commitId is latest for gets and pass in null if it is for pe…
Feb 24, 2024
a30da31
remove any _deleted flag in element to be updated
Feb 24, 2024
7831189
set returned elements refId to match requested refId
Feb 24, 2024
4a91807
set refIds for cameo element gets
Feb 24, 2024
064512b
allow update even if previous element not found
Feb 24, 2024
c76802c
handle if element json not found during gets
Feb 24, 2024
13f1ad7
remove addChildViews delay
Feb 24, 2024
a52046c
throw error if project can't hard delete
Feb 24, 2024
c6aecc5
update project permissions after changing orgs if needed
Feb 24, 2024
1af38d9
continue with element delete even if json not found
Feb 24, 2024
814b718
Merge commit 'f7ac4a8af45c3f3347eec2a2b4d0e9a5fe12f144' into fix/pers…
Mar 10, 2024
e8fc607
add more tests for branching behavior
Mar 11, 2024
b58f138
Merge commit '83ec1f6db8a540e1c8bade294c49fa62a62cec25' into fix/pers…
Mar 17, 2024
13318b9
use returned instance from spring data repository save
Mar 19, 2024
e51fa08
fix branch not found behavior when init branch perms
Mar 25, 2024
a55b5ca
remove unused things in FederatedPermissionUpdatesResponseBuilder
Mar 30, 2024
f178665
remove unneeded element delete processing
Mar 31, 2024
7162f86
users list is available to authenticated users
Mar 31, 2024
844e9eb
tweak commit update in case twc module is used
Mar 31, 2024
7858dfb
commit fail cleanup
Mar 31, 2024
26300d3
fix commit delete
Mar 31, 2024
404ef00
in FederatedNodeChangeDomain.primeNodeChangeInfo, add to any existing…
Mar 31, 2024
27f056a
only further process transacted elements but keep other existing info…
Mar 31, 2024
fce5e38
Merge pull request #260 from Open-MBEE/fix/persistence_refactor_fixes
dlamoris Apr 9, 2024
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
Prev Previous commit
Next Next commit
set returned elements refId to match requested refId
  • Loading branch information
Doris Lam committed Feb 24, 2024
commit 7831189a80e2265e6e831bd56ca00e774f42387b
Original file line number Diff line number Diff line change
@@ -135,6 +135,7 @@ public ElementsResponse read(String projectId, String refId, ElementsRequest req

ElementsResponse response = new ElementsResponse();
response.getElements().addAll(info.getActiveElementMap().values());
response.getElements().forEach(v -> v.setRefId(refId));
response.setRejected(new ArrayList<>(info.getRejected().values()));
response.setCommitId(commitId);
return response;
Original file line number Diff line number Diff line change
@@ -163,6 +163,7 @@ public void streamAllAtCommit(String projectId, String refId, String commitId, O
}
Collection<ElementJson> result = getNodeGetDomain().processGetJsonFromNodes(ns, commitToPass)
.getActiveElementMap().values();
result.forEach(v -> v.setRefId(refId));
stream.write(result.stream().map(this::toJson).collect(Collectors.joining(separator))
.getBytes(StandardCharsets.UTF_8));
} catch (IOException ioe) {