From 1e4ac40455fe2222e46cd08a250c20eb6f57bcd9 Mon Sep 17 00:00:00 2001 From: Sara <113976231+hyunxhri@users.noreply.github.com> Date: Fri, 20 Oct 2023 09:38:16 +0200 Subject: [PATCH 1/2] =?UTF-8?q?A=C3=B1adido=20nombre=20en=20colaboradores?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/vcs.xml | 6 ++++ .idea/workspace.xml | 50 ++++++++++++++++++++++++++++ README.md | 80 +++++++++++++++++++++++++-------------------- 3 files changed, 100 insertions(+), 36 deletions(-) create mode 100644 .idea/vcs.xml create mode 100644 .idea/workspace.xml diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 0000000..cddd19d --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,50 @@ + + + + + + + + + + { + "associatedIndex": 6 +} + + + + { + "keyToString": { + "RunOnceActivity.OpenProjectViewOnStart": "true", + "RunOnceActivity.ShowReadmeOnStart": "true", + "WebServerToolWindowFactoryState": "false", + "last_opened_file_path": "C:/Users/marim/Desktop/2º DAW/DWES/kata-API", + "nodejs_package_manager_path": "npm", + "vue.rearranger.settings.migration": "true" + } +} + + + + + 1697786598038 + + + + + + \ No newline at end of file diff --git a/README.md b/README.md index db38816..4a35d0a 100644 --- a/README.md +++ b/README.md @@ -3,93 +3,101 @@ > Pero ahora mismo no es nuestro objetivo. > Los objetivos son los que aparecen tras ### Objetivos del módulo - # Kata API + Kata : crear una [API](https://github.com/OAI/OpenAPI-Specification) funcional [CRUD](https://www.codecademy.com/articles/what-is-crud) sobre varias tablas en MySQL. ## Objetivo + Creación y utilización de una API y aprender y usar diferentes [métodos HTTP](https://developer.mozilla.org/es/docs/Web/HTTP/Methods). Además de trabajar con Docker en un proyecto. ## Prerrequisitos + En la Kata se asume familiaridad con las siguientes tecnologías [Git](https://git-scm.com/), [Docker](https://www.docker.com/) y [Docker-compose](https://docs.docker.com/compose/). ## Procedimiento + [Hacer un fork](https://github.com/epfl-dojo/kata-api/#fork-destination-box) del repositorio, -crear una rama (`git checkout -b username/langage` por ejemplo `git checkout --b nicolasreymond/php`, desde vuestro fork). Haced un pull request para añadirlo a este -repo y añadiéndoos al final de este fichero como autores. +crear una rama (`git checkout -b username/langage` por ejemplo `git checkout -b nicolasreymond/php`, desde vuestro fork). Haced un pull request para añadirlo a este +repo y añadiéndoos al final de este fichero como autores. ## Puesta en marcha + En cada cambio de un fichero en el contenedor tenemos que hacer: + ```bash docker-compose up --build ``` + Y para lanzar los contenedores: + ```bash docker-compose up -d ``` ## Objetivos de la Kata + - [ ] Forcker le dépot Git - [ ] Créer une nouvelle branche (ex. : `usermame/langage`) -- [ ] Ajouter un container Docker (pour le langage de votre choix) +- [ ] Ajouter un container Docker (pour le langage de votre choix) au docker-compose -### Objetivos del módulo + +### Objetivos del módulo + - [ ] Comprender cómo detectar las diferentes [peticiones HTTP](https://developer.mozilla.org/es/docs/Web/HTTP/Methods) (GET, POST, PUT, PATCH, DELETE) - [ ] Implementación del CRUD sobre el endpoint `/beer*` - - [ ] Implementar la creación **`C`**`reate` - - [ ] Implementar la lectura **`R`**`ead` - - [ ] Implementar la actualilzación **`U`**`pdate` - - [ ] Implementar el borrado **`D`**`elete` + - [ ] Implementar la creación **`C`**`reate` + - [ ] Implementar la lectura **`R`**`ead` + - [ ] Implementar la actualilzación **`U`**`pdate` + - [ ] Implementar el borrado **`D`**`elete` - [ ] Implementar la lectura de los endpoints `/brewerie*`, `/categorie*` et `/style*` - [ ] Probar la API con - [postman](https://www.postman.com/), - - [insomnia](https://insomnia.rest), - - [curl](https://curl.haxx.se/), - - [httpie](https://httpie.org/), etc… - y guardar esas peticiones en un fichero de resultados. + - [insomnia](https://insomnia.rest), + - [curl](https://curl.haxx.se/), + - [httpie](https://httpie.org/), etc… + y guardar esas peticiones en un fichero de resultados. - [ ] Hacer un documento que explique cómo utilizar la API (con ejemplos de cada una de las consultas) Ir más lejos -- [ ] Implementar la paginación para consultar que devuelven muchos datos - por ejemplo con el método HTTP HEAD. + +- [ ] Implementar la paginación para consultar que devuelven muchos datos + por ejemplo con el método HTTP HEAD. [HEAD](https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods/HEAD) -- [ ] Integración con [swagger](https://swagger.io/tools/open-source/open-source-integrations/) +- [ ] Integración con [swagger](https://swagger.io/tools/open-source/open-source-integrations/) del lenguaje escogido. -- [ ] Modificaciones para poder subir imágenes de las cervezas - +- [ ] Modificaciones para poder subir imágenes de las cervezas ## Descripción de rutas a utilizar -| Endpoint | Resultado | Método | -|----------------- |-----------------------------------------|:--------:| -|`/beers` | Muestra todas las cervezas | GET | -|`/beer` | Añadir una cerveza | POST | -|`/beer/{id}` | Mostrar la cerveza con el id `{id}` | GET | -|`/beer/{id}` | Eliminar una cerveza | DELETE | -|`/beer/{id}` | Modificar una cerveza | PUT | -|`/beer/{id}` | Modificar parcialmente una cerveza | PATCH | -|`/breweries` | Listar todas las cerveceras | GET | -|`/brewerie/{id}` | Mostrar la cervecera `{id}` | GET | -|`/categories` | Listar todas las categorías | GET | -|`/categorie/{id}` | Mostrar la categoría `{id}` | GET | -|`/styles` | Listar todos los estilos -style- | GET | -|`/style/{id}` | Mostrar el estilo -style- `{id}` | GET | - +| Endpoint | Resultado | Método | +| ------------------- | ------------------------------------- | :-----: | +| `/beers` | Muestra todas las cervezas | GET | +| `/beer` | Añadir una cerveza | POST | +| `/beer/{id}` | Mostrar la cerveza con el id `{id}` | GET | +| `/beer/{id}` | Eliminar una cerveza | DELETE | +| `/beer/{id}` | Modificar una cerveza | PUT | +| `/beer/{id}` | Modificar parcialmente una cerveza | PATCH | +| `/breweries` | Listar todas las cerveceras | GET | +| `/brewerie/{id}` | Mostrar la cervecera `{id}` | GET | +| `/categories` | Listar todas las categorías | GET | +| `/categorie/{id}` | Mostrar la categoría `{id}` | GET | +| `/styles` | Listar todos los estilos -style- | GET | +| `/style/{id}` | Mostrar el estilo -style-`{id}` | GET | ## Colaboradores (idiomas en orden alfabético) -[Laravel](https://github.com/SaphireVert/Kata-API/tree/saphirevert/laravel) → [![saphirevert-repos][saphirevert-shield]][saphirevert-url] +[Laravel](https://github.com/SaphireVert/Kata-API/tree/saphirevert/laravel) → [saphirevert-repos][saphirevert-url] +Java → [hyunxhri][saphirevert-url] [saphirevert-shield]: https://badgen.net/badge/Github/SaphireVert/green?icon=https://svgshare.com/i/Srf.svg [saphirevert-url]: https://github.com/saphirevert/ - From ae35ea4bea027fafc9c760cb5303211ceac39ede Mon Sep 17 00:00:00 2001 From: hyunxhri Date: Fri, 15 Dec 2023 00:47:53 +0100 Subject: [PATCH 2/2] terminada --- .idea/workspace.xml | 131 +++++++- HELP.md | 32 ++ mvnw | 308 ++++++++++++++++++ mvnw.cmd | 205 ++++++++++++ pom.xml | 83 +++++ .../com/example/demo/KataApiApplication.java | 13 + .../com/example/demo/config/CorsConfig.java | 16 + .../demo/controllers/BeersController.java | 98 ++++++ .../demo/controllers/BreweriesController.java | 40 +++ .../controllers/CategoriesController.java | 40 +++ .../demo/controllers/StylesController.java | 40 +++ .../com/example/demo/dto/CreateBeerDTO.java | 24 ++ .../com/example/demo/dto/UpdateBeerDTO.java | 22 ++ .../java/com/example/demo/models/Beer.java | 36 ++ .../com/example/demo/models/Breweries.java | 36 ++ .../com/example/demo/models/Categories.java | 25 ++ .../java/com/example/demo/models/Styles.java | 26 ++ .../demo/repositories/BeerRepository.java | 8 + .../repositories/BreweriesRepository.java | 8 + .../repositories/CategoriesRepository.java | 8 + .../demo/repositories/StylesRepository.java | 8 + src/main/resources/application.properties | 1 + .../example/demo/KataApiApplicationTests.java | 13 + 23 files changed, 1205 insertions(+), 16 deletions(-) create mode 100644 HELP.md create mode 100755 mvnw create mode 100644 mvnw.cmd create mode 100644 pom.xml create mode 100644 src/main/java/com/example/demo/KataApiApplication.java create mode 100644 src/main/java/com/example/demo/config/CorsConfig.java create mode 100644 src/main/java/com/example/demo/controllers/BeersController.java create mode 100644 src/main/java/com/example/demo/controllers/BreweriesController.java create mode 100644 src/main/java/com/example/demo/controllers/CategoriesController.java create mode 100644 src/main/java/com/example/demo/controllers/StylesController.java create mode 100644 src/main/java/com/example/demo/dto/CreateBeerDTO.java create mode 100644 src/main/java/com/example/demo/dto/UpdateBeerDTO.java create mode 100644 src/main/java/com/example/demo/models/Beer.java create mode 100644 src/main/java/com/example/demo/models/Breweries.java create mode 100644 src/main/java/com/example/demo/models/Categories.java create mode 100644 src/main/java/com/example/demo/models/Styles.java create mode 100644 src/main/java/com/example/demo/repositories/BeerRepository.java create mode 100644 src/main/java/com/example/demo/repositories/BreweriesRepository.java create mode 100644 src/main/java/com/example/demo/repositories/CategoriesRepository.java create mode 100644 src/main/java/com/example/demo/repositories/StylesRepository.java create mode 100644 src/main/resources/application.properties create mode 100644 src/test/java/com/example/demo/KataApiApplicationTests.java diff --git a/.idea/workspace.xml b/.idea/workspace.xml index cddd19d..ea7941d 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,50 +1,149 @@ + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + { "associatedIndex": 6 } - + + + + - { - "keyToString": { - "RunOnceActivity.OpenProjectViewOnStart": "true", - "RunOnceActivity.ShowReadmeOnStart": "true", - "WebServerToolWindowFactoryState": "false", - "last_opened_file_path": "C:/Users/marim/Desktop/2º DAW/DWES/kata-API", - "nodejs_package_manager_path": "npm", - "vue.rearranger.settings.migration": "true" + +}]]> + + + + + + + + + + + + + + + + - - 1697786598038 + + 1702279089775 + + + + + \ No newline at end of file diff --git a/HELP.md b/HELP.md new file mode 100644 index 0000000..ff515d1 --- /dev/null +++ b/HELP.md @@ -0,0 +1,32 @@ +# Getting Started + +### Reference Documentation +For further reference, please consider the following sections: + +* [Official Apache Maven documentation](https://maven.apache.org/guides/index.html) +* [Spring Boot Maven Plugin Reference Guide](https://docs.spring.io/spring-boot/docs/3.2.0/maven-plugin/reference/html/) +* [Create an OCI image](https://docs.spring.io/spring-boot/docs/3.2.0/maven-plugin/reference/html/#build-image) +* [Docker Compose Support](https://docs.spring.io/spring-boot/docs/3.2.0/reference/htmlsingle/index.html#features.docker-compose) +* [Spring Data JPA](https://docs.spring.io/spring-boot/docs/3.2.0/reference/htmlsingle/index.html#data.sql.jpa-and-spring-data) +* [Spring Web](https://docs.spring.io/spring-boot/docs/3.2.0/reference/htmlsingle/index.html#web) +* [Rest Repositories](https://docs.spring.io/spring-boot/docs/3.2.0/reference/htmlsingle/index.html#howto.data-access.exposing-spring-data-repositories-as-rest) + +### Guides +The following guides illustrate how to use some features concretely: + +* [Accessing Data with JPA](https://spring.io/guides/gs/accessing-data-jpa/) +* [Building a RESTful Web Service](https://spring.io/guides/gs/rest-service/) +* [Serving Web Content with Spring MVC](https://spring.io/guides/gs/serving-web-content/) +* [Building REST services with Spring](https://spring.io/guides/tutorials/rest/) +* [Accessing JPA Data with REST](https://spring.io/guides/gs/accessing-data-rest/) +* [Accessing Neo4j Data with REST](https://spring.io/guides/gs/accessing-neo4j-data-rest/) +* [Accessing MongoDB Data with REST](https://spring.io/guides/gs/accessing-mongodb-data-rest/) + +### Docker Compose support +This project contains a Docker Compose file named `compose.yaml`. +In this file, the following services have been defined: + +* mariadb: [`mariadb:latest`](https://hub.docker.com/_/mariadb) + +Please review the tags of the used images and set them to the same as you're running in production. + diff --git a/mvnw b/mvnw new file mode 100755 index 0000000..66df285 --- /dev/null +++ b/mvnw @@ -0,0 +1,308 @@ +#!/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 +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Apache Maven Wrapper startup batch script, version 3.2.0 +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /usr/local/etc/mavenrc ] ; then + . /usr/local/etc/mavenrc + fi + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "$(uname)" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + JAVA_HOME="$(/usr/libexec/java_home)"; export JAVA_HOME + else + JAVA_HOME="/Library/Java/Home"; export JAVA_HOME + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=$(java-config --jre-home) + fi +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$JAVA_HOME" ] && + JAVA_HOME=$(cygpath --unix "$JAVA_HOME") + [ -n "$CLASSPATH" ] && + CLASSPATH=$(cygpath --path --unix "$CLASSPATH") +fi + +# For Mingw, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$JAVA_HOME" ] && [ -d "$JAVA_HOME" ] && + JAVA_HOME="$(cd "$JAVA_HOME" || (echo "cannot cd into $JAVA_HOME."; exit 1); pwd)" +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="$(which javac)" + if [ -n "$javaExecutable" ] && ! [ "$(expr "\"$javaExecutable\"" : '\([^ ]*\)')" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=$(which readlink) + if [ ! "$(expr "$readLink" : '\([^ ]*\)')" = "no" ]; then + if $darwin ; then + javaHome="$(dirname "\"$javaExecutable\"")" + javaExecutable="$(cd "\"$javaHome\"" && pwd -P)/javac" + else + javaExecutable="$(readlink -f "\"$javaExecutable\"")" + fi + javaHome="$(dirname "\"$javaExecutable\"")" + javaHome=$(expr "$javaHome" : '\(.*\)/bin') + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="$(\unset -f command 2>/dev/null; \command -v java)" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=$(cd "$wdir/.." || exit 1; pwd) + fi + # end of workaround + done + printf '%s' "$(cd "$basedir" || exit 1; pwd)" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + # Remove \r in case we run on Windows within Git Bash + # and check out the repository with auto CRLF management + # enabled. Otherwise, we may read lines that are delimited with + # \r\n and produce $'-Xarg\r' rather than -Xarg due to word + # splitting rules. + tr -s '\r\n' ' ' < "$1" + fi +} + +log() { + if [ "$MVNW_VERBOSE" = true ]; then + printf '%s\n' "$1" + fi +} + +BASE_DIR=$(find_maven_basedir "$(dirname "$0")") +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}; export MAVEN_PROJECTBASEDIR +log "$MAVEN_PROJECTBASEDIR" + +########################################################################################## +# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +# This allows using the maven wrapper in projects that prohibit checking in binary data. +########################################################################################## +wrapperJarPath="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" +if [ -r "$wrapperJarPath" ]; then + log "Found $wrapperJarPath" +else + log "Couldn't find $wrapperJarPath, downloading it ..." + + if [ -n "$MVNW_REPOURL" ]; then + wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" + else + wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" + fi + while IFS="=" read -r key value; do + # Remove '\r' from value to allow usage on windows as IFS does not consider '\r' as a separator ( considers space, tab, new line ('\n'), and custom '=' ) + safeValue=$(echo "$value" | tr -d '\r') + case "$key" in (wrapperUrl) wrapperUrl="$safeValue"; break ;; + esac + done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties" + log "Downloading from: $wrapperUrl" + + if $cygwin; then + wrapperJarPath=$(cygpath --path --windows "$wrapperJarPath") + fi + + if command -v wget > /dev/null; then + log "Found wget ... using wget" + [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--quiet" + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget $QUIET "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + else + wget $QUIET --http-user="$MVNW_USERNAME" --http-password="$MVNW_PASSWORD" "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + fi + elif command -v curl > /dev/null; then + log "Found curl ... using curl" + [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--silent" + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl $QUIET -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" + else + curl $QUIET --user "$MVNW_USERNAME:$MVNW_PASSWORD" -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" + fi + else + log "Falling back to using Java to download" + javaSource="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.java" + javaClass="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.class" + # For Cygwin, switch paths to Windows format before running javac + if $cygwin; then + javaSource=$(cygpath --path --windows "$javaSource") + javaClass=$(cygpath --path --windows "$javaClass") + fi + if [ -e "$javaSource" ]; then + if [ ! -e "$javaClass" ]; then + log " - Compiling MavenWrapperDownloader.java ..." + ("$JAVA_HOME/bin/javac" "$javaSource") + fi + if [ -e "$javaClass" ]; then + log " - Running MavenWrapperDownloader.java ..." + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$wrapperUrl" "$wrapperJarPath") || rm -f "$wrapperJarPath" + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +# If specified, validate the SHA-256 sum of the Maven wrapper jar file +wrapperSha256Sum="" +while IFS="=" read -r key value; do + case "$key" in (wrapperSha256Sum) wrapperSha256Sum=$value; break ;; + esac +done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties" +if [ -n "$wrapperSha256Sum" ]; then + wrapperSha256Result=false + if command -v sha256sum > /dev/null; then + if echo "$wrapperSha256Sum $wrapperJarPath" | sha256sum -c > /dev/null 2>&1; then + wrapperSha256Result=true + fi + elif command -v shasum > /dev/null; then + if echo "$wrapperSha256Sum $wrapperJarPath" | shasum -a 256 -c > /dev/null 2>&1; then + wrapperSha256Result=true + fi + else + echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." + echo "Please install either command, or disable validation by removing 'wrapperSha256Sum' from your maven-wrapper.properties." + exit 1 + fi + if [ $wrapperSha256Result = false ]; then + echo "Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised." >&2 + echo "Investigate or delete $wrapperJarPath to attempt a clean download." >&2 + echo "If you updated your Maven version, you need to update the specified wrapperSha256Sum property." >&2 + exit 1 + fi +fi + +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$JAVA_HOME" ] && + JAVA_HOME=$(cygpath --path --windows "$JAVA_HOME") + [ -n "$CLASSPATH" ] && + CLASSPATH=$(cygpath --path --windows "$CLASSPATH") + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=$(cygpath --path --windows "$MAVEN_PROJECTBASEDIR") +fi + +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $*" +export MAVEN_CMD_LINE_ARGS + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +# shellcheck disable=SC2086 # safe args +exec "$JAVACMD" \ + $MAVEN_OPTS \ + $MAVEN_DEBUG_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/mvnw.cmd b/mvnw.cmd new file mode 100644 index 0000000..95ba6f5 --- /dev/null +++ b/mvnw.cmd @@ -0,0 +1,205 @@ +@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 https://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.2.0 +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM set title of command window +title %0 +@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %* +if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %* +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +set WRAPPER_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" + +FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET WRAPPER_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + if "%MVNW_VERBOSE%" == "true" ( + echo Found %WRAPPER_JAR% + ) +) else ( + if not "%MVNW_REPOURL%" == "" ( + SET WRAPPER_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %WRAPPER_URL% + ) + + powershell -Command "&{"^ + "$webclient = new-object System.Net.WebClient;"^ + "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ + "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ + "}"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%WRAPPER_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) +) +@REM End of extension + +@REM If specified, validate the SHA-256 sum of the Maven wrapper jar file +SET WRAPPER_SHA_256_SUM="" +FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperSha256Sum" SET WRAPPER_SHA_256_SUM=%%B +) +IF NOT %WRAPPER_SHA_256_SUM%=="" ( + powershell -Command "&{"^ + "$hash = (Get-FileHash \"%WRAPPER_JAR%\" -Algorithm SHA256).Hash.ToLower();"^ + "If('%WRAPPER_SHA_256_SUM%' -ne $hash){"^ + " Write-Output 'Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised.';"^ + " Write-Output 'Investigate or delete %WRAPPER_JAR% to attempt a clean download.';"^ + " Write-Output 'If you updated your Maven version, you need to update the specified wrapperSha256Sum property.';"^ + " exit 1;"^ + "}"^ + "}" + if ERRORLEVEL 1 goto error +) + +@REM Provide a "standardized" way to retrieve the CLI args that will +@REM work with both Windows and non-Windows executions. +set MAVEN_CMD_LINE_ARGS=%* + +%MAVEN_JAVA_EXE% ^ + %JVM_CONFIG_MAVEN_PROPS% ^ + %MAVEN_OPTS% ^ + %MAVEN_DEBUG_OPTS% ^ + -classpath %WRAPPER_JAR% ^ + "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^ + %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat" +if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%"=="on" pause + +if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE% + +cmd /C exit /B %ERROR_CODE% diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..72b517a --- /dev/null +++ b/pom.xml @@ -0,0 +1,83 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 3.2.0 + + + com.example + demo + 0.0.1-SNAPSHOT + Kata-API + Demo project for Spring Boot + + 17 + + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.springframework.boot + spring-boot-starter-data-rest + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-docker-compose + runtime + true + + + org.mariadb.jdbc + mariadb-java-client + runtime + + + org.projectlombok + lombok + true + + + org.springframework.boot + spring-boot-starter-test + test + + + jakarta.persistence + jakarta.persistence-api + 3.1.0 + + + javax.validation + validation-api + 2.0.1.Final + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + org.projectlombok + lombok + + + + + + + + diff --git a/src/main/java/com/example/demo/KataApiApplication.java b/src/main/java/com/example/demo/KataApiApplication.java new file mode 100644 index 0000000..0300b61 --- /dev/null +++ b/src/main/java/com/example/demo/KataApiApplication.java @@ -0,0 +1,13 @@ +package com.example.demo; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class KataApiApplication { + + public static void main(String[] args) { + SpringApplication.run(KataApiApplication.class, args); + } + +} diff --git a/src/main/java/com/example/demo/config/CorsConfig.java b/src/main/java/com/example/demo/config/CorsConfig.java new file mode 100644 index 0000000..1f7f771 --- /dev/null +++ b/src/main/java/com/example/demo/config/CorsConfig.java @@ -0,0 +1,16 @@ +package com.example.demo.config; + +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 implements WebMvcConfigurer +{ + @Override + public void addCorsMappings(CorsRegistry registry) { + registry.addMapping("/**") + .allowedOrigins("http://localhost") + .allowedMethods("GET","POST", "PUT", "DELETE"); + } +} \ No newline at end of file diff --git a/src/main/java/com/example/demo/controllers/BeersController.java b/src/main/java/com/example/demo/controllers/BeersController.java new file mode 100644 index 0000000..9e19f96 --- /dev/null +++ b/src/main/java/com/example/demo/controllers/BeersController.java @@ -0,0 +1,98 @@ +package com.example.demo.controllers; + +/* +/beer Añadir una cerveza POST +/beer/{id} Modificar una cerveza PUT +*/ + +import com.example.demo.dto.CreateBeerDTO; +import com.example.demo.dto.UpdateBeerDTO; +import com.example.demo.models.Beer; +import com.example.demo.repositories.BeerRepository; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.rest.webmvc.ResourceNotFoundException; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; +import java.util.Date; + +@RestController +@RequestMapping("/api") +public class BeersController { + + private final BeerRepository beerRepository; + + public BeersController(BeerRepository beerRepository) { + this.beerRepository = beerRepository; + } + + @GetMapping("/beers") + public Page getBeers(@RequestParam(defaultValue = "0") int page, + @RequestParam(defaultValue = "100") int size) { + PageRequest pageRequest = PageRequest.of(page, size); + Page beerPage = beerRepository.findAll(pageRequest); + return ResponseEntity.status(HttpStatus.OK).body(beerPage).getBody(); + } + + @GetMapping("/beer/{id}") + public ResponseEntity getBeerById(@PathVariable Long id) { + Beer beer = beerRepository.findById(id).orElse(null); + if (beer != null) { + return new ResponseEntity<>(beer, HttpStatus.OK); + } else { + throw new ResourceNotFoundException("Beer not found with id " + id); + } + } + + @DeleteMapping("/beer/{id}") + public ResponseEntity deleteBeer(@PathVariable Long id) { + return beerRepository.findById(id) + .map(beer -> { + beerRepository.delete(beer); + return ResponseEntity.ok().build(); + }) + .orElseThrow(() -> new ResourceNotFoundException("Beer not found with id " + id)); + } + + @PostMapping("/beer") + public ResponseEntity addBeer(@Valid @RequestBody CreateBeerDTO beerDTO) { + Beer beer = new Beer(); + beer.setName(beerDTO.getName()); + beer.setBrewery_id(beerDTO.getBrewery_id()); + beer.setCat_id(beerDTO.getCat_id()); + beer.setStyle_id(beerDTO.getStyle_id()); + beer.setAbv(beerDTO.getAbv()); + beer.setIbu(beerDTO.getIbu()); + beer.setSrm(beerDTO.getSrm()); + beer.setUpc(beerDTO.getUpc()); + beer.setFilepath(beerDTO.getFilepath()); + beer.setDescript(beerDTO.getDescript()); + beer.setAdd_user(beerDTO.getAdd_user()); + beer.setLast_mod(new Date()); + Beer beerAdded = beerRepository.save(beer); + return new ResponseEntity<>(beerAdded, HttpStatus.CREATED); + } + + @PutMapping("/beer/{id}") + public ResponseEntity updateBeer(@PathVariable Long id, @Valid @RequestBody UpdateBeerDTO beerDTO) { + Beer beer = new Beer(); + beer.setId(id); + beer.setName(beerDTO.getName()); + beer.setBrewery_id(beerDTO.getBrewery_id()); + beer.setCat_id(beerDTO.getCat_id()); + beer.setStyle_id(beerDTO.getStyle_id()); + beer.setAbv(beerDTO.getAbv()); + beer.setIbu(beerDTO.getIbu()); + beer.setSrm(beerDTO.getSrm()); + beer.setUpc(beerDTO.getUpc()); + beer.setFilepath(beerDTO.getFilepath()); + beer.setDescript(beerDTO.getDescript()); + beer.setAdd_user(beerDTO.getAdd_user()); + beer.setLast_mod(new Date()); + Beer beerUpdated = beerRepository.save(beer); + return new ResponseEntity<>(beerUpdated, HttpStatus.OK); + } +} diff --git a/src/main/java/com/example/demo/controllers/BreweriesController.java b/src/main/java/com/example/demo/controllers/BreweriesController.java new file mode 100644 index 0000000..ccd4f8b --- /dev/null +++ b/src/main/java/com/example/demo/controllers/BreweriesController.java @@ -0,0 +1,40 @@ +package com.example.demo.controllers; + +import com.example.demo.models.Breweries; +import com.example.demo.repositories.BreweriesRepository; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.rest.webmvc.ResourceNotFoundException; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping("/api") +public class BreweriesController { + + private final BreweriesRepository breweriesRepository; + + public BreweriesController(BreweriesRepository breweriesRepository) { + this.breweriesRepository = breweriesRepository; + } + + @GetMapping("/breweries") + public Page getBreweries(@RequestParam(defaultValue = "0") int page, + @RequestParam(defaultValue = "100") int size) { + PageRequest pageRequest = PageRequest.of(page, size); + Page breweriesPage = breweriesRepository.findAll(pageRequest); + return ResponseEntity.status(HttpStatus.OK).body(breweriesPage).getBody(); + } + + @GetMapping("/brewerie/{id}") + public ResponseEntity getBrewerieById(@PathVariable Long id) { + Breweries brewerie = breweriesRepository.findById(id).orElse(null); + if (brewerie != null) { + return new ResponseEntity<>(brewerie, HttpStatus.OK); + } else { + throw new ResourceNotFoundException("Brewerie not found with id " + id); + } + } + +} diff --git a/src/main/java/com/example/demo/controllers/CategoriesController.java b/src/main/java/com/example/demo/controllers/CategoriesController.java new file mode 100644 index 0000000..d46e820 --- /dev/null +++ b/src/main/java/com/example/demo/controllers/CategoriesController.java @@ -0,0 +1,40 @@ +package com.example.demo.controllers; + +import com.example.demo.models.Categories; +import com.example.demo.repositories.CategoriesRepository; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.rest.webmvc.ResourceNotFoundException; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping("/api") +public class CategoriesController { + + private final CategoriesRepository categoriesRepository; + + public CategoriesController(CategoriesRepository categoriesRepository) { + this.categoriesRepository = categoriesRepository; + } + + @GetMapping("/categories") + public Page getCategories(@RequestParam(defaultValue = "0") int page, + @RequestParam(defaultValue = "100") int size) { + PageRequest pageRequest = PageRequest.of(page, size); + Page categoriesPage = categoriesRepository.findAll(pageRequest); + return ResponseEntity.status(HttpStatus.OK).body(categoriesPage).getBody(); + } + + @GetMapping("/categorie/{id}") + public ResponseEntity getCategoryById(@PathVariable Long id) { + Categories category = categoriesRepository.findById(id).orElse(null); + if (category != null) { + return new ResponseEntity<>(category, HttpStatus.OK); + } else { + throw new ResourceNotFoundException("Category not found with id " + id); + } + } + +} diff --git a/src/main/java/com/example/demo/controllers/StylesController.java b/src/main/java/com/example/demo/controllers/StylesController.java new file mode 100644 index 0000000..8af9dd9 --- /dev/null +++ b/src/main/java/com/example/demo/controllers/StylesController.java @@ -0,0 +1,40 @@ +package com.example.demo.controllers; + +import com.example.demo.models.Styles; +import com.example.demo.repositories.StylesRepository; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.rest.webmvc.ResourceNotFoundException; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping("/api") +public class StylesController { + + private final StylesRepository stylesRepository; + + public StylesController(StylesRepository stylesRepository) { + this.stylesRepository = stylesRepository; + } + + @GetMapping("/styles") + public Page getStyles(@RequestParam(defaultValue = "0") int page, + @RequestParam(defaultValue = "100") int size) { + PageRequest pageRequest = PageRequest.of(page, size); + Page stylesPage = stylesRepository.findAll(pageRequest); + return ResponseEntity.status(HttpStatus.OK).body(stylesPage).getBody(); + } + + @GetMapping("/style/{id}") + public ResponseEntity getStyleById(@PathVariable Long id) { + Styles style = stylesRepository.findById(id).orElse(null); + if (style != null) { + return new ResponseEntity<>(style, HttpStatus.OK); + } else { + throw new ResourceNotFoundException("Style not found with id " + id); + } + } + +} \ No newline at end of file diff --git a/src/main/java/com/example/demo/dto/CreateBeerDTO.java b/src/main/java/com/example/demo/dto/CreateBeerDTO.java new file mode 100644 index 0000000..9b853d4 --- /dev/null +++ b/src/main/java/com/example/demo/dto/CreateBeerDTO.java @@ -0,0 +1,24 @@ +package com.example.demo.dto; + +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +@Data +@NoArgsConstructor +public class CreateBeerDTO { + + private int brewery_id = 0; + private String name; + private int cat_id = 0; + private int style_id = 0; + private float abv = 0; + private float ibu = 0; + private float srm = 0; + private float upc = 0; + private String filepath; + private String descript; + private int add_user = 0; + +} diff --git a/src/main/java/com/example/demo/dto/UpdateBeerDTO.java b/src/main/java/com/example/demo/dto/UpdateBeerDTO.java new file mode 100644 index 0000000..c4df0e6 --- /dev/null +++ b/src/main/java/com/example/demo/dto/UpdateBeerDTO.java @@ -0,0 +1,22 @@ +package com.example.demo.dto; + +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@NoArgsConstructor +public class UpdateBeerDTO { + + private int brewery_id = 0; + private String name; + private int cat_id = 0; + private int style_id = 0; + private float abv = 0; + private float ibu = 0; + private float srm = 0; + private float upc = 0; + private String filepath; + private String descript; + private int add_user = 0; + +} diff --git a/src/main/java/com/example/demo/models/Beer.java b/src/main/java/com/example/demo/models/Beer.java new file mode 100644 index 0000000..346b2c3 --- /dev/null +++ b/src/main/java/com/example/demo/models/Beer.java @@ -0,0 +1,36 @@ +package com.example.demo.models; + +import jakarta.persistence.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@Entity +@Builder +@Table (name = "beers") +public class Beer { + + @Id + @GeneratedValue (strategy = GenerationType.IDENTITY) + private Long id; + + private int brewery_id = 0; + private String name; + private int cat_id = 0; + private int style_id = 0; + private float abv = 0; + private float ibu = 0; + private float srm = 0; + private float upc = 0; + private String filepath; + private String descript; + private int add_user = 0; + private Date last_mod; + +} diff --git a/src/main/java/com/example/demo/models/Breweries.java b/src/main/java/com/example/demo/models/Breweries.java new file mode 100644 index 0000000..e69022a --- /dev/null +++ b/src/main/java/com/example/demo/models/Breweries.java @@ -0,0 +1,36 @@ +package com.example.demo.models; + +import jakarta.persistence.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@Entity +@Builder +@Table(name = "breweries") +public class Breweries { + + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + private Long id; + private String name; + private String address1; + private String address2; + private String city; + private String state; + private String code; + private String country; + private String phone; + private String website; + private String filepath; + private String descript; + private int add_user = 0; + private Date last_mod; + +} diff --git a/src/main/java/com/example/demo/models/Categories.java b/src/main/java/com/example/demo/models/Categories.java new file mode 100644 index 0000000..9b55287 --- /dev/null +++ b/src/main/java/com/example/demo/models/Categories.java @@ -0,0 +1,25 @@ +package com.example.demo.models; + +import jakarta.persistence.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@Entity +@Builder +@Table(name = "categories") +public class Categories { + + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + private Long id; + private String cat_name; + private Date last_mod; + +} diff --git a/src/main/java/com/example/demo/models/Styles.java b/src/main/java/com/example/demo/models/Styles.java new file mode 100644 index 0000000..ee8cab6 --- /dev/null +++ b/src/main/java/com/example/demo/models/Styles.java @@ -0,0 +1,26 @@ +package com.example.demo.models; + +import jakarta.persistence.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@Entity +@Builder +@Table(name = "styles") +public class Styles { + + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + private Long id; + private int cat_id = 0; + private String style_name; + private Date last_mod; + +} diff --git a/src/main/java/com/example/demo/repositories/BeerRepository.java b/src/main/java/com/example/demo/repositories/BeerRepository.java new file mode 100644 index 0000000..889b8bb --- /dev/null +++ b/src/main/java/com/example/demo/repositories/BeerRepository.java @@ -0,0 +1,8 @@ +package com.example.demo.repositories; + +import com.example.demo.models.Beer; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface BeerRepository extends JpaRepository { + +} diff --git a/src/main/java/com/example/demo/repositories/BreweriesRepository.java b/src/main/java/com/example/demo/repositories/BreweriesRepository.java new file mode 100644 index 0000000..b12ddec --- /dev/null +++ b/src/main/java/com/example/demo/repositories/BreweriesRepository.java @@ -0,0 +1,8 @@ +package com.example.demo.repositories; + +import com.example.demo.models.Breweries; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface BreweriesRepository extends JpaRepository { + +} diff --git a/src/main/java/com/example/demo/repositories/CategoriesRepository.java b/src/main/java/com/example/demo/repositories/CategoriesRepository.java new file mode 100644 index 0000000..435516f --- /dev/null +++ b/src/main/java/com/example/demo/repositories/CategoriesRepository.java @@ -0,0 +1,8 @@ +package com.example.demo.repositories; + +import com.example.demo.models.Categories; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface CategoriesRepository extends JpaRepository { + +} \ No newline at end of file diff --git a/src/main/java/com/example/demo/repositories/StylesRepository.java b/src/main/java/com/example/demo/repositories/StylesRepository.java new file mode 100644 index 0000000..02aa466 --- /dev/null +++ b/src/main/java/com/example/demo/repositories/StylesRepository.java @@ -0,0 +1,8 @@ +package com.example.demo.repositories; + +import com.example.demo.models.Styles; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface StylesRepository 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..8b13789 --- /dev/null +++ b/src/main/resources/application.properties @@ -0,0 +1 @@ + diff --git a/src/test/java/com/example/demo/KataApiApplicationTests.java b/src/test/java/com/example/demo/KataApiApplicationTests.java new file mode 100644 index 0000000..7ea807d --- /dev/null +++ b/src/test/java/com/example/demo/KataApiApplicationTests.java @@ -0,0 +1,13 @@ +package com.example.demo; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class KataApiApplicationTests { + + @Test + void contextLoads() { + } + +}