users in configuration

service/configuration.yml

@@ -5,6 +5,12 @@ dbName: db
 flagHashMethod: "MD5"
 
 users:
-    - gpietrus
-    - mehow
-    - rosiu
+- name: "gpietrus"
+  password: "gpietrus"
+  email: "gpietrusza@gmail.com"
\ No newline at end of file
+- name: "mehow"
+  password: "mehow123"
+  email: "mehow@gmail.com"
+- name: "rosiu"
+  password: "rosiu321"
+  email: "rosiu@gmail.com"

service/src/main/java/CTFApplication.java

@@ -24,7 +24,7 @@ import repositories.TasksRepository;
 import repositories.TeamsRepository;
 import repositories.UsersRepository;
 
-import java.util.ArrayList;
+import java.util.Random;
 import java.util.UUID;
 
 /**
@@ -45,18 +45,10 @@ public class CTFApplication extends Application<ApplicationConfiguration> {
         TeamsRepository teamsRepository = new TeamsRepository(dbConnector);
         teamsRepository.clean();
 
-        int numberOfNewTeams = 1;//new Random().nextInt(20);
-        int numberOfTeamMembers = 1;
+        int numberOfNewTeams = new Random().nextInt(5-3)+3;
 
         for (int i = 0; i < numberOfNewTeams; i++) {
-
-            ArrayList<User> members = new ArrayList<>();
-            for (int j = 0; j < numberOfTeamMembers; j++) {
-                members.add(new User("gpietrus", "passwd", "email"));
-//                members.add(new User(String.valueOf(UUID.randomUUID()), "passwd", "email"));
-            }
-
-            teamsRepository.add(new Team(String.valueOf(UUID.randomUUID()), "description", members));
+            teamsRepository.add(new Team(String.valueOf(UUID.randomUUID()), "description", applicationConfiguration.getUsers()));
         }
 
         //GENERATE TEAMS END

service/src/main/java/core/ApplicationConfiguration.java

 package core;
 
 import io.dropwizard.Configuration;
+import objects.User;
 
 import java.util.List;
 
@@ -14,17 +15,17 @@ public class ApplicationConfiguration extends Configuration {
 
     private String flagHashMethod;
 
-    private List<String> users;
+    private List<User> users;
 
     public String getFlagHashMethod() {
         return flagHashMethod;
     }
 
-    public List<String> getUsers() {
+    public List<User> getUsers() {
         return users;
     }
 
-    public void setUsers(List<String> users) {
+    public void setUsers(List<User> users) {
         this.users = users;
     }
 

service/src/main/java/objects/User.java

@@ -20,8 +20,12 @@ public class User implements Principal {
         this.email = document.get("password").toString();
     }
 
-    public User(String username, String password, String email) {
-        this.name = username;
+    public User() {
+        //dummy constructor for json
+    }
+
+    public User(String name, String password, String email) {
+        this.name = name;
         this.password = password;
         this.email = email;
     }