From fc0c12bd76006f56676d671c183c9dcb2d813414 Mon Sep 17 00:00:00 2001 From: Montse Date: Thu, 5 Sep 2024 12:45:42 +0200 Subject: [PATCH 1/2] first commit --- .gitignore | 33 +++ .mvn/wrapper/maven-wrapper.properties | 19 ++ mvnw | 259 ++++++++++++++++++ mvnw.cmd | 149 ++++++++++ pom.xml | 76 +++++ .../java/nurses/nurses/NursesApplication.java | 13 + .../nurses/controller/ChapterController.java | 33 +++ .../nurses/controller/MemberController.java | 33 +++ src/main/java/nurses/nurses/enums/Status.java | 8 + .../java/nurses/nurses/model/Chapter.java | 22 ++ src/main/java/nurses/nurses/model/Member.java | 24 ++ .../nurses/repository/ChapterRepository.java | 10 + .../nurses/repository/MemberRepository.java | 13 + .../nurses/nurses/service/ChapterService.java | 27 ++ .../nurses/nurses/service/MemberService.java | 24 ++ src/main/resources/application.properties | 30 ++ .../nurses/nurses/NursesApplicationTests.java | 13 + 17 files changed, 786 insertions(+) create mode 100644 .gitignore create mode 100644 .mvn/wrapper/maven-wrapper.properties create mode 100644 mvnw create mode 100644 mvnw.cmd create mode 100644 pom.xml create mode 100644 src/main/java/nurses/nurses/NursesApplication.java create mode 100644 src/main/java/nurses/nurses/controller/ChapterController.java create mode 100644 src/main/java/nurses/nurses/controller/MemberController.java create mode 100644 src/main/java/nurses/nurses/enums/Status.java create mode 100644 src/main/java/nurses/nurses/model/Chapter.java create mode 100644 src/main/java/nurses/nurses/model/Member.java create mode 100644 src/main/java/nurses/nurses/repository/ChapterRepository.java create mode 100644 src/main/java/nurses/nurses/repository/MemberRepository.java create mode 100644 src/main/java/nurses/nurses/service/ChapterService.java create mode 100644 src/main/java/nurses/nurses/service/MemberService.java create mode 100644 src/main/resources/application.properties create mode 100644 src/test/java/nurses/nurses/NursesApplicationTests.java diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..549e00a --- /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..d58dfb7 --- /dev/null +++ b/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,19 @@ +# 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. +wrapperVersion=3.3.2 +distributionType=only-script +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip diff --git a/mvnw b/mvnw new file mode 100644 index 0000000..19529dd --- /dev/null +++ b/mvnw @@ -0,0 +1,259 @@ +#!/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.2 +# +# 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:]' +} + +# 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 <"${0%/*}/.mvn/wrapper/maven-wrapper.properties" +[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in ${0%/*}/.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${0##*/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 +printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/mvnw.url" +mv -- "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" "$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..249bdf3 --- /dev/null +++ b/mvnw.cmd @@ -0,0 +1,149 @@ +<# : 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.2 +@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) { "/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_HOME_PARENT = "$HOME/.m2/wrapper/dists/$distributionUrlNameMain" +if ($env:MAVEN_USER_HOME) { + $MAVEN_HOME_PARENT = "$env:MAVEN_USER_HOME/wrapper/dists/$distributionUrlNameMain" +} +$MAVEN_HOME_NAME = ([System.Security.Cryptography.MD5]::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 +Rename-Item -Path "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" -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..17756b7 --- /dev/null +++ b/pom.xml @@ -0,0 +1,76 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 3.3.3 + + + nurses + nurses + 0.0.1-SNAPSHOT + nurses + Demo project for Spring Boot + + + + + + + + + + + + + + + 17 + + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.springframework.boot + spring-boot-starter-web + + + + com.mysql + mysql-connector-j + runtime + + + org.projectlombok + lombok + true + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + org.projectlombok + lombok + + + + + + + + diff --git a/src/main/java/nurses/nurses/NursesApplication.java b/src/main/java/nurses/nurses/NursesApplication.java new file mode 100644 index 0000000..4e23308 --- /dev/null +++ b/src/main/java/nurses/nurses/NursesApplication.java @@ -0,0 +1,13 @@ +package nurses.nurses; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class NursesApplication { + + public static void main(String[] args) { + SpringApplication.run(NursesApplication.class, args); + } + +} diff --git a/src/main/java/nurses/nurses/controller/ChapterController.java b/src/main/java/nurses/nurses/controller/ChapterController.java new file mode 100644 index 0000000..58fd96e --- /dev/null +++ b/src/main/java/nurses/nurses/controller/ChapterController.java @@ -0,0 +1,33 @@ +package controller; + +import model.Chapter; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import service.ChapterService; + +import java.util.List; +import java.util.Optional; + +@RestController +@RequestMapping("/chapter") +public class ChapterController { + @Autowired + private ChapterService chapterService; + + @GetMapping + public List getAllChapters(){ return chapterService.getAllChapters();} + + @GetMapping("/{id}") + public ResponseEntity getChapterById(@PathVariable Long id){ + Optional chapter = chapterService.getChapterById(id); + return chapter.map(ResponseEntity::ok).orElseGet(()-> ResponseEntity.notFound().build()); + } + + @PutMapping("/{id}") + public ResponseEntity updateChapter(@PathVariable Long id, @RequestBody Chapter chapter){ + Optional updatedChapter = chapterService.updateChapter(id, chapter); + return updatedChapter.map(ResponseEntity::ok).orElseGet(()-> ResponseEntity.notFound().build()); + } + +} diff --git a/src/main/java/nurses/nurses/controller/MemberController.java b/src/main/java/nurses/nurses/controller/MemberController.java new file mode 100644 index 0000000..13c5a00 --- /dev/null +++ b/src/main/java/nurses/nurses/controller/MemberController.java @@ -0,0 +1,33 @@ +package controller; + +import enums.Status; +import model.Member; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import service.MemberService; + +import java.util.List; +import java.util.Optional; + +@RestController +@RequestMapping("/member") +public class MemberController { + @Autowired + private MemberService balnearioService; + + @GetMapping + public List getAllMembers(){ return balnearioService.getAllMembers();} + + @GetMapping("/{id}") + public ResponseEntity getMemberById(@PathVariable Long id){ + Optional balneario = balnearioService.getMemberById(id); + return balneario.map(ResponseEntity::ok).orElseGet(()-> ResponseEntity.notFound().build()); + } + + @GetMapping("/buscar/status-miembro") + public ResponseEntity> buscarPorStatusMiembro(@RequestParam Status statusMiembro){ + List balnearios = balnearioService.buscarPorStatusMiembro(statusMiembro); + return ResponseEntity.ok(balnearios); + } +} diff --git a/src/main/java/nurses/nurses/enums/Status.java b/src/main/java/nurses/nurses/enums/Status.java new file mode 100644 index 0000000..30f3f7f --- /dev/null +++ b/src/main/java/nurses/nurses/enums/Status.java @@ -0,0 +1,8 @@ +package enums; + + +public enum Status { + ACTIVE , + LAPSED +} + diff --git a/src/main/java/nurses/nurses/model/Chapter.java b/src/main/java/nurses/nurses/model/Chapter.java new file mode 100644 index 0000000..ed9788a --- /dev/null +++ b/src/main/java/nurses/nurses/model/Chapter.java @@ -0,0 +1,22 @@ +package model; + +import jakarta.persistence.*; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +@Entity +public class Chapter implements Serializable { + + @Id + @GeneratedValue (strategy = GenerationType.IDENTITY) + private Long id; + + private String district; + @OneToOne + private Member president; + @OneToMany + private List members; +} diff --git a/src/main/java/nurses/nurses/model/Member.java b/src/main/java/nurses/nurses/model/Member.java new file mode 100644 index 0000000..2bd5ae8 --- /dev/null +++ b/src/main/java/nurses/nurses/model/Member.java @@ -0,0 +1,24 @@ +package model; + +import enums.Status; +import jakarta.persistence.*; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDate; + +@Data +@Entity +public class Member implements Serializable { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + private String name; + + @Enumerated(EnumType.STRING) + private Status status; + private LocalDate renewalDate; + +} diff --git a/src/main/java/nurses/nurses/repository/ChapterRepository.java b/src/main/java/nurses/nurses/repository/ChapterRepository.java new file mode 100644 index 0000000..844f347 --- /dev/null +++ b/src/main/java/nurses/nurses/repository/ChapterRepository.java @@ -0,0 +1,10 @@ +package repository; + +import model.Chapter; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.List; + +public interface ChapterRepository extends JpaRepository { + +} diff --git a/src/main/java/nurses/nurses/repository/MemberRepository.java b/src/main/java/nurses/nurses/repository/MemberRepository.java new file mode 100644 index 0000000..cb12518 --- /dev/null +++ b/src/main/java/nurses/nurses/repository/MemberRepository.java @@ -0,0 +1,13 @@ +package repository; + +import enums.Status; +import model.Chapter; +import model.Member; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.List; + +public interface MemberRepository extends JpaRepository { + + List findByStatus(Status statusMiembro); +} diff --git a/src/main/java/nurses/nurses/service/ChapterService.java b/src/main/java/nurses/nurses/service/ChapterService.java new file mode 100644 index 0000000..c9c088d --- /dev/null +++ b/src/main/java/nurses/nurses/service/ChapterService.java @@ -0,0 +1,27 @@ +package service; + +import model.Chapter; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import repository.ChapterRepository; + +import java.util.List; +import java.util.Optional; + +@Service +public class ChapterService { + @Autowired + private ChapterRepository chapterRepository; + + public List getAllChapters() { return chapterRepository.findAll(); } + + public Optional getChapterById(Long id){ return chapterRepository.findById(id); } + + public Optional updateChapter(Long id, Chapter chapter){ + if(chapterRepository.existsById(id)){ + chapter.setId(id); + return Optional.of(chapterRepository.save(chapter)); + } + return Optional.empty(); + } +} diff --git a/src/main/java/nurses/nurses/service/MemberService.java b/src/main/java/nurses/nurses/service/MemberService.java new file mode 100644 index 0000000..242c983 --- /dev/null +++ b/src/main/java/nurses/nurses/service/MemberService.java @@ -0,0 +1,24 @@ +package service; + +import enums.Status; +import model.Member; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import repository.MemberRepository; + +import java.util.List; +import java.util.Optional; + +@Service +public class MemberService { + @Autowired + private MemberRepository memberRepository; + + public List getAllMembers() { return memberRepository.findAll(); } + + public Optional getMemberById(Long id){ return memberRepository.findById(id); } + + public List buscarPorStatusMiembro(Status statusMiembro) { + return memberRepository.findByStatus(statusMiembro); + } +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties new file mode 100644 index 0000000..50caa4d --- /dev/null +++ b/src/main/resources/application.properties @@ -0,0 +1,30 @@ +spring.application.name=nurses + +# Configuraci?n de la conexi?n a la base de datos +spring.datasource.url=jdbc:mysql://localhost:3306/turismo?createDatabaseIfNotExist=true +spring.datasource.username=root +spring.datasource.password=ironhack +spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver + + +# Configuraci?n de Hibernate (JPA) +#spring.jpa.hibernate.ddl-auto=update para actualizar la base de datos que ya existe +#spring.jpa.hibernate.ddl-auto=create-drop para borrar la que ya existe y crear una desde 0, muy usado en test. +spring.jpa.hibernate.ddl-auto=create-drop +spring.jpa.show-sql=true + +# Configuraci?n de logs +# logging.level.org.springframework=INFO +# logging.level.com.tu_proyecto=DEBUG + +# Configuraci?n de Internacionalizaci?n (opcional) +# spring.messages.basename=messages + +# Configuraci?n de perfiles (opcional) +# spring.profiles.active=dev + +# Configuraci?n de CORS (opcional) +# Permitir todas las solicitudes desde cualquier origen +# spring.mvc.cors.allowed-origins=* +# Permitir m?todos espec?ficos (GET, POST, etc.) +# spring.mvc.cors.allowed-methods=GET,POST,PUT,DELETE \ No newline at end of file diff --git a/src/test/java/nurses/nurses/NursesApplicationTests.java b/src/test/java/nurses/nurses/NursesApplicationTests.java new file mode 100644 index 0000000..445b3f6 --- /dev/null +++ b/src/test/java/nurses/nurses/NursesApplicationTests.java @@ -0,0 +1,13 @@ +package nurses.nurses; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class NursesApplicationTests { + + @Test + void contextLoads() { + } + +} From d68352ea81e7376ef86bf68b92f3966f05ea040b Mon Sep 17 00:00:00 2001 From: Montse Date: Thu, 5 Sep 2024 17:05:20 +0200 Subject: [PATCH 2/2] work done --- .../controller/ChapterController.java | 6 +-- .../controller/ConferenceController.java | 33 +++++++++++++++ .../controller/EventController.java | 33 +++++++++++++++ .../controller/ExpositionController.java | 33 +++++++++++++++ .../controller/GuestController.java | 41 +++++++++++++++++++ .../controller/MemberController.java | 20 ++++----- .../controller/SpeakerController.java | 33 +++++++++++++++ .../java/lab1SpringJPA/enums/GuestStatus.java | 7 ++++ .../lab1SpringJPA/enums/MemberStatus.java | 8 ++++ .../lab1SpringJPA.java} | 6 +-- .../model/Chapter.java | 6 ++- .../java/lab1SpringJPA/model/Conference.java | 16 ++++++++ src/main/java/lab1SpringJPA/model/Event.java | 30 ++++++++++++++ .../java/lab1SpringJPA/model/Exposition.java | 10 +++++ src/main/java/lab1SpringJPA/model/Guest.java | 23 +++++++++++ .../model/Member.java | 9 ++-- .../java/lab1SpringJPA/model/Speaker.java | 19 +++++++++ .../repository/ChapterRepository.java | 8 ++-- .../repository/ConferenceRepository.java | 10 +++++ .../repository/EventRepository.java | 10 +++++ .../repository/ExpositionRepository.java | 10 +++++ .../repository/GuestRepository.java | 18 ++++++++ .../repository/MemberRepository.java | 14 +++++++ .../repository/SpeakerRepository.java | 10 +++++ .../service/ChapterService.java | 6 +-- .../service/ConferenceService.java | 27 ++++++++++++ .../lab1SpringJPA/service/EventService.java | 27 ++++++++++++ .../service/ExpositionService.java | 27 ++++++++++++ .../lab1SpringJPA/service/GuestService.java | 38 +++++++++++++++++ .../service/MemberService.java | 10 ++--- .../lab1SpringJPA/service/SpeakerService.java | 27 ++++++++++++ src/main/java/nurses/nurses/enums/Status.java | 8 ---- .../nurses/repository/MemberRepository.java | 13 ------ .../NursesApplicationTests.java | 2 +- 34 files changed, 543 insertions(+), 55 deletions(-) rename src/main/java/{nurses/nurses => lab1SpringJPA}/controller/ChapterController.java (90%) create mode 100644 src/main/java/lab1SpringJPA/controller/ConferenceController.java create mode 100644 src/main/java/lab1SpringJPA/controller/EventController.java create mode 100644 src/main/java/lab1SpringJPA/controller/ExpositionController.java create mode 100644 src/main/java/lab1SpringJPA/controller/GuestController.java rename src/main/java/{nurses/nurses => lab1SpringJPA}/controller/MemberController.java (55%) create mode 100644 src/main/java/lab1SpringJPA/controller/SpeakerController.java create mode 100644 src/main/java/lab1SpringJPA/enums/GuestStatus.java create mode 100644 src/main/java/lab1SpringJPA/enums/MemberStatus.java rename src/main/java/{nurses/nurses/NursesApplication.java => lab1SpringJPA/lab1SpringJPA.java} (63%) rename src/main/java/{nurses/nurses => lab1SpringJPA}/model/Chapter.java (72%) create mode 100644 src/main/java/lab1SpringJPA/model/Conference.java create mode 100644 src/main/java/lab1SpringJPA/model/Event.java create mode 100644 src/main/java/lab1SpringJPA/model/Exposition.java create mode 100644 src/main/java/lab1SpringJPA/model/Guest.java rename src/main/java/{nurses/nurses => lab1SpringJPA}/model/Member.java (65%) create mode 100644 src/main/java/lab1SpringJPA/model/Speaker.java rename src/main/java/{nurses/nurses => lab1SpringJPA}/repository/ChapterRepository.java (51%) create mode 100644 src/main/java/lab1SpringJPA/repository/ConferenceRepository.java create mode 100644 src/main/java/lab1SpringJPA/repository/EventRepository.java create mode 100644 src/main/java/lab1SpringJPA/repository/ExpositionRepository.java create mode 100644 src/main/java/lab1SpringJPA/repository/GuestRepository.java create mode 100644 src/main/java/lab1SpringJPA/repository/MemberRepository.java create mode 100644 src/main/java/lab1SpringJPA/repository/SpeakerRepository.java rename src/main/java/{nurses/nurses => lab1SpringJPA}/service/ChapterService.java (85%) create mode 100644 src/main/java/lab1SpringJPA/service/ConferenceService.java create mode 100644 src/main/java/lab1SpringJPA/service/EventService.java create mode 100644 src/main/java/lab1SpringJPA/service/ExpositionService.java create mode 100644 src/main/java/lab1SpringJPA/service/GuestService.java rename src/main/java/{nurses/nurses => lab1SpringJPA}/service/MemberService.java (68%) create mode 100644 src/main/java/lab1SpringJPA/service/SpeakerService.java delete mode 100644 src/main/java/nurses/nurses/enums/Status.java delete mode 100644 src/main/java/nurses/nurses/repository/MemberRepository.java rename src/test/java/{nurses/nurses => lab1SpringJPA}/NursesApplicationTests.java (88%) diff --git a/src/main/java/nurses/nurses/controller/ChapterController.java b/src/main/java/lab1SpringJPA/controller/ChapterController.java similarity index 90% rename from src/main/java/nurses/nurses/controller/ChapterController.java rename to src/main/java/lab1SpringJPA/controller/ChapterController.java index 58fd96e..25cf7f7 100644 --- a/src/main/java/nurses/nurses/controller/ChapterController.java +++ b/src/main/java/lab1SpringJPA/controller/ChapterController.java @@ -1,10 +1,10 @@ -package controller; +package lab1SpringJPA.controller; -import model.Chapter; +import lab1SpringJPA.model.Chapter; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; -import service.ChapterService; +import lab1SpringJPA.service.ChapterService; import java.util.List; import java.util.Optional; diff --git a/src/main/java/lab1SpringJPA/controller/ConferenceController.java b/src/main/java/lab1SpringJPA/controller/ConferenceController.java new file mode 100644 index 0000000..71491ad --- /dev/null +++ b/src/main/java/lab1SpringJPA/controller/ConferenceController.java @@ -0,0 +1,33 @@ +package lab1SpringJPA.controller; + +import lab1SpringJPA.model.Conference; +import lab1SpringJPA.service.ConferenceService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Optional; + +@RestController +@RequestMapping("/conference") +public class ConferenceController { + @Autowired + private ConferenceService conferenceService; + + @GetMapping + public List getAllConferences(){ return conferenceService.getAllConferences();} + + @GetMapping("/{id}") + public ResponseEntity getConferenceById(@PathVariable Long id){ + Optional conference = conferenceService.getConferenceById(id); + return conference.map(ResponseEntity::ok).orElseGet(()-> ResponseEntity.notFound().build()); + } + + @PutMapping("/{id}") + public ResponseEntity updateConference(@PathVariable Long id, @RequestBody Conference conference){ + Optional updatedConference = conferenceService.updateConference(id, conference); + return updatedConference.map(ResponseEntity::ok).orElseGet(()-> ResponseEntity.notFound().build()); + } + +} diff --git a/src/main/java/lab1SpringJPA/controller/EventController.java b/src/main/java/lab1SpringJPA/controller/EventController.java new file mode 100644 index 0000000..3b4b8d1 --- /dev/null +++ b/src/main/java/lab1SpringJPA/controller/EventController.java @@ -0,0 +1,33 @@ +package lab1SpringJPA.controller; + +import lab1SpringJPA.model.Event; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import lab1SpringJPA.service.EventService; + +import java.util.List; +import java.util.Optional; + +@RestController +@RequestMapping("/event") +public class EventController { + @Autowired + private EventService eventService; + + @GetMapping + public List getAllEvents(){ return eventService.getAllEvents();} + + @GetMapping("/{id}") + public ResponseEntity getEventById(@PathVariable Long id){ + Optional event = eventService.getEventById(id); + return event.map(ResponseEntity::ok).orElseGet(()-> ResponseEntity.notFound().build()); + } + + @PutMapping("/{id}") + public ResponseEntity updateEvent(@PathVariable Long id, @RequestBody Event event){ + Optional updatedEvent = eventService.updateEvent(id, event); + return updatedEvent.map(ResponseEntity::ok).orElseGet(()-> ResponseEntity.notFound().build()); + } + +} diff --git a/src/main/java/lab1SpringJPA/controller/ExpositionController.java b/src/main/java/lab1SpringJPA/controller/ExpositionController.java new file mode 100644 index 0000000..a43d3c0 --- /dev/null +++ b/src/main/java/lab1SpringJPA/controller/ExpositionController.java @@ -0,0 +1,33 @@ +package lab1SpringJPA.controller; + +import lab1SpringJPA.model.Exposition; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import lab1SpringJPA.service.ExpositionService; + +import java.util.List; +import java.util.Optional; + +@RestController +@RequestMapping("/exposition") +public class ExpositionController { + @Autowired + private ExpositionService expositionService; + + @GetMapping + public List getAllExpositions(){ return expositionService.getAllExpositions();} + + @GetMapping("/{id}") + public ResponseEntity getExpositionById(@PathVariable Long id){ + Optional exposition = expositionService.getExpositionById(id); + return exposition.map(ResponseEntity::ok).orElseGet(()-> ResponseEntity.notFound().build()); + } + + @PutMapping("/{id}") + public ResponseEntity updateExposition(@PathVariable Long id, @RequestBody Exposition exposition){ + Optional updatedExposition = expositionService.updateExposition(id, exposition); + return updatedExposition.map(ResponseEntity::ok).orElseGet(()-> ResponseEntity.notFound().build()); + } + +} \ No newline at end of file diff --git a/src/main/java/lab1SpringJPA/controller/GuestController.java b/src/main/java/lab1SpringJPA/controller/GuestController.java new file mode 100644 index 0000000..4ea080c --- /dev/null +++ b/src/main/java/lab1SpringJPA/controller/GuestController.java @@ -0,0 +1,41 @@ +package lab1SpringJPA.controller; + +import lab1SpringJPA.enums.GuestStatus; +import lab1SpringJPA.enums.MemberStatus; +import lab1SpringJPA.model.Guest; +import lab1SpringJPA.model.Member; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import lab1SpringJPA.service.GuestService; + +import java.util.List; +import java.util.Optional; + +@RestController +@RequestMapping("/guest") +public class GuestController { + @Autowired + private GuestService guestService; + + @GetMapping + public List getAllGuests(){ return guestService.getAllGuests();} + + @GetMapping("/{id}") + public ResponseEntity getGuestById(@PathVariable Long id){ + Optional guest = guestService.getGuestById(id); + return guest.map(ResponseEntity::ok).orElseGet(()-> ResponseEntity.notFound().build()); + } + + @PutMapping("/{id}") + public ResponseEntity updateGuest(@PathVariable Long id, @RequestBody Guest guest){ + Optional updatedGuest = guestService.updateGuest(id, guest); + return updatedGuest.map(ResponseEntity::ok).orElseGet(()-> ResponseEntity.notFound().build()); + } + + @GetMapping("/buscar/status-guest") + public ResponseEntity> buscarPorStatusGuest(@RequestParam GuestStatus statusGuest){ + List guests = guestService.buscarPorStatusGuest(statusGuest); + return ResponseEntity.ok(guests); + } +} \ No newline at end of file diff --git a/src/main/java/nurses/nurses/controller/MemberController.java b/src/main/java/lab1SpringJPA/controller/MemberController.java similarity index 55% rename from src/main/java/nurses/nurses/controller/MemberController.java rename to src/main/java/lab1SpringJPA/controller/MemberController.java index 13c5a00..d9a44cf 100644 --- a/src/main/java/nurses/nurses/controller/MemberController.java +++ b/src/main/java/lab1SpringJPA/controller/MemberController.java @@ -1,11 +1,11 @@ -package controller; +package lab1SpringJPA.controller; -import enums.Status; -import model.Member; +import lab1SpringJPA.enums.MemberStatus; +import lab1SpringJPA.model.Member; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; -import service.MemberService; +import lab1SpringJPA.service.MemberService; import java.util.List; import java.util.Optional; @@ -14,20 +14,20 @@ @RequestMapping("/member") public class MemberController { @Autowired - private MemberService balnearioService; + private MemberService miembroService; @GetMapping - public List getAllMembers(){ return balnearioService.getAllMembers();} + public List getAllMembers(){ return miembroService.getAllMembers();} @GetMapping("/{id}") public ResponseEntity getMemberById(@PathVariable Long id){ - Optional balneario = balnearioService.getMemberById(id); + Optional balneario = miembroService.getMemberById(id); return balneario.map(ResponseEntity::ok).orElseGet(()-> ResponseEntity.notFound().build()); } @GetMapping("/buscar/status-miembro") - public ResponseEntity> buscarPorStatusMiembro(@RequestParam Status statusMiembro){ - List balnearios = balnearioService.buscarPorStatusMiembro(statusMiembro); - return ResponseEntity.ok(balnearios); + public ResponseEntity> buscarPorStatusMiembro(@RequestParam MemberStatus statusMiembro){ + List miembros = miembroService.buscarPorStatusMiembro(statusMiembro); + return ResponseEntity.ok(miembros); } } diff --git a/src/main/java/lab1SpringJPA/controller/SpeakerController.java b/src/main/java/lab1SpringJPA/controller/SpeakerController.java new file mode 100644 index 0000000..cb5553b --- /dev/null +++ b/src/main/java/lab1SpringJPA/controller/SpeakerController.java @@ -0,0 +1,33 @@ +package lab1SpringJPA.controller; + +import lab1SpringJPA.model.Speaker; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import lab1SpringJPA.service.SpeakerService; + +import java.util.List; +import java.util.Optional; + +@RestController +@RequestMapping("/speaker") +public class SpeakerController { + @Autowired + private SpeakerService speakerService; + + @GetMapping + public List getAllSpeakers(){ return speakerService.getAllSpeakers();} + + @GetMapping("/{id}") + public ResponseEntity getSpeakerById(@PathVariable Long id){ + Optional speaker = speakerService.getSpeakerById(id); + return speaker.map(ResponseEntity::ok).orElseGet(()-> ResponseEntity.notFound().build()); + } + + @PutMapping("/{id}") + public ResponseEntity updateSpeaker(@PathVariable Long id, @RequestBody Speaker speaker){ + Optional updatedSpeaker = speakerService.updateSpeaker(id, speaker); + return updatedSpeaker.map(ResponseEntity::ok).orElseGet(()-> ResponseEntity.notFound().build()); + } + +} diff --git a/src/main/java/lab1SpringJPA/enums/GuestStatus.java b/src/main/java/lab1SpringJPA/enums/GuestStatus.java new file mode 100644 index 0000000..8971fd6 --- /dev/null +++ b/src/main/java/lab1SpringJPA/enums/GuestStatus.java @@ -0,0 +1,7 @@ +package lab1SpringJPA.enums; + +public enum GuestStatus { + ATTENDING, + NOT_ATTENDING, + NO_RESPONSE +} diff --git a/src/main/java/lab1SpringJPA/enums/MemberStatus.java b/src/main/java/lab1SpringJPA/enums/MemberStatus.java new file mode 100644 index 0000000..5b2fe32 --- /dev/null +++ b/src/main/java/lab1SpringJPA/enums/MemberStatus.java @@ -0,0 +1,8 @@ +package lab1SpringJPA.enums; + + +public enum MemberStatus { + ACTIVE , + LAPSED +} + diff --git a/src/main/java/nurses/nurses/NursesApplication.java b/src/main/java/lab1SpringJPA/lab1SpringJPA.java similarity index 63% rename from src/main/java/nurses/nurses/NursesApplication.java rename to src/main/java/lab1SpringJPA/lab1SpringJPA.java index 4e23308..e4e138b 100644 --- a/src/main/java/nurses/nurses/NursesApplication.java +++ b/src/main/java/lab1SpringJPA/lab1SpringJPA.java @@ -1,13 +1,13 @@ -package nurses.nurses; +package lab1SpringJPA; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @SpringBootApplication -public class NursesApplication { +public class lab1SpringJPA { public static void main(String[] args) { - SpringApplication.run(NursesApplication.class, args); + SpringApplication.run(lab1SpringJPA.class, args); } } diff --git a/src/main/java/nurses/nurses/model/Chapter.java b/src/main/java/lab1SpringJPA/model/Chapter.java similarity index 72% rename from src/main/java/nurses/nurses/model/Chapter.java rename to src/main/java/lab1SpringJPA/model/Chapter.java index ed9788a..4c60c6e 100644 --- a/src/main/java/nurses/nurses/model/Chapter.java +++ b/src/main/java/lab1SpringJPA/model/Chapter.java @@ -1,4 +1,4 @@ -package model; +package lab1SpringJPA.model; import jakarta.persistence.*; import lombok.Data; @@ -17,6 +17,8 @@ public class Chapter implements Serializable { private String district; @OneToOne private Member president; - @OneToMany + + //mapped es el nombre que le doy para que busque la lista de miembros + @OneToMany(mappedBy = "chapter") private List members; } diff --git a/src/main/java/lab1SpringJPA/model/Conference.java b/src/main/java/lab1SpringJPA/model/Conference.java new file mode 100644 index 0000000..e21f488 --- /dev/null +++ b/src/main/java/lab1SpringJPA/model/Conference.java @@ -0,0 +1,16 @@ +package lab1SpringJPA.model; + +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import lombok.Data; + +import java.util.List; + +@Data +@Entity +public class Conference extends Event{ + + @OneToMany + private List speakers; +} diff --git a/src/main/java/lab1SpringJPA/model/Event.java b/src/main/java/lab1SpringJPA/model/Event.java new file mode 100644 index 0000000..31e1978 --- /dev/null +++ b/src/main/java/lab1SpringJPA/model/Event.java @@ -0,0 +1,30 @@ +package lab1SpringJPA.model; + +import jakarta.persistence.*; +import jdk.jfr.DataAmount; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +import java.time.LocalDate; +import java.util.List; + +@Data +@NoArgsConstructor +@Entity +public abstract class Event implements Serializable { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + private LocalDate date; + private int duration; + private String location; + private String title; + + @OneToMany(mappedBy = "event") + private List guests; +} + diff --git a/src/main/java/lab1SpringJPA/model/Exposition.java b/src/main/java/lab1SpringJPA/model/Exposition.java new file mode 100644 index 0000000..10892f0 --- /dev/null +++ b/src/main/java/lab1SpringJPA/model/Exposition.java @@ -0,0 +1,10 @@ +package lab1SpringJPA.model; + +import jakarta.persistence.Entity; +import lombok.Data; + +@Data +@Entity +public class Exposition extends Event{ + private String test; +} diff --git a/src/main/java/lab1SpringJPA/model/Guest.java b/src/main/java/lab1SpringJPA/model/Guest.java new file mode 100644 index 0000000..3134969 --- /dev/null +++ b/src/main/java/lab1SpringJPA/model/Guest.java @@ -0,0 +1,23 @@ +package lab1SpringJPA.model; + +import jakarta.persistence.*; +import lab1SpringJPA.enums.GuestStatus; +import lab1SpringJPA.enums.MemberStatus; +import lombok.Data; + +@Data +@Entity +public class Guest { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + private String name; + + @Enumerated(EnumType.STRING) + private GuestStatus status; + + @ManyToOne + private Event event; +} diff --git a/src/main/java/nurses/nurses/model/Member.java b/src/main/java/lab1SpringJPA/model/Member.java similarity index 65% rename from src/main/java/nurses/nurses/model/Member.java rename to src/main/java/lab1SpringJPA/model/Member.java index 2bd5ae8..9ecf5a9 100644 --- a/src/main/java/nurses/nurses/model/Member.java +++ b/src/main/java/lab1SpringJPA/model/Member.java @@ -1,6 +1,6 @@ -package model; +package lab1SpringJPA.model; -import enums.Status; +import lab1SpringJPA.enums.MemberStatus; import jakarta.persistence.*; import lombok.Data; @@ -18,7 +18,10 @@ public class Member implements Serializable { private String name; @Enumerated(EnumType.STRING) - private Status status; + private MemberStatus status; private LocalDate renewalDate; + @ManyToOne + @JoinColumn(name = "chapter_id") + private Chapter chapter; } diff --git a/src/main/java/lab1SpringJPA/model/Speaker.java b/src/main/java/lab1SpringJPA/model/Speaker.java new file mode 100644 index 0000000..60a3b8a --- /dev/null +++ b/src/main/java/lab1SpringJPA/model/Speaker.java @@ -0,0 +1,19 @@ +package lab1SpringJPA.model; + +import jakarta.persistence.*; +import lombok.Data; + +@Data +@Entity +public class Speaker { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + private String name; + private int presentationDuration; + + @ManyToOne + @JoinColumn(name = "conference_id") + private Conference conference; +} diff --git a/src/main/java/nurses/nurses/repository/ChapterRepository.java b/src/main/java/lab1SpringJPA/repository/ChapterRepository.java similarity index 51% rename from src/main/java/nurses/nurses/repository/ChapterRepository.java rename to src/main/java/lab1SpringJPA/repository/ChapterRepository.java index 844f347..4a9c32f 100644 --- a/src/main/java/nurses/nurses/repository/ChapterRepository.java +++ b/src/main/java/lab1SpringJPA/repository/ChapterRepository.java @@ -1,10 +1,10 @@ -package repository; +package lab1SpringJPA.repository; -import model.Chapter; +import lab1SpringJPA.model.Chapter; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; -import java.util.List; - +@Repository public interface ChapterRepository extends JpaRepository { } diff --git a/src/main/java/lab1SpringJPA/repository/ConferenceRepository.java b/src/main/java/lab1SpringJPA/repository/ConferenceRepository.java new file mode 100644 index 0000000..715b3c8 --- /dev/null +++ b/src/main/java/lab1SpringJPA/repository/ConferenceRepository.java @@ -0,0 +1,10 @@ +package lab1SpringJPA.repository; + +import lab1SpringJPA.model.Chapter; +import lab1SpringJPA.model.Conference; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface ConferenceRepository extends JpaRepository { +} diff --git a/src/main/java/lab1SpringJPA/repository/EventRepository.java b/src/main/java/lab1SpringJPA/repository/EventRepository.java new file mode 100644 index 0000000..1cfce55 --- /dev/null +++ b/src/main/java/lab1SpringJPA/repository/EventRepository.java @@ -0,0 +1,10 @@ +package lab1SpringJPA.repository; + +import lab1SpringJPA.model.Chapter; +import lab1SpringJPA.model.Event; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface EventRepository extends JpaRepository { +} diff --git a/src/main/java/lab1SpringJPA/repository/ExpositionRepository.java b/src/main/java/lab1SpringJPA/repository/ExpositionRepository.java new file mode 100644 index 0000000..b88563d --- /dev/null +++ b/src/main/java/lab1SpringJPA/repository/ExpositionRepository.java @@ -0,0 +1,10 @@ +package lab1SpringJPA.repository; + +import lab1SpringJPA.model.Chapter; +import lab1SpringJPA.model.Exposition; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface ExpositionRepository extends JpaRepository { +} diff --git a/src/main/java/lab1SpringJPA/repository/GuestRepository.java b/src/main/java/lab1SpringJPA/repository/GuestRepository.java new file mode 100644 index 0000000..265427b --- /dev/null +++ b/src/main/java/lab1SpringJPA/repository/GuestRepository.java @@ -0,0 +1,18 @@ +package lab1SpringJPA.repository; + +import lab1SpringJPA.enums.GuestStatus; +import lab1SpringJPA.enums.MemberStatus; +import lab1SpringJPA.model.Guest; +import lab1SpringJPA.model.Member; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Optional; + +@Repository +public interface GuestRepository extends JpaRepository { + List findByStatus(GuestStatus statusGuest); +} diff --git a/src/main/java/lab1SpringJPA/repository/MemberRepository.java b/src/main/java/lab1SpringJPA/repository/MemberRepository.java new file mode 100644 index 0000000..96daf91 --- /dev/null +++ b/src/main/java/lab1SpringJPA/repository/MemberRepository.java @@ -0,0 +1,14 @@ +package lab1SpringJPA.repository; + +import lab1SpringJPA.enums.MemberStatus; +import lab1SpringJPA.model.Member; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +import java.util.List; + +@Repository +public interface MemberRepository extends JpaRepository { + + List findByStatus(MemberStatus statusMiembro); +} diff --git a/src/main/java/lab1SpringJPA/repository/SpeakerRepository.java b/src/main/java/lab1SpringJPA/repository/SpeakerRepository.java new file mode 100644 index 0000000..5a0e34c --- /dev/null +++ b/src/main/java/lab1SpringJPA/repository/SpeakerRepository.java @@ -0,0 +1,10 @@ +package lab1SpringJPA.repository; + +import lab1SpringJPA.model.Chapter; +import lab1SpringJPA.model.Speaker; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface SpeakerRepository extends JpaRepository { +} diff --git a/src/main/java/nurses/nurses/service/ChapterService.java b/src/main/java/lab1SpringJPA/service/ChapterService.java similarity index 85% rename from src/main/java/nurses/nurses/service/ChapterService.java rename to src/main/java/lab1SpringJPA/service/ChapterService.java index c9c088d..31b0e9e 100644 --- a/src/main/java/nurses/nurses/service/ChapterService.java +++ b/src/main/java/lab1SpringJPA/service/ChapterService.java @@ -1,9 +1,9 @@ -package service; +package lab1SpringJPA.service; -import model.Chapter; +import lab1SpringJPA.model.Chapter; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import repository.ChapterRepository; +import lab1SpringJPA.repository.ChapterRepository; import java.util.List; import java.util.Optional; diff --git a/src/main/java/lab1SpringJPA/service/ConferenceService.java b/src/main/java/lab1SpringJPA/service/ConferenceService.java new file mode 100644 index 0000000..9842bcd --- /dev/null +++ b/src/main/java/lab1SpringJPA/service/ConferenceService.java @@ -0,0 +1,27 @@ +package lab1SpringJPA.service; + +import lab1SpringJPA.model.Conference; +import lab1SpringJPA.repository.ConferenceRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Optional; + +@Service +public class ConferenceService { + @Autowired + private ConferenceRepository conferenceRepository; + + public List getAllConferences() { return conferenceRepository.findAll(); } + + public Optional getConferenceById(Long id){ return conferenceRepository.findById(id); } + + public Optional updateConference(Long id, Conference conference){ + if(conferenceRepository.existsById(id)){ + conference.setId(id); + return Optional.of(conferenceRepository.save(conference)); + } + return Optional.empty(); + } +} diff --git a/src/main/java/lab1SpringJPA/service/EventService.java b/src/main/java/lab1SpringJPA/service/EventService.java new file mode 100644 index 0000000..b7fa07f --- /dev/null +++ b/src/main/java/lab1SpringJPA/service/EventService.java @@ -0,0 +1,27 @@ +package lab1SpringJPA.service; + +import lab1SpringJPA.model.Event; +import lab1SpringJPA.repository.EventRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Optional; + +@Service +public class EventService { + @Autowired + private EventRepository eventRepository; + + public List getAllEvents() { return eventRepository.findAll(); } + + public Optional getEventById(Long id){ return eventRepository.findById(id); } + + public Optional updateEvent(Long id, Event event){ + if(eventRepository.existsById(id)){ + event.setId(id); + return Optional.of(eventRepository.save(event)); + } + return Optional.empty(); + } +} diff --git a/src/main/java/lab1SpringJPA/service/ExpositionService.java b/src/main/java/lab1SpringJPA/service/ExpositionService.java new file mode 100644 index 0000000..183b274 --- /dev/null +++ b/src/main/java/lab1SpringJPA/service/ExpositionService.java @@ -0,0 +1,27 @@ +package lab1SpringJPA.service; + +import lab1SpringJPA.model.Exposition; +import lab1SpringJPA.repository.ExpositionRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Optional; + +@Service +public class ExpositionService { + @Autowired + private ExpositionRepository expositionRepository; + + public List getAllExpositions() { return expositionRepository.findAll(); } + + public Optional getExpositionById(Long id){ return expositionRepository.findById(id); } + + public Optional updateExposition(Long id, Exposition exposition){ + if(expositionRepository.existsById(id)){ + exposition.setId(id); + return Optional.of(expositionRepository.save(exposition)); + } + return Optional.empty(); + } +} diff --git a/src/main/java/lab1SpringJPA/service/GuestService.java b/src/main/java/lab1SpringJPA/service/GuestService.java new file mode 100644 index 0000000..e3c934b --- /dev/null +++ b/src/main/java/lab1SpringJPA/service/GuestService.java @@ -0,0 +1,38 @@ +package lab1SpringJPA.service; + +import lab1SpringJPA.enums.GuestStatus; +import lab1SpringJPA.enums.MemberStatus; +import lab1SpringJPA.model.Guest; +import lab1SpringJPA.model.Member; +import lab1SpringJPA.repository.GuestRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Optional; + +@Service +public class GuestService { + @Autowired + private GuestRepository guestRepository; + + public List getAllGuests() { + return guestRepository.findAll(); + } + + public Optional getGuestById(Long id) { + return guestRepository.findById(id); + } + + public Optional updateGuest(Long id, Guest guest) { + if (guestRepository.existsById(id)) { + guest.setId(id); + return Optional.of(guestRepository.save(guest)); + } + return Optional.empty(); + } + + public List buscarPorStatusGuest(GuestStatus statusGuest) { + return guestRepository.findByStatus(statusGuest); + } +} \ No newline at end of file diff --git a/src/main/java/nurses/nurses/service/MemberService.java b/src/main/java/lab1SpringJPA/service/MemberService.java similarity index 68% rename from src/main/java/nurses/nurses/service/MemberService.java rename to src/main/java/lab1SpringJPA/service/MemberService.java index 242c983..ca8be5d 100644 --- a/src/main/java/nurses/nurses/service/MemberService.java +++ b/src/main/java/lab1SpringJPA/service/MemberService.java @@ -1,10 +1,10 @@ -package service; +package lab1SpringJPA.service; -import enums.Status; -import model.Member; +import lab1SpringJPA.enums.MemberStatus; +import lab1SpringJPA.model.Member; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import repository.MemberRepository; +import lab1SpringJPA.repository.MemberRepository; import java.util.List; import java.util.Optional; @@ -18,7 +18,7 @@ public class MemberService { public Optional getMemberById(Long id){ return memberRepository.findById(id); } - public List buscarPorStatusMiembro(Status statusMiembro) { + public List buscarPorStatusMiembro(MemberStatus statusMiembro) { return memberRepository.findByStatus(statusMiembro); } } diff --git a/src/main/java/lab1SpringJPA/service/SpeakerService.java b/src/main/java/lab1SpringJPA/service/SpeakerService.java new file mode 100644 index 0000000..1a47b55 --- /dev/null +++ b/src/main/java/lab1SpringJPA/service/SpeakerService.java @@ -0,0 +1,27 @@ +package lab1SpringJPA.service; + +import lab1SpringJPA.model.Speaker; +import lab1SpringJPA.repository.SpeakerRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Optional; + +@Service +public class SpeakerService { + @Autowired + private SpeakerRepository speakerRepository; + + public List getAllSpeakers() { return speakerRepository.findAll(); } + + public Optional getSpeakerById(Long id){ return speakerRepository.findById(id); } + + public Optional updateSpeaker(Long id, Speaker speaker){ + if(speakerRepository.existsById(id)){ + speaker.setId(id); + return Optional.of(speakerRepository.save(speaker)); + } + return Optional.empty(); + } +} \ No newline at end of file diff --git a/src/main/java/nurses/nurses/enums/Status.java b/src/main/java/nurses/nurses/enums/Status.java deleted file mode 100644 index 30f3f7f..0000000 --- a/src/main/java/nurses/nurses/enums/Status.java +++ /dev/null @@ -1,8 +0,0 @@ -package enums; - - -public enum Status { - ACTIVE , - LAPSED -} - diff --git a/src/main/java/nurses/nurses/repository/MemberRepository.java b/src/main/java/nurses/nurses/repository/MemberRepository.java deleted file mode 100644 index cb12518..0000000 --- a/src/main/java/nurses/nurses/repository/MemberRepository.java +++ /dev/null @@ -1,13 +0,0 @@ -package repository; - -import enums.Status; -import model.Chapter; -import model.Member; -import org.springframework.data.jpa.repository.JpaRepository; - -import java.util.List; - -public interface MemberRepository extends JpaRepository { - - List findByStatus(Status statusMiembro); -} diff --git a/src/test/java/nurses/nurses/NursesApplicationTests.java b/src/test/java/lab1SpringJPA/NursesApplicationTests.java similarity index 88% rename from src/test/java/nurses/nurses/NursesApplicationTests.java rename to src/test/java/lab1SpringJPA/NursesApplicationTests.java index 445b3f6..47a0c51 100644 --- a/src/test/java/nurses/nurses/NursesApplicationTests.java +++ b/src/test/java/lab1SpringJPA/NursesApplicationTests.java @@ -1,4 +1,4 @@ -package nurses.nurses; +package lab1SpringJPA; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest;