Merge pull request #34 from labens-ufrn/estimate_count

Adicionando contagem estimativa e outros ajustes.

Author: tacianosilva

.travis.yml

@@ -1,7 +1,7 @@
 language: java
 
 jdk:
-  - openjdk8
+  - openjdk11
 
 cache:
   directories:

README.md

@@ -4,6 +4,13 @@
 
 Sistema para facilitar a contagem na análise por pontos de função (APF) desenvolvido para ser utilizado nas disciplinas de Engenharia de Software do curso de Bacharelado em Sistemas de Informação do CERES/UFRN.
 
+## Documentação do Projeto
+
+* Plano de Iteração
+* Documento de Visão
+* Lista de User Stories
+* Contagem de Tamanho Funcional com Análise por Pontos de Função
+
 ## Padrões de Codificação
 
 * Insert spaces for tabs
@@ -60,4 +67,4 @@ Desenvolvido a partir do tutorial e do código linkado abaixo:
 
 ### Tutoriais
 
-Na página [Tutoriais](Tutorials.md) temos a lista de tutoriais consultados.
+Na página [Tutoriais](docs/Tutorials.md) temos a lista de tutoriais consultados.

BussinessRules.md renamed to docs/BussinessRules.md

@@ -82,6 +82,12 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
             <version>2.1.5.RELEASE</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-logging</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -128,11 +134,10 @@
             <version>2.3.0</version>
         </dependency>
 
-        <!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core -->
         <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-core</artifactId>
-            <version>2.13.2</version>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-log4j2</artifactId>
+            <version>2.1.5.RELEASE</version>
         </dependency>
 
         <dependency>
@@ -211,14 +216,15 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.22.0</version>
+                    <version>2.22.2</version>
                     <configuration>
                         <includes>
                             <include>**/*Tests.java</include>
                             <include>**/*Test.java</include>
                         </includes>
                         <excludes>
                             <exclude>**/Abstract*.java</exclude>
+                            <exclude>**/ContagemTest.java</exclude>
                         </excludes>
                     </configuration>
                 </plugin>
@@ -256,13 +262,16 @@
                 <configuration>
                     <dependencyDetailsEnabled>true</dependencyDetailsEnabled>
                 </configuration>
-                <!-- <reportSets> <reportSet> <reports> <report>dependencies</report>
+                <!-- <reportSets> <reportSet> <reports> <report>dependencies</report> 
                     <report>scm</report> </reports> </reportSet> </reportSets> -->
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <version>3.0.0</version>
+                <configuration>
+                    <source>1.8</source>
+                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

Tutorials.md renamed to docs/Tutorials.md

@@ -0,0 +1,39 @@
+package br.ufrn.dct.apf.configuration;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.jdbc.DataSourceBuilder;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+import javax.sql.DataSource;
+
+
+@Configuration
+public class WebMvcConfig implements WebMvcConfigurer {
+
+    @Value("${spring.datasource.url}")
+    private String jdbcURl;
+
+    @Value("${spring.datasource.username}")
+    private String dbUsername;
+
+    @Value("${spring.datasource.password}")
+    private String dbPassword;
+
+    @Bean
+    public BCryptPasswordEncoder passwordEncoder() {
+        return new BCryptPasswordEncoder();
+    }
+
+    @Bean
+    public DataSource getDataSource() {
+        DataSourceBuilder<?> dataSourceBuilder = DataSourceBuilder.create();
+        dataSourceBuilder.driverClassName("com.mysql.jdbc.Driver");
+        dataSourceBuilder.url(jdbcURl);
+        dataSourceBuilder.username(dbUsername);
+        dataSourceBuilder.password(dbPassword);
+        return dataSourceBuilder.build();
+    }
+}

pom.xml

@@ -9,8 +9,6 @@
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.web.servlet.ModelAndView;
 
-import br.ufrn.dct.apf.dto.DataFunctionDTO;
-import br.ufrn.dct.apf.model.DataFunction;
 import br.ufrn.dct.apf.model.Role;
 import br.ufrn.dct.apf.model.User;
 import br.ufrn.dct.apf.service.UserService;
@@ -72,33 +70,4 @@ protected String getRoles(User user) {
         bld.append("]");
         return bld.toString();
     }
-    
-    protected DataFunction convertToEntity(DataFunctionDTO dfDTO) {
-        DataFunction df = new DataFunction();
-        if (dfDTO.getType().equals(DataFunction.TYPE_ILF)) {
-            df = DataFunction.createILF(dfDTO.getName());
-        }
-        if (dfDTO.getType().equals(DataFunction.TYPE_EIF)) {
-            df = DataFunction.createEIF(dfDTO.getName());
-        }
-        df.setRecordElementTypes(dfDTO.getRecordElementTypes());
-        df.setDataElementTypes(dfDTO.getDataElementTypes());
-        df.setProject(dfDTO.getProject());
-        df.setUserStory(dfDTO.getUserStory());
-        
-        return df;
-    }
-    
-    protected DataFunctionDTO convertToDto(DataFunction df) {
-        DataFunctionDTO dto = new DataFunctionDTO();
-        dto.setId(df.getId());
-        dto.setName(df.getName());
-        dto.setType(df.getType());
-        dto.setRecordElementTypes(df.getRecordElementTypes());
-        dto.setDataElementTypes(df.getDataElementTypes());
-        dto.setProject(df.getProject());
-        dto.setUserStory(df.getUserStory());
-        
-        return dto;
-    }
 }

src/main/java/br/ufrn/dct/apf/configuration/WebMvcConfig.java

@@ -6,7 +6,8 @@
 
 import javax.validation.Valid;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.validation.BindingResult;
@@ -16,7 +17,6 @@
 import org.springframework.web.servlet.ModelAndView;
 
 import br.ufrn.dct.apf.dto.DataFunctionDTO;
-import br.ufrn.dct.apf.model.DataFunction;
 import br.ufrn.dct.apf.model.Project;
 import br.ufrn.dct.apf.model.User;
 import br.ufrn.dct.apf.model.UserStory;
@@ -29,7 +29,7 @@ public class DataFunctionController extends AbstractController {
     /**
      * Logger.
      */
-    private static final Logger LOGGER = Logger.getLogger(DataFunctionController.class.getName());
+    private static final Logger logger = LogManager.getLogger(DataFunctionController.class);
 
     @Autowired
     private DataFunctionService service;
@@ -95,7 +95,7 @@ public ModelAndView list() {
     public ModelAndView save(@Valid DataFunctionDTO dfDto, BindingResult result) {
 
         if (result.hasErrors()) {
-            LOGGER.error("error.df.controller.save");
+            logger.error("error.df.controller.save");
             return add(dfDto);
         }
 
@@ -107,8 +107,8 @@ public ModelAndView save(@Valid DataFunctionDTO dfDto, BindingResult result) {
             p = projects.get(0);
             dfDto.setProject(p);
         }
-        DataFunction df = convertToEntity(dfDto);
-        service.save(df);
+
+        service.save(dfDto);
 
         DataFunctionDTO newDF = new DataFunctionDTO();
         newDF.setProject(p);

src/main/java/br/ufrn/dct/apf/controller/AbstractController.java

@@ -12,6 +12,7 @@
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.servlet.ModelAndView;
 
+import br.ufrn.dct.apf.count.EstimativeCount;
 import br.ufrn.dct.apf.count.IndicativeCount;
 import br.ufrn.dct.apf.model.User;
 import br.ufrn.dct.apf.service.ProjectService;
@@ -98,7 +99,8 @@ public ModelAndView dashboard() {
         setUserAuth(mv);
 
         mv.addObject("projects", projectService.findByIsPrivateFalse());
-        mv.addObject("counter", new IndicativeCount());
+        mv.addObject("icounter", new IndicativeCount());
+        mv.addObject("ecounter", new EstimativeCount());
 
         return mv;
     }

src/main/java/br/ufrn/dct/apf/controller/DataFunctionController.java

@@ -5,8 +5,8 @@
 
 import javax.validation.Valid;
 
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.validation.BindingResult;
@@ -28,7 +28,7 @@ public class ProjectController extends AbstractController {
     /**
      * Logger.
      */
-    private static final Logger LOGGER = Logger.getLogger(ProjectService.class.getName());
+    private static final Logger logger = LogManager.getLogger(ProjectController.class);
 
     @Autowired
     private ProjectService service;
@@ -91,7 +91,7 @@ public ModelAndView save(@Valid Project project, BindingResult result) {
         try {
             service.save(project, user);
         } catch (BusinessRuleException e) {
-            LOGGER.error("error.project.controller.save", e);
+            logger.error("error.project.controller.save", e);
             modelAndView.addObject("errorMessage", "User has been registered successfully");
         }
 
@@ -109,7 +109,7 @@ public ModelAndView save(@Valid Project project, BindingResult result) {
     @GetMapping(value = "/project/suggestion", produces = "application/json")
     @ResponseBody
     public ProjectSuggestionWrapper autocompleteSuggestions(@RequestParam("searchstr") String searchstr) {
-        LOGGER.log(Level.INFO, "searchstr = "+ searchstr);
+        logger.debug("searchstr = "+ searchstr);
 
         List<ProjectSuggestion> suggestions = new ArrayList<>();
         User current = getCurrentUser();

src/main/java/br/ufrn/dct/apf/controller/LoginController.java

@@ -0,0 +1,118 @@
+package br.ufrn.dct.apf.controller;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import javax.validation.Valid;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.servlet.ModelAndView;
+
+import br.ufrn.dct.apf.dto.TransactionFunctionDTO;
+import br.ufrn.dct.apf.model.Project;
+import br.ufrn.dct.apf.model.User;
+import br.ufrn.dct.apf.model.UserStory;
+import br.ufrn.dct.apf.service.TransactionFunctionService;
+import br.ufrn.dct.apf.service.ProjectService;
+
+@Controller
+public class TransactionFunctionController extends AbstractController {
+
+    /**
+     * Logger.
+     */
+    private static final Logger logger = LogManager.getLogger(TransactionFunctionController.class);
+
+    @Autowired
+    private TransactionFunctionService service;
+
+    @Autowired
+    private ProjectService projectService;
+
+    @GetMapping("/tf/add/{projectId}")
+    public ModelAndView add(TransactionFunctionDTO tf, @PathVariable("projectId") Long id) {
+        ModelAndView mv = new ModelAndView("tf/add");
+        
+        Project project = projectService.findOne(id);
+        tf.setProject(project);
+        Set<UserStory> userStories = project.getUserStories();
+        UserStory userStory = new UserStory();
+
+        mv.addObject("project", project);
+        mv.addObject("userStories", userStories);
+        mv.addObject("userStory", userStory);
+
+        mv.addObject("tfDTO", tf);
+
+        return mv;
+    }
+
+    @GetMapping("/tf/add")
+    public ModelAndView add(TransactionFunctionDTO tf) {
+        ModelAndView mv = new ModelAndView("tf/add");
+        setUserAuth(mv);
+
+        Project project = new Project();
+        Set<UserStory> userStories = new HashSet<>();
+        UserStory userStory = new UserStory();
+        if (tf != null && tf.getProject() != null) {
+            project = projectService.findOne(tf.getProject().getId());
+            tf.setProject(project);
+            userStories = project.getUserStories();
+        }
+
+        mv.addObject("project", project);
+        mv.addObject("userStories", userStories);
+        mv.addObject("userStory", userStory);
+
+        mv.addObject("tfDTO", tf);
+
+        return mv;
+    }
+
+    @GetMapping("/tf/list")
+    public ModelAndView list() {
+        ModelAndView mv = new ModelAndView("tf/list");
+
+        User current = getCurrentUser();
+
+        List<Project> projects = projectService.findByUserId(current.getId());
+
+        mv.addObject("projects", projects);
+
+        return mv;
+    }
+
+    @PostMapping("/tf/save")
+    public ModelAndView save(@Valid TransactionFunctionDTO tfDto, BindingResult result) {
+
+        if (result.hasErrors()) {
+            logger.error("error.df.controller.save");
+            return add(tfDto);
+        }
+
+        User current = getCurrentUser();
+
+        List<Project> projects = projectService.findByName(current.getId(), tfDto.getProject().getName());
+        Project p = null;
+        if (!projects.isEmpty()) {
+            p = projects.get(0);
+            tfDto.setProject(p);
+        }
+
+        service.save(tfDto);
+
+        TransactionFunctionDTO newTF = new TransactionFunctionDTO();
+        newTF.setProject(p);
+
+        return add(newTF);
+    }
+}