Nuova release CapitanOvvio!

.gitignore

@@ -23,3 +23,6 @@
 /nbdist/
 /.nb-gradle/
 /build/
+!/src/test/resources/application.properties
+!/src/main/resources/application.properties
+!/mvn-repository-exported.zip

.travis.yml

@@ -1,14 +1,35 @@
 env:
   global:
-    - CC_TEST_REPORTER_ID=19cd4efa77fdc8ca82e9308787980d32ec2282b88cd4d6f91d00528790b7fa09
-
+  - CC_TEST_REPORTER_ID=19cd4efa77fdc8ca82e9308787980d32ec2282b88cd4d6f91d00528790b7fa09
 cache:
   directories:
-    - $HOME/.m2
-
+  - "$HOME/.m2"
+before_install:
+- sudo apt-get install -y tree
+before_script:
+- curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64
+  > ./cc-test-reporter
+- chmod +x ./cc-test-reporter
+- "./cc-test-reporter before-build"
 language: java
 after_success:
-  - bash <(curl -s https://codecov.io/bash)
+- bash <(curl -s https://codecov.io/bash)
+- JACOCO_SOURCE_PATH=src/main/java
+- cp target/jacoco-ut/jacoco.xml ./jacoco.xml
+- "./cc-test-reporter format-coverage -t jacoco -d --exit-code $TRAVIS_TEST_RESULT"
+- pwd
+- tree -L 3
+- "./cc-test-reporter format-coverage -t jacoco target/jacoco-ut/jacoco.xml"
+- "./cc-test-reporter upload-coverage"
 jdk: oraclejdk8
-
-
+deploy:
+  provider: releases
+  api_key:
+    secure: Yw6wgyCZF0ypJzFtEF75g9iaMNKPduhZiwOjUUuhPBu+fTkQP1nukORGZCE4FPcEnBA3Hu8iN6V5KujPJWduId6mduWUDIfZJwVINmnjLmWtLSeY5rxcA61dzJ789I3l9gtxlmxu/LRlDfntTEW9MSOBvRRIoggE0Vv1MnUyYZZWSmDgwGcrjkTCAp/Cbk/Fg6/+4uD9GOYYX45vwvHFbtCSNgBriWDpxJ5EeBNvhwcP9mVpZ3Mn5JkFQ2Q0MbK6kV8cFYQe0qag6rABrVR181zCaAFejDoiaKHrV7Qr7CYCOCRT45g6Vh2fMnyt0Z4y1kPV2zu2X0GWf6ePn/LGQE0tU/+pJXVILly2yjdkbV8eMfkgHe/X19ruZpQTVQDD6fIKYqZkZo8z32Pz+s++FV0usYGWF6OOmrG+dK2pFLSuQtYZFYvPa+zoCKUuAw0uI9cH+er7SL6nz5wIv6lpofhKsmcYLAhDtqicoLYqlSazPpJ3JM1u0duRIdxBzCczodKNctpNEWHVzMCU2zaQtkjZi3AZBWRDq5Cq6nCOgN0w4O0U4Tys6npKbiLD+EYWIpd21LbB1wj8f2nDxrsW7cE2ViHRedwSkJCdYvvNTnZeabh3C6fAqyNxes5ZCTokxj8al784CQxDI06jw6Hj+i71MwFxZgekMD/1Oqr0RK0=
+  file: "$HOME/target/*.jar"
+  on:
+    repo: tetofonta/academy-backend
+notifications:
+  slack:
+    rooms:
+    - capitanovvio:OzupfbOHX15vJW4vJE1TOIA9#general

pom.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
@@ -8,31 +8,42 @@
         <version>2.1.2.RELEASE</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
-    <groupId>it.myti.accademy</groupId>
+    <groupId>it.myti.academy</groupId>
     <artifactId>backend</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>1.0-RELEASE</version>
     <name>backend</name>
     <description>Backend project for MyTi accademy</description>
 
     <properties>
         <java.version>1.8</java.version>
     </properties>
 
+    <repositories>
+        <repository>
+            <id>myti-local</id>
+            <url>http://localhost:8081/</url>
+        </repository>
+    </repositories>
+
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-web</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>
         </dependency>
-
         <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-devtools</artifactId>
-            <scope>runtime</scope>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-web</artifactId>
         </dependency>
+
+        <!-- TOOLS -->
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
@@ -43,12 +54,27 @@
             <artifactId>lombok</artifactId>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt</artifactId>
+            <version>0.9.0</version>
+        </dependency>
+
         <!-- TEST -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-security</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-test</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

src/main/java/it/myti/academy/backend/BackendApplication.java

@@ -1,5 +1,6 @@
 package it.myti.academy.backend;
 
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
@@ -8,6 +9,7 @@ public class BackendApplication {
 
     public static void main(String[] args) {
         SpringApplication.run(BackendApplication.class, args);
+
     }
 
 }

src/main/java/it/myti/academy/backend/config/CryptConfig.java

@@ -0,0 +1,19 @@
+package it.myti.academy.backend.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+
+/**
+ * Created by david at 2019-03-20
+ */
+@Configuration
+public class CryptConfig {
+
+    @Bean
+    public BCryptPasswordEncoder bCryptPasswordEncoder() {
+        return new BCryptPasswordEncoder();
+    }
+
+
+}

src/main/java/it/myti/academy/backend/config/WebSecurity.java

@@ -0,0 +1,46 @@
+package it.myti.academy.backend.config;
+
+import it.myti.academy.backend.filter.JWTAuthenticationFilter;
+import it.myti.academy.backend.filter.JWTAuthorizationFilter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.http.HttpMethod;
+import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+import org.springframework.security.core.userdetails.UserDetailsService;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+
+
+/**
+ * Created by david at 2019-03-20
+ */
+@EnableWebSecurity
+public class WebSecurity extends WebSecurityConfigurerAdapter{
+    private UserDetailsService userDetailsService;
+    private BCryptPasswordEncoder bCryptPasswordEncoder;
+
+    @Autowired
+    public WebSecurity(@Qualifier("userDetailsServiceImpl") UserDetailsService userDetailsService, BCryptPasswordEncoder bCryptPasswordEncoder) {
+        this.userDetailsService = userDetailsService;
+        this.bCryptPasswordEncoder = bCryptPasswordEncoder;
+    }
+
+    @Override
+    protected void configure(HttpSecurity http) throws Exception {
+        http.csrf().disable().authorizeRequests()
+                .antMatchers("/h2-console/**").permitAll()
+                .antMatchers(HttpMethod.POST, "/utenti/sign-up", "/unitalogistiche/*").permitAll()
+                .anyRequest().authenticated()
+                .and()
+                .addFilter(new JWTAuthenticationFilter(authenticationManager()))
+                .addFilter(new JWTAuthorizationFilter(authenticationManager()));
+        http.headers().frameOptions().disable();
+    }
+
+    @Override
+    public void configure(AuthenticationManagerBuilder auth) throws Exception {
+        auth.userDetailsService(userDetailsService).passwordEncoder(bCryptPasswordEncoder);
+    }
+}

src/main/java/it/myti/academy/backend/controller/ColliController.java

@@ -0,0 +1,48 @@
+package it.myti.academy.backend.controller;
+
+import it.myti.academy.backend.model.Collo;
+import it.myti.academy.backend.model.Utente;
+import it.myti.academy.backend.repository.UtenteRepository;
+import it.myti.academy.backend.service.ColloService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * Created by david at 2019-03-07
+ */
+@RestController
+@RequestMapping("/colli")
+public class ColliController {
+
+    private final ColloService colloService;
+
+    private final UtenteRepository utenteRepository;
+
+    @Autowired
+    public ColliController(ColloService colloService, UtenteRepository utenteRepository) {
+        this.colloService = colloService;
+        this.utenteRepository = utenteRepository;
+    }
+
+    @GetMapping("/")
+    public List<Collo> getByUtente() {
+        List<Collo> returnValue = null;
+
+        Authentication auth = SecurityContextHolder.getContext().getAuthentication();
+        String username = auth.getName();
+        final Utente utente = utenteRepository.findByUsername(username);
+
+        if (utente != null)
+            returnValue = colloService.getSpedizioniAttiveByUtente(utente);
+
+        return returnValue;
+    }
+
+}

src/main/java/it/myti/academy/backend/controller/EventiController.java

@@ -0,0 +1,50 @@
+package it.myti.academy.backend.controller;
+
+import it.myti.academy.backend.model.Evento;
+import it.myti.academy.backend.model.Utente;
+import it.myti.academy.backend.repository.UtenteRepository;
+import it.myti.academy.backend.service.EventoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequestMapping("/eventi")
+public class EventiController {
+
+    private final UtenteRepository utenteRepository;
+    private final EventoService eventi;
+    @Autowired
+    public EventiController(UtenteRepository utenteRepository, EventoService eventi) {
+        this.utenteRepository = utenteRepository;
+        this.eventi = eventi;
+    }
+
+    @GetMapping("/")
+    public List<Evento> getByUtente(@RequestParam Map<String, String> params) {
+        Authentication auth = SecurityContextHolder.getContext().getAuthentication();
+        String username = auth.getName();
+        final Utente utente = utenteRepository.findByUsername(username);
+        if (utente != null) {
+            Long spedizione = null;
+            Long ul = null;
+            try {
+                spedizione = params.get("idSpedizione") != null ? Long.parseLong(params.get("idSpedizione")) : null;
+                ul = params.get("idUnitaLogistica") != null ? Long.parseLong(params.get("idUnitaLogistica")) : null;
+            } catch (NumberFormatException e) {
+                spedizione = null;
+                ul = null;
+            }
+            return eventi.getEventiByUtente(utente, spedizione, ul);
+        }
+        return null;
+    }
+
+}

src/main/java/it/myti/academy/backend/controller/UnitaLogisticheController.java

@@ -0,0 +1,47 @@
+package it.myti.academy.backend.controller;
+
+import it.myti.academy.backend.model.UnitaLogistica;
+import it.myti.academy.backend.model.Utente;
+import it.myti.academy.backend.model.resp.UnitaLogisticaDettaglio;
+import it.myti.academy.backend.repository.UtenteRepository;
+import it.myti.academy.backend.service.UnitaLogisticaService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/unitalogistiche")
+public class UnitaLogisticheController {
+
+    private final UtenteRepository utenteRepository;
+    private final UnitaLogisticaService uls;
+
+    @Autowired
+    public UnitaLogisticheController(UtenteRepository utenteRepository, UnitaLogisticaService uls) {
+        this.utenteRepository = utenteRepository;
+        this.uls = uls;
+    }
+
+    @GetMapping("/")
+    public List<UnitaLogistica> getByUtente() {
+        Authentication auth = SecurityContextHolder.getContext().getAuthentication();
+        String username = auth.getName();
+        final Utente utente = utenteRepository.findByUsername(username);
+
+        if (utente != null)
+            return uls.getUnitaLogisticheInViaggioByUtente(utente);
+        return null;
+    }
+
+    @GetMapping("/{id}")
+    public UnitaLogisticaDettaglio getById(@PathVariable("id") long id) {
+        return uls.getUnitaLogisticaDetail(id);
+    }
+
+}