Commit 2e3fb55f authored by Grzegorz Pietrusza's avatar Grzegorz Pietrusza

move submit flag to solution resource

parent 6d3e87c3
...@@ -20,10 +20,6 @@ public class SolutionsRepository implements Repository { ...@@ -20,10 +20,6 @@ public class SolutionsRepository implements Repository {
initialize(); initialize();
} }
// public void get(UUID uuid) {
//
// }
public List<Solution> getAll() { public List<Solution> getAll() {
return datastore.createQuery(Solution.class).asList(); return datastore.createQuery(Solution.class).asList();
} }
......
package resources; package resources;
import io.dropwizard.auth.Auth;
import objects.Solution; import objects.Solution;
import objects.User;
import repositories.SolutionsRepository; import repositories.SolutionsRepository;
import repositories.TasksRepository;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Singleton; import javax.inject.Singleton;
import javax.ws.rs.GET; import javax.ws.rs.GET;
import javax.ws.rs.POST;
import javax.ws.rs.Path; import javax.ws.rs.Path;
import javax.ws.rs.Produces; import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.function.Function; import java.util.function.Function;
...@@ -23,10 +28,22 @@ import java.util.stream.Collectors; ...@@ -23,10 +28,22 @@ import java.util.stream.Collectors;
public class SolutionsResource { public class SolutionsResource {
private SolutionsRepository solutionsRepository; private SolutionsRepository solutionsRepository;
private TasksRepository tasksRepository;
@Inject @Inject
public SolutionsResource(SolutionsRepository solutionsRepository) { public SolutionsResource(SolutionsRepository solutionsRepository, TasksRepository tasksRepository) {
this.solutionsRepository = solutionsRepository; this.solutionsRepository = solutionsRepository;
this.tasksRepository = tasksRepository;
}
@POST
public Response submitSolution(@Auth User user,
String flag) throws Exception
{
if (tasksRepository.checkFlag(user.getName(), flag)) {
return Response.ok().build();
}
return Response.status(Response.Status.NOT_ACCEPTABLE).build();
} }
@GET @GET
......
...@@ -43,16 +43,4 @@ public class TasksResource ...@@ -43,16 +43,4 @@ public class TasksResource
} }
return Response.status(Response.Status.UNAUTHORIZED).build(); return Response.status(Response.Status.UNAUTHORIZED).build();
} }
//todo: move to solutions resource
@POST
public Response submitSolution(@Auth User user,
String flag) throws Exception
{
if (tasksRepository.checkFlag(user.getName(), flag)) {
return Response.ok().build();
}
return Response.status(Response.Status.NOT_ACCEPTABLE).build();
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment