vmario/wisemapping-open-source
1
0
Fork 0
mirror of https://bitbucket.org/wisemapping/wisemapping-open-source.git synced 2024-11-21 21:57:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Performance optimization to avoid loading Collaboration table per map.

Browse Source
This commit is contained in:
Paulo Gustavo Veiga 2022-09-26 10:25:23 -07:00
parent 0c88b8a474
commit 86964febc1
3 changed files with 33 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
wise-webapp/src/main/java/com/wisemapping/model/Collaborator.java
View File

@ -112,10 +112,18 @@ public class Collaborator implements Serializable {
public boolean identityEquality(@Nullable Collaborator that) {
if (this == that) return true;
if (that == null) return false;
if (this == that) {
return true;
}
if (that == null) {
return false;
}
if (id != that.getId()) {
return false;
}
if (id != that.getId()) return false;
return email != null ? email.equals(that.getEmail()) : that.getEmail() == null;
}

11
wise-webapp/src/main/java/com/wisemapping/model/Mindmap.java
View File

@ -63,7 +63,7 @@ public class Mindmap implements Serializable {
@Column(name = "public")
private boolean isPublic;
@OneToMany(mappedBy = "mindMap", orphanRemoval = true, cascade = {CascadeType.ALL})
@OneToMany(mappedBy = "mindMap", orphanRemoval = true, cascade = {CascadeType.ALL}, fetch = FetchType.LAZY)
private Set<Collaboration> collaborations = new HashSet<>();
@ManyToMany(cascade = {CascadeType.PERSIST, CascadeType.REFRESH, CascadeType.MERGE})
@ -177,15 +177,14 @@ public class Mindmap implements Serializable {
return result;
}
public boolean isCreator(@NotNull User user) {
return this.getCreator()!=null && this.getCreator().identityEquality(user);
}
public boolean isPublic() {
return isPublic;
}
//@Todo: This is a hack to overcome some problem with JS EL. For some reason, ${mindmap.public} fails as not supported.
// More research is needed...
public boolean isAccessible() {
return isPublic();
}
public void setPublic(boolean isPublic) {
this.isPublic = isPublic;

17
wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmapInfo.java
View File

@ -91,7 +91,7 @@ public class RestMindmapInfo {
public Set<RestLabel> getLabels() {
// Support test deserialization...
Set<RestLabel> result = this.restLabels;
if(result==null) {
if (result == null) {
final User me = Utils.getUser();
result = mindmap.getLabels().
stream()
@ -108,7 +108,7 @@ public class RestMindmapInfo {
public int getId() {
int result = this.mapId;
if(mapId==-1) {
if (mapId == -1) {
result = mindmap.getId();
}
return result;
@ -132,8 +132,17 @@ public class RestMindmapInfo {
}
public String getRole() {
final Optional<Collaboration> collaboration = mindmap.findCollaboration(Utils.getUser());
return collaboration.map(value -> value.getRole().getLabel()).orElse(ROLE_NONE);
final User user = Utils.getUser();
String result;
if (mindmap.isCreator(user)) {
// Performance hack. In case that the person is the creator, assume that the role is owner.
// This is to avoid loading all the collaboration maps per map.
result = CollaborationRole.OWNER.getLabel();
} else {
final Optional<Collaboration> collaboration = mindmap.findCollaboration(user);
result = collaboration.map(value -> value.getRole().getLabel()).orElse(ROLE_NONE);
}
return result;
}
public void setRole(String value) {