fix survey commit

gemeinsamforschen/src/main/java/unipotsdam/gf/modules/group/preferences/survey/GroupWorkContext.java

 package unipotsdam.gf.modules.group.preferences.survey;
 
 public enum GroupWorkContext {
-    FL,
-    DOTA,
-    OVERWATCH,
+    fl,
+    dota,
+    overwatch,
 
 }

gemeinsamforschen/src/main/java/unipotsdam/gf/modules/group/preferences/survey/SurveyMapper.java

@@ -93,10 +93,10 @@ public class SurveyMapper {
 
             String discordIdString = "(optional) Enter your discord ID!";
             switch (groupWorkContext) {
-                case FL:
+                case fl:
                     break;
-                case DOTA:
-                case OVERWATCH:
+                case dota:
+                case overwatch:
                     LocalizedText discordQuestion =
                             new LocalizedText("" + discordIdString, "(optional) Geben Sie ihre Discord ID ein!");
                     addGeneralQuestion(DISCORDID, discordQuestion, generalDetails);

gemeinsamforschen/src/main/java/unipotsdam/gf/modules/group/preferences/survey/SurveyView.java

@@ -47,7 +47,8 @@ public class SurveyView {
     @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     @Path("/data/project/{projectId}")
     public SurveyData getSurveyData(@PathParam("projectId") String projectId) throws Exception {
-        return surveyMapper.getItemsFromDB(GroupWorkContext.DOTA, true, new Project(projectId));
+        // TODO change context to dynamic
+        return surveyMapper.getItemsFromDB(GroupWorkContext.dota, true, new Project(projectId));
     }
 
     @GET

gemeinsamforschen/src/main/java/unipotsdam/gf/modules/project/ProjectDAO.java

@@ -49,7 +49,7 @@ public class ProjectDAO {
                 project.setAuthorEmail("julian.dehne@uni-potsdam.de");
             }
             if (project.getGroupWorkContext() == null) {
-                project.setGroupWorkContext(GroupWorkContext.FL);
+                project.setGroupWorkContext(GroupWorkContext.fl);
             }
             connect.connect();
             String mysqlRequest =
@@ -238,7 +238,10 @@ public class ProjectDAO {
                 connect.issueSelectStatement(query, projectContext, Phase.GroupFormation);
 
         boolean next = vereinfachtesResultSet.next();
-        String result = vereinfachtesResultSet.getString("name");
+        String result = null;
+        if (next) {
+            result = vereinfachtesResultSet.getString("name");
+        }
 
         connect.close();
 

gemeinsamforschen/src/test/resources/database/fltrail.sql

@@ -95,7 +95,6 @@ CREATE TABLE `projects` (
   `isSurvey` tinyint(1),
   `context` varchar(100)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-ALTER TABLE projects ADD issurvey BOOLEAN NULL;
 
 CREATE TABLE `projectuser` (
   `projectName` varchar(100) NOT NULL,