Rename MindmapUser to Collaboration.

wise-webapp/src/main/java/com/wisemapping/rest/MindmapController.java

@@ -24,8 +24,8 @@ import com.wisemapping.importer.ImportFormat;
 import com.wisemapping.importer.Importer;
 import com.wisemapping.importer.ImporterException;
 import com.wisemapping.importer.ImporterFactory;
+import com.wisemapping.model.Collaboration;
 import com.wisemapping.model.MindMap;
-import com.wisemapping.model.MindmapUser;
 import com.wisemapping.model.User;
 import com.wisemapping.rest.model.RestMindmap;
 import com.wisemapping.rest.model.RestMindmapInfo;
@@ -92,10 +92,10 @@ public class MindmapController extends BaseController {
 
         final MindmapFilter filter = MindmapFilter.parse(q);
 
-        final List<MindmapUser> mapsByUser = mindmapService.getMindmapUserByUser(user);
+        final List<Collaboration> mapsByUser = mindmapService.getMindmapUserByUser(user);
         final List<MindMap> mindmaps = new ArrayList<MindMap>();
-        for (MindmapUser mindmapUser : mapsByUser) {
-            final MindMap mindmap = mindmapUser.getMindMap();
+        for (Collaboration collaboration : mapsByUser) {
+            final MindMap mindmap = collaboration.getMindMap();
             if (filter.accept(mindmap, user)) {
                 mindmaps.add(mindmap);
             }
@@ -201,6 +201,25 @@ public class MindmapController extends BaseController {
         saveMindmap(true, mindMap, user);
     }
 
+    @RequestMapping(method = RequestMethod.PUT, value = "/maps/{id}/collabs", consumes = {"application/json", "application/xml"}, produces = {"application/json", "text/html", "application/xml"})
+    @ResponseStatus(value = HttpStatus.NO_CONTENT)
+    public void updateCollabs(@PathVariable int id) throws WiseMappingException {
+
+        final MindMap mindMap = mindmapService.getMindmapById(id);
+        final User user = Utils.getUser();
+    }
+
+    @RequestMapping(method = RequestMethod.GET, value = "/maps/{id}/collabs", produces = {"application/json", "text/html", "application/xml"})
+    public ModelAndView retrieveList(@PathVariable int id) throws IOException {
+        final MindMap mindMap = mindmapService.getMindmapById(id);
+        final User user = Utils.getUser();
+
+        final Set<Collaboration> collaborations = mindMap.getCollaborations();
+
+        return new ModelAndView("mapsView", "list", collaborations);
+    }
+
+
     @RequestMapping(method = RequestMethod.PUT, value = "/maps/{id}/description", consumes = {"text/plain"}, produces = {"application/json", "text/html", "application/xml"})
     @ResponseStatus(value = HttpStatus.NO_CONTENT)
     public void updateDescription(@RequestBody String description, @PathVariable int id) throws WiseMappingException {

wise-webapp/src/main/java/com/wisemapping/rest/model/RestCollaboration.java

@@ -0,0 +1,50 @@
+package com.wisemapping.rest.model;
+
+
+import com.wisemapping.model.CollaborationRole;
+import org.codehaus.jackson.annotate.JsonAutoDetect;
+import org.codehaus.jackson.annotate.JsonIgnore;
+import org.jetbrains.annotations.NotNull;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement(name = "collaborators")
+@XmlAccessorType(XmlAccessType.PROPERTY)
+@JsonAutoDetect(
+        fieldVisibility = JsonAutoDetect.Visibility.NONE,
+        getterVisibility = JsonAutoDetect.Visibility.PUBLIC_ONLY,
+        isGetterVisibility = JsonAutoDetect.Visibility.PUBLIC_ONLY)
+public class RestCollaboration {
+
+    @JsonIgnore
+    private String email;
+
+    @JsonIgnore
+    private CollaborationRole role;
+
+    public RestCollaboration() {
+
+    }
+
+    public void setRole(@NotNull final String value) {
+        if (value == null) {
+            throw new IllegalStateException("role can not be null");
+        }
+
+        role = CollaborationRole.valueOf(value.toUpperCase());
+    }
+
+    public String getRole() {
+        return role.toString().toLowerCase();
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+}

wise-webapp/src/main/java/com/wisemapping/rest/model/RestCollaborationList.java

@@ -0,0 +1,47 @@
+package com.wisemapping.rest.model;
+
+
+import com.wisemapping.model.Collaborator;
+import com.wisemapping.model.MindMap;
+import org.codehaus.jackson.annotate.JsonAutoDetect;
+import org.jetbrains.annotations.NotNull;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+@XmlRootElement(name = "collaboration")
+@XmlAccessorType(XmlAccessType.PROPERTY)
+@JsonAutoDetect(
+        fieldVisibility = JsonAutoDetect.Visibility.NONE,
+        getterVisibility = JsonAutoDetect.Visibility.PUBLIC_ONLY,
+        isGetterVisibility = JsonAutoDetect.Visibility.PUBLIC_ONLY)
+public class RestCollaborationList {
+
+    private List<RestCollaboration> collaborations;
+
+    public RestCollaborationList() {
+
+    }
+
+    public int getCount() {
+        return this.collaborations.size();
+    }
+
+    public void setCount(int count) {
+
+    }
+
+    @XmlElement(name = "collaborate")
+    public List<RestCollaboration> getCollaborations() {
+        return collaborations;
+    }
+
+    public void setCollaborations(@NotNull List<RestCollaboration> collaborations) {
+        this.collaborations = collaborations;
+    }
+}