Index: itignore =================================================================== --- .gitignore (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,35 +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 - -tunnel/ - -### 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: vn/wrapper/maven-wrapper.properties =================================================================== --- .mvn/wrapper/maven-wrapper.properties (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (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: README.md =================================================================== --- README.md (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ README.md (revision e8d3511d1a5acb4b0b4909587041ede4c9d0b96a) @@ -1,11 +1,1 @@ # AutoPartz - -Проект по предметот Бази на Податоци - -Членови на тимот: - -Андреј Тодоровски - 201084 - -Стефан Милески - 201141 - -Христијан Саздовски - 201207 Index: nw =================================================================== --- mvnw (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (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: nw.cmd =================================================================== --- mvnw.cmd (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (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: m.xml =================================================================== --- pom.xml (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,95 +1,0 @@ - - - 4.0.0 - - org.springframework.boot - spring-boot-starter-parent - 2.7.4 - - - com.example - AutoPartz - 0.0.1-SNAPSHOT - AutoPartz - AutoPartz - - 17.0.5 - 5.6.1 - - - - org.springframework.boot - spring-boot-starter-data-jpa - - - org.thymeleaf.extras - thymeleaf-extras-springsecurity5 - - - org.springframework.boot - spring-boot-starter-thymeleaf - - - org.springframework.boot - spring-boot-starter-web - - - javax.servlet - javax.servlet-api - 4.0.1 - provided - - - - - org.postgresql - postgresql - runtime - - - org.projectlombok - lombok - 1.18.24 - provided - true - - - org.springframework.boot - spring-boot-starter-test - test - - - org.springframework.boot - spring-boot-starter-security - - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - org.projectlombok - lombok - - - - - - com.google.cloud.tools - appengine-maven-plugin - 2.2.0 - - 1 - GCLOUD_CONFIG - - - - - - Index: c/main/java/com/example/autopartz/AutoPartzApplication.java =================================================================== --- src/main/java/com/example/autopartz/AutoPartzApplication.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,25 +1,0 @@ -package com.example.autopartz; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.context.annotation.Bean; -import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; -import org.springframework.security.crypto.password.PasswordEncoder; -import org.thymeleaf.extras.springsecurity5.dialect.SpringSecurityDialect; - -@SpringBootApplication -public class AutoPartzApplication { - - public static void main(String[] args) { - SpringApplication.run(AutoPartzApplication.class, args); - } - @Bean - PasswordEncoder passwordEncoder() { - return new BCryptPasswordEncoder(10); - } - @Bean - public SpringSecurityDialect securityDialect() { - return new SpringSecurityDialect(); - } - -} Index: c/main/java/com/example/autopartz/config/CustomUsernamePasswordAuthenticationProvider.java =================================================================== --- src/main/java/com/example/autopartz/config/CustomUsernamePasswordAuthenticationProvider.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,49 +1,0 @@ -package com.example.autopartz.config; - -import com.example.autopartz.service.UserService; -import org.springframework.security.authentication.AuthenticationProvider; -import org.springframework.security.authentication.BadCredentialsException; -import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; -import org.springframework.security.core.Authentication; -import org.springframework.security.core.AuthenticationException; -import org.springframework.security.core.userdetails.UserDetails; -import org.springframework.security.crypto.password.PasswordEncoder; -import org.springframework.stereotype.Component; - -import java.util.Objects; - -@Component -public class CustomUsernamePasswordAuthenticationProvider implements AuthenticationProvider { - - private final UserService userService; - private final PasswordEncoder passwordEncoder; - - public CustomUsernamePasswordAuthenticationProvider(UserService userService, PasswordEncoder passwordEncoder) { - this.userService = userService; - this.passwordEncoder = passwordEncoder; - } - - @Override - public Authentication authenticate(Authentication authentication) throws AuthenticationException { - String username = authentication.getName(); - String password = authentication.getCredentials().toString(); - - if ("".equals(username) || "".equals(password)) { - throw new BadCredentialsException("Invalid Credentials"); - } - - UserDetails userDetails = this.userService.findByUsername(username); - String realPassword = userDetails.getPassword(); - if (!Objects.equals(password,realPassword)) { - throw new BadCredentialsException("Password is incorrect!"); - } - return new UsernamePasswordAuthenticationToken(userDetails, userDetails.getPassword(), userDetails.getAuthorities()); - - } - - @Override - public boolean supports(Class aClass) { - return aClass.equals(UsernamePasswordAuthenticationToken.class); - } -} - Index: c/main/java/com/example/autopartz/config/WebSecurityConfig.java =================================================================== --- src/main/java/com/example/autopartz/config/WebSecurityConfig.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,62 +1,0 @@ -package com.example.autopartz.config; - -import org.springframework.context.annotation.Configuration; -import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; -import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity; -import org.springframework.security.config.annotation.web.builders.HttpSecurity; -import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; -import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; -import org.springframework.security.crypto.password.PasswordEncoder; - -@Configuration -@EnableWebSecurity -@EnableGlobalMethodSecurity(securedEnabled = true, prePostEnabled = true) -public class WebSecurityConfig extends WebSecurityConfigurerAdapter { - - private final PasswordEncoder passwordEncoder; - private final CustomUsernamePasswordAuthenticationProvider authenticationProvider; - - public WebSecurityConfig(PasswordEncoder passwordEncoder, - CustomUsernamePasswordAuthenticationProvider authenticationProvider) { - this.passwordEncoder = passwordEncoder; - this.authenticationProvider = authenticationProvider; - } - - @Override - protected void configure(HttpSecurity http) throws Exception { - - http.csrf().disable() - .authorizeRequests() - .antMatchers("/", "/products", "/services", "/filtered", "/login", "/register","/registerWarehouseman","/finishRegister","/test/*","/access_denied","/carCategoryReport","/partManufacturersReport","/mostPurchasedPart","/part/*").permitAll() - .antMatchers("/orders","/repairs","/reviews","/currentOrder","/addCarSampleForUser","/repairs/addReview/*").hasRole("CLIENT") - .antMatchers("/viewUsers","/approve/*","/addPart","/addCarManufacturer","/addPartManufacturer","/addCategory","/addCar","/addRepairShop","/addWarehouse").hasRole("ADMIN") - .antMatchers("/myWarehouseReport","myWarehouse").hasRole("WAREHOUSEMAN") - .anyRequest() - .authenticated() - .and() - .formLogin() - .loginPage("/login").permitAll() - .failureUrl("/login?error=BadCredentials") - .defaultSuccessUrl("/", true) - .and() - .logout() - .logoutUrl("/logout") - .clearAuthentication(true) - .invalidateHttpSession(true) - .deleteCookies("JSESSIONID") - .logoutSuccessUrl("/") - .and() - .exceptionHandling().accessDeniedPage("/access_denied"); - - } - - @Override - protected void configure(AuthenticationManagerBuilder auth) { - auth.authenticationProvider(authenticationProvider); - } - - - -} - - Index: c/main/java/com/example/autopartz/controller/AdminController.java =================================================================== --- src/main/java/com/example/autopartz/controller/AdminController.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,197 +1,0 @@ -package com.example.autopartz.controller; - -import com.example.autopartz.model.*; -import com.example.autopartz.repository.*; -import com.example.autopartz.service.PartService; -import com.example.autopartz.service.RepairShopService; -import com.example.autopartz.service.UserService; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.time.LocalDate; -import java.util.List; -import java.util.Objects; - -@Controller -@RequestMapping("/") -public class AdminController { - private final UserService userService; - private final CarManufacturerRepository carManufacturerRepository; - private final WarehousemanRepository warehousemanRepository; - private final DeliverymanRepository deliverymanRepository; - private final CategoryRepository categoryRepository; - private final WarehouseRepository warehouseRepository; - private final CarRepository carRepository; - private final PartManufacturerRepository partManufacturerRepository; - private final PartService partService; - private final RepairShopService repairShopService; - - public AdminController(UserService userService, CarManufacturerRepository carManufacturerRepository, WarehousemanRepository warehousemanRepository, DeliverymanRepository deliverymanRepository, CategoryRepository categoryRepository, WarehouseRepository warehouseRepository, CarRepository carRepository, PartManufacturerRepository partManufacturerRepository, PartService partService, RepairShopService repairShopService) { - this.userService = userService; - this.carManufacturerRepository = carManufacturerRepository; - this.warehousemanRepository = warehousemanRepository; - this.deliverymanRepository = deliverymanRepository; - this.categoryRepository = categoryRepository; - this.warehouseRepository = warehouseRepository; - this.carRepository = carRepository; - this.partManufacturerRepository = partManufacturerRepository; - this.partService = partService; - this.repairShopService = repairShopService; - } - - @GetMapping("/viewUsers") - public String getAllUsers(Model model){ - List pendingList = userService.findAllUsers().stream().filter(u->u.getAuthorities().contains(Role.ROLE_PENDING_DELIVERYMAN) || u.getAuthorities().contains(Role.ROLE_PENDING_WAREHOUSEMAN)).toList(); - if(pendingList.size()==0){ - model.addAttribute("hasError",true); - } - else { - model.addAttribute("hasError",false); - model.addAttribute("users", pendingList); - } - model.addAttribute("bodyContent", "viewUsers"); - return "master-template"; - } - @PostMapping("/approve/{id}") - public void approve(@PathVariable Integer id, HttpServletResponse response){ - if(Objects.equals(userService.findById(id).getAuthorities().stream().findFirst().get(),Role.ROLE_PENDING_WAREHOUSEMAN)){ - Warehouseman wh = (Warehouseman) userService.findById(id); - wh.setEmployed_from(LocalDate.now()); - warehousemanRepository.save(wh); - try { - response.sendRedirect("/viewUsers"); - } catch (IOException e) { - throw new RuntimeException(e); - } - - } - else { - Deliveryman dm = (Deliveryman) userService.findById(id); - dm.setEmployed_from(LocalDate.now()); - deliverymanRepository.save(dm); - try { - response.sendRedirect("/viewUsers"); - } catch (IOException e) { - throw new RuntimeException(e); - } - } - } - @GetMapping("/addPart") - public String addPart(Model model){ - model.addAttribute("categories",categoryRepository.findAll()); - model.addAttribute("warehouses",warehouseRepository.findAll()); - model.addAttribute("cars",carRepository.findAll()); - model.addAttribute("manufacturers",partManufacturerRepository.findAll()); - model.addAttribute("bodyContent","addPart"); - return "master-template"; - } - @PostMapping("/addPart") - public void addPart(@RequestParam String name, @RequestParam(required = false) String description, - @RequestParam Integer manufacturer, @RequestParam List cars, - @RequestParam List categories, @RequestParam Integer warehouse, - @RequestParam Integer quantity, @RequestParam Integer amount, HttpServletResponse response){ - partService.addPart(name,description,manufacturer,cars,categories,warehouse,quantity,amount); - try { - response.sendRedirect("/"); - } catch (IOException e) { - throw new RuntimeException(e); - } - } - @GetMapping("/addCarManufacturer") - public String getCarManView(Model model){ - model.addAttribute("bodyContent","addCarManufacturer"); - return "master-template"; - } - @PostMapping("/addCarManufacturer") - public void saveCarManufacturer(@RequestParam String name,@RequestParam String location, - HttpServletResponse response) { - carManufacturerRepository.save(new CarManufacturer(name,location)); - try { - response.sendRedirect("/"); - } catch (IOException e) { - throw new RuntimeException(e); - } - } - @GetMapping("/addPartManufacturer") - public String getPartManView(Model model){ - model.addAttribute("bodyContent","addPartManufacturer"); - return "master-template"; - } - @PostMapping("/addPartManufacturer") - public void savePartManufacturer(@RequestParam String name,@RequestParam String location, - HttpServletResponse response) { - partManufacturerRepository.save(new PartManufacturer(name,location)); - try { - response.sendRedirect("/"); - } catch (IOException e) { - throw new RuntimeException(e); - } - } - @GetMapping("/addCategory") - public String getCategoryView(Model model){ - model.addAttribute("bodyContent","addCategory"); - return "master-template"; - } - @PostMapping("/addCategory") - public void saveCategory(@RequestParam String name, - HttpServletResponse response) { - categoryRepository.save(new Category(name)); - try { - response.sendRedirect("/"); - } catch (IOException e) { - throw new RuntimeException(e); - } - } - @GetMapping("/addCar") - public String getCarView(Model model){ - model.addAttribute("bodyContent","addCar"); - model.addAttribute("manufacturers",carManufacturerRepository.findAll()); - return "master-template"; - } - @PostMapping("/addCar") - public void saveCar(@RequestParam Integer since,@RequestParam Integer till, - @RequestParam String name,@RequestParam Integer mId, - HttpServletResponse response) { - carRepository.save(new Car(since,till,name,carManufacturerRepository.findById(mId).get())); - try { - response.sendRedirect("/"); - } catch (IOException e) { - throw new RuntimeException(e); - } - } - @GetMapping("/addRepairShop") - public String getRepairShopView(Model model){ - model.addAttribute("bodyContent","addRepairShop"); - model.addAttribute("manufacturers",carManufacturerRepository.findAll()); - return "master-template"; - } - @PostMapping("/addRepairShop") - public void saveRepairShop(@RequestParam String name,@RequestParam String location, - @RequestParam String number,@RequestParam Integer carMId, - HttpServletResponse response) { - repairShopService.save(name,location,number,carMId); - try { - response.sendRedirect("/"); - } catch (IOException e) { - throw new RuntimeException(e); - } - } - @GetMapping("/addWarehouse") - public String getWarehouseView(Model model){ - model.addAttribute("bodyContent","addWarehouse"); - return "master-template"; - } - @PostMapping("/addWarehouse") - public void saveWarehouse(@RequestParam String name, - HttpServletResponse response) { - warehouseRepository.save(new Warehouse(name)); - try { - response.sendRedirect("/"); - } catch (IOException e) { - throw new RuntimeException(e); - } - } -} Index: c/main/java/com/example/autopartz/controller/HomeController.java =================================================================== --- src/main/java/com/example/autopartz/controller/HomeController.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,308 +1,0 @@ -package com.example.autopartz.controller; - -import com.example.autopartz.model.DTO.CurrentOrderDTO; -import com.example.autopartz.model.DTO.OrderInfo; -import com.example.autopartz.model.*; -import com.example.autopartz.model.manytomany.OrderContainsPart; -import com.example.autopartz.model.manytomany.PartIsInStockInWarehouse; -import com.example.autopartz.model.views.DeliveriesInProgress; -import com.example.autopartz.model.views.PartsForCarTypeAndCategory; -import com.example.autopartz.repository.*; -import com.example.autopartz.service.*; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; -import java.util.Objects; -import java.util.stream.Collectors; - -@Controller -@RequestMapping("/") -public class HomeController { - private final LoginService loginService; - private final PartService partService; - private final PartsForCarTypeAndCategoryRepository partsForCarTypeAndCategoryRepository; - private final CarService carService; - private final CategoryService categoryService; - private final RepairShopReviewSummaryRepository repairShopReviewSummaryRepository; - private final WarehouseRepository warehouseRepository; - private final OrderContainsPartRepository orderContainsPartRepository; - private final OrderService orderService; - private final UserService userService; - private final DeliveriesInProgressRepository deliveriesInProgressRepository; - private final DeliveryService deliveryService; - private final PartIsInStockInWarehouseRepository partIsInStockInWarehouseRepository; - private final CarCategoryReportRepository carCategoryReportRepository; - private final PartManufacturersReportRepository partManufacturersReportRepository; - private final MostPurchasedPartRepository mostPurchasedPartRepository; - private final PriceService priceService; - private final WarehousemanReportRepository warehousemanReportRepository; - private final PartRepository partRepository; - public HomeController(LoginService loginService, PartService partService, PartsForCarTypeAndCategoryRepository partsForCarTypeAndCategoryRepository, CarService carService, CategoryService categoryService, RepairShopReviewSummaryRepository repairShopReviewSummaryRepository, WarehouseRepository warehouseRepository, - OrderContainsPartRepository orderContainsPartRepository, OrderService orderService, UserService userService, DeliveriesInProgressRepository deliveriesInProgressRepository, DeliveryService deliveryService, PartIsInStockInWarehouseRepository partIsInStockInWarehouseRepository, CarCategoryReportRepository carCategoryReportRepository, PartManufacturersReportRepository partManufacturersReportRepository, MostPurchasedPartRepository mostPurchasedPartRepository, PriceService priceService, WarehousemanReportRepository warehousemanReportRepository, PartRepository partRepository) { - this.loginService = loginService; - this.partService = partService; - this.partsForCarTypeAndCategoryRepository = partsForCarTypeAndCategoryRepository; - this.carService = carService; - this.categoryService = categoryService; - this.repairShopReviewSummaryRepository = repairShopReviewSummaryRepository; - this.warehouseRepository = warehouseRepository; - this.orderContainsPartRepository = orderContainsPartRepository; - this.orderService = orderService; - this.userService = userService; - this.deliveriesInProgressRepository = deliveriesInProgressRepository; - this.deliveryService = deliveryService; - this.partIsInStockInWarehouseRepository = partIsInStockInWarehouseRepository; - this.carCategoryReportRepository = carCategoryReportRepository; - this.partManufacturersReportRepository = partManufacturersReportRepository; - this.mostPurchasedPartRepository = mostPurchasedPartRepository; - this.priceService = priceService; - this.warehousemanReportRepository = warehousemanReportRepository; - this.partRepository = partRepository; - } - - @GetMapping() - public String getHomePage(Model model, HttpServletRequest request){ - model.addAttribute("bodyContent","home"); - model.addAttribute("user",request.getRemoteUser()); - return "master-template"; - } - @GetMapping("/products") - public String getProducts(Model model){ - model.addAttribute("parts",partService.findAll()); - model.addAttribute("cars",carService.findAll()); - model.addAttribute("categories",categoryService.findAll()); - model.addAttribute("bodyContent","products"); - return "master-template"; - } - @GetMapping("/services") - public String getServices(Model model){ - model.addAttribute("services",repairShopReviewSummaryRepository.findAll()); - model.addAttribute("bodyContent","services"); - return "master-template"; - } - @GetMapping("/currentOrder") - public String getCurrentOrder(Model model,HttpSession session){ - if(session.getAttribute("order")==null){ - model.addAttribute("hasError",true); - model.addAttribute("error","Нарачката е празна"); - } - else { - Order o = (Order) session.getAttribute("order"); - model.addAttribute("hasError",false); - model.addAttribute("order",o); - List list = new ArrayList<>(); - int total = 0; - List qList = orderContainsPartRepository.findAllByOrderid(o.getOrderid()); - for (OrderContainsPart orderContainsPart : qList) { - int pr = orderContainsPart.getQuantity_order() * - priceService.findPriceForPart(partService.findById(orderContainsPart.getPartid())).stream().findFirst().get().getAmount(); - CurrentOrderDTO temp = new CurrentOrderDTO( - partService.findById(orderContainsPart.getPartid()).getName(), - partService.findById(orderContainsPart.getPartid()).getManufacturer().getName(), - orderContainsPart.getQuantity_order(), - pr); - list.add(temp); - total += pr; - } - model.addAttribute("total",total); - model.addAttribute("parts",list); - } - model.addAttribute("bodyContent","currentOrder"); - return "master-template"; - } - @GetMapping("/filtered") - public String getPartsForCarTypeAndCategory(@RequestParam String cartype, @RequestParam String category, Model model){ - List tmp = partsForCarTypeAndCategoryRepository.findAllByCartypeAndCategory(cartype,category); - if(tmp.size()==0){ - model.addAttribute("hasError",true); - model.addAttribute("error","Не постојат такви производи, обидете се повторно"); - } - else { - model.addAttribute("hasError",false); - model.addAttribute("filtered", tmp); - } - model.addAttribute("selectedCar","Previously selected : "+cartype); - model.addAttribute("selectedCategory","Previously selected : " + category); - model.addAttribute("cars",carService.findAll()); - model.addAttribute("categories",categoryService.findAll()); - model.addAttribute("bodyContent","filteredParts"); - return "master-template"; - } - @GetMapping("/login") - public String getLoginPage(Model model){ - model.addAttribute("bodyContent","login"); - return "master-template"; - } - @GetMapping("/register") - public String getRegisterPage(Model model){ - model.addAttribute("bodyContent","register"); - return "master-template"; - } - @PostMapping("/login") - public void handleLogin(@RequestParam String username, @RequestParam String password){ - User u = loginService.login(username,password); - System.out.println(u.getName()); - } - @PostMapping("/register") - public void handleRegister(@RequestParam String username, @RequestParam String name, - @RequestParam String password, @RequestParam String rpassword, - @RequestParam String email, @RequestParam String number, - @RequestParam String role, HttpServletResponse response, HttpSession session){ - System.out.println(username + name + password + rpassword + email + number + role); - if(Objects.equals(role, "warehouseman")){ - session.setAttribute("username", username); - session.setAttribute("name", name); - session.setAttribute("password", password); - session.setAttribute("rpassword", rpassword); - session.setAttribute("email", email); - session.setAttribute("number", number); - try { - response.sendRedirect("/registerWarehouseman"); - } catch (IOException e) { - throw new RuntimeException(e); - } - } - else { - loginService.register(name, username, email, number, password, role); - try { - response.sendRedirect("/login"); - } catch (IOException e) { - throw new RuntimeException(e); - } - } - } - @GetMapping("/registerWarehouseman") - public String getSelectPage(Model model){ - model.addAttribute("locations",warehouseRepository.findAll()); - model.addAttribute("bodyContent","selectWarehouse"); - return "master-template"; - } - @PostMapping("/finishRegister") - public void handleWarehousemanRegister(@RequestParam String location, HttpServletResponse response, HttpSession session){ - System.out.println("here?"); - String username = (String) session.getAttribute("username"); - String name = (String) session.getAttribute("name"); - String password = (String) session.getAttribute("password"); - String email = (String) session.getAttribute("email"); - String number = (String) session.getAttribute("number"); - Warehouse warehouse = warehouseRepository.findAllByLocation(location).stream().findFirst().orElseThrow(RuntimeException::new); - loginService.registerWarehouseman(name,username,email,number,password,"warehouseman",warehouse); - try { - response.sendRedirect("/login"); - } catch (IOException e) { - throw new RuntimeException(e); - } - } - @GetMapping("/access_denied") - public String accessDenied(Model model){ - model.addAttribute("bodyContent","access_denied"); - return "master-template"; - } - @GetMapping("/myWarehouse") - public String myWarehouse(Model model, HttpServletRequest request){ - Warehouseman whm = (Warehouseman) userService.findByUsername(request.getRemoteUser()); - Warehouse warehouse = whm.getWarehouse(); - List partIsInStockInWarehouseList = partIsInStockInWarehouseRepository.findAllByWarehouseid(warehouse.getId()); - model.addAttribute("bodyContent","myWarehouse"); - model.addAttribute("warehouse",warehouse); - model.addAttribute("parts", partIsInStockInWarehouseList); - return "master-template"; - } - @GetMapping("myDeliveries") - public String myDeliveries(Model model, HttpServletRequest request){ - Deliveryman dm = (Deliveryman) userService.findByUsername(request.getRemoteUser()); - List deliveries = deliveryService.findAllByDeliverer(dm); - deliveries = deliveries.stream().sorted((p1,p2)->p2.getOrder().getDate().compareTo(p1.getOrder().getDate())).collect(Collectors.toList()); - model.addAttribute("bodyContent","myDeliveries"); - model.addAttribute("deliveries",deliveries); - return "master-template"; - } - @GetMapping("myNextDeliveries") - public String myNextDeliveries(Model model, HttpServletRequest request){ - Deliveryman dm = (Deliveryman) userService.findByUsername(request.getRemoteUser()); - List ldip = deliveriesInProgressRepository.findAllByUserid(dm.getId()); - if(ldip.size()==0){ - model.addAttribute("hasError",true); - model.addAttribute("error","Сите достави се завршени"); - } - else { - model.addAttribute("hasError",false); - model.addAttribute("deliveries", deliveriesInProgressRepository.findAllByUserid(dm.getId())); - } - model.addAttribute("bodyContent","myNextDeliveries"); - return "master-template"; - } - @PostMapping("/finishDelivery/{id}") - public void finishDelivery(@PathVariable Integer id, HttpServletResponse response){ - Delivery d = deliveryService.findByOrder(orderService.findById(id)); - d.setStatus("finished"); - deliveryService.update(d); - try { - response.sendRedirect("/myDeliveries"); - } catch (IOException e) { - throw new RuntimeException(e); - } - } - @GetMapping("/order/{id}") - public String getOrderInfo(@PathVariable Integer id, Model model){ - List list = orderContainsPartRepository.findAllByOrderid(id); - List partList = new ArrayList<>(); - for (OrderContainsPart orderContainsPart : list) { - OrderInfo oi = new OrderInfo(partService.findById(orderContainsPart.getPartid()).getName(), - orderContainsPart.getQuantity_order(), partService.findById(orderContainsPart.getPartid()).getManufacturer().getName()); - partList.add(oi); - } - model.addAttribute("parts",partList); - model.addAttribute("o",orderService.findById(id)); - model.addAttribute("bodyContent","orderInfo"); - return "master-template"; - } - @GetMapping("/carCategoryReport") - public String getCarCategoryInfo(Model model){ - model.addAttribute("data",carCategoryReportRepository.findAll()); - model.addAttribute("bodyContent","carCategoryReport"); - return "master-template"; - } - @GetMapping("/partManufacturersReport") - public String getPartManufacturersReport(Model model){ - model.addAttribute("data",partManufacturersReportRepository.findAll()); - model.addAttribute("bodyContent","partManufacturersReport"); - return "master-template"; - - } - @GetMapping("/mostPurchasedPart") - public String getMostPurchasedPart(Model model){ - model.addAttribute("data",mostPurchasedPartRepository.findAll()); - model.addAttribute("bodyContent","mostPurchasedPart"); - return "master-template"; - } - @GetMapping("/myWarehouseReport") - public String getMyWarehouseReport(Model model, HttpServletRequest request){ - Warehouseman whm = (Warehouseman) userService.findByUsername(request.getRemoteUser()); - Warehouse wh = whm.getWarehouse(); - Integer whId = wh.getId(); - model.addAttribute("data", warehousemanReportRepository.findByWid(whId)); - model.addAttribute("bodyContent","myWarehouseReport"); - return "master-template"; - } - @PostMapping("/myWarehouse/{pname}") - public void addPartToWarehouse(@PathVariable String pname,@RequestParam Integer quantity, HttpServletRequest request, HttpServletResponse response){ - Integer pId = partRepository.findAllByName(pname).stream().findFirst().get().getId(); - Warehouseman whm = (Warehouseman) userService.findByUsername(request.getRemoteUser()); - Warehouse wh = whm.getWarehouse(); - Integer whId = wh.getId(); - partService.addPartToWarehouse(pId,quantity,whId); - try { - response.sendRedirect("/myWarehouseReport"); - } catch (IOException e) { - throw new RuntimeException(e); - } - } -} Index: c/main/java/com/example/autopartz/controller/PartController.java =================================================================== --- src/main/java/com/example/autopartz/controller/PartController.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,148 +1,0 @@ -package com.example.autopartz.controller; - -import com.example.autopartz.model.*; -import com.example.autopartz.model.manytomany.OrderContainsPart; -import com.example.autopartz.model.manytomany.RsForCm; -import com.example.autopartz.repository.*; -import com.example.autopartz.service.*; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; - -@Controller -@RequestMapping("/part") -public class PartController { - private final PartService partService; - private final RepairShopService repairShopService; - private final PriceService priceService; - private final OrderService orderService; - private final UserService userService; - private final OrderContainsPartRepository orderContainsPartRepository; - private final DeliveryRepository deliveryRepository; - private final RepairRepository repairRepository; - private final CarSampleRepository carSampleRepository; - private final ServiceBookRepository serviceBookRepository; - private final DeliverymanRepository deliverymanRepository; - private final RsForCmRepository rsForCmRepository; - public PartController(PartService partService, RepairShopService repairShopService, PriceService priceService, OrderService orderService, UserService userService, OrderContainsPartRepository orderContainsPartRepository, DeliveryRepository deliveryRepository, RepairRepository repairRepository, CarSampleRepository carSampleRepository, ServiceBookRepository serviceBookRepository, DeliverymanRepository deliverymanRepository, RsForCmRepository rsForCmRepository) { - this.partService = partService; - this.repairShopService = repairShopService; - this.priceService = priceService; - this.orderService = orderService; - this.userService = userService; - this.orderContainsPartRepository = orderContainsPartRepository; - this.deliveryRepository = deliveryRepository; - this.repairRepository = repairRepository; - this.carSampleRepository = carSampleRepository; - this.serviceBookRepository = serviceBookRepository; - this.deliverymanRepository = deliverymanRepository; - this.rsForCmRepository = rsForCmRepository; - } - @GetMapping("/{id}") - public String getPartPage(@PathVariable Integer id, Model model){ - Part temp = partService.findById(id); - Integer amount = priceService.findPriceForPart(temp).stream().findFirst().orElseThrow(RuntimeException::new).getAmount(); - model.addAttribute("part",temp); - model.addAttribute("amount",amount); - model.addAttribute("bodyContent","partinfo"); - return "master-template"; - } - @GetMapping("/delivery") - public String getDeliveryPage(Model model, HttpServletRequest request){ - Client cl = (Client) userService.findByUsername(request.getRemoteUser()); - List cs = carSampleRepository.findAllByClient(cl); - model.addAttribute("cars",cs); - if(cs.size()==0){ - model.addAttribute("hasError",true); - model.addAttribute("error","Внеси твоја кола"); - } - else { - model.addAttribute("hasError",false); - } - model.addAttribute("bodyContent","deliveryForPart"); - return "master-template"; - } - @PostMapping("/repairshopdelivery") - public void setRepairShopDelivery(@RequestParam Integer vin, HttpServletResponse response, HttpSession session){ - // insert into project.repair (vin, id_repair_shop, id_service_book) values (1111,3,1) - session.setAttribute("carVin",vin); - try { - response.sendRedirect("/part/chooseRepairShop"); - } catch (IOException e) { - throw new RuntimeException(e); - } - } - @GetMapping("/chooseRepairShop") - public String chooseRepairShop(Model model, HttpSession session){ - if(session.getAttribute("carVin")==null){ - model.addAttribute("hasError",true); - model.addAttribute("error","Внеси твоја кола"); - } - else { - model.addAttribute("hasError", false); - CarSample cs = carSampleRepository.findById((Integer) session.getAttribute("carVin")).get(); - Integer idCM = cs.getCar().getCar_manufacturer().getId(); - List rsForCm = rsForCmRepository.findAllByCmid(idCM); - List newRepairShopList = new ArrayList<>(); - for (RsForCm forCm : rsForCm) { - newRepairShopList.add(repairShopService.getById(forCm.getRsid())); - } - model.addAttribute("authorized", newRepairShopList); - } - model.addAttribute("bodyContent", "chooseRepairShop"); - return "master-template"; - } - @PostMapping("/chooseRepairShop") - public void chooseRepairShop(@RequestParam Integer rs,HttpSession session, HttpServletResponse response){ - Order o = (Order) session.getAttribute("order"); - CarSample cs = carSampleRepository.findById((Integer)session.getAttribute("carVin")).get(); - ServiceBook sb = serviceBookRepository.findByCarSample(cs); - RepairShop repairShop = repairShopService.getById(rs); - repairRepository.save(new Repair(o,repairShop,sb)); - session.removeAttribute("order"); - try { - response.sendRedirect("/"); - } catch (IOException e) { - throw new RuntimeException(e); - } - } - @PostMapping("/homedelivery") - public void setHomeDelivery(@RequestParam String address, HttpServletResponse response, HttpSession session){ - // insert into delivery (delivery_status, delivery_address,id_user,id_order) values ('in progress','Aerodrom',4,1) - Order o = (Order) session.getAttribute("order"); - List deliverymanList = deliverymanRepository.findAll().stream().filter(dm->dm.getAuthorities().contains(Role.ROLE_DELIVERYMAN)).toList(); - int num = deliverymanList.size(); - int deliverer = (int) ((Math.random() * (num))); - Deliveryman dm = deliverymanList.get(deliverer); - deliveryRepository.save(new Delivery("in progress",address,dm,o)); - session.removeAttribute("order"); - try { - response.sendRedirect("/"); - } catch (IOException e) { - throw new RuntimeException(e); - } - } - @PostMapping("/addToOrder/{id}") - public void addToOrder(@PathVariable Integer id,@RequestParam Integer quantity, HttpSession session, HttpServletResponse response, HttpServletRequest request){ - if(session.getAttribute("order")==null){ - User u = userService.findByUsername(request.getRemoteUser()); - Order newOrder = orderService.createOrderAndAddPartToOrder((Client) u, id, quantity); - session.setAttribute("order",newOrder); - } else { - Order order = (Order) session.getAttribute("order"); - orderContainsPartRepository.save(new OrderContainsPart(id, order.getOrderid(), quantity)); - } - try { - response.sendRedirect("/products"); - } catch (IOException e) { - throw new RuntimeException(e); - } - } -} Index: c/main/java/com/example/autopartz/controller/UserController.java =================================================================== --- src/main/java/com/example/autopartz/controller/UserController.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,113 +1,0 @@ -package com.example.autopartz.controller; - -import com.example.autopartz.model.*; -import com.example.autopartz.model.views.RepairsForUser; -import com.example.autopartz.repository.*; -import com.example.autopartz.service.CarService; -import com.example.autopartz.service.RepairService; -import com.example.autopartz.service.UserService; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; - -@Controller -@RequestMapping("/") -public class UserController { - private final OrdersForUserRepository ordersForUserRepository; - private final RepairsForUserRepository repairsForUserRepository; - private final ReviewsForUserRepository reviewsForUserRepository; - private final UserService userService; - private final CarService carService; - private final RepairService repairService; - private final ReviewRepository reviewRepository; - private final OrderRepository orderRepository; - - public UserController(OrdersForUserRepository ordersForUserRepository, RepairsForUserRepository repairsForUserRepository, ReviewsForUserRepository reviewsForUserRepository, UserService userService, CarService carService, RepairService repairService, ReviewRepository reviewRepository, - OrderRepository orderRepository) { - this.ordersForUserRepository = ordersForUserRepository; - this.repairsForUserRepository = repairsForUserRepository; - this.reviewsForUserRepository = reviewsForUserRepository; - this.userService = userService; - this.carService = carService; - this.repairService = repairService; - this.reviewRepository = reviewRepository; - this.orderRepository = orderRepository; - } - @GetMapping("orders") - public String getOrdersForUser(Model model, HttpServletRequest request){ - Integer id = userService.findByUsername(request.getRemoteUser()).getId(); - model.addAttribute("userOrders",ordersForUserRepository.findAllByUserid(id)); - model.addAttribute("bodyContent","ordersForUser"); - return "master-template"; - } - @GetMapping("repairs") - public String getRepairsForUser(Model model, HttpServletRequest request){ - Integer id = userService.findByUsername(request.getRemoteUser()).getId(); - model.addAttribute("userRepairs",repairsForUserRepository.findAllByUserid(id)); - List hasReview = new ArrayList<>(100); - for (int i = 0; i < orderRepository.findAll().size(); i++) { - hasReview.add(false); - } - for(RepairsForUser rfu: repairsForUserRepository.findAll()){ - if(reviewRepository.findByRepair(repairService.findById(rfu.getRepairid()))==null){ - hasReview.set(rfu.getRepairid(),false); - } - else { - hasReview.set(rfu.getRepairid(),true); - } - } - model.addAttribute("hasReview", hasReview); - model.addAttribute("bodyContent","repairsForUser"); - return "master-template"; - } - @GetMapping("reviews") - public String getReviewsForUser(Model model,HttpServletRequest request){ - Integer id = userService.findByUsername(request.getRemoteUser()).getId(); - model.addAttribute("userReviews",reviewsForUserRepository.findAllByUserid(id)); - model.addAttribute("bodyContent","reviewsForUser"); - return "master-template"; - } - @GetMapping("/addCarSampleForUser") - public String addCarSampleForUser(Model model){ - model.addAttribute("bodyContent","addCarSampleForUser"); - model.addAttribute("cars",carService.findAll()); - return "master-template"; - } - @PostMapping("/addCarSampleForUser") - public void addCarSampleForUser(@RequestParam Integer vin, @RequestParam Integer year, @RequestParam Integer power, - @RequestParam Integer displacement, @RequestParam String fuel, - @RequestParam Integer km, @RequestParam Integer cartype, - HttpServletRequest request, HttpServletResponse response){ - userService.addCarSampleForUser(vin,year,power,displacement,fuel,km,cartype,request.getRemoteUser()); - try { - response.sendRedirect("/"); - } catch (IOException e) { - throw new RuntimeException(e); - } - } - @GetMapping("/repairs/addReview/{id}") - public String addReviewFor(@PathVariable Integer id, Model model){ - model.addAttribute("bodyContent","addReviewPage"); - model.addAttribute("repair", repairService.findById(id)); - return "master-template"; - } - @PostMapping("/repairs/addReview/{id}") - public void addReview(@PathVariable Integer id, @RequestParam Integer rating, @RequestParam(required = false) String comment, - HttpServletResponse response, HttpServletRequest request){ - Client client = (Client) userService.findByUsername(request.getRemoteUser()); - Repair repair = repairService.findById(id); - reviewRepository.save(new Review(rating, - comment==null ? "" : comment, repair,client)); - try { - response.sendRedirect("/repairs"); - } catch (IOException e) { - throw new RuntimeException(e); - } - } -} Index: c/main/java/com/example/autopartz/model/Administrator.java =================================================================== --- src/main/java/com/example/autopartz/model/Administrator.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,41 +1,0 @@ -package com.example.autopartz.model; - -import lombok.Getter; -import lombok.Setter; -import lombok.ToString; -import org.hibernate.Hibernate; -import org.springframework.security.core.GrantedAuthority; - -import javax.persistence.Entity; -import java.time.LocalDate; -import java.util.Collection; -import java.util.Collections; -import java.util.Objects; - -@Getter -@Setter -@ToString -@Entity -public class Administrator extends User{ - LocalDate authorized_from; - LocalDate authorized_till; - - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) return false; - Administrator that = (Administrator) o; - return id != null && Objects.equals(id, that.id); - } - - @Override - public int hashCode() { - return getClass().hashCode(); - } - - @Override - public Collection getAuthorities() { - return Collections.singletonList(Role.ROLE_ADMIN); - } -} Index: c/main/java/com/example/autopartz/model/Car.java =================================================================== --- src/main/java/com/example/autopartz/model/Car.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,50 +1,0 @@ -package com.example.autopartz.model; - -import lombok.Getter; -import lombok.RequiredArgsConstructor; -import lombok.Setter; -import lombok.ToString; -import org.hibernate.Hibernate; - -import javax.persistence.*; -import java.util.Objects; - -@Getter -@Setter -@ToString -@RequiredArgsConstructor -@Entity -@Table(name = "car") -public class Car { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "ID_car") - Integer id; - Integer in_production_since; - Integer in_production_till; - @Column(name = "car_type") - String cartype; - @ManyToOne - @JoinColumn(name = "id_car_manufacturer") - CarManufacturer car_manufacturer; - - public Car(Integer in_production_since, Integer in_production_till, String cartype, CarManufacturer car_manufacturer) { - this.in_production_since = in_production_since; - this.in_production_till = in_production_till; - this.cartype = cartype; - this.car_manufacturer = car_manufacturer; - } - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) return false; - Car car = (Car) o; - return id != null && Objects.equals(id, car.id); - } - - @Override - public int hashCode() { - return getClass().hashCode(); - } -} Index: c/main/java/com/example/autopartz/model/CarManufacturer.java =================================================================== --- src/main/java/com/example/autopartz/model/CarManufacturer.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,44 +1,0 @@ -package com.example.autopartz.model; - -import lombok.Getter; -import lombok.RequiredArgsConstructor; -import lombok.Setter; -import lombok.ToString; -import org.hibernate.Hibernate; - -import javax.persistence.*; -import java.util.Objects; - -@Getter -@Setter -@ToString -@RequiredArgsConstructor -@Entity -@Table(name = "car_manufacturer", schema = "project") -public class CarManufacturer { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "id_car_manufacturer") - Integer id; - @Column(name = "cm_name") - String cmname; - String cm_country; - - public CarManufacturer(String cmname, String cm_country) { - this.cmname = cmname; - this.cm_country = cm_country; - } - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) return false; - CarManufacturer that = (CarManufacturer) o; - return id != null && Objects.equals(id, that.id); - } - - @Override - public int hashCode() { - return getClass().hashCode(); - } -} Index: c/main/java/com/example/autopartz/model/CarSample.java =================================================================== --- src/main/java/com/example/autopartz/model/CarSample.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,57 +1,0 @@ -package com.example.autopartz.model; - -import lombok.Getter; -import lombok.RequiredArgsConstructor; -import lombok.Setter; -import lombok.ToString; -import org.hibernate.Hibernate; - -import javax.persistence.*; -import java.util.Objects; - -@Getter -@Setter -@ToString -@RequiredArgsConstructor -@Entity -@Table(name = "car_sample") -public class CarSample { - @Id - Integer vin; - Integer year_of_production; - Integer engine_power; - Integer displacement; - String fuel_type; - Integer km_driven; - @ManyToOne - @JoinColumn(name = "id_user") - Client client; - @ManyToOne - @JoinColumn(name = "id_car") - Car car; - - - public CarSample(Integer vin,Integer year_of_production, Integer engine_power, Integer displacement, String fuel_type, Integer km_driven, Client client, Car car) { - this.vin = vin; - this.year_of_production = year_of_production; - this.engine_power = engine_power; - this.displacement = displacement; - this.fuel_type = fuel_type; - this.km_driven = km_driven; - this.client = client; - this.car = car; - } - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) return false; - CarSample carSample = (CarSample) o; - return vin != null && Objects.equals(vin, carSample.vin); - } - - @Override - public int hashCode() { - return getClass().hashCode(); - } -} Index: c/main/java/com/example/autopartz/model/Category.java =================================================================== --- src/main/java/com/example/autopartz/model/Category.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,44 +1,0 @@ -package com.example.autopartz.model; - -import lombok.Getter; -import lombok.RequiredArgsConstructor; -import lombok.Setter; -import lombok.ToString; -import org.hibernate.Hibernate; - -import javax.persistence.*; -import java.util.Objects; - -@Getter -@Setter -@ToString -@RequiredArgsConstructor -@Entity -public class Category { - @Id - @Column(name = "id_category") - @GeneratedValue(strategy = GenerationType.IDENTITY) - Integer id; - @Column(name = "category_name") - String cname; - @ManyToOne - @JoinColumn(name = "id_parent_category") - Category ID_parent_category; - - public Category(String category) { - this.cname = category; - } - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) return false; - Category category = (Category) o; - return id != null && Objects.equals(id, category.id); - } - - @Override - public int hashCode() { - return getClass().hashCode(); - } -} Index: c/main/java/com/example/autopartz/model/Client.java =================================================================== --- src/main/java/com/example/autopartz/model/Client.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,41 +1,0 @@ -package com.example.autopartz.model; - -import lombok.Getter; -import lombok.RequiredArgsConstructor; -import lombok.Setter; -import lombok.ToString; -import org.hibernate.Hibernate; -import org.springframework.security.core.GrantedAuthority; - -import javax.persistence.Entity; -import java.util.Collection; -import java.util.Collections; -import java.util.Objects; - -@Getter -@Setter -@ToString -@RequiredArgsConstructor -@Entity -public class Client extends User{ - public Client(String username, String name, String email, String password, String number) { - super(username, name, email, password, number); - } - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) return false; - Client client = (Client) o; - return id != null && Objects.equals(id, client.id); - } - - @Override - public int hashCode() { - return getClass().hashCode(); - } - @Override - public Collection getAuthorities() { - return Collections.singletonList(Role.ROLE_CLIENT); - } -} Index: c/main/java/com/example/autopartz/model/DTO/CurrentOrderDTO.java =================================================================== --- src/main/java/com/example/autopartz/model/DTO/CurrentOrderDTO.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,21 +1,0 @@ -package com.example.autopartz.model.DTO; - -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.RequiredArgsConstructor; - -@Data -@NoArgsConstructor -public class CurrentOrderDTO { - String partName; - String manufacturerName; - Integer quantity; - Integer price; - - public CurrentOrderDTO(String partName, String manufacturerName, Integer quantity, Integer price) { - this.partName = partName; - this.manufacturerName = manufacturerName; - this.quantity = quantity; - this.price = price; - } -} Index: c/main/java/com/example/autopartz/model/DTO/OrderInfo.java =================================================================== --- src/main/java/com/example/autopartz/model/DTO/OrderInfo.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,16 +1,0 @@ -package com.example.autopartz.model.DTO; - - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@NoArgsConstructor -@AllArgsConstructor -public class OrderInfo { - String partname; - Integer quantity; - String manufacturername; -} - Index: c/main/java/com/example/autopartz/model/Delivery.java =================================================================== --- src/main/java/com/example/autopartz/model/Delivery.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,51 +1,0 @@ -package com.example.autopartz.model; - -import lombok.Getter; -import lombok.RequiredArgsConstructor; -import lombok.Setter; -import lombok.ToString; -import org.hibernate.Hibernate; - -import javax.persistence.*; -import java.util.Objects; - -@Entity -@Getter -@Setter -@ToString -@RequiredArgsConstructor -public class Delivery { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - Integer ID_delivery; - @Column(name = "delivery_status") - String status; - @Column(name = "delivery_address") - String address; - @ManyToOne - @JoinColumn(name = "id_user") - Deliveryman deliveryman; - @JoinColumn(name = "id_order") - @OneToOne - Order order; - - public Delivery(String status, String address, Deliveryman deliveryman, Order order) { - this.status = status; - this.address = address; - this.deliveryman = deliveryman; - this.order = order; - } - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) return false; - Delivery delivery = (Delivery) o; - return ID_delivery != null && Objects.equals(ID_delivery, delivery.ID_delivery); - } - - @Override - public int hashCode() { - return getClass().hashCode(); - } -} Index: c/main/java/com/example/autopartz/model/Deliveryman.java =================================================================== --- src/main/java/com/example/autopartz/model/Deliveryman.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,51 +1,0 @@ -package com.example.autopartz.model; - -import lombok.Getter; -import lombok.RequiredArgsConstructor; -import lombok.Setter; -import lombok.ToString; -import org.hibernate.Hibernate; -import org.springframework.security.core.GrantedAuthority; - -import javax.persistence.Entity; -import javax.persistence.Table; -import java.time.LocalDate; -import java.util.Collection; -import java.util.Collections; -import java.util.Objects; - -@Getter -@Setter -@ToString -@RequiredArgsConstructor -@Entity -@Table(name = "delivery_man") -public class Deliveryman extends User{ - LocalDate employed_from; - public static final LocalDate defaultEmployedFrom = LocalDate.of(2020,1,1); - - public Deliveryman(String username, String name, String email, String password, String number) { - super(username, name, email, password, number); - this.employed_from = defaultEmployedFrom; - } - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) return false; - Deliveryman that = (Deliveryman) o; - return id != null && Objects.equals(id, that.id); - } - - @Override - public int hashCode() { - return getClass().hashCode(); - } - @Override - public Collection getAuthorities() { - if(Objects.equals(employed_from, defaultEmployedFrom)) - return Collections.singletonList(Role.ROLE_PENDING_DELIVERYMAN); - else - return Collections.singletonList(Role.ROLE_DELIVERYMAN); - } -} Index: c/main/java/com/example/autopartz/model/Order.java =================================================================== --- src/main/java/com/example/autopartz/model/Order.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,56 +1,0 @@ -package com.example.autopartz.model; - -import lombok.Getter; -import lombok.RequiredArgsConstructor; -import lombok.Setter; -import lombok.ToString; -import org.hibernate.Hibernate; - -import javax.persistence.*; -import java.time.LocalDateTime; -import java.util.List; -import java.util.Objects; - -@Entity -@Getter -@Setter -@ToString -@RequiredArgsConstructor -@Table(name = "order_table") -public class Order { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "ID_order") - Integer orderid; - String order_status; - @Column(name = "order_date") - LocalDateTime date; - @JoinColumn(name = "id_user") - @ManyToOne - Client user; - @ManyToMany - @JoinTable(name = "order_contains_part", joinColumns = - @JoinColumn(name = "id_order"), - inverseJoinColumns = @JoinColumn(name = "id_part")) - @ToString.Exclude - List partList; - - public Order(Client user) { - this.order_status = "created"; - this.user = user; - this.date = LocalDateTime.now(); - } - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) return false; - Order order = (Order) o; - return orderid != null && Objects.equals(orderid, order.orderid); - } - - @Override - public int hashCode() { - return getClass().hashCode(); - } -} Index: c/main/java/com/example/autopartz/model/Part.java =================================================================== --- src/main/java/com/example/autopartz/model/Part.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,70 +1,0 @@ -package com.example.autopartz.model; - -import lombok.Getter; -import lombok.RequiredArgsConstructor; -import lombok.Setter; -import lombok.ToString; -import org.hibernate.Hibernate; - -import javax.persistence.*; -import java.util.List; -import java.util.Objects; - -@Getter -@Setter -@ToString -@RequiredArgsConstructor -@Entity -public class Part { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "ID_part") - Integer id; - @Column(name = "part_name") - String name; - @Column(name = "part_description") - String description; - @ManyToOne - @JoinColumn(name = "id_part_manufacturer") - PartManufacturer manufacturer; - @ManyToMany - @JoinTable(name = "part_is_from_category", joinColumns = - @JoinColumn(name = "id_part"), - inverseJoinColumns = @JoinColumn(name = "id_category")) - @ToString.Exclude - List categoryList; - @ManyToMany - @JoinTable(name = "part_is_in_stock_in_warehouse", joinColumns = - @JoinColumn(name = "id_part"), - inverseJoinColumns = @JoinColumn(name = "id_warehouse")) - @ToString.Exclude - List warehouseList; - @ManyToMany - @JoinTable(name = "part_is_appropriate_for_car", joinColumns = - @JoinColumn(name = "id_part"), - inverseJoinColumns = @JoinColumn(name = "id_car")) - @ToString.Exclude - List carList; - - public Part(String name, String description, PartManufacturer manufacturer, List categoryList, List warehouseList, List carList) { - this.name = name; - this.description = description; - this.manufacturer = manufacturer; - this.categoryList = categoryList; - this.warehouseList = warehouseList; - this.carList = carList; - } - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) return false; - Part part = (Part) o; - return id != null && Objects.equals(id, part.id); - } - - @Override - public int hashCode() { - return getClass().hashCode(); - } -} Index: c/main/java/com/example/autopartz/model/PartManufacturer.java =================================================================== --- src/main/java/com/example/autopartz/model/PartManufacturer.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,44 +1,0 @@ -package com.example.autopartz.model; - -import lombok.Getter; -import lombok.RequiredArgsConstructor; -import lombok.Setter; -import lombok.ToString; -import org.hibernate.Hibernate; - -import javax.persistence.*; -import java.util.Objects; - -@Getter -@Setter -@ToString -@RequiredArgsConstructor -@Entity -@Table(name = "part_manufacturer") -public class PartManufacturer { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "id_part_manufacturer") - Integer id; - @Column(name = "pm_name") - String name; - String pm_location; - - public PartManufacturer(String name, String location) { - this.name = name; - this.pm_location = location; - } - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) return false; - PartManufacturer that = (PartManufacturer) o; - return id != null && Objects.equals(id, that.id); - } - - @Override - public int hashCode() { - return getClass().hashCode(); - } -} Index: c/main/java/com/example/autopartz/model/Price.java =================================================================== --- src/main/java/com/example/autopartz/model/Price.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,47 +1,0 @@ -package com.example.autopartz.model; - -import lombok.Getter; -import lombok.RequiredArgsConstructor; -import lombok.Setter; -import lombok.ToString; -import org.hibernate.Hibernate; - -import javax.persistence.*; -import java.time.LocalDate; -import java.util.Objects; - -@Entity -@Getter -@Setter -@ToString -@RequiredArgsConstructor -public class Price { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - Integer ID_price; - Integer amount; - LocalDate price_from; - LocalDate price_till; - @ManyToOne - @JoinColumn(name = "id_part") - Part part; - - public Price(Integer amount, LocalDate price_from, Part part) { - this.amount = amount; - this.price_from = price_from; - this.part = part; - } - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) return false; - Price price = (Price) o; - return ID_price != null && Objects.equals(ID_price, price.ID_price); - } - - @Override - public int hashCode() { - return getClass().hashCode(); - } -} Index: c/main/java/com/example/autopartz/model/Repair.java =================================================================== --- src/main/java/com/example/autopartz/model/Repair.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,49 +1,0 @@ -package com.example.autopartz.model; - -import lombok.Getter; -import lombok.RequiredArgsConstructor; -import lombok.Setter; -import lombok.ToString; -import org.hibernate.Hibernate; - -import javax.persistence.*; -import java.util.Objects; - -@Getter -@Setter -@ToString -@RequiredArgsConstructor -@Entity -public class Repair { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "ID_repair") - Integer id; - @OneToOne - @JoinColumn(name = "id_order") - Order order; - @ManyToOne - @JoinColumn(name = "id_repair_shop") - RepairShop repairShop; - @ManyToOne - @JoinColumn(name = "id_service_book") - ServiceBook serviceBook; - - public Repair(Order order, RepairShop repairShop, ServiceBook serviceBook) { - this.order = order; - this.repairShop = repairShop; - this.serviceBook = serviceBook; - } - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) return false; - Repair repair = (Repair) o; - return id != null && Objects.equals(id, repair.id); - } - - @Override - public int hashCode() { - return getClass().hashCode(); - } -} Index: c/main/java/com/example/autopartz/model/RepairShop.java =================================================================== --- src/main/java/com/example/autopartz/model/RepairShop.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,56 +1,0 @@ -package com.example.autopartz.model; - -import lombok.Getter; -import lombok.RequiredArgsConstructor; -import lombok.Setter; -import lombok.ToString; -import org.hibernate.Hibernate; - -import javax.persistence.*; -import java.util.List; -import java.util.Objects; - -@Getter -@Setter -@ToString -@RequiredArgsConstructor -@Entity -@Table(name = "repair_shop") -public class RepairShop { - @Id - @Column(name = "ID_repair_shop") - @GeneratedValue(strategy = GenerationType.IDENTITY) - Integer id; - @Column(name = "rs_name") - String name; - @Column(name = "rs_location") - String location; - @Column(name = "rs_phone_number") - String number; - @ManyToMany - @JoinTable(name = "repair_shop_is_authorized_for_car_make", joinColumns = - @JoinColumn(name = "id_repair_shop"), - inverseJoinColumns = @JoinColumn(name = "id_car_manufacturer")) - @ToString.Exclude - List carManufacturerList; - - public RepairShop(String name, String location, String number, List carManufacturerList) { - this.name = name; - this.location = location; - this.number = number; - this.carManufacturerList = carManufacturerList; - } - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) return false; - RepairShop that = (RepairShop) o; - return id != null && Objects.equals(id, that.id); - } - - @Override - public int hashCode() { - return getClass().hashCode(); - } -} Index: c/main/java/com/example/autopartz/model/Review.java =================================================================== --- src/main/java/com/example/autopartz/model/Review.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,49 +1,0 @@ -package com.example.autopartz.model; - -import lombok.Getter; -import lombok.RequiredArgsConstructor; -import lombok.Setter; -import lombok.ToString; -import org.hibernate.Hibernate; - -import javax.persistence.*; -import java.util.Objects; - -@Getter -@Setter -@ToString -@RequiredArgsConstructor -@Entity -public class Review { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - Integer ID_review; - Integer review_rating; - String review_comment; - @ManyToOne - @JoinColumn(name = "id_repair") - Repair repair; - @ManyToOne - @JoinColumn(name = "id_user") - Client client; - - public Review(Integer review_rating, String review_comment, Repair repair, Client client) { - this.review_rating = review_rating; - this.review_comment = review_comment; - this.repair = repair; - this.client = client; - } - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) return false; - Review review = (Review) o; - return ID_review != null && Objects.equals(ID_review, review.ID_review); - } - - @Override - public int hashCode() { - return getClass().hashCode(); - } -} Index: c/main/java/com/example/autopartz/model/Role.java =================================================================== --- src/main/java/com/example/autopartz/model/Role.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,15 +1,0 @@ -package com.example.autopartz.model; - -import org.springframework.security.core.GrantedAuthority; - - -public enum Role implements GrantedAuthority { - - ROLE_USER,ROLE_CLIENT, ROLE_ADMIN, ROLE_WAREHOUSEMAN, ROLE_DELIVERYMAN, ROLE_PENDING_WAREHOUSEMAN,ROLE_PENDING_DELIVERYMAN; - - @Override - public String getAuthority() { - return name(); - } -} - Index: c/main/java/com/example/autopartz/model/ServiceBook.java =================================================================== --- src/main/java/com/example/autopartz/model/ServiceBook.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,46 +1,0 @@ -package com.example.autopartz.model; - -import lombok.Getter; -import lombok.RequiredArgsConstructor; -import lombok.Setter; -import lombok.ToString; -import org.hibernate.Hibernate; - -import javax.persistence.*; -import java.time.LocalDateTime; -import java.util.Objects; - -@Getter -@Setter -@ToString -@RequiredArgsConstructor -@Entity -@Table(name = "service_book") -public class ServiceBook { - @Id - @Column(name = "ID_service_book") - @GeneratedValue(strategy = GenerationType.IDENTITY) - Integer id; - LocalDateTime sb_created_on; - @OneToOne - @JoinColumn(name = "vin") - CarSample carSample; - - public ServiceBook(CarSample carSample) { - this.sb_created_on = LocalDateTime.now(); - this.carSample = carSample; - } - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) return false; - ServiceBook that = (ServiceBook) o; - return id != null && Objects.equals(id, that.id); - } - - @Override - public int hashCode() { - return getClass().hashCode(); - } -} Index: c/main/java/com/example/autopartz/model/User.java =================================================================== --- src/main/java/com/example/autopartz/model/User.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,88 +1,0 @@ -package com.example.autopartz.model; - -import lombok.Getter; -import lombok.RequiredArgsConstructor; -import lombok.Setter; -import lombok.ToString; -import org.hibernate.Hibernate; -import org.springframework.security.core.GrantedAuthority; -import org.springframework.security.core.userdetails.UserDetails; - -import javax.persistence.*; -import java.time.LocalDateTime; -import java.util.Collection; -import java.util.Collections; -import java.util.Objects; - -@Getter -@Setter -@ToString -@RequiredArgsConstructor -@Entity -@Table(name = "users_table") -@Inheritance(strategy = InheritanceType.JOINED) -public class User implements UserDetails { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "ID_user") - Integer id; - String username; - String email; - @Column(name = "name_user") - String name; - @Column(name = "password_user") - String password; - LocalDateTime user_created_on; - String phone_number; - @ManyToOne - @JoinColumn(name = "id_administrator") - Administrator administrator; - - public User(String username, String name, String email, String password, String number) { - this.username = username; - this.name = name; - this.email = email; - this.password = password; - this.phone_number = number; - this.user_created_on = LocalDateTime.now(); - } - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) return false; - User user = (User) o; - return id != null && Objects.equals(id, user.id); - } - - @Override - public int hashCode() { - return getClass().hashCode(); - } - - - @Override - public Collection getAuthorities() { - return Collections.singletonList(Role.ROLE_USER); - } - - @Override - public boolean isAccountNonExpired() { - return true; - } - - @Override - public boolean isAccountNonLocked() { - return true; - } - - @Override - public boolean isCredentialsNonExpired() { - return true; - } - - @Override - public boolean isEnabled() { - return true; - } -} Index: c/main/java/com/example/autopartz/model/Warehouse.java =================================================================== --- src/main/java/com/example/autopartz/model/Warehouse.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,41 +1,0 @@ -package com.example.autopartz.model; - -import lombok.Getter; -import lombok.RequiredArgsConstructor; -import lombok.Setter; -import lombok.ToString; -import org.hibernate.Hibernate; - -import javax.persistence.*; -import java.util.Objects; - -@Getter -@Setter -@ToString -@RequiredArgsConstructor -@Entity -public class Warehouse { - @Id - @Column(name = "id_warehouse") - @GeneratedValue(strategy = GenerationType.IDENTITY) - Integer id; - @Column(name = "warehouse_location") - String location; - - public Warehouse(String name) { - this.location = name; - } - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) return false; - Warehouse warehouse = (Warehouse) o; - return id != null && Objects.equals(id, warehouse.id); - } - - @Override - public int hashCode() { - return getClass().hashCode(); - } -} Index: c/main/java/com/example/autopartz/model/Warehouseman.java =================================================================== --- src/main/java/com/example/autopartz/model/Warehouseman.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,55 +1,0 @@ -package com.example.autopartz.model; - -import lombok.Getter; -import lombok.RequiredArgsConstructor; -import lombok.Setter; -import lombok.ToString; -import org.hibernate.Hibernate; -import org.springframework.security.core.GrantedAuthority; - -import javax.persistence.Entity; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import java.time.LocalDate; -import java.util.Collection; -import java.util.Collections; -import java.util.Objects; - -@Getter -@Setter -@ToString -@RequiredArgsConstructor -@Entity -public class Warehouseman extends User{ - LocalDate employed_from; - public static final LocalDate defaultEmployedFrom = LocalDate.of(2020,1,1); - @ManyToOne - @JoinColumn(name = "id_warehouse") - Warehouse warehouse; - - public Warehouseman(String username, String name, String email, String password, String number, Warehouse warehouse) { - super(username, name, email, password, number); - this.employed_from=defaultEmployedFrom; - this.warehouse= warehouse; - } - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) return false; - Warehouseman that = (Warehouseman) o; - return id != null && Objects.equals(id, that.id); - } - - @Override - public int hashCode() { - return getClass().hashCode(); - } - @Override - public Collection getAuthorities() { - if(Objects.equals(employed_from, defaultEmployedFrom)) - return Collections.singletonList(Role.ROLE_PENDING_WAREHOUSEMAN); - else - return Collections.singletonList(Role.ROLE_WAREHOUSEMAN); - } -} Index: c/main/java/com/example/autopartz/model/manytomany/OrderContainsPart.java =================================================================== --- src/main/java/com/example/autopartz/model/manytomany/OrderContainsPart.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,31 +1,0 @@ -package com.example.autopartz.model.manytomany; - -import lombok.Getter; -import lombok.RequiredArgsConstructor; -import lombok.Setter; -import lombok.ToString; - -import javax.persistence.*; - -@Entity -@Getter -@Setter -@ToString -@RequiredArgsConstructor -@Table(name = "`order_contains_part`") -@IdClass(OrderContainsPartId.class) -public class OrderContainsPart { - @Id - @Column(name = "id_part") - Integer partid; - @Column(name = "id_order") - @Id - Integer orderid; - Integer quantity_order; - - public OrderContainsPart(Integer partid, Integer orderid, Integer quantity_order) { - this.partid = partid; - this.orderid = orderid; - this.quantity_order = quantity_order; - } -} Index: c/main/java/com/example/autopartz/model/manytomany/OrderContainsPartId.java =================================================================== --- src/main/java/com/example/autopartz/model/manytomany/OrderContainsPartId.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,12 +1,0 @@ -package com.example.autopartz.model.manytomany; - -import lombok.Data; - -import java.io.Serializable; - -@Data -public class OrderContainsPartId implements Serializable { - Integer partid; - Integer orderid; -} - Index: c/main/java/com/example/autopartz/model/manytomany/PartIsAppropriateForCar.java =================================================================== --- src/main/java/com/example/autopartz/model/manytomany/PartIsAppropriateForCar.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,29 +1,0 @@ -package com.example.autopartz.model.manytomany; - -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; -import lombok.ToString; - -import javax.persistence.*; - -@Entity -@Getter -@Setter -@ToString -@NoArgsConstructor -@Table(name = "`part_is_appropriate_for_car`") -@IdClass(PartIsAppropriateForCarId.class) -public class PartIsAppropriateForCar { - @Id - @Column(name = "id_part") - Integer partid; - @Column(name = "id_car") - @Id - Integer carid; - - public PartIsAppropriateForCar(Integer partid, Integer carid) { - this.partid = partid; - this.carid = carid; - } -} Index: c/main/java/com/example/autopartz/model/manytomany/PartIsAppropriateForCarId.java =================================================================== --- src/main/java/com/example/autopartz/model/manytomany/PartIsAppropriateForCarId.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,11 +1,0 @@ -package com.example.autopartz.model.manytomany; - -import lombok.Data; - -import java.io.Serializable; - -@Data -public class PartIsAppropriateForCarId implements Serializable { - Integer partid; - Integer carid; -} Index: c/main/java/com/example/autopartz/model/manytomany/PartIsFromCategory.java =================================================================== --- src/main/java/com/example/autopartz/model/manytomany/PartIsFromCategory.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,29 +1,0 @@ -package com.example.autopartz.model.manytomany; - -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; -import lombok.ToString; - -import javax.persistence.*; - -@Entity -@Getter -@Setter -@ToString -@NoArgsConstructor -@Table(name = "`part_is_from_category`") -@IdClass(PartIsFromCategoryId.class) -public class PartIsFromCategory { - @Id - @Column(name = "id_part") - Integer partid; - @Column(name = "id_category") - @Id - Integer categoryid; - - public PartIsFromCategory(Integer partid, Integer categoryid) { - this.partid = partid; - this.categoryid = categoryid; - } -} Index: c/main/java/com/example/autopartz/model/manytomany/PartIsFromCategoryId.java =================================================================== --- src/main/java/com/example/autopartz/model/manytomany/PartIsFromCategoryId.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,11 +1,0 @@ -package com.example.autopartz.model.manytomany; - -import lombok.Data; - -import java.io.Serializable; - -@Data -public class PartIsFromCategoryId implements Serializable { - Integer partid; - Integer categoryid; -} Index: c/main/java/com/example/autopartz/model/manytomany/PartIsInStockInWarehouse.java =================================================================== --- src/main/java/com/example/autopartz/model/manytomany/PartIsInStockInWarehouse.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,29 +1,0 @@ -package com.example.autopartz.model.manytomany; - -import lombok.*; - -import javax.persistence.*; - -@Entity -@Getter -@Setter -@ToString -@NoArgsConstructor -@Table(name = "`part_is_in_stock_in_warehouse`") -@IdClass(PartIsInStockInWarehouseId.class) -public class PartIsInStockInWarehouse { - @Id - @Column(name = "id_part") - Integer partid; - @Column(name = "id_warehouse") - @Id - Integer warehouseid; - @Column(name = "quantity_warehouse") - Integer quantity; - - public PartIsInStockInWarehouse(Integer partid, Integer warehouseid, Integer quantity) { - this.partid = partid; - this.warehouseid = warehouseid; - this.quantity = quantity; - } -} Index: c/main/java/com/example/autopartz/model/manytomany/PartIsInStockInWarehouseId.java =================================================================== --- src/main/java/com/example/autopartz/model/manytomany/PartIsInStockInWarehouseId.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,19 +1,0 @@ -package com.example.autopartz.model.manytomany; - -import lombok.Data; - -import java.io.Serializable; - -@Data -public class PartIsInStockInWarehouseId implements Serializable { - Integer partid; - Integer warehouseid; - - public PartIsInStockInWarehouseId(Integer pId, Integer whId) { - this.partid = pId; - this.warehouseid = whId; - } - - public PartIsInStockInWarehouseId() { - } -} Index: c/main/java/com/example/autopartz/model/manytomany/RsForCm.java =================================================================== --- src/main/java/com/example/autopartz/model/manytomany/RsForCm.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,29 +1,0 @@ -package com.example.autopartz.model.manytomany; - -import lombok.Getter; -import lombok.RequiredArgsConstructor; -import lombok.Setter; -import lombok.ToString; - -import javax.persistence.*; - -@Entity -@Getter -@Setter -@ToString -@RequiredArgsConstructor -@Table(name = "`repair_shop_is_authorized_for_car_make`") -@IdClass(RsForCmId.class) -public class RsForCm { - @Id - @Column(name = "id_repair_shop") - Integer rsid; - @Column(name = "id_car_manufacturer") - @Id - Integer cmid; - - public RsForCm(Integer rsid, Integer cmid) { - this.rsid = rsid; - this.cmid = cmid; - } -} Index: c/main/java/com/example/autopartz/model/manytomany/RsForCmId.java =================================================================== --- src/main/java/com/example/autopartz/model/manytomany/RsForCmId.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,11 +1,0 @@ -package com.example.autopartz.model.manytomany; - -import lombok.Data; - -import java.io.Serializable; - -@Data -public class RsForCmId implements Serializable { - Integer rsid; - Integer cmid; -} Index: c/main/java/com/example/autopartz/model/views/CarCategoryReport.java =================================================================== --- src/main/java/com/example/autopartz/model/views/CarCategoryReport.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,33 +1,0 @@ -package com.example.autopartz.model.views; - -import lombok.Getter; -import lombok.RequiredArgsConstructor; -import lombok.Setter; -import lombok.ToString; -import org.hibernate.annotations.Immutable; - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.Table; -import java.io.Serial; -import java.io.Serializable; -import java.time.LocalDateTime; - -@Entity -@Getter -@Setter -@ToString -@RequiredArgsConstructor -@Immutable -@Table(name = "`car_category_report`") -@IdClass(CarCategoryReportId.class) -public class CarCategoryReport implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - @Id - String cname; - @Id - String cmname; - Long partsordered; -} Index: c/main/java/com/example/autopartz/model/views/CarCategoryReportId.java =================================================================== --- src/main/java/com/example/autopartz/model/views/CarCategoryReportId.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,11 +1,0 @@ -package com.example.autopartz.model.views; - -import lombok.Data; - -import java.io.Serializable; - -@Data -public class CarCategoryReportId implements Serializable { - String cname; - String cmname; -} Index: c/main/java/com/example/autopartz/model/views/DeliveriesInProgress.java =================================================================== --- src/main/java/com/example/autopartz/model/views/DeliveriesInProgress.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,35 +1,0 @@ -package com.example.autopartz.model.views; - -import lombok.Getter; -import lombok.RequiredArgsConstructor; -import lombok.Setter; -import lombok.ToString; -import org.hibernate.annotations.Immutable; - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.Table; -import java.io.Serial; -import java.io.Serializable; -import java.time.LocalDate; -import java.time.LocalDateTime; - -@Entity -@Getter -@Setter -@ToString -@RequiredArgsConstructor -@Immutable -@Table(name = "`deliveries_in_progress`") -public class DeliveriesInProgress implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - @Id - Integer deliveryid; - Integer userid; - Integer orderid; - LocalDateTime datum; - String status; - String address; -} Index: c/main/java/com/example/autopartz/model/views/MostPurchasedPart.java =================================================================== --- src/main/java/com/example/autopartz/model/views/MostPurchasedPart.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,30 +1,0 @@ -package com.example.autopartz.model.views; - -import lombok.Getter; -import lombok.RequiredArgsConstructor; -import lombok.Setter; -import lombok.ToString; -import org.hibernate.annotations.Immutable; - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import java.io.Serial; -import java.io.Serializable; -import java.time.LocalDateTime; - -@Entity -@Getter -@Setter -@ToString -@RequiredArgsConstructor -@Immutable -@Table(name = "`most_purchased_part`") -public class MostPurchasedPart implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - @Id - String pname; - String cmname; - Long maxkol; -} Index: c/main/java/com/example/autopartz/model/views/OrdersForUser.java =================================================================== --- src/main/java/com/example/autopartz/model/views/OrdersForUser.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,39 +1,0 @@ -package com.example.autopartz.model.views; - -import lombok.Getter; -import lombok.RequiredArgsConstructor; -import lombok.Setter; -import lombok.ToString; -import org.hibernate.annotations.Immutable; - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.Table; -import java.io.Serial; -import java.io.Serializable; -import java.time.LocalDateTime; - -// извештај за сите сервиси и за сите број на reviews и avg рејтинг -@Entity -@Getter -@Setter -@ToString -@RequiredArgsConstructor -@Immutable -@Table(name = "`orders_for_user`") -@IdClass(OrdersForUserId.class) -public class OrdersForUser implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - @Id - Integer userid; - @Id - LocalDateTime orderdate; - @Id - String partname; - Integer amount; - Integer quantity; - String status; -} - Index: c/main/java/com/example/autopartz/model/views/OrdersForUserId.java =================================================================== --- src/main/java/com/example/autopartz/model/views/OrdersForUserId.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,13 +1,0 @@ -package com.example.autopartz.model.views; - -import lombok.Data; - -import java.io.Serializable; -import java.time.LocalDateTime; - -@Data -public class OrdersForUserId implements Serializable { - Integer userid; - LocalDateTime orderdate; - String partname; -} Index: c/main/java/com/example/autopartz/model/views/PartManufacturersReport.java =================================================================== --- src/main/java/com/example/autopartz/model/views/PartManufacturersReport.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,32 +1,0 @@ -package com.example.autopartz.model.views; - -import lombok.Getter; -import lombok.RequiredArgsConstructor; -import lombok.Setter; -import lombok.ToString; -import org.hibernate.annotations.Immutable; - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import java.io.Serial; -import java.io.Serializable; -import java.time.LocalDateTime; - -@Entity -@Getter -@Setter -@ToString -@RequiredArgsConstructor -@Immutable -@Table(name = "`part_manufacturers_report`") -public class PartManufacturersReport implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - @Id - String pmname; - Long prva; - Long vtora; - Long treta; - Long cetvrta; -} Index: c/main/java/com/example/autopartz/model/views/PartsForCarTypeAndCategory.java =================================================================== --- src/main/java/com/example/autopartz/model/views/PartsForCarTypeAndCategory.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,31 +1,0 @@ -package com.example.autopartz.model.views; - -import lombok.Getter; -import lombok.RequiredArgsConstructor; -import lombok.Setter; -import lombok.ToString; -import org.hibernate.annotations.Immutable; - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import java.io.Serial; -import java.io.Serializable; - -@Entity -@Getter -@Setter -@ToString -@RequiredArgsConstructor -@Immutable -@Table(name = "`parts_for_car_type_and_category`") -public class PartsForCarTypeAndCategory implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - @Id - Integer partid; - String partname; - String cartype; - String category; - String pmname; -} Index: c/main/java/com/example/autopartz/model/views/RepairShopReviewsSummary.java =================================================================== --- src/main/java/com/example/autopartz/model/views/RepairShopReviewsSummary.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,46 +1,0 @@ -package com.example.autopartz.model.views; - -import lombok.Getter; -import lombok.RequiredArgsConstructor; -import lombok.Setter; -import lombok.ToString; -import org.hibernate.Hibernate; -import org.hibernate.annotations.Immutable; - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import java.io.Serial; -import java.io.Serializable; -import java.util.Objects; - -// извештај за сите сервиси и за сите број на reviews и avg рејтинг -@Entity -@Getter -@Setter -@ToString -@RequiredArgsConstructor -@Immutable -@Table(name = "`repair_shop_reviews_summary`") -public class RepairShopReviewsSummary implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - @Id - Integer rsid; - String rsname; - Long reviewcount; - Float reviewaverage; - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) return false; - RepairShopReviewsSummary that = (RepairShopReviewsSummary) o; - return rsid != null && Objects.equals(rsid, that.rsid); - } - - @Override - public int hashCode() { - return getClass().hashCode(); - } -} Index: c/main/java/com/example/autopartz/model/views/RepairsForUser.java =================================================================== --- src/main/java/com/example/autopartz/model/views/RepairsForUser.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,36 +1,0 @@ -package com.example.autopartz.model.views; - -import lombok.Getter; -import lombok.RequiredArgsConstructor; -import lombok.Setter; -import lombok.ToString; -import org.hibernate.annotations.Immutable; - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.Table; -import java.io.Serial; -import java.io.Serializable; -import java.time.LocalDateTime; - -// извештај за сите сервиси и за сите број на reviews и avg рејтинг -@Entity -@Getter -@Setter -@ToString -@RequiredArgsConstructor -@Immutable -@Table(name = "`repairs_for_user`") -public class RepairsForUser implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - @Id - Integer repairid; - Integer userid; - LocalDateTime orderdate; - Integer orderid; - String rsname; -} - - Index: c/main/java/com/example/autopartz/model/views/ReviewsForUser.java =================================================================== --- src/main/java/com/example/autopartz/model/views/ReviewsForUser.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,36 +1,0 @@ -package com.example.autopartz.model.views; - -import lombok.Getter; -import lombok.RequiredArgsConstructor; -import lombok.Setter; -import lombok.ToString; -import org.hibernate.annotations.Immutable; - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import java.io.Serial; -import java.io.Serializable; - -// извештај за сите сервиси и за сите број на reviews и avg рејтинг -@Entity -@Getter -@Setter -@ToString -@RequiredArgsConstructor -@Immutable -@Table(name = "`reviews_for_user`") -public class ReviewsForUser implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - @Id - Integer repairid; - Integer userid; - Integer rating; - Integer orderid; - String rcomment; - String rsname; - String rslocation; -} - - Index: c/main/java/com/example/autopartz/model/views/WarehousemanReport.java =================================================================== --- src/main/java/com/example/autopartz/model/views/WarehousemanReport.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,35 +1,0 @@ -package com.example.autopartz.model.views; - -import lombok.Getter; -import lombok.RequiredArgsConstructor; -import lombok.Setter; -import lombok.ToString; -import org.hibernate.annotations.Immutable; - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.Table; -import java.io.Serial; -import java.io.Serializable; - -@Entity -@Getter -@Setter -@ToString -@RequiredArgsConstructor -@Immutable -@Table(name = "`warehouseman_report`") -@IdClass(WarehousemanReportId.class) -public class WarehousemanReport implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - @Id - Integer wid; - @Id - String pname; - Long quantityordered; - Integer quantitywarehouse; - Long quantitylast3months; - String hasenoughinstock; -} Index: c/main/java/com/example/autopartz/model/views/WarehousemanReportId.java =================================================================== --- src/main/java/com/example/autopartz/model/views/WarehousemanReportId.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,11 +1,0 @@ -package com.example.autopartz.model.views; - -import lombok.Data; - -import java.io.Serializable; - -@Data -public class WarehousemanReportId implements Serializable { - Integer wid; - String pname; -} Index: c/main/java/com/example/autopartz/repository/CarCategoryReportRepository.java =================================================================== --- src/main/java/com/example/autopartz/repository/CarCategoryReportRepository.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,9 +1,0 @@ -package com.example.autopartz.repository; - -import com.example.autopartz.model.views.CarCategoryReport; -import com.example.autopartz.model.views.CarCategoryReportId; -import org.springframework.data.jpa.repository.JpaRepository; - -public interface CarCategoryReportRepository extends JpaRepository { - -} Index: c/main/java/com/example/autopartz/repository/CarManufacturerRepository.java =================================================================== --- src/main/java/com/example/autopartz/repository/CarManufacturerRepository.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,7 +1,0 @@ -package com.example.autopartz.repository; - -import com.example.autopartz.model.CarManufacturer; -import org.springframework.data.jpa.repository.JpaRepository; - -public interface CarManufacturerRepository extends JpaRepository { -} Index: c/main/java/com/example/autopartz/repository/CarRepository.java =================================================================== --- src/main/java/com/example/autopartz/repository/CarRepository.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,9 +1,0 @@ -package com.example.autopartz.repository; - -import com.example.autopartz.model.Car; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -@Repository -public interface CarRepository extends JpaRepository { -} Index: c/main/java/com/example/autopartz/repository/CarSampleRepository.java =================================================================== --- src/main/java/com/example/autopartz/repository/CarSampleRepository.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,11 +1,0 @@ -package com.example.autopartz.repository; - -import com.example.autopartz.model.CarSample; -import com.example.autopartz.model.Client; -import org.springframework.data.jpa.repository.JpaRepository; - -import java.util.List; - -public interface CarSampleRepository extends JpaRepository { - List findAllByClient(Client client); -} Index: c/main/java/com/example/autopartz/repository/CategoryRepository.java =================================================================== --- src/main/java/com/example/autopartz/repository/CategoryRepository.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,9 +1,0 @@ -package com.example.autopartz.repository; - -import com.example.autopartz.model.Category; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -@Repository -public interface CategoryRepository extends JpaRepository { -} Index: c/main/java/com/example/autopartz/repository/DeliveriesInProgressRepository.java =================================================================== --- src/main/java/com/example/autopartz/repository/DeliveriesInProgressRepository.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,10 +1,0 @@ -package com.example.autopartz.repository; - -import com.example.autopartz.model.views.DeliveriesInProgress; -import org.springframework.data.jpa.repository.JpaRepository; - -import java.util.List; - -public interface DeliveriesInProgressRepository extends JpaRepository { - List findAllByUserid(Integer userid); -} Index: c/main/java/com/example/autopartz/repository/DeliveryRepository.java =================================================================== --- src/main/java/com/example/autopartz/repository/DeliveryRepository.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,15 +1,0 @@ -package com.example.autopartz.repository; - -import com.example.autopartz.model.Delivery; -import com.example.autopartz.model.Deliveryman; -import com.example.autopartz.model.Order; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -import java.util.List; - -@Repository -public interface DeliveryRepository extends JpaRepository { - List findAllByDeliveryman(Deliveryman deliveryman); - List findAllByOrder(Order order); -} Index: c/main/java/com/example/autopartz/repository/DeliverymanRepository.java =================================================================== --- src/main/java/com/example/autopartz/repository/DeliverymanRepository.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,7 +1,0 @@ -package com.example.autopartz.repository; - -import com.example.autopartz.model.Deliveryman; -import org.springframework.data.jpa.repository.JpaRepository; - -public interface DeliverymanRepository extends JpaRepository { -} Index: c/main/java/com/example/autopartz/repository/MostPurchasedPartRepository.java =================================================================== --- src/main/java/com/example/autopartz/repository/MostPurchasedPartRepository.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,7 +1,0 @@ -package com.example.autopartz.repository; - -import com.example.autopartz.model.views.MostPurchasedPart; -import org.springframework.data.jpa.repository.JpaRepository; - -public interface MostPurchasedPartRepository extends JpaRepository { -} Index: c/main/java/com/example/autopartz/repository/OrderContainsPartRepository.java =================================================================== --- src/main/java/com/example/autopartz/repository/OrderContainsPartRepository.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,13 +1,0 @@ -package com.example.autopartz.repository; - -import com.example.autopartz.model.manytomany.OrderContainsPart; -import com.example.autopartz.model.manytomany.OrderContainsPartId; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -import java.util.List; - -@Repository -public interface OrderContainsPartRepository extends JpaRepository { - List findAllByOrderid(Integer orderid); -} Index: c/main/java/com/example/autopartz/repository/OrderRepository.java =================================================================== --- src/main/java/com/example/autopartz/repository/OrderRepository.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,9 +1,0 @@ -package com.example.autopartz.repository; - -import com.example.autopartz.model.Order; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -@Repository -public interface OrderRepository extends JpaRepository { -} Index: c/main/java/com/example/autopartz/repository/OrdersForUserRepository.java =================================================================== --- src/main/java/com/example/autopartz/repository/OrdersForUserRepository.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,13 +1,0 @@ -package com.example.autopartz.repository; - -import com.example.autopartz.model.views.OrdersForUser; -import com.example.autopartz.model.views.OrdersForUserId; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -import java.util.List; - -@Repository -public interface OrdersForUserRepository extends JpaRepository { - List findAllByUserid(Integer userid); -} Index: c/main/java/com/example/autopartz/repository/PartIsAppropriateForCarRepository.java =================================================================== --- src/main/java/com/example/autopartz/repository/PartIsAppropriateForCarRepository.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,8 +1,0 @@ -package com.example.autopartz.repository; - -import com.example.autopartz.model.manytomany.PartIsAppropriateForCar; -import com.example.autopartz.model.manytomany.PartIsAppropriateForCarId; -import org.springframework.data.jpa.repository.JpaRepository; - -public interface PartIsAppropriateForCarRepository extends JpaRepository { -} Index: c/main/java/com/example/autopartz/repository/PartIsFromCategoryRepository.java =================================================================== --- src/main/java/com/example/autopartz/repository/PartIsFromCategoryRepository.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,8 +1,0 @@ -package com.example.autopartz.repository; - -import com.example.autopartz.model.manytomany.PartIsFromCategory; -import com.example.autopartz.model.manytomany.PartIsFromCategoryId; -import org.springframework.data.jpa.repository.JpaRepository; - -public interface PartIsFromCategoryRepository extends JpaRepository { -} Index: c/main/java/com/example/autopartz/repository/PartIsInStockInWarehouseRepository.java =================================================================== --- src/main/java/com/example/autopartz/repository/PartIsInStockInWarehouseRepository.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,11 +1,0 @@ -package com.example.autopartz.repository; - -import com.example.autopartz.model.manytomany.PartIsInStockInWarehouse; -import com.example.autopartz.model.manytomany.PartIsInStockInWarehouseId; -import org.springframework.data.jpa.repository.JpaRepository; - -import java.util.List; - -public interface PartIsInStockInWarehouseRepository extends JpaRepository { - List findAllByWarehouseid(Integer warehouseid); -} Index: c/main/java/com/example/autopartz/repository/PartManufacturerRepository.java =================================================================== --- src/main/java/com/example/autopartz/repository/PartManufacturerRepository.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,7 +1,0 @@ -package com.example.autopartz.repository; - -import com.example.autopartz.model.PartManufacturer; -import org.springframework.data.jpa.repository.JpaRepository; - -public interface PartManufacturerRepository extends JpaRepository { -} Index: c/main/java/com/example/autopartz/repository/PartManufacturersReportRepository.java =================================================================== --- src/main/java/com/example/autopartz/repository/PartManufacturersReportRepository.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,8 +1,0 @@ -package com.example.autopartz.repository; - -import com.example.autopartz.model.views.PartManufacturersReport; -import org.springframework.data.jpa.repository.JpaRepository; - -public interface PartManufacturersReportRepository extends JpaRepository { - -} Index: c/main/java/com/example/autopartz/repository/PartRepository.java =================================================================== --- src/main/java/com/example/autopartz/repository/PartRepository.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,12 +1,0 @@ -package com.example.autopartz.repository; - -import com.example.autopartz.model.Part; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -import java.util.List; - -@Repository -public interface PartRepository extends JpaRepository { - List findAllByName(String name); -} Index: c/main/java/com/example/autopartz/repository/PartsForCarTypeAndCategoryRepository.java =================================================================== --- src/main/java/com/example/autopartz/repository/PartsForCarTypeAndCategoryRepository.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,12 +1,0 @@ -package com.example.autopartz.repository; - -import com.example.autopartz.model.views.PartsForCarTypeAndCategory; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -import java.util.List; - -@Repository -public interface PartsForCarTypeAndCategoryRepository extends JpaRepository { - List findAllByCartypeAndCategory(String cartype, String category); -} Index: c/main/java/com/example/autopartz/repository/PriceRepository.java =================================================================== --- src/main/java/com/example/autopartz/repository/PriceRepository.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,11 +1,0 @@ -package com.example.autopartz.repository; - -import com.example.autopartz.model.Part; -import com.example.autopartz.model.Price; -import org.springframework.data.jpa.repository.JpaRepository; - -import java.util.List; - -public interface PriceRepository extends JpaRepository { - List findAllByPart(Part part); -} Index: c/main/java/com/example/autopartz/repository/RepairRepository.java =================================================================== --- src/main/java/com/example/autopartz/repository/RepairRepository.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,10 +1,0 @@ -package com.example.autopartz.repository; - -import com.example.autopartz.model.Repair; -import org.springframework.data.jpa.repository.JpaRepository; - -import java.util.List; - -public interface RepairRepository extends JpaRepository { - List findAllById(Integer id); -} Index: c/main/java/com/example/autopartz/repository/RepairShopRepository.java =================================================================== --- src/main/java/com/example/autopartz/repository/RepairShopRepository.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,10 +1,0 @@ -package com.example.autopartz.repository; - -import com.example.autopartz.model.RepairShop; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -@Repository -public interface RepairShopRepository extends JpaRepository { - RepairShop getRepairShopByName(String name); -} Index: c/main/java/com/example/autopartz/repository/RepairShopReviewSummaryRepository.java =================================================================== --- src/main/java/com/example/autopartz/repository/RepairShopReviewSummaryRepository.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,10 +1,0 @@ -package com.example.autopartz.repository; - -import com.example.autopartz.model.views.RepairShopReviewsSummary; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -// извештај за сите сервиси и за сите број на reviews и avg рејтинг -@Repository -public interface RepairShopReviewSummaryRepository extends JpaRepository { -} Index: c/main/java/com/example/autopartz/repository/RepairsForUserRepository.java =================================================================== --- src/main/java/com/example/autopartz/repository/RepairsForUserRepository.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,13 +1,0 @@ -package com.example.autopartz.repository; - -import com.example.autopartz.model.views.OrdersForUserId; -import com.example.autopartz.model.views.RepairsForUser; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -import java.util.List; - -@Repository -public interface RepairsForUserRepository extends JpaRepository { - List findAllByUserid(Integer userid); -} Index: c/main/java/com/example/autopartz/repository/ReviewRepository.java =================================================================== --- src/main/java/com/example/autopartz/repository/ReviewRepository.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,9 +1,0 @@ -package com.example.autopartz.repository; - -import com.example.autopartz.model.Repair; -import com.example.autopartz.model.Review; -import org.springframework.data.jpa.repository.JpaRepository; - -public interface ReviewRepository extends JpaRepository { - Review findByRepair(Repair repair); -} Index: c/main/java/com/example/autopartz/repository/ReviewsForUserRepository.java =================================================================== --- src/main/java/com/example/autopartz/repository/ReviewsForUserRepository.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,12 +1,0 @@ -package com.example.autopartz.repository; - -import com.example.autopartz.model.views.ReviewsForUser; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -import java.util.List; - -@Repository -public interface ReviewsForUserRepository extends JpaRepository { - List findAllByUserid(Integer id); -} Index: c/main/java/com/example/autopartz/repository/RsForCmRepository.java =================================================================== --- src/main/java/com/example/autopartz/repository/RsForCmRepository.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,11 +1,0 @@ -package com.example.autopartz.repository; - -import com.example.autopartz.model.manytomany.RsForCm; -import com.example.autopartz.model.manytomany.RsForCmId; -import org.springframework.data.jpa.repository.JpaRepository; - -import java.util.List; - -public interface RsForCmRepository extends JpaRepository { - List findAllByCmid(Integer cmid); -} Index: c/main/java/com/example/autopartz/repository/ServiceBookRepository.java =================================================================== --- src/main/java/com/example/autopartz/repository/ServiceBookRepository.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,9 +1,0 @@ -package com.example.autopartz.repository; - -import com.example.autopartz.model.CarSample; -import com.example.autopartz.model.ServiceBook; -import org.springframework.data.jpa.repository.JpaRepository; - -public interface ServiceBookRepository extends JpaRepository { - ServiceBook findByCarSample(CarSample carSample); -} Index: c/main/java/com/example/autopartz/repository/UserRepository.java =================================================================== --- src/main/java/com/example/autopartz/repository/UserRepository.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,17 +1,0 @@ -package com.example.autopartz.repository; - -import com.example.autopartz.model.User; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.security.core.GrantedAuthority; -import org.springframework.stereotype.Repository; - -import java.util.Collection; -import java.util.List; - -// import java.util.List; - -@Repository -public interface UserRepository extends JpaRepository { - List findAllByUsername(String username); - List findAllByUsernameAndPassword(String username, String password); -} Index: c/main/java/com/example/autopartz/repository/WarehouseRepository.java =================================================================== --- src/main/java/com/example/autopartz/repository/WarehouseRepository.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,11 +1,0 @@ -package com.example.autopartz.repository; - -import com.example.autopartz.model.Warehouse; -import org.springframework.data.jpa.repository.JpaRepository; - -import java.util.List; - -public interface WarehouseRepository extends JpaRepository { - List findAllByLocation(String location); - List findAllById(Integer id); -} Index: c/main/java/com/example/autopartz/repository/WarehousemanReportRepository.java =================================================================== --- src/main/java/com/example/autopartz/repository/WarehousemanReportRepository.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,11 +1,0 @@ -package com.example.autopartz.repository; - -import com.example.autopartz.model.views.WarehousemanReport; -import com.example.autopartz.model.views.WarehousemanReportId; -import org.springframework.data.jpa.repository.JpaRepository; - -import java.util.List; - -public interface WarehousemanReportRepository extends JpaRepository { - List findByWid(Integer wid); -} Index: c/main/java/com/example/autopartz/repository/WarehousemanRepository.java =================================================================== --- src/main/java/com/example/autopartz/repository/WarehousemanRepository.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,11 +1,0 @@ -package com.example.autopartz.repository; - -import com.example.autopartz.model.Warehouse; -import com.example.autopartz.model.Warehouseman; -import org.springframework.data.jpa.repository.JpaRepository; - -import java.util.List; - -public interface WarehousemanRepository extends JpaRepository { - List findAllByWarehouse(Warehouse warehouse); -} Index: c/main/java/com/example/autopartz/service/CarService.java =================================================================== --- src/main/java/com/example/autopartz/service/CarService.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,10 +1,0 @@ -package com.example.autopartz.service; - -import com.example.autopartz.model.Car; - -import java.util.List; - -public interface CarService { - List findAll(); - Car findById(Integer id); -} Index: c/main/java/com/example/autopartz/service/CategoryService.java =================================================================== --- src/main/java/com/example/autopartz/service/CategoryService.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,9 +1,0 @@ -package com.example.autopartz.service; - -import com.example.autopartz.model.Category; - -import java.util.List; - -public interface CategoryService { - List findAll(); -} Index: c/main/java/com/example/autopartz/service/DeliveryService.java =================================================================== --- src/main/java/com/example/autopartz/service/DeliveryService.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,14 +1,0 @@ -package com.example.autopartz.service; - -import com.example.autopartz.model.Delivery; -import com.example.autopartz.model.Deliveryman; -import com.example.autopartz.model.Order; - -import java.util.List; - -public interface DeliveryService { - List findAllByDeliverer(Deliveryman dm); - Delivery findById(Integer id); - void update(Delivery d); - Delivery findByOrder(Order o); -} Index: c/main/java/com/example/autopartz/service/LoginService.java =================================================================== --- src/main/java/com/example/autopartz/service/LoginService.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,10 +1,0 @@ -package com.example.autopartz.service; - -import com.example.autopartz.model.User; -import com.example.autopartz.model.Warehouse; - -public interface LoginService { - void register(String name, String username, String email, String number, String password, String role); - User login(String username, String password); - void registerWarehouseman(String name, String username, String email, String number, String password, String role, Warehouse warehouse); -} Index: c/main/java/com/example/autopartz/service/OrderService.java =================================================================== --- src/main/java/com/example/autopartz/service/OrderService.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,14 +1,0 @@ -package com.example.autopartz.service; - -import com.example.autopartz.model.Client; -import com.example.autopartz.model.Order; - -import java.util.List; - -public interface OrderService { - List findAll(); - Order createOrderAndAddPartToOrder(Client user, Integer partId, Integer quantity); - Order findById(Integer id); - void save(Order o); -} - Index: c/main/java/com/example/autopartz/service/PartService.java =================================================================== --- src/main/java/com/example/autopartz/service/PartService.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,18 +1,0 @@ -package com.example.autopartz.service; - -import com.example.autopartz.model.Car; -import com.example.autopartz.model.Category; -import com.example.autopartz.model.Part; - -import java.util.List; - -public interface PartService { - List findAll(); - - Part findById(Integer id); - - void addPartToWarehouse(Integer partId, Integer quantity, Integer warehouseId); - - void addPart(String name, String description, Integer manufacturer, List cars, List categories, Integer warehouse, Integer quantity, Integer amount - ); -} Index: c/main/java/com/example/autopartz/service/PriceService.java =================================================================== --- src/main/java/com/example/autopartz/service/PriceService.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,11 +1,0 @@ -package com.example.autopartz.service; - -import com.example.autopartz.model.Part; -import com.example.autopartz.model.Price; - -import java.util.List; - -public interface PriceService { - List findPriceForPart(Part part); - void save(Price p); -} Index: c/main/java/com/example/autopartz/service/RepairService.java =================================================================== --- src/main/java/com/example/autopartz/service/RepairService.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,8 +1,0 @@ -package com.example.autopartz.service; - -import com.example.autopartz.model.Repair; - - -public interface RepairService { - Repair findById(Integer id); -} Index: c/main/java/com/example/autopartz/service/RepairShopService.java =================================================================== --- src/main/java/com/example/autopartz/service/RepairShopService.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,12 +1,0 @@ -package com.example.autopartz.service; - -import com.example.autopartz.model.RepairShop; - -import java.util.List; - -public interface RepairShopService { - List findAll(); - RepairShop getByName(String name); - RepairShop getById(Integer id); - void save(String name, String location, String number, Integer carMId); -} Index: c/main/java/com/example/autopartz/service/UserService.java =================================================================== --- src/main/java/com/example/autopartz/service/UserService.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,16 +1,0 @@ -package com.example.autopartz.service; - -import com.example.autopartz.model.User; - -import java.util.List; - -public interface UserService { - List findAllUsers(); - - User findByUsername(String username); - - User findById(Integer id); - - void addCarSampleForUser(Integer vin, Integer year, Integer power, Integer displacement, String fuel, Integer km, Integer cartype, String username); - -} Index: c/main/java/com/example/autopartz/service/impl/CarServiceImpl.java =================================================================== --- src/main/java/com/example/autopartz/service/impl/CarServiceImpl.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,27 +1,0 @@ -package com.example.autopartz.service.impl; - -import com.example.autopartz.model.Car; -import com.example.autopartz.repository.CarRepository; -import com.example.autopartz.service.CarService; -import org.springframework.stereotype.Service; - -import java.util.List; - -@Service -public class CarServiceImpl implements CarService { - private final CarRepository carRepository; - - public CarServiceImpl(CarRepository carRepository) { - this.carRepository = carRepository; - } - - @Override - public List findAll() { - return carRepository.findAll(); - } - - @Override - public Car findById(Integer id) { - return carRepository.findById(id).get(); - } -} Index: c/main/java/com/example/autopartz/service/impl/CategoryServiceImpl.java =================================================================== --- src/main/java/com/example/autopartz/service/impl/CategoryServiceImpl.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,22 +1,0 @@ -package com.example.autopartz.service.impl; - -import com.example.autopartz.model.Category; -import com.example.autopartz.repository.CategoryRepository; -import com.example.autopartz.service.CategoryService; -import org.springframework.stereotype.Service; - -import java.util.List; - -@Service -public class CategoryServiceImpl implements CategoryService { - private final CategoryRepository categoryRepository; - - public CategoryServiceImpl(CategoryRepository categoryRepository) { - this.categoryRepository = categoryRepository; - } - - @Override - public List findAll() { - return categoryRepository.findAll(); - } -} Index: c/main/java/com/example/autopartz/service/impl/DeliveryServiceImpl.java =================================================================== --- src/main/java/com/example/autopartz/service/impl/DeliveryServiceImpl.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,39 +1,0 @@ -package com.example.autopartz.service.impl; - -import com.example.autopartz.model.Delivery; -import com.example.autopartz.model.Deliveryman; -import com.example.autopartz.model.Order; -import com.example.autopartz.repository.DeliveryRepository; -import com.example.autopartz.service.DeliveryService; -import org.springframework.stereotype.Service; - -import java.util.List; - -@Service -public class DeliveryServiceImpl implements DeliveryService { - private final DeliveryRepository deliveryRepository; - - public DeliveryServiceImpl(DeliveryRepository deliveryRepository) { - this.deliveryRepository = deliveryRepository; - } - - @Override - public List findAllByDeliverer(Deliveryman dm) { - return deliveryRepository.findAllByDeliveryman(dm); - } - - @Override - public Delivery findById(Integer id) { - return deliveryRepository.findById(id).get(); - } - - @Override - public void update(Delivery d) { - deliveryRepository.save(d); - } - - @Override - public Delivery findByOrder(Order o) { - return deliveryRepository.findAllByOrder(o).stream().findFirst().orElseThrow(RuntimeException::new); - } -} Index: c/main/java/com/example/autopartz/service/impl/LoginServiceImpl.java =================================================================== --- src/main/java/com/example/autopartz/service/impl/LoginServiceImpl.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,43 +1,0 @@ -package com.example.autopartz.service.impl; - -import com.example.autopartz.model.*; -import com.example.autopartz.repository.UserRepository; -import com.example.autopartz.service.LoginService; -import org.springframework.stereotype.Service; - -import java.util.Objects; - -@Service -public class LoginServiceImpl implements LoginService { - private final UserRepository userRepository; - - public LoginServiceImpl(UserRepository userRepository) { - this.userRepository = userRepository; - } - - @Override - public void register(String name, String username, String email, String number, String password, String role) { - if (Objects.equals(role, "client")) { - userRepository.save(new Client(username, name, email, password, number)); - } - else { - userRepository.save(new Deliveryman(username, name, email, password, number)); - } - } - - @Override - public User login(String username, String password) { - return userRepository.findAllByUsernameAndPassword(username,password).stream().findFirst().orElseThrow(RuntimeException::new); - } - - @Override - public void registerWarehouseman(String name, String username, String email, String number, String password, String role, Warehouse warehouse) { - userRepository.save(new Warehouseman(username, name, email, password, number, warehouse)); - - } - -// @Override -// public User findByUsername(String username) { -// return userRepository.findAllByUsername(username).stream().findFirst().orElseThrow(RuntimeException::new); -// } -} Index: c/main/java/com/example/autopartz/service/impl/OrderServiceImpl.java =================================================================== --- src/main/java/com/example/autopartz/service/impl/OrderServiceImpl.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,45 +1,0 @@ -package com.example.autopartz.service.impl; - -import com.example.autopartz.model.Client; -import com.example.autopartz.model.Order; -import com.example.autopartz.model.manytomany.OrderContainsPart; -import com.example.autopartz.repository.OrderContainsPartRepository; -import com.example.autopartz.repository.OrderRepository; -import com.example.autopartz.service.OrderService; -import org.springframework.stereotype.Service; - -import javax.transaction.Transactional; -import java.util.List; -@Service -public class OrderServiceImpl implements OrderService { - private final OrderRepository orderRepository; - private final OrderContainsPartRepository orderContainsPartRepository; - - public OrderServiceImpl(OrderRepository orderRepository, OrderContainsPartRepository orderContainsPartRepository) { - this.orderRepository = orderRepository; - this.orderContainsPartRepository = orderContainsPartRepository; - } - - @Override - public List findAll() { - return orderRepository.findAll(); - } - - @Override - @Transactional - public Order createOrderAndAddPartToOrder(Client user, Integer partId, Integer quantity) { - Order order = orderRepository.save(new Order(user)); - orderContainsPartRepository.save(new OrderContainsPart(partId, order.getOrderid(), quantity)); - return order; - } - - @Override - public Order findById(Integer id) { - return orderRepository.findById(id).get(); - } - - @Override - public void save(Order o) { - orderRepository.save(o); - } -} Index: c/main/java/com/example/autopartz/service/impl/PartServiceImpl.java =================================================================== --- src/main/java/com/example/autopartz/service/impl/PartServiceImpl.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,75 +1,0 @@ -package com.example.autopartz.service.impl; - -import com.example.autopartz.model.Car; -import com.example.autopartz.model.Category; -import com.example.autopartz.model.Part; -import com.example.autopartz.model.Price; -import com.example.autopartz.model.manytomany.PartIsAppropriateForCar; -import com.example.autopartz.model.manytomany.PartIsFromCategory; -import com.example.autopartz.model.manytomany.PartIsInStockInWarehouse; -import com.example.autopartz.model.manytomany.PartIsInStockInWarehouseId; -import com.example.autopartz.repository.*; -import com.example.autopartz.service.PartService; -import com.example.autopartz.service.PriceService; -import org.springframework.stereotype.Service; - -import javax.transaction.Transactional; -import java.time.LocalDate; -import java.util.List; - -@Service -public class PartServiceImpl implements PartService { - private final PartRepository partRepository; - private final PartIsInStockInWarehouseRepository partIsInStockInWarehouseRepository; - private final PartIsFromCategoryRepository partIsFromCategoryRepository; - private final PartIsAppropriateForCarRepository partIsAppropriateForCarRepository; - private final WarehouseRepository warehouseRepository; - private final PartManufacturerRepository partManufacturerRepository; - private final PriceService priceService; - - public PartServiceImpl(PartRepository partRepository, PartIsInStockInWarehouseRepository partIsInStockInWarehouseRepository, PartIsFromCategoryRepository partIsFromCategoryRepository, PartIsAppropriateForCarRepository partIsAppropriateForCarRepository, WarehouseRepository warehouseRepository, PartManufacturerRepository partManufacturerRepository, PriceService priceService) { - this.partRepository = partRepository; - this.partIsInStockInWarehouseRepository = partIsInStockInWarehouseRepository; - this.partIsFromCategoryRepository = partIsFromCategoryRepository; - this.partIsAppropriateForCarRepository = partIsAppropriateForCarRepository; - this.warehouseRepository = warehouseRepository; - this.partManufacturerRepository = partManufacturerRepository; - this.priceService = priceService; - } - - @Override - public List findAll() { - return partRepository.findAll(); - } - - @Override - public Part findById(Integer id) { - return partRepository.findById(id).orElseThrow(RuntimeException::new); - } - - @Override - @Transactional - public void addPartToWarehouse(Integer partId, Integer quantity, Integer warehouseId) { - PartIsInStockInWarehouseId tmp = new PartIsInStockInWarehouseId(partId, warehouseId); - PartIsInStockInWarehouse temp = partIsInStockInWarehouseRepository.findById(tmp).get(); - temp.setQuantity(temp.getQuantity() + quantity); - partIsInStockInWarehouseRepository.save(temp); - } - - @Override - @Transactional - public void addPart(String name, String description, Integer manufacturer, List cars, List categories, Integer warehouse, Integer quantity, Integer amount) { - Part newPart = new Part(name, description==null ? "" : description, partManufacturerRepository.findById(manufacturer).get(), - categories, List.of(warehouseRepository.findById(warehouse).get()),cars); - partRepository.save(newPart); - priceService.save(new Price(amount, LocalDate.now(),newPart)); - partIsInStockInWarehouseRepository.save(new PartIsInStockInWarehouse(newPart.getId(),warehouse,quantity)); - for (Category c:categories - ) { - partIsFromCategoryRepository.save(new PartIsFromCategory(newPart.getId(),c.getId())); - } - for (Car car:cars){ - partIsAppropriateForCarRepository.save(new PartIsAppropriateForCar(newPart.getId(),car.getId())); - } - } -} Index: c/main/java/com/example/autopartz/service/impl/PriceServiceImpl.java =================================================================== --- src/main/java/com/example/autopartz/service/impl/PriceServiceImpl.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,29 +1,0 @@ -package com.example.autopartz.service.impl; - -import com.example.autopartz.model.Part; -import com.example.autopartz.model.Price; -import com.example.autopartz.repository.PriceRepository; -import com.example.autopartz.service.PriceService; -import org.springframework.stereotype.Service; - -import java.util.List; - -@Service -public class PriceServiceImpl implements PriceService { - - private final PriceRepository priceRepository; - - public PriceServiceImpl(PriceRepository priceRepository) { - this.priceRepository = priceRepository; - } - - @Override - public List findPriceForPart(Part part) { - return priceRepository.findAllByPart(part); - } - - @Override - public void save(Price p) { - priceRepository.save(p); - } -} Index: c/main/java/com/example/autopartz/service/impl/RepairServiceImpl.java =================================================================== --- src/main/java/com/example/autopartz/service/impl/RepairServiceImpl.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,20 +1,0 @@ -package com.example.autopartz.service.impl; - -import com.example.autopartz.model.Repair; -import com.example.autopartz.repository.RepairRepository; -import com.example.autopartz.service.RepairService; -import org.springframework.stereotype.Service; - -@Service -public class RepairServiceImpl implements RepairService { - private final RepairRepository repairRepository; - - public RepairServiceImpl(RepairRepository repairRepository) { - this.repairRepository = repairRepository; - } - - @Override - public Repair findById(Integer id) { - return repairRepository.findById(id).get(); - } -} Index: c/main/java/com/example/autopartz/service/impl/RepairShopServiceImpl.java =================================================================== --- src/main/java/com/example/autopartz/service/impl/RepairShopServiceImpl.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,49 +1,0 @@ -package com.example.autopartz.service.impl; - -import com.example.autopartz.model.RepairShop; -import com.example.autopartz.model.manytomany.RsForCm; -import com.example.autopartz.repository.CarManufacturerRepository; -import com.example.autopartz.repository.RepairShopRepository; -import com.example.autopartz.repository.RsForCmRepository; -import com.example.autopartz.service.RepairShopService; -import org.springframework.stereotype.Service; - -import javax.transaction.Transactional; -import java.util.List; - -@Service -public class RepairShopServiceImpl implements RepairShopService { - private final RepairShopRepository repairShopRepository; - private final CarManufacturerRepository carManufacturerRepository; - private final RsForCmRepository rsForCmRepository; - - public RepairShopServiceImpl(RepairShopRepository repairShopRepository, CarManufacturerRepository carManufacturerRepository, RsForCmRepository rsForCmRepository) { - this.repairShopRepository = repairShopRepository; - this.carManufacturerRepository = carManufacturerRepository; - this.rsForCmRepository = rsForCmRepository; - } - - @Override - public List findAll() { - return repairShopRepository.findAll(); - } - - @Override - public RepairShop getByName(String name) { - return repairShopRepository.getRepairShopByName(name); - } - - @Override - public RepairShop getById(Integer id) { - return repairShopRepository.findById(id).get(); - } - - @Override - @Transactional - public void save(String name, String location, String number, Integer carMId) { - RepairShop newRs = new RepairShop(name,location,number, - List.of(carManufacturerRepository.findById(carMId).get())); - repairShopRepository.save(newRs); - rsForCmRepository.save(new RsForCm(newRs.getId(), carMId)); - } -} Index: c/main/java/com/example/autopartz/service/impl/UserServiceImpl.java =================================================================== --- src/main/java/com/example/autopartz/service/impl/UserServiceImpl.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,50 +1,0 @@ -package com.example.autopartz.service.impl; - -import com.example.autopartz.model.*; -import com.example.autopartz.repository.CarRepository; -import com.example.autopartz.repository.CarSampleRepository; -import com.example.autopartz.repository.ServiceBookRepository; -import com.example.autopartz.repository.UserRepository; -import com.example.autopartz.service.UserService; -import org.springframework.stereotype.Service; - -import javax.transaction.Transactional; -import java.util.List; - -@Service -public class UserServiceImpl implements UserService { - private final UserRepository userRepository; - private final CarRepository carRepository; - private final CarSampleRepository carSampleRepository; - private final ServiceBookRepository serviceBookRepository; - - public UserServiceImpl(UserRepository userRepository, CarRepository carRepository, CarSampleRepository carSampleRepository, ServiceBookRepository serviceBookRepository) { - this.userRepository = userRepository; - this.carRepository = carRepository; - this.carSampleRepository = carSampleRepository; - this.serviceBookRepository = serviceBookRepository; - } - - @Override - public List findAllUsers() { - return userRepository.findAll(); - } - - @Override - public User findByUsername(String username) { - return userRepository.findAllByUsername(username).stream().findFirst().orElseThrow(RuntimeException::new); - } - - @Override - public User findById(Integer id) { - return userRepository.findById(id).get(); - } - - @Override - @Transactional - public void addCarSampleForUser(Integer vin, Integer year, Integer power, Integer displacement, String fuel, Integer km, Integer cartype, String username) { - CarSample cs = new CarSample(vin, year, power, displacement, fuel, km, (Client) this.findByUsername(username), carRepository.findById(cartype).get()); - carSampleRepository.save(cs); - serviceBookRepository.save(new ServiceBook(cs)); - } -} Index: c/main/resources/application-prod.properties =================================================================== --- src/main/resources/application-prod.properties (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,16 +1,0 @@ -## PostgreSQL -spring.datasource.url=jdbc:postgresql://localhost:5444/db_202223z_va_prj_autopartzmk -spring.datasource.username=db_202223z_va_prj_autopartzmk_owner -spring.datasource.password=ce8a327b3b72 - - -## default connection pool -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.properties.hibernate.default_schema=project - -spring.jpa.hibernate.ddl-auto=validate -spring.jpa.show-sql=true Index: c/main/resources/application.properties =================================================================== --- src/main/resources/application.properties (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,3 +1,0 @@ -server.port=9999 -spring.profiles.active=prod -spring.jpa.properties.hibernate.default_schema=project Index: c/main/resources/templates/access_denied.html =================================================================== --- src/main/resources/templates/access_denied.html (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,3 +1,0 @@ -
- You don't have access to this page -
Index: c/main/resources/templates/addCar.html =================================================================== --- src/main/resources/templates/addCar.html (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,28 +1,0 @@ -
- -
Index: c/main/resources/templates/addCarManufacturer.html =================================================================== --- src/main/resources/templates/addCarManufacturer.html (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,14 +1,0 @@ -
- -
Index: c/main/resources/templates/addCarSampleForUser.html =================================================================== --- src/main/resources/templates/addCarSampleForUser.html (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,45 +1,0 @@ -
- -
Index: c/main/resources/templates/addCategory.html =================================================================== --- src/main/resources/templates/addCategory.html (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,10 +1,0 @@ -
- -
Index: c/main/resources/templates/addPart.html =================================================================== --- src/main/resources/templates/addPart.html (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,69 +1,0 @@ -
- -
Index: c/main/resources/templates/addPartManufacturer.html =================================================================== --- src/main/resources/templates/addPartManufacturer.html (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,14 +1,0 @@ -
- -
Index: c/main/resources/templates/addRepairShop.html =================================================================== --- src/main/resources/templates/addRepairShop.html (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,27 +1,0 @@ -
- -
Index: c/main/resources/templates/addReviewPage.html =================================================================== --- src/main/resources/templates/addReviewPage.html (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,16 +1,0 @@ -
-
- -
-
Index: c/main/resources/templates/addWarehouse.html =================================================================== --- src/main/resources/templates/addWarehouse.html (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,10 +1,0 @@ -
- -
Index: c/main/resources/templates/carCategoryReport.html =================================================================== --- src/main/resources/templates/carCategoryReport.html (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,19 +1,0 @@ -
-

Извештај за сите категории и за кој прозиводител на коли биле купени највеќе делови од таа категорија

- - - - - - - - - - - - - - - -
КатегоријаПроизводител на колаБрој на делови
-
Index: c/main/resources/templates/chooseRepairShop.html =================================================================== --- src/main/resources/templates/chooseRepairShop.html (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,18 +1,0 @@ -
-

-
-

Достава до овластен сервис

- -
-
Index: c/main/resources/templates/currentOrder.html =================================================================== --- src/main/resources/templates/currentOrder.html (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,34 +1,0 @@ -
-

-
-
- -
-

- Тековна нарачка за корисник : -

- - - - - - - - - - - - - - - - - - -
ИмеПроизводителКоличинаВкупна цена
-

Вкупен износ :

-
- -
-
-
Index: c/main/resources/templates/deliveryForPart.html =================================================================== --- src/main/resources/templates/deliveryForPart.html (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,33 +1,0 @@ -
-
-

Податоци за достава

-
-
-

Достава до дома

- -

Достава до овластен сервис

-

-
- -
-
- -
Index: c/main/resources/templates/filteredParts.html =================================================================== --- src/main/resources/templates/filteredParts.html (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,44 +1,0 @@ -
-

Резултат од филтерот

-Врати се на сите производи -
- - - -
-

-
- - - - - - - - - - - - - - - -
ИмеПроизводителДетали
-
- -
-
-
-
Index: c/main/resources/templates/fragments/footer.html =================================================================== --- src/main/resources/templates/fragments/footer.html (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,46 +1,0 @@ - Index: c/main/resources/templates/fragments/header.html =================================================================== --- src/main/resources/templates/fragments/header.html (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,138 +1,0 @@ -
- -
Index: c/main/resources/templates/home.html =================================================================== --- src/main/resources/templates/home.html (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,16 +1,0 @@ -
-

Авто делови AutoPartz.MK - онлајн продавница

-
-
-

Се за вашиот автомобил

-

Избор од голем број на производители

-
-
- Image -
-
- - -
Index: c/main/resources/templates/login.html =================================================================== --- src/main/resources/templates/login.html (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,19 +1,0 @@ -
-
-
- - -

- - -

-

- - -

- - -
- -Регистрирај се -
Index: c/main/resources/templates/master-template.html =================================================================== --- src/main/resources/templates/master-template.html (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,22 +1,0 @@ - - - - - AutoPartz - - - - - - -
- -
- -
- -
- - - Index: c/main/resources/templates/mostPurchasedPart.html =================================================================== --- src/main/resources/templates/mostPurchasedPart.html (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,19 +1,0 @@ -
-

Најкупуван производ

- - - - - - - - - - - - - - - -
КатегоријаИме на делотКоличина
-
Index: c/main/resources/templates/myDeliveries.html =================================================================== --- src/main/resources/templates/myDeliveries.html (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,24 +1,0 @@ -
-

Мои достави

- - - - - - - - - - - - - - - - - - -
Статус на доставаАдреса на доставаБрој на нарачкаДатум на нарачка
-
Index: c/main/resources/templates/myNextDeliveries.html =================================================================== --- src/main/resources/templates/myNextDeliveries.html (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,30 +1,0 @@ -
-

Мои следни достави

-

-
- - - - - - - - - - - - - - - - - - - -
Статус на доставаАдреса на доставаБрој на нарачкаДатум на нарачкаДетали за нарачка
-
- -
-
-
-
Index: c/main/resources/templates/myWarehouse.html =================================================================== --- src/main/resources/templates/myWarehouse.html (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,19 +1,0 @@ -
-

Мој магацин

- - - - - - - - - - - - - - - -
МагацинДелКоличина
-
Index: c/main/resources/templates/myWarehouseReport.html =================================================================== --- src/main/resources/templates/myWarehouseReport.html (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,33 +1,0 @@ -
- - - - - - - - - - - - - - - - - - - - - - - -
МагацинИме на делМоментално нарачаниМоментално достапниПотрошени во последните 3 месециДали треба да се нарача?Нарачај
-
- - -
-
-
Index: c/main/resources/templates/orderInfo.html =================================================================== --- src/main/resources/templates/orderInfo.html (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,22 +1,0 @@ -
-

Нарачка број

- - - - - - - - - - - - - - - -
Име на делотКоличинаПроизводител на делот
-
- -
-
Index: c/main/resources/templates/ordersForUser.html =================================================================== --- src/main/resources/templates/ordersForUser.html (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,23 +1,0 @@ -
-

Мои нарачки

- - - - - - - - - - - - - - - - - - - -
Датум на нарачкаНарачан делЦенаКоличинаСтатус
-
Index: c/main/resources/templates/partManufacturersReport.html =================================================================== --- src/main/resources/templates/partManufacturersReport.html (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,23 +1,0 @@ -
-

Извештај за производителите на авто делови, колку делови од тој производител се продаваат за секоја четвртина од минатата година

- - - - - - - - - - - - - - - - - - - -
Производител на деловиПрва четвртинаВтора четвртинаТрета четвртинаЧетврта четвртина
-
Index: c/main/resources/templates/partinfo.html =================================================================== --- src/main/resources/templates/partinfo.html (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,29 +1,0 @@ -
-

Детали за делот

- Назад кон сите продукти - - - - - - - - - - - - - - - - - -
ИмеОписПроизводителЦена
денари
- -
- - -
-
Index: c/main/resources/templates/products.html =================================================================== --- src/main/resources/templates/products.html (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,41 +1,0 @@ -
-
-

Сите производи

-
- - - -
- - - - - - - - - - - - - - - -
ИмеПроизводителДетали
-
- -
-
-
-
Index: c/main/resources/templates/register.html =================================================================== --- src/main/resources/templates/register.html (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,44 +1,0 @@ -
-
-
- - -

- - -

-

- - -

-

- - -

-

- - -

-

- - -

-

- - -

-

- -

- - -
- -Веќе имате сметка? Најавете се -
Index: c/main/resources/templates/repairsForUser.html =================================================================== --- src/main/resources/templates/repairsForUser.html (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,32 +1,0 @@ -
-

Мои поправки

- - - - - - - - - - - - - - - - - - - -
Број на поправкаДатум на нарачкаБрој на нарачкаИме на сервисДодај критика
-
-
- -
-
-
- Веќе има критика -
-
-
Index: c/main/resources/templates/reviewsForUser.html =================================================================== --- src/main/resources/templates/reviewsForUser.html (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,23 +1,0 @@ -
-

Мои критики

- - - - - - - - - - - - - - - - - - - -
ОценкаКоментарИме на сервисЛокација на сервисЗа нарачка број
-
Index: c/main/resources/templates/selectWarehouse.html =================================================================== --- src/main/resources/templates/selectWarehouse.html (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,12 +1,0 @@ -
-

Одбери овластен сервис

- -
Index: c/main/resources/templates/services.html =================================================================== --- src/main/resources/templates/services.html (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,21 +1,0 @@ -
-
-

Информации за сервиси

- - - - - - - - - - - - - - - -
Име на сервисБрој на критикиПросечна оценка
-
-
Index: c/main/resources/templates/viewUsers.html =================================================================== --- src/main/resources/templates/viewUsers.html (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,30 +1,0 @@ -
-
-

Нема корисници за одобрување

-
-
-

Корисници за одобрување

- - - - - - - - - - - - - - - - - -
ИмеКорисничко имеУлогаОдобри
-
- -
-
-
-
Index: c/test/java/com/example/autopartz/AutoPartzApplicationTests.java =================================================================== --- src/test/java/com/example/autopartz/AutoPartzApplicationTests.java (revision 2a552fe252508ef26ee2a3e2b504f88d6ff7e5ae) +++ (revision ) @@ -1,13 +1,0 @@ -package com.example.autopartz; - -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.context.SpringBootTest; - -@SpringBootTest -class AutoPartzApplicationTests { - - @Test - void contextLoads() { - } - -}