validation

service/src/main/java/com/telephoners/krakyournet/ctf/beans/User.java

@@ -8,7 +8,6 @@ public class User extends CouchDbDocument
     private String name;
     private String password;
     private String email;
-    private boolean admin = false;
     private String teamId; //todo: better references
 
     public String getName()
@@ -41,16 +40,6 @@ public class User extends CouchDbDocument
         this.email = email;
     }
 
-    public boolean isAdmin()
-    {
-        return admin;
-    }
-
-    public void setAdmin(boolean admin)
-    {
-        this.admin = admin;
-    }
-
     public String getTeamId()
     {
         return teamId;

service/src/main/java/com/telephoners/krakyournet/ctf/resources/RegistrationResource.java

@@ -9,12 +9,13 @@ import com.telephoners.krakyournet.ctf.repositories.UserRepository;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;
-import javax.ws.rs.GET;
+import javax.ws.rs.POST;
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.MediaType;
 
+import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
+
 @Singleton
 @Path(value = "/register")
 @Produces(MediaType.APPLICATION_JSON)
@@ -27,41 +28,28 @@ public class RegistrationResource
     public RegistrationResource(final UserRepository userRepository,
                                 final TeamRepository teamsRepository)
     {
-        //todo: checkNotNUll
-        this.teamsRepository = teamsRepository;
-        this.userRepository = userRepository;
+        this.teamsRepository = checkNotNull(teamsRepository);
+        this.userRepository = checkNotNull(userRepository);
     }
 
-    @GET
+    @POST
     @Path("/team")
-    public String registerTeam(@QueryParam("teamName") final String teamName)
+    public String registerTeam(final Team team)
     {
-        validateTeamName(teamName);
-
-        Team team = new Team();
-        team.setName(teamName);
-        team.setDescription("descr");
+        validateTeamName(team.getName());
 
         teamsRepository.add(team);
         return team.getId();
     }
 
-    @GET
+    @POST
     @Path("/user")
-    public String register(@QueryParam("userName") final String userName,
-                           @QueryParam("teamId") final String teamId)
+    public String register(final User user)
     {
-        validateTeam(teamId);
-        validateUserName(userName);
+        validateTeam(user.getTeamId());
+        validateUserName(user.getName());
 
-        User user = new User();
-        user.setEmail("gpietrusza@gmail.com");
-        user.setName(userName);
-        user.setPassword("password");
-        user.setAdmin(false);
-        user.setTeamId(teamId);
         userRepository.add(user);
-
         return user.getId();
     }
 

service/src/main/java/com/telephoners/krakyournet/ctf/resources/UtilResource.java

@@ -45,13 +45,13 @@ public class UtilResource
         ImmutableMap.Builder<Object, Object> responseBuilder = ImmutableMap.builder();
         String userName = user.getName();
         responseBuilder.put("userName", userName);
-        if (!user.isAdmin()) {
+//        if (!user.isAdmin()) {
             //todo: fix
 //            Team team = teamsRepository.getTeamByUserName(userName);
 //            responseBuilder.put("teamName", team.getName());
-        } else {
-            responseBuilder.put("isAdmin", true);
-        }
+//        } else {
+//            responseBuilder.put("isAdmin", true);
+//        }
         return Response.ok()
                 .entity(responseBuilder.build())
                 .build();