prod & completion

src/dev/peerat/backend/Configuration.java

@@ -11,6 +11,8 @@ import dev.peerat.backend.utils.Mail;
 
 public class Configuration {
 	
+	private boolean prod;
+
 	private String db_host;
 	private int db_port;
 	private String db_user;
@@ -126,6 +128,10 @@ public class Configuration {
 		writer.close();
 	}
 	
+	public boolean isProduction(){
+		return this.prod;
+	}
+
 	public String getDbHost() {
 		return this.db_host;
 	}

src/dev/peerat/backend/Main.java

@@ -114,9 +114,12 @@ public class Main{
 		Locker<Group> groupLock = new Locker<>();
 		Locker<Completion> leaderboard = new Locker<>();
 		
+		if(config.isProduction())
 			router.
 				register(new Register(repo, playersWaiting, mail)).
-			register(new MailConfirmation(repo, router, config.getUsersFiles(), config.getGitToken(), playersWaiting, mail)).
+				register(new MailConfirmation(repo, router, config.getUsersFiles(), config.getGitToken(), playersWaiting, mail));
+		
+		router.
 			register(new Login(repo, router)).
 			register(new ProfileSettings(repo)).
 			register(new ChangePassword(repo)).

src/dev/peerat/backend/model/Completion.java

@@ -40,7 +40,7 @@ public class Completion{
 		this.score = score;
 
 		if (currentPuzzle != null)
-			addTry(currentPuzzle, response);
+			addTry(currentPuzzle, response, 0);
 		
 		puzzleName = initPuzzleName;
 	}
@@ -62,13 +62,14 @@ public class Completion{
 		return tries;
 	}
 
-	public void addTry(Puzzle currentPuzzle, byte[] response){
+	public void addTry(Puzzle currentPuzzle, byte[] response, int chapter){
 		if (score <= 0){
 			tries++;
+			if(chapter < 4) return;
 			if (response != null && Arrays.equals(currentPuzzle.getSoluce(), response)){
 				if (tries > 1) { // Loose 5% each try with a minimum of 1 for score
-//					score = (int) Math.ceil(currentPuzzle.getScoreMax() * (1 - ((tries - 1) / 20.)));
+					score = (int) Math.ceil(currentPuzzle.getScoreMax() * (1 - ((tries - 1) / 20.)));
-					score = currentPuzzle.getScoreMax();
+//					score = currentPuzzle.getScoreMax();
 					if (score < 1)
 						score = 1;
 				} else

src/dev/peerat/backend/model/Player.java

@@ -190,7 +190,7 @@ public class Player implements Comparable<Player> {
 
 	@Override
 	public int hashCode(){
-		return Objects.hash(email);
+		return Objects.hash(email, pseudo);
 	}
 
 	@Override
@@ -202,6 +202,6 @@ public class Player implements Comparable<Player> {
 		if (getClass() != obj.getClass())
 			return false;
 		Player other = (Player) obj;
-		return Objects.equals(email, other.email);
+		return Objects.equals(email, other.email) && Objects.equals(pseudo, other.pseudo);
 	}
 }

src/dev/peerat/backend/repository/DatabaseRepository.java

@@ -593,7 +593,7 @@ public class DatabaseRepository {
 				insertCompletion(completion);
 			} else {
 				System.out.println(completion);
-				completion.addTry(currentPuzzle, response);
+				completion.addTry(currentPuzzle, response, getChapter(currentPuzzle).getId());
 				int lastUserId = completion.getPlayerId();
 				completion.updatePlayer(userId);
 				updateCompletion(completion, lastUserId);