Serviços separados em módulo independente

.docker/postgresql.yml

@@ -24,7 +24,7 @@ services:
     volumes:
       - apsso-test-pgdata:/var/lib/postgresql/data
     ports:
-      - 54320:5432
+      - 5433:5432
 
 volumes:
   apsso-pgdata:

.github/workflows/build.yml

@@ -18,7 +18,7 @@ jobs:
           POSTGRES_USER: apsso-dbuser
           POSTGRES_PASSWORD: apsso-dbpasswd
         ports:
-          - 54320:5432
+          - 5433:5432
 
     steps:
 
@@ -70,4 +70,4 @@ jobs:
       - name: Push da imagem docker do backend do módulo administrativo
         run: |
           docker push ghcr.io/andrepenteado/apsso/apsso-backend:latest
-          docker push ghcr.io/andrepenteado/apsso/apsso-backend:${{ env.VERSAO }}
+          docker push ghcr.io/andrepenteado/apsso/apsso-backend:${{ env.VERSAO }}

.gitignore

@@ -36,3 +36,4 @@ nbactions.xml
 /frontend/node_modules/
 /frontend/.angular/
 /frontend/frontend.iml
+/services/target/

.run/apsso-debug.run.xml → .run/APsso Debug.run.xml

@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="apsso-debug" type="Remote">
+  <configuration default="false" name="APsso Debug" type="Remote">
     <option name="USE_SOCKET_TRANSPORT" value="true" />
     <option name="SERVER_MODE" value="false" />
     <option name="SHMEM_ADDRESS" />

.run/Backend UP.run.xml

@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Backend UP" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
-    <option name="ALTERNATIVE_JRE_PATH" value="corretto-21" />
+    <option name="ALTERNATIVE_JRE_PATH" value="Amazon Corretto JDK 21" />
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
     <module name="backend" />
     <option name="SPRING_BOOT_MAIN_CLASS" value="com.github.andrepenteado.apsso.backend.ApssoBackendApplication" />

backend/pom.xml

@@ -28,6 +28,11 @@
             <groupId>org.flywaydb</groupId>
             <artifactId>flyway-core</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.github.andrepenteado.sso</groupId>
+            <artifactId>services</artifactId>
+            <version>${project.version}</version>
+        </dependency>
 
         <!-- Testes -->
         <dependency>
@@ -64,4 +69,4 @@
         </plugins>
     </build>
 
-</project>
+</project>

backend/src/main/java/com/github/andrepenteado/apsso/backend/ApssoBackendApplication.java

@@ -2,34 +2,26 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.domain.EntityScan;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Profile;
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.security.config.Customizer;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
 import org.springframework.security.web.SecurityFilterChain;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.cors.CorsConfiguration;
 
-@SpringBootApplication
+@SpringBootApplication(scanBasePackages = "com.github.andrepenteado.apsso")
+@EntityScan(basePackages = "com.github.andrepenteado.apsso")
+@EnableJpaRepositories(basePackages = "com.github.andrepenteado.apsso")
 public class ApssoBackendApplication {
 
     public static void main(String[] args) {
 		SpringApplication.run(ApssoBackendApplication.class, args);
 	}
 
-    public static String validateModel(BindingResult validacao) {
-        String result = null;
-        if (validacao.hasErrors()) {
-            final StringBuilder errosFinal = new StringBuilder();
-            validacao.getFieldErrors().forEach(msg -> {
-                errosFinal.append(msg.getDefaultMessage());
-            });
-            result = errosFinal.toString();
-        }
-        return result;
-    }
-
     @Bean
     @Profile("!test")
     SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {

backend/src/main/java/com/github/andrepenteado/apsso/backend/resources/SistemaResource.java

@@ -1,9 +1,9 @@
 package com.github.andrepenteado.apsso.backend.resources;
 
-import com.github.andrepenteado.apsso.backend.models.PerfilSistema;
-import com.github.andrepenteado.apsso.backend.models.Sistema;
-import com.github.andrepenteado.apsso.backend.services.PerfilSistemaService;
-import com.github.andrepenteado.apsso.backend.services.SistemaService;
+import com.github.andrepenteado.apsso.services.PerfilSistemaService;
+import com.github.andrepenteado.apsso.services.SistemaService;
+import com.github.andrepenteado.apsso.services.models.PerfilSistema;
+import com.github.andrepenteado.apsso.services.models.Sistema;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

backend/src/main/java/com/github/andrepenteado/apsso/backend/resources/UsuarioResource.java

@@ -1,7 +1,7 @@
 package com.github.andrepenteado.apsso.backend.resources;
 
-import com.github.andrepenteado.apsso.backend.models.Usuario;
-import com.github.andrepenteado.apsso.backend.services.UsuarioService;
+import com.github.andrepenteado.apsso.services.UsuarioService;
+import com.github.andrepenteado.apsso.services.models.Usuario;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

backend/src/test/java/com/github/andrepenteado/apsso/backend/resources/SistemaResourceTest.java

@@ -2,8 +2,8 @@
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.github.andrepenteado.apsso.backend.models.PerfilSistema;
-import com.github.andrepenteado.apsso.backend.models.Sistema;
+import com.github.andrepenteado.apsso.services.models.PerfilSistema;
+import com.github.andrepenteado.apsso.services.models.Sistema;
 import com.github.springtestdbunit.DbUnitTestExecutionListener;
 import com.github.springtestdbunit.annotation.DatabaseSetup;
 import org.junit.jupiter.api.DisplayName;
@@ -182,4 +182,4 @@ void testExcluirPerfil() throws Exception {
                 .accept(MediaType.APPLICATION_JSON))
             .andExpect(status().isNotFound());*/
     }
-}
+}

backend/src/test/java/com/github/andrepenteado/apsso/backend/resources/UsuarioResourceTest.java

@@ -2,9 +2,9 @@
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.github.andrepenteado.apsso.backend.models.PerfilSistema;
-import com.github.andrepenteado.apsso.backend.models.Sistema;
-import com.github.andrepenteado.apsso.backend.models.Usuario;
+import com.github.andrepenteado.apsso.services.models.PerfilSistema;
+import com.github.andrepenteado.apsso.services.models.Sistema;
+import com.github.andrepenteado.apsso.services.models.Usuario;
 import com.github.springtestdbunit.DbUnitTestExecutionListener;
 import com.github.springtestdbunit.annotation.DatabaseSetup;
 import org.junit.jupiter.api.DisplayName;
@@ -175,4 +175,4 @@ void testExcluir() throws Exception {
                 .accept(MediaType.APPLICATION_JSON))
             .andExpect(status().isNotFound());*/
     }
-}
+}

backend/src/test/resources/application.yml

@@ -1,7 +1,7 @@
 spring:
 
   datasource:
-    url: jdbc:postgresql://localhost:54320/apsso-dbname?autoReconnect=true
+    url: jdbc:postgresql://localhost:5433/apsso-dbname?autoReconnect=true
     username: apsso-dbuser
     password: apsso-dbpasswd
     driver-class-name: org.postgresql.Driver

login/pom.xml

@@ -30,6 +30,11 @@
             <artifactId>jakarta.servlet.jsp.jstl</artifactId>
             <version>3.0.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.github.andrepenteado.sso</groupId>
+            <artifactId>services</artifactId>
+            <version>${project.version}</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -42,4 +47,4 @@
         </plugins>
     </build>
 
-</project>
+</project>

login/src/main/java/com/github/andrepenteado/apsso/login/ApssoLoginApplication.java

@@ -2,9 +2,13 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.domain.EntityScan;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 
-@SpringBootApplication
+@SpringBootApplication(scanBasePackages = "com.github.andrepenteado.apsso")
+@EntityScan(basePackages = "com.github.andrepenteado.apsso")
+@EnableJpaRepositories(basePackages = "com.github.andrepenteado.apsso")
 public class ApssoLoginApplication extends SpringBootServletInitializer {
 
     public static void main(String[] args) {

backend/src/main/java/com/github/andrepenteado/apsso/backend/resources/AuthResource.java → login/src/main/java/com/github/andrepenteado/apsso/login/resources/AuthResource.java

@@ -1,9 +1,12 @@
-package com.github.andrepenteado.apsso.backend.resources;
+package com.github.andrepenteado.apsso.login.resources;
 
-import com.github.andrepenteado.apsso.backend.models.Usuario;
-import com.github.andrepenteado.apsso.backend.services.UsuarioService;
+import com.github.andrepenteado.apsso.services.UsuarioService;
+import com.github.andrepenteado.apsso.services.models.Usuario;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.domain.EntityScan;
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.security.core.Authentication;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;

pom.xml

@@ -41,6 +41,7 @@
     </properties>
 
     <modules>
+        <module>services</module>
         <module>login</module>
         <module>backend</module>
     </modules>
@@ -50,6 +51,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-security</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>

services/pom.xml

@@ -0,0 +1,40 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.github.andrepenteado.sso</groupId>
+    <artifactId>services</artifactId>
+    <packaging>jar</packaging>
+
+    <name>Biblioteca de Serviços</name>
+    <description>Biblioteca compartilhada de serviços dos módulos</description>
+
+    <organization>
+        <name>APcode</name>
+        <url>http://www.apcode.com.br</url>
+    </organization>
+
+    <developers>
+        <developer>
+            <name>André Penteado</name>
+            <email>andre.penteado@apcode.com.br</email>
+            <organization>APcode</organization>
+        </developer>
+    </developers>
+
+    <parent>
+        <groupId>com.github.andrepenteado</groupId>
+        <artifactId>apsso</artifactId>
+        <version>2.0.0</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>

backend/src/main/java/com/github/andrepenteado/apsso/backend/services/PerfilSistemaService.java → services/src/main/java/com/github/andrepenteado/apsso/services/PerfilSistemaService.java

@@ -1,6 +1,7 @@
-package com.github.andrepenteado.apsso.backend.services;
+package com.github.andrepenteado.apsso.services;
 
-import com.github.andrepenteado.apsso.backend.models.PerfilSistema;
+import com.github.andrepenteado.apsso.services.models.PerfilSistema;
+import org.springframework.stereotype.Service;
 import org.springframework.validation.BindingResult;
 
 import java.util.List;

backend/src/main/java/com/github/andrepenteado/apsso/backend/services/SistemaService.java → services/src/main/java/com/github/andrepenteado/apsso/services/SistemaService.java

@@ -1,6 +1,7 @@
-package com.github.andrepenteado.apsso.backend.services;
+package com.github.andrepenteado.apsso.services;
 
-import com.github.andrepenteado.apsso.backend.models.Sistema;
+import com.github.andrepenteado.apsso.services.models.Sistema;
+import org.springframework.stereotype.Service;
 import org.springframework.validation.BindingResult;
 
 import java.util.List;

backend/src/main/java/com/github/andrepenteado/apsso/backend/services/UsuarioService.java → services/src/main/java/com/github/andrepenteado/apsso/services/UsuarioService.java

@@ -1,6 +1,7 @@
-package com.github.andrepenteado.apsso.backend.services;
+package com.github.andrepenteado.apsso.services;
 
-import com.github.andrepenteado.apsso.backend.models.Usuario;
+import com.github.andrepenteado.apsso.services.models.Usuario;
+import org.springframework.stereotype.Service;
 import org.springframework.validation.BindingResult;
 
 import java.util.List;

services/src/main/java/com/github/andrepenteado/apsso/services/Util.java

@@ -0,0 +1,19 @@
+package com.github.andrepenteado.apsso.services;
+
+import org.springframework.validation.BindingResult;
+
+public class Util {
+
+    public static String validateModel(BindingResult validacao) {
+        String result = null;
+        if (validacao.hasErrors()) {
+            final StringBuilder errosFinal = new StringBuilder();
+            validacao.getFieldErrors().forEach(msg -> {
+                errosFinal.append(msg.getDefaultMessage());
+            });
+            result = errosFinal.toString();
+        }
+        return result;
+    }
+
+}

backend/src/main/java/com/github/andrepenteado/apsso/backend/services/impl/PerfilSistemaServiceImpl.java → services/src/main/java/com/github/andrepenteado/apsso/services/impl/PerfilSistemaServiceImpl.java

@@ -1,9 +1,9 @@
-package com.github.andrepenteado.apsso.backend.services.impl;
+package com.github.andrepenteado.apsso.services.impl;
 
-import com.github.andrepenteado.apsso.backend.ApssoBackendApplication;
-import com.github.andrepenteado.apsso.backend.models.PerfilSistema;
-import com.github.andrepenteado.apsso.backend.repositories.PerfilSistemaRepository;
-import com.github.andrepenteado.apsso.backend.services.PerfilSistemaService;
+import com.github.andrepenteado.apsso.services.repositories.PerfilSistemaRepository;
+import com.github.andrepenteado.apsso.services.Util;
+import com.github.andrepenteado.apsso.services.models.PerfilSistema;
+import com.github.andrepenteado.apsso.services.PerfilSistemaService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.dao.EmptyResultDataAccessException;
 import org.springframework.http.HttpStatus;
@@ -31,7 +31,7 @@ public List<PerfilSistema> listarPorSistema(String idSistema) {
 
     @Override
     public PerfilSistema incluir(PerfilSistema perfilSistema, BindingResult validacao) {
-        String erros = ApssoBackendApplication.validateModel(validacao);
+        String erros = Util.validateModel(validacao);
         if (erros != null)
             throw new ResponseStatusException(HttpStatus.UNPROCESSABLE_ENTITY, erros);
 

backend/src/main/java/com/github/andrepenteado/apsso/backend/services/impl/SistemaServiceImpl.java → services/src/main/java/com/github/andrepenteado/apsso/services/impl/SistemaServiceImpl.java

@@ -1,9 +1,9 @@
-package com.github.andrepenteado.apsso.backend.services.impl;
+package com.github.andrepenteado.apsso.services.impl;
 
-import com.github.andrepenteado.apsso.backend.ApssoBackendApplication;
-import com.github.andrepenteado.apsso.backend.models.Sistema;
-import com.github.andrepenteado.apsso.backend.repositories.SistemaRepository;
-import com.github.andrepenteado.apsso.backend.services.SistemaService;
+import com.github.andrepenteado.apsso.services.repositories.SistemaRepository;
+import com.github.andrepenteado.apsso.services.Util;
+import com.github.andrepenteado.apsso.services.models.Sistema;
+import com.github.andrepenteado.apsso.services.SistemaService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.dao.EmptyResultDataAccessException;
 import org.springframework.http.HttpStatus;
@@ -34,7 +34,7 @@ public Optional<Sistema> buscar(String id) {
 
     @Override
     public Sistema incluirOuAlterar(Sistema sistema, BindingResult validacao) {
-        String erros = ApssoBackendApplication.validateModel(validacao);
+        String erros = Util.validateModel(validacao);
         if (erros != null)
             throw new ResponseStatusException(HttpStatus.UNPROCESSABLE_ENTITY, erros);