commit f1077c108c46b28f1e4f19efcda7a3604172702b Author: andre00bejarano00vaca Date: Sat Nov 29 10:46:26 2025 -0400 se añadio websocket para terminar el remate diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..3b41682 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +/mvnw text eol=lf +*.cmd text eol=crlf diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml new file mode 100644 index 0000000..8c6d757 --- /dev/null +++ b/.gitea/workflows/deploy.yml @@ -0,0 +1,28 @@ +name: Deploy Spring Boot App + +on: + push: + branches: + - master + +jobs: + build-and-deploy: + runs-on: self-hosted + steps: + - name: Checkout + uses: actions/checkout@v3 + + - name: Set up JDK 21 + uses: actions/setup-java@v3 + with: + distrobution: 'temurin' + java-version: '21' + + - name: Build with Maven + run: mvn clean package -DskipTests + + - name: Restart Spring Boot via Supervisor + run: sudo supervisorctl restart fercogan + + + diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..667aaef --- /dev/null +++ b/.gitignore @@ -0,0 +1,33 @@ +HELP.md +target/ +.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..44f3cf2 --- /dev/null +++ b/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,2 @@ +distributionType=only-script +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.zip diff --git a/TIC.txt b/TIC.txt new file mode 100644 index 0000000..2e72b3e --- /dev/null +++ b/TIC.txt @@ -0,0 +1,24 @@ +Java 21 o superior + +Spring Boot 3.5.5 → framework principal para crear el backend REST. + +Spring Security + +Spring Data JPA + +🔹 Base de datos + +Hibernate +MySQL + +🔹 Seguridad y encriptación + +BCryptPasswordEncoder → codificación segura de contraseñas. + +Basic Auth (HTTP Basic Authentication) → método de autenticación para pruebas. + +🔹 Servidor / despliegue + +Tomcat embebido → servidor web incluido en Spring Boot para ejecutar la app. + +Maven / Gradle diff --git a/mvnw b/mvnw new file mode 100755 index 0000000..e9cf8d3 --- /dev/null +++ b/mvnw @@ -0,0 +1,295 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you 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 +# +# http://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. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Apache Maven Wrapper startup batch script, version 3.3.3 +# +# Optional ENV vars +# ----------------- +# JAVA_HOME - location of a JDK home dir, required when download maven via java source +# MVNW_REPOURL - repo url base for downloading maven distribution +# MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +# MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output +# ---------------------------------------------------------------------------- + +set -euf +[ "${MVNW_VERBOSE-}" != debug ] || set -x + +# OS specific support. +native_path() { printf %s\\n "$1"; } +case "$(uname)" in +CYGWIN* | MINGW*) + [ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")" + native_path() { cygpath --path --windows "$1"; } + ;; +esac + +# set JAVACMD and JAVACCMD +set_java_home() { + # For Cygwin and MinGW, ensure paths are in Unix format before anything is touched + 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" + JAVACCMD="$JAVA_HOME/jre/sh/javac" + else + JAVACMD="$JAVA_HOME/bin/java" + JAVACCMD="$JAVA_HOME/bin/javac" + + if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then + echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2 + echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2 + return 1 + fi + fi + else + JAVACMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v java + )" || : + JAVACCMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v javac + )" || : + + if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then + echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2 + return 1 + fi + fi +} + +# hash string like Java String::hashCode +hash_string() { + str="${1:-}" h=0 + while [ -n "$str" ]; do + char="${str%"${str#?}"}" + h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296)) + str="${str#?}" + done + printf %x\\n $h +} + +verbose() { :; } +[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; } + +die() { + printf %s\\n "$1" >&2 + exit 1 +} + +trim() { + # MWRAPPER-139: + # Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds. + # Needed for removing poorly interpreted newline sequences when running in more + # exotic environments such as mingw bash on Windows. + printf "%s" "${1}" | tr -d '[:space:]' +} + +scriptDir="$(dirname "$0")" +scriptName="$(basename "$0")" + +# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties +while IFS="=" read -r key value; do + case "${key-}" in + distributionUrl) distributionUrl=$(trim "${value-}") ;; + distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;; + esac +done <"$scriptDir/.mvn/wrapper/maven-wrapper.properties" +[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" + +case "${distributionUrl##*/}" in +maven-mvnd-*bin.*) + MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ + case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in + *AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;; + :Darwin*x86_64) distributionPlatform=darwin-amd64 ;; + :Darwin*arm64) distributionPlatform=darwin-aarch64 ;; + :Linux*x86_64*) distributionPlatform=linux-amd64 ;; + *) + echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2 + distributionPlatform=linux-amd64 + ;; + esac + distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip" + ;; +maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;; +*) MVN_CMD="mvn${scriptName#mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;; +esac + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}" +distributionUrlName="${distributionUrl##*/}" +distributionUrlNameMain="${distributionUrlName%.*}" +distributionUrlNameMain="${distributionUrlNameMain%-bin}" +MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}" +MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")" + +exec_maven() { + unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || : + exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD" +} + +if [ -d "$MAVEN_HOME" ]; then + verbose "found existing MAVEN_HOME at $MAVEN_HOME" + exec_maven "$@" +fi + +case "${distributionUrl-}" in +*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;; +*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;; +esac + +# prepare tmp dir +if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then + clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; } + trap clean HUP INT TERM EXIT +else + die "cannot create temp dir" +fi + +mkdir -p -- "${MAVEN_HOME%/*}" + +# Download and Install Apache Maven +verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +verbose "Downloading from: $distributionUrl" +verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +# select .zip or .tar.gz +if ! command -v unzip >/dev/null; then + distributionUrl="${distributionUrl%.zip}.tar.gz" + distributionUrlName="${distributionUrl##*/}" +fi + +# verbose opt +__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR='' +[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v + +# normalize http auth +case "${MVNW_PASSWORD:+has-password}" in +'') MVNW_USERNAME='' MVNW_PASSWORD='' ;; +has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;; +esac + +if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then + verbose "Found wget ... using wget" + wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl" +elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then + verbose "Found curl ... using curl" + curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl" +elif set_java_home; then + verbose "Falling back to use Java to download" + javaSource="$TMP_DOWNLOAD_DIR/Downloader.java" + targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName" + cat >"$javaSource" <<-END + public class Downloader extends java.net.Authenticator + { + protected java.net.PasswordAuthentication getPasswordAuthentication() + { + return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() ); + } + public static void main( String[] args ) throws Exception + { + setDefault( new Downloader() ); + java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() ); + } + } + END + # For Cygwin/MinGW, switch paths to Windows format before running javac and java + verbose " - Compiling Downloader.java ..." + "$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java" + verbose " - Running Downloader.java ..." + "$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")" +fi + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +if [ -n "${distributionSha256Sum-}" ]; then + distributionSha256Result=false + if [ "$MVN_CMD" = mvnd.sh ]; then + echo "Checksum validation is not supported for maven-mvnd." >&2 + echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + elif command -v sha256sum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c - >/dev/null 2>&1; then + distributionSha256Result=true + fi + elif command -v shasum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then + distributionSha256Result=true + fi + else + echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2 + echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + fi + if [ $distributionSha256Result = false ]; then + echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2 + echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2 + exit 1 + fi +fi + +# unzip and move +if command -v unzip >/dev/null; then + unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip" +else + tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar" +fi + +# Find the actual extracted directory name (handles snapshots where filename != directory name) +actualDistributionDir="" + +# First try the expected directory name (for regular distributions) +if [ -d "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" ]; then + if [ -f "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/bin/$MVN_CMD" ]; then + actualDistributionDir="$distributionUrlNameMain" + fi +fi + +# If not found, search for any directory with the Maven executable (for snapshots) +if [ -z "$actualDistributionDir" ]; then + # enable globbing to iterate over items + set +f + for dir in "$TMP_DOWNLOAD_DIR"/*; do + if [ -d "$dir" ]; then + if [ -f "$dir/bin/$MVN_CMD" ]; then + actualDistributionDir="$(basename "$dir")" + break + fi + fi + done + set -f +fi + +if [ -z "$actualDistributionDir" ]; then + verbose "Contents of $TMP_DOWNLOAD_DIR:" + verbose "$(ls -la "$TMP_DOWNLOAD_DIR")" + die "Could not find Maven distribution directory in extracted archive" +fi + +verbose "Found extracted Maven distribution directory: $actualDistributionDir" +printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$actualDistributionDir/mvnw.url" +mv -- "$TMP_DOWNLOAD_DIR/$actualDistributionDir" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME" + +clean || : +exec_maven "$@" diff --git a/mvnw.cmd b/mvnw.cmd new file mode 100644 index 0000000..2e2dbe0 --- /dev/null +++ b/mvnw.cmd @@ -0,0 +1,189 @@ +<# : 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.3 +@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/pom.xml b/pom.xml new file mode 100644 index 0000000..135fa04 --- /dev/null +++ b/pom.xml @@ -0,0 +1,81 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 3.5.5 + + + com.example + fercoganbackend + 0.0.1-SNAPSHOT + fercoganbackend + Demo project for Spring Boot + + + + + + + + + + + + + + + 21 + + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-websocket + + + + com.mysql + mysql-connector-j + runtime + + + org.springframework.boot + spring-boot-starter-test + test + + + org.springframework.boot + spring-boot-starter-webflux + + + org.springframework.security + spring-security-test + test + + + org.springframework.boot + spring-boot-starter-security + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + diff --git a/src/main/java/com/example/fercoganbackend/FercoganbackendApplication.java b/src/main/java/com/example/fercoganbackend/FercoganbackendApplication.java new file mode 100644 index 0000000..f4c3b19 --- /dev/null +++ b/src/main/java/com/example/fercoganbackend/FercoganbackendApplication.java @@ -0,0 +1,13 @@ +package com.example.fercoganbackend; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class FercoganbackendApplication { + + public static void main(String[] args) { + SpringApplication.run(FercoganbackendApplication.class, args); + } + +} diff --git a/src/main/java/com/example/fercoganbackend/component/ContadorWebSocketHandler.java b/src/main/java/com/example/fercoganbackend/component/ContadorWebSocketHandler.java new file mode 100644 index 0000000..f4413f5 --- /dev/null +++ b/src/main/java/com/example/fercoganbackend/component/ContadorWebSocketHandler.java @@ -0,0 +1,126 @@ +package com.example.fercoganbackend.component; + +import com.example.fercoganbackend.service.ContadorService; +import org.springframework.stereotype.Component; +import org.springframework.web.socket.*; +import org.springframework.web.socket.handler.TextWebSocketHandler; +import java.io.IOException; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import java.util.Set; +import java.util.concurrent.CopyOnWriteArraySet; + +@Component +public class ContadorWebSocketHandler extends TextWebSocketHandler { + + private final Map> sesionesPorLote = new ConcurrentHashMap<>(); + private final ContadorService contadorService; + + public ContadorWebSocketHandler(ContadorService contadorService) { + this.contadorService = contadorService; + } + + // En ContadorWebSocketHandler + public void notificarFinRemate(String remate, String lote) { + String message = "{\"estado\":\"finalizado\"}"; + broadcastToRoom(remate, lote, message); + } + + + @Override + public void afterConnectionEstablished(WebSocketSession session) throws Exception { + String roomKey = extraerRoomKey(session); + + System.out.println("=== NUEVA CONEXIÓN WEBSOCKET ==="); + System.out.println("Session ID: " + session.getId()); + System.out.println("URI: " + session.getUri()); + System.out.println("Room Key: " + roomKey); + System.out.println("Sesiones activas en " + roomKey + ": " + + (sesionesPorLote.get(roomKey) != null ? sesionesPorLote.get(roomKey).size() : 0)); + + // Agregar sesión a la sala correspondiente + sesionesPorLote.computeIfAbsent(roomKey, k -> new CopyOnWriteArraySet<>()).add(session); + + // Enviar valor actual del contador para este lote + int valorActual = contadorService.getContador(roomKey); + session.sendMessage(new TextMessage(String.valueOf(valorActual))); + + System.out.println("Valor inicial enviado: " + valorActual); + System.out.println("=== CONEXIÓN ESTABLECIDA ==="); + } + + @Override + public void afterConnectionClosed(WebSocketSession session, CloseStatus status) { + String roomKey = extraerRoomKey(session); + Set sesiones = sesionesPorLote.get(roomKey); + if (sesiones != null) { + sesiones.remove(session); + if (sesiones.isEmpty()) { + sesionesPorLote.remove(roomKey); + } + } + System.out.println("Conexión cerrada para: " + roomKey + " - " + status); + } + + @Override + public void handleTextMessage(WebSocketSession session, TextMessage message) throws Exception { + String roomKey = extraerRoomKey(session); + String payload = message.getPayload(); + + System.out.println("Mensaje recibido de " + roomKey + ": " + payload); + + if ("incrementar".equals(payload)) { + int nuevoValor = contadorService.incrementar(roomKey); + System.out.println("Incrementando " + roomKey + " a: " + nuevoValor); + broadcastToRoom(roomKey, String.valueOf(nuevoValor)); + } + } + + // Broadcast a una sala específica + public void broadcastToRoom(String remate, String lote, String message) { + String roomKey = generarRoomKey(remate, lote); + System.out.println("Broadcast a room: " + roomKey + " - Mensaje: " + message); + broadcastToRoom(roomKey, message); + } + + private void broadcastToRoom(String roomKey, String message) { + Set sesiones = sesionesPorLote.get(roomKey); + System.out.println("Buscando sesiones para: " + roomKey); + System.out.println("Sesiones encontradas: " + (sesiones != null ? sesiones.size() : 0)); + + if (sesiones != null) { + for (WebSocketSession session : sesiones) { + try { + if (session.isOpen()) { + System.out.println("Enviando a session: " + session.getId()); + session.sendMessage(new TextMessage(message)); + } else { + System.out.println("Session cerrada: " + session.getId()); + } + } catch (IOException e) { + System.err.println("Error enviando mensaje a " + session.getId() + ": " + e.getMessage()); + } + } + } else { + System.out.println("No hay sesiones activas para: " + roomKey); + } + } + + private String extraerRoomKey(WebSocketSession session) { + String path = session.getUri().getPath(); + String[] segments = path.split("/"); + + // Para /ws/remate1/lote1 los segmentos son: ["", "ws", "remate1", "lote1"] + if (segments.length >= 4) { + String remate = segments[2]; // índice 2 = remate1 + String lote = segments[3]; // índice 3 = lote1 + return generarRoomKey(remate, lote); + } + + return "default-default"; + } + + private String generarRoomKey(String remate, String lote) { + return remate + "-" + lote; + } +} \ No newline at end of file diff --git a/src/main/java/com/example/fercoganbackend/component/EventoWebSocketHandler.java b/src/main/java/com/example/fercoganbackend/component/EventoWebSocketHandler.java new file mode 100644 index 0000000..70b1b6d --- /dev/null +++ b/src/main/java/com/example/fercoganbackend/component/EventoWebSocketHandler.java @@ -0,0 +1,52 @@ +package com.example.fercoganbackend.component; + +import org.springframework.stereotype.Component; +import org.springframework.web.socket.CloseStatus; +import org.springframework.web.socket.TextMessage; +import org.springframework.web.socket.WebSocketSession; +import org.springframework.web.socket.handler.TextWebSocketHandler; + +import java.util.Map; +import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.CopyOnWriteArraySet; + +@Component +public class EventoWebSocketHandler extends TextWebSocketHandler { + + private final Map> sesionesPorRemate = new ConcurrentHashMap<>(); + + @Override + public void afterConnectionEstablished(WebSocketSession session) { + String remateId = session.getUri().getPath().split("/")[3]; + + sesionesPorRemate + .computeIfAbsent(remateId, k -> new CopyOnWriteArraySet<>()) + .add(session); + + System.out.println("[EVENTOS] Cliente conectado al remate: " + remateId); + } + + @Override + public void afterConnectionClosed(WebSocketSession session, CloseStatus status) { + String remateId = session.getUri().getPath().split("/")[3]; + sesionesPorRemate.getOrDefault(remateId, Set.of()).remove(session); + System.out.println("[EVENTOS] Cliente desconectado: " + remateId); + } + + public void enviarEvento(String remateId, String mensaje) { + Set sesiones = sesionesPorRemate.get(remateId); + if (sesiones == null) return; + + for (WebSocketSession session : sesiones) { + try { + if (session.isOpen()) { + session.sendMessage(new TextMessage(mensaje)); + } + } catch (Exception e) { + e.printStackTrace(); + } + } + } +} + diff --git a/src/main/java/com/example/fercoganbackend/configuration/CorsConfig.java b/src/main/java/com/example/fercoganbackend/configuration/CorsConfig.java new file mode 100644 index 0000000..92b91e2 --- /dev/null +++ b/src/main/java/com/example/fercoganbackend/configuration/CorsConfig.java @@ -0,0 +1,23 @@ +package com.example.fercoganbackend.configuration; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.config.annotation.CorsRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +@Configuration +public class CorsConfig { + + @Bean + public WebMvcConfigurer corsConfigurer() { + return new WebMvcConfigurer() { + @Override + public void addCorsMappings(CorsRegistry registry) { + registry.addMapping("/**") // permite todos los endpoints + .allowedOrigins("*") // permite todas las apps cliente + .allowedMethods("GET", "POST", "PUT", "DELETE", "OPTIONS") // métodos permitidos + .allowedHeaders("*"); // cabeceras permitidas + } + }; + } +} diff --git a/src/main/java/com/example/fercoganbackend/configuration/SecurityConfig.java b/src/main/java/com/example/fercoganbackend/configuration/SecurityConfig.java new file mode 100644 index 0000000..92ff392 --- /dev/null +++ b/src/main/java/com/example/fercoganbackend/configuration/SecurityConfig.java @@ -0,0 +1,63 @@ +package com.example.fercoganbackend.configuration; + +import com.example.fercoganbackend.service.UsuarioDetailsService; +import jakarta.servlet.http.HttpServletResponse; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.config.annotation.authentication.configuration.AuthenticationConfiguration; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.configuration.WebSecurityCustomizer; +import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.security.web.SecurityFilterChain; + +@Configuration +public class SecurityConfig { + + private final UsuarioDetailsService usuarioDetailsService; + + public SecurityConfig(UsuarioDetailsService usuarioDetailsService) { + this.usuarioDetailsService = usuarioDetailsService; + } + + @Bean + public PasswordEncoder passwordEncoder() { + return new BCryptPasswordEncoder(); + } + + @Bean + public AuthenticationManager authenticationManager(AuthenticationConfiguration authConfig) throws Exception { + return authConfig.getAuthenticationManager(); + } + + @Bean + public WebSecurityCustomizer webSecurityCustomizer() { + return (web) -> web.ignoring().requestMatchers("/ws/**"); + } + + @Bean + public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { + http + .csrf(AbstractHttpConfigurer::disable) + .authorizeHttpRequests(auth -> auth + .requestMatchers("/auth/**").permitAll() + .requestMatchers("/favicon.ico", "/error", "/static/**","/contador/**", "/api/**").permitAll() + .requestMatchers("/ws/**").permitAll() // permitir WS sin auth + .requestMatchers("/admin/**").hasAnyAuthority("SUPER_USUARIO","ADMIN") + .anyRequest().authenticated() + ) + .httpBasic(httpBasic -> httpBasic + .authenticationEntryPoint((request, response, authException) -> { + // Log del fallo de autenticación + System.out.println("Fallo de autenticación: " + authException.getMessage()); + response.sendError(HttpServletResponse.SC_UNAUTHORIZED, authException.getMessage()); + }) + ); + return http.build(); + } + +} + + diff --git a/src/main/java/com/example/fercoganbackend/configuration/WebSocketConfig.java b/src/main/java/com/example/fercoganbackend/configuration/WebSocketConfig.java new file mode 100644 index 0000000..b47b5a2 --- /dev/null +++ b/src/main/java/com/example/fercoganbackend/configuration/WebSocketConfig.java @@ -0,0 +1,30 @@ +package com.example.fercoganbackend.configuration; + +import com.example.fercoganbackend.component.ContadorWebSocketHandler; +import com.example.fercoganbackend.component.EventoWebSocketHandler; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.socket.config.annotation.EnableWebSocket; +import org.springframework.web.socket.config.annotation.WebSocketConfigurer; +import org.springframework.web.socket.config.annotation.WebSocketHandlerRegistry; + +@Configuration +@EnableWebSocket +public class WebSocketConfig implements WebSocketConfigurer { + + private final ContadorWebSocketHandler webSocketHandler; + private final EventoWebSocketHandler eventoWebSocketHandler; + + public WebSocketConfig(ContadorWebSocketHandler webSocketHandler, EventoWebSocketHandler eventoWebSocketHandler) { + this.webSocketHandler = webSocketHandler; + this.eventoWebSocketHandler = eventoWebSocketHandler; + } + + @Override + public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) { + registry.addHandler(webSocketHandler, "/ws/{remate}/{lote}") + .setAllowedOrigins("*"); + registry.addHandler(eventoWebSocketHandler, "/ws/eventos/{remate}") + .setAllowedOrigins("*"); + + } +} \ No newline at end of file diff --git a/src/main/java/com/example/fercoganbackend/controller/AppController.java b/src/main/java/com/example/fercoganbackend/controller/AppController.java new file mode 100644 index 0000000..b83cb8e --- /dev/null +++ b/src/main/java/com/example/fercoganbackend/controller/AppController.java @@ -0,0 +1,79 @@ +package com.example.fercoganbackend.controller; + +import com.example.fercoganbackend.component.ContadorWebSocketHandler; +import com.example.fercoganbackend.entity.Rol; +import com.example.fercoganbackend.entity.Usuario; +import com.example.fercoganbackend.otros.ConfirmadoTF; +import com.example.fercoganbackend.service.ContadorService; +import com.example.fercoganbackend.service.UsuarioService; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import java.util.Set; +import java.util.List; + +@RestController +public class AppController { + + private final UsuarioService usuarioService; + private final ContadorService contadorService; + private final ContadorWebSocketHandler webSocketHandler; + + public AppController(UsuarioService usuarioService, ContadorService contadorService, ContadorWebSocketHandler webSocketHandler) { + this.usuarioService = usuarioService; + this.contadorService = contadorService; + this.webSocketHandler = webSocketHandler; + } + + // Registro + @PostMapping("/auth/registrar") + public ResponseEntity registrar(@RequestParam String username, + @RequestParam String password) { + if (usuarioService.estaRegistrado(username)) { + return ResponseEntity.status(HttpStatus.CONFLICT).body("Usuario ya existe ❌"); + } + + usuarioService.registrarUsuario(username, password, Set.of(Rol.CLIENTE)); + return ResponseEntity.ok("Usuario registrado, pendiente de aprobación ✅"); + } + + + + // Verificar si aprobado + @GetMapping("/auth/verificar/{username}") + public ConfirmadoTF verificar(@PathVariable String username) { + ConfirmadoTF aprobado = usuarioService.registradoYAprobado(username); + return aprobado; + } + + @GetMapping("/auth/existe/{username}") + public ResponseEntity existe(@PathVariable String username) { + ConfirmadoTF aprobado = usuarioService.registradoYAprobado(username); + + if (aprobado == null) { + return ResponseEntity.status(HttpStatus.NOT_FOUND).build(); + } + + if (!aprobado.isConfirmed()) { // supongamos que ConfirmadoTF tiene isAprobado() + return ResponseEntity.status(HttpStatus.UNAUTHORIZED).build(); + } + + return ResponseEntity.ok(aprobado); + } + + + // Listar pendientes (solo admin/super) + @GetMapping("/admin/pendientes") + public List pendientes() { + return usuarioService.listarPendientes(); + } + + // Aceptar usuario (solo admin/super) + @PostMapping("/admin/aceptar/{id}") + public String aceptar(@PathVariable Long id) { + usuarioService.aceptarUsuario(id); + return "Usuario aprobado ✅"; + } + +} + diff --git a/src/main/java/com/example/fercoganbackend/controller/CabanaController.java b/src/main/java/com/example/fercoganbackend/controller/CabanaController.java new file mode 100644 index 0000000..4b3b612 --- /dev/null +++ b/src/main/java/com/example/fercoganbackend/controller/CabanaController.java @@ -0,0 +1,55 @@ +package com.example.fercoganbackend.controller; + +import com.example.fercoganbackend.entity.Cabana; +import com.example.fercoganbackend.service.CabanaService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequestMapping("/api/cabanas") +public class CabanaController { + + @Autowired + private CabanaService cabanaService; + + @GetMapping + public List getAll() { + return cabanaService.findAll(); + } + + @GetMapping("/{id}") + public ResponseEntity getById(@PathVariable Long id) { + return cabanaService.findById(id) + .map(ResponseEntity::ok) + .orElse(ResponseEntity.notFound().build()); + } + + @PostMapping + public Cabana create(@RequestBody Cabana cabana) { + return cabanaService.save(cabana); + } + + @PutMapping("/{id}") + public ResponseEntity update(@PathVariable Long id, @RequestBody Cabana cabana) { + return cabanaService.findById(id) + .map(existing -> { + // Actualiza solo los campos necesarios + existing.setNombre(cabana.getNombre()); + existing.setTelefono(cabana.getTelefono()); + existing.setVisible(cabana.getVisible()); + + Cabana updated = cabanaService.save(existing); + return ResponseEntity.ok(updated); + }) + .orElse(ResponseEntity.notFound().build()); + } + + @DeleteMapping("/{id}") + public ResponseEntity delete(@PathVariable Long id) { + cabanaService.delete(id); + return ResponseEntity.noContent().build(); + } +} diff --git a/src/main/java/com/example/fercoganbackend/controller/ContadorController.java b/src/main/java/com/example/fercoganbackend/controller/ContadorController.java new file mode 100644 index 0000000..9b8d4d1 --- /dev/null +++ b/src/main/java/com/example/fercoganbackend/controller/ContadorController.java @@ -0,0 +1,47 @@ +package com.example.fercoganbackend.controller; + +import com.example.fercoganbackend.component.ContadorWebSocketHandler; +import com.example.fercoganbackend.service.ContadorService; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping("/contador") +public class ContadorController { + private final ContadorService contadorService; + private final ContadorWebSocketHandler webSocketHandler; + + public ContadorController(ContadorService contadorService, + ContadorWebSocketHandler webSocketHandler) { + this.contadorService = contadorService; + this.webSocketHandler = webSocketHandler; + } + + @PostMapping("/incrementar/{remate}/{lote}") + public int incrementar(@PathVariable String remate, @PathVariable String lote) { + String roomKey = remate + "-" + lote; + int nuevoValor = contadorService.incrementar(roomKey); + + System.out.println("=== INCREMENTAR VIA REST ==="); + System.out.println("Remate: " + remate + ", Lote: " + lote); + System.out.println("Room Key: " + roomKey); + System.out.println("Nuevo valor: " + nuevoValor); + + webSocketHandler.broadcastToRoom(remate, lote, String.valueOf(nuevoValor)); + return nuevoValor; + } + + @GetMapping("/{remate}/{lote}") + public int getContador(@PathVariable String remate, @PathVariable String lote) { + return contadorService.getContador(remate + "-" + lote); + } + + @PostMapping("/reset/{remate}/{lote}") + public int resetContador(@PathVariable String remate, @PathVariable String lote, + @RequestParam(defaultValue = "200") int valorInicial) { + String roomKey = remate + "-" + lote; + contadorService.setContador(roomKey, valorInicial); + int valor = contadorService.getContador(roomKey); + webSocketHandler.broadcastToRoom(remate, lote, String.valueOf(valor)); + return valor; + } +} \ No newline at end of file diff --git a/src/main/java/com/example/fercoganbackend/controller/HistorialLotesController.java b/src/main/java/com/example/fercoganbackend/controller/HistorialLotesController.java new file mode 100644 index 0000000..dad4322 --- /dev/null +++ b/src/main/java/com/example/fercoganbackend/controller/HistorialLotesController.java @@ -0,0 +1,31 @@ +package com.example.fercoganbackend.controller; + +import com.example.fercoganbackend.dto.PujaRequest; +import com.example.fercoganbackend.dto.PujaResponse; +import com.example.fercoganbackend.entity.HistorialLotes; +import com.example.fercoganbackend.service.HistorialLotesService; + +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequestMapping("/api/HistorialPujas") +public class HistorialLotesController { + + private final HistorialLotesService historialLote; + + public HistorialLotesController(HistorialLotesService historialLote) { + this.historialLote = historialLote; + } + + @PostMapping + public PujaResponse realizarPuja(@RequestBody PujaRequest request) { + return historialLote.registrarPuja(request); + } + + @GetMapping + public List getHistorialLote(){ + return historialLote.getHistorialLoteAll(); + } +} diff --git a/src/main/java/com/example/fercoganbackend/controller/LoteController.java b/src/main/java/com/example/fercoganbackend/controller/LoteController.java new file mode 100644 index 0000000..76d3e76 --- /dev/null +++ b/src/main/java/com/example/fercoganbackend/controller/LoteController.java @@ -0,0 +1,51 @@ +package com.example.fercoganbackend.controller; + +import com.example.fercoganbackend.entity.Lote; +import com.example.fercoganbackend.service.LoteService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequestMapping("/api/lotes") +public class LoteController { + + @Autowired + private LoteService loteService; + + @GetMapping + public List getAll() { + return loteService.findAll(); + } + + @GetMapping("/{id}") + public ResponseEntity getById(@PathVariable Long id) { + return loteService.findById(id) + .map(ResponseEntity::ok) + .orElse(ResponseEntity.notFound().build()); + } + + @PostMapping + public Lote create(@RequestBody Lote remate) { + return loteService.save(remate); + } + + @PutMapping("/{id}") + public ResponseEntity update(@PathVariable Long id, @RequestBody Lote remate) { + return loteService.findById(id) + .map(r -> { + remate.setId(id); + return ResponseEntity.ok(loteService.save(remate)); + }) + .orElse(ResponseEntity.notFound().build()); + } + + @DeleteMapping("/{id}") + public ResponseEntity delete(@PathVariable Long id) { + loteService.delete(id); + return ResponseEntity.noContent().build(); + } +} + diff --git a/src/main/java/com/example/fercoganbackend/controller/LoteControllerWebFlux.java b/src/main/java/com/example/fercoganbackend/controller/LoteControllerWebFlux.java new file mode 100644 index 0000000..4fc4ae7 --- /dev/null +++ b/src/main/java/com/example/fercoganbackend/controller/LoteControllerWebFlux.java @@ -0,0 +1,90 @@ +package com.example.fercoganbackend.controller; + +import com.example.fercoganbackend.entity.Lote; +import com.example.fercoganbackend.service.LoteServiceWebFlux; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import reactor.core.publisher.Flux; + +import java.util.List; +import java.util.Optional; + +@RestController +@RequestMapping("/api/webflux/lotes") +public class LoteControllerWebFlux { + + @Autowired + private LoteServiceWebFlux loteService; + + @GetMapping + public java.util.List getAll() { + return loteService.findAll(); + } + + @GetMapping("/{id}") + public ResponseEntity getById(@PathVariable Long id) { + return loteService.findById(id) + .map(ResponseEntity::ok) + .orElse(ResponseEntity.notFound().build()); + } + + @PostMapping + public Lote create(@RequestBody Lote remate) { + return loteService.save(remate); + } + + @PutMapping("/{id}") + public ResponseEntity update(@PathVariable Long id, @RequestBody Lote remate) { + return loteService.findById(id) + .map(r -> { + remate.setId(id); + Lote updated = loteService.save(remate); + return ResponseEntity.ok(updated); + }) + .orElse(ResponseEntity.notFound().build()); + } + + @DeleteMapping("/{id}") + public ResponseEntity delete(@PathVariable Long id) { + loteService.delete(id); + return ResponseEntity.noContent().build(); + } + + // -------------------- NUEVO: SSE por LOTE -------------------- + // Endpoint que devuelve el flujo de actualizaciones solo para ese lote (id). + @GetMapping(value = "/stream/{id}", produces = MediaType.TEXT_EVENT_STREAM_VALUE) + public Flux streamLoteById(@PathVariable Long id) { + // flujo de futuras actualizaciones (todos los lotes, luego filtramos por id) + Flux updates = loteService.getSink().asFlux() + .filter(l -> l != null && l.getId() != null && l.getId().equals(id)); + + // enviamos primero el estado actual (si existe), luego las actualizaciones + Optional current = loteService.findById(id); + if (current.isPresent()) { + return Flux.concat(Flux.just(current.get()), updates); + } else { + // si no existe ahora, devolvemos solo futuras actualizaciones (por ejemplo creación posterior) + return updates; + } + } + + @GetMapping(value = "/stream/cabanaid/{cabanaId}", produces = MediaType.TEXT_EVENT_STREAM_VALUE) + public Flux streamLote(@PathVariable Long cabanaId) { + // Flujo de futuras actualizaciones (todos los lotes, luego filtramos por cabanaId) + Flux updates = loteService.getSink().asFlux() + .filter(lote -> lote.getCabana().getId().equals(cabanaId)); + + // Enviamos primero el estado actual (todos los lotes de la cabaña), luego las actualizaciones + List currentLotes = loteService.findByCabanaId(cabanaId); + + if (!currentLotes.isEmpty()) { + return Flux.concat(Flux.fromIterable(currentLotes), updates); + } else { + // Si no existen lotes ahora, devolvemos solo futuras actualizaciones + return updates; + } + } +} + diff --git a/src/main/java/com/example/fercoganbackend/controller/PujaController.java b/src/main/java/com/example/fercoganbackend/controller/PujaController.java new file mode 100644 index 0000000..4e5dbc3 --- /dev/null +++ b/src/main/java/com/example/fercoganbackend/controller/PujaController.java @@ -0,0 +1,65 @@ +package com.example.fercoganbackend.controller; + +import com.example.fercoganbackend.entity.Puja; +import com.example.fercoganbackend.service.PujaService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequestMapping("/api/pujas") +public class PujaController { + + @Autowired + private PujaService pujaService; + + @GetMapping + public List getAll() { + return pujaService.findAll(); + } + + @GetMapping("/id/{id}") + public ResponseEntity getById(@PathVariable Long id) { + return pujaService.findById(id) + .map(ResponseEntity::ok) + .orElse(ResponseEntity.notFound().build()); + } + + @GetMapping("/informe/{remateId}") + public List getForInforme(@PathVariable Long remateId){ + return pujaService.fingForReporte(remateId); + } + @GetMapping("/remate/{id}") + public List getForRemate(@PathVariable Long id){ + return pujaService.findForRemtae(id); + } + + //get coincidir con lote y remate + @GetMapping("/loteyremate/{loteId}/{remateId}") + public List getForLoteAndRemate(@PathVariable Long loteId,@PathVariable Long remateId){ + return pujaService.findForLoteAndRemate(loteId,remateId); + } + + @PostMapping + public Puja create(@RequestBody Puja puja) { + return pujaService.save(puja); + } + + @PutMapping("/{id}") + public ResponseEntity update(@PathVariable Long id, @RequestBody Puja remate) { + return pujaService.findById(id) + .map(r -> { + remate.setId(id); + return ResponseEntity.ok(pujaService.save(remate)); + }) + .orElse(ResponseEntity.notFound().build()); + } + + @DeleteMapping("/{id}") + public ResponseEntity delete(@PathVariable Long id) { + pujaService.delete(id); + return ResponseEntity.noContent().build(); + } +} diff --git a/src/main/java/com/example/fercoganbackend/controller/RemateController.java b/src/main/java/com/example/fercoganbackend/controller/RemateController.java new file mode 100644 index 0000000..5e5f271 --- /dev/null +++ b/src/main/java/com/example/fercoganbackend/controller/RemateController.java @@ -0,0 +1,80 @@ +package com.example.fercoganbackend.controller; + +import com.example.fercoganbackend.component.ContadorWebSocketHandler; +import com.example.fercoganbackend.entity.Remate; +import com.example.fercoganbackend.repository.RemateRepository; +import com.example.fercoganbackend.service.RemateService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import java.io.IOException; +import java.util.List; + +@RestController +@RequestMapping("/api/remates") +public class RemateController { + + @Autowired + private RemateService remateService; + + @GetMapping + public List getAll() { + return remateService.findAll(); + } + + private final RemateRepository remateRepository; + private final ContadorWebSocketHandler webSocketHandler; + + @Autowired + public RemateController(RemateRepository remateRepository, + ContadorWebSocketHandler webSocketHandler) { + this.remateRepository = remateRepository; + this.webSocketHandler = webSocketHandler; + } + + @GetMapping("/{id}") + public ResponseEntity getById(@PathVariable Long id) { + return remateService.findById(id) + .map(ResponseEntity::ok) + .orElse(ResponseEntity.notFound().build()); + } + + @PostMapping + public Remate create(@RequestBody Remate remate) { + return remateService.save(remate); + } + + @PutMapping("/{id}") + public ResponseEntity update(@PathVariable Long id, @RequestBody Remate remate) { + return remateService.findById(id) + .map(r -> { + remate.setId(id); + return ResponseEntity.ok(remateService.save(remate)); + }) + .orElse(ResponseEntity.notFound().build()); + } + + @DeleteMapping("/{id}") + public ResponseEntity delete(@PathVariable Long id) { + remateService.delete(id); + return ResponseEntity.noContent().build(); + } + + @PutMapping("/{remateId}/finalizar/{loteId}") + public ResponseEntity finalizarRemate( + @PathVariable Long remateId, + @PathVariable Long loteId + ) { + remateRepository.actualizarEstado(remateId, "finalizado"); + + remateService.finalizarRemate(remateId, + String.valueOf(loteId) + ); + + return ResponseEntity.ok("Remate finalizado y notificado"); + } + + +} + diff --git a/src/main/java/com/example/fercoganbackend/controller/UserController.java b/src/main/java/com/example/fercoganbackend/controller/UserController.java new file mode 100644 index 0000000..9bd9151 --- /dev/null +++ b/src/main/java/com/example/fercoganbackend/controller/UserController.java @@ -0,0 +1,112 @@ +package com.example.fercoganbackend.controller; + +import com.example.fercoganbackend.entity.Rol; +import com.example.fercoganbackend.entity.Usuario; +import com.example.fercoganbackend.otros.ConfirmadoTF; +import com.example.fercoganbackend.service.UsuarioService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Set; + +@RestController +@RequestMapping("/api/usuarios") +public class UserController { + + @Autowired + private UsuarioService service; + + + // ✅ Obtener todos los usuarios + @GetMapping + public List getAllUsuarios() { + return service.getAll(); + } + + // ✅ Registrar nuevo usuario + @PostMapping("/registrar") + public Usuario registrarUsuario(@RequestBody UsuarioRequest request) { + return service.registrarUsuario(request.getUsername(), request.getPassword(), request.getRoles()); + } + + // ✅ Listar usuarios pendientes (no aprobados) + @GetMapping("/pendientes") + public List listarPendientes() { + return service.listarPendientes(); + } + + // ✅ Aceptar usuario (cambiar a aprobado = true) + @PatchMapping("/aceptar/{id}") + public Usuario aceptarUsuario(@PathVariable Long id) { + return service.aceptarUsuario(id); + } + + // ✅ Verificar si un usuario está aprobado + @GetMapping("/aprobado/{username}") + public boolean estaAprobado(@PathVariable String username) { + return service.estaAprobado(username); + } + + // ✅ Verificar si un usuario está registrado + @GetMapping("/registrado/{username}") + public boolean estaRegistrado(@PathVariable String username) { + return service.estaRegistrado(username); + } + + // ✅ Confirmar si está registrado y aprobado + @GetMapping("/confirmado/{username}") + public ConfirmadoTF registradoYAprobado(@PathVariable String username) { + return service.registradoYAprobado(username); + } + + // ✅ Actualizar usuario (por id) + @PutMapping("/{id}") + public Usuario actualizarUsuario(@PathVariable Long id, @RequestBody Usuario usuario) { + return service.actualizarUsuario(id, usuario); + } + + + // ✅ Eliminar usuario + @DeleteMapping("/{id}") + public ResponseEntity eliminarUsuario(@PathVariable Long id) { + service.eliminarUsuario(id); + return ResponseEntity.ok("Usuario eliminado correctamente"); + } + + + // ✅ DTO interno para registro + public static class UsuarioRequest { + private String username; + private String password; + private Set roles; + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + public Set getRoles() { + return roles; + } + + public void setRoles(Set roles) { + this.roles = roles; + } + } +} diff --git a/src/main/java/com/example/fercoganbackend/dto/PujaRequest.java b/src/main/java/com/example/fercoganbackend/dto/PujaRequest.java new file mode 100644 index 0000000..5835b86 --- /dev/null +++ b/src/main/java/com/example/fercoganbackend/dto/PujaRequest.java @@ -0,0 +1,29 @@ +package com.example.fercoganbackend.dto; + +import java.time.LocalDateTime; + +public class PujaRequest { + private LocalDateTime fecha; + private Double monto; + private Boolean visible; + + private Long usuarioId; + private Long cabanaId; + private Long loteId; + private Long remateId; + + public Long getRemateId(){ + return remateId; + } + public Long getUsuarioId() { + return usuarioId; + } + + public Long getLoteId() { + return loteId; + } + + public Double getMonto() { + return monto; + } +} diff --git a/src/main/java/com/example/fercoganbackend/dto/PujaResponse.java b/src/main/java/com/example/fercoganbackend/dto/PujaResponse.java new file mode 100644 index 0000000..e8b682d --- /dev/null +++ b/src/main/java/com/example/fercoganbackend/dto/PujaResponse.java @@ -0,0 +1,53 @@ +package com.example.fercoganbackend.dto; + +import java.time.LocalDateTime; + +public class PujaResponse { + + private Long pujaId; + private Long loteId; + private Long remateId; + private Long usuarioId; + + private Double montoPujado; + private LocalDateTime fecha; + private String estado; + + public PujaResponse(Long pujaId, Long loteId, Long usuarioId,Long remateId, + Double montoPujado, LocalDateTime fecha, String estado) { + this.pujaId = pujaId; + this.loteId = loteId; + this.remateId = remateId; + this.usuarioId = usuarioId; + this.montoPujado = montoPujado; + this.fecha = fecha; + this.estado = estado; + } + public Long getRemateId(){ + return remateId; + } + + public Long getPujaId() { + return pujaId; + } + + public Long getLoteId() { + return loteId; + } + + public Long getUsuarioId() { + return usuarioId; + } + + public Double getMontoPujado() { + return montoPujado; + } + + public LocalDateTime getFecha() { + return fecha; + } + + public String getEstado() { + return estado; + } +} diff --git a/src/main/java/com/example/fercoganbackend/entity/Cabana.java b/src/main/java/com/example/fercoganbackend/entity/Cabana.java new file mode 100644 index 0000000..7b83c0f --- /dev/null +++ b/src/main/java/com/example/fercoganbackend/entity/Cabana.java @@ -0,0 +1,49 @@ +package com.example.fercoganbackend.entity; + +import jakarta.persistence.*; + +// Cabaña +@Entity +@Table(name = "cabanas") +public class Cabana { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + private String nombre; + private Integer telefono; + private Boolean visible = true; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Integer getTelefono() { + return telefono; + } + + public void setTelefono(Integer telefono) { + this.telefono = telefono; + } + + public String getNombre() { + return nombre; + } + + public void setNombre(String nombre) { + this.nombre = nombre; + } + + public Boolean getVisible() { + return visible; + } + + public void setVisible(Boolean visible) { + this.visible = visible; + } +} + diff --git a/src/main/java/com/example/fercoganbackend/entity/HistorialLotes.java b/src/main/java/com/example/fercoganbackend/entity/HistorialLotes.java new file mode 100644 index 0000000..28228d1 --- /dev/null +++ b/src/main/java/com/example/fercoganbackend/entity/HistorialLotes.java @@ -0,0 +1,107 @@ +package com.example.fercoganbackend.entity; + + +import jakarta.persistence.*; + +import java.time.LocalDateTime; + +@Entity +@Table(name = "historial_lotes") +public class HistorialLotes { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + // Usuario que realizó la puja + @ManyToOne + @JoinColumn(name = "usuario_id", nullable = false) + private Usuario usuario; + + // Lote al que pertenece la puja + @ManyToOne + @JoinColumn(name = "lote_id", nullable = false) + private Lote lote; + + @ManyToOne + @JoinColumn(name= "remate_id",nullable = false) + private Remate remate; + + // Monto pujado + @Column(nullable = false) + private Double monto; + + // Fecha y hora de la puja + @Column(nullable = false) + private LocalDateTime fecha; + + // Estado de la puja (opcional) + private String estado; + + public HistorialLotes() {} + + public HistorialLotes(Usuario usuario, Lote lote, Double monto, LocalDateTime fecha, String estado, Remate remate) { + this.usuario = usuario; + this.lote = lote; + this.remate = remate; + this.monto = monto; + this.fecha = fecha; + this.estado = estado; + } + + public Remate getRemate() { + return remate; + } + + public void setRemate(Remate remate) { + this.remate = remate; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Usuario getUsuario() { + return usuario; + } + + public void setUsuario(Usuario usuario) { + this.usuario = usuario; + } + + public Lote getLote() { + return lote; + } + + public void setLote(Lote lote) { + this.lote = lote; + } + + public Double getMonto() { + return monto; + } + + public void setMonto(Double monto) { + this.monto = monto; + } + + public LocalDateTime getFecha() { + return fecha; + } + + public void setFecha(LocalDateTime fecha) { + this.fecha = fecha; + } + + public String getEstado() { + return estado; + } + + public void setEstado(String estado) { + this.estado = estado; + } +} diff --git a/src/main/java/com/example/fercoganbackend/entity/Lote.java b/src/main/java/com/example/fercoganbackend/entity/Lote.java new file mode 100644 index 0000000..262ca6a --- /dev/null +++ b/src/main/java/com/example/fercoganbackend/entity/Lote.java @@ -0,0 +1,126 @@ +package com.example.fercoganbackend.entity; + +import jakarta.persistence.*; + +// Lote +@Entity +@Table(name = "lotes") +public class Lote { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + private String nombre; + private Double precio; + private String raza; + private Double prelance; + private Double puja; + private String estado; + private Boolean visible = true; + private String video; + private int numLote; + + @ManyToOne + @JoinColumn(name = "remate_id") + private Remate remate; + + @ManyToOne + @JoinColumn(name = "cabana_id") + private Cabana cabana; + + public int getNumLote() { + return numLote; + } + + public void setNumLote(int numLote) { + this.numLote = numLote; + } + + public String getVideo() { + return video; + } + + public void setVideo(String video) { + this.video = video; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getNombre() { + return nombre; + } + + public void setNombre(String nombre) { + this.nombre = nombre; + } + + public Double getPrecio() { + return precio; + } + + public void setPrecio(Double precio) { + this.precio = precio; + } + + public String getRaza() { + return raza; + } + + public void setRaza(String raza) { + this.raza = raza; + } + + public Double getPrelance() { + return prelance; + } + + public void setPrelance(Double prelance) { + this.prelance = prelance; + } + + public Double getPuja() { + return puja; + } + + public void setPuja(Double puja) { + this.puja = puja; + } + + public String getEstado() { + return estado; + } + + public void setEstado(String estado) { + this.estado = estado; + } + + public Boolean getVisible() { + return visible; + } + + public void setVisible(Boolean visible) { + this.visible = visible; + } + + public Remate getRemate() { + return remate; + } + + public void setRemate(Remate remate) { + this.remate = remate; + } + + public Cabana getCabana() { + return cabana; + } + + public void setCabana(Cabana cabana) { + this.cabana = cabana; + } +} diff --git a/src/main/java/com/example/fercoganbackend/entity/Puja.java b/src/main/java/com/example/fercoganbackend/entity/Puja.java new file mode 100644 index 0000000..742b492 --- /dev/null +++ b/src/main/java/com/example/fercoganbackend/entity/Puja.java @@ -0,0 +1,87 @@ +package com.example.fercoganbackend.entity; + +import jakarta.persistence.*; + +import java.time.LocalDateTime; + +// Puja +@Entity +@Table(name = "pujas") +public class Puja { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + private LocalDateTime fecha; + private Double monto; + private Boolean visible; + + @ManyToOne + @JoinColumn(name = "usuario_id") + private Usuario usuario; // ya lo tienes + + @ManyToOne + @JoinColumn(name = "cabana_id") + private Cabana cabana; + + @ManyToOne + @JoinColumn(name = "lote_id") + private Lote lote; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public LocalDateTime getFecha() { + return fecha; + } + + public void setFecha(LocalDateTime fecha) { + this.fecha = fecha; + } + + public Double getMonto() { + return monto; + } + + public void setMonto(Double monto) { + this.monto = monto; + } + + public Boolean getVisible() { + return visible; + } + + public void setVisible(Boolean visible) { + this.visible = visible; + } + + public Usuario getUsuario() { + return usuario; + } + + public void setUsuario(Usuario usuario) { + this.usuario = usuario; + } + + public Cabana getCabana() { + return cabana; + } + + public void setCabana(Cabana cabana) { + this.cabana = cabana; + } + + public Lote getLote() { + return lote; + } + + public void setLote(Lote lote) { + this.lote = lote; + } +} diff --git a/src/main/java/com/example/fercoganbackend/entity/Remate.java b/src/main/java/com/example/fercoganbackend/entity/Remate.java new file mode 100644 index 0000000..6927073 --- /dev/null +++ b/src/main/java/com/example/fercoganbackend/entity/Remate.java @@ -0,0 +1,81 @@ +package com.example.fercoganbackend.entity; + +import jakarta.persistence.*; + +import java.time.LocalDate; +import java.time.LocalDateTime; + +// Remate +@Entity +@Table(name = "remates") +public class Remate { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + private LocalDateTime fechaFin; + private String nombre; + private LocalDateTime fecha; + private String urlListaLotes; + private String estado; + private Boolean visible = true; + + @ManyToOne + @JoinColumn(name = "cabana_id") + private Cabana cabana; + //getter and setter + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getNombre() { + return nombre; + } + + public void setNombre(String nombre) { + this.nombre = nombre; + } + + public LocalDateTime getFecha() { + return fecha; + } + + public void setFecha(LocalDateTime fecha) { + this.fecha = fecha; + } + + public String getUrlListaLotes() { + return urlListaLotes; + } + + public void setUrlListaLotes(String urlListaLotes) { + this.urlListaLotes = urlListaLotes; + } + + public String getEstado() { + return estado; + } + + public void setEstado(String estado) { + this.estado = estado; + } + + public Boolean getVisible() { + return visible; + } + + public void setVisible(Boolean visible) { + this.visible = visible; + } + + public Cabana getCabana() { + return cabana; + } + + public void setCabana(Cabana cabana) { + this.cabana = cabana; + } +} diff --git a/src/main/java/com/example/fercoganbackend/entity/Rol.java b/src/main/java/com/example/fercoganbackend/entity/Rol.java new file mode 100644 index 0000000..6aa2b0b --- /dev/null +++ b/src/main/java/com/example/fercoganbackend/entity/Rol.java @@ -0,0 +1,6 @@ +package com.example.fercoganbackend.entity; + + +public enum Rol { + SUPER_USUARIO, ADMIN, COLABORADOR, CLIENTE +} diff --git a/src/main/java/com/example/fercoganbackend/entity/Usuario.java b/src/main/java/com/example/fercoganbackend/entity/Usuario.java new file mode 100644 index 0000000..320b86d --- /dev/null +++ b/src/main/java/com/example/fercoganbackend/entity/Usuario.java @@ -0,0 +1,74 @@ +package com.example.fercoganbackend.entity; + +import jakarta.persistence.*; +import java.util.Set; + +@Entity +public class Usuario { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + private String username; + private String password; + + @Column(nullable = false) + private Boolean aprobado = false; + + @ElementCollection(fetch = FetchType.EAGER) + @Enumerated(EnumType.STRING) + private Set roles; // aquí consumes el enum + + private Boolean visible = true; + + // getters y setters + + + public Boolean getVisible() { + return visible; + } + + public void setVisible(Boolean visible) { + this.visible = visible; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + public boolean isAprobado() { + return aprobado; + } + + public void setAprobado(boolean aprobado) { + this.aprobado = aprobado; + } + + public Set getRoles() { + return roles; + } + + public void setRoles(Set roles) { + this.roles = roles; + } +} diff --git a/src/main/java/com/example/fercoganbackend/otros/ConfirmadoTF.java b/src/main/java/com/example/fercoganbackend/otros/ConfirmadoTF.java new file mode 100644 index 0000000..cb5381f --- /dev/null +++ b/src/main/java/com/example/fercoganbackend/otros/ConfirmadoTF.java @@ -0,0 +1,25 @@ +package com.example.fercoganbackend.otros; + +public class ConfirmadoTF { + private boolean authenticated; + private boolean confirmed; + + public ConfirmadoTF(){ + } + + public boolean isAuthenticated() { + return authenticated; + } + + public void setAuthenticated(boolean authenticated) { + this.authenticated = authenticated; + } + + public boolean isConfirmed() { + return confirmed; + } + + public void setConfirmed(boolean confirmed) { + this.confirmed = confirmed; + } +} diff --git a/src/main/java/com/example/fercoganbackend/otros/UsuarioPrincipal.java b/src/main/java/com/example/fercoganbackend/otros/UsuarioPrincipal.java new file mode 100644 index 0000000..d769c79 --- /dev/null +++ b/src/main/java/com/example/fercoganbackend/otros/UsuarioPrincipal.java @@ -0,0 +1,54 @@ +package com.example.fercoganbackend.otros; + +import com.example.fercoganbackend.entity.Usuario; +import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.authority.SimpleGrantedAuthority; +import org.springframework.security.core.userdetails.UserDetails; +import java.util.Collection; +import java.util.stream.Collectors; + +public class UsuarioPrincipal implements UserDetails { + private final Usuario usuario; + + public UsuarioPrincipal(Usuario usuario) { + this.usuario = usuario; + } + + @Override + public Collection getAuthorities() { + return usuario.getRoles().stream() + .map(r -> new SimpleGrantedAuthority("ROLE_" + r.name())) + .collect(Collectors.toList()); + } + + @Override + public String getPassword() { + return usuario.getPassword(); + } + + @Override + public String getUsername() { + return usuario.getUsername(); + } + + @Override + public boolean isAccountNonExpired() { + return true; + } + + @Override + public boolean isAccountNonLocked() { + return true; + } + + @Override + public boolean isCredentialsNonExpired() { + return true; + } + + @Override + public boolean isEnabled() { + return usuario.isAprobado(); // aquí usamos tu booleano + } +} + diff --git a/src/main/java/com/example/fercoganbackend/repository/CabanaRepository.java b/src/main/java/com/example/fercoganbackend/repository/CabanaRepository.java new file mode 100644 index 0000000..0d3e951 --- /dev/null +++ b/src/main/java/com/example/fercoganbackend/repository/CabanaRepository.java @@ -0,0 +1,7 @@ +package com.example.fercoganbackend.repository; + +import com.example.fercoganbackend.entity.Cabana; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface CabanaRepository extends JpaRepository {} + diff --git a/src/main/java/com/example/fercoganbackend/repository/HistorialLotesRepository.java b/src/main/java/com/example/fercoganbackend/repository/HistorialLotesRepository.java new file mode 100644 index 0000000..b0a3b38 --- /dev/null +++ b/src/main/java/com/example/fercoganbackend/repository/HistorialLotesRepository.java @@ -0,0 +1,30 @@ +package com.example.fercoganbackend.repository; + +import com.example.fercoganbackend.entity.HistorialLotes; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +import java.time.LocalDateTime; +import java.util.List; + +@Repository +public interface HistorialLotesRepository extends JpaRepository { + + List findByLoteIdOrderByFechaDesc(Long loteId); + + HistorialLotes findFirstByLoteIdOrderByFechaDesc(Long loteId); + + List findByLote_Remate_Id(Long remateId); + + List findByLote_IdAndLote_Remate_Id(Long loteId, Long remateId); + + List findByLote_IdAndLote_Remate_IdAndFechaAfter( + Long loteId, + Long remateId, + LocalDateTime fecha + ); + List findByLote_Remate_IdAndFechaAfter( + Long remateId, + LocalDateTime fecha + ); +} diff --git a/src/main/java/com/example/fercoganbackend/repository/LoteRepository.java b/src/main/java/com/example/fercoganbackend/repository/LoteRepository.java new file mode 100644 index 0000000..01309d2 --- /dev/null +++ b/src/main/java/com/example/fercoganbackend/repository/LoteRepository.java @@ -0,0 +1,16 @@ +package com.example.fercoganbackend.repository; + +import com.example.fercoganbackend.entity.Lote; +import org.springframework.data.domain.Page; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.List; + +public interface LoteRepository extends JpaRepository { + // Con ordenamiento + //List findByCabanaIdOrderByNumeroLote(Long cabanaId); + + // Para paginación + List findByCabanaId(Long cabanaId); + +} diff --git a/src/main/java/com/example/fercoganbackend/repository/PujaRepository.java b/src/main/java/com/example/fercoganbackend/repository/PujaRepository.java new file mode 100644 index 0000000..32ec82f --- /dev/null +++ b/src/main/java/com/example/fercoganbackend/repository/PujaRepository.java @@ -0,0 +1,35 @@ +package com.example.fercoganbackend.repository; + +import com.example.fercoganbackend.entity.HistorialLotes; +import com.example.fercoganbackend.entity.Puja; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; + +import java.time.LocalDateTime; +import java.util.List; + +public interface PujaRepository extends JpaRepository { + + List findByLote_Remate_Id(Long remateId); + + List findByLote_IdAndLote_Remate_Id(Long loteId, Long remateId); + + List findByLote_IdAndLote_Remate_IdAndFechaAfter( + Long loteId, + Long remateId, + LocalDateTime fecha + ); + List findByLote_Remate_IdAndFechaAfter(Long id,LocalDateTime fecha); + + @Query(value = """ + SELECT p.* FROM pujas p + INNER JOIN ( + SELECT lote_id, MAX(monto) AS max_monto + FROM pujas + WHERE lote_id IN (SELECT id FROM lotes WHERE remate_id = :remateId) + GROUP BY lote_id + ) pm ON p.lote_id = pm.lote_id AND p.monto = pm.max_monto + """, nativeQuery = true) + List findMayorPujaPorLotePorRemateNative(Long remateId); + +} diff --git a/src/main/java/com/example/fercoganbackend/repository/RemateRepository.java b/src/main/java/com/example/fercoganbackend/repository/RemateRepository.java new file mode 100644 index 0000000..5b6f2a3 --- /dev/null +++ b/src/main/java/com/example/fercoganbackend/repository/RemateRepository.java @@ -0,0 +1,15 @@ +package com.example.fercoganbackend.repository; + +import com.example.fercoganbackend.entity.Remate; +import jakarta.transaction.Transactional; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; + +public interface RemateRepository extends JpaRepository { + + @Modifying + @Transactional + @Query("UPDATE Remate r SET r.estado = :estado WHERE r.id = :id") + int actualizarEstado(Long id, String estado); +} diff --git a/src/main/java/com/example/fercoganbackend/repository/UsuarioRepository.java b/src/main/java/com/example/fercoganbackend/repository/UsuarioRepository.java new file mode 100644 index 0000000..3805a2a --- /dev/null +++ b/src/main/java/com/example/fercoganbackend/repository/UsuarioRepository.java @@ -0,0 +1,9 @@ +package com.example.fercoganbackend.repository; + +import com.example.fercoganbackend.entity.Usuario; +import org.springframework.data.jpa.repository.JpaRepository; +import java.util.Optional; + +public interface UsuarioRepository extends JpaRepository { + Optional findByUsername(String username); +} diff --git a/src/main/java/com/example/fercoganbackend/service/CabanaService.java b/src/main/java/com/example/fercoganbackend/service/CabanaService.java new file mode 100644 index 0000000..2ca94ff --- /dev/null +++ b/src/main/java/com/example/fercoganbackend/service/CabanaService.java @@ -0,0 +1,32 @@ +package com.example.fercoganbackend.service; + +import com.example.fercoganbackend.entity.Cabana; +import com.example.fercoganbackend.repository.CabanaRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Optional; + +@Service +public class CabanaService { + + @Autowired + private CabanaRepository cabanaRepository; + + public List findAll() { + return cabanaRepository.findAll(); + } + + public Optional findById(Long id) { + return cabanaRepository.findById(id); + } + + public Cabana save(Cabana remate) { + return cabanaRepository.save(remate); + } + + public void delete(Long id) { + cabanaRepository.deleteById(id); + } +} diff --git a/src/main/java/com/example/fercoganbackend/service/ContadorService.java b/src/main/java/com/example/fercoganbackend/service/ContadorService.java new file mode 100644 index 0000000..a312d7c --- /dev/null +++ b/src/main/java/com/example/fercoganbackend/service/ContadorService.java @@ -0,0 +1,49 @@ +package com.example.fercoganbackend.service; + +import org.springframework.stereotype.Service; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +@Service +public class ContadorService { + private final Map contadoresPorLote = new ConcurrentHashMap<>(); + private final Map switchesPorLote = new ConcurrentHashMap<>(); + + public int incrementar(String roomKey) { + AtomicInteger contador = contadoresPorLote.computeIfAbsent(roomKey, + k -> new AtomicInteger(200)); + boolean sw = switchesPorLote.computeIfAbsent(roomKey, k -> true); + + int valorActual = contador.get(); + int incremento = calcularIncremento(valorActual, sw); + + // Alternar el switch para este lote + switchesPorLote.put(roomKey, !sw); + + return contador.addAndGet(incremento); + } + + public int getContador(String roomKey) { + AtomicInteger contador = contadoresPorLote.get(roomKey); + return contador != null ? contador.get() : 200; // Valor por defecto + } + + public void setContador(String roomKey, int valor) { + AtomicInteger contador = contadoresPorLote.computeIfAbsent(roomKey, + k -> new AtomicInteger(valor)); + contador.set(valor); + } + + private int calcularIncremento(int valorActual, boolean sw) { + if (valorActual < 300) { + return sw ? 20 : 30; + } else if (valorActual < 1000) { + return 50; + } else if (valorActual < 2000) { + return 100; + } else { + return 500; + } + } +} \ No newline at end of file diff --git a/src/main/java/com/example/fercoganbackend/service/HistorialLotesService.java b/src/main/java/com/example/fercoganbackend/service/HistorialLotesService.java new file mode 100644 index 0000000..42a3e1b --- /dev/null +++ b/src/main/java/com/example/fercoganbackend/service/HistorialLotesService.java @@ -0,0 +1,72 @@ +package com.example.fercoganbackend.service; + +import com.example.fercoganbackend.dto.PujaRequest; +import com.example.fercoganbackend.dto.PujaResponse; +import com.example.fercoganbackend.entity.HistorialLotes; +import com.example.fercoganbackend.entity.Remate; +import com.example.fercoganbackend.entity.Usuario; +import com.example.fercoganbackend.entity.Lote; +import com.example.fercoganbackend.repository.HistorialLotesRepository; +import com.example.fercoganbackend.repository.RemateRepository; +import com.example.fercoganbackend.repository.UsuarioRepository; +import com.example.fercoganbackend.repository.LoteRepository; + +import org.springframework.stereotype.Service; + +import java.time.LocalDateTime; +import java.util.List; + +@Service +public class HistorialLotesService { + + private final HistorialLotesRepository historialRepo; + private final UsuarioRepository usuarioRepo; + private final LoteRepository loteRepo; + private final RemateRepository remateRepo; + + public HistorialLotesService(HistorialLotesRepository historialRepo, + UsuarioRepository usuarioRepo, + LoteRepository loteRepo, RemateRepository remateRepo) { + this.historialRepo = historialRepo; + this.remateRepo = remateRepo; + this.usuarioRepo = usuarioRepo; + this.loteRepo = loteRepo; + } + + public List getHistorialLoteAll(){ + return historialRepo.findAll(); + } + + public PujaResponse registrarPuja(PujaRequest request) { + + Usuario usuario = usuarioRepo.findById(request.getUsuarioId()) + .orElseThrow(() -> new RuntimeException("Usuario no encontrado")); + + Lote lote = loteRepo.findById(request.getLoteId()) + .orElseThrow(() -> new RuntimeException("Lote no encontrado")); + + Remate remate = remateRepo.findById(request.getRemateId()) + .orElseThrow(() -> new RuntimeException("No se encontro el remate")); + + HistorialLotes nuevaPuja = new HistorialLotes( + usuario, + lote, + request.getMonto(), + LocalDateTime.now(), + "ACEPTADA", + remate + ); + + historialRepo.save(nuevaPuja); + + return new PujaResponse( + nuevaPuja.getId(), + lote.getId(), + usuario.getId(), + remate.getId(), + nuevaPuja.getMonto(), + nuevaPuja.getFecha(), + nuevaPuja.getEstado() + ); + } +} diff --git a/src/main/java/com/example/fercoganbackend/service/LoteService.java b/src/main/java/com/example/fercoganbackend/service/LoteService.java new file mode 100644 index 0000000..3cc79c9 --- /dev/null +++ b/src/main/java/com/example/fercoganbackend/service/LoteService.java @@ -0,0 +1,32 @@ +package com.example.fercoganbackend.service; + +import com.example.fercoganbackend.entity.Lote; +import com.example.fercoganbackend.repository.LoteRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Optional; + +@Service +public class LoteService { + + @Autowired + private LoteRepository loteRepository; + + public List findAll() { + return loteRepository.findAll(); + } + + public Optional findById(Long id) { + return loteRepository.findById(id); + } + + public Lote save(Lote remate) { + return loteRepository.save(remate); + } + + public void delete(Long id) { + loteRepository.deleteById(id); + } +} diff --git a/src/main/java/com/example/fercoganbackend/service/LoteServiceWebFlux.java b/src/main/java/com/example/fercoganbackend/service/LoteServiceWebFlux.java new file mode 100644 index 0000000..cbda1b2 --- /dev/null +++ b/src/main/java/com/example/fercoganbackend/service/LoteServiceWebFlux.java @@ -0,0 +1,71 @@ +package com.example.fercoganbackend.service; + + +import com.example.fercoganbackend.entity.Lote; +import com.example.fercoganbackend.repository.LoteRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import reactor.core.publisher.Sinks; + +import java.util.List; +import java.util.Optional; + +@Service +public class LoteServiceWebFlux { + + private final LoteRepository repo; + private final Sinks.Many sink; // canal que emite actualizaciones por lote + + public LoteServiceWebFlux(LoteRepository repo) { + this.repo = repo; + // replay().latest() guarda el último emitido (por si alguien se suscribe tarde) + this.sink = Sinks.many().replay().latest(); + } + + public List findAll() { + return repo.findAll(); + } + + public List findByCabanaId(Long id) { + return repo.findByCabanaId(id); + } + + public Optional findById(Long id) { + return repo.findById(id); + } + + @Transactional + public Lote save(Lote lote) { + Lote saved = repo.save(lote); + emitChange(saved); // notificamos a los suscriptores el lote actualizado + return saved; + } + + @Transactional + public void delete(Long id) { + // Intentamos obtener el lote antes de borrar para poder notificar su eliminación + Optional maybe = repo.findById(id); + repo.deleteById(id); + // Emitimos un "evento de eliminación": un Lote con id y visible = false + Lote tombstone = maybe.orElseGet(() -> { + Lote t = new Lote(); + t.setId(id); + return t; + }); + // Si tu entidad Lote tiene campo visible, marcalo; si no, sigue emitiendo el id. + try { + tombstone.setVisible(false); + } catch (Exception ignored) {} + emitChange(tombstone); + } + + private void emitChange(Lote lote) { + // emitimos el objeto lote al sink; los controladores filtran por id + sink.tryEmitNext(lote); + } + + public Sinks.Many getSink() { + return sink; + } +} diff --git a/src/main/java/com/example/fercoganbackend/service/PujaService.java b/src/main/java/com/example/fercoganbackend/service/PujaService.java new file mode 100644 index 0000000..be1615f --- /dev/null +++ b/src/main/java/com/example/fercoganbackend/service/PujaService.java @@ -0,0 +1,94 @@ +package com.example.fercoganbackend.service; + +import com.example.fercoganbackend.entity.Puja; +import com.example.fercoganbackend.entity.Remate; +import com.example.fercoganbackend.repository.PujaRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.example.fercoganbackend.repository.UsuarioRepository; +import com.example.fercoganbackend.repository.CabanaRepository; +import com.example.fercoganbackend.repository.LoteRepository; +import com.example.fercoganbackend.repository.RemateRepository; + + +import java.time.LocalDateTime; +import java.util.List; +import java.util.Optional; + +@Service +public class PujaService { + @Autowired + private UsuarioRepository usuarioRepository; + + @Autowired + private CabanaRepository cabanaRepository; + + @Autowired + private LoteRepository loteRepository; + + @Autowired + private RemateRepository remateRepository; + + @Autowired + private PujaRepository pujaRepository; + + public List findAll() { + return pujaRepository.findAll(); + } + + public List findForRemtae(Long id){ + return pujaRepository.findByLote_Remate_Id(id); + } + + public List findForLoteAndRemate(Long loteId, Long remateId){ + return pujaRepository.findByLote_IdAndLote_Remate_Id(loteId,remateId); + } + + public List findForLoteAndRemateAndDate(Long loteId, Long remateId, LocalDateTime fecha){ + return pujaRepository.findByLote_IdAndLote_Remate_IdAndFechaAfter(loteId, remateId, fecha); + } + public List fingForReporte(Long id){ + return pujaRepository.findMayorPujaPorLotePorRemateNative(id); + } + public Optional findById(Long id) { + return pujaRepository.findById(id); + } + + public Puja save(Puja puja) { + + // Validar USUARIO + if (puja.getUsuario() == null || puja.getUsuario().getId() == null) { + throw new RuntimeException("El usuario es obligatorio"); + } + var usuario = usuarioRepository.findById(puja.getUsuario().getId()) + .orElseThrow(() -> new RuntimeException("Usuario no encontrado")); + + // Validar CABAÑA + if (puja.getCabana() == null || puja.getCabana().getId() == null) { + throw new RuntimeException("La cabaña es obligatoria"); + } + var cabana = cabanaRepository.findById(puja.getCabana().getId()) + .orElseThrow(() -> new RuntimeException("Cabaña no encontrada")); + + // Validar LOTE + if (puja.getLote() == null || puja.getLote().getId() == null) { + throw new RuntimeException("El lote es obligatorio"); + } + var lote = loteRepository.findById(puja.getLote().getId()) + .orElseThrow(() -> new RuntimeException("Lote no encontrado")); + + + // Asignar entidades reales para que JPA las maneje correctamente + puja.setUsuario(usuario); + puja.setCabana(cabana); + puja.setLote(lote); + + return pujaRepository.save(puja); + } + + + public void delete(Long id) { + pujaRepository.deleteById(id); + } +} + diff --git a/src/main/java/com/example/fercoganbackend/service/RemateService.java b/src/main/java/com/example/fercoganbackend/service/RemateService.java new file mode 100644 index 0000000..dcb6416 --- /dev/null +++ b/src/main/java/com/example/fercoganbackend/service/RemateService.java @@ -0,0 +1,50 @@ +package com.example.fercoganbackend.service; + +import com.example.fercoganbackend.component.ContadorWebSocketHandler; +import com.example.fercoganbackend.component.EventoWebSocketHandler; +import com.example.fercoganbackend.entity.Remate; +import com.example.fercoganbackend.repository.RemateRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Optional; + +@Service +public class RemateService { + + @Autowired + private RemateRepository remateRepository; + @Autowired + private EventoWebSocketHandler webSocketHandler; + + public List findAll() { + return remateRepository.findAll(); + } + + public Optional findById(Long id) { + return remateRepository.findById(id); + } + + public Remate save(Remate remate) { + return remateRepository.save(remate); + } + + public void delete(Long id) { + remateRepository.deleteById(id); + } + + + public void finalizarRemate(Long remateId, String loteId) { + // 1. Cambiar estado en la base de datos + remateRepository.actualizarEstado(remateId, "FINALIZADO"); + + // 2. Notificar a todos los clientes conectados + webSocketHandler.enviarEvento( + String.valueOf(remateId), + "FIN_REMATE" + ); + } + +} + diff --git a/src/main/java/com/example/fercoganbackend/service/UsuarioDetailsService.java b/src/main/java/com/example/fercoganbackend/service/UsuarioDetailsService.java new file mode 100644 index 0000000..29c4f2c --- /dev/null +++ b/src/main/java/com/example/fercoganbackend/service/UsuarioDetailsService.java @@ -0,0 +1,50 @@ +package com.example.fercoganbackend.service; + +import com.example.fercoganbackend.entity.Usuario; +import com.example.fercoganbackend.otros.UsuarioPrincipal; +import com.example.fercoganbackend.repository.UsuarioRepository; +import org.springframework.security.core.authority.SimpleGrantedAuthority; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.core.userdetails.UserDetailsService; +import org.springframework.security.core.userdetails.UsernameNotFoundException; +import org.springframework.stereotype.Service; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.List; + + +@Service +public class UsuarioDetailsService implements UserDetailsService { + + private final UsuarioRepository usuarioRepository; + private final Logger logger = LoggerFactory.getLogger(UsuarioDetailsService.class); + + + public UsuarioDetailsService(UsuarioRepository usuarioRepository) { + this.usuarioRepository = usuarioRepository; + } + + @Override + public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException { + logger.info("Intentando autenticar usuario: {}", username); + + Usuario usuario = usuarioRepository.findByUsername(username) + .orElseThrow(() -> { + logger.warn("Usuario no encontrado: {}", username); + return new UsernameNotFoundException("Usuario no encontrado"); + }); + + logger.info("Usuario encontrado: {}, aprobado: {}", usuario.getUsername(), usuario.isAprobado()); + logger.info("Roles del usuario: {}", usuario.getRoles()); + + return new org.springframework.security.core.userdetails.User( + usuario.getUsername(), + usuario.getPassword(), + usuario.isAprobado(), true, true, true, + usuario.getRoles().stream() + .map(r -> new SimpleGrantedAuthority(r.name())) + .toList() + ); + } +} diff --git a/src/main/java/com/example/fercoganbackend/service/UsuarioService.java b/src/main/java/com/example/fercoganbackend/service/UsuarioService.java new file mode 100644 index 0000000..2b685ad --- /dev/null +++ b/src/main/java/com/example/fercoganbackend/service/UsuarioService.java @@ -0,0 +1,78 @@ +package com.example.fercoganbackend.service; +import com.example.fercoganbackend.entity.Rol; +import com.example.fercoganbackend.entity.Usuario; +import com.example.fercoganbackend.otros.ConfirmadoTF; +import com.example.fercoganbackend.repository.UsuarioRepository; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.stereotype.Service; +import java.util.List; +import java.util.Set; + +@Service +public class UsuarioService { + private final UsuarioRepository repo; + private final PasswordEncoder encoder; + + public List getAll(){ + return repo.findAll(); + } + public UsuarioService(UsuarioRepository repo, PasswordEncoder encoder) { + this.repo = repo; + this.encoder = encoder; + } + + public Usuario registrarUsuario(String username, String password, Set roles) { + Usuario u = new Usuario(); + u.setUsername(username); + u.setPassword(encoder.encode(password)); + u.setRoles(roles); + u.setAprobado(false); // no aprobado hasta aceptación + return repo.save(u); + } + + public Usuario actualizarUsuario(Long id, Usuario usuario) { + Usuario existente = repo.findById(id) + .orElseThrow(() -> new RuntimeException("Usuario no encontrado")); + + existente.setUsername(usuario.getUsername()); + existente.setPassword(encoder.encode(usuario.getPassword())); + existente.setRoles(usuario.getRoles()); + existente.setAprobado(usuario.isAprobado()); + existente.setVisible(usuario.getVisible()); + + return repo.save(existente); // <-- Aquí sí se actualiza el existente + } + + public List listarPendientes() { + return repo.findAll().stream().filter(u -> !u.isAprobado()).toList(); + } + + public Usuario aceptarUsuario(Long id) { + Usuario u = repo.findById(id).orElseThrow(); + u.setAprobado(true); + return repo.save(u); + } + + public boolean estaAprobado(String username) { + return repo.findByUsername(username).map(Usuario::isAprobado).orElse(false); + } + public boolean estaRegistrado(String username) { + return repo.findByUsername(username).isPresent(); + } + + public ConfirmadoTF registradoYAprobado(String username){ + ConfirmadoTF confirmadotf = new ConfirmadoTF(); + confirmadotf.setAuthenticated(estaRegistrado(username)); + confirmadotf.setConfirmed(estaAprobado(username)); + return confirmadotf; + } + + public void eliminarUsuario(Long id) { + if (!repo.existsById(id)) { + throw new RuntimeException("Usuario no encontrado"); + } + repo.deleteById(id); + } + + +} diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties new file mode 100644 index 0000000..e1c1d4a --- /dev/null +++ b/src/main/resources/application-dev.properties @@ -0,0 +1,3 @@ +spring.datasource.url=jdbc:mysql://localhost:3306/testdb +spring.datasource.username=andre +spring.datasource.password=andre \ No newline at end of file diff --git a/src/main/resources/application-prod.properties b/src/main/resources/application-prod.properties new file mode 100644 index 0000000..be9eba9 --- /dev/null +++ b/src/main/resources/application-prod.properties @@ -0,0 +1,3 @@ +spring.datasource.url=jdbc:mysql://192.168.5.250:3306/TEST_fercoApp +spring.datasource.username=ferco +spring.datasource.password=9+k+9076[5S26#C1mn"u \ No newline at end of file diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties new file mode 100644 index 0000000..03fcd84 --- /dev/null +++ b/src/main/resources/application.properties @@ -0,0 +1,11 @@ +spring.application.name=fercoganbackend +spring.profiles.active=prod +spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver + +spring.jpa.hibernate.ddl-auto=update +spring.jpa.show-sql=true +spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL8Dialect +# Nivel de log para Spring Security +logging.level.org.springframework.security=DEBUG +logging.level.org.hibernate.SQL=DEBUG +logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE diff --git a/src/test/java/com/example/fercoganbackend/FercoganbackendApplicationTests.java b/src/test/java/com/example/fercoganbackend/FercoganbackendApplicationTests.java new file mode 100644 index 0000000..c861c49 --- /dev/null +++ b/src/test/java/com/example/fercoganbackend/FercoganbackendApplicationTests.java @@ -0,0 +1,13 @@ +package com.example.fercoganbackend; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class FercoganbackendApplicationTests { + + @Test + void contextLoads() { + } + +}