From 9e97dcf6ee1a3459650f60c9b4a9365f24cb8d4f Mon Sep 17 00:00:00 2001 From: h4ckx0r Date: Wed, 21 Jan 2026 10:12:54 +0100 Subject: [PATCH] Add initial project structure with user management and Base64 image support - Create application properties for database configuration - Implement user entity and DTO with Base64 image handling - Add user controller for CRUD operations - Introduce Base64 converter utility for image encoding/decoding - Set up Maven wrapper and project dependencies - Configure .gitignore and .gitattributes for environment consistency --- .gitattributes | 2 + .gitignore | 33 ++ .mvn/wrapper/maven-wrapper.properties | 3 + BASE64_IMAGE_GUIDE.md | 140 +++++++++ mvnw | 295 ++++++++++++++++++ mvnw.cmd | 189 +++++++++++ pom.xml | 86 +++++ .../h4ckx0r/idiomas/IdiomasApplication.java | 13 + .../h4ckx0r/idiomas/ServletInitializer.java | 13 + .../idiomas/controllers/IdiomaController.java | 30 ++ .../controllers/UsuariaController.java | 80 +++++ .../net/h4ckx0r/idiomas/dto/HablaDto.java | 54 ++++ .../net/h4ckx0r/idiomas/dto/IdiomaDto.java | 46 +++ .../net/h4ckx0r/idiomas/dto/UsuariaDto.java | 96 ++++++ .../h4ckx0r/idiomas/dto/UsuarioTipoDto.java | 46 +++ .../net/h4ckx0r/idiomas/entities/Habla.java | 44 +++ .../net/h4ckx0r/idiomas/entities/Idioma.java | 34 ++ .../net/h4ckx0r/idiomas/entities/Usuaria.java | 100 ++++++ .../h4ckx0r/idiomas/entities/UsuarioTipo.java | 34 ++ .../idiomas/mappers/Base64Converter.java | 28 ++ .../h4ckx0r/idiomas/mappers/IdiomaMapper.java | 15 + .../idiomas/mappers/UsuariaMapper.java | 18 ++ .../repositories/IdiomaRepository.java | 8 + .../repositories/UsuariaRepository.java | 17 + .../repositories/UsuarioTipoRepository.java | 7 + src/main/resources/application.properties | 7 + .../idiomas/IdiomasApplicationTests.java | 13 + 27 files changed, 1451 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 .mvn/wrapper/maven-wrapper.properties create mode 100644 BASE64_IMAGE_GUIDE.md create mode 100755 mvnw create mode 100644 mvnw.cmd create mode 100644 pom.xml create mode 100644 src/main/java/net/h4ckx0r/idiomas/IdiomasApplication.java create mode 100644 src/main/java/net/h4ckx0r/idiomas/ServletInitializer.java create mode 100644 src/main/java/net/h4ckx0r/idiomas/controllers/IdiomaController.java create mode 100644 src/main/java/net/h4ckx0r/idiomas/controllers/UsuariaController.java create mode 100644 src/main/java/net/h4ckx0r/idiomas/dto/HablaDto.java create mode 100644 src/main/java/net/h4ckx0r/idiomas/dto/IdiomaDto.java create mode 100644 src/main/java/net/h4ckx0r/idiomas/dto/UsuariaDto.java create mode 100644 src/main/java/net/h4ckx0r/idiomas/dto/UsuarioTipoDto.java create mode 100644 src/main/java/net/h4ckx0r/idiomas/entities/Habla.java create mode 100644 src/main/java/net/h4ckx0r/idiomas/entities/Idioma.java create mode 100644 src/main/java/net/h4ckx0r/idiomas/entities/Usuaria.java create mode 100644 src/main/java/net/h4ckx0r/idiomas/entities/UsuarioTipo.java create mode 100644 src/main/java/net/h4ckx0r/idiomas/mappers/Base64Converter.java create mode 100644 src/main/java/net/h4ckx0r/idiomas/mappers/IdiomaMapper.java create mode 100644 src/main/java/net/h4ckx0r/idiomas/mappers/UsuariaMapper.java create mode 100644 src/main/java/net/h4ckx0r/idiomas/repositories/IdiomaRepository.java create mode 100644 src/main/java/net/h4ckx0r/idiomas/repositories/UsuariaRepository.java create mode 100644 src/main/java/net/h4ckx0r/idiomas/repositories/UsuarioTipoRepository.java create mode 100644 src/main/resources/application.properties create mode 100644 src/test/java/net/h4ckx0r/idiomas/IdiomasApplicationTests.java 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/.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..c0bcafe --- /dev/null +++ b/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,3 @@ +wrapperVersion=3.3.4 +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/BASE64_IMAGE_GUIDE.md b/BASE64_IMAGE_GUIDE.md new file mode 100644 index 0000000..66393b8 --- /dev/null +++ b/BASE64_IMAGE_GUIDE.md @@ -0,0 +1,140 @@ +# Guía: Crear Usuaria con Imagen en Base64 + +## Descripción General + +Ahora puedes crear una usuaria con una imagen enviando la imagen como una cadena Base64 en el JSON del POST request. El sistema se encargará de convertir automáticamente el Base64 a bytes para almacenarla en la base de datos. + +## Cambios Realizados + +### 1. **UsuariaDto.java** +- Cambié el campo `img` de `byte[]` a `String` +- Ahora acepta Base64 en lugar de bytes + +### 2. **Base64Converter.java** (Nuevo) +- Clase utilitaria con métodos para convertir entre Base64 y bytes +- Incluye manejo de errores para Base64 inválido + +### 3. **UsuariaMapper.java** +- Integración con MapStruct para convertir automáticamente: + - `toEntity()`: Convierte `String` (Base64) → `byte[]` + - `toDto()`: Convierte `byte[]` → `String` (Base64) + - `partialUpdate()`: Maneja actualizaciones parciales + +## Cómo Usar + +### Crear Usuaria con Imagen + +```bash +POST http://localhost:8080/usuaria +Content-Type: application/json + +{ + "id": 80, + "fechaElim": null, + "fechaNac": "2026-12-08", + "img": "kjhadfjklaghshjldfgajhsdf==", + "nombre": "pasda", + "pass": "asdad", + "username": "asdad", + "idTipoUsuario": null +} +``` + +### Obtener Usuaria (La imagen se devuelve en Base64) + +```bash +GET http://localhost:8080/usuaria/80 +``` + +Response: +```json +{ + "id": 80, + "fechaElim": null, + "fechaNac": "2026-12-08", + "img": "kjhadfjklaghshjldfgajhsdf==", + "nombre": "pasda", + "pass": "asdad", + "username": "asdad", + "idTipoUsuario": null +} +``` + +## Notas Importantes + +1. **Base64 Válido**: La cadena debe ser Base64 válido. Si no lo es, se guardará como `null`. +2. **Imagen Opcional**: Si no envías el campo `img` o es `null`, se almacenará como `null`. +3. **Conversión Automática**: Todo ocurre automáticamente gracias a MapStruct. No necesitas hacer nada más. + +## Generación de Base64 + +Para generar una cadena Base64 de una imagen, puedes usar: + +### En JavaScript (Frontend): +```javascript +const file = document.getElementById('imageInput').files[0]; +const reader = new FileReader(); +reader.onload = (e) => { + const base64String = e.target.result.split(',')[1]; + // Usar base64String en el JSON +}; +reader.readAsDataURL(file); +``` + +### En Java: +```java +import java.util.Base64; +import java.nio.file.Files; +import java.nio.file.Paths; + +byte[] imageBytes = Files.readAllBytes(Paths.get("path/to/image.png")); +String base64String = Base64.getEncoder().encodeToString(imageBytes); +``` + +### En Python: +```python +import base64 + +with open('image.png', 'rb') as f: + base64_string = base64.b64encode(f.read()).decode('utf-8') +``` + +## Errores Comunes + +1. **Invalid Base64**: Si envías una cadena que no sea Base64 válido, se ignorará y se guardará como `null`. +2. **Null String**: Si el campo `img` es `null`, se guardará como `null` en la base de datos. + +## Arquitectura de la Solución + +``` +UsuariaController (POST) + ↓ +UsuariaDto (img: String) + ↓ +UsuariaMapper.toEntity() + ↓ +Base64Converter.base64ToBytes() + ↓ +Usuaria Entity (img: byte[]) + ↓ +UsuariaRepository.save() + ↓ +Base de Datos (BLOB) +``` + +Cuando obtienes la usuaria: + +``` +Base de Datos (BLOB) + ↓ +Usuaria Entity (img: byte[]) + ↓ +UsuariaMapper.toDto() + ↓ +Base64Converter.bytesToBase64() + ↓ +UsuariaDto (img: String) + ↓ +Response JSON +``` + diff --git a/mvnw b/mvnw new file mode 100755 index 0000000..bd8896b --- /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.4 +# +# 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..92450f9 --- /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.4 +@REM +@REM Optional ENV vars +@REM MVNW_REPOURL - repo url base for downloading maven distribution +@REM MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +@REM MVNW_VERBOSE - true: enable verbose log; others: silence the output +@REM ---------------------------------------------------------------------------- + +@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0) +@SET __MVNW_CMD__= +@SET __MVNW_ERROR__= +@SET __MVNW_PSMODULEP_SAVE=%PSModulePath% +@SET PSModulePath= +@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @( + IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B) +) +@SET PSModulePath=%__MVNW_PSMODULEP_SAVE% +@SET __MVNW_PSMODULEP_SAVE= +@SET __MVNW_ARG0_NAME__= +@SET MVNW_USERNAME= +@SET MVNW_PASSWORD= +@IF NOT "%__MVNW_CMD__%"=="" ("%__MVNW_CMD__%" %*) +@echo Cannot start maven from wrapper >&2 && exit /b 1 +@GOTO :EOF +: end batch / begin powershell #> + +$ErrorActionPreference = "Stop" +if ($env:MVNW_VERBOSE -eq "true") { + $VerbosePreference = "Continue" +} + +# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties +$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl +if (!$distributionUrl) { + Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" +} + +switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) { + "maven-mvnd-*" { + $USE_MVND = $true + $distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip" + $MVN_CMD = "mvnd.cmd" + break + } + default { + $USE_MVND = $false + $MVN_CMD = $script -replace '^mvnw','mvn' + break + } +} + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +if ($env:MVNW_REPOURL) { + $MVNW_REPO_PATTERN = if ($USE_MVND -eq $False) { "/org/apache/maven/" } else { "/maven/mvnd/" } + $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace "^.*$MVNW_REPO_PATTERN",'')" +} +$distributionUrlName = $distributionUrl -replace '^.*/','' +$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$','' + +$MAVEN_M2_PATH = "$HOME/.m2" +if ($env:MAVEN_USER_HOME) { + $MAVEN_M2_PATH = "$env:MAVEN_USER_HOME" +} + +if (-not (Test-Path -Path $MAVEN_M2_PATH)) { + New-Item -Path $MAVEN_M2_PATH -ItemType Directory | Out-Null +} + +$MAVEN_WRAPPER_DISTS = $null +if ((Get-Item $MAVEN_M2_PATH).Target[0] -eq $null) { + $MAVEN_WRAPPER_DISTS = "$MAVEN_M2_PATH/wrapper/dists" +} else { + $MAVEN_WRAPPER_DISTS = (Get-Item $MAVEN_M2_PATH).Target[0] + "/wrapper/dists" +} + +$MAVEN_HOME_PARENT = "$MAVEN_WRAPPER_DISTS/$distributionUrlNameMain" +$MAVEN_HOME_NAME = ([System.Security.Cryptography.SHA256]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join '' +$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME" + +if (Test-Path -Path "$MAVEN_HOME" -PathType Container) { + Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME" + Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" + exit $? +} + +if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) { + Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl" +} + +# prepare tmp dir +$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile +$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir" +$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null +trap { + if ($TMP_DOWNLOAD_DIR.Exists) { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } + } +} + +New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null + +# Download and Install Apache Maven +Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +Write-Verbose "Downloading from: $distributionUrl" +Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +$webclient = New-Object System.Net.WebClient +if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) { + $webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD) +} +[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 +$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum +if ($distributionSha256Sum) { + if ($USE_MVND) { + Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." + } + Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash + if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) { + Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property." + } +} + +# unzip and move +Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null + +# Find the actual extracted directory name (handles snapshots where filename != directory name) +$actualDistributionDir = "" + +# First try the expected directory name (for regular distributions) +$expectedPath = Join-Path "$TMP_DOWNLOAD_DIR" "$distributionUrlNameMain" +$expectedMvnPath = Join-Path "$expectedPath" "bin/$MVN_CMD" +if ((Test-Path -Path $expectedPath -PathType Container) -and (Test-Path -Path $expectedMvnPath -PathType Leaf)) { + $actualDistributionDir = $distributionUrlNameMain +} + +# If not found, search for any directory with the Maven executable (for snapshots) +if (!$actualDistributionDir) { + Get-ChildItem -Path "$TMP_DOWNLOAD_DIR" -Directory | ForEach-Object { + $testPath = Join-Path $_.FullName "bin/$MVN_CMD" + if (Test-Path -Path $testPath -PathType Leaf) { + $actualDistributionDir = $_.Name + } + } +} + +if (!$actualDistributionDir) { + Write-Error "Could not find Maven distribution directory in extracted archive" +} + +Write-Verbose "Found extracted Maven distribution directory: $actualDistributionDir" +Rename-Item -Path "$TMP_DOWNLOAD_DIR/$actualDistributionDir" -NewName $MAVEN_HOME_NAME | Out-Null +try { + Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null +} catch { + if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) { + Write-Error "fail to move MAVEN_HOME" + } +} finally { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } +} + +Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..97f21d7 --- /dev/null +++ b/pom.xml @@ -0,0 +1,86 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 4.0.0 + + + net.h4ckx0r + Idiomas + 0.0.1-SNAPSHOT + war + Idiomas + Idiomas + + + + + + + + + + + + + + + 25 + 1.6.3 + + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.springframework.boot + spring-boot-starter-webmvc + + + + com.mysql + mysql-connector-j + runtime + + + org.springframework.boot + spring-boot-starter-tomcat + provided + + + org.springframework.boot + spring-boot-starter-data-jpa-test + test + + + org.springframework.boot + spring-boot-starter-webmvc-test + test + + + org.mapstruct + mapstruct + ${mapstruct.version} + + + org.mapstruct + mapstruct-processor + ${mapstruct.version} + provided + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + diff --git a/src/main/java/net/h4ckx0r/idiomas/IdiomasApplication.java b/src/main/java/net/h4ckx0r/idiomas/IdiomasApplication.java new file mode 100644 index 0000000..a8b6ce5 --- /dev/null +++ b/src/main/java/net/h4ckx0r/idiomas/IdiomasApplication.java @@ -0,0 +1,13 @@ +package net.h4ckx0r.idiomas; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class IdiomasApplication { + + public static void main(String[] args) { + SpringApplication.run(IdiomasApplication.class, args); + } + +} diff --git a/src/main/java/net/h4ckx0r/idiomas/ServletInitializer.java b/src/main/java/net/h4ckx0r/idiomas/ServletInitializer.java new file mode 100644 index 0000000..7c0fd9b --- /dev/null +++ b/src/main/java/net/h4ckx0r/idiomas/ServletInitializer.java @@ -0,0 +1,13 @@ +package net.h4ckx0r.idiomas; + +import org.springframework.boot.builder.SpringApplicationBuilder; +import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; + +public class ServletInitializer extends SpringBootServletInitializer { + + @Override + protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { + return application.sources(IdiomasApplication.class); + } + +} diff --git a/src/main/java/net/h4ckx0r/idiomas/controllers/IdiomaController.java b/src/main/java/net/h4ckx0r/idiomas/controllers/IdiomaController.java new file mode 100644 index 0000000..8b5bdf3 --- /dev/null +++ b/src/main/java/net/h4ckx0r/idiomas/controllers/IdiomaController.java @@ -0,0 +1,30 @@ +package net.h4ckx0r.idiomas.controllers; + +import net.h4ckx0r.idiomas.dto.IdiomaDto; +import net.h4ckx0r.idiomas.mappers.IdiomaMapper; +import net.h4ckx0r.idiomas.repositories.IdiomaRepository; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.RequestMapping; + +@RestController +@RequestMapping("/idioma") +class IdiomaController { + private final IdiomaRepository idiomaRepository; + private final IdiomaMapper idiomaMapper; + + IdiomaController(IdiomaRepository idiomaRepository, IdiomaMapper idiomaMapper) { + this.idiomaRepository = idiomaRepository; + this.idiomaMapper = idiomaMapper; + } + + @GetMapping("/{id}") + public ResponseEntity getIdiomaById(@PathVariable Integer id) { + return idiomaRepository.findById(id) + .map(idiomaMapper::toDto) + .map(ResponseEntity::ok) + .orElse(ResponseEntity.notFound().build()); + } +} diff --git a/src/main/java/net/h4ckx0r/idiomas/controllers/UsuariaController.java b/src/main/java/net/h4ckx0r/idiomas/controllers/UsuariaController.java new file mode 100644 index 0000000..9241302 --- /dev/null +++ b/src/main/java/net/h4ckx0r/idiomas/controllers/UsuariaController.java @@ -0,0 +1,80 @@ +package net.h4ckx0r.idiomas.controllers; + +import net.h4ckx0r.idiomas.dto.UsuariaDto; +import net.h4ckx0r.idiomas.entities.Usuaria; +import net.h4ckx0r.idiomas.mappers.UsuariaMapper; +import net.h4ckx0r.idiomas.repositories.UsuariaRepository; +import org.springframework.http.ResponseEntity; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@CrossOrigin +@RestController +@RequestMapping("/usuaria") +class UsuariaController { + + private final UsuariaRepository usuariaRepository; + private final UsuariaMapper usuariaMapper; + + UsuariaController(UsuariaRepository usuariaRepository, UsuariaMapper usuariaMapper) { + this.usuariaRepository = usuariaRepository; + this.usuariaMapper = usuariaMapper; + } + + @GetMapping() + @Transactional + public List getAllUsuarias() { + return usuariaRepository.findAll() + .stream() + .map(usuariaMapper::toDto) + .toList(); + } + + @GetMapping("/{id}") + @Transactional + public UsuariaDto getUsuariaById(@PathVariable Integer id) { + return usuariaRepository.findById(id) + .map(usuariaMapper::toDto) + .orElseThrow(() -> new RuntimeException("Usuaria no encontrada")); + } + + @GetMapping("/id") + @Transactional + public UsuariaDto getUsuariaById(@RequestParam("id") int id) { + return usuariaRepository.findById(id) + .map(usuariaMapper::toDto) + .orElseThrow(() -> new RuntimeException("Usuaria no encontrada")); + } + + @DeleteMapping("/{id}") + public ResponseEntity deleteUsuarioById(@PathVariable Integer id) { + if (usuariaRepository.existsById(id)) { + usuariaRepository.deleteById(id); + return ResponseEntity.ok(true); + } else { + return ResponseEntity.ok(false); + } + } + + @PostMapping("/create") + @Transactional + public UsuariaDto createUsuaria(@RequestBody UsuariaDto usuaria) { + Usuaria entityUsuaria = usuariaMapper.toEntity(usuaria); + Usuaria savedEntity = usuariaRepository.save(entityUsuaria); + return usuariaMapper.toDto(savedEntity); + } + + + @PostMapping() + public ResponseEntity postCreateUsuaria(@RequestBody UsuariaDto usuaria) { + System.out.println(usuaria); + Usuaria newUsuaria = usuariaMapper.toEntity(usuaria); + Usuaria savedUsuaria = usuariaRepository.save(newUsuaria); + return ResponseEntity.ok(usuariaMapper.toDto(savedUsuaria)); + } + + + +} diff --git a/src/main/java/net/h4ckx0r/idiomas/dto/HablaDto.java b/src/main/java/net/h4ckx0r/idiomas/dto/HablaDto.java new file mode 100644 index 0000000..7d268e3 --- /dev/null +++ b/src/main/java/net/h4ckx0r/idiomas/dto/HablaDto.java @@ -0,0 +1,54 @@ +package net.h4ckx0r.idiomas.dto; + +import java.io.Serializable; +import java.util.Objects; + +/** + * DTO for {@link net.h4ckx0r.idiomas.entities.Habla} + */ +public class HablaDto implements Serializable { + private final Integer id; + private final UsuariaDto idUsuario; + private final IdiomaDto idIdioma; + + public HablaDto(Integer id, UsuariaDto idUsuario, IdiomaDto idIdioma) { + this.id = id; + this.idUsuario = idUsuario; + this.idIdioma = idIdioma; + } + + public Integer getId() { + return id; + } + + public UsuariaDto getIdUsuario() { + return idUsuario; + } + + public IdiomaDto getIdIdioma() { + return idIdioma; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + HablaDto entity = (HablaDto) o; + return Objects.equals(this.id, entity.id) && + Objects.equals(this.idUsuario, entity.idUsuario) && + Objects.equals(this.idIdioma, entity.idIdioma); + } + + @Override + public int hashCode() { + return Objects.hash(id, idUsuario, idIdioma); + } + + @Override + public String toString() { + return getClass().getSimpleName() + "(" + + "id = " + id + ", " + + "idUsuario = " + idUsuario + ", " + + "idIdioma = " + idIdioma + ")"; + } +} \ No newline at end of file diff --git a/src/main/java/net/h4ckx0r/idiomas/dto/IdiomaDto.java b/src/main/java/net/h4ckx0r/idiomas/dto/IdiomaDto.java new file mode 100644 index 0000000..9a320ca --- /dev/null +++ b/src/main/java/net/h4ckx0r/idiomas/dto/IdiomaDto.java @@ -0,0 +1,46 @@ +package net.h4ckx0r.idiomas.dto; + +import java.io.Serializable; +import java.util.Objects; + +/** + * DTO for {@link net.h4ckx0r.idiomas.entities.Idioma} + */ +public class IdiomaDto implements Serializable { + private final Integer id; + private final String nombre; + + public IdiomaDto(Integer id, String nombre) { + this.id = id; + this.nombre = nombre; + } + + public Integer getId() { + return id; + } + + public String getNombre() { + return nombre; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + IdiomaDto entity = (IdiomaDto) o; + return Objects.equals(this.id, entity.id) && + Objects.equals(this.nombre, entity.nombre); + } + + @Override + public int hashCode() { + return Objects.hash(id, nombre); + } + + @Override + public String toString() { + return getClass().getSimpleName() + "(" + + "id = " + id + ", " + + "nombre = " + nombre + ")"; + } +} \ No newline at end of file diff --git a/src/main/java/net/h4ckx0r/idiomas/dto/UsuariaDto.java b/src/main/java/net/h4ckx0r/idiomas/dto/UsuariaDto.java new file mode 100644 index 0000000..95ef463 --- /dev/null +++ b/src/main/java/net/h4ckx0r/idiomas/dto/UsuariaDto.java @@ -0,0 +1,96 @@ +package net.h4ckx0r.idiomas.dto; + +import java.io.Serializable; +import java.time.LocalDate; +import java.util.Objects; + +/** + * DTO for {@link net.h4ckx0r.idiomas.entities.Usuaria} + */ +public class UsuariaDto implements Serializable { + private final Integer id; + private final LocalDate fechaElim; + private final LocalDate fechaNac; + private final String img; + private final String nombre; + private final String pass; + private final String username; + private final UsuarioTipoDto idTipoUsuario; + + public UsuariaDto(Integer id, LocalDate fechaElim, LocalDate fechaNac, String img, String nombre, String pass, String username, UsuarioTipoDto idTipoUsuario) { + this.id = id; + this.fechaElim = fechaElim; + this.fechaNac = fechaNac; + this.img = img; + this.nombre = nombre; + this.pass = pass; + this.username = username; + this.idTipoUsuario = idTipoUsuario; + } + + public Integer getId() { + return id; + } + + public LocalDate getFechaElim() { + return fechaElim; + } + + public LocalDate getFechaNac() { + return fechaNac; + } + + public String getImg() { + return img; + } + + public String getNombre() { + return nombre; + } + + public String getPass() { + return pass; + } + + public String getUsername() { + return username; + } + + public UsuarioTipoDto getIdTipoUsuario() { + return idTipoUsuario; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + UsuariaDto entity = (UsuariaDto) o; + return Objects.equals(this.id, entity.id) && + Objects.equals(this.fechaElim, entity.fechaElim) && + Objects.equals(this.fechaNac, entity.fechaNac) && + Objects.equals(this.img, entity.img) && + Objects.equals(this.nombre, entity.nombre) && + Objects.equals(this.pass, entity.pass) && + Objects.equals(this.username, entity.username) && + Objects.equals(this.idTipoUsuario, entity.idTipoUsuario); + } + + @Override + public int hashCode() { + return Objects.hash(id, fechaElim, fechaNac, img, nombre, pass, username, idTipoUsuario); + } + + @Override + public String toString() { + return getClass().getSimpleName() + "(" + + "id = " + id + ", " + + "fechaElim = " + fechaElim + ", " + + "fechaNac = " + fechaNac + ", " + + "img = " + img + ", " + + "nombre = " + nombre + ", " + + "pass = " + pass + ", " + + "username = " + username + ", " + + "idTipoUsuario = " + idTipoUsuario + ")"; + } +} + diff --git a/src/main/java/net/h4ckx0r/idiomas/dto/UsuarioTipoDto.java b/src/main/java/net/h4ckx0r/idiomas/dto/UsuarioTipoDto.java new file mode 100644 index 0000000..582a54f --- /dev/null +++ b/src/main/java/net/h4ckx0r/idiomas/dto/UsuarioTipoDto.java @@ -0,0 +1,46 @@ +package net.h4ckx0r.idiomas.dto; + +import java.io.Serializable; +import java.util.Objects; + +/** + * DTO for {@link net.h4ckx0r.idiomas.entities.UsuarioTipo} + */ +public class UsuarioTipoDto implements Serializable { + private final Integer id; + private final String rol; + + public UsuarioTipoDto(Integer id, String rol) { + this.id = id; + this.rol = rol; + } + + public Integer getId() { + return id; + } + + public String getRol() { + return rol; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + UsuarioTipoDto entity = (UsuarioTipoDto) o; + return Objects.equals(this.id, entity.id) && + Objects.equals(this.rol, entity.rol); + } + + @Override + public int hashCode() { + return Objects.hash(id, rol); + } + + @Override + public String toString() { + return getClass().getSimpleName() + "(" + + "id = " + id + ", " + + "rol = " + rol + ")"; + } +} \ No newline at end of file diff --git a/src/main/java/net/h4ckx0r/idiomas/entities/Habla.java b/src/main/java/net/h4ckx0r/idiomas/entities/Habla.java new file mode 100644 index 0000000..b85398c --- /dev/null +++ b/src/main/java/net/h4ckx0r/idiomas/entities/Habla.java @@ -0,0 +1,44 @@ +package net.h4ckx0r.idiomas.entities; + +import jakarta.persistence.*; + +@Entity +@Table(name = "habla") +public class Habla { + @Id + @Column(name = "id", nullable = false) + private Integer id; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "id_usuario") + private Usuaria idUsuario; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "id_idioma") + private Idioma idIdioma; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public Usuaria getIdUsuario() { + return idUsuario; + } + + public void setIdUsuario(Usuaria idUsuario) { + this.idUsuario = idUsuario; + } + + public Idioma getIdIdioma() { + return idIdioma; + } + + public void setIdIdioma(Idioma idIdioma) { + this.idIdioma = idIdioma; + } + +} \ No newline at end of file diff --git a/src/main/java/net/h4ckx0r/idiomas/entities/Idioma.java b/src/main/java/net/h4ckx0r/idiomas/entities/Idioma.java new file mode 100644 index 0000000..d1fce65 --- /dev/null +++ b/src/main/java/net/h4ckx0r/idiomas/entities/Idioma.java @@ -0,0 +1,34 @@ +package net.h4ckx0r.idiomas.entities; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; + +@Entity +@Table(name = "idioma") +public class Idioma { + @Id + @Column(name = "id", nullable = false) + private Integer id; + + @Column(name = "nombre") + private String nombre; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getNombre() { + return nombre; + } + + public void setNombre(String nombre) { + this.nombre = nombre; + } + +} \ No newline at end of file diff --git a/src/main/java/net/h4ckx0r/idiomas/entities/Usuaria.java b/src/main/java/net/h4ckx0r/idiomas/entities/Usuaria.java new file mode 100644 index 0000000..3dd48ce --- /dev/null +++ b/src/main/java/net/h4ckx0r/idiomas/entities/Usuaria.java @@ -0,0 +1,100 @@ +package net.h4ckx0r.idiomas.entities; + +import jakarta.persistence.*; + +import java.time.LocalDate; + +@Entity +@Table(name = "usuaria") +public class Usuaria { + @Id + @Column(name = "id", nullable = false) + private Integer id; + + @Column(name = "fecha_elim") + private LocalDate fechaElim; + + @Column(name = "fecha_nac") + private LocalDate fechaNac; + + @Column(name = "img") + private byte[] img; + + @Column(name = "nombre") + private String nombre; + + @Column(name = "pass") + private String pass; + + @Column(name = "username") + private String username; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "id_tipo_usuario") + private UsuarioTipo idTipoUsuario; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public LocalDate getFechaElim() { + return fechaElim; + } + + public void setFechaElim(LocalDate fechaElim) { + this.fechaElim = fechaElim; + } + + public LocalDate getFechaNac() { + return fechaNac; + } + + public void setFechaNac(LocalDate fechaNac) { + this.fechaNac = fechaNac; + } + + public byte[] getImg() { + return img; + } + + public void setImg(byte[] img) { + this.img = img; + } + + public String getNombre() { + return nombre; + } + + public void setNombre(String nombre) { + this.nombre = nombre; + } + + public String getPass() { + return pass; + } + + public void setPass(String pass) { + this.pass = pass; + } + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public UsuarioTipo getIdTipoUsuario() { + return idTipoUsuario; + } + + public void setIdTipoUsuario(UsuarioTipo idTipoUsuario) { + this.idTipoUsuario = idTipoUsuario; + } + +} \ No newline at end of file diff --git a/src/main/java/net/h4ckx0r/idiomas/entities/UsuarioTipo.java b/src/main/java/net/h4ckx0r/idiomas/entities/UsuarioTipo.java new file mode 100644 index 0000000..cebbccc --- /dev/null +++ b/src/main/java/net/h4ckx0r/idiomas/entities/UsuarioTipo.java @@ -0,0 +1,34 @@ +package net.h4ckx0r.idiomas.entities; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; + +@Entity +@Table(name = "usuario_tipo") +public class UsuarioTipo { + @Id + @Column(name = "id", nullable = false) + private Integer id; + + @Column(name = "rol") + private String rol; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getRol() { + return rol; + } + + public void setRol(String rol) { + this.rol = rol; + } + +} \ No newline at end of file diff --git a/src/main/java/net/h4ckx0r/idiomas/mappers/Base64Converter.java b/src/main/java/net/h4ckx0r/idiomas/mappers/Base64Converter.java new file mode 100644 index 0000000..6f3b69f --- /dev/null +++ b/src/main/java/net/h4ckx0r/idiomas/mappers/Base64Converter.java @@ -0,0 +1,28 @@ +package net.h4ckx0r.idiomas.mappers; + +import org.mapstruct.Named; + +import java.util.Base64; + +public class Base64Converter { + @Named("base64ToBytes") + public static byte[] base64ToBytes(String base64String) { + if (base64String == null || base64String.isEmpty()) { + return null; + } + try { + return Base64.getDecoder().decode(base64String); + } catch (IllegalArgumentException e) { + return null; + } + } + + @Named("bytesToBase64") + public static String bytesToBase64(byte[] bytes) { + if (bytes == null) { + return null; + } + return Base64.getEncoder().encodeToString(bytes); + } +} + diff --git a/src/main/java/net/h4ckx0r/idiomas/mappers/IdiomaMapper.java b/src/main/java/net/h4ckx0r/idiomas/mappers/IdiomaMapper.java new file mode 100644 index 0000000..70ad21d --- /dev/null +++ b/src/main/java/net/h4ckx0r/idiomas/mappers/IdiomaMapper.java @@ -0,0 +1,15 @@ +package net.h4ckx0r.idiomas.mappers; + +import net.h4ckx0r.idiomas.dto.IdiomaDto; +import net.h4ckx0r.idiomas.entities.Idioma; +import org.mapstruct.*; + +@Mapper(unmappedTargetPolicy = ReportingPolicy.IGNORE, componentModel = MappingConstants.ComponentModel.SPRING) +public interface IdiomaMapper { + Idioma toEntity(IdiomaDto idiomaDto); + + IdiomaDto toDto(Idioma idioma); + + @BeanMapping(nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE) + Idioma partialUpdate(IdiomaDto idiomaDto, @MappingTarget Idioma idioma); +} \ No newline at end of file diff --git a/src/main/java/net/h4ckx0r/idiomas/mappers/UsuariaMapper.java b/src/main/java/net/h4ckx0r/idiomas/mappers/UsuariaMapper.java new file mode 100644 index 0000000..3c9a519 --- /dev/null +++ b/src/main/java/net/h4ckx0r/idiomas/mappers/UsuariaMapper.java @@ -0,0 +1,18 @@ +package net.h4ckx0r.idiomas.mappers; + +import net.h4ckx0r.idiomas.dto.UsuariaDto; +import net.h4ckx0r.idiomas.entities.Usuaria; +import org.mapstruct.*; + +@Mapper(unmappedTargetPolicy = ReportingPolicy.IGNORE, componentModel = MappingConstants.ComponentModel.SPRING, uses = Base64Converter.class) +public interface UsuariaMapper { + @Mapping(target = "img", source = "img", qualifiedByName = "base64ToBytes") + Usuaria toEntity(UsuariaDto usuariaDto); + + @Mapping(target = "img", source = "img", qualifiedByName = "bytesToBase64") + UsuariaDto toDto(Usuaria usuaria); + + @BeanMapping(nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE) + @Mapping(target = "img", source = "img", qualifiedByName = "base64ToBytes") + Usuaria partialUpdate(UsuariaDto usuariaDto, @MappingTarget Usuaria usuaria); +} \ No newline at end of file diff --git a/src/main/java/net/h4ckx0r/idiomas/repositories/IdiomaRepository.java b/src/main/java/net/h4ckx0r/idiomas/repositories/IdiomaRepository.java new file mode 100644 index 0000000..4dc90a7 --- /dev/null +++ b/src/main/java/net/h4ckx0r/idiomas/repositories/IdiomaRepository.java @@ -0,0 +1,8 @@ +package net.h4ckx0r.idiomas.repositories; + +import net.h4ckx0r.idiomas.entities.Idioma; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface IdiomaRepository extends JpaRepository { + +} \ No newline at end of file diff --git a/src/main/java/net/h4ckx0r/idiomas/repositories/UsuariaRepository.java b/src/main/java/net/h4ckx0r/idiomas/repositories/UsuariaRepository.java new file mode 100644 index 0000000..8200189 --- /dev/null +++ b/src/main/java/net/h4ckx0r/idiomas/repositories/UsuariaRepository.java @@ -0,0 +1,17 @@ +package net.h4ckx0r.idiomas.repositories; + +import net.h4ckx0r.idiomas.entities.Usuaria; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.List; +import java.util.Optional; + +public interface UsuariaRepository extends JpaRepository { + + @Override + Optional findById(Integer integer); + + @Override + List findAll(); + +} \ No newline at end of file diff --git a/src/main/java/net/h4ckx0r/idiomas/repositories/UsuarioTipoRepository.java b/src/main/java/net/h4ckx0r/idiomas/repositories/UsuarioTipoRepository.java new file mode 100644 index 0000000..284e367 --- /dev/null +++ b/src/main/java/net/h4ckx0r/idiomas/repositories/UsuarioTipoRepository.java @@ -0,0 +1,7 @@ +package net.h4ckx0r.idiomas.repositories; + +import net.h4ckx0r.idiomas.entities.UsuarioTipo; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface UsuarioTipoRepository extends JpaRepository { +} \ 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..338a21c --- /dev/null +++ b/src/main/resources/application.properties @@ -0,0 +1,7 @@ +spring.application.name=Idiomas +spring.datasource.url=jdbc:mysql://localhost:3306/nuevo5 +spring.datasource.username=dwes +spring.datasource.password=abc123. +server.port=8080 + +spring.jpa.open-in-view=false \ No newline at end of file diff --git a/src/test/java/net/h4ckx0r/idiomas/IdiomasApplicationTests.java b/src/test/java/net/h4ckx0r/idiomas/IdiomasApplicationTests.java new file mode 100644 index 0000000..4bd26ee --- /dev/null +++ b/src/test/java/net/h4ckx0r/idiomas/IdiomasApplicationTests.java @@ -0,0 +1,13 @@ +package net.h4ckx0r.idiomas; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class IdiomasApplicationTests { + + @Test + void contextLoads() { + } + +}