From 093266ac56de6cb69e25338e2ac0db07a7464d5e Mon Sep 17 00:00:00 2001 From: Leonardo Date: Thu, 21 May 2026 22:26:32 -0300 Subject: [PATCH] feat: add context of user not permitted to reserve --- Convive/mvnw.cmd | 189 ------------------ .../Controller/MoradorHomeController.java | 68 +++---- .../java/com/EC6/Convive/Model/Usuario.java | 2 +- .../EC6/Convive/Service/ReservaService.java | 7 +- .../EC6/Convive/Service/UsuarioService.java | 10 + .../Validator/MoradorHomeValidator.java | 66 ++++++ 6 files changed, 111 insertions(+), 231 deletions(-) delete mode 100644 Convive/mvnw.cmd create mode 100644 Convive/src/main/java/com/EC6/Convive/Validator/MoradorHomeValidator.java diff --git a/Convive/mvnw.cmd b/Convive/mvnw.cmd deleted file mode 100644 index 92450f9..0000000 --- a/Convive/mvnw.cmd +++ /dev/null @@ -1,189 +0,0 @@ -<# : batch portion -@REM ---------------------------------------------------------------------------- -@REM Licensed to the Apache Software Foundation (ASF) under one -@REM or more contributor license agreements. See the NOTICE file -@REM distributed with this work for additional information -@REM regarding copyright ownership. The ASF licenses this file -@REM to you under the Apache License, Version 2.0 (the -@REM "License"); you may not use this file except in compliance -@REM with the License. You may obtain a copy of the License at -@REM -@REM http://www.apache.org/licenses/LICENSE-2.0 -@REM -@REM Unless required by applicable law or agreed to in writing, -@REM software distributed under the License is distributed on an -@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -@REM KIND, either express or implied. See the License for the -@REM specific language governing permissions and limitations -@REM under the License. -@REM ---------------------------------------------------------------------------- - -@REM ---------------------------------------------------------------------------- -@REM Apache Maven Wrapper startup batch script, version 3.3.4 -@REM -@REM Optional ENV vars -@REM MVNW_REPOURL - repo url base for downloading maven distribution -@REM MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven -@REM MVNW_VERBOSE - true: enable verbose log; others: silence the output -@REM ---------------------------------------------------------------------------- - -@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0) -@SET __MVNW_CMD__= -@SET __MVNW_ERROR__= -@SET __MVNW_PSMODULEP_SAVE=%PSModulePath% -@SET PSModulePath= -@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @( - IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B) -) -@SET PSModulePath=%__MVNW_PSMODULEP_SAVE% -@SET __MVNW_PSMODULEP_SAVE= -@SET __MVNW_ARG0_NAME__= -@SET MVNW_USERNAME= -@SET MVNW_PASSWORD= -@IF NOT "%__MVNW_CMD__%"=="" ("%__MVNW_CMD__%" %*) -@echo Cannot start maven from wrapper >&2 && exit /b 1 -@GOTO :EOF -: end batch / begin powershell #> - -$ErrorActionPreference = "Stop" -if ($env:MVNW_VERBOSE -eq "true") { - $VerbosePreference = "Continue" -} - -# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties -$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl -if (!$distributionUrl) { - Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" -} - -switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) { - "maven-mvnd-*" { - $USE_MVND = $true - $distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip" - $MVN_CMD = "mvnd.cmd" - break - } - default { - $USE_MVND = $false - $MVN_CMD = $script -replace '^mvnw','mvn' - break - } -} - -# apply MVNW_REPOURL and calculate MAVEN_HOME -# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ -if ($env:MVNW_REPOURL) { - $MVNW_REPO_PATTERN = if ($USE_MVND -eq $False) { "/org/apache/maven/" } else { "/maven/mvnd/" } - $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace "^.*$MVNW_REPO_PATTERN",'')" -} -$distributionUrlName = $distributionUrl -replace '^.*/','' -$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$','' - -$MAVEN_M2_PATH = "$HOME/.m2" -if ($env:MAVEN_USER_HOME) { - $MAVEN_M2_PATH = "$env:MAVEN_USER_HOME" -} - -if (-not (Test-Path -Path $MAVEN_M2_PATH)) { - New-Item -Path $MAVEN_M2_PATH -ItemType Directory | Out-Null -} - -$MAVEN_WRAPPER_DISTS = $null -if ((Get-Item $MAVEN_M2_PATH).Target[0] -eq $null) { - $MAVEN_WRAPPER_DISTS = "$MAVEN_M2_PATH/wrapper/dists" -} else { - $MAVEN_WRAPPER_DISTS = (Get-Item $MAVEN_M2_PATH).Target[0] + "/wrapper/dists" -} - -$MAVEN_HOME_PARENT = "$MAVEN_WRAPPER_DISTS/$distributionUrlNameMain" -$MAVEN_HOME_NAME = ([System.Security.Cryptography.SHA256]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join '' -$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME" - -if (Test-Path -Path "$MAVEN_HOME" -PathType Container) { - Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME" - Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" - exit $? -} - -if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) { - Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl" -} - -# prepare tmp dir -$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile -$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir" -$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null -trap { - if ($TMP_DOWNLOAD_DIR.Exists) { - try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } - catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } - } -} - -New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null - -# Download and Install Apache Maven -Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." -Write-Verbose "Downloading from: $distributionUrl" -Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" - -$webclient = New-Object System.Net.WebClient -if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) { - $webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD) -} -[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 -$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null - -# If specified, validate the SHA-256 sum of the Maven distribution zip file -$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum -if ($distributionSha256Sum) { - if ($USE_MVND) { - Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." - } - Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash - if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) { - Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property." - } -} - -# unzip and move -Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null - -# Find the actual extracted directory name (handles snapshots where filename != directory name) -$actualDistributionDir = "" - -# First try the expected directory name (for regular distributions) -$expectedPath = Join-Path "$TMP_DOWNLOAD_DIR" "$distributionUrlNameMain" -$expectedMvnPath = Join-Path "$expectedPath" "bin/$MVN_CMD" -if ((Test-Path -Path $expectedPath -PathType Container) -and (Test-Path -Path $expectedMvnPath -PathType Leaf)) { - $actualDistributionDir = $distributionUrlNameMain -} - -# If not found, search for any directory with the Maven executable (for snapshots) -if (!$actualDistributionDir) { - Get-ChildItem -Path "$TMP_DOWNLOAD_DIR" -Directory | ForEach-Object { - $testPath = Join-Path $_.FullName "bin/$MVN_CMD" - if (Test-Path -Path $testPath -PathType Leaf) { - $actualDistributionDir = $_.Name - } - } -} - -if (!$actualDistributionDir) { - Write-Error "Could not find Maven distribution directory in extracted archive" -} - -Write-Verbose "Found extracted Maven distribution directory: $actualDistributionDir" -Rename-Item -Path "$TMP_DOWNLOAD_DIR/$actualDistributionDir" -NewName $MAVEN_HOME_NAME | Out-Null -try { - Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null -} catch { - if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) { - Write-Error "fail to move MAVEN_HOME" - } -} finally { - try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } - catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } -} - -Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" diff --git a/Convive/src/main/java/com/EC6/Convive/Controller/MoradorHomeController.java b/Convive/src/main/java/com/EC6/Convive/Controller/MoradorHomeController.java index 113c4b3..610314a 100644 --- a/Convive/src/main/java/com/EC6/Convive/Controller/MoradorHomeController.java +++ b/Convive/src/main/java/com/EC6/Convive/Controller/MoradorHomeController.java @@ -4,6 +4,7 @@ import com.EC6.Convive.Security.CustomUserDetails; import com.EC6.Convive.Service.*; import com.EC6.Convive.Util.PaginationConstants; +import com.EC6.Convive.Validator.MoradorHomeValidator; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import com.EC6.Convive.Event.ReservaPendenteCriadaEvent; @@ -38,6 +39,7 @@ public class MoradorHomeController { private final UsuarioService usuarioService; private final AreaComumService areaComumService; private final ApplicationEventPublisher eventPublisher; + private final MoradorHomeValidator moradorHomeValidator; @GetMapping("/home") public String dashboardMorador(@AuthenticationPrincipal CustomUserDetails userDetails, Model model) { @@ -100,52 +102,19 @@ public String criarReservaMorador( RedirectAttributes redirectAttributes ) { Usuario usuario = userDetails.getUsuario(); + String erroValidacao = moradorHomeValidator.validarNovaReserva(usuario, areaId, dataReserva, turno, convidadosEstimados); - if (turno == null || !TURNOS_VALIDOS.contains(turno.toLowerCase(Locale.ROOT))) { - redirectAttributes.addFlashAttribute("erroReserva", "Turno inválido."); - return "redirect:/morador/reservas"; - } - turno = turno.toLowerCase(Locale.ROOT); - - LocalDate hoje = LocalDate.now(ZONA_APP); - if (dataReserva.isBefore(hoje)) { - redirectAttributes.addFlashAttribute("erroReserva", "A data não pode ser no passado."); + if (erroValidacao != null) { + redirectAttributes.addFlashAttribute("erroReserva", erroValidacao); return "redirect:/morador/reservas"; } - AreaComum area; - try { - area = areaComumService.searchById(areaId); - } catch (RuntimeException ex) { - redirectAttributes.addFlashAttribute("erroReserva", "Ambiente não encontrado."); - return "redirect:/morador/reservas"; - } - - if (area.getStatusArea() != StatusArea.ATIVA) { - redirectAttributes.addFlashAttribute("erroReserva", "Este ambiente não está disponível para reserva."); - return "redirect:/morador/reservas"; - } + AreaComum area = areaComumService.searchById(areaId); + turno = turno.toLowerCase(Locale.ROOT); Integer convidados = null; if (convidadosEstimados != null && !convidadosEstimados.isBlank()) { - try { - convidados = Integer.parseInt(convidadosEstimados.trim()); - } catch (NumberFormatException ex) { - redirectAttributes.addFlashAttribute("erroReserva", "Número de convidados inválido."); - return "redirect:/morador/reservas"; - } - } - - if (convidados != null) { - if (convidados < 1) { - redirectAttributes.addFlashAttribute("erroReserva", "O número de convidados deve ser pelo menos 1."); - return "redirect:/morador/reservas"; - } - if (convidados > area.getCapacidade()) { - redirectAttributes.addFlashAttribute("erroReserva", - "O número de convidados não pode exceder a capacidade do ambiente (" + area.getCapacidade() + ")."); - return "redirect:/morador/reservas"; - } + convidados = Integer.parseInt(convidadosEstimados.trim()); } LocalDateTime[] periodo = resolverPeriodoTurno(dataReserva, turno); @@ -226,4 +195,25 @@ private static LocalDateTime[] resolverPeriodoTurno(LocalDate data, String turno default -> throw new IllegalArgumentException("Turno inválido"); }; } + + @PostMapping("/usuarios/{id}/inadimplencia") + public String alterarInadimplenciaUsuario( + @PathVariable UUID id, + @RequestParam boolean inadimplente, + RedirectAttributes redirectAttributes + ) { + try { + usuarioService.alterarInadimplencia(id, inadimplente); + + if (inadimplente) { + redirectAttributes.addFlashAttribute("sucesso", "Morador marcado como INADIMPLENTE com sucesso."); + } else { + redirectAttributes.addFlashAttribute("sucesso", "Restrição removida. Morador agora está ADIMPLENTE."); + } + } catch (Exception e) { + redirectAttributes.addFlashAttribute("erro", "Erro ao tentar alterar o status do morador."); + } + + return "redirect:/moderador/usuarios"; + } } \ No newline at end of file diff --git a/Convive/src/main/java/com/EC6/Convive/Model/Usuario.java b/Convive/src/main/java/com/EC6/Convive/Model/Usuario.java index ad97a23..48dc4ca 100644 --- a/Convive/src/main/java/com/EC6/Convive/Model/Usuario.java +++ b/Convive/src/main/java/com/EC6/Convive/Model/Usuario.java @@ -34,7 +34,7 @@ public abstract class Usuario { private String status; @Column(name = "isInadimplente") - private boolean isInadimplente; + private boolean isInadimplente = true; @Column(name = "fotoPerfil") private String fotoPerfil; diff --git a/Convive/src/main/java/com/EC6/Convive/Service/ReservaService.java b/Convive/src/main/java/com/EC6/Convive/Service/ReservaService.java index e5b80b8..6f73991 100644 --- a/Convive/src/main/java/com/EC6/Convive/Service/ReservaService.java +++ b/Convive/src/main/java/com/EC6/Convive/Service/ReservaService.java @@ -22,8 +22,11 @@ public class ReservaService { private final ReservaRepository reservaRepository; - public Reserva insert(Reserva Reserva) { - return reservaRepository.save(Reserva); + public Reserva insert(Reserva reserva) { + if (reserva.getReservadoPor() != null && reserva.getReservadoPor().isInadimplente()) { + throw new RuntimeException("Moradores inadimplentes não têm permissão para reservar áreas comuns."); + } + return reservaRepository.save(reserva); } public List listAll() { diff --git a/Convive/src/main/java/com/EC6/Convive/Service/UsuarioService.java b/Convive/src/main/java/com/EC6/Convive/Service/UsuarioService.java index 97435db..810ccb7 100644 --- a/Convive/src/main/java/com/EC6/Convive/Service/UsuarioService.java +++ b/Convive/src/main/java/com/EC6/Convive/Service/UsuarioService.java @@ -8,6 +8,7 @@ import org.springframework.data.domain.Pageable; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.List; import java.util.UUID; @@ -51,6 +52,15 @@ public void delete(UUID id) { usuarioRepository.deleteById(id); } + @Transactional + public void alterarInadimplencia(UUID usuarioId, boolean status) { + Usuario usuario = usuarioRepository.findById(usuarioId) + .orElseThrow(() -> new RuntimeException("Usuário não encontrado com o ID: " + usuarioId)); + + usuario.setInadimplente(status); + usuarioRepository.save(usuario); + } + public Usuario update(UUID id, Usuario moradorAtualizado) { Usuario usuario = searchById(id); diff --git a/Convive/src/main/java/com/EC6/Convive/Validator/MoradorHomeValidator.java b/Convive/src/main/java/com/EC6/Convive/Validator/MoradorHomeValidator.java new file mode 100644 index 0000000..361c1e0 --- /dev/null +++ b/Convive/src/main/java/com/EC6/Convive/Validator/MoradorHomeValidator.java @@ -0,0 +1,66 @@ +package com.EC6.Convive.Validator; + +import com.EC6.Convive.Model.AreaComum; +import com.EC6.Convive.Model.StatusArea; +import com.EC6.Convive.Model.Usuario; +import com.EC6.Convive.Service.AreaComumService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Component; + +import java.time.LocalDate; +import java.time.ZoneId; +import java.util.Locale; +import java.util.Set; +import java.util.UUID; + +@Component +@RequiredArgsConstructor +public class MoradorHomeValidator { + + private static final ZoneId ZONA_APP = ZoneId.of("America/Sao_Paulo"); + private static final Set TURNOS_VALIDOS = Set.of("manha", "tarde", "noite", "integral"); + + private final AreaComumService areaComumService; + + public String validarNovaReserva(Usuario usuario, UUID areaId, LocalDate dataReserva, String turno, String convidadosEstimados) { + + if (usuario.isInadimplente()) { + return "Não é possível realizar a reserva. Constam pendências financeiras em seu cadastro."; + } + + if (turno == null || !TURNOS_VALIDOS.contains(turno.toLowerCase(Locale.ROOT))) { + return "Turno inválido."; + } + + LocalDate hoje = LocalDate.now(ZONA_APP); + if (dataReserva.isBefore(hoje)) { + return "A data não pode ser no passado."; + } + + AreaComum area; + try { + area = areaComumService.searchById(areaId); + } catch (RuntimeException ex) { + return "Ambiente não encontrado."; + } + + if (area.getStatusArea() != StatusArea.ATIVA) { + return "Este ambiente não está disponível para reserva."; + } + + if (convidadosEstimados != null && !convidadosEstimados.isBlank()) { + try { + int convidados = Integer.parseInt(convidadosEstimados.trim()); + if (convidados < 1) { + return "O número de convidados deve ser pelo menos 1."; + } + if (convidados > area.getCapacidade()) { + return "O número de convidados não pode exceder a capacidade do ambiente (" + area.getCapacidade() + ")."; + } + } catch (NumberFormatException ex) { + return "Número de convidados inválido."; + } + } + return null; + } +} \ No newline at end of file