Feat/support for networks #309
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #309 +/- ##
============================================
- Coverage 79.71% 79.39% -0.32%
- Complexity 1076 1091 +15
============================================
Files 146 147 +1
Lines 3243 3281 +38
Branches 173 179 +6
============================================
+ Hits 2585 2605 +20
- Misses 543 552 +9
- Partials 115 124 +9
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
RadovanTomik
reviewed
May 2, 2024
src/main/java/eu/bbmri_eric/negotiator/database/model/Person.java
Outdated
Show resolved
Hide resolved
RadovanTomik
reviewed
May 2, 2024
src/main/java/eu/bbmri_eric/negotiator/database/model/Network.java
Outdated
Show resolved
Hide resolved
RadovanTomik
reviewed
May 2, 2024
src/main/java/eu/bbmri_eric/negotiator/database/model/Network.java
Outdated
Show resolved
Hide resolved
jungwire
force-pushed
the
feat/support_for_networks
branch
from
491d74d
to
b497f09
Compare
6 tasks
RadovanTomik
requested changes
May 3, 2024
src/main/java/eu/bbmri_eric/negotiator/database/model/Network.java
Outdated
Show resolved
Hide resolved
src/main/java/eu/bbmri_eric/negotiator/database/model/Network.java
Outdated
Show resolved
Hide resolved
src/main/java/eu/bbmri_eric/negotiator/database/model/Network.java
Outdated
Show resolved
Hide resolved
| import jakarta.persistence.NamedEntityGraph; | ||
| import jakarta.persistence.OneToMany; | ||
| import jakarta.persistence.SequenceGenerator; | ||
| import jakarta.persistence.*; |
There was a problem hiding this comment.
src/main/java/eu/bbmri_eric/negotiator/database/model/Person.java
Outdated
Show resolved
Hide resolved
src/main/java/eu/bbmri_eric/negotiator/database/model/Person.java
Outdated
Show resolved
Hide resolved
src/test/java/eu/bbmri_eric/negotiator/integration/repository/NetworkRepositoryTest.java
Show resolved
Hide resolved
… <> manaher assignment to person
jungwire
force-pushed
the
feat/support_for_networks
branch
from
80c505a
to
995b4e3
Compare
RadovanTomik
requested changes
May 13, 2024
There was a problem hiding this comment.
Please see comments and fix the imports with *. It violates google java format, see https://www.jetbrains.com/help/idea/creating-and-optimizing-imports.html
| /** The resources of the network. */ | ||
| @ManyToMany( | ||
| cascade = {CascadeType.PERSIST, CascadeType.MERGE}, | ||
| fetch = FetchType.EAGER) |
There was a problem hiding this comment.
I would avoid eager fetching as much as possible since we will have some large objects. Any good reason for including it? A network can have thousands of resources
Comment on lines
75
to
92
| public void addNetwork(Network network) { | ||
| this.networks.add(network); | ||
| if (!network.getResources().contains(this)) { | ||
| network.addResource(this); | ||
| } | ||
| } | ||
|
|
||
| public Set<Network> getNetworks() { | ||
| if (Objects.isNull(this.networks)) { | ||
| return Set.of(); | ||
| } | ||
| return Collections.unmodifiableSet(this.networks); | ||
| } | ||
|
|
||
| public void removeNetwork(Network network) { | ||
| this.networks.remove(network); | ||
| if (network.getResources().contains(this)) { | ||
| network.removeResource(this); |
There was a problem hiding this comment.
I do not think it makes sense to have this API on both the Resource and the Network. Wouldn't it be better to just have it in one of them?
RadovanTomik
approved these changes
May 13, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Negotiator pull request:
Description:
Adds network entities
Checklist:
Make sure you tick all the boxes bellow if they are true or do not apply: