Revize 73897ee9

https://kivprogrammers.atlassian.net/browse/TSP2-24 Changes by jirka

src/main/java/cz/zcu/fav/kiv/antipatterndetectionapp/Constants.java

@@ -4 +4 @@
     public static final String ANTI_PATTERN_CATALOGUE_URL = "https://github.com/ReliSA/Software-process-antipatterns-catalogue/blob/master/catalogue/";
     public static final String SUBSTRING_DELIMITER = "||";
     public static final String ANTI_PATTERN_CATALOGUE_URL_RAW = "https://raw.githubusercontent.com/ReliSA/Software-process-antipatterns-catalogue/master/catalogue/";
+
+    public static final String HTML_DELIMITER = "_";
+    public static final String INDENT = "    ";
+    public static final Long DEFAULT_ID = -1L;
+    public static final Integer SUBMIT_TYPES = 3;
 }
+

src/main/java/cz/zcu/fav/kiv/antipatterndetectionapp/utils/Utils.java

@@ -15 +15 @@
 import java.util.*;
 
 public class Utils {
-
+    //[JT] pouzit, nebo zahodit
     private final Logger LOGGER = LoggerFactory.getLogger(Utils.class);
 
     /**
@@ -108 +108 @@
      * @return is valid
      */
     public static boolean checkStringSubstrings(String substrings) {
+        //[JT] prepsat do regexu - tohle je zrudne
         if (substrings.startsWith(Constants.SUBSTRING_DELIMITER)) {
             return false;
         }

src/main/java/cz/zcu/fav/kiv/antipatterndetectionapp/v2/service/ConfigService.java

@@ -1 @@
-package cz.zcu.fav.kiv.antipatterndetectionapp.v2.service;
-import cz.zcu.fav.kiv.antipatterndetectionapp.v2.dials.ConfigurationControllerStatusCodes;
-import cz.zcu.fav.kiv.antipatterndetectionapp.v2.model.Configuration;
-import cz.zcu.fav.kiv.antipatterndetectionapp.v2.model.User;
-import cz.zcu.fav.kiv.antipatterndetectionapp.v2.model.UserConfiguration;
-
-import java.util.List;
-public interface ConfigService {
-    //upload configuration
-    ConfigurationControllerStatusCodes addConfiguration(Configuration cfg);
-    ConfigurationControllerStatusCodes addConfiguration(UserConfiguration cfg);
-
-    ConfigurationControllerStatusCodes pairConfigurationWithUser(User user, Configuration configuration);
-
-
-    List<Configuration> getUserConfigurations(User user);
-
-    Configuration getConfigurationById(int id);
-    String getConfigurationName(int userId, int configurationId);
-
-
-}

src/main/java/cz/zcu/fav/kiv/antipatterndetectionapp/v2/service/configuration/ConfigService.java

@@ +1 @@
+package cz.zcu.fav.kiv.antipatterndetectionapp.v2.service.configuration;
+import cz.zcu.fav.kiv.antipatterndetectionapp.v2.dials.ConfigurationControllerStatusCodes;
+import cz.zcu.fav.kiv.antipatterndetectionapp.v2.model.Configuration;
+import cz.zcu.fav.kiv.antipatterndetectionapp.v2.model.User;
+import cz.zcu.fav.kiv.antipatterndetectionapp.v2.model.UserConfiguration;
+
+import java.util.List;
+public interface ConfigService {
+    //upload configuration
+    ConfigurationControllerStatusCodes addConfiguration(Configuration cfg);
+    ConfigurationControllerStatusCodes addConfiguration(UserConfiguration cfg);
+
+    ConfigurationControllerStatusCodes pairConfigurationWithUser(User user, Configuration configuration);
+
+
+    List<Configuration> getUserConfigurations(User user);
+
+    Configuration getConfigurationById(int id);
+    String getConfigurationName(int userId, int configurationId);
+
+
+}

src/main/java/cz/zcu/fav/kiv/antipatterndetectionapp/v2/service/configuration/ConfigurationServiceImplementation.java

@@ -1 @@
-package cz.zcu.fav.kiv.antipatterndetectionapp.v2.service;
+package cz.zcu.fav.kiv.antipatterndetectionapp.v2.service.configuration;
 
 import cz.zcu.fav.kiv.antipatterndetectionapp.v2.dials.ConfigurationControllerStatusCodes;
 import cz.zcu.fav.kiv.antipatterndetectionapp.v2.model.*;

src/main/java/cz/zcu/fav/kiv/antipatterndetectionapp/v2/service/detection/DetectionServiceImpl.java

@@ -11 +11 @@
 import cz.zcu.fav.kiv.antipatterndetectionapp.v2.service.user.UserService;
 import cz.zcu.fav.kiv.antipatterndetectionapp.v2.service.configuration.ConfigService;
 import cz.zcu.fav.kiv.antipatterndetectionapp.v2.utils.JSONBuilder;
+import cz.zcu.fav.kiv.antipatterndetectionapp.v2.utils.converters.ClassToDto;
+import cz.zcu.fav.kiv.antipatterndetectionapp.v2.utils.converters.ProjectToDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -39 +41 @@
 
     @Override
     public Query getAllProjectsAndAntipatterns() {
-        Query q = new Query(projectService.getAllProjects(), antiPatternService.antiPatternsToModel(antiPatternService.getAllAntiPatterns()));
+        ClassToDto<Project, ProjectDto> classToDto = new ProjectToDto();
+        Query q = new Query(classToDto.convert(projectService.getAllProjects()), antiPatternService.antiPatternsToModel(antiPatternService.getAllAntiPatterns()));
+
         return q;
     }