Bsapp 870

.github/workflows/build.yml

@@ -0,0 +1,32 @@
+name: Build
+on: [push, pull_request]
+jobs:
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
+      - name: Set up JDK 11
+        uses: actions/setup-java@v1
+        with:
+          java-version: 11
+      - name: Cache SonarCloud packages
+        uses: actions/cache@v1
+        with:
+          path: ~/.sonar/cache
+          key: ${{ runner.os }}-sonar
+          restore-keys: ${{ runner.os }}-sonar
+      - name: Cache Maven packages
+        uses: actions/cache@v1
+        with:
+          path: ~/.m2
+          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
+          restore-keys: ${{ runner.os }}-m2
+      - name: Build and analyze
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+        working-directory: ./bogenliga
+        run: mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar

README.md

@@ -1,6 +1,6 @@
-[![Build Status](https://travis-ci.org/exxcellent/swt2-bsa-backend.svg?branch=master)](https://travis-ci.org/exxcellent/swt2-bsa-backend)
-[![sonarcloud](https://sonarcloud.io/api/project_badges/measure?project=de.bogenliga.application&metric=alert_status)](https://sonarcloud.io/dashboard?id=de.bogenliga.application)
-[![sonarcloud_cov](https://sonarcloud.io/api/project_badges/measure?project=de.bogenliga.application&metric=coverage)](https://sonarcloud.io/dashboard?id=de.bogenliga.application)
+[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=exxcellent_swt2-bsa-backend&metric=alert_status)](https://sonarcloud.io/dashboard?id=exxcellent_swt2-bsa-backend)
+[![Coverage](https://sonarcloud.io/api/project_badges/measure?project=exxcellent_swt2-bsa-backend&metric=coverage)](https://sonarcloud.io/dashboard?id=exxcellent_swt2-bsa-backend)
+[![Code Smells](https://sonarcloud.io/api/project_badges/measure?project=exxcellent_swt2-bsa-backend&metric=code_smells)](https://sonarcloud.io/dashboard?id=exxcellent_swt2-bsa-backend)
 
 
 # Bogenliga Application
@@ -34,3 +34,4 @@ Use ```mvnw``` instead of ```mvn``` commands.
 - https://flywaydb.org/documentation/migrations
 - https://flywaydb.org/documentation/maven/
 - https://flywaydb.org/documentation/command/migrate
+-

bogenliga/bogenliga-application/pom.xml

@@ -30,7 +30,11 @@
             <artifactId>bogenliga-business-logic</artifactId>
             <version>${project.version}</version>
         </dependency>
-
+        <dependency>
+            <groupId>de.bogenliga</groupId>
+            <artifactId>bogenliga-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>       
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
@@ -134,6 +138,16 @@
     </profiles>
 
     <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.jacoco</groupId>
+                    <artifactId>jacoco-maven-plugin</artifactId>
+                    <version>0.8.6</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
@@ -146,7 +160,6 @@
                     </execution>
                 </executions>
             </plugin>
-
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>cobertura-maven-plugin</artifactId>
@@ -200,6 +213,26 @@
                 </executions>
             </plugin>
 
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>prepare-agent</id>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>report-aggregate</id>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>report-aggregate</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
             <!-- database migration -->
             <plugin>
                 <groupId>org.flywaydb</groupId>

bogenliga/bogenliga-application/src/main/java/de/bogenliga/application/services/v1/competitionclass/service/CompetitionClassService.java

@@ -3,16 +3,9 @@
 import java.security.Principal;
 import java.util.List;
 import java.util.stream.Collectors;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import de.bogenliga.application.business.competitionclass.api.CompetitionClassComponent;
 import de.bogenliga.application.business.competitionclass.api.types.CompetitionClassDO;
 import de.bogenliga.application.common.service.ServiceFacade;
@@ -41,11 +34,11 @@ public class CompetitionClassService implements ServiceFacade {
     private static final String PRECONDITION_MSG_NAME = "The CompetitionClass must be given a name";
 
 
-    private final Logger LOGGER = LoggerFactory.getLogger(CompetitionClassService.class);
 
     private final CompetitionClassComponent competitionClassComponent;
 
 
+
     /**
      * Constructor with dependency injection
      *
@@ -62,8 +55,7 @@ public CompetitionClassService(final CompetitionClassComponent competitionClassC
      *
      * @return lost of {@link CompetitionClassDTO} as JSON
      */
-    @RequestMapping(method = RequestMethod.GET,
-            produces = MediaType.APPLICATION_JSON_VALUE)
+    @GetMapping(produces = MediaType.APPLICATION_JSON_VALUE)
     @RequiresPermission(UserPermission.CAN_READ_SYSTEMDATEN)
     public List<CompetitionClassDTO> findAll() {
         final List<CompetitionClassDO> competitionClassDOList = competitionClassComponent.findAll();
@@ -77,16 +69,13 @@ public List<CompetitionClassDTO> findAll() {
      * @param id id of the klasse to be returned
      * @return returns a klasse
      */
-    @RequestMapping(
+    @GetMapping(
             value = "{id}",
-            method = RequestMethod.GET,
             produces = MediaType.APPLICATION_JSON_VALUE)
     @RequiresPermission(UserPermission.CAN_READ_SYSTEMDATEN)
     public CompetitionClassDTO findById(@PathVariable("id") final long id){
         Preconditions.checkArgument(id >= 0, PRECONDITION_MSG_KLASSE_ID);
 
-        LOGGER.debug("Receive 'findById' request with ID '{}'", id);
-
         final CompetitionClassDO competitionClassDO = competitionClassComponent.findById(id);
 
         return CompetitionClassDTOMapper.toDTO.apply(competitionClassDO);
@@ -96,23 +85,16 @@ public CompetitionClassDTO findById(@PathVariable("id") final long id){
     /**
      * I persist a new CompetitionClass and return this CompetitionClass entry
      *
-     * @param competitionClassDTO
-     * @param principal
+     * @param competitionClassDTO COmpetition Data to be stored to DB
+     * @param principal user saving data
      *
      * @return list of {@link CompetitionClassDTO} as JSON
      */
-    @RequestMapping(method = RequestMethod.POST,
+    @PostMapping(
             consumes = MediaType.APPLICATION_JSON_VALUE,
             produces = MediaType.APPLICATION_JSON_VALUE)
     @RequiresPermission(UserPermission.CAN_CREATE_SYSTEMDATEN)
     public CompetitionClassDTO create(@RequestBody final CompetitionClassDTO competitionClassDTO, final Principal principal) {
-        LOGGER.debug(
-                "Receive 'create' request with klasseId '{}', klasseName '{}', klasseJahrgangMin '{}', klasseJahrgangMax '{}', klasseNr '{}' ",
-                competitionClassDTO.getId(),
-                competitionClassDTO.getKlasseName(),
-                competitionClassDTO.getKlasseJahrgangMin(),
-                competitionClassDTO.getKlasseJahrgangMax(),
-                competitionClassDTO.getKlasseNr());
 
         checkPreconditions(competitionClassDTO);
 
@@ -127,21 +109,15 @@ public CompetitionClassDTO create(@RequestBody final CompetitionClassDTO competi
 
     /**
      * I persist a newer version of the CompetitionClass in the database.
+     *
      */
-    @RequestMapping(method = RequestMethod.PUT,
+    @PutMapping(
             consumes = MediaType.APPLICATION_JSON_VALUE,
             produces = MediaType.APPLICATION_JSON_VALUE)
     @RequiresPermission(UserPermission.CAN_MODIFY_SYSTEMDATEN)
     public CompetitionClassDTO update(@RequestBody final CompetitionClassDTO competitionClassDTO,
                                       final Principal principal) {
 
-        LOGGER.debug("Receive 'update' request with  id '{}', name '{}', jahrgang_Min '{}', jahrgang_Max '{}', klasseNr '{}'",
-
-                competitionClassDTO.getId(),
-                competitionClassDTO.getKlasseName(),
-                competitionClassDTO.getKlasseJahrgangMin(),
-                competitionClassDTO.getKlasseJahrgangMax(),
-                competitionClassDTO.getKlasseNr());
 
         checkPreconditions(competitionClassDTO);
 

bogenliga/bogenliga-application/src/main/java/de/bogenliga/application/services/v1/configuration/mapper/ConfigurationDTOMapper.java

@@ -27,19 +27,23 @@ private ConfigurationDTOMapper() {
      * I map the {@link ConfigurationDO} object to the {@link ConfigurationDTO} object
      */
     public static final Function<ConfigurationDO, ConfigurationDTO> toDTO = vo -> {
+        final Long id = vo.getId();
         final String key = vo.getKey();
         final String value = vo.getValue();
+        final String regex = vo.getRegex();
 
-        return new ConfigurationDTO(key, value);
+        return new ConfigurationDTO(id, key, value, regex);
     };
 
     /**
      * I map the {@link ConfigurationDTO} object to the {@link ConfigurationDO} object
      */
-    public static final Function<ConfigurationDTO, ConfigurationDO> toVO = dto -> {
+    public static final Function<ConfigurationDTO, ConfigurationDO> toDO = dto -> {
+        final Long id = dto.getId();
         final String key = dto.getKey();
         final String value = dto.getValue();
+        final String regex = dto.getRegex();
 
-        return new ConfigurationDO(key, value);
+        return new ConfigurationDO(id, key, value, regex);
     };
 }

bogenliga/bogenliga-application/src/main/java/de/bogenliga/application/services/v1/configuration/model/ConfigurationDTO.java

@@ -11,9 +11,10 @@
  * @see DataTransferObject
  */
 public class ConfigurationDTO implements DataTransferObject {
+    private Long id;
     private String key;
     private String value;
-
+    private String regex;
 
     /**
      * Constructor
@@ -22,16 +23,28 @@ public ConfigurationDTO() {
         // empty constructor
     }
 
-
     /**
      * Constructor with required fields
      *
      * @param key   of the key-value-pair
      * @param value of the key-value-pair
      */
-    public ConfigurationDTO(final String key, final String value) {
+
+    public ConfigurationDTO(final Long id, final String key, final String value, final String regex){
+        this.id = id;
         this.key = key;
         this.value = value;
+        this.regex = regex;
+    }
+
+
+    public Long getId() {
+        return id;
+    }
+
+
+    public void setId(Long id) {
+        this.id = id;
     }
 
 
@@ -53,4 +66,14 @@ public String getValue() {
     public void setValue(final String value) {
         this.value = value;
     }
+
+
+    public String getRegex() {
+        return regex;
+    }
+
+
+    public void setRegex(String regex) {
+        this.regex = regex;
+    }
 }