solutions refactored

service/src/main/java/api/SolutionsResource.java

@@ -37,7 +37,7 @@ public class SolutionsResource {
                 .collect(Collectors.groupingBy(new Function<Solution, String>() {
                     @Override
                     public String apply(Solution solution) {
-                        return solution.getTaskId();
+                        return solution.getTaskName();
                     }
                 }))
                 .entrySet()

service/src/main/java/objects/Solution.java

@@ -2,23 +2,29 @@ package objects;
 
 import com.google.common.collect.ImmutableMap;
 import org.bson.Document;
+import org.bson.types.ObjectId;
+import org.mongodb.morphia.annotations.Entity;
 
 import java.util.Map;
 
 /**
  * Created by gpietrus on 20.02.2016.
  */
+@Entity("solutions")
 public class Solution {
-    private String taskId;
+    private ObjectId id;
+    private String taskName;
     private String teamId;
 
-    public Solution(String teamId, String taskId) {
+    public Solution(String teamId, String taskName) {
         this.teamId = teamId;
-        this.taskId = taskId;
+        this.taskName = taskName;
     }
 
-    public String getTaskId() {
-        return taskId;
+    public Solution() {}
+
+    public String getTaskName() {
+        return taskName;
     }
 
     public String getTeamId() {
@@ -26,7 +32,7 @@ public class Solution {
     }
 
     public Solution(Document document) {
-        this.taskId = document.get("taskId").toString(); //todo: refactor mapping
+        this.taskName = document.get("taskName").toString(); //todo: refactor mapping
         this.teamId = document.get("teamId").toString();
     }
 
@@ -34,7 +40,7 @@ public class Solution {
     public Map<String, String> toMap() {
         return ImmutableMap.<String, String>builder()
                 .put("teamId",teamId)
-                .put("taskId", taskId)
+                .put("taskName", taskName)
                 .build();
     }
 }

service/src/main/java/repositories/SolutionsRepository.java

@@ -5,9 +5,6 @@ import org.mongodb.morphia.Datastore;
 
 import javax.inject.Inject;
 import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
 
 /**
  * Created by gpietrus on 20.02.2016.
@@ -25,25 +22,15 @@ public class SolutionsRepository implements Repository {
 //    }
 
     public List<Solution> getAll() {
-        return null; //todo
-       /* return mongoDBConnector.getCollection("solutions")
-                .stream()
-                .map(Solution::new)
-                .collect(Collectors.toList());*/ //todo: revert
+        return datastore.createQuery(Solution.class).asList();
     }
 
     public void add(Solution solution) { //todo
-        //todo: object/string
-        Map<String, Object> retypedMap = solution.toMap().entrySet().stream()
-                .collect(Collectors.toMap(
-                        (Function<Map.Entry<String, String>, String>) Map.Entry::getKey,
-                        (Function<Map.Entry<String, String>, Object>) Map.Entry::getValue
-                ));
-//        mongoDBConnector.addDocument("solutions", new Document(retypedMap)); //todo: revert
+        datastore.save(solution); //todo: error handling?
     }
 
     public void clean() {
-//        mongoDBConnector.removeCollection("solutions"); //todo: revert
+        datastore.getCollection(Solution.class).drop();
     }
 }
 

service/src/main/java/repositories/UsersRepository.java

@@ -40,6 +40,9 @@ public class UsersRepository implements Repository {
 //    }
 
     public Optional<User> authenticateUser(BasicCredentials basicCredentials) {
+
+
+
         return null;
         /*
         Optional<User> userOptional = teamsRepository.getAll()