Commit d31cc80f authored by Grzegorz Pietrusza's avatar Grzegorz Pietrusza

cleanup

parent d07c78a5
package com.telephoners.krakyournet.ctf.repositories; package com.telephoners.krakyournet.ctf.repositories;
import com.google.inject.name.Named;
import com.telephoners.krakyournet.ctf.beans.Flag; import com.telephoners.krakyournet.ctf.beans.Flag;
import com.telephoners.krakyournet.ctf.beans.User; import com.telephoners.krakyournet.ctf.beans.User;
import com.telephoners.krakyournet.ctf.beans.tasks.Task; import com.telephoners.krakyournet.ctf.beans.tasks.Task;
import com.telephoners.krakyournet.ctf.core.ApplicationConfiguration;
import com.telephoners.krakyournet.ctf.core.HashValidator; import com.telephoners.krakyournet.ctf.core.HashValidator;
import com.telephoners.krakyournet.ctf.helpers.DBObjectUtils; import com.telephoners.krakyournet.ctf.helpers.DBObjectUtils;
import javafx.util.Pair; import javafx.util.Pair;
...@@ -12,7 +10,6 @@ import org.mongodb.morphia.Datastore; ...@@ -12,7 +10,6 @@ import org.mongodb.morphia.Datastore;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Singleton; import javax.inject.Singleton;
import java.security.MessageDigest;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
...@@ -20,29 +17,19 @@ import java.util.stream.Collectors; ...@@ -20,29 +17,19 @@ import java.util.stream.Collectors;
@Singleton @Singleton
public class TasksRepository extends Repository<Task> public class TasksRepository extends Repository<Task>
{ {
private ApplicationConfiguration applicationConfiguration;
private Datastore datastore; private Datastore datastore;
private TeamsRepository teamsRepository;
private SolutionsRepository solutionsRepository;
private UsersRepository usersRepository; private UsersRepository usersRepository;
private HashValidator hashValidator; private HashValidator hashValidator;
private MessageDigest messageDigest;
@Inject @Inject
public TasksRepository(ApplicationConfiguration applicationConfiguration, Datastore datastore, public TasksRepository(Datastore datastore,
TeamsRepository teamsRepository, SolutionsRepository solutionsRepository,
UsersRepository usersRepository, UsersRepository usersRepository,
HashValidator hashValidator, HashValidator hashValidator)
final @Named("messageDigest") MessageDigest messageDigest)
{ {
super(datastore); super(datastore);
this.applicationConfiguration = applicationConfiguration;
this.datastore = datastore; this.datastore = datastore;
this.teamsRepository = teamsRepository;
this.solutionsRepository = solutionsRepository;
this.usersRepository = usersRepository; this.usersRepository = usersRepository;
this.hashValidator = hashValidator; this.hashValidator = hashValidator;
this.messageDigest = messageDigest;
} }
public Task getByLevel(int level) public Task getByLevel(int level)
...@@ -72,7 +59,6 @@ public class TasksRepository extends Repository<Task> ...@@ -72,7 +59,6 @@ public class TasksRepository extends Repository<Task>
public Pair<Task, Flag> getTaskFlagPairByHashValue(User user, String userHash, int taskLevel) public Pair<Task, Flag> getTaskFlagPairByHashValue(User user, String userHash, int taskLevel)
{ {
String username = user.getName();
Flag matchedFlag = getByLevel(taskLevel).getFlags().stream() Flag matchedFlag = getByLevel(taskLevel).getFlags().stream()
.filter(flag -> hashValidator.calculateHashValue(user, flag.getValue()).equals(userHash)) .filter(flag -> hashValidator.calculateHashValue(user, flag.getValue()).equals(userHash))
.findFirst() .findFirst()
......
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