teams in conf part 1

service/configuration.yml

@@ -4,13 +4,40 @@ dbName: db
 
 flagHashMethod: "MD5"
 
-users:
-- name: "gpietrus"
-  password: "41b450e73c974fca46911eba84e114f2" #gpietrus md5
-  email: "gpietrusza@gmail.com"
-- name: "mehow"
-  password: "c4d24515428cb3ad50e7840be8718f23" #mehos123 md5
-  email: "mehow@gmail.com"
-- name: "rosiu"
-  password: "188ed9df2dac8e10f5c5fd2e02383765" #rosiu321 md5
-  email: "rosiu@gmail.com"
+teams:
+  - name: "misiaczki"
+    description: "misiaczki opis"
+    members:
+      - name: "gpietrus1"
+        password: "41b450e73c974fca46911eba84e114f2" #gpietrus md5
+        email: "gpietrusza@gmail.com"
+      - name: "mehow1"
+        password: "c4d24515428cb3ad50e7840be8718f23" #mehos123 md5
+        email: "mehow@gmail.com"
+      - name: "rosiu1"
+        password: "188ed9df2dac8e10f5c5fd2e02383765" #rosiu321 md5
+        email: "rosiu@gmail.com"
+  - name: "prosiaczki"
+    description: "prosiaczki opis"
+    members:
+      - name: "gpietrus2"
+        password: "41b450e73c974fca46911eba84e114f2" #gpietrus md5
+        email: "gpietrusza@gmail.com"
+      - name: "mehow2"
+        password: "c4d24515428cb3ad50e7840be8718f23" #mehos123 md5
+        email: "mehow@gmail.com"
+      - name: "rosiu2"
+        password: "188ed9df2dac8e10f5c5fd2e02383765" #rosiu321 md5
+        email: "rosiu@gmail.com"
+  - name: "dupeczki"
+    description: "dupeczki opis"
+    members:
+      - name: "gpietrus3"
+        password: "41b450e73c974fca46911eba84e114f2" #gpietrus md5
+        email: "gpietrusza@gmail.com"
+      - name: "mehow3"
+        password: "c4d24515428cb3ad50e7840be8718f23" #mehos123 md5
+        email: "mehow@gmail.com"
+      - name: "rosiu3"
+        password: "188ed9df2dac8e10f5c5fd2e02383765" #rosiu321 md5
+        email: "rosiu@gmail.com"

service/src/main/java/CTFApplication.java

@@ -16,7 +16,6 @@ import io.dropwizard.auth.basic.BasicCredentials;
 import io.dropwizard.setup.Environment;
 import objects.Flag;
 import objects.Task;
-import objects.Team;
 import objects.User;
 import org.glassfish.jersey.server.filter.RolesAllowedDynamicFeature;
 import repositories.SolutionsRepository;
@@ -24,7 +23,6 @@ import repositories.TasksRepository;
 import repositories.TeamsRepository;
 import repositories.UsersRepository;
 
-import java.util.Random;
 import java.util.UUID;
 
 /**
@@ -40,18 +38,11 @@ public class CTFApplication extends Application<ApplicationConfiguration> {
         MongoDBConnector dbConnector = new MongoDBConnector(applicationConfiguration);
         dbConnector.connect();
 
-        //GENERATE TEAMS
+        //REGISTER TEAMS
 
         TeamsRepository teamsRepository = new TeamsRepository(dbConnector);
         teamsRepository.clean();
-
-        int numberOfNewTeams = new Random().nextInt(5-3)+3;
-
-        for (int i = 0; i < numberOfNewTeams; i++) {
-            teamsRepository.add(new Team(String.valueOf(UUID.randomUUID()), "description", applicationConfiguration.getUsers()));
-        }
-
-        //GENERATE TEAMS END
+        applicationConfiguration.getTeams().forEach(teamsRepository::add);
 
         //GENERATE TASKS
 

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

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

service/src/main/java/objects/Team.java

@@ -26,6 +26,10 @@ public class Team {
                 .collect(Collectors.toList());
     }
 
+    public Team() {
+        //dummy constructor for json
+    }
+
     public List<User> getMembers() {
         return members;
     }

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

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