diff --git a/.vscode/settings.json b/.vscode/settings.json index e8c88db..849f79e 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,5 +1,3 @@ { - "java.compile.nullAnalysis.mode": "disabled", - "editor.fontFamily": "FiraCode Nerd Font Mono", - "java.jdt.ls.vmargs": "-XX:+UseParallelGC -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -Dsun.zip.disableMemoryMapping=true -Xmx4G -Xms100m -Xlog:disable" + "java.compile.nullAnalysis.mode": "automatic" } diff --git a/auth-service-api/.gitattributes b/auth-service-api/.gitattributes new file mode 100644 index 0000000..8af972c --- /dev/null +++ b/auth-service-api/.gitattributes @@ -0,0 +1,3 @@ +/gradlew text eol=lf +*.bat text eol=crlf +*.jar binary diff --git a/auth-service-api/.gitignore b/auth-service-api/.gitignore new file mode 100644 index 0000000..c2065bc --- /dev/null +++ b/auth-service-api/.gitignore @@ -0,0 +1,37 @@ +HELP.md +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ diff --git a/auth-service-api/build.gradle b/auth-service-api/build.gradle new file mode 100644 index 0000000..1f8b32c --- /dev/null +++ b/auth-service-api/build.gradle @@ -0,0 +1,42 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '3.5.8' + id 'io.spring.dependency-management' version '1.1.7' + id 'org.graalvm.buildtools.native' version '0.10.6' +} + +apply from: 'gradle/plugins/dependencies.gradle' + +group = 'br.com.rayankonecny' +version = '1.0.0' +description = 'auth service project for Spring Boot' + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} + +configurations { + compileOnly { + extendsFrom annotationProcessor + } +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter' + compileOnly 'org.projectlombok:lombok' + developmentOnly 'org.springframework.boot:spring-boot-devtools' + annotationProcessor 'org.springframework.boot:spring-boot-configuration-processor' + annotationProcessor 'org.projectlombok:lombok' + testImplementation 'org.springframework.boot:spring-boot-starter-test' + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' +} + +tasks.named('test') { + useJUnitPlatform() +} diff --git a/auth-service-api/gradle/plugins/dependencies.gradle b/auth-service-api/gradle/plugins/dependencies.gradle new file mode 100644 index 0000000..7cd0dff --- /dev/null +++ b/auth-service-api/gradle/plugins/dependencies.gradle @@ -0,0 +1,85 @@ +repositories { + mavenLocal() + mavenCentral() + maven() { + url = uri("https://artifactory-oss.prod.netflix.net/artifactory/maven-oss-candidates") + } +} + +ext { + springCloudVersion = "2023.0.3" +} + +dependencies { + + // Spring Boot Starters initial project + implementation 'org.springframework.boot:spring-boot-starter-web' + // implementation 'org.springframework.cloud:spring-cloud-starter-config' + // implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap' + // implementation 'org.springframework.cloud:spring-cloud-starter-netflix-eureka-client' + implementation ('org.springframework.boot:spring-boot-starter-data-mongodb') { + because('Starter para integrar com o MongoDB') + } + + implementation ('org.springframework.boot:spring-boot-starter-validation') { + because('Starter para validação de dados') + } + + // Biblioteca de codigo comum + implementation ('br.com.rayankonecny:hd-commons-lib:1.0.0') { + because('Lib para compartilhar código comum entre os projetos') + } + + // Spring Security + implementation ('org.springframework.boot:spring-boot-starter-security') { + because('Starter para integrar com o Srping Security') + } + + // Json Web Token + implementation ('io.jsonwebtoken:jjwt:0.12.6') { + because('Dependencia para gerar a validar JWT') + } + + // Java Architecture for XML Binding + implementation ('javax.xml.bind:jaxb-api:2.4.0-b180725.0427') { + because('JAXB API') + } + + // Swagger / OpenAPI (compatível com Spring Boot 3.3.x) + implementation ('org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0') { + because('Starter para integrar com o SpringDoc OpenAPI e adicionar documentacao') + } + + // Lombok for code generation (at compile time) + compileOnly 'org.projectlombok:lombok' + annotationProcessor 'org.projectlombok:lombok' + implementation 'org.projectlombok:lombok-mapstruct-binding:0.2.0' + + // Lombok para TESTES (ESSENCIAL) + testCompileOnly 'org.projectlombok:lombok' + testAnnotationProcessor 'org.projectlombok:lombok' + + // MapStruct for object mapping (at compile time) + implementation 'org.mapstruct:mapstruct:1.5.3.Final' + annotationProcessor 'org.mapstruct:mapstruct-processor:1.5.3.Final' + + // Spring Security dependencies for authentication and authorization + implementation 'org.springframework.security:spring-security-crypto:6.4.7' + + // Testing dependencies + testImplementation 'org.springframework.boot:spring-boot-starter-test' + + // Mockito for mocking in tests + testImplementation 'org.mockito:mockito-core:5.12.0' + + // Podam for data mocking in tests + testImplementation 'uk.co.jemos.podam:podam:8.0.2.RELEASE' + + +} + +dependencyManagement { + imports { + mavenBom "org.springframework.cloud:spring-cloud-dependencies:${springCloudVersion}" + } +} diff --git a/auth-service-api/gradle/wrapper/gradle-wrapper.jar b/auth-service-api/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..1b33c55 Binary files /dev/null and b/auth-service-api/gradle/wrapper/gradle-wrapper.jar differ diff --git a/auth-service-api/gradle/wrapper/gradle-wrapper.properties b/auth-service-api/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..d4081da --- /dev/null +++ b/auth-service-api/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/auth-service-api/gradlew b/auth-service-api/gradlew new file mode 100755 index 0000000..23d15a9 --- /dev/null +++ b/auth-service-api/gradlew @@ -0,0 +1,251 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH="\\\"\\\"" + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/auth-service-api/gradlew.bat b/auth-service-api/gradlew.bat new file mode 100644 index 0000000..db3a6ac --- /dev/null +++ b/auth-service-api/gradlew.bat @@ -0,0 +1,94 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH= + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/auth-service-api/settings.gradle b/auth-service-api/settings.gradle new file mode 100644 index 0000000..752370a --- /dev/null +++ b/auth-service-api/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'auth-service-api' diff --git a/auth-service-api/src/main/java/br/com/rayankonecny/authserviceapi/AuthServiceApiApplication.java b/auth-service-api/src/main/java/br/com/rayankonecny/authserviceapi/AuthServiceApiApplication.java new file mode 100644 index 0000000..d41c9c9 --- /dev/null +++ b/auth-service-api/src/main/java/br/com/rayankonecny/authserviceapi/AuthServiceApiApplication.java @@ -0,0 +1,13 @@ +package br.com.rayankonecny.authserviceapi; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class AuthServiceApiApplication { + + public static void main(String[] args) { + SpringApplication.run(AuthServiceApiApplication.class, args); + } + +} diff --git a/auth-service-api/src/main/java/br/com/rayankonecny/authserviceapi/controllers/AuthController.java b/auth-service-api/src/main/java/br/com/rayankonecny/authserviceapi/controllers/AuthController.java new file mode 100644 index 0000000..2007feb --- /dev/null +++ b/auth-service-api/src/main/java/br/com/rayankonecny/authserviceapi/controllers/AuthController.java @@ -0,0 +1,13 @@ +package br.com.rayankonecny.authserviceapi.controllers; + +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; + +@RequestMapping("/auth") +public interface AuthController { + + @PostMapping("/login") + ResponseEntity authenticate(); + +} diff --git a/auth-service-api/src/main/resources/application.yml b/auth-service-api/src/main/resources/application.yml new file mode 100644 index 0000000..d908854 --- /dev/null +++ b/auth-service-api/src/main/resources/application.yml @@ -0,0 +1,3 @@ +spring: + application: + name: "auth-service-api" diff --git a/auth-service-api/src/test/java/br/com/rayankonecny/authserviceapi/AuthServiceApiApplicationTests.java b/auth-service-api/src/test/java/br/com/rayankonecny/authserviceapi/AuthServiceApiApplicationTests.java new file mode 100644 index 0000000..b5fbf04 --- /dev/null +++ b/auth-service-api/src/test/java/br/com/rayankonecny/authserviceapi/AuthServiceApiApplicationTests.java @@ -0,0 +1,13 @@ +package br.com.rayankonecny.authserviceapi; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class AuthServiceApiApplicationTests { + + @Test + void contextLoads() { + } + +} diff --git a/hd-commons-lib/pom.xml b/hd-commons-lib/pom.xml index 854dea8..a2e31fd 100644 --- a/hd-commons-lib/pom.xml +++ b/hd-commons-lib/pom.xml @@ -4,10 +4,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - br.com.rayan + br.com.rayankonecny hd-commons-lib 1.0.0 + 21 @@ -29,9 +30,15 @@ - org.springdoc - springdoc-openapi-starter-webmvc-ui - 2.1.0 + org.yaml + snakeyaml + 2.2 + + + + io.swagger.core.v3 + swagger-annotations + 2.2.22 diff --git a/hd-commons-lib/src/main/java/br/com/rayankonecny/hdcommoslib/models/enums/ProfileEnum.java b/hd-commons-lib/src/main/java/br/com/rayankonecny/hdcommoslib/models/enums/ProfileEnum.java index 898d8c3..6af540d 100644 --- a/hd-commons-lib/src/main/java/br/com/rayankonecny/hdcommoslib/models/enums/ProfileEnum.java +++ b/hd-commons-lib/src/main/java/br/com/rayankonecny/hdcommoslib/models/enums/ProfileEnum.java @@ -1,11 +1,9 @@ -package models.enums; +package br.com.rayankonecny.hdcommoslib.models.enums; import java.util.Arrays; public enum ProfileEnum { - ROLE_ADMIN("ROLE_ADMIN"), - ROLE_CUSTOMER("ROLE_CUSTOMER"), - ROLE_TECHNICIAN("ROLE_TECHNICIAN"); + ROLE_ADMIN("ROLE_ADMIN"), ROLE_CUSTOMER("ROLE_CUSTOMER"), ROLE_TECHNICIAN("ROLE_TECHNICIAN"); private final String description; @@ -18,9 +16,7 @@ public enum ProfileEnum { } public static ProfileEnum toEnum(final String description) { - return Arrays.stream(ProfileEnum.values()) - .filter(profile -> profile.getDescription().equals(description)) - .findFirst() - .orElseThrow(() -> new IllegalArgumentException("Invalid description: " + description)); + return Arrays.stream(ProfileEnum.values()).filter(profile -> profile.getDescription().equals(description)) + .findFirst().orElseThrow(() -> new IllegalArgumentException("Invalid description: " + description)); } } diff --git a/hd-commons-lib/src/main/java/br/com/rayankonecny/hdcommoslib/models/exceptions/ResourceNotFoundException.java b/hd-commons-lib/src/main/java/br/com/rayankonecny/hdcommoslib/models/exceptions/ResourceNotFoundException.java index 5d4b3d3..1d901c9 100644 --- a/hd-commons-lib/src/main/java/br/com/rayankonecny/hdcommoslib/models/exceptions/ResourceNotFoundException.java +++ b/hd-commons-lib/src/main/java/br/com/rayankonecny/hdcommoslib/models/exceptions/ResourceNotFoundException.java @@ -1,4 +1,4 @@ -package models.exceptions; +package br.com.rayankonecny.hdcommoslib.models.exceptions; public class ResourceNotFoundException extends RuntimeException { diff --git a/hd-commons-lib/src/main/java/br/com/rayankonecny/hdcommoslib/models/exceptions/StandardError.java b/hd-commons-lib/src/main/java/br/com/rayankonecny/hdcommoslib/models/exceptions/StandardError.java index 765e12c..c63ec7b 100644 --- a/hd-commons-lib/src/main/java/br/com/rayankonecny/hdcommoslib/models/exceptions/StandardError.java +++ b/hd-commons-lib/src/main/java/br/com/rayankonecny/hdcommoslib/models/exceptions/StandardError.java @@ -1,4 +1,4 @@ -package models.exceptions; +package br.com.rayankonecny.hdcommoslib.models.exceptions; import java.time.LocalDateTime; import lombok.Getter; diff --git a/hd-commons-lib/src/main/java/br/com/rayankonecny/hdcommoslib/models/exceptions/ValidationException.java b/hd-commons-lib/src/main/java/br/com/rayankonecny/hdcommoslib/models/exceptions/ValidationException.java index adb0128..e516fbf 100644 --- a/hd-commons-lib/src/main/java/br/com/rayankonecny/hdcommoslib/models/exceptions/ValidationException.java +++ b/hd-commons-lib/src/main/java/br/com/rayankonecny/hdcommoslib/models/exceptions/ValidationException.java @@ -1,4 +1,4 @@ -package models.exceptions; +package br.com.rayankonecny.hdcommoslib.models.exceptions; import java.util.List; diff --git a/hd-commons-lib/src/main/java/br/com/rayankonecny/hdcommoslib/models/requests/AuthenticateRequest.java b/hd-commons-lib/src/main/java/br/com/rayankonecny/hdcommoslib/models/requests/AuthenticateRequest.java new file mode 100644 index 0000000..0369750 --- /dev/null +++ b/hd-commons-lib/src/main/java/br/com/rayankonecny/hdcommoslib/models/requests/AuthenticateRequest.java @@ -0,0 +1,27 @@ +package br.com.rayankonecny.hdcommoslib.models.requests; + +import java.io.Serial; +import java.io.Serializable; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.Email; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.Size; + +public record AuthenticateRequest( + + @Schema(description = "Email of the user", example = "rayanvix@gmail.com") + @Email(message = "Invalid email format") + @NotBlank(message = "Email cannot be blank") + @Size(min = 6, max = 50, message = "Email must contain between 6 and 50 characters") + String email, + + @Schema(description = "Password of the user", example = "P@ssw0rd!", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "Password cannot be empty") + @Size(min = 6, max = 20, message = "Password must contain between 6 and 20 characters") + @NotBlank(message = "Password cannot be blank") + String password) implements Serializable { + @Serial + private static final long serialVersionUID = 1L; +} diff --git a/hd-commons-lib/src/main/java/br/com/rayankonecny/hdcommoslib/models/requests/CreateUserRequest.java b/hd-commons-lib/src/main/java/br/com/rayankonecny/hdcommoslib/models/requests/CreateUserRequest.java index b8982e2..763e708 100644 --- a/hd-commons-lib/src/main/java/br/com/rayankonecny/hdcommoslib/models/requests/CreateUserRequest.java +++ b/hd-commons-lib/src/main/java/br/com/rayankonecny/hdcommoslib/models/requests/CreateUserRequest.java @@ -1,33 +1,34 @@ -package models.requests; +package br.com.rayankonecny.hdcommoslib.models.requests; import java.util.Set; + +import br.com.rayankonecny.hdcommoslib.models.enums.ProfileEnum; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.Email; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Size; import lombok.With; import io.swagger.v3.oas.annotations.media.Schema; -import models.enums.ProfileEnum; @With public record CreateUserRequest( - @Schema(description = "Name of the user", example = "John Doe", requiredMode = Schema.RequiredMode.REQUIRED) - @NotEmpty(message = "Name cannot be empty") - @Size(min = 3, max = 50, message = "Name must contain between 3 and 50 characters") - String name, + @Schema(description = "Name of the user", example = "John Doe", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "Name cannot be empty") + @Size(min = 3, max = 50, message = "Name must contain between 3 and 50 characters") + String name, - @Schema(description = "Email of the user", example = "rayanvix@gmail.com") - @Email(message = "Invalid email format") - @NotBlank(message = "Email cannot be blank") - @Size(min = 6, max = 50, message = "Email must contain between 6 and 50 characters") - String email, + @Schema(description = "Email of the user", example = "rayanvix@gmail.com") + @Email(message = "Invalid email format") + @NotBlank(message = "Email cannot be blank") + @Size(min = 6, max = 50, message = "Email must contain between 6 and 50 characters") + String email, - @Schema(description = "Password of the user", example = "P@ssw0rd!", requiredMode = Schema.RequiredMode.REQUIRED) - @NotEmpty(message = "Password cannot be empty") - @Size(min = 6, max = 20, message = "Password must contain between 6 and 20 characters") - @NotBlank(message = "Password cannot be blank") - String password, + @Schema(description = "Password of the user", example = "P@ssw0rd!", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "Password cannot be empty") + @Size(min = 6, max = 20, message = "Password must contain between 6 and 20 characters") + @NotBlank(message = "Password cannot be blank") + String password, - @Schema(description = "Profiles assigned to the user", example = "[\" ROLE_ADMIN \", \"ROLE_CUSTOMER \" ]", requiredMode = Schema.RequiredMode.REQUIRED) - Set profiles) { + @Schema(description = "Profiles assigned to the user", example = "[\" ROLE_ADMIN \", \"ROLE_CUSTOMER \" ]", requiredMode = Schema.RequiredMode.REQUIRED) + Set profiles) { } diff --git a/hd-commons-lib/src/main/java/br/com/rayankonecny/hdcommoslib/models/requests/UpdateUserRequest.java b/hd-commons-lib/src/main/java/br/com/rayankonecny/hdcommoslib/models/requests/UpdateUserRequest.java index 192df43..e623755 100644 --- a/hd-commons-lib/src/main/java/br/com/rayankonecny/hdcommoslib/models/requests/UpdateUserRequest.java +++ b/hd-commons-lib/src/main/java/br/com/rayankonecny/hdcommoslib/models/requests/UpdateUserRequest.java @@ -1,13 +1,14 @@ -package models.requests; +package br.com.rayankonecny.hdcommoslib.models.requests; import java.util.Set; + +import br.com.rayankonecny.hdcommoslib.models.enums.ProfileEnum; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.Email; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Size; import lombok.With; import io.swagger.v3.oas.annotations.media.Schema; -import models.enums.ProfileEnum; @With @Schema(description = "Request to update user") diff --git a/hd-commons-lib/src/main/java/br/com/rayankonecny/hdcommoslib/models/responses/UserResponse.java b/hd-commons-lib/src/main/java/br/com/rayankonecny/hdcommoslib/models/responses/UserResponse.java index 33c2872..ef29599 100644 --- a/hd-commons-lib/src/main/java/br/com/rayankonecny/hdcommoslib/models/responses/UserResponse.java +++ b/hd-commons-lib/src/main/java/br/com/rayankonecny/hdcommoslib/models/responses/UserResponse.java @@ -1,9 +1,10 @@ -package models.responses; +package br.com.rayankonecny.hdcommoslib.models.responses; import java.io.Serial; import java.io.Serializable; import java.util.Set; -import models.enums.ProfileEnum; + +import br.com.rayankonecny.hdcommoslib.models.enums.ProfileEnum; public record UserResponse( String id, diff --git a/rest.http b/rest.http index 4886701..8ed5aa4 100644 --- a/rest.http +++ b/rest.http @@ -1,5 +1,5 @@ ### Get user by id (replace {{id}} or use a concrete id like 1) -GET http://175.15.15.91:8080/api/users/692cca264e957945b99f731a +GET http://175.15.15.91:8080/api/users/6927c8c75efcfda14c3ea570 Accept: application/json # Authorization: Bearer {{token}} diff --git a/user-service-api/gradle/wrapper/plugins/dependencies.gradle b/user-service-api/gradle/wrapper/plugins/dependencies.gradle index 3844cbc..c6af8ca 100644 --- a/user-service-api/gradle/wrapper/plugins/dependencies.gradle +++ b/user-service-api/gradle/wrapper/plugins/dependencies.gradle @@ -12,7 +12,7 @@ ext { dependencies { - implementation 'br.com.rayan:hd-commons-lib:1.0.0' + implementation 'br.com.rayankonecny:hd-commons-lib:1.0.0' // Spring Boot Starters initial project implementation 'org.springframework.boot:spring-boot-starter' diff --git a/user-service-api/src/main/java/br/com/rayankonecny/userserviceapi/controller/UserController.java b/user-service-api/src/main/java/br/com/rayankonecny/userserviceapi/controller/UserController.java index 73228a1..0a9258d 100644 --- a/user-service-api/src/main/java/br/com/rayankonecny/userserviceapi/controller/UserController.java +++ b/user-service-api/src/main/java/br/com/rayankonecny/userserviceapi/controller/UserController.java @@ -20,10 +20,10 @@ import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.responses.ApiResponses; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; -import models.exceptions.StandardError; -import models.requests.CreateUserRequest; -import models.requests.UpdateUserRequest; -import models.responses.UserResponse; +import br.com.rayankonecny.hdcommoslib.models.exceptions.StandardError; +import br.com.rayankonecny.hdcommoslib.models.requests.CreateUserRequest; +import br.com.rayankonecny.hdcommoslib.models.requests.UpdateUserRequest; +import br.com.rayankonecny.hdcommoslib.models.responses.UserResponse; @Tag(name = "User Controller", description = "Controller responsible for user operations") @RequestMapping("/api/users") diff --git a/user-service-api/src/main/java/br/com/rayankonecny/userserviceapi/controller/exceptions/ControllerExceptionHandler.java b/user-service-api/src/main/java/br/com/rayankonecny/userserviceapi/controller/exceptions/ControllerExceptionHandler.java index b031cf6..d5fa39c 100644 --- a/user-service-api/src/main/java/br/com/rayankonecny/userserviceapi/controller/exceptions/ControllerExceptionHandler.java +++ b/user-service-api/src/main/java/br/com/rayankonecny/userserviceapi/controller/exceptions/ControllerExceptionHandler.java @@ -9,9 +9,9 @@ import org.springframework.web.bind.annotation.ExceptionHandler; import jakarta.servlet.http.HttpServletRequest; -import models.exceptions.ValidationException; -import models.exceptions.ResourceNotFoundException; -import models.exceptions.StandardError; +import br.com.rayankonecny.hdcommoslib.models.exceptions.ValidationException; +import br.com.rayankonecny.hdcommoslib.models.exceptions.ResourceNotFoundException; +import br.com.rayankonecny.hdcommoslib.models.exceptions.StandardError; import static java.time.LocalDateTime.now; import static org.springframework.http.HttpStatus.BAD_REQUEST; @@ -38,17 +38,12 @@ public class ControllerExceptionHandler { ResponseEntity handleMethodArgumentNotValidException(final MethodArgumentNotValidException ex, final HttpServletRequest request) { - var error = ValidationException.builder() - .timestamp(now()) - .status(BAD_REQUEST.value()) - .error("Validation Exception") - .message("Exception in validation attributes") - .path(request.getRequestURI()) - .errors(new ArrayList<>()) - .build(); + var error = ValidationException.builder().timestamp(now()).status(BAD_REQUEST.value()) + .error("Validation Exception").message("Exception in validation attributes") + .path(request.getRequestURI()).errors(new ArrayList<>()).build(); for (FieldError fieldError : ex.getBindingResult().getFieldErrors()) { - error.addError(fieldError.getField(), fieldError.getDefaultMessage()); + error.addError(fieldError.getField(), fieldError.getDefaultMessage()); } return ResponseEntity.badRequest().body(error); diff --git a/user-service-api/src/main/java/br/com/rayankonecny/userserviceapi/controller/impl/UserControllerImpl.java b/user-service-api/src/main/java/br/com/rayankonecny/userserviceapi/controller/impl/UserControllerImpl.java index 19f00d0..2525f5f 100644 --- a/user-service-api/src/main/java/br/com/rayankonecny/userserviceapi/controller/impl/UserControllerImpl.java +++ b/user-service-api/src/main/java/br/com/rayankonecny/userserviceapi/controller/impl/UserControllerImpl.java @@ -7,9 +7,9 @@ import br.com.rayankonecny.userserviceapi.service.UserService; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; -import models.requests.CreateUserRequest; -import models.requests.UpdateUserRequest; -import models.responses.UserResponse; +import br.com.rayankonecny.hdcommoslib.models.requests.CreateUserRequest; +import br.com.rayankonecny.hdcommoslib.models.requests.UpdateUserRequest; +import br.com.rayankonecny.hdcommoslib.models.responses.UserResponse; import static org.springframework.http.HttpStatus.CREATED; @@ -38,9 +38,9 @@ public class UserControllerImpl implements UserController { } @Override - public ResponseEntity update(final String id, @Valid final UpdateUserRequest updateUserRequest) { + public ResponseEntity update(final String id, @Valid + final UpdateUserRequest updateUserRequest) { return ResponseEntity.ok().body(userService.update(id, updateUserRequest)); } - } diff --git a/user-service-api/src/main/java/br/com/rayankonecny/userserviceapi/entity/User.java b/user-service-api/src/main/java/br/com/rayankonecny/userserviceapi/entity/User.java index 646b802..dc2d245 100644 --- a/user-service-api/src/main/java/br/com/rayankonecny/userserviceapi/entity/User.java +++ b/user-service-api/src/main/java/br/com/rayankonecny/userserviceapi/entity/User.java @@ -9,7 +9,7 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; import lombok.With; -import models.enums.ProfileEnum; +import br.com.rayankonecny.hdcommoslib.models.enums.ProfileEnum; @With @Data diff --git a/user-service-api/src/main/java/br/com/rayankonecny/userserviceapi/mapper/UserMapper.java b/user-service-api/src/main/java/br/com/rayankonecny/userserviceapi/mapper/UserMapper.java index 8388136..b83730a 100644 --- a/user-service-api/src/main/java/br/com/rayankonecny/userserviceapi/mapper/UserMapper.java +++ b/user-service-api/src/main/java/br/com/rayankonecny/userserviceapi/mapper/UserMapper.java @@ -5,9 +5,9 @@ import org.mapstruct.Mapping; import org.mapstruct.MappingTarget; import br.com.rayankonecny.userserviceapi.entity.User; -import models.requests.CreateUserRequest; -import models.requests.UpdateUserRequest; -import models.responses.UserResponse; +import br.com.rayankonecny.hdcommoslib.models.requests.CreateUserRequest; +import br.com.rayankonecny.hdcommoslib.models.requests.UpdateUserRequest; +import br.com.rayankonecny.hdcommoslib.models.responses.UserResponse; import static org.mapstruct.NullValuePropertyMappingStrategy.IGNORE; import static org.mapstruct.NullValueCheckStrategy.ALWAYS; @@ -21,5 +21,6 @@ public interface UserMapper { User fromRequest(CreateUserRequest createUserRequest); @Mapping(target = "id", ignore = true) - User update(UpdateUserRequest updateUserRequest, @MappingTarget User entity); + User update(UpdateUserRequest updateUserRequest, @MappingTarget + User entity); } diff --git a/user-service-api/src/main/java/br/com/rayankonecny/userserviceapi/service/UserService.java b/user-service-api/src/main/java/br/com/rayankonecny/userserviceapi/service/UserService.java index eac5a8a..090cd55 100644 --- a/user-service-api/src/main/java/br/com/rayankonecny/userserviceapi/service/UserService.java +++ b/user-service-api/src/main/java/br/com/rayankonecny/userserviceapi/service/UserService.java @@ -11,15 +11,15 @@ import br.com.rayankonecny.userserviceapi.mapper.UserMapper; import br.com.rayankonecny.userserviceapi.repository.UserRepository; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; -import models.responses.UserResponse; -import models.exceptions.ResourceNotFoundException; -import models.requests.CreateUserRequest; -import models.requests.UpdateUserRequest; +import br.com.rayankonecny.hdcommoslib.models.responses.UserResponse; +import br.com.rayankonecny.hdcommoslib.models.exceptions.ResourceNotFoundException; +import br.com.rayankonecny.hdcommoslib.models.requests.CreateUserRequest; +import br.com.rayankonecny.hdcommoslib.models.requests.UpdateUserRequest; @Service @RequiredArgsConstructor public class UserService { - + // Dependencies private final UserRepository repository; private final UserMapper mapper; diff --git a/user-service-api/src/test/java/br/com/rayankonecny/userserviceapi/controller/impl/UserControllerImpTest.java b/user-service-api/src/test/java/br/com/rayankonecny/userserviceapi/controller/impl/UserControllerImpTest.java index 5f4b96d..daff31f 100644 --- a/user-service-api/src/test/java/br/com/rayankonecny/userserviceapi/controller/impl/UserControllerImpTest.java +++ b/user-service-api/src/test/java/br/com/rayankonecny/userserviceapi/controller/impl/UserControllerImpTest.java @@ -22,14 +22,14 @@ import java.util.List; import com.fasterxml.jackson.databind.ObjectMapper; import br.com.rayankonecny.userserviceapi.entity.User; import br.com.rayankonecny.userserviceapi.repository.UserRepository; -import models.requests.CreateUserRequest; +import br.com.rayankonecny.hdcommoslib.models.requests.CreateUserRequest; @SpringBootTest @AutoConfigureMockMvc @ActiveProfiles("test") public class UserControllerImpTest { - private static final String VALID_EMAIL = "rayanvix@gmail.com"; + private static final String VALID_EMAIL = "rayanvix2@gmail.com"; private static final String BASE_URI = "/api/users"; @@ -109,13 +109,12 @@ public class UserControllerImpTest { final var request = generateMock(CreateUserRequest.class).withName("").withEmail(VALID_EMAIL); mockMvc.perform(post(BASE_URI).contentType(APPLICATION_JSON).content(toJson(request))) - .andExpect(status().isBadRequest()) - .andExpect(jsonPath("$.message").value("Exception in validation attributes")) - .andExpect(jsonPath("$.error").value("Validation Exception")) - .andExpect(jsonPath("$.path").value(BASE_URI)) - .andExpect(jsonPath("$.status").value(BAD_REQUEST.value())) - .andExpect(jsonPath("$.timestamp").isNotEmpty()) - .andExpect(jsonPath("$.errors[?(@.fieldName=='name' && @.message=='Name must contain between 3 and 50 characters')]").exists()) + .andExpect(status().isBadRequest()).andExpect(jsonPath("$.message").value("Exception in validation attributes")) + .andExpect(jsonPath("$.error").value("Validation Exception")).andExpect(jsonPath("$.path").value(BASE_URI)) + .andExpect(jsonPath("$.status").value(BAD_REQUEST.value())).andExpect(jsonPath("$.timestamp").isNotEmpty()) + .andExpect( + jsonPath("$.errors[?(@.fieldName=='name' && @.message=='Name must contain between 3 and 50 characters')]") + .exists()) .andExpect(jsonPath("$.errors[?(@.fieldName=='name' && @.message=='Name cannot be empty')]").exists()); } diff --git a/user-service-api/src/test/java/br/com/rayankonecny/userserviceapi/service/UserServiceTest.java b/user-service-api/src/test/java/br/com/rayankonecny/userserviceapi/service/UserServiceTest.java index e59738e..67db238 100644 --- a/user-service-api/src/test/java/br/com/rayankonecny/userserviceapi/service/UserServiceTest.java +++ b/user-service-api/src/test/java/br/com/rayankonecny/userserviceapi/service/UserServiceTest.java @@ -16,10 +16,10 @@ import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import br.com.rayankonecny.userserviceapi.entity.User; import br.com.rayankonecny.userserviceapi.mapper.UserMapper; import br.com.rayankonecny.userserviceapi.repository.UserRepository; -import models.exceptions.ResourceNotFoundException; -import models.requests.CreateUserRequest; -import models.requests.UpdateUserRequest; -import models.responses.UserResponse; +import br.com.rayankonecny.hdcommoslib.models.exceptions.ResourceNotFoundException; +import br.com.rayankonecny.hdcommoslib.models.requests.CreateUserRequest; +import br.com.rayankonecny.hdcommoslib.models.requests.UpdateUserRequest; +import br.com.rayankonecny.hdcommoslib.models.responses.UserResponse; import static br.com.rayankonecny.userserviceapi.creator.CreatorUtils.generateMock; import static org.mockito.Mockito.when;