Index: ototype Application/Paw5/.gitignore =================================================================== --- Prototype Application/Paw5/.gitignore (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,33 +1,0 @@ -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/ Index: ototype Application/Paw5/.mvn/wrapper/maven-wrapper.properties =================================================================== --- Prototype Application/Paw5/.mvn/wrapper/maven-wrapper.properties (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,2 +1,0 @@ -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.6/apache-maven-3.8.6-bin.zip -wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar Index: ototype Application/Paw5/mvnw =================================================================== --- Prototype Application/Paw5/mvnw (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,316 +1,0 @@ -#!/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. -# ---------------------------------------------------------------------------- - -# ---------------------------------------------------------------------------- -# Maven Start Up Batch script -# -# Required ENV vars: -# ------------------ -# JAVA_HOME - location of a JDK home dir -# -# Optional ENV vars -# ----------------- -# M2_HOME - location of maven2's installed home dir -# 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 - export JAVA_HOME="`/usr/libexec/java_home`" - else - export JAVA_HOME="/Library/Java/Home" - fi - fi - ;; -esac - -if [ -z "$JAVA_HOME" ] ; then - if [ -r /etc/gentoo-release ] ; then - JAVA_HOME=`java-config --jre-home` - fi -fi - -if [ -z "$M2_HOME" ] ; then - ## resolve links - $0 may be a link to maven's home - PRG="$0" - - # need this for relative symlinks - while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG="`dirname "$PRG"`/$link" - fi - done - - saveddir=`pwd` - - M2_HOME=`dirname "$PRG"`/.. - - # make it fully qualified - M2_HOME=`cd "$M2_HOME" && pwd` - - cd "$saveddir" - # echo Using m2 at $M2_HOME -fi - -# For Cygwin, ensure paths are in UNIX format before anything is touched -if $cygwin ; then - [ -n "$M2_HOME" ] && - M2_HOME=`cygpath --unix "$M2_HOME"` - [ -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 "$M2_HOME" ] && - M2_HOME="`(cd "$M2_HOME"; pwd)`" - [ -n "$JAVA_HOME" ] && - JAVA_HOME="`(cd "$JAVA_HOME"; 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; \\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 - -CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher - -# 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/.."; pwd` - fi - # end of workaround - done - echo "${basedir}" -} - -# concatenates all lines of a file -concat_lines() { - if [ -f "$1" ]; then - echo "$(tr -s '\n' ' ' < "$1")" - fi -} - -BASE_DIR=`find_maven_basedir "$(pwd)"` -if [ -z "$BASE_DIR" ]; then - exit 1; -fi - -########################################################################################## -# 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. -########################################################################################## -if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then - if [ "$MVNW_VERBOSE" = true ]; then - echo "Found .mvn/wrapper/maven-wrapper.jar" - fi -else - if [ "$MVNW_VERBOSE" = true ]; then - echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." - fi - if [ -n "$MVNW_REPOURL" ]; then - jarUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" - else - jarUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" - fi - while IFS="=" read key value; do - case "$key" in (wrapperUrl) jarUrl="$value"; break ;; - esac - done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" - if [ "$MVNW_VERBOSE" = true ]; then - echo "Downloading from: $jarUrl" - fi - wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" - if $cygwin; then - wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"` - fi - - if command -v wget > /dev/null; then - if [ "$MVNW_VERBOSE" = true ]; then - echo "Found wget ... using wget" - fi - if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then - wget "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" - else - wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" - fi - elif command -v curl > /dev/null; then - if [ "$MVNW_VERBOSE" = true ]; then - echo "Found curl ... using curl" - fi - if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then - curl -o "$wrapperJarPath" "$jarUrl" -f - else - curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f - fi - - else - if [ "$MVNW_VERBOSE" = true ]; then - echo "Falling back to using Java to download" - fi - javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" - # For Cygwin, switch paths to Windows format before running javac - if $cygwin; then - javaClass=`cygpath --path --windows "$javaClass"` - fi - if [ -e "$javaClass" ]; then - if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then - if [ "$MVNW_VERBOSE" = true ]; then - echo " - Compiling MavenWrapperDownloader.java ..." - fi - # Compiling the Java class - ("$JAVA_HOME/bin/javac" "$javaClass") - fi - if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then - # Running the downloader - if [ "$MVNW_VERBOSE" = true ]; then - echo " - Running MavenWrapperDownloader.java ..." - fi - ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") - fi - fi - fi -fi -########################################################################################## -# End of extension -########################################################################################## - -export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} -if [ "$MVNW_VERBOSE" = true ]; then - echo $MAVEN_PROJECTBASEDIR -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 "$M2_HOME" ] && - M2_HOME=`cygpath --path --windows "$M2_HOME"` - [ -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 - -exec "$JAVACMD" \ - $MAVEN_OPTS \ - $MAVEN_DEBUG_OPTS \ - -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ - "-Dmaven.home=${M2_HOME}" \ - "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ - ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" Index: ototype Application/Paw5/mvnw.cmd =================================================================== --- Prototype Application/Paw5/mvnw.cmd (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,188 +1,0 @@ -@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 Maven Start Up Batch script -@REM -@REM Required ENV vars: -@REM JAVA_HOME - location of a JDK home dir -@REM -@REM Optional ENV vars -@REM M2_HOME - location of maven2's installed home dir -@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 DOWNLOAD_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" - -FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( - IF "%%A"=="wrapperUrl" SET DOWNLOAD_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 DOWNLOAD_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" - ) - if "%MVNW_VERBOSE%" == "true" ( - echo Couldn't find %WRAPPER_JAR%, downloading it ... - echo Downloading from: %DOWNLOAD_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('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^ - "}" - if "%MVNW_VERBOSE%" == "true" ( - echo Finished downloading %WRAPPER_JAR% - ) -) -@REM End of extension - -@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% Index: ototype Application/Paw5/pom.xml =================================================================== --- Prototype Application/Paw5/pom.xml (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,71 +1,0 @@ - - - 4.0.0 - - org.springframework.boot - spring-boot-starter-parent - 3.0.1 - - - finki - Paw5 - 0.0.1-SNAPSHOT - Paw5 - Demo project for Spring Boot - - 17 - - - - org.springframework.boot - spring-boot-starter-thymeleaf - - - org.springframework.boot - spring-boot-starter-web - - - - org.projectlombok - lombok - true - - - org.springframework.boot - spring-boot-starter-test - test - - - org.springframework.boot - spring-boot-starter-data-jpa - - - org.postgresql - postgresql - runtime - - - org.springframework.boot - spring-boot-starter-jdbc - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - org.projectlombok - lombok - - - - - - - - Index: ototype Application/Paw5/src/main/java/finki/paw5/Paw5Application.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/Paw5Application.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,13 +1,0 @@ -package finki.paw5; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -@SpringBootApplication -public class Paw5Application { - - public static void main(String[] args) { - SpringApplication.run(Paw5Application.class, args); - } - -} Index: ototype Application/Paw5/src/main/java/finki/paw5/model/entities/Admin.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/model/entities/Admin.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,20 +1,0 @@ -package finki.paw5.model.entities; - -import jakarta.persistence.*; -import lombok.Data; -import lombok.RequiredArgsConstructor; - -import java.time.LocalDate; - -@Data -@Entity -@RequiredArgsConstructor -@Table(name = "admin_table", schema = "project") -@PrimaryKeyJoinColumn(name = "id_user") -public class Admin extends User { - - public Admin(LocalDate dateCreated, String name, String email, - String password, String telephone) { - super(dateCreated, name, email, password, telephone); - } -} Index: ototype Application/Paw5/src/main/java/finki/paw5/model/entities/Adopter.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/model/entities/Adopter.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,62 +1,0 @@ -package finki.paw5.model.entities; - -import finki.paw5.model.enumerations.FreeTime; -import finki.paw5.model.enumerations.Funds; -import finki.paw5.model.enumerations.Housing; -import finki.paw5.model.enumerations.PhysicalActivity; -import jakarta.persistence.*; -import lombok.Data; -import lombok.RequiredArgsConstructor; - -import java.time.LocalDate; - -@Data -@Entity -@Table(name = "adopter", schema = "project") -@RequiredArgsConstructor -@PrimaryKeyJoinColumn(name = "id_user") -public class Adopter extends User { - - @Column(name = "free_time") - private FreeTime freeTime; - - @Column(name = "funds") - private Funds funds; - - @Column(name = "has_other_pets") - private Boolean hasOtherPets; - - @Column(name = "has_kids") - private Boolean hasKids; - - @Column(name = "housing") - private Housing housing; - - @Column(name = "physical_activity_adopters") - private PhysicalActivity physicalActivity; - - @Column(name = "will_foster") - private Boolean willFoster; - - @Column(name = "is_verified", nullable = false) - private Boolean verified; - - @ManyToOne - @JoinColumn(name = "verified_by_employee") - Employee employeeVerificator; - - public Adopter(LocalDate dateCreated, String name, String email, String password, String telephone, - FreeTime freeTime, Funds funds, boolean hasOtherPets, boolean hasKids, Housing housing, - PhysicalActivity physicalActivity, boolean willFoster, boolean verified) { - super(dateCreated, name, email, password, telephone); - this.freeTime = freeTime; - this.funds = funds; - this.hasOtherPets = hasOtherPets; - this.hasKids = hasKids; - this.housing = housing; - this.physicalActivity = physicalActivity; - this.willFoster = willFoster; - this.verified = verified; - } - -} Index: ototype Application/Paw5/src/main/java/finki/paw5/model/entities/Adoption.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/model/entities/Adoption.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,40 +1,0 @@ -package finki.paw5.model.entities; - -import jakarta.persistence.*; -import lombok.Data; -import lombok.RequiredArgsConstructor; - -import java.time.LocalDate; - -@Data -@Entity -@RequiredArgsConstructor -@Table(name = "adoption", schema = "project") -public class Adoption { - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "id_adoption") - private Integer id; - - @Column(name = "start_date", nullable = false) - private LocalDate startDate; - - @Column(name = "end_date_foster") - private LocalDate endDateFoster; - - @Column(name = "approved", nullable = false) - private Boolean approved; - - @ManyToOne - @JoinColumn(name = "id_adopter", nullable = false) - private Adopter adopter; - - public Adoption(LocalDate startDate, LocalDate endDateFoster, Boolean approved, - Adopter adopter) { - this.startDate = startDate; - this.endDateFoster = endDateFoster; - this.approved = approved; - this.adopter = adopter; - } -} Index: ototype Application/Paw5/src/main/java/finki/paw5/model/entities/Category.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/model/entities/Category.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,33 +1,0 @@ -package finki.paw5.model.entities; - -import jakarta.persistence.*; -import lombok.Data; -import lombok.RequiredArgsConstructor; - -import java.util.List; - -@Data -@Entity -@RequiredArgsConstructor -@Table(name = "category", schema = "project") -public class Category { - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "id_category") - private Integer id; - - @Column(name = "name_category", nullable = false, length = 100) - private String name; - - @ManyToMany - @JoinTable(name = "pet_belongs_to_category", - joinColumns = @JoinColumn(name = "id_category"), - inverseJoinColumns = @JoinColumn(name = "id_pet")) - List pets; - - public Category(String name) { - this.name = name; - } - -} Index: ototype Application/Paw5/src/main/java/finki/paw5/model/entities/Donor.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/model/entities/Donor.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,37 +1,0 @@ -package finki.paw5.model.entities; - -import jakarta.persistence.*; -import lombok.Data; -import lombok.RequiredArgsConstructor; - -import java.time.LocalDate; -import java.util.List; - -@Data -@Entity -@RequiredArgsConstructor -@Table(name = "donor", schema = "project") -@PrimaryKeyJoinColumn(name = "id_user") -public class Donor extends User { - - @Column(name = "is_from_organisation", nullable = false) - private Boolean fromOrganisation; - - @Column(name = "name_organisation_donor", nullable = true, length = 100) - private String organisationName; - - @ManyToMany - @JoinTable(name = "donor_donates_to_organisation", - joinColumns = @JoinColumn(name = "id_user"), - inverseJoinColumns = @JoinColumn(name = "id_organisation")) - List donatedToOrganisations; - - public Donor(LocalDate dateCreated, String name, String email, - String password, String telephone, Boolean fromOrganisation, - String organisationName) { - super(dateCreated, name, email, password, telephone); - this.fromOrganisation = fromOrganisation; - this.organisationName = organisationName; - } - -} Index: ototype Application/Paw5/src/main/java/finki/paw5/model/entities/Employee.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/model/entities/Employee.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,38 +1,0 @@ -package finki.paw5.model.entities; - -import jakarta.persistence.*; -import lombok.Data; -import lombok.RequiredArgsConstructor; - -import java.time.LocalDate; - -@Data -@Entity -@RequiredArgsConstructor -@Table(name = "employee", schema = "project") -@PrimaryKeyJoinColumn(name = "id_user") -public class Employee extends User { - - @Column(name = "position_employee", nullable = false, length = 20) - private String position; - - @ManyToOne - @JoinColumn(name = "id_shelter", nullable = false) - private Shelter shelter; - - @Column(name = "is_verified", nullable = false) - private Boolean verified; - - @ManyToOne - @JoinColumn(name = "verified_by_admin") - private Admin adminVerificator; - - public Employee(LocalDate dateCreated, String name, String email, String password, String telephone, - String position, Shelter shelter, Boolean verified) { - super(dateCreated, name, email, password, telephone); - this.position = position; - this.shelter = shelter; - this.verified = verified; - } - -} Index: ototype Application/Paw5/src/main/java/finki/paw5/model/entities/Food.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/model/entities/Food.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,41 +1,0 @@ -package finki.paw5.model.entities; - -import finki.paw5.model.enumerations.FoodType; -import jakarta.persistence.*; -import lombok.Data; -import lombok.RequiredArgsConstructor; - -import java.util.List; - -@Data -@Entity -@RequiredArgsConstructor -@Table(name = "food", schema = "project") -public class Food { - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "id_food") - private Integer id; - - @Column(name = "manufacturer", nullable = false, length = 100) - private String manufacturer; - - @Column(name = "name_food", nullable = false, length = 20) - private String name; - - @Column(name = "type_food", nullable = false) - private FoodType type; - - @ManyToMany - @JoinTable(name = "pet_preferably_eats_food", - joinColumns = @JoinColumn(name = "id_food"), - inverseJoinColumns = @JoinColumn(name = "id_pet")) - List pets; - - public Food(String manufacturer, String name, FoodType type) { - this.manufacturer = manufacturer; - this.name = name; - this.type = type; - } -} Index: ototype Application/Paw5/src/main/java/finki/paw5/model/entities/Organisation.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/model/entities/Organisation.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,40 +1,0 @@ -package finki.paw5.model.entities; - -import jakarta.persistence.*; -import lombok.Data; -import lombok.RequiredArgsConstructor; - -import java.util.List; - -@Data -@Entity -@RequiredArgsConstructor -@Table(name = "organisation", schema = "project") -public class Organisation { - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "id_organisation") - private Integer id; - - @Column(name = "name_organisation", nullable = false, length = 100) - private String name; - - @Column(name = "email_organisation", nullable = false, length = 100, unique = true) - private String email; - - @Column(name = "billing_information", nullable = false, length = 20, unique = true) - private String billingInformation; - - @ManyToMany - @JoinTable(name = "donor_donates_to_organisation", - joinColumns = @JoinColumn(name = "id_organisation"), - inverseJoinColumns = @JoinColumn(name = "id_user")) - List donors; - - public Organisation(String name, String email, String billingInformation) { - this.name = name; - this.email = email; - this.billingInformation = billingInformation; - } -} Index: ototype Application/Paw5/src/main/java/finki/paw5/model/entities/PersonalProfile.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/model/entities/PersonalProfile.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,46 +1,0 @@ -package finki.paw5.model.entities; - -import finki.paw5.model.enumerations.*; -import jakarta.persistence.*; -import lombok.Data; -import lombok.RequiredArgsConstructor; - -@Data -@Entity -@RequiredArgsConstructor -@Table(name = "personal_profile", schema = "project") -public class PersonalProfile { - - @Id - @Column(name = "id_pet", nullable = false) - private Integer id; - - @OneToOne - @JoinColumn(name = "id_pet", nullable = false) - private Pet pet; - - @Column(name = "friendly_to_kids", nullable = false) - private FriendlyToKids friendlyToKids; - - @Column(name = "friendly_to_pets", nullable = false) - private FriendlyToPets friendlyToPets; - - @Column(name = "attention", nullable = false) - private AttentionNeed attentionNeed; - - @Column(name = "physical_activity", nullable = false) - private PhysicalActivity physicalActivity; - - @Column(name = "grooming_needed", nullable = false) - private GroomingNeed groomingNeed; - - public PersonalProfile(Integer id, Pet pet, FriendlyToKids friendlyToKids, FriendlyToPets friendlyToPets, AttentionNeed attentionNeed, PhysicalActivity physicalActivity, GroomingNeed groomingNeed) { - this.id = id; - this.pet = pet; - this.friendlyToKids = friendlyToKids; - this.friendlyToPets = friendlyToPets; - this.attentionNeed = attentionNeed; - this.physicalActivity = physicalActivity; - this.groomingNeed = groomingNeed; - } -} Index: ototype Application/Paw5/src/main/java/finki/paw5/model/entities/Pet.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/model/entities/Pet.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,98 +1,0 @@ -package finki.paw5.model.entities; - -import finki.paw5.model.enumerations.AgeGroup; -import finki.paw5.model.enumerations.Gender; -import finki.paw5.model.enumerations.Size; -import finki.paw5.model.enumerations.Species; -import jakarta.persistence.*; -import lombok.Data; -import lombok.RequiredArgsConstructor; - -import java.util.List; - -@Data -@Entity -@RequiredArgsConstructor -@Table(name = "pet", schema = "project") -public class Pet { - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "id_pet") - private Integer id; - - @OneToOne - @JoinColumn(name = "id_pet", nullable = false) - private PersonalProfile personalProfile; - - @Column(name = "url_pet_image", length = 200) - private String imageUrl; - - @Column(name = "age_group", nullable = false) - private AgeGroup ageGroup; - - @Column(name = "size_pet", nullable = false) - private Size size; - - @Column(name = "breed", length = 100) - private String breed; - - @Column(name = "name_pet", length = 20) - private String name; - - @Column(name = "species", nullable = false) - private Species species; - - @Column(name = "gender", nullable = false) - private Gender gender; - - @Column(name = "can_be_fostered", nullable = false) - private Boolean canBeFostered; - - @ManyToOne - @JoinColumn(name = "id_adoption") - private Adoption adoption; - - @ManyToOne - @JoinColumn(name = "id_shelter") - private Shelter shelter; - - @ManyToMany - @JoinTable(name = "pet_belongs_to_category", - joinColumns = @JoinColumn(name = "id_pet"), - inverseJoinColumns = @JoinColumn(name = "id_category")) - List categories; - - @ManyToMany - @JoinTable(name = "pet_needs_intervention_in_vet_clinic", - joinColumns = @JoinColumn(name = "id_pet"), - inverseJoinColumns = @JoinColumn(name = "id_vet_clinic")) - List vetClinicsTreatedIn; - - @ManyToMany - @JoinTable(name = "pet_needs_therapy", - joinColumns = @JoinColumn(name = "id_pet"), - inverseJoinColumns = @JoinColumn(name = "id_therapy")) - List therapies; - - @ManyToMany - @JoinTable(name = "pet_preferably_eats_food", - joinColumns = @JoinColumn(name = "id_pet"), - inverseJoinColumns = @JoinColumn(name = "id_food")) - List preferredFoods; - - public Pet(String imageUrl, AgeGroup ageGroup, Size size, String breed, - String name, Species species, Gender gender, Boolean canBeFostered, - Adoption adoption, Shelter shelter) { - this.imageUrl = imageUrl; - this.ageGroup = ageGroup; - this.size = size; - this.breed = breed; - this.name = name; - this.species = species; - this.gender = gender; - this.canBeFostered = canBeFostered; - this.adoption = adoption; - this.shelter = shelter; - } -} Index: ototype Application/Paw5/src/main/java/finki/paw5/model/entities/Post.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/model/entities/Post.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,46 +1,0 @@ -package finki.paw5.model.entities; - -import jakarta.persistence.*; -import lombok.Data; -import lombok.RequiredArgsConstructor; - -import java.time.LocalDate; - -@Data -@Entity -@RequiredArgsConstructor -@Table(name = "post", schema = "project") -public class Post { - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "id_post") - private Integer id; - - @Column(name="date_post", nullable = false) - private LocalDate dateCreated; - - @Column(name="url_thumbanail", length = 200) - private String thumbnailUrl; - - @OneToOne - @JoinColumn(name="id_pet", nullable = false) - private Pet pet; - - @ManyToOne - @JoinColumn(name="id_surendee") - private Surendee surendeePoster; - - @ManyToOne - @JoinColumn(name="id_employee") - private Employee employeePoster; - - public Post(LocalDate dateCreated, String thumbnailUrl, - Pet pet, Surendee surendeePoster, Employee employeePoster) { - this.dateCreated = dateCreated; - this.thumbnailUrl = thumbnailUrl; - this.pet = pet; - this.surendeePoster = surendeePoster; - this.employeePoster = employeePoster; - } -} Index: ototype Application/Paw5/src/main/java/finki/paw5/model/entities/Shelter.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/model/entities/Shelter.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,42 +1,0 @@ -package finki.paw5.model.entities; - -import jakarta.persistence.*; -import lombok.Data; -import lombok.RequiredArgsConstructor; - -@Data -@Entity -@RequiredArgsConstructor -@Table(name = "shelter", schema = "project") -public class Shelter { - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "id_shelter") - private Integer id; - - @Column(name = "address_shelter", nullable = false, length = 100) - private String address; - - @Column(name = "telephone_shelter", nullable = false, length = 20) - private String telephone; - - @ManyToOne - @JoinColumn(name = "id_organisation") - private Organisation organisation; - - @Column(name = "name_shelter", nullable = false, length = 100) - private String name; - - @Column(name = "email_shelter", nullable = false, length = 100, unique = true) - private String email; - - public Shelter(String address, String telephone, Organisation organisation, - String name, String email) { - this.address = address; - this.telephone = telephone; - this.organisation = organisation; - this.name = name; - this.email = email; - } -} Index: ototype Application/Paw5/src/main/java/finki/paw5/model/entities/Surendee.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/model/entities/Surendee.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,20 +1,0 @@ -package finki.paw5.model.entities; - -import jakarta.persistence.*; -import lombok.Data; -import lombok.RequiredArgsConstructor; - -import java.time.LocalDate; - -@Data -@Entity -@RequiredArgsConstructor -@Table(name = "surendee", schema = "project") -@PrimaryKeyJoinColumn(name = "id_user") -public class Surendee extends User { - - public Surendee(LocalDate dateCreated, String name, String email, String password, String telephone) { - super(dateCreated, name, email, password, telephone); - } - -} Index: ototype Application/Paw5/src/main/java/finki/paw5/model/entities/Therapy.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/model/entities/Therapy.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,42 +1,0 @@ -package finki.paw5.model.entities; - -import jakarta.persistence.*; -import lombok.Data; -import lombok.RequiredArgsConstructor; - -import java.time.LocalDate; -import java.util.Date; -import java.util.List; - -@Data -@Entity -@RequiredArgsConstructor -@Table(name = "therapy", schema = "project") -public class Therapy { - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "id_therapy") - private Integer id; - - @Column(name = "health_problem", nullable = false, length = 100) - private String healthProblem; - - @Column(name = "start_date") - private LocalDate startDate; - - @Column(name = "end_date") - private LocalDate endDate; - - @ManyToMany - @JoinTable(name = "pet_needs_therapy", - joinColumns = @JoinColumn(name = "id_therapy"), - inverseJoinColumns = @JoinColumn(name = "id_pet")) - List pets; - - public Therapy(String healthProblem, LocalDate startDate, LocalDate endDate) { - this.healthProblem = healthProblem; - this.startDate = startDate; - this.endDate = endDate; - } -} Index: ototype Application/Paw5/src/main/java/finki/paw5/model/entities/User.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/model/entities/User.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,44 +1,0 @@ -package finki.paw5.model.entities; - -import jakarta.persistence.*; -import lombok.Data; -import lombok.RequiredArgsConstructor; - -import java.time.LocalDate; -import java.util.Date; - -@Data -@Entity -@RequiredArgsConstructor -@Table(name = "user_table", schema = "project") -@Inheritance(strategy = InheritanceType.JOINED) -public class User { - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "id_user") - protected Integer id; - - @Column(name = "date_created_user", nullable = false) - protected LocalDate dateCreated; - - @Column(name = "name_user", nullable = false, length = 100) - protected String name; - - @Column(name = "email_user", nullable = false, length = 100, unique = true) - protected String email; - - @Column(name = "password_user", nullable = false, length = 20) - protected String password; - - @Column(name = "telephone_user", length = 20) - protected String telephone; - - public User(LocalDate dateCreated, String name, String email, String password, String telephone) { - this.dateCreated = dateCreated; - this.name = name; - this.email = email; - this.password = password; - this.telephone = telephone; - } -} Index: ototype Application/Paw5/src/main/java/finki/paw5/model/entities/VetClinic.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/model/entities/VetClinic.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,40 +1,0 @@ -package finki.paw5.model.entities; - -import jakarta.persistence.*; -import lombok.Data; -import lombok.RequiredArgsConstructor; - -import java.util.List; - -@Data -@Entity -@RequiredArgsConstructor -@Table(name = "vet_clinic", schema = "project") -public class VetClinic { - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "id_vet_clinic") - private Integer id; - - @Column(name = "telephone_vet_clinic", nullable = false, length = 20) - private String telephone; - - @Column(name = "address_vet_clinic", nullable = false, length = 100) - private String address; - - @Column(name = "name_vet_clinic", nullable = false, length = 100) - private String name; - - @ManyToMany - @JoinTable(name = "pet_needs_intervention_in_vet_clinic", - joinColumns = @JoinColumn(name = "id_vet_clinic"), - inverseJoinColumns = @JoinColumn(name = "id_pet")) - List pets; - - public VetClinic(String telephone, String address, String name) { - this.telephone = telephone; - this.address = address; - this.name = name; - } -} Index: ototype Application/Paw5/src/main/java/finki/paw5/model/enumerations/AgeGroup.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/model/enumerations/AgeGroup.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,7 +1,0 @@ -package finki.paw5.model.enumerations; - -public enum AgeGroup { - YOUNG, - ADULT, - ELDER -} Index: ototype Application/Paw5/src/main/java/finki/paw5/model/enumerations/AttentionNeed.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/model/enumerations/AttentionNeed.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,7 +1,0 @@ -package finki.paw5.model.enumerations; - -public enum AttentionNeed { - LOW, - MEDIUM, - HIGH -} Index: ototype Application/Paw5/src/main/java/finki/paw5/model/enumerations/FoodType.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/model/enumerations/FoodType.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,6 +1,0 @@ -package finki.paw5.model.enumerations; - -public enum FoodType { - DRY, - WET -} Index: ototype Application/Paw5/src/main/java/finki/paw5/model/enumerations/FreeTime.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/model/enumerations/FreeTime.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,7 +1,0 @@ -package finki.paw5.model.enumerations; - -public enum FreeTime { - LOW, - MEDIUM, - HIGH -} Index: ototype Application/Paw5/src/main/java/finki/paw5/model/enumerations/FriendlyToKids.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/model/enumerations/FriendlyToKids.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,7 +1,0 @@ -package finki.paw5.model.enumerations; - -public enum FriendlyToKids { - LOW, - MEDIUM, - HIGH -} Index: ototype Application/Paw5/src/main/java/finki/paw5/model/enumerations/FriendlyToPets.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/model/enumerations/FriendlyToPets.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,7 +1,0 @@ -package finki.paw5.model.enumerations; - -public enum FriendlyToPets { - LOW, - MEDIUM, - HIGH -} Index: ototype Application/Paw5/src/main/java/finki/paw5/model/enumerations/Funds.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/model/enumerations/Funds.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,7 +1,0 @@ -package finki.paw5.model.enumerations; - -public enum Funds { - LOW, - MEDIUM, - HIGH -} Index: ototype Application/Paw5/src/main/java/finki/paw5/model/enumerations/Gender.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/model/enumerations/Gender.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,6 +1,0 @@ -package finki.paw5.model.enumerations; - -public enum Gender { - MALE, - FEMALE -} Index: ototype Application/Paw5/src/main/java/finki/paw5/model/enumerations/GroomingNeed.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/model/enumerations/GroomingNeed.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,7 +1,0 @@ -package finki.paw5.model.enumerations; - -public enum GroomingNeed { - NEVER, - RARELY, - OFTEN -} Index: ototype Application/Paw5/src/main/java/finki/paw5/model/enumerations/Housing.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/model/enumerations/Housing.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,6 +1,0 @@ -package finki.paw5.model.enumerations; - -public enum Housing { - APARTMENT, - HOUSE -} Index: ototype Application/Paw5/src/main/java/finki/paw5/model/enumerations/PhysicalActivity.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/model/enumerations/PhysicalActivity.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,7 +1,0 @@ -package finki.paw5.model.enumerations; - -public enum PhysicalActivity { - LOW, - MEDIUM, - HIGH -} Index: ototype Application/Paw5/src/main/java/finki/paw5/model/enumerations/Size.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/model/enumerations/Size.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,9 +1,0 @@ -package finki.paw5.model.enumerations; - -public enum Size { - XSMALL, - SMALL, - MEDIUM, - LARGE, - XLARGE -} Index: ototype Application/Paw5/src/main/java/finki/paw5/model/enumerations/Species.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/model/enumerations/Species.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,7 +1,0 @@ -package finki.paw5.model.enumerations; - -public enum Species { - CAT, - DOG, - BIRD -} Index: ototype Application/Paw5/src/main/java/finki/paw5/model/exceptions/InvalidPetIdException.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/model/exceptions/InvalidPetIdException.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,4 +1,0 @@ -package finki.paw5.model.exceptions; - -public class InvalidPetIdException extends RuntimeException{ -} Index: ototype Application/Paw5/src/main/java/finki/paw5/model/exceptions/NonExistingArgumentsException.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/model/exceptions/NonExistingArgumentsException.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,7 +1,0 @@ -package finki.paw5.model.exceptions; - -public class NonExistingArgumentsException extends Exception{ - public NonExistingArgumentsException() { - super("There are empty fields for arguments"); - } -} Index: ototype Application/Paw5/src/main/java/finki/paw5/model/relations/DonorDonatesToOrganisation.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/model/relations/DonorDonatesToOrganisation.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,26 +1,0 @@ -package finki.paw5.model.relations; - -import jakarta.persistence.*; -import lombok.Data; -import lombok.RequiredArgsConstructor; - -@Data -@Entity -@RequiredArgsConstructor -@Table(name = "donor_donates_to_organisation", schema = "project") -@IdClass(DonorDonatesToOrganisationId.class) -public class DonorDonatesToOrganisation { - - @Id - @Column(name="id_user", nullable = false) - private Integer userId; - - @Id - @Column(name="id_organisation", nullable = false) - private Integer organisationId; - - public DonorDonatesToOrganisation(int userId, int organisationId) { - this.userId = userId; - this.organisationId = organisationId; - } -} Index: ototype Application/Paw5/src/main/java/finki/paw5/model/relations/DonorDonatesToOrganisationId.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/model/relations/DonorDonatesToOrganisationId.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,13 +1,0 @@ -package finki.paw5.model.relations; - -import lombok.Data; - -import java.io.Serializable; - -@Data -public class DonorDonatesToOrganisationId implements Serializable { - - Integer userId; - Integer organisationId; - -} Index: ototype Application/Paw5/src/main/java/finki/paw5/model/relations/PetBelongsToCategory.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/model/relations/PetBelongsToCategory.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,26 +1,0 @@ -package finki.paw5.model.relations; - -import jakarta.persistence.*; -import lombok.Data; -import lombok.RequiredArgsConstructor; - -@Data -@Entity -@RequiredArgsConstructor -@Table(name = "pet_belongs_to_category", schema = "project") -@IdClass(PetBelongsToCategoryId.class) -public class PetBelongsToCategory { - - @Id - @Column(name="id_pet", nullable = false) - private Integer petId; - - @Id - @Column(name="id_category", nullable = false) - private Integer categoryId; - - public PetBelongsToCategory(int petId, int categoryId) { - this.petId = petId; - this.categoryId = categoryId; - } -} Index: ototype Application/Paw5/src/main/java/finki/paw5/model/relations/PetBelongsToCategoryId.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/model/relations/PetBelongsToCategoryId.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,13 +1,0 @@ -package finki.paw5.model.relations; - -import lombok.Data; - -import java.io.Serializable; - -@Data -public class PetBelongsToCategoryId implements Serializable { - - Integer petId; - Integer categoryId; - -} Index: ototype Application/Paw5/src/main/java/finki/paw5/model/relations/PetNeedsInterventionInVetClinic.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/model/relations/PetNeedsInterventionInVetClinic.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,37 +1,0 @@ -package finki.paw5.model.relations; - -import jakarta.persistence.*; -import lombok.Data; -import lombok.RequiredArgsConstructor; - -import java.time.LocalDate; -import java.util.Date; - -@Data -@Entity -@RequiredArgsConstructor -@Table(name = "pet_needs_intervention_in_vet_clinic", schema = "project") -@IdClass(PetNeedsInterventionInVetClinicId.class) -public class PetNeedsInterventionInVetClinic { - - @Id - @Column(name = "id_pet", nullable = false) - private Integer petId; - - @Id - @Column(name = "id_vet_clinic", nullable = false) - private Integer vetClinicId; - - @Column(name = "date_of_interventing", nullable = false) - private LocalDate interventionDate; - - @Column(name = "description", length = 100) - private String description; - - public PetNeedsInterventionInVetClinic(int petId, int vetClinicId, LocalDate interventionDate, String description) { - this.petId = petId; - this.vetClinicId = vetClinicId; - this.interventionDate = interventionDate; - this.description = description; - } -} Index: ototype Application/Paw5/src/main/java/finki/paw5/model/relations/PetNeedsInterventionInVetClinicId.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/model/relations/PetNeedsInterventionInVetClinicId.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,13 +1,0 @@ -package finki.paw5.model.relations; - -import lombok.Data; - -import java.io.Serializable; - -@Data -public class PetNeedsInterventionInVetClinicId implements Serializable { - - Integer petId; - Integer vetClinicId; - -} Index: ototype Application/Paw5/src/main/java/finki/paw5/model/relations/PetNeedsTherapy.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/model/relations/PetNeedsTherapy.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,26 +1,0 @@ -package finki.paw5.model.relations; - -import jakarta.persistence.*; -import lombok.Data; -import lombok.RequiredArgsConstructor; - -@Data -@Entity -@RequiredArgsConstructor -@Table(name = "pet_needs_therapy", schema = "project") -@IdClass(PetNeedsTherapyId.class) -public class PetNeedsTherapy { - - @Id - @Column(name="id_pet", nullable = false) - private Integer petId; - - @Id - @Column(name="id_therapy", nullable = false) - private Integer therapyId; - - public PetNeedsTherapy(int petId, int therapyId) { - this.petId = petId; - this.therapyId = therapyId; - } -} Index: ototype Application/Paw5/src/main/java/finki/paw5/model/relations/PetNeedsTherapyId.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/model/relations/PetNeedsTherapyId.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,13 +1,0 @@ -package finki.paw5.model.relations; - -import lombok.Data; - -import java.io.Serializable; - -@Data -public class PetNeedsTherapyId implements Serializable { - - Integer petId; - Integer therapyId; - -} Index: ototype Application/Paw5/src/main/java/finki/paw5/model/relations/PetPreferablyEatsFood.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/model/relations/PetPreferablyEatsFood.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,30 +1,0 @@ -package finki.paw5.model.relations; - -import jakarta.persistence.*; -import lombok.Data; -import lombok.RequiredArgsConstructor; - -@Data -@Entity -@RequiredArgsConstructor -@Table(name = "pet_preferably_eats_food", schema = "project") -@IdClass(PetPreferablyEatsFoodId.class) -public class PetPreferablyEatsFood { - - @Id - @Column(name = "id_pet", nullable = false) - private Integer petId; - - @Id - @Column(name = "id_food", nullable = false) - private Integer foodId; - - @Column(name = "quantity_a_day", nullable = false) - private int quantityPerDay; - - public PetPreferablyEatsFood(int petId, int foodId, int quantityPerDay) { - this.petId = petId; - this.foodId = foodId; - this.quantityPerDay = quantityPerDay; - } -} Index: ototype Application/Paw5/src/main/java/finki/paw5/model/relations/PetPreferablyEatsFoodId.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/model/relations/PetPreferablyEatsFoodId.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,13 +1,0 @@ -package finki.paw5.model.relations; - -import lombok.Data; - -import java.io.Serializable; - -@Data -public class PetPreferablyEatsFoodId implements Serializable { - - private Integer petId; - private Integer foodId; - -} Index: ototype Application/Paw5/src/main/java/finki/paw5/repository/AdminRepository.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/repository/AdminRepository.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,9 +1,0 @@ -package finki.paw5.repository; - -import finki.paw5.model.entities.Admin; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -@Repository -public interface AdminRepository extends JpaRepository { -} Index: ototype Application/Paw5/src/main/java/finki/paw5/repository/AdopterRepository.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/repository/AdopterRepository.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,10 +1,0 @@ -package finki.paw5.repository; - -import finki.paw5.model.entities.Adopter; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - - -@Repository -public interface AdopterRepository extends JpaRepository { -} Index: ototype Application/Paw5/src/main/java/finki/paw5/repository/AdoptionRepository.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/repository/AdoptionRepository.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,9 +1,0 @@ -package finki.paw5.repository; - -import finki.paw5.model.entities.Adoption; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -@Repository -public interface AdoptionRepository extends JpaRepository { -} Index: ototype Application/Paw5/src/main/java/finki/paw5/repository/CategoryRepository.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/repository/CategoryRepository.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,9 +1,0 @@ -package finki.paw5.repository; - -import finki.paw5.model.entities.Category; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -@Repository -public interface CategoryRepository extends JpaRepository { -} Index: ototype Application/Paw5/src/main/java/finki/paw5/repository/DonorDonatesToOrganisationRepository.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/repository/DonorDonatesToOrganisationRepository.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,10 +1,0 @@ -package finki.paw5.repository; - -import finki.paw5.model.relations.DonorDonatesToOrganisation; -import finki.paw5.model.relations.DonorDonatesToOrganisationId; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -@Repository -public interface DonorDonatesToOrganisationRepository extends JpaRepository { -} Index: ototype Application/Paw5/src/main/java/finki/paw5/repository/DonorRepository.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/repository/DonorRepository.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,9 +1,0 @@ -package finki.paw5.repository; - -import finki.paw5.model.entities.Donor; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -@Repository -public interface DonorRepository extends JpaRepository { -} Index: ototype Application/Paw5/src/main/java/finki/paw5/repository/EmployeeRepository.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/repository/EmployeeRepository.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,12 +1,0 @@ -package finki.paw5.repository; - -import finki.paw5.model.entities.Employee; -import finki.paw5.model.entities.Shelter; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -import java.util.List; - -@Repository -public interface EmployeeRepository extends JpaRepository { -} Index: ototype Application/Paw5/src/main/java/finki/paw5/repository/FoodRepository.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/repository/FoodRepository.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,9 +1,0 @@ -package finki.paw5.repository; - -import finki.paw5.model.entities.Food; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -@Repository -public interface FoodRepository extends JpaRepository { -} Index: ototype Application/Paw5/src/main/java/finki/paw5/repository/OrganisationRepository.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/repository/OrganisationRepository.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,9 +1,0 @@ -package finki.paw5.repository; - -import finki.paw5.model.entities.Organisation; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -@Repository -public interface OrganisationRepository extends JpaRepository { -} Index: ototype Application/Paw5/src/main/java/finki/paw5/repository/PersonalProfileRepository.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/repository/PersonalProfileRepository.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,9 +1,0 @@ -package finki.paw5.repository; - -import finki.paw5.model.entities.PersonalProfile; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -@Repository -public interface PersonalProfileRepository extends JpaRepository { -} Index: ototype Application/Paw5/src/main/java/finki/paw5/repository/PetBelongsToCategoryRepository.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/repository/PetBelongsToCategoryRepository.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,10 +1,0 @@ -package finki.paw5.repository; - -import finki.paw5.model.relations.PetBelongsToCategory; -import finki.paw5.model.relations.PetBelongsToCategoryId; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -@Repository -public interface PetBelongsToCategoryRepository extends JpaRepository { -} Index: ototype Application/Paw5/src/main/java/finki/paw5/repository/PetNeedsInterventionInVetClinicRepository.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/repository/PetNeedsInterventionInVetClinicRepository.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,10 +1,0 @@ -package finki.paw5.repository; - -import finki.paw5.model.relations.PetNeedsInterventionInVetClinic; -import finki.paw5.model.relations.PetNeedsInterventionInVetClinicId; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -@Repository -public interface PetNeedsInterventionInVetClinicRepository extends JpaRepository { -} Index: ototype Application/Paw5/src/main/java/finki/paw5/repository/PetNeedsTherapyRepository.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/repository/PetNeedsTherapyRepository.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,10 +1,0 @@ -package finki.paw5.repository; - -import finki.paw5.model.relations.PetNeedsTherapy; -import finki.paw5.model.relations.PetNeedsTherapyId; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -@Repository -public interface PetNeedsTherapyRepository extends JpaRepository { -} Index: ototype Application/Paw5/src/main/java/finki/paw5/repository/PetPreferablyEatsFoodRepository.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/repository/PetPreferablyEatsFoodRepository.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,10 +1,0 @@ -package finki.paw5.repository; - -import finki.paw5.model.relations.PetPreferablyEatsFood; -import finki.paw5.model.relations.PetPreferablyEatsFoodId; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -@Repository -public interface PetPreferablyEatsFoodRepository extends JpaRepository { -} Index: ototype Application/Paw5/src/main/java/finki/paw5/repository/PetRepository.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/repository/PetRepository.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,9 +1,0 @@ -package finki.paw5.repository; - -import finki.paw5.model.entities.Pet; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -@Repository -public interface PetRepository extends JpaRepository { -} Index: ototype Application/Paw5/src/main/java/finki/paw5/repository/PostRepository.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/repository/PostRepository.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,9 +1,0 @@ -package finki.paw5.repository; - -import finki.paw5.model.entities.Post; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -@Repository -public interface PostRepository extends JpaRepository { -} Index: ototype Application/Paw5/src/main/java/finki/paw5/repository/ShelterRepository.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/repository/ShelterRepository.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,11 +1,0 @@ -package finki.paw5.repository; - -import finki.paw5.model.entities.Shelter; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -import java.util.List; - -@Repository -public interface ShelterRepository extends JpaRepository { -} Index: ototype Application/Paw5/src/main/java/finki/paw5/repository/SurendeeRepository.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/repository/SurendeeRepository.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,9 +1,0 @@ -package finki.paw5.repository; - -import finki.paw5.model.entities.Surendee; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -@Repository -public interface SurendeeRepository extends JpaRepository { -} Index: ototype Application/Paw5/src/main/java/finki/paw5/repository/TherapyRepository.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/repository/TherapyRepository.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,9 +1,0 @@ -package finki.paw5.repository; - -import finki.paw5.model.entities.Therapy; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -@Repository -public interface TherapyRepository extends JpaRepository { -} Index: ototype Application/Paw5/src/main/java/finki/paw5/repository/UserRepository.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/repository/UserRepository.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,12 +1,0 @@ -package finki.paw5.repository; - -import finki.paw5.model.entities.User; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - - -@Repository -public interface UserRepository extends JpaRepository { - User findByEmailAndPassword(String email, String password); - User findByEmail(String email); -} Index: ototype Application/Paw5/src/main/java/finki/paw5/repository/VetClinicRepository.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/repository/VetClinicRepository.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,9 +1,0 @@ -package finki.paw5.repository; - -import finki.paw5.model.entities.VetClinic; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -@Repository -public interface VetClinicRepository extends JpaRepository { -} Index: ototype Application/Paw5/src/main/java/finki/paw5/service/AdopterService.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/service/AdopterService.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,13 +1,0 @@ -package finki.paw5.service; - -import finki.paw5.model.entities.Adopter; - -import java.util.List; - -public interface AdopterService { - List findAllThatNeedApproval(); - - Adopter findById(Integer id); - - void save(Adopter adopter); -} Index: ototype Application/Paw5/src/main/java/finki/paw5/service/AdoptionService.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/service/AdoptionService.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,8 +1,0 @@ -package finki.paw5.service; - -import finki.paw5.model.entities.Adoption; - -public interface AdoptionService { - - void save(Adoption adoption); -} Index: ototype Application/Paw5/src/main/java/finki/paw5/service/AuthService.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/service/AuthService.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,16 +1,0 @@ -package finki.paw5.service; - -import finki.paw5.model.entities.Adopter; -import finki.paw5.model.entities.Employee; -import finki.paw5.model.entities.User; -import finki.paw5.model.enumerations.FreeTime; -import finki.paw5.model.enumerations.Funds; -import finki.paw5.model.enumerations.Housing; -import finki.paw5.model.enumerations.PhysicalActivity; - -public interface AuthService { - User login (String email, String password); - Adopter registerAdopter(String name, String email, String password, String telephone, FreeTime freeTime, Funds funds, boolean hasOtherPets, boolean hasKids, Housing housing, PhysicalActivity physicalActivity, boolean willFoster); - Employee registerEmployee(String name, String email, String password, String telephone, String position, Integer shelterId); - -} Index: ototype Application/Paw5/src/main/java/finki/paw5/service/EmployeeService.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/service/EmployeeService.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,10 +1,0 @@ -package finki.paw5.service; - - -import finki.paw5.model.entities.Employee; - -import java.util.List; - -public interface EmployeeService { - List findAll(); -} Index: ototype Application/Paw5/src/main/java/finki/paw5/service/OrganisationService.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/service/OrganisationService.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,9 +1,0 @@ -package finki.paw5.service; - -import finki.paw5.model.entities.Organisation; - -import java.util.List; - -public interface OrganisationService { - List findAll(); -} Index: ototype Application/Paw5/src/main/java/finki/paw5/service/PersonalProfileService.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/service/PersonalProfileService.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,10 +1,0 @@ -package finki.paw5.service; - -import finki.paw5.model.entities.PersonalProfile; -import finki.paw5.web.controllers.PostController; - -import java.util.Optional; - -public interface PersonalProfileService { - Optional findById(Integer petId); -} Index: ototype Application/Paw5/src/main/java/finki/paw5/service/PetService.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/service/PetService.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,14 +1,0 @@ -package finki.paw5.service; - -import finki.paw5.model.entities.Pet; - -import java.util.List; - -public interface PetService { - - void save (Pet pet); - - List listpets(); - - Pet findById(Integer id); -} Index: ototype Application/Paw5/src/main/java/finki/paw5/service/PostService.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/service/PostService.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,14 +1,0 @@ -package finki.paw5.service; - -import finki.paw5.model.entities.Post; -import java.util.List; -import java.util.Optional; - -public interface PostService { - - void save (Post post); - - List findAll(); - - Optional findById(Integer id); -} Index: ototype Application/Paw5/src/main/java/finki/paw5/service/ShelterService.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/service/ShelterService.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,11 +1,0 @@ -package finki.paw5.service; - -import finki.paw5.model.entities.Shelter; - -import java.util.List; -import java.util.Optional; - -public interface ShelterService { - Optional findById(Integer id); - List listShelters(); -} Index: ototype Application/Paw5/src/main/java/finki/paw5/service/UserService.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/service/UserService.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,10 +1,0 @@ -package finki.paw5.service; - -import finki.paw5.model.entities.User; - -import java.util.Optional; - -public interface UserService { - User register(String password, String repeatPassword, String name, String email, String telephone); - -} Index: ototype Application/Paw5/src/main/java/finki/paw5/service/implementation/AdopterServiceImplementation.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/service/implementation/AdopterServiceImplementation.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,36 +1,0 @@ -package finki.paw5.service.implementation; - -import finki.paw5.model.entities.Adopter; -import finki.paw5.repository.AdopterRepository; -import finki.paw5.service.AdopterService; -import org.springframework.stereotype.Service; - -import java.util.List; -import java.util.stream.Collectors; - -@Service -public class AdopterServiceImplementation implements AdopterService { - private final AdopterRepository adopterRepository; - - public AdopterServiceImplementation(AdopterRepository adopterRepository) { - this.adopterRepository = adopterRepository; - } - - @Override - public List findAllThatNeedApproval() { - - return adopterRepository.findAll().stream() - .filter(a -> !a.getVerified() && a.getEmployeeVerificator() == null) - .collect(Collectors.toList()); - } - - @Override - public Adopter findById(Integer id) { - return this.adopterRepository.findById(id).get(); - } - - @Override - public void save(Adopter adopter) { - this.adopterRepository.save(adopter); - } -} Index: ototype Application/Paw5/src/main/java/finki/paw5/service/implementation/AdoptionServiceImplementation.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/service/implementation/AdoptionServiceImplementation.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,21 +1,0 @@ -package finki.paw5.service.implementation; - -import finki.paw5.model.entities.Adoption; -import finki.paw5.repository.AdoptionRepository; -import finki.paw5.service.AdoptionService; -import org.springframework.stereotype.Service; - -@Service -public class AdoptionServiceImplementation implements AdoptionService { - - private final AdoptionRepository adoptionRepository; - - public AdoptionServiceImplementation(AdoptionRepository adoptionRepository) { - this.adoptionRepository = adoptionRepository; - } - - @Override - public void save(Adoption adoption) { - this.adoptionRepository.save(adoption); - } -} Index: ototype Application/Paw5/src/main/java/finki/paw5/service/implementation/AuthServiceImplementation.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/service/implementation/AuthServiceImplementation.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,58 +1,0 @@ -package finki.paw5.service.implementation; - -import finki.paw5.model.entities.Adopter; -import finki.paw5.model.entities.Employee; -import finki.paw5.model.entities.Shelter; -import finki.paw5.model.entities.User; -import finki.paw5.model.enumerations.FreeTime; -import finki.paw5.model.enumerations.Funds; -import finki.paw5.model.enumerations.Housing; -import finki.paw5.model.enumerations.PhysicalActivity; -import finki.paw5.repository.AdopterRepository; -import finki.paw5.repository.EmployeeRepository; -import finki.paw5.repository.ShelterRepository; -import finki.paw5.repository.UserRepository; -import finki.paw5.service.AuthService; -import org.springframework.stereotype.Service; - -import java.time.LocalDate; - -@Service -public class AuthServiceImplementation implements AuthService { - - private final UserRepository userRepository; - private final AdopterRepository adopterRepository; - private final EmployeeRepository employeeRepository; - private final ShelterRepository shelterRepository; - - public AuthServiceImplementation(UserRepository userRepository, AdopterRepository adopterRepository, EmployeeRepository employeeRepository, ShelterRepository shelterRepository) { - this.userRepository = userRepository; - this.adopterRepository = adopterRepository; - this.employeeRepository = employeeRepository; - this.shelterRepository = shelterRepository; - } - - @Override - public User login(String email, String password) { - - if(userRepository.findByEmailAndPassword(email, password)!=null){ - return userRepository.findByEmailAndPassword(email,password); - } - return null; - } - - - @Override - public Adopter registerAdopter(String name, String email, String password, String telephone, FreeTime freeTime, Funds funds, boolean hasOtherPets, boolean hasKids, Housing housing, PhysicalActivity physicalActivity, boolean willFoster) { - Adopter adopter = new Adopter(LocalDate.now(), name, email, password, telephone,freeTime,funds,hasOtherPets,hasKids,housing,physicalActivity,willFoster,false); - return adopterRepository.save(adopter); - } - - @Override - public Employee registerEmployee(String name, String email, String password, String telephone, String position, Integer shelterId) { - Shelter shelter = this.shelterRepository.findById(shelterId).get(); - Employee employee = new Employee(LocalDate.now(),name, email,password,telephone,position,shelter,false); - return employeeRepository.save(employee); - } - -} Index: ototype Application/Paw5/src/main/java/finki/paw5/service/implementation/EmployeeServiceImplementation.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/service/implementation/EmployeeServiceImplementation.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,22 +1,0 @@ -package finki.paw5.service.implementation; - -import finki.paw5.model.entities.Employee; -import finki.paw5.repository.EmployeeRepository; -import finki.paw5.service.EmployeeService; -import org.springframework.stereotype.Service; - -import java.util.List; - -@Service -public class EmployeeServiceImplementation implements EmployeeService { - private final EmployeeRepository employeeRepository; - - public EmployeeServiceImplementation(EmployeeRepository employeeRepository) { - this.employeeRepository = employeeRepository; - } - - @Override - public List findAll() { - return employeeRepository.findAll(); - } -} Index: ototype Application/Paw5/src/main/java/finki/paw5/service/implementation/OrganisationServiceImplementation.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/service/implementation/OrganisationServiceImplementation.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,21 +1,0 @@ -package finki.paw5.service.implementation; - -import finki.paw5.model.entities.Organisation; -import finki.paw5.repository.OrganisationRepository; -import finki.paw5.service.OrganisationService; -import org.springframework.stereotype.Service; - -import java.util.List; -@Service -public class OrganisationServiceImplementation implements OrganisationService { - private final OrganisationRepository organisationRepository; - - public OrganisationServiceImplementation(OrganisationRepository organisationRepository) { - this.organisationRepository = organisationRepository; - } - - @Override - public List findAll() { - return organisationRepository.findAll(); - } -} Index: ototype Application/Paw5/src/main/java/finki/paw5/service/implementation/PersonalProfileServiceImplementation.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/service/implementation/PersonalProfileServiceImplementation.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,23 +1,0 @@ -package finki.paw5.service.implementation; - -import finki.paw5.model.entities.PersonalProfile; -import finki.paw5.repository.PersonalProfileRepository; -import finki.paw5.service.PersonalProfileService; -import org.springframework.stereotype.Service; - -import java.util.Optional; - -@Service -public class PersonalProfileServiceImplementation implements PersonalProfileService { - - private final PersonalProfileRepository personalProfileRepository; - - public PersonalProfileServiceImplementation(PersonalProfileRepository personalProfileRepository) { - this.personalProfileRepository = personalProfileRepository; - } - - @Override - public Optional findById(Integer petId) { - return this.personalProfileRepository.findById(petId); - } -} Index: ototype Application/Paw5/src/main/java/finki/paw5/service/implementation/PetServiceImplementation.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/service/implementation/PetServiceImplementation.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,30 +1,0 @@ -package finki.paw5.service.implementation; - -import finki.paw5.model.entities.Pet; -import finki.paw5.repository.PetRepository; -import finki.paw5.service.PetService; -import org.springframework.stereotype.Service; - -import java.util.List; - -@Service -public class PetServiceImplementation implements PetService { - - private final PetRepository petRepository; - - public PetServiceImplementation(PetRepository petRepository) { - this.petRepository = petRepository; - } - - @Override - public void save(Pet pet) { - this.petRepository.save(pet); - } - - public List listpets() {return this.petRepository.findAll();} - - @Override - public Pet findById(Integer id) { - return this.petRepository.findById(id).get(); - } -} Index: ototype Application/Paw5/src/main/java/finki/paw5/service/implementation/PostServiceImplementation.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/service/implementation/PostServiceImplementation.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,34 +1,0 @@ -package finki.paw5.service.implementation; - -import finki.paw5.model.entities.Post; -import finki.paw5.repository.PostRepository; -import finki.paw5.service.PostService; -import org.springframework.stereotype.Service; - -import java.util.List; -import java.util.Optional; - -@Service -public class PostServiceImplementation implements PostService { - - private final PostRepository postRepository; - - public PostServiceImplementation(PostRepository PostRepository){ - this.postRepository = PostRepository; - } - - @Override - public void save(Post post) { - this.postRepository.save(post); - } - - @Override - public List findAll() { - return this.postRepository.findAll(); - } - - @Override - public Optional findById(Integer id) { - return this.postRepository.findById(id); - } -} Index: ototype Application/Paw5/src/main/java/finki/paw5/service/implementation/ShelterServiceImplementation.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/service/implementation/ShelterServiceImplementation.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,31 +1,0 @@ -package finki.paw5.service.implementation; - -import finki.paw5.model.entities.Shelter; -import finki.paw5.repository.ShelterRepository; -import finki.paw5.service.ShelterService; -import org.springframework.stereotype.Service; - -import java.util.List; -import java.util.Optional; - -@Service -public class ShelterServiceImplementation implements ShelterService { - - private final ShelterRepository shelterRepository; - - public ShelterServiceImplementation(ShelterRepository shelterRepository) { - this.shelterRepository = shelterRepository; - } - - @Override - public Optional findById(Integer id) { - return this.shelterRepository.findById(id); - } - - @Override - public List listShelters() { - return shelterRepository.findAll(); - } - - -} Index: ototype Application/Paw5/src/main/java/finki/paw5/service/implementation/UserServiceImpl.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/service/implementation/UserServiceImpl.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,36 +1,0 @@ -package finki.paw5.service.implementation; - -import finki.paw5.model.entities.User; -import finki.paw5.repository.UserRepository; -import finki.paw5.service.UserService; -import org.springframework.stereotype.Service; - -import java.sql.Date; -import java.time.LocalDate; -import java.util.Optional; - -@Service -public class UserServiceImpl implements UserService { - - private final UserRepository userRepository; - - public UserServiceImpl(UserRepository userRepository) { - this.userRepository = userRepository; - } - - @Override - public User register(String password, String repeatPassword, String name, String email, String telephone) { - if (email == null || email.isEmpty() || password == null || password.isEmpty()) { - //throw new Exception(); - } - if (!password.equals(repeatPassword)) { - //throw new Exception(); - } - if (this.userRepository.findByEmail(email)!=null) { - //throw new Exception("Username exists:"+email); - } - User user = new User(LocalDate.now(), name, email, password, telephone); - return userRepository.save(user); - } - -} Index: ototype Application/Paw5/src/main/java/finki/paw5/web/controllers/EmployeeController.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/web/controllers/EmployeeController.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,47 +1,0 @@ -package finki.paw5.web.controllers; - -import finki.paw5.model.entities.Adopter; -import finki.paw5.model.entities.Employee; -import finki.paw5.service.AdopterService; -import finki.paw5.service.EmployeeService; -import jakarta.servlet.http.HttpServletRequest; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; - -@Controller -@RequestMapping("/") -public class EmployeeController { - - private final AdopterService adopterService; - private final EmployeeService employeeService; - - public EmployeeController(AdopterService adopterService, EmployeeService employeeService) { - this.adopterService = adopterService; - this.employeeService = employeeService; - } - - @GetMapping("/approve-adopters") - public String getApprovalPage(Model model){ - model.addAttribute("needApproval", this.adopterService.findAllThatNeedApproval()); - return "/approve-adopters"; - } - - @PostMapping("/submit-approval-{id}") - public String approveAdopter(@PathVariable Integer id, HttpServletRequest request){ - - Employee employeeVerificator = (Employee) request.getSession().getAttribute("user"); - - Adopter adopter = this.adopterService.findById(id); - - adopter.setVerified(true); - adopter.setEmployeeVerificator(employeeVerificator); - - this.adopterService.save(adopter); - - return "redirect:/approve-adopters"; - } -} Index: ototype Application/Paw5/src/main/java/finki/paw5/web/controllers/HomeController.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/web/controllers/HomeController.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,24 +1,0 @@ -package finki.paw5.web.controllers; - -import jakarta.servlet.http.HttpServletRequest; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; - -@Controller -@RequestMapping("/home") -public class HomeController { - - @GetMapping - public String getHomePage(HttpServletRequest request) { - if(request.getSession().getAttribute("user")==null){ - return "redirect:/login"; - } - return "home"; - } - - @GetMapping("/aboutUs") - public String getAboutUsPage(){ - return "/aboutUs"; - } -} Index: ototype Application/Paw5/src/main/java/finki/paw5/web/controllers/LoginController.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/web/controllers/LoginController.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,49 +1,0 @@ -package finki.paw5.web.controllers; - -import finki.paw5.model.entities.User; -import finki.paw5.model.exceptions.NonExistingArgumentsException; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; - -import finki.paw5.service.AuthService; -import jakarta.servlet.http.HttpServletRequest; -import org.springframework.web.bind.annotation.RequestParam; - -import java.util.Objects; - -@Controller -@RequestMapping("/login") -public class LoginController { - - private final AuthService authService; - - public LoginController(AuthService authService) { - this.authService = authService; - } - - @GetMapping - public String register(){ - return "/login"; - } - @PostMapping - public String register(@RequestParam String email, @RequestParam String password, HttpServletRequest request, Model model) throws NonExistingArgumentsException { - - if(email==null || email.equals("") || Objects.equals(password, "") || password==null){ - throw new NonExistingArgumentsException(); - } - User user = authService.login(email,password); - - if(user!=null){ - request.getSession().setAttribute("user",user); //go smestuvam korisnikot vo sesija - return "redirect:/home"; - } - else{ - return "redirect:/login"; - } - - - } -} Index: ototype Application/Paw5/src/main/java/finki/paw5/web/controllers/PetController.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/web/controllers/PetController.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,41 +1,0 @@ -package finki.paw5.web.controllers; - -import finki.paw5.model.entities.Adopter; -import finki.paw5.model.entities.Adoption; -import finki.paw5.model.entities.Pet; -import finki.paw5.service.AdoptionService; -import finki.paw5.service.PetService; -import jakarta.servlet.http.HttpServletRequest; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; - -import java.time.LocalDate; - -@Controller -public class PetController { - - private final PetService petService; - private final AdoptionService adoptionService; - - public PetController(PetService petService, AdoptionService adoptionService) { - this.petService = petService; - this.adoptionService = adoptionService; - } - - @PostMapping("/submit-adoption-{id}") - public String saveAdoption(@PathVariable Integer id, HttpServletRequest request) { - - Pet pet = this.petService.findById(id); - - Adopter adopter = (Adopter) request.getSession().getAttribute("user"); - - Adoption adoption = new Adoption(LocalDate.now(), null, false, adopter); - this.adoptionService.save(adoption); - - pet.setAdoption(adoption); - this.petService.save(pet); - - return "redirect:/home"; - } -} Index: ototype Application/Paw5/src/main/java/finki/paw5/web/controllers/PostController.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/web/controllers/PostController.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,101 +1,0 @@ -package finki.paw5.web.controllers; -import finki.paw5.model.entities.Pet; -import finki.paw5.model.entities.Post; -import finki.paw5.model.entities.Employee; -import finki.paw5.model.enumerations.AgeGroup; -import finki.paw5.model.enumerations.Gender; -import finki.paw5.model.enumerations.Size; -import finki.paw5.model.enumerations.Species; -import finki.paw5.service.PersonalProfileService; -import finki.paw5.service.PetService; -import finki.paw5.service.PostService; -import finki.paw5.service.ShelterService; -import jakarta.servlet.http.HttpServletRequest; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestParam; - -import java.time.LocalDate; -import java.util.List; - -@Controller -public class PostController { - - private final PostService postService; - private final PetService petService; - private final PersonalProfileService personalProfileService; - - public PostController(PostService postService, PetService petService, PersonalProfileService personalProfileService, ShelterService shelterService) { - this.postService = postService; - this.petService = petService; - this.personalProfileService = personalProfileService; - } - - @GetMapping("/create-post") - public String get(Model model) { - model.addAttribute("pets", this.petService.listpets()); - return "create-post"; - } - - @PostMapping("/submit-post") - public String savePost(@RequestParam(required = false) Integer petId, - @RequestParam(required = false) boolean newPetCheckbox, - @RequestParam(required = false) String name, - @RequestParam(required = false) String gender, - @RequestParam(required = false) String ageGroup, - @RequestParam(required = false) String size, - @RequestParam(required = false) String species, - @RequestParam(required = false) String breed, - @RequestParam(required = false) String imageUrl, - @RequestParam(required = false) boolean canBeFostered, - HttpServletRequest request) { - - Employee employee = (Employee) request.getSession().getAttribute("user"); - - if(newPetCheckbox == true){ - - Pet newPet = new Pet(imageUrl, AgeGroup.valueOf(ageGroup), Size.valueOf(size), breed, name, Species.valueOf(species), Gender.valueOf(gender), canBeFostered, null, employee.getShelter()); - this.petService.save(newPet); - - Post post = new Post(LocalDate.now(), imageUrl, newPet, null, employee); - this.postService.save(post); - - } else{ - - Pet selectedPet = this.petService.findById(petId); - - Post post = new Post(LocalDate.now(), imageUrl, selectedPet, null, employee); - this.postService.save(post); - - } - - return "redirect:/home"; - } - - @GetMapping("/adoption-posts") - public String getAdoptionPosts(Model model){ - - List posts = this.postService.findAll(); - List pets = this.petService.listpets(); - model.addAttribute("posts", posts); - model.addAttribute("pets",pets); - - return "list-posts-adoption"; - } - - @GetMapping("/pet-details-{id}") - public String getPostDetails(@PathVariable Integer id, - Model model){ - - Post post = this.postService.findById(id).get(); - Pet pet = post.getPet(); - - model.addAttribute("pet", pet); - model.addAttribute("post", post); - - return "pet-details"; - } -} Index: ototype Application/Paw5/src/main/java/finki/paw5/web/controllers/RegisterController.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/web/controllers/RegisterController.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,73 +1,0 @@ -package finki.paw5.web.controllers; -import finki.paw5.model.entities.Adopter; -import finki.paw5.model.entities.Employee; -import finki.paw5.model.enumerations.FreeTime; -import finki.paw5.model.enumerations.Funds; -import finki.paw5.model.enumerations.Housing; -import finki.paw5.model.enumerations.PhysicalActivity; -import finki.paw5.service.AuthService; -import finki.paw5.service.OrganisationService; -import finki.paw5.service.ShelterService; -import jakarta.servlet.http.HttpServletRequest; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.RequestParam; - -@Controller -@RequestMapping("/register") -public class RegisterController { - - private final OrganisationService organisationService; - private final ShelterService shelterService; - private final AuthService authService; - - public RegisterController(OrganisationService organisationService, ShelterService shelterService, AuthService authService) { - this.organisationService = organisationService; - this.shelterService = shelterService; - this.authService = authService; - } - - @GetMapping - public String getRegisterPage(Model model) { - model.addAttribute("shelters", this.shelterService.listShelters()); - model.addAttribute("organisations", this.organisationService.findAll()); - return "register"; - } - - @PostMapping - public String registerUser(@RequestParam String name, @RequestParam String email, - @RequestParam String password, @RequestParam String repeatPassword, - @RequestParam String telephone,@RequestParam String role, - @RequestParam (required = false) String freeTime, @RequestParam (required = false) String funds, - @RequestParam (required = false) boolean hasOtherPets, @RequestParam (required = false) boolean hasKids, - @RequestParam (required = false) String housing, @RequestParam (required = false) String physicalActivity, - @RequestParam (required = false) boolean willFoster, @RequestParam (required = false) Integer shelter, - @RequestParam (required = false) String position, HttpServletRequest request) { - - if(role.equals("adopter") & password.equals(repeatPassword)){ - - FreeTime ft = FreeTime.valueOf(freeTime); - Funds f = Funds.valueOf(funds); - Housing h = Housing.valueOf(housing); - PhysicalActivity pa = PhysicalActivity.valueOf(physicalActivity); - - Adopter adopterUser = authService.registerAdopter(name, email, password, telephone,ft,f,hasOtherPets,hasKids,h,pa,willFoster); - - request.getSession().setAttribute("user",adopterUser); - return "redirect:/home"; - } - else if(role.equals("employee") & password.equals(repeatPassword)){ - - Employee employeeUser = authService.registerEmployee(name, email, password, telephone,position,shelter); - - request.getSession().setAttribute("user",employeeUser); - return "redirect:/home"; - } - - return "redirect:/register"; - } - -} Index: ototype Application/Paw5/src/main/resources/application.properties =================================================================== --- Prototype Application/Paw5/src/main/resources/application.properties (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,12 +1,0 @@ -spring.datasource.url=jdbc:postgresql://localhost:9999/db_202223z_va_prj_paw5 -spring.datasource.username=db_202223z_va_prj_paw5_owner -spring.datasource.password=b53473cba3b3 - -spring.datasource.hikari.connectionTimeout=20000 -spring.datasource.hikari.maximumPoolSize=5 - -spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQL95Dialect -spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=true - -spring.jpa.hibernate.ddl-auto=validate -spring.jpa.show-sql=true Index: ototype Application/Paw5/src/main/resources/templates/aboutUs.html =================================================================== --- Prototype Application/Paw5/src/main/resources/templates/aboutUs.html (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,52 +1,0 @@ - - - - - Title - - - - - - - -
- -
-

About Us

-
-
- You successfully logged in - -
-
- - Index: ototype Application/Paw5/src/main/resources/templates/approve-adopters.html =================================================================== --- Prototype Application/Paw5/src/main/resources/templates/approve-adopters.html (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,75 +1,0 @@ - - - - - Unapproved adopters - - - - - - -
- -
-
-

Adopters who are waiting for your approval

- - - - - - - - - - - - - -
NameEmail AddressTelephone Number
-
- -
-
-
- - Index: ototype Application/Paw5/src/main/resources/templates/create-post.html =================================================================== --- Prototype Application/Paw5/src/main/resources/templates/create-post.html (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,186 +1,0 @@ - - - - - Create a post - - - - - - - -
- -
-

Create post

-
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - - -
- -
- - -
- - - -
- - Index: ototype Application/Paw5/src/main/resources/templates/home.html =================================================================== --- Prototype Application/Paw5/src/main/resources/templates/home.html (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,64 +1,0 @@ - - - - - Home - - - - - - -
- -
-
-

Welcome to Paw 5

-

Let's get started - -

-
-
-
- -
-
-
-
- -
-
- - Index: ototype Application/Paw5/src/main/resources/templates/list-posts-adoption.html =================================================================== --- Prototype Application/Paw5/src/main/resources/templates/list-posts-adoption.html (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,64 +1,0 @@ - - - - - Adoption Posts - - - - - - - -
- -
- - - - - - - - - - - - -
Post IDPet NameSpecies
-
- -
- -
- - Index: ototype Application/Paw5/src/main/resources/templates/login.html =================================================================== --- Prototype Application/Paw5/src/main/resources/templates/login.html (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,84 +1,0 @@ - - - - - Title - - - - - - - -
- -
-
- -
-

Login

- -

- - -

- - - -
- Register here -
- - - Index: ototype Application/Paw5/src/main/resources/templates/pet-details.html =================================================================== --- Prototype Application/Paw5/src/main/resources/templates/pet-details.html (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,78 +1,0 @@ - - - - - Title - - - - - - -
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Post ID
Pet Name
Species
Breed
Gender
Age Group
Size
-
- -
- - - Index: ototype Application/Paw5/src/main/resources/templates/register.html =================================================================== --- Prototype Application/Paw5/src/main/resources/templates/register.html (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,205 +1,0 @@ - - - - - Title - - - - - - - -
- -
-
-

Register

-
-
- -

- - -

- - -

- - -

- - -

- -


- - - - -

- - -

- - -

- -


- - - - -

- -

- *the following information is needed so we can provide our best services for you* -

- - -

- - -

- - - Yes - No

- - - Yes - No

- - -

- - -

- - - Yes - No

- -

- - - -

- - -

- -

- - - -

- - -
-
-

You want to adopt or foster a pet? - You are an adopter
- You want your pet to be adopted by another person? - You are a surendee
- You want to donate to an organisation protection animal rights? - You are a donor
- You work in one of our partner's shelters? - You are an employee
-

-
- - - Index: ototype Application/Paw5/src/test/java/finki/paw5/Paw5ApplicationTests.java =================================================================== --- Prototype Application/Paw5/src/test/java/finki/paw5/Paw5ApplicationTests.java (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ (revision ) @@ -1,13 +1,0 @@ -package finki.paw5; - -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.context.SpringBootTest; - -@SpringBootTest -class Paw5ApplicationTests { - - @Test - void contextLoads() { - } - -} Index: README.md =================================================================== --- README.md (revision 30ab9cc52ec89288ec1b1d272bb30c2e5575b10b) +++ README.md (revision 98b48bfa3993c87d61d1c19089f70aae72f97dc7) @@ -1,25 +1,1 @@ # Paw5 - -## Краток опис на проектот - -Paw5 е платформа која овозможува посвојување на милиничиња на кои им е потребен дом. Корисниците кои сакаат да посвојат или привремено да чуваат милениче можат да разгледуваат огласи и да филтрираат низ истите со цел да го најдат вистинското милениче за нив и нивниот стил на живот. Освен основни податоци како возраст и пол на животното, достапни се и подетални информации за нивната физичка активност , потребен простор, дали може да живее во дом со мали деца и други животни, потребна ветеринарна грижа и исхрана и слично. Целта на ова е да помогне да се направи вистински избор при посвојување, за и сопственикот и миленичето да бидат среќни. Покрај можноста за посвојување, корисниците ќе можат и да објават оглас за нивни миленици за кои не можат да се грижат или кои што ги нашле на улица. Корисниците ќе можат да направат и донации кон организациите, за да им помогнат да се грижат за животните. Апликацијата е наменета да ја употребуваат и вработените во прифатилиштата и организациите за заштита на животните, кои се грижат за логистиката при посвојување на нивните миленици. Поголемата цел која Paw5 сака да ја постигне е намалување на бројот на улични животни преку нудење на поефикасен начин на огласување и посвојување миленици. - -## Членови на тимот - -Екатерина Саздова 201063 (координатор) - -Мила Трајчева 201088 - -Филип Чорбески 201235 - -## Предмет - -Бази на податоци во 2022/2023/Зимски - -## Ментори - -вонр. проф. д-р Вангел Ајановски, асистент м-р Ненад Анчев и демонстратор Ана Младеновска - -## Проектен сајт - -https://develop.finki.ukim.mk/projects/PAW5