Index: llyStocked/.gitignore =================================================================== --- FullyStocked/.gitignore (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,33 +1,0 @@ -HELP.md -target/ -!.mvn/wrapper/maven-wrapper.jar -!**/src/main/**/target/ -!**/src/test/**/target/ - -### STS ### -.apt_generated -.classpath -.factorypath -.project -.settings -.springBeans -.sts4-cache - -### IntelliJ IDEA ### -.idea -*.iws -*.iml -*.ipr - -### NetBeans ### -/nbproject/private/ -/nbbuild/ -/dist/ -/nbdist/ -/.nb-gradle/ -build/ -!**/src/main/**/build/ -!**/src/test/**/build/ - -### VS Code ### -.vscode/ Index: llyStocked/.mvn/wrapper/maven-wrapper.properties =================================================================== --- FullyStocked/.mvn/wrapper/maven-wrapper.properties (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (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: llyStocked/mvnw =================================================================== --- FullyStocked/mvnw (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (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: llyStocked/mvnw.cmd =================================================================== --- FullyStocked/mvnw.cmd (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (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: llyStocked/pom.xml =================================================================== --- FullyStocked/pom.xml (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,79 +1,0 @@ - - - 4.0.0 - - org.springframework.boot - spring-boot-starter-parent - 2.7.4 - - - com.bazi - FullyStocked - 0.0.1-SNAPSHOT - FullyStocked - FullyStocked - - 17 - - - - org.springframework.boot - spring-boot-starter-thymeleaf - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-data-jpa - - - org.postgresql - postgresql - - - org.projectlombok - lombok - true - - - org.springframework.boot - spring-boot-starter-test - test - - - org.springframework.boot - spring-boot-starter-data-jpa - - - jakarta.validation - jakarta.validation-api - 2.0.2 - - - org.springframework.security - spring-security-crypto - 5.7.5 - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - org.projectlombok - lombok - - - - - - - - Index: llyStocked/src/main/java/com/bazi/fullystocked/Filter/LoginFilter.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Filter/LoginFilter.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,40 +1,0 @@ -package com.bazi.fullystocked.Filter; - -import com.bazi.fullystocked.Models.User; - -import javax.servlet.*; -import javax.servlet.annotation.WebFilter; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; - -@WebFilter -public class LoginFilter implements Filter { - @Override - public void init(FilterConfig filterConfig) throws ServletException { - - } - - @Override - public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException { - - HttpServletRequest request = (HttpServletRequest) servletRequest; - HttpServletResponse response = (HttpServletResponse) servletResponse; - - User user = (User)request.getSession().getAttribute("user"); - - String path = request.getServletPath(); - - if (!"/".equals(path) && !"/home".equals(path) && !"/register".equals(path) && !"/login".equals(path) && user==null) { - response.sendRedirect("/login"); - } else { - filterChain.doFilter(servletRequest,servletResponse); - } - - } - - @Override - public void destroy() { - - } -} Index: llyStocked/src/main/java/com/bazi/fullystocked/FullyStockedApplication.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/FullyStockedApplication.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,25 +1,0 @@ -package com.bazi.fullystocked; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.web.servlet.ServletComponentScan; -import org.springframework.context.annotation.Bean; -import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; -import org.springframework.security.crypto.password.PasswordEncoder; - -@SpringBootApplication -@ServletComponentScan -public class FullyStockedApplication { - - public static void main(String[] args) { - SpringApplication.run(FullyStockedApplication.class, args); - } - - @Bean - PasswordEncoder passwordEncoder() - { - return new BCryptPasswordEncoder(10); - } - - -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Models/AnswerId.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Models/AnswerId.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,33 +1,0 @@ -package com.bazi.fullystocked.Models; - -import lombok.Getter; -import lombok.Setter; - -import javax.persistence.*; -import java.io.Serializable; -import java.util.Objects; - -@Embeddable -@Getter -@Setter -public class AnswerId implements Serializable { - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Integer answerid; - @ManyToOne - @JoinColumn(name="questionid") - private Questions question; - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - AnswerId answerId = (AnswerId) o; - return answerid.equals(answerId.answerid) && question.equals(answerId.question); - } - - @Override - public int hashCode() { - return Objects.hash(answerid, question); - } - - -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Models/Answers.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Models/Answers.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,32 +1,0 @@ -package com.bazi.fullystocked.Models; - - -import lombok.Data; -import lombok.NoArgsConstructor; - -import javax.persistence.*; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.time.LocalDateTime; - -@Entity -@NoArgsConstructor -@Data -public class Answers { - @EmbeddedId - private AnswerId answerId; - private LocalDateTime datecreated; - @NotNull(message = "The answer must have content") - @NotEmpty(message = "The location must have content") - @Column(nullable = false) - private String answertext; - - public Answers(Questions question, Integer answerCount, String answertext) { - this.datecreated = LocalDateTime.now(); - this.answertext = answertext; - this.answerId=new AnswerId(); - this.answerId.setAnswerid(answerCount); - this.answerId.setQuestion(question); - } -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Models/Articles.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Models/Articles.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,50 +1,0 @@ -package com.bazi.fullystocked.Models; - -import lombok.Data; -import lombok.NoArgsConstructor; - -import javax.persistence.*; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.util.ArrayList; -import java.util.List; - -@Data -@Entity -@NoArgsConstructor -public class Articles { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Integer articleid; - @Column(nullable = false) - @NotNull(message = "Article must have description") - @NotEmpty(message = "Article must have description") - private String description; - @Column(nullable = false) - @NotNull(message = "Article must have name") - @NotEmpty(message = "Article must have name") - private String articlename; - private String imageurl; - @Column(nullable = false) - @NotNull(message = "Article must have max quantity") - private int maxquantityperlocation; - @ManyToMany - @JoinTable(name = "article_belongs_to_category", - joinColumns = @JoinColumn(name = "articleid"), - inverseJoinColumns = @JoinColumn(name = "categoryid") - ) - private List categoryList=new ArrayList<>(); - - public Articles(String description, String articlename, int maxquantityperlocation) { - this.description = description; - this.articlename = articlename; - this.maxquantityperlocation = maxquantityperlocation; - } - - public Articles(String description, String articlename, String imageurl, int maxquantityperlocation) { - this.description = description; - this.articlename = articlename; - this.imageurl = imageurl; - this.maxquantityperlocation = maxquantityperlocation; - } -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Models/Categories.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Models/Categories.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,37 +1,0 @@ -package com.bazi.fullystocked.Models; - -import lombok.Data; -import lombok.NoArgsConstructor; - -import javax.persistence.*; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.util.ArrayList; -import java.util.List; - -@Data -@Entity -@NoArgsConstructor -public class Categories { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Integer categoryid; - @Column(nullable = false) - @NotNull(message = "Category must have name") - @NotEmpty(message = "Category must have name") - private String categoryname; - @Column(nullable = false) - @NotNull(message = "Category must have description") - @NotEmpty(message = "Category must have description") - private String description; - @ManyToMany(mappedBy = "categoryList") - private List articlesList=new ArrayList<>(); - @ManyToMany(mappedBy = "categoryList") - private List suppliersList=new ArrayList<>(); - - - public Categories(String categoryname, String description) { - this.categoryname = categoryname; - this.description = description; - } -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Models/DTO/ArticleAnalysisDTO.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Models/DTO/ArticleAnalysisDTO.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,14 +1,0 @@ -package com.bazi.fullystocked.Models.DTO; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@AllArgsConstructor -@NoArgsConstructor -public class ArticleAnalysisDTO { - String articlename; - String locationname; - String defict; -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Models/DTO/LocationAnalysisDTO.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Models/DTO/LocationAnalysisDTO.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,15 +1,0 @@ -package com.bazi.fullystocked.Models.DTO; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.math.BigInteger; - -@Data -@AllArgsConstructor -@NoArgsConstructor -public class LocationAnalysisDTO { - String locationname; - BigInteger profit; -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Models/DTO/TopUsersDTO.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Models/DTO/TopUsersDTO.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,22 +1,0 @@ -package com.bazi.fullystocked.Models.DTO; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.math.BigInteger; - -@Data -@AllArgsConstructor -@NoArgsConstructor -public class TopUsersDTO { - String firstname; - String lastname; - String username; - String email; - BigInteger topinvoicesum; - String toparticlename; - Integer toparticleprice; - Integer toparticlequantity; - Integer toparticletotalprice; -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Models/Enumerations/ArticleStatus.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Models/Enumerations/ArticleStatus.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,16 +1,0 @@ -package com.bazi.fullystocked.Models.Enumerations; - -public enum ArticleStatus { - ORDERED("Ordered"), DELIVERED("Delivered"), PROCESSED("Processed"); - private String name; - - ArticleStatus(String s) { - this.name=s; - } - public String getName() { - return this.name; - } - public String toString() { - return name; - } -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Models/Enumerations/OrderPriority.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Models/Enumerations/OrderPriority.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,16 +1,0 @@ -package com.bazi.fullystocked.Models.Enumerations; - -public enum OrderPriority { - LOW("Low"), MEDIUM("Medium"), HIGH("High"); - private String name; - - OrderPriority(String s) { - this.name=s; - } - public String getName() { - return this.name; - } - public String toString() { - return name; - } -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Models/Enumerations/OrderStatus.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Models/Enumerations/OrderStatus.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,23 +1,0 @@ -package com.bazi.fullystocked.Models.Enumerations; - -public enum OrderStatus { - CREATED("Created"), - SENT("Sent"), - APPROVED("Approved"), - CANCELED("Canceled"), - IN_PROGRESS("In progress"), - DELIVERED("Delivered"), - REJECTED("Rejected"), - PROCESSED("Processed"); - private String name; - - OrderStatus(String s) { - this.name=s; - } - public String getName() { - return this.name; - } - public String toString() { - return name; - } -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Models/Exceptions/ArticleAlreadyInInvoiceException.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Models/Exceptions/ArticleAlreadyInInvoiceException.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,7 +1,0 @@ -package com.bazi.fullystocked.Models.Exceptions; - -public class ArticleAlreadyInInvoiceException extends RuntimeException{ - public ArticleAlreadyInInvoiceException() { - super("Article is already added to the invoice"); - } -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Models/Exceptions/ArticleAlreadyInOrderException.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Models/Exceptions/ArticleAlreadyInOrderException.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,7 +1,0 @@ -package com.bazi.fullystocked.Models.Exceptions; - -public class ArticleAlreadyInOrderException extends RuntimeException{ - public ArticleAlreadyInOrderException() { - super("Article is already added to the order"); - } -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Models/Exceptions/ArticleAlreadyInQuestionException.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Models/Exceptions/ArticleAlreadyInQuestionException.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,7 +1,0 @@ -package com.bazi.fullystocked.Models.Exceptions; - -public class ArticleAlreadyInQuestionException extends RuntimeException{ - public ArticleAlreadyInQuestionException() { - super("Article is already added to the question"); - } -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Models/Exceptions/ArticleMaxQuantityException.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Models/Exceptions/ArticleMaxQuantityException.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,7 +1,0 @@ -package com.bazi.fullystocked.Models.Exceptions; - -public class ArticleMaxQuantityException extends RuntimeException{ - public ArticleMaxQuantityException() { - super("The order exceeds the maximum allowed quantity of the article"); - } -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Models/Exceptions/ArticleNotAvailableException.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Models/Exceptions/ArticleNotAvailableException.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,7 +1,0 @@ -package com.bazi.fullystocked.Models.Exceptions; - -public class ArticleNotAvailableException extends RuntimeException{ - public ArticleNotAvailableException() { - super("The article is not available in the asked quantity"); - } -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Models/Exceptions/InvalidArgumentsException.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Models/Exceptions/InvalidArgumentsException.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,8 +1,0 @@ -package com.bazi.fullystocked.Models.Exceptions; - -public class InvalidArgumentsException extends RuntimeException { - - public InvalidArgumentsException() { - super("Invalid arguments"); - } -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Models/Exceptions/InvalidUserCredentialsException.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Models/Exceptions/InvalidUserCredentialsException.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,8 +1,0 @@ -package com.bazi.fullystocked.Models.Exceptions; - -public class InvalidUserCredentialsException extends RuntimeException { - - public InvalidUserCredentialsException() { - super("Invalid user credentials"); - } -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Models/Exceptions/UserNotFoundException.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Models/Exceptions/UserNotFoundException.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,11 +1,0 @@ -package com.bazi.fullystocked.Models.Exceptions; - -import org.springframework.http.HttpStatus; -import org.springframework.web.bind.annotation.ResponseStatus; - -public class UserNotFoundException extends RuntimeException{ - - public UserNotFoundException(String username) { - super(String.format("User with username: %s was not found", username)); - } -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Models/Exceptions/UsernameAlreadyExistsException.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Models/Exceptions/UsernameAlreadyExistsException.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,7 +1,0 @@ -package com.bazi.fullystocked.Models.Exceptions; - -public class UsernameAlreadyExistsException extends RuntimeException{ - public UsernameAlreadyExistsException(String username) { - super(String.format("User with username: %s already exists", username)); - } -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Models/InvoicedArticles.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Models/InvoicedArticles.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,39 +1,0 @@ -package com.bazi.fullystocked.Models; - -import lombok.Data; -import lombok.NoArgsConstructor; - -import javax.persistence.*; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; - -@Data -@Entity -@NoArgsConstructor -@Table(name="invoicedarticles") -public class InvoicedArticles { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Integer iarticleid; - @Column(nullable = false) - @NotNull(message = "Invoiced Article must have price") - @Min(0) - private int price; - @Column(nullable = false) - @NotNull(message = "Invoiced Article must have quantity") - @Min(0) - private int quantity; - @ManyToOne - @JoinColumn(name = "invoiceid") - private Invoices invoice; - @ManyToOne - @JoinColumn(name = "articleid") - private Articles article; - - public InvoicedArticles(int price, int quantity, Invoices invoice, Articles article) { - this.price = price; - this.quantity = quantity; - this.invoice = invoice; - this.article = article; - } -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Models/Invoices.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Models/Invoices.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,48 +1,0 @@ -package com.bazi.fullystocked.Models; - -import lombok.Data; -import lombok.NoArgsConstructor; - -import javax.persistence.*; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.time.LocalDateTime; -import java.util.*; - -@Data -@Entity -@NoArgsConstructor -public class Invoices { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Integer invoiceid; - private String customername; - private String customerphone; - private String street; - private int streetnumber; - private String city; - @Column(nullable = false) - @NotNull(message = "Invoice must have creation date") - private LocalDateTime datecreate; - @ManyToOne - @JoinColumn(name = "workeruserid") - private Workers worker; - @OneToMany(mappedBy = "invoice") - private ListarticlesList=new ArrayList<>(); - - public Invoices(Workers worker) { - - this.datecreate = LocalDateTime.now(); - this.worker = worker; - } - - public Invoices(String customername, String customerphone, String street, int streetnumber, String city, Workers worker) { - this.customername = customername; - this.customerphone = customerphone; - this.street = street; - this.streetnumber = streetnumber; - this.city = city; - this.worker = worker; - this.datecreate=LocalDateTime.now(); - } -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Models/Locations.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Models/Locations.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,44 +1,0 @@ -package com.bazi.fullystocked.Models; - -import lombok.Data; -import lombok.NoArgsConstructor; - -import javax.persistence.*; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; - -@Data -@Entity -@NoArgsConstructor -public class Locations { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Integer locationid; - @Column(nullable = false) - @NotNull(message = "Location must have name") - @NotEmpty(message = "Location must have name") - private String locationname; - @Column(nullable = false) - @NotNull(message = "Location must have phone") - @NotEmpty(message = "Location must have phone") - private String phone; - @Column(nullable = false) - @NotNull(message = "Location must have street") - @NotEmpty(message = "Location must have street") - private String street; - @Column(nullable = false) - @NotNull(message = "Location must have street number") - private Integer streetnumber; - @Column(nullable = false) - @NotNull(message = "Location must have city") - @NotEmpty(message = "Location must have city") - private String city; - - public Locations(String locationname, String phone, String street, Integer streetnumber, String city) { - this.locationname = locationname; - this.phone = phone; - this.street = street; - this.streetnumber = streetnumber; - this.city = city; - } -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Models/Managers.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Models/Managers.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,17 +1,0 @@ -package com.bazi.fullystocked.Models; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -import javax.persistence.Entity; - -@Entity -@EqualsAndHashCode(callSuper = true) -@Data -@NoArgsConstructor -public class Managers extends User{ - public Managers(String firstname, String lastname, String username, String email, String password) { - super(firstname, lastname, username, email, password); - } -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Models/OrderedArticles.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Models/OrderedArticles.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,46 +1,0 @@ -package com.bazi.fullystocked.Models; - -import com.bazi.fullystocked.Models.Enumerations.ArticleStatus; -import lombok.Data; -import lombok.NoArgsConstructor; - -import javax.persistence.*; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; - -@Data -@Entity -@NoArgsConstructor -@Table(name="orderedarticles") -public class OrderedArticles { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Integer oarticleid; - private Integer price; - @Column(nullable = false) - @NotNull(message = "Ordered Article must have quantity") - @Min(0) - private int quantity; - @Column(nullable = false) - @Enumerated(EnumType.STRING) - private ArticleStatus articlestatus; - @ManyToOne - @JoinColumn(name = "orderid") - private Orders order; - @ManyToOne - @JoinColumn(name = "locationid") - private Locations location; - @ManyToOne - @JoinColumn(name = "articleid") - private Articles article; - - public OrderedArticles(int quantity, Orders order, Locations location, Articles article) { - this.quantity = quantity; - this.articlestatus = ArticleStatus.ORDERED; - this.order = order; - this.location = location; - this.article = article; - this.price= null; - } -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Models/Orders.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Models/Orders.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,50 +1,0 @@ -package com.bazi.fullystocked.Models; - -import com.bazi.fullystocked.Models.Enumerations.OrderPriority; -import com.bazi.fullystocked.Models.Enumerations.OrderStatus; -import lombok.Data; -import lombok.NoArgsConstructor; - -import javax.persistence.*; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.time.LocalDateTime; -import java.util.*; - -@Data -@Entity -@NoArgsConstructor -public class Orders { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Integer orderid; - @Column(nullable = false) - @Enumerated(EnumType.STRING) - private OrderStatus status; - private String supplierremark; - private String managerremark; - @Column(nullable = false) - @NotNull(message = "Order must have creation date") - private LocalDateTime datecreated; - private LocalDateTime dateapproved; - private LocalDateTime datedelivered; - @Column(nullable = false) - @Enumerated(EnumType.STRING) - private OrderPriority priority; - @ManyToOne - @JoinColumn(name = "manageruserid") - private Managers manager; - @ManyToOne - @JoinColumn(name = "supplieruserid") - private Suppliers supplier; - @OneToMany(mappedBy="order") - private List articlesList=new ArrayList<>(); - - public Orders(OrderPriority priority, Managers manager, Suppliers supplier) { - this.status = OrderStatus.CREATED; - this.datecreated = LocalDateTime.now(); - this.priority = priority; - this.manager = manager; - this.supplier = supplier; - } -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Models/Questions.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Models/Questions.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,43 +1,0 @@ -package com.bazi.fullystocked.Models; - -import lombok.Data; -import lombok.NoArgsConstructor; - -import javax.persistence.*; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.List; - -@Data -@Entity -@NoArgsConstructor -public class Questions { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Integer questionid; - @Column(nullable = false) - @NotNull(message = "Question must have content") - @NotEmpty(message = "Question must have content") - private String questiontext; - @Column(nullable = false) - @NotNull(message = "Question must have creation date") - private LocalDateTime datecreated; - @ManyToOne - @JoinColumn(name = "workeruserid") - private Workers worker; - @ManyToOne - @JoinColumn(name = "manageruserid") - private Managers manager; - @ManyToMany(mappedBy = "questionsList") - private List storedarticlesList=new ArrayList<>(); - - - public Questions(String questiontext, Workers worker, Managers manager) { - this.questiontext = questiontext; - this.datecreated = LocalDateTime.now(); - this.worker = worker; - this.manager = manager; - } -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Models/SqlViews/ArticlesAndCategoriesId.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Models/SqlViews/ArticlesAndCategoriesId.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,30 +1,0 @@ -package com.bazi.fullystocked.Models.SqlViews; - -import lombok.Getter; -import lombok.Setter; - -import javax.persistence.Embeddable; -import javax.persistence.Id; -import java.io.Serializable; -import java.util.Objects; - -@Embeddable -@Getter -@Setter -public class ArticlesAndCategoriesId implements Serializable { - private Integer categoryid; - private Integer articleid; - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - ArticlesAndCategoriesId that = (ArticlesAndCategoriesId) o; - return categoryid.equals(that.categoryid) && articleid.equals(that.articleid); - } - - @Override - public int hashCode() { - return Objects.hash(categoryid, articleid); - } -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Models/SqlViews/ArticlesAndCategoriesReport.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Models/SqlViews/ArticlesAndCategoriesReport.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,20 +1,0 @@ -package com.bazi.fullystocked.Models.SqlViews; - -import lombok.Getter; -import org.hibernate.annotations.Immutable; - -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; - -@Entity -@Immutable -@Getter -@Table(name = "articles_and_cats_report") -public class ArticlesAndCategoriesReport { - @EmbeddedId - private ArticlesAndCategoriesId id; - private String categoryname; - private String articlename; -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Models/SqlViews/ArticlesAtLocationReport.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Models/SqlViews/ArticlesAtLocationReport.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,26 +1,0 @@ -package com.bazi.fullystocked.Models.SqlViews; - -import lombok.Getter; -import org.hibernate.annotations.Immutable; - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; - -@Entity -@Immutable -@Getter -@Table(name = "articles_at_location") -public class ArticlesAtLocationReport { - @Id - private Integer sarticleid; - private Integer locationid; - private String locationname; - private Integer articleid; - private String description; - private String articlename; - private String imageurl; - private int maxquantityperlocation; - private int quantity; - -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Models/SqlViews/ArticlesReport.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Models/SqlViews/ArticlesReport.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,54 +1,0 @@ -package com.bazi.fullystocked.Models.SqlViews; - -import org.hibernate.annotations.Immutable; - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; - -@Entity -@Immutable -@Table(name = "articles_report") -public class ArticlesReport { - @Id - private Integer sarticleid; - private Integer articleid; - private String articlename; - private String description; - private String imageurl; - private int quantity; - private String locationname; - private Integer locationid; - - public Integer getSarticleid() { - return sarticleid; - } - - public Integer getArticleid() { - return articleid; - } - - public String getArticlename() { - return articlename; - } - - public String getDescription() { - return description; - } - - public String getImageurl() { - return imageurl; - } - - public int getQuantity() { - return quantity; - } - - public String getLocationname() { - return locationname; - } - - public Integer getLocationid() { - return locationid; - } -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Models/SqlViews/InvoicedArticlesReport.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Models/SqlViews/InvoicedArticlesReport.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,24 +1,0 @@ -package com.bazi.fullystocked.Models.SqlViews; - -import com.bazi.fullystocked.Models.Enumerations.ArticleStatus; -import lombok.Getter; -import org.hibernate.annotations.Immutable; - -import javax.persistence.*; - -@Entity -@Immutable -@Getter -@Table(name = "invoiced_articles_report") -public class InvoicedArticlesReport { - @Id - private Integer iarticleid; - private Integer articleid; - private String description; - private String articlename; - private String imageurl; - private int maxquantityperlocation; - private int quantity; - private int price; - private int invoiceid; -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Models/SqlViews/OrderedArticlesReport.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Models/SqlViews/OrderedArticlesReport.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,30 +1,0 @@ -package com.bazi.fullystocked.Models.SqlViews; - -import com.bazi.fullystocked.Models.Enumerations.ArticleStatus; -import lombok.Getter; -import lombok.ToString; -import org.hibernate.annotations.Immutable; - -import javax.persistence.*; - -@Entity -@Immutable -@Getter -@ToString -@Table(name = "ordered_articles_report") -public class OrderedArticlesReport { - @Id - private Integer oarticleid; - private Integer articleid; - private String description; - private String articlename; - private String imageurl; - private int maxquantityperlocation; - private int quantity; - private Integer locationid; - private Integer price; - @Enumerated(EnumType.STRING) - private ArticleStatus articlestatus; - private int orderid; - private int storedquantity; -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Models/SqlViews/OrdersReport.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Models/SqlViews/OrdersReport.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,29 +1,0 @@ -package com.bazi.fullystocked.Models.SqlViews; - -import com.bazi.fullystocked.Models.Enumerations.OrderPriority; -import com.bazi.fullystocked.Models.Enumerations.OrderStatus; -import lombok.Getter; -import org.apache.tomcat.jni.Local; -import org.hibernate.annotations.Immutable; - -import javax.persistence.*; -import java.time.LocalDateTime; - -@Immutable -@Entity -@Getter -@Table(name="orders_report") -public class OrdersReport { - @Id - Integer orderid; - String supplierremark; - String managerremark; - @Enumerated(EnumType.STRING) - OrderStatus status; - LocalDateTime datecreated; - @Enumerated(EnumType.STRING) - OrderPriority priority; - Integer supplieruserid; - String supplierinfo; - Integer manageruserid; -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Models/SqlViews/SupplierSuppliesArticleReport.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Models/SqlViews/SupplierSuppliesArticleReport.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,19 +1,0 @@ -package com.bazi.fullystocked.Models.SqlViews; - -import lombok.Getter; -import org.hibernate.annotations.Immutable; - -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.Table; - -@Entity -@Immutable -@Getter -@Table(name = "supplier_supplies_article") -public class SupplierSuppliesArticleReport { - @EmbeddedId - private SupplierSuppliesArticleReportId id; - private String articlename; - private String imageurl; -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Models/SqlViews/SupplierSuppliesArticleReportId.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Models/SqlViews/SupplierSuppliesArticleReportId.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,29 +1,0 @@ -package com.bazi.fullystocked.Models.SqlViews; - -import lombok.Getter; -import lombok.Setter; - -import javax.persistence.Embeddable; -import java.io.Serializable; -import java.util.Objects; - -@Embeddable -@Getter -@Setter -public class SupplierSuppliesArticleReportId implements Serializable { - private Integer articleid; - private Integer userid; - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - SupplierSuppliesArticleReportId that = (SupplierSuppliesArticleReportId) o; - return articleid.equals(that.articleid) && userid.equals(that.userid); - } - - @Override - public int hashCode() { - return Objects.hash(articleid, userid); - } -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Models/SqlViews/SuppliersReport.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Models/SqlViews/SuppliersReport.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,25 +1,0 @@ -package com.bazi.fullystocked.Models.SqlViews; - -import lombok.Getter; -import org.hibernate.annotations.Immutable; - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; - -@Entity -@Immutable -@Getter -@Table(name = "suppliers_report") -public class SuppliersReport { - @Id - Integer userid; - String username; - String firstname; - String lastname; - String street; - int streetnumber; - String city; - String phone; - String supplierinfo; -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Models/StoredArticles.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Models/StoredArticles.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,42 +1,0 @@ -package com.bazi.fullystocked.Models; - -import lombok.Data; -import lombok.NoArgsConstructor; - -import javax.persistence.*; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; -import java.util.ArrayList; -import java.util.List; - -@Data -@Entity -@NoArgsConstructor -@Table(name="storedarticles") -public class StoredArticles { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Integer sarticleid; - @Column(nullable = false) - @NotNull(message = "Stored Article must have quantity") - @Min(0) - private int quantity; - @ManyToOne - @JoinColumn(name = "locationid") - private Locations locations; - @ManyToOne - @JoinColumn(name = "articleid") - private Articles article; - @ManyToMany - @JoinTable(name = "question_availability_for_storedarticle", - joinColumns = @JoinColumn(name = "sarticleid"), - inverseJoinColumns = @JoinColumn(name = "questionid") - ) - private List questionsList=new ArrayList<>(); - - public StoredArticles(int quantity, Locations locations, Articles article) { - this.quantity = quantity; - this.locations = locations; - this.article = article; - } -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Models/Suppliers.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Models/Suppliers.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,52 +1,0 @@ -package com.bazi.fullystocked.Models; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -import javax.persistence.*; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.util.ArrayList; -import java.util.List; - -@Entity -@EqualsAndHashCode(callSuper = true) -@Data -@NoArgsConstructor -public class Suppliers extends User{ - @Column(nullable = false) - @NotNull(message = "Supplier must have supplierInfo") - @NotEmpty(message = "Supplier must have supplierInfo") - private String supplierinfo; - @Column(nullable = false) - @NotNull(message = "Supplier must have phone") - @NotEmpty(message = "Supplier must have phone") - private String phone; - @Column(nullable = false) - @NotNull(message = "Supplier must have street") - @NotEmpty(message = "Supplier must have street") - private String street; - @Column(nullable = false) - @NotNull(message = "Supplier must have street number") - private int streetnumber; - @Column(nullable = false) - @NotNull(message = "Supplier must have street city") - @NotEmpty(message = "Supplier must have street city") - private String city; - @ManyToMany() - @JoinTable(name = "supplier_supplies_category", - joinColumns = @JoinColumn(name = "userid"), - inverseJoinColumns = @JoinColumn(name = "categoryid") - ) - private List categoryList=new ArrayList<>(); - - public Suppliers(String firstname, String lastname, String username, String email, String password, String supplierinfo, String phone, String street, int sttreetnumber, String city) { - super(firstname, lastname, username, email, password); - this.supplierinfo = supplierinfo; - this.phone = phone; - this.street = street; - this.streetnumber = sttreetnumber; - this.city = city; - } -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Models/User.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Models/User.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,48 +1,0 @@ -package com.bazi.fullystocked.Models; -import javax.persistence.*; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.util.Collection; - - -@Inheritance(strategy = InheritanceType.JOINED) -@Entity -@Data -@NoArgsConstructor -@Table(name="users") -public class User { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Integer userid; - @Column(nullable = false) - @NotNull(message = "The user must have an first name") - @NotEmpty(message = "The user must have an first name") - private String firstname; - @Column(nullable = false) - @NotNull(message = "The user must have an last name") - @NotEmpty(message = "The user must have an last name") - private String lastname; - @Column(nullable = false) - @NotNull(message = "The user must have an username") - @NotEmpty(message = "The user must have an username") - private String username; - @Column(nullable = false) - @NotNull(message = "The user must have an email") - @NotEmpty(message = "The user must have an email") - private String email; - @Column(nullable = false) - @NotNull(message = "The user must have an password") - @NotEmpty(message = "The user must have an password") - private String userpassword; - - public User(String firstname, String lastname, String username, String email, String password) { - this.firstname = firstname; - this.lastname = lastname; - this.username = username; - this.email = email; - this.userpassword = password; - } -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Models/Workers.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Models/Workers.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,27 +1,0 @@ -package com.bazi.fullystocked.Models; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -import javax.persistence.Entity; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; - -@Entity -@EqualsAndHashCode(callSuper = true) -@Data -@NoArgsConstructor -public class Workers extends User{ - @ManyToOne - @JoinColumn(name = "locationid") - private Locations location; - - public Workers(String firstname, String lastname, String username, String email, String password, Locations location) { - super(firstname, lastname, username, email, password); - this.location = location; - } - public Workers(String firstname, String lastname, String username, String email, String password) { - super(firstname, lastname, username, email, password); - } -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Repositories/AnswersRepository.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Repositories/AnswersRepository.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,14 +1,0 @@ -package com.bazi.fullystocked.Repositories; - -import com.bazi.fullystocked.Models.AnswerId; -import com.bazi.fullystocked.Models.Answers; -import com.bazi.fullystocked.Models.Questions; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; -import java.util.*; - -@Repository -public interface AnswersRepository extends JpaRepository { - List findAnswersByAnswerId_Question(Questions q); - int countAnswersByAnswerId_Question(Questions q); -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Repositories/ArticlesAndCategoriesRepository.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Repositories/ArticlesAndCategoriesRepository.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,13 +1,0 @@ -package com.bazi.fullystocked.Repositories; - -import com.bazi.fullystocked.Models.SqlViews.ArticlesAndCategoriesId; -import com.bazi.fullystocked.Models.SqlViews.ArticlesAndCategoriesReport; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; -import java.util.*; - -@Repository -public interface ArticlesAndCategoriesRepository extends JpaRepository { - List findAllById_Articleid(Integer id); - List findAllById_Categoryid(Integer id); -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Repositories/ArticlesAtLocationRepository.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Repositories/ArticlesAtLocationRepository.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,12 +1,0 @@ -package com.bazi.fullystocked.Repositories; - -import com.bazi.fullystocked.Models.SqlViews.ArticlesAtLocationReport; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; -import java.util.*; - -@Repository -public interface ArticlesAtLocationRepository extends JpaRepository { - List findAllByLocationid(Integer id); - List findAllByArticleid(Integer id); -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Repositories/ArticlesReportRepository.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Repositories/ArticlesReportRepository.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,12 +1,0 @@ -package com.bazi.fullystocked.Repositories; - -import com.bazi.fullystocked.Models.SqlViews.ArticlesReport; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; -import java.util.*; - -@Repository -public interface ArticlesReportRepository extends JpaRepository { - Optional findByArticleid(Integer id); - List findAllByLocationid(Integer id); -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Repositories/ArticlesRepository.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Repositories/ArticlesRepository.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,14 +1,0 @@ -package com.bazi.fullystocked.Repositories; - -import com.bazi.fullystocked.Models.Articles; -import com.bazi.fullystocked.Models.Categories; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; -import java.util.*; - -@Repository -public interface ArticlesRepository extends JpaRepository { - List findAllByArticlenameContainingIgnoreCase(String name); - List findAllByCategoryListContaining(Categories category); - List findAllBy(); -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Repositories/CategoriesRepository.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Repositories/CategoriesRepository.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,12 +1,0 @@ -package com.bazi.fullystocked.Repositories; - -import com.bazi.fullystocked.Models.Categories; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; -import java.util.*; - -@Repository -public interface CategoriesRepository extends JpaRepository { - List findAllByCategorynameContainsIgnoreCase(String name); - List findAll(); -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Repositories/InvoicedArticlesReportRepository.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Repositories/InvoicedArticlesReportRepository.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,11 +1,0 @@ -package com.bazi.fullystocked.Repositories; - -import com.bazi.fullystocked.Models.SqlViews.InvoicedArticlesReport; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; -import java.util.*; - -@Repository -public interface InvoicedArticlesReportRepository extends JpaRepository { - List findAllByInvoiceid(Integer invoiceid); -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Repositories/InvoicedArticlesRepository.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Repositories/InvoicedArticlesRepository.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,15 +1,0 @@ -package com.bazi.fullystocked.Repositories; - -import com.bazi.fullystocked.Models.Articles; -import com.bazi.fullystocked.Models.InvoicedArticles; -import com.bazi.fullystocked.Models.Invoices; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; -import java.util.*; - -@Repository -public interface InvoicedArticlesRepository extends JpaRepository { - List findAllByArticle(Articles article); - List findAllByInvoice(Invoices invoice); - Optional findByInvoiceAndArticle(Invoices invoice, Articles article); -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Repositories/InvoicesRepository.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Repositories/InvoicesRepository.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,22 +1,0 @@ -package com.bazi.fullystocked.Repositories; - -import com.bazi.fullystocked.Models.InvoicedArticles; -import com.bazi.fullystocked.Models.Invoices; -import com.bazi.fullystocked.Models.Locations; -import com.bazi.fullystocked.Models.Workers; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -import java.time.LocalDateTime; -import java.util.*; - -@Repository -public interface InvoicesRepository extends JpaRepository { - List findAllByWorker(Workers worker); - List findAllByCustomernameContainingIgnoreCase(String name); - List findAllByDatecreateBetween(LocalDateTime from, LocalDateTime to); - List findAllByDatecreateBetweenAndWorker(LocalDateTime from, LocalDateTime to, Workers worker); - List findAllByWorker_Location(Locations location); - List findAllByWorker_LocationAndDatecreateBetween(Locations location, LocalDateTime from, LocalDateTime to); - List findAllByArticlesListContaining(InvoicedArticles article); -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Repositories/LocationsRepository.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Repositories/LocationsRepository.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,12 +1,0 @@ -package com.bazi.fullystocked.Repositories; - -import com.bazi.fullystocked.Models.Locations; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; -import java.util.*; - -@Repository -public interface LocationsRepository extends JpaRepository { - List findAllByCityIgnoreCase(String city); - List findAllByLocationnameContainingIgnoreCase(String name); -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Repositories/ManagersRepository.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Repositories/ManagersRepository.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,10 +1,0 @@ -package com.bazi.fullystocked.Repositories; - -import com.bazi.fullystocked.Models.Managers; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -@Repository -public interface ManagersRepository extends JpaRepository { - -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Repositories/OrderedArticlesReportRepository.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Repositories/OrderedArticlesReportRepository.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,13 +1,0 @@ -package com.bazi.fullystocked.Repositories; - -import com.bazi.fullystocked.Models.Enumerations.ArticleStatus; -import com.bazi.fullystocked.Models.SqlViews.OrderedArticlesReport; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; -import java.util.*; -@Repository -public interface OrderedArticlesReportRepository extends JpaRepository { - List findAllByOrderid(Integer orderid); - List findAllByArticlestatus(ArticleStatus status); - List findAllByArticlestatusAndLocationid(ArticleStatus status, Integer locationid); -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Repositories/OrderedArticlesRepository.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Repositories/OrderedArticlesRepository.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,24 +1,0 @@ -package com.bazi.fullystocked.Repositories; - -import com.bazi.fullystocked.Models.Articles; -import com.bazi.fullystocked.Models.Enumerations.ArticleStatus; -import com.bazi.fullystocked.Models.Locations; -import com.bazi.fullystocked.Models.OrderedArticles; -import com.bazi.fullystocked.Models.Orders; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; -import java.util.*; - -@Repository -public interface OrderedArticlesRepository extends JpaRepository { - List findAllByArticle(Articles article); - List findAllByLocation(Locations location); - List findAllByLocationAndArticleAndArticlestatus(Locations location, Articles article, ArticleStatus status); - List findAllByOrder(Orders order); - Optional findByOrderAndArticle(Orders order, Articles article); - Optional findByOrderAndArticleAndLocation(Orders order, Articles article, Locations location); - List findAllByArticlestatus(ArticleStatus status); - List findAllByLocationAndArticlestatus(Locations location, ArticleStatus status); - List findAllByOrderAndArticlestatus(Orders order, ArticleStatus status); - List findAllByOrderAndPriceIsNull(Orders order); -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Repositories/OrdersReportRepository.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Repositories/OrdersReportRepository.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,13 +1,0 @@ -package com.bazi.fullystocked.Repositories; - -import com.bazi.fullystocked.Models.Enumerations.OrderStatus; -import com.bazi.fullystocked.Models.SqlViews.OrdersReport; -import org.hibernate.criterion.Order; -import org.springframework.data.jpa.repository.JpaRepository; -import java.util.*; - -public interface OrdersReportRepository extends JpaRepository { - List findAllBySupplieruserid(Integer id); - List findAllByManageruserid(Integer id); - List findAllByStatus(OrderStatus status); -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Repositories/OrdersRepository.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Repositories/OrdersRepository.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,34 +1,0 @@ -package com.bazi.fullystocked.Repositories; - -import com.bazi.fullystocked.Models.Enumerations.OrderPriority; -import com.bazi.fullystocked.Models.Enumerations.OrderStatus; -import com.bazi.fullystocked.Models.Managers; -import com.bazi.fullystocked.Models.OrderedArticles; -import com.bazi.fullystocked.Models.Orders; -import com.bazi.fullystocked.Models.Suppliers; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -import java.time.LocalDateTime; -import java.util.*; - -@Repository -public interface OrdersRepository extends JpaRepository { - List findAllByManager(Managers manager); - List findAllByManagerAndStatus(Managers manager, OrderStatus status); - List findAllByManagerAndPriority(Managers manager, OrderPriority priority); - List findAllBySupplierAndStatus(Suppliers supplier, OrderStatus status); - List findAllBySupplierAndPriority(Suppliers supplier, OrderPriority priority); - List findAllBySupplier(Suppliers supplier); - List findAllByPriority(OrderPriority priority); - List findAllByStatus(OrderStatus status); - List findAllByDateapprovedBetween(LocalDateTime from, LocalDateTime to); - List findAllByDatecreatedBetween(LocalDateTime from, LocalDateTime to); - List findAllByDateapprovedBetweenAndPriority(LocalDateTime from, LocalDateTime to, OrderPriority priority); - List findAllByDatecreatedBetweenAndPriority(LocalDateTime from, LocalDateTime to, OrderPriority priority); - List findAllByDateapprovedBetweenAndSupplier(LocalDateTime from, LocalDateTime to, Suppliers supplier); - List findAllByDatecreatedBetweenAndSupplier(LocalDateTime from, LocalDateTime to, Suppliers supplier); - List findAllByDateapprovedBetweenAndManager(LocalDateTime from, LocalDateTime to, Managers manager); - List findAllByDatecreatedBetweenAndManager(LocalDateTime from, LocalDateTime to, Managers manager); - List findAllByArticlesListContaining(OrderedArticles article); -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Repositories/QuestionsRepository.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Repositories/QuestionsRepository.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,17 +1,0 @@ -package com.bazi.fullystocked.Repositories; - -import com.bazi.fullystocked.Models.Managers; -import com.bazi.fullystocked.Models.Questions; -import com.bazi.fullystocked.Models.StoredArticles; -import com.bazi.fullystocked.Models.Workers; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; -import java.util.*; - - -@Repository -public interface QuestionsRepository extends JpaRepository { - List findAllByManager(Managers manager); - List findAllByWorker(Workers worker); - List findAllByStoredarticlesListContaining(StoredArticles article); -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Repositories/StoredArticlesRepository.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Repositories/StoredArticlesRepository.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,17 +1,0 @@ -package com.bazi.fullystocked.Repositories; -import com.bazi.fullystocked.Models.Articles; -import com.bazi.fullystocked.Models.Locations; -import com.bazi.fullystocked.Models.StoredArticles; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; -import java.util.*; - -@Repository -public interface StoredArticlesRepository extends JpaRepository { - List findAllByLocations(Locations location); - List findAllByArticle(Articles article); - Optional findByArticleAndLocations(Articles article, Locations location); - List findAllByLocationsAndQuantityIsLessThanEqual(Locations location, int quantity); - List findAllByLocationsAndQuantity(Locations location, int quantity); - -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Repositories/SupplierSuppliesArticleRepository.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Repositories/SupplierSuppliesArticleRepository.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,13 +1,0 @@ -package com.bazi.fullystocked.Repositories; - -import com.bazi.fullystocked.Models.SqlViews.SupplierSuppliesArticleReport; -import com.bazi.fullystocked.Models.SqlViews.SupplierSuppliesArticleReportId; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; -import java.util.*; - -@Repository -public interface SupplierSuppliesArticleRepository extends JpaRepository { - List findAllById_Articleid(Integer id); - List findAllById_Userid(Integer id); -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Repositories/SuppliersReportRepository.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Repositories/SuppliersReportRepository.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,10 +1,0 @@ -package com.bazi.fullystocked.Repositories; - -import com.bazi.fullystocked.Models.SqlViews.SuppliersReport; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -@Repository -public interface SuppliersReportRepository extends JpaRepository { - -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Repositories/SuppliersRepository.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Repositories/SuppliersRepository.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,13 +1,0 @@ -package com.bazi.fullystocked.Repositories; - -import com.bazi.fullystocked.Models.Categories; -import com.bazi.fullystocked.Models.Suppliers; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; -import java.util.*; - -@Repository -public interface SuppliersRepository extends JpaRepository { - List findAllByCategoryListContains(Categories category); - List findAllByCityIgnoreCase(String city); -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Repositories/UsersRepository.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Repositories/UsersRepository.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,14 +1,0 @@ -package com.bazi.fullystocked.Repositories; - -import com.bazi.fullystocked.Models.User; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -import java.util.Optional; - -@Repository -public interface UsersRepository extends JpaRepository { - Optional findByUsernameAndUserpassword(String username, String userpassword); - Optional findByUsername(String username); - -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Repositories/WorkersRepository.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Repositories/WorkersRepository.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,17 +1,0 @@ -package com.bazi.fullystocked.Repositories; - -import com.bazi.fullystocked.Models.Invoices; -import com.bazi.fullystocked.Models.Locations; -import com.bazi.fullystocked.Models.User; -import com.bazi.fullystocked.Models.Workers; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -import java.util.*; - -@Repository -public interface WorkersRepository extends JpaRepository { - List findAllByLocation(Locations location); - List findAllByLocationIsNull(); - -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Services/AnswerService.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Services/AnswerService.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,11 +1,0 @@ -package com.bazi.fullystocked.Services; - -import com.bazi.fullystocked.Models.Answers; - -import java.util.*; - -public interface AnswerService { - List findAllAnswersToQuestion(Integer questionid); - Optional create(Integer questionid, String text); - -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Services/ArticlesService.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Services/ArticlesService.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,25 +1,0 @@ -package com.bazi.fullystocked.Services; - -import com.bazi.fullystocked.Models.Articles; -import com.bazi.fullystocked.Models.Categories; -import com.bazi.fullystocked.Models.DTO.ArticleAnalysisDTO; -import com.bazi.fullystocked.Models.SqlViews.ArticlesAtLocationReport; -import com.bazi.fullystocked.Models.SqlViews.SupplierSuppliesArticleReport; -import java.util.*; - -public interface ArticlesService { - - Optional create(String description, String articlename, int maxquantityperlocation); - - Optional create(String description, String articlename, String imageurl, int maxquantityperlocation); - - Optional addToCategory(Integer articleId, Integer categoryId); - List findAllCategoriesByArticle(Integer articleId); - List findAll(); - - List findAllBySupplier(Integer id); - - List findAvailabilityAtAllLocations(Integer id); - List getArticleAnalysis(); - -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Services/AuthService.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Services/AuthService.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,14 +1,0 @@ -package com.bazi.fullystocked.Services; - -import com.bazi.fullystocked.Models.Managers; -import com.bazi.fullystocked.Models.Suppliers; -import com.bazi.fullystocked.Models.User; -import com.bazi.fullystocked.Models.Workers; - -public interface AuthService { - User login(String username, String password); - Workers registerWorker(String firstname, String lastname, String username, String email, String password); - Managers registerManager(String firstname, String lastname, String username, String email, String password); - Suppliers registerSupplier(String firstname, String lastname, String username, String email, String password, String supplierInfo, String phone, String street, int streetNumber, String city); - -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Services/CategoriesService.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Services/CategoriesService.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,9 +1,0 @@ -package com.bazi.fullystocked.Services; - -import com.bazi.fullystocked.Models.Categories; - -import java.util.List; - -public interface CategoriesService { - List findAll(); -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Services/Implementations/AnswerServiceImpl.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Services/Implementations/AnswerServiceImpl.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,39 +1,0 @@ -package com.bazi.fullystocked.Services.Implementations; - -import com.bazi.fullystocked.Models.Answers; -import com.bazi.fullystocked.Models.Exceptions.InvalidArgumentsException; -import com.bazi.fullystocked.Models.Questions; -import com.bazi.fullystocked.Repositories.AnswersRepository; -import com.bazi.fullystocked.Repositories.QuestionsRepository; -import com.bazi.fullystocked.Services.AnswerService; -import org.springframework.stereotype.Service; - -import java.util.List; -import java.util.Optional; - -@Service -public class AnswerServiceImpl implements AnswerService { - private final AnswersRepository answersRepository; - private final QuestionsRepository questionsRepository; - - public AnswerServiceImpl(AnswersRepository answersRepository, QuestionsRepository questionsRepository) { - this.answersRepository = answersRepository; - this.questionsRepository = questionsRepository; - } - - @Override - public List findAllAnswersToQuestion(Integer questionid) { - Questions question = questionsRepository.findById(questionid).orElseThrow(InvalidArgumentsException::new); - return answersRepository.findAnswersByAnswerId_Question(question); - } - - @Override - public Optional create(Integer questionid, String text) { - Questions question = questionsRepository.findById(questionid).orElseThrow(InvalidArgumentsException::new); - if(text==null || text.isEmpty()) - { - throw new InvalidArgumentsException(); - } - return Optional.of(answersRepository.save(new Answers(question, answersRepository.countAnswersByAnswerId_Question(question) +1, text))); - } -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Services/Implementations/ArticlesServiceImpl.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Services/Implementations/ArticlesServiceImpl.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,129 +1,0 @@ -package com.bazi.fullystocked.Services.Implementations; - -import com.bazi.fullystocked.Models.Articles; -import com.bazi.fullystocked.Models.Categories; -import com.bazi.fullystocked.Models.DTO.ArticleAnalysisDTO; -import com.bazi.fullystocked.Models.Exceptions.InvalidArgumentsException; -import com.bazi.fullystocked.Models.SqlViews.ArticlesAtLocationReport; -import com.bazi.fullystocked.Models.SqlViews.SupplierSuppliesArticleReport; -import com.bazi.fullystocked.Repositories.ArticlesAtLocationRepository; -import com.bazi.fullystocked.Repositories.ArticlesRepository; -import com.bazi.fullystocked.Repositories.CategoriesRepository; -import com.bazi.fullystocked.Repositories.SupplierSuppliesArticleRepository; -import com.bazi.fullystocked.Services.ArticlesService; -import org.hibernate.query.NativeQuery; -import org.hibernate.transform.Transformers; -import org.springframework.stereotype.Service; - -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.transaction.Transactional; -import java.util.List; -import java.util.Optional; - -@Service -public class ArticlesServiceImpl implements ArticlesService { - private final ArticlesRepository articlesRepository; - private final CategoriesRepository categoriesRepository; - private final SupplierSuppliesArticleRepository supplierSuppliesArticleRepository; - private final ArticlesAtLocationRepository articlesAtLocationRepository; - @PersistenceContext - private EntityManager entityManager; - - public ArticlesServiceImpl(ArticlesRepository articlesRepository, CategoriesRepository categoriesRepository, SupplierSuppliesArticleRepository supplierSuppliesArticleRepository, ArticlesAtLocationRepository articlesAtLocationRepository) { - this.articlesRepository = articlesRepository; - this.categoriesRepository = categoriesRepository; - this.supplierSuppliesArticleRepository = supplierSuppliesArticleRepository; - this.articlesAtLocationRepository = articlesAtLocationRepository; - } - - @Override - @Transactional - public Optional create(String description, String articlename, int maxquantityperlocation) { - if(description==null || description.isEmpty() || articlename==null || articlename.isEmpty() || maxquantityperlocation<=0) - { - throw new InvalidArgumentsException(); - } - return Optional.of(articlesRepository.saveAndFlush(new Articles(description, articlename, maxquantityperlocation))); - } - - @Override - @Transactional - public Optional create(String description, String articlename, String imageurl, int maxquantityperlocation) { - if(description==null || description.isEmpty() || articlename==null || articlename.isEmpty() || maxquantityperlocation<=0) - { - throw new InvalidArgumentsException(); - } - return Optional.of(articlesRepository.saveAndFlush(new Articles(description, articlename, imageurl, maxquantityperlocation))); - } - - @Override - @Transactional - public Optional addToCategory(Integer articleId, Integer categoryId) { - Categories category=categoriesRepository.findById(categoryId).orElseThrow(InvalidArgumentsException::new); - Articles articles=articlesRepository.findById(articleId).orElseThrow(InvalidArgumentsException::new); - if(articles.getCategoryList().contains(category)) - { - return Optional.of(articles); - } - articles.getCategoryList().add(category); - articlesRepository.save(articles); - return Optional.of(articles); - } - - @Override - public List findAllCategoriesByArticle(Integer articleId) { - Articles articles=articlesRepository.findById(articleId).orElseThrow(InvalidArgumentsException::new); - return articles.getCategoryList(); - } - - @Override - public List findAll() { - return articlesRepository.findAll(); - } - - @Override - public List findAllBySupplier(Integer supplierId) { - return supplierSuppliesArticleRepository.findAllById_Userid(supplierId); - } - - @Override - public List findAvailabilityAtAllLocations(Integer id) { - return articlesAtLocationRepository.findAllByArticleid(id); - } - - @Override - public List getArticleAnalysis() { - List results = entityManager.createNativeQuery(""" - select a.articlename, l.locationname, - (case - when q1.dostapnost+coalesce(q2.incoming, 0) new UserNotFoundException(username)); - if (passwordEncoder.matches(password, user.getUserpassword())) { - return user; - } else { - throw new InvalidUserCredentialsException(); - } - } - - @Override - public Workers registerWorker(String firstname, String lastname, String username, String email, String password) { - RegParamsCheck(firstname, lastname, username, email, password); - return workersRepository.save(new Workers(firstname, lastname, username, email, passwordEncoder.encode(password))); - } - - @Override - public Managers registerManager(String firstname, String lastname, String username, String email, String password) { - RegParamsCheck(firstname, lastname, username, email, password); - return managersRepository.save(new Managers(firstname, lastname, username, email, passwordEncoder.encode(password))); - } - - private void RegParamsCheck(String firstname, String lastname, String username, String email, String password) { - if (firstname == null || firstname.isEmpty() || lastname == null || lastname.isEmpty() || username == null || username.isEmpty() || email == null || email.isEmpty() || password == null || password.isEmpty()) { - throw new InvalidArgumentsException(); - } - if (usersRepository.findByUsername(username).isPresent()) { - throw new UsernameAlreadyExistsException(username); - } - } - - @Override - public Suppliers registerSupplier(String firstname, String lastname, String username, String email, String password, String supplierInfo, String phone, String street, int streetNumber, String city) { - if (firstname == null || firstname.isEmpty() || lastname == null || lastname.isEmpty() || username == null || username.isEmpty() || email == null || email.isEmpty() || password == null || password.isEmpty()) { - throw new InvalidArgumentsException(); - } - if (supplierInfo == null || supplierInfo.isEmpty() || phone == null || phone.isEmpty() || street == null || street.isEmpty() || city == null || city.isEmpty()) { - throw new InvalidArgumentsException(); - } - if (usersRepository.findByUsername(username).isPresent()) { - throw new UsernameAlreadyExistsException(username); - } - return suppliersRepository.save(new Suppliers(firstname, lastname, username, email, passwordEncoder.encode(password), supplierInfo, phone, street, streetNumber, city)); - } - -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Services/Implementations/CategoriesServiceImpl.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Services/Implementations/CategoriesServiceImpl.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,22 +1,0 @@ -package com.bazi.fullystocked.Services.Implementations; - -import com.bazi.fullystocked.Models.Categories; -import com.bazi.fullystocked.Repositories.CategoriesRepository; -import com.bazi.fullystocked.Services.CategoriesService; -import org.springframework.stereotype.Service; - -import java.util.List; - -@Service -public class CategoriesServiceImpl implements CategoriesService { - private final CategoriesRepository categoriesRepository; - - public CategoriesServiceImpl(CategoriesRepository categoriesRepository) { - this.categoriesRepository = categoriesRepository; - } - - @Override - public List findAll() { - return categoriesRepository.findAll(); - } -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Services/Implementations/InvoicesServiceImpl.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Services/Implementations/InvoicesServiceImpl.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,71 +1,0 @@ -package com.bazi.fullystocked.Services.Implementations; - -import com.bazi.fullystocked.Models.*; -import com.bazi.fullystocked.Models.Exceptions.ArticleAlreadyInInvoiceException; -import com.bazi.fullystocked.Models.Exceptions.ArticleNotAvailableException; -import com.bazi.fullystocked.Models.Exceptions.InvalidArgumentsException; -import com.bazi.fullystocked.Repositories.*; -import com.bazi.fullystocked.Services.InvoicesService; -import org.springframework.stereotype.Service; - -import javax.transaction.Transactional; -import java.util.Optional; - -@Service -public class InvoicesServiceImpl implements InvoicesService { - private final InvoicedArticlesRepository invoicedArticlesRepository; - private final InvoicesRepository invoicesRepository; - private final WorkersRepository workersRepository; - private final ArticlesRepository articlesRepository; - private final StoredArticlesRepository storedArticlesRepository; - - public InvoicesServiceImpl(InvoicedArticlesRepository invoicedArticlesRepository, InvoicesRepository invoicesRepository, WorkersRepository workersRepository, ArticlesRepository articlesRepository, StoredArticlesRepository storedArticlesRepository) { - this.invoicedArticlesRepository = invoicedArticlesRepository; - this.invoicesRepository = invoicesRepository; - this.workersRepository = workersRepository; - this.articlesRepository = articlesRepository; - this.storedArticlesRepository = storedArticlesRepository; - } - - @Override - public Optional create(String customername, String customerphone, String street, int streetnumber, String city, Integer workerId) { - Workers worker = workersRepository.findById(workerId).orElseThrow(InvalidArgumentsException::new); - return Optional.of(invoicesRepository.save(new Invoices(customername, customerphone, street, streetnumber, city, worker))); - } - - @Override - public Optional create(Integer workerId) { - Workers worker = workersRepository.findById(workerId).orElseThrow(InvalidArgumentsException::new); - return Optional.of(invoicesRepository.save(new Invoices(worker))); - } - - @Override - @Transactional - public Optional addArticleToInvoice(Integer invoiceId, Integer articleId, int price, int quantity) { - Invoices invoice = invoicesRepository.findById(invoiceId).orElseThrow(InvalidArgumentsException::new); - Articles article = articlesRepository.findById(articleId).orElseThrow(InvalidArgumentsException::new); - if(invoicedArticlesRepository.findByInvoiceAndArticle(invoice, article).isPresent()) - { - throw new ArticleAlreadyInInvoiceException(); - } - if(price<=0 || quantity<=0) - { - throw new InvalidArgumentsException(); - } - StoredArticles storedArticle=storedArticlesRepository.findByArticleAndLocations(article, invoice.getWorker().getLocation()).orElseThrow(InvalidArgumentsException::new); - if(quantity>storedArticle.getQuantity()) - { - throw new ArticleNotAvailableException(); - } - storedArticle.setQuantity(storedArticle.getQuantity()-quantity); - InvoicedArticles invoicedArticles=new InvoicedArticles(price, quantity, invoice, article); - invoicedArticlesRepository.save(invoicedArticles); - invoice.getArticlesList().add(invoicedArticles); - return Optional.of(invoicesRepository.save(invoice)); - } - - @Override - public Optional findById(Integer id) { - return invoicesRepository.findById(id); - } -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Services/Implementations/LocationServiceImpl.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Services/Implementations/LocationServiceImpl.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,66 +1,0 @@ -package com.bazi.fullystocked.Services.Implementations; - -import com.bazi.fullystocked.Models.DTO.LocationAnalysisDTO; -import com.bazi.fullystocked.Models.DTO.TopUsersDTO; -import com.bazi.fullystocked.Models.Locations; -import com.bazi.fullystocked.Models.SqlViews.ArticlesAtLocationReport; -import com.bazi.fullystocked.Repositories.ArticlesAtLocationRepository; -import com.bazi.fullystocked.Repositories.LocationsRepository; -import com.bazi.fullystocked.Services.LocationsService; -import org.hibernate.query.NativeQuery; -import org.hibernate.transform.Transformers; -import org.springframework.stereotype.Service; - -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import java.util.List; - -@Service -public class LocationServiceImpl implements LocationsService { - private final ArticlesAtLocationRepository articlesAtLocationRepository; - private final LocationsRepository locationsRepository; - @PersistenceContext - private EntityManager entityManager; - - public LocationServiceImpl(ArticlesAtLocationRepository articlesAtLocationRepository, LocationsRepository locationsRepository) { - this.articlesAtLocationRepository = articlesAtLocationRepository; - this.locationsRepository = locationsRepository; - } - - @Override - public List findAllArticlesAtLocation(Integer locationid) { - return articlesAtLocationRepository.findAllByLocationid(locationid); - } - - @Override - public List findAll() { - return locationsRepository.findAll(); - } - - @Override - public List getLocationAnalysis() { - List results = entityManager.createNativeQuery(""" - select q1.locationname, prihod-odliv as profit from\s - ( - select l.locationid, l.locationname, coalesce(sum(i.price*i.quantity), 0) as prihod from project.locations l\s - left join project.storedarticles s on s.locationid=l.locationid\s - left join project.invoicedarticles i on i.articleid=s.articleid - left join project.invoices i2 on i2.invoiceid=i.invoiceid and i2.datecreate between now()-interval '1 year' and now() - group by l.locationid - - ) as q1 - full outer join\s - ( - select l.locationid, l.locationname, coalesce(sum(o.price*o.quantity), 0) as odliv from project.locations l\s - left join project.orderedarticles o on o.locationid=l.locationid\s - left join project.orders o2 on o2.orderid=o.orderid and o2.datecreated between now()-interval '1 year' and now() - group by l.locationid - - ) q2 on q2.locationid=q1.locationid -""") - .unwrap(NativeQuery.class) - .setResultTransformer(Transformers.aliasToBean(LocationAnalysisDTO.class)) - .getResultList(); - return results; - } -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Services/Implementations/ManagersServiceImpl.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Services/Implementations/ManagersServiceImpl.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,22 +1,0 @@ -package com.bazi.fullystocked.Services.Implementations; - -import com.bazi.fullystocked.Models.Managers; -import com.bazi.fullystocked.Repositories.ManagersRepository; -import com.bazi.fullystocked.Services.ManagersService; -import org.springframework.stereotype.Service; - -import java.util.List; - -@Service -public class ManagersServiceImpl implements ManagersService { - private final ManagersRepository managersRepository; - - public ManagersServiceImpl(ManagersRepository managersRepository) { - this.managersRepository = managersRepository; - } - - @Override - public List findAll() { - return managersRepository.findAll(); - } -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Services/Implementations/OrderedArticlesServiceImpl.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Services/Implementations/OrderedArticlesServiceImpl.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,58 +1,0 @@ -package com.bazi.fullystocked.Services.Implementations; - -import com.bazi.fullystocked.Models.Enumerations.ArticleStatus; -import com.bazi.fullystocked.Models.Enumerations.OrderStatus; -import com.bazi.fullystocked.Models.Exceptions.InvalidArgumentsException; -import com.bazi.fullystocked.Models.OrderedArticles; -import com.bazi.fullystocked.Models.SqlViews.OrderedArticlesReport; -import com.bazi.fullystocked.Repositories.OrderedArticlesReportRepository; -import com.bazi.fullystocked.Repositories.OrderedArticlesRepository; -import com.bazi.fullystocked.Services.OrderedArticlesService; -import org.springframework.stereotype.Service; - -import javax.transaction.Transactional; -import java.util.List; -import java.util.Optional; - -@Service -public class OrderedArticlesServiceImpl implements OrderedArticlesService { - private final OrderedArticlesReportRepository orderedArticlesReportRepository; - private final OrderedArticlesRepository orderedArticlesRepository; - - public OrderedArticlesServiceImpl(OrderedArticlesReportRepository orderedArticlesReportRepository, OrderedArticlesRepository orderedArticlesRepository) { - this.orderedArticlesReportRepository = orderedArticlesReportRepository; - this.orderedArticlesRepository = orderedArticlesRepository; - } - - @Override - public List findAllByOrder(Integer orderId) { - return orderedArticlesReportRepository.findAllByOrderid(orderId); - } - - @Override - @Transactional - public Optional update(Integer oarticleid, int price, int quantity) { - OrderedArticles orderedArticles=orderedArticlesRepository.findById(oarticleid).orElseThrow(InvalidArgumentsException::new); - if(!orderedArticles.getOrder().getStatus().equals(OrderStatus.SENT)) - { - throw new InvalidArgumentsException(); - } - if(price<=0 || quantity<=0) - { - throw new InvalidArgumentsException(); - } - orderedArticles.setPrice(price); - orderedArticles.setQuantity(quantity); - return Optional.of(orderedArticlesRepository.save(orderedArticles)); - } - - @Override - public List findByStatusAtLocation(ArticleStatus status, Integer locationid) { - return orderedArticlesReportRepository.findAllByArticlestatusAndLocationid(status, locationid); - } - - @Override - public Optional findById(Integer oarticleid) { - return orderedArticlesReportRepository.findById(oarticleid); - } -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Services/Implementations/OrdersServiceImpl.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Services/Implementations/OrdersServiceImpl.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,200 +1,0 @@ -package com.bazi.fullystocked.Services.Implementations; - -import com.bazi.fullystocked.Models.*; -import com.bazi.fullystocked.Models.Enumerations.ArticleStatus; -import com.bazi.fullystocked.Models.Enumerations.OrderPriority; -import com.bazi.fullystocked.Models.Enumerations.OrderStatus; -import com.bazi.fullystocked.Models.Exceptions.ArticleAlreadyInOrderException; -import com.bazi.fullystocked.Models.Exceptions.ArticleMaxQuantityException; -import com.bazi.fullystocked.Models.Exceptions.InvalidArgumentsException; -import com.bazi.fullystocked.Models.SqlViews.OrdersReport; -import com.bazi.fullystocked.Repositories.*; -import com.bazi.fullystocked.Services.OrdersService; -import org.springframework.stereotype.Service; - -import javax.transaction.Transactional; -import java.time.LocalDateTime; -import java.util.List; -import java.util.Optional; - - -@Service -public class OrdersServiceImpl implements OrdersService { - private final OrdersRepository ordersRepository; - private final ManagersRepository managersRepository; - private final SuppliersRepository suppliersRepository; - private final ArticlesRepository articlesRepository; - private final LocationsRepository locationsRepository; - private final OrderedArticlesRepository orderedArticlesRepository; - private final OrdersReportRepository ordersReportRepository; - - public OrdersServiceImpl(OrdersRepository ordersRepository, ManagersRepository managersRepository, SuppliersRepository suppliersRepository, ArticlesRepository articlesRepository, LocationsRepository locationsRepository, OrderedArticlesRepository orderedArticlesRepository, OrdersReportRepository ordersReportRepository) { - this.ordersRepository = ordersRepository; - this.managersRepository = managersRepository; - this.suppliersRepository = suppliersRepository; - this.articlesRepository = articlesRepository; - this.locationsRepository = locationsRepository; - this.orderedArticlesRepository = orderedArticlesRepository; - this.ordersReportRepository = ordersReportRepository; - } - - @Override - public Optional create(OrderPriority priority, Integer managerId, Integer supplierId) { - Managers manager=managersRepository.findById(managerId).orElseThrow(InvalidArgumentsException::new); - Suppliers supplier=suppliersRepository.findById(supplierId).orElseThrow(InvalidArgumentsException::new); - return Optional.of(ordersRepository.save(new Orders(priority, manager, supplier))); - } - - @Override - public List findAllByManager(Integer managerId) { - Managers manager=managersRepository.findById(managerId).orElseThrow(InvalidArgumentsException::new); - return ordersRepository.findAllByManager(manager); - } - - @Override - public List findAllByManagerReport(Integer managerId) { - return ordersReportRepository.findAllByManageruserid(managerId); - } - - @Override - public List findAllByManagerAndStatus(Integer managerId, OrderStatus status) { - Managers manager=managersRepository.findById(managerId).orElseThrow(InvalidArgumentsException::new); - return ordersRepository.findAllByManagerAndStatus(manager, status); - } - - @Override - @Transactional - public Optional addArticleToOrder(int quantity, Integer locationId, Integer articleId, Integer orderId) { - Locations location=locationsRepository.findById(locationId).orElseThrow(InvalidArgumentsException::new); - Articles article=articlesRepository.findById(articleId).orElseThrow(InvalidArgumentsException::new); - Orders order=ordersRepository.findById(orderId).orElseThrow(InvalidArgumentsException::new); - if(!order.getStatus().equals(OrderStatus.CREATED)) - { - throw new InvalidArgumentsException(); - } - if(orderedArticlesRepository.findByOrderAndArticleAndLocation(order, article, location).isPresent()) - { - throw new ArticleAlreadyInOrderException(); - } - if(quantity<=0) - { - throw new InvalidArgumentsException(); - } - int quantityAlreadyOrdered=orderedArticlesRepository.findAllByLocationAndArticleAndArticlestatus(location, article, ArticleStatus.ORDERED). - stream().mapToInt(OrderedArticles::getQuantity).sum()+ - orderedArticlesRepository.findAllByLocationAndArticleAndArticlestatus(location, article, ArticleStatus.DELIVERED). - stream().mapToInt(OrderedArticles::getQuantity).sum(); - if(article.getMaxquantityperlocation() addManagerRemark(Integer orderId, String remark) { - Orders order=ordersRepository.findById(orderId).orElseThrow(InvalidArgumentsException::new); - order.setManagerremark(remark); - return Optional.of(ordersRepository.save(order)); - } - - @Override - public Optional addSupplierRemark(Integer orderId, String remark) { - Orders order=ordersRepository.findById(orderId).orElseThrow(InvalidArgumentsException::new); - order.setSupplierremark(remark); - return Optional.of(ordersRepository.save(order)); - } - - @Override - public List findAllBySupplier(Integer supplierId) { - Suppliers supplier=suppliersRepository.findById(supplierId).orElseThrow(InvalidArgumentsException::new); - return ordersRepository.findAllBySupplier(supplier); - } - - @Override - public List findAllBySupplierReport(Integer supplierId) { - return ordersReportRepository.findAllBySupplieruserid(supplierId); - } - - @Override - public List findAllBySupplierAndStatus(Integer supplierId, OrderStatus status) { - Suppliers supplier=suppliersRepository.findById(supplierId).orElseThrow(InvalidArgumentsException::new); - return ordersRepository.findAllBySupplierAndStatus(supplier, status); - } - - @Override - public Optional findById(Integer orderId) { - return ordersRepository.findById(orderId); - } - - @Override - public Optional findByIdReport(Integer orderId) { - return ordersReportRepository.findById(orderId); - } - - @Override - public Optional updateStatus(Integer orderId, OrderStatus status) { - Orders order=ordersRepository.findById(orderId).orElseThrow(InvalidArgumentsException::new); - if(status.equals(OrderStatus.CREATED)) - { - throw new InvalidArgumentsException(); - } - if(status.equals(OrderStatus.SENT) && !order.getStatus().equals(OrderStatus.CREATED)) - { - throw new InvalidArgumentsException(); - } - if(status.equals(OrderStatus.APPROVED) && !order.getStatus().equals(OrderStatus.SENT)) - { - throw new InvalidArgumentsException(); - } - if(status.equals(OrderStatus.REJECTED) && !(order.getStatus().equals(OrderStatus.CREATED) || order.getStatus().equals(OrderStatus.SENT))) - { - throw new InvalidArgumentsException(); - } - if(status.equals(OrderStatus.IN_PROGRESS) && !order.getStatus().equals(OrderStatus.APPROVED)) - { - throw new InvalidArgumentsException(); - } - if(status.equals(OrderStatus.DELIVERED)) - { - if(!order.getStatus().equals(OrderStatus.IN_PROGRESS)) - { - throw new InvalidArgumentsException(); - } - order.setDatedelivered(LocalDateTime.now()); - order.getArticlesList().forEach(orderedArticles -> orderedArticles.setArticlestatus(ArticleStatus.DELIVERED)); - } - if(status.equals(OrderStatus.PROCESSED)) - { - if(!order.getStatus().equals(OrderStatus.DELIVERED)) - { - throw new InvalidArgumentsException(); - } - if(order.getArticlesList().stream().anyMatch(orderedArticles -> !orderedArticles.getArticlestatus().equals(ArticleStatus.PROCESSED))) - { - return Optional.of(order); - } - } - if(status.equals(OrderStatus.CANCELED)) - { - if(order.getStatus().equals(OrderStatus.DELIVERED) || order.getStatus().equals(OrderStatus.PROCESSED)) - { - throw new InvalidArgumentsException(); - } - } - if(status.equals(OrderStatus.APPROVED)) - { - order.setDateapproved(LocalDateTime.now()); - } - order.setStatus(status); - return Optional.of(ordersRepository.save(order)); - } - - @Override - public List findByStatus(OrderStatus status) { - return ordersReportRepository.findAllByStatus(status); - } - -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Services/Implementations/QuestionServiceImpl.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Services/Implementations/QuestionServiceImpl.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,76 +1,0 @@ -package com.bazi.fullystocked.Services.Implementations; - -import com.bazi.fullystocked.Models.Exceptions.ArticleAlreadyInQuestionException; -import com.bazi.fullystocked.Models.Exceptions.InvalidArgumentsException; -import com.bazi.fullystocked.Models.Managers; -import com.bazi.fullystocked.Models.Questions; -import com.bazi.fullystocked.Models.StoredArticles; -import com.bazi.fullystocked.Models.Workers; -import com.bazi.fullystocked.Repositories.ManagersRepository; -import com.bazi.fullystocked.Repositories.QuestionsRepository; -import com.bazi.fullystocked.Repositories.StoredArticlesRepository; -import com.bazi.fullystocked.Repositories.WorkersRepository; -import com.bazi.fullystocked.Services.QuestionsService; -import org.springframework.stereotype.Service; - -import javax.transaction.Transactional; -import java.util.List; -import java.util.Optional; - -@Service -public class QuestionServiceImpl implements QuestionsService { - private final QuestionsRepository questionsRepository; - private final WorkersRepository workersRepository; - private final ManagersRepository managersRepository; - private final StoredArticlesRepository storedArticlesRepository; - - public QuestionServiceImpl(QuestionsRepository questionsRepository, WorkersRepository workersRepository, ManagersRepository managersRepository, StoredArticlesRepository storedArticlesRepository) { - this.questionsRepository = questionsRepository; - this.workersRepository = workersRepository; - this.managersRepository = managersRepository; - this.storedArticlesRepository = storedArticlesRepository; - } - - @Override - public Optional create(String text, Integer workerid, Integer managerid) { - Workers worker=workersRepository.findById(workerid).orElseThrow(InvalidArgumentsException::new); - Managers manager=managersRepository.findById(managerid).orElseThrow(InvalidArgumentsException::new); - if(text==null || text.isEmpty()) - { - throw new InvalidArgumentsException(); - } - return Optional.of(questionsRepository.save(new Questions(text, worker, manager))); - } - - @Override - @Transactional - public Optional addArticle(Integer questionid, Integer sarticleid) { - Questions question=questionsRepository.findById(questionid).orElseThrow(InvalidArgumentsException::new); - StoredArticles article=storedArticlesRepository.findById(sarticleid).orElseThrow(InvalidArgumentsException::new); - if(article.getQuestionsList().stream().anyMatch(questions -> questions.getQuestionid().equals(questionid))) - { - throw new ArticleAlreadyInQuestionException(); - } - article.getQuestionsList().add(question); - storedArticlesRepository.save(article); - questionsRepository.save(question); - return Optional.of(question); - } - - @Override - public List findAllByManager(Integer managerId) { - Managers manager=managersRepository.findById(managerId).orElseThrow(InvalidArgumentsException::new); - return questionsRepository.findAllByManager(manager); - } - - @Override - public List findAllByWorker(Integer workerId) { - Workers worker=workersRepository.findById(workerId).orElseThrow(InvalidArgumentsException::new); - return questionsRepository.findAllByWorker(worker); - } - - @Override - public Optional findById(Integer questionId) { - return questionsRepository.findById(questionId); - } -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Services/Implementations/StoredArticlesServiceImpl.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Services/Implementations/StoredArticlesServiceImpl.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,63 +1,0 @@ -package com.bazi.fullystocked.Services.Implementations; - -import com.bazi.fullystocked.Models.Categories; -import com.bazi.fullystocked.Models.Enumerations.ArticleStatus; -import com.bazi.fullystocked.Models.Enumerations.OrderStatus; -import com.bazi.fullystocked.Models.Exceptions.InvalidArgumentsException; -import com.bazi.fullystocked.Models.OrderedArticles; -import com.bazi.fullystocked.Models.SqlViews.ArticlesReport; -import com.bazi.fullystocked.Models.SqlViews.SupplierSuppliesArticleReport; -import com.bazi.fullystocked.Models.StoredArticles; -import com.bazi.fullystocked.Repositories.ArticlesReportRepository; -import com.bazi.fullystocked.Repositories.OrderedArticlesRepository; -import com.bazi.fullystocked.Repositories.StoredArticlesRepository; -import com.bazi.fullystocked.Repositories.SupplierSuppliesArticleRepository; -import com.bazi.fullystocked.Services.OrdersService; -import com.bazi.fullystocked.Services.StoredArticlesService; -import org.springframework.stereotype.Service; - -import javax.transaction.Transactional; -import java.util.List; -import java.util.Optional; - -@Service -public class StoredArticlesServiceImpl implements StoredArticlesService { - private final OrderedArticlesRepository orderedArticlesRepository; - private final StoredArticlesRepository storedArticlesRepository; - private final OrdersService ordersService; - private final ArticlesReportRepository articlesReportRepository; - - public StoredArticlesServiceImpl(OrderedArticlesRepository orderedArticlesRepository, StoredArticlesRepository storedArticlesRepository, OrdersService ordersService, ArticlesReportRepository articlesReportRepository) { - this.orderedArticlesRepository = orderedArticlesRepository; - this.storedArticlesRepository = storedArticlesRepository; - this.ordersService = ordersService; - this.articlesReportRepository = articlesReportRepository; - } - - - @Override - @Transactional - public Optional updateFromOrder(Integer oarticleid) { - OrderedArticles orderedArticle=orderedArticlesRepository.findById(oarticleid).orElseThrow(InvalidArgumentsException::new); - if(!orderedArticle.getArticlestatus().equals(ArticleStatus.DELIVERED)) - { - throw new InvalidArgumentsException(); - } - StoredArticles storedArticle=storedArticlesRepository.findByArticleAndLocations(orderedArticle.getArticle(), orderedArticle.getLocation()).orElseThrow(InvalidArgumentsException::new); - storedArticle.setQuantity(storedArticle.getQuantity()+ orderedArticle.getQuantity()); - orderedArticle.setArticlestatus(ArticleStatus.PROCESSED); - ordersService.updateStatus(orderedArticle.getOrder().getOrderid(), OrderStatus.PROCESSED); - storedArticlesRepository.save(storedArticle); - orderedArticlesRepository.save(orderedArticle); - return Optional.of(storedArticle); - } - - @Override - public List findByLocation(Integer locationId) { - return articlesReportRepository.findAllByLocationid(locationId); - } - public Optional findById(Integer id) - { - return articlesReportRepository.findById(id); - } -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Services/Implementations/SuppliersServiceImpl.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Services/Implementations/SuppliersServiceImpl.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,53 +1,0 @@ -package com.bazi.fullystocked.Services.Implementations; - -import com.bazi.fullystocked.Models.Categories; -import com.bazi.fullystocked.Models.Exceptions.InvalidArgumentsException; -import com.bazi.fullystocked.Models.SqlViews.SuppliersReport; -import com.bazi.fullystocked.Models.Suppliers; -import com.bazi.fullystocked.Repositories.CategoriesRepository; -import com.bazi.fullystocked.Repositories.SuppliersReportRepository; -import com.bazi.fullystocked.Repositories.SuppliersRepository; -import com.bazi.fullystocked.Services.SuppliersService; -import org.springframework.stereotype.Service; - -import javax.transaction.Transactional; -import java.util.List; -import java.util.Optional; - -@Service -public class SuppliersServiceImpl implements SuppliersService { - private final SuppliersRepository suppliersRepository; - private final SuppliersReportRepository suppliersReportRepository; - - public SuppliersServiceImpl(SuppliersRepository suppliersRepository, SuppliersReportRepository suppliersReportRepository) { - this.suppliersRepository = suppliersRepository; - this.suppliersReportRepository = suppliersReportRepository; - } - - @Override - public List findAll() { - return suppliersRepository.findAll(); - } - - @Override - public Optional findByIdReport(Integer id) { - return suppliersReportRepository.findById(id); - } - - @Override - public List findAllSuppliersReport() { - return suppliersReportRepository.findAll(); - } - - @Override - public Optional findById(Integer id) { - return suppliersRepository.findById(id); - } - - @Override - @Transactional - public List findCategoriesBySupplier(Integer id) { - Suppliers supplier=suppliersRepository.findById(id).orElseThrow(InvalidArgumentsException::new); - return supplier.getCategoryList(); - } -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Services/Implementations/WorkersServiceImpl.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Services/Implementations/WorkersServiceImpl.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,84 +1,0 @@ -package com.bazi.fullystocked.Services.Implementations; - -import com.bazi.fullystocked.Models.DTO.ArticleAnalysisDTO; -import com.bazi.fullystocked.Models.DTO.TopUsersDTO; -import com.bazi.fullystocked.Models.Exceptions.InvalidArgumentsException; -import com.bazi.fullystocked.Models.Locations; -import com.bazi.fullystocked.Models.Workers; -import com.bazi.fullystocked.Repositories.LocationsRepository; -import com.bazi.fullystocked.Repositories.WorkersRepository; -import com.bazi.fullystocked.Services.WorkersService; -import org.hibernate.query.NativeQuery; -import org.hibernate.transform.Transformers; -import org.springframework.stereotype.Service; - -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import java.util.List; -import java.util.Optional; - -@Service -public class WorkersServiceImpl implements WorkersService { - private final WorkersRepository workersRepository; - private final LocationsRepository locationsRepository; - @PersistenceContext - private EntityManager entityManager; - - public WorkersServiceImpl(WorkersRepository workersRepository, LocationsRepository locationsRepository) { - this.workersRepository = workersRepository; - this.locationsRepository = locationsRepository; - } - - @Override - public Optional assignLocation(Integer workerId, Integer locationId) { - Workers worker=workersRepository.findById(workerId).orElseThrow(InvalidArgumentsException::new); - Locations location=locationsRepository.findById(locationId).orElseThrow(InvalidArgumentsException::new); - worker.setLocation(location); - return Optional.of(workersRepository.save(worker)); - } - - @Override - public List findAllWithNoLocation() { - return workersRepository.findAllByLocationIsNull(); - } - - @Override - public List findAllTopUsers() { - List results = entityManager.createNativeQuery(""" - select u.firstname, u.lastname, u.username, u.email, coalesce(max(ti.totalPrice), 0) as topInvoiceSum, - (select a.articlename from project.articles a - left join project.invoicedarticles i2 on i2.articleid=a.articleid - where i2.price*i2.quantity=max(ba.totalPrice) and i2.invoiceid = min(ti.invoiceid) - ) as topArticleName, - (select i2.price from project.articles a - left join project.invoicedarticles i2 on i2.articleid=a.articleid - where i2.price*i2.quantity=max(ba.totalPrice) and i2.invoiceid = min(ti.invoiceid) - ) as topArticlePrice, - (select i2.quantity from project.articles a - left join project.invoicedarticles i2 on i2.articleid=a.articleid - where i2.price*i2.quantity=max(ba.totalPrice) and i2.invoiceid = min(ti.invoiceid) - ) as topArticleQuantity, - max(ba.totalPrice) as topArticleTotalPrice from project.workers w - left join project.users u on u.userid=w.userid - left join - ( - select i.invoiceid, i.workeruserid , sum(ia.price*ia.quantity) as totalPrice from project.invoices i - left join project.invoicedarticles ia on ia.invoiceid=i.invoiceid - group by i.invoiceid, i.workeruserid - ) ti on ti.workeruserid=u.userid - left join - ( - select ia2.invoiceid, a.articlename, ia2.price as price, ia2.quantity as quantity, ia2.price*ia2.quantity as totalPrice from project.invoicedarticles ia2 - left join project.articles a on a.articleid=ia2.articleid - ) ba on ba.invoiceid=ti.invoiceid - group by u.userid - order by topInvoiceSum desc -""") - .unwrap(NativeQuery.class) - .setResultTransformer(Transformers.aliasToBean(TopUsersDTO.class)) - .getResultList(); - return results; - } - - -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Services/InvoicesService.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Services/InvoicesService.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,12 +1,0 @@ -package com.bazi.fullystocked.Services; - -import com.bazi.fullystocked.Models.Invoices; - -import java.util.*; - -public interface InvoicesService { - Optional create(String customername, String customerphone, String street, int streetnumber, String city, Integer workerId); - Optional create(Integer workerId); - Optional addArticleToInvoice(Integer invoiceId, Integer articleId, int price, int quantity); - Optional findById(Integer id); -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Services/LocationsService.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Services/LocationsService.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,14 +1,0 @@ -package com.bazi.fullystocked.Services; - - -import com.bazi.fullystocked.Models.DTO.LocationAnalysisDTO; -import com.bazi.fullystocked.Models.Locations; -import com.bazi.fullystocked.Models.SqlViews.ArticlesAtLocationReport; - -import java.util.*; - -public interface LocationsService { - List findAllArticlesAtLocation(Integer locationid); - List findAll(); - List getLocationAnalysis(); -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Services/ManagersService.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Services/ManagersService.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,8 +1,0 @@ -package com.bazi.fullystocked.Services; -import com.bazi.fullystocked.Models.Managers; - -import java.util.*; - -public interface ManagersService { - List findAll(); -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Services/OrderedArticlesService.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Services/OrderedArticlesService.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,13 +1,0 @@ -package com.bazi.fullystocked.Services; - -import com.bazi.fullystocked.Models.Enumerations.ArticleStatus; -import com.bazi.fullystocked.Models.OrderedArticles; -import com.bazi.fullystocked.Models.SqlViews.OrderedArticlesReport; -import java.util.*; - -public interface OrderedArticlesService { - List findAllByOrder(Integer orderId); - Optional update(Integer oarticleid, int price, int quantity); - List findByStatusAtLocation(ArticleStatus status, Integer locationid); - Optional findById(Integer oarticleid); -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Services/OrdersService.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Services/OrdersService.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,27 +1,0 @@ -package com.bazi.fullystocked.Services; - -import com.bazi.fullystocked.Models.Enumerations.OrderPriority; -import com.bazi.fullystocked.Models.Enumerations.OrderStatus; -import com.bazi.fullystocked.Models.Orders; -import com.bazi.fullystocked.Models.SqlViews.OrdersReport; -import com.bazi.fullystocked.Repositories.OrdersReportRepository; - -import java.util.*; - -public interface OrdersService { - Optional create(OrderPriority priority, Integer managerId, Integer supplierId); - List findAllByManager(Integer managerId); - List findAllByManagerReport(Integer managerId); - List findAllByManagerAndStatus(Integer managerId, OrderStatus status); - Optional addArticleToOrder(int quantity, Integer locationId, Integer articleId, Integer orderId); - Optional addManagerRemark(Integer orderId, String remark); - Optional addSupplierRemark(Integer orderId, String remark); - List findAllBySupplier(Integer supplierId); - List findAllBySupplierReport(Integer supplierId); - List findAllBySupplierAndStatus(Integer supplierId, OrderStatus status); - Optional findById(Integer orderId); - Optional findByIdReport(Integer orderId); - Optional updateStatus(Integer orderId, OrderStatus status); - List findByStatus(OrderStatus status); - -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Services/QuestionsService.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Services/QuestionsService.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,14 +1,0 @@ -package com.bazi.fullystocked.Services; - -import com.bazi.fullystocked.Models.Questions; - - -import java.util.*; - -public interface QuestionsService { - Optional create(String text, Integer workerid, Integer managerid); - Optional addArticle(Integer questionid, Integer sarticleid); - List findAllByManager(Integer managerId); - List findAllByWorker(Integer workerId); - Optional findById(Integer questionId); -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Services/StoredArticlesService.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Services/StoredArticlesService.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,16 +1,0 @@ -package com.bazi.fullystocked.Services; - - -import com.bazi.fullystocked.Models.Categories; -import com.bazi.fullystocked.Models.SqlViews.ArticlesReport; -import com.bazi.fullystocked.Models.SqlViews.SupplierSuppliesArticleReport; -import com.bazi.fullystocked.Models.StoredArticles; - -import java.util.*; - -public interface StoredArticlesService { - Optional updateFromOrder(Integer oarticleid); - List findByLocation(Integer locationId); - Optional findById(Integer id); - -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Services/SuppliersService.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Services/SuppliersService.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,15 +1,0 @@ -package com.bazi.fullystocked.Services; - -import com.bazi.fullystocked.Models.Categories; -import com.bazi.fullystocked.Models.SqlViews.SuppliersReport; -import com.bazi.fullystocked.Models.Suppliers; - -import java.util.*; - -public interface SuppliersService { - List findAll(); - Optional findByIdReport(Integer id); - List findAllSuppliersReport(); - Optional findById(Integer id); - List findCategoriesBySupplier(Integer id); -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Services/WorkersService.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Services/WorkersService.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,12 +1,0 @@ -package com.bazi.fullystocked.Services; - -import com.bazi.fullystocked.Models.DTO.ArticleAnalysisDTO; -import com.bazi.fullystocked.Models.DTO.TopUsersDTO; -import com.bazi.fullystocked.Models.Workers; -import java.util.*; - -public interface WorkersService { - Optional assignLocation(Integer workerId, Integer locationId); - List findAllWithNoLocation(); - List findAllTopUsers(); -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Web/Controller/ArticleController.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Web/Controller/ArticleController.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,80 +1,0 @@ -package com.bazi.fullystocked.Web.Controller; - -import com.bazi.fullystocked.Models.Articles; -import com.bazi.fullystocked.Models.Categories; -import com.bazi.fullystocked.Models.Exceptions.InvalidArgumentsException; -import com.bazi.fullystocked.Services.ArticlesService; -import com.bazi.fullystocked.Services.CategoriesService; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; - -import javax.servlet.http.HttpServletRequest; -import java.util.List; - -@Controller -@RequestMapping(value ="/articles") -public class ArticleController { - private final ArticlesService articlesService; - private final CategoriesService categoriesService; - - public ArticleController(ArticlesService articlesService, CategoriesService categoriesService) { - this.articlesService = articlesService; - this.categoriesService = categoriesService; - } - - @GetMapping("/create") - private String createArticle() - { - return "createArticle"; - } - @PostMapping("/create") - public String createArticle(@RequestParam String aname, - @RequestParam String opis, - @RequestParam(required = false) String slika, - @RequestParam int num, HttpServletRequest request, Model model) { - try { - if (slika != null || !slika.isEmpty()) { - articlesService.create(opis, aname, slika, num); - } else { - articlesService.create(opis, aname, num); - } - - } - catch (InvalidArgumentsException e) - { - return "redirect:/articles/create?error="+e.getMessage(); - - } - return "redirect:/manager"; - } - @GetMapping("/category/add") - private String categoryArticle(Model m) - { - List articlesList=articlesService.findAll(); - List categories=categoriesService.findAll(); - m.addAttribute("articles",articlesList); - m.addAttribute("categories",categories); - - - return "addArticleCategory"; - } - @PostMapping("/category/add") - private String categoryArticle(@RequestParam Integer article, - @RequestParam Integer category) - { - try{ - articlesService.addToCategory(article,category); - } - catch (InvalidArgumentsException e) - { - return "redirect:/articles/category/add?error="+e.getMessage(); - } - - - return "redirect:/manager"; - } -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Web/Controller/HomeController.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Web/Controller/HomeController.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,18 +1,0 @@ -package com.bazi.fullystocked.Web.Controller; - -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; - -@Controller -@RequestMapping(value = {"/","/home"}) -public class HomeController { - @GetMapping - public String getHomePage() - { - return "home"; - } - - -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Web/Controller/InvoiceController.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Web/Controller/InvoiceController.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,126 +1,0 @@ -package com.bazi.fullystocked.Web.Controller; - -import com.bazi.fullystocked.Models.Exceptions.InvalidArgumentsException; -import com.bazi.fullystocked.Models.Invoices; -import com.bazi.fullystocked.Models.SqlViews.ArticlesReport; -import com.bazi.fullystocked.Models.Workers; -import com.bazi.fullystocked.Services.InvoicesService; -import com.bazi.fullystocked.Services.StoredArticlesService; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletRequest; - -@Controller -@RequestMapping(value ="/invoices") -public class InvoiceController { - private final InvoicesService invoicesService; - private final StoredArticlesService storedArticlesService; - - public InvoiceController(InvoicesService invoicesService, StoredArticlesService storedArticlesService) { - this.invoicesService = invoicesService; - this.storedArticlesService = storedArticlesService; - } - - @GetMapping("/create") - public String createInvoice() - { - return "createInv"; - } - @PostMapping("/create") - public String createInvoice(@RequestParam(required = false) String cname, - @RequestParam(required = false) String phone, - @RequestParam(required = false) String city, - @RequestParam(required = false) String street, - @RequestParam(required = false) int num, HttpServletRequest request, Model model) - { - Invoices inv=null; - Workers u=null; - try - { - u= (Workers) request.getSession().getAttribute("user"); - if(cname==null || cname.isEmpty()) - { - inv=invoicesService.create(u.getUserid()).orElseThrow(); - } - else - { - inv = invoicesService.create(cname, phone, street, num, city, u.getUserid()).orElseThrow(); - } - } - catch (Exception e) - { - return "redirect:/invoices/create?error="+e.getMessage(); - } - model.addAttribute("invId", inv.getInvoiceid()); - model.addAttribute("articles", storedArticlesService.findByLocation(u.getLocation().getLocationid())); - return "selectInvArticle"; - } - - @PostMapping("/articles/select") - public String getDetails(@RequestParam int invoiceId, @RequestParam int articleId, Model model) - { - if(invoicesService.findById(invoiceId).isEmpty()) - { - return "redirect:/invoices/create"; - } - try{ - model.addAttribute("invId", invoiceId); - ArticlesReport articlesReport=this.storedArticlesService.findById(articleId).orElseThrow(InvalidArgumentsException::new); - model.addAttribute("article",articlesReport); - return "addInvoiceArticle"; - } - catch(Exception e) - { - return "redirect:/invoices/backToList/"+invoiceId+"?"+e.getMessage(); - } - } - @PostMapping("/articles/add") - public String getDetails(@RequestParam int invoiceId, @RequestParam int articleId, @RequestParam int quantity, @RequestParam int price, HttpServletRequest request, Model model) - { - if(invoicesService.findById(invoiceId).isEmpty()) - { - return "redirect:/invoices/create"; - } - try - { - Workers u= (Workers) request.getSession().getAttribute("user"); - invoicesService.addArticleToInvoice(invoiceId, articleId, price, quantity); - model.addAttribute("invId", invoiceId); - model.addAttribute("articles", storedArticlesService.findByLocation(u.getLocation().getLocationid())); - return "selectInvArticle"; - } - catch(Exception e) - { - return "redirect:/invoices/backToList/"+invoiceId+"?"+e.getMessage(); - } - } - - @GetMapping("/backToList/{invoiceId}") - public String backToList(@PathVariable int invoiceId, HttpServletRequest request, Model model, @RequestParam(required = false) String error) - { - Workers u=null; - try - { - u=(Workers) request.getSession().getAttribute("user"); - } - catch (Exception e) - { - return "redirect:/login"; - } - if(invoicesService.findById(invoiceId).isEmpty()) - { - return "redirect:/invoices/create"; - } - Invoices inv=invoicesService.findById(invoiceId).get(); - if(!inv.getWorker().getUserid().equals(u.getUserid())) - { - return "redirect:/login"; - - } - model.addAttribute("invId", invoiceId); - model.addAttribute("articles", storedArticlesService.findByLocation(u.getLocation().getLocationid())); - return "selectInvArticle"; - } -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Web/Controller/LogOutController.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Web/Controller/LogOutController.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,18 +1,0 @@ -package com.bazi.fullystocked.Web.Controller; - -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; - -import javax.servlet.http.HttpServletRequest; - -@Controller -@RequestMapping("/logout") -public class LogOutController { - @GetMapping - public String loguot(HttpServletRequest request) - { - request.getSession().invalidate(); - return "redirect:/login"; - } -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Web/Controller/LoginController.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Web/Controller/LoginController.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,69 +1,0 @@ -package com.bazi.fullystocked.Web.Controller; - -import com.bazi.fullystocked.Models.Exceptions.InvalidUserCredentialsException; -import com.bazi.fullystocked.Models.Exceptions.UserNotFoundException; -import com.bazi.fullystocked.Models.Managers; -import com.bazi.fullystocked.Models.Suppliers; -import com.bazi.fullystocked.Models.User; -import com.bazi.fullystocked.Models.Workers; -import com.bazi.fullystocked.Services.AuthService; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; - -import javax.servlet.http.HttpServletRequest; - -@Controller -@RequestMapping("/login") -public class LoginController { - - - private final AuthService authService; - - public LoginController(AuthService authService) { - this.authService = authService; - } - - @GetMapping - public String getLoginPage(Model m, @RequestParam(required = false) String error) { - m.addAttribute("bodycontent","login"); - m.addAttribute("error", error); - return "/login"; - } - - @PostMapping - public String login(HttpServletRequest request, Model model) { - User user = null; - try { - user = this.authService.login(request.getParameter("username"), - request.getParameter("password")); - if (user instanceof Workers) { - Workers w= (Workers) user; - request.getSession().setAttribute("user", w); - request.getSession().setAttribute("location",w.getLocation().getLocationname()+" "+w.getLocation().getCity()); - return "redirect:/worker"; - } else if (user instanceof Managers) { - Managers m= (Managers) user; - request.getSession().setAttribute("user", m); - return "redirect:/manager"; - } - else if(user instanceof Suppliers) - { - Suppliers s= (Suppliers) user; - request.getSession().setAttribute("user", s); - request.getSession().setAttribute("info",s.getSupplierinfo()); - request.getSession().setAttribute("number",s.getPhone()); - request.getSession().setAttribute("location",s.getStreet()+" бр."+ s.getStreetnumber()+", "+s.getCity()); - return "redirect:/supplier"; - } - return "redirect:/home"; - } - catch (Exception exception) { - - return "redirect:/login?error="+exception.getMessage(); - } - } -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Web/Controller/ManagerController.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Web/Controller/ManagerController.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,70 +1,0 @@ -package com.bazi.fullystocked.Web.Controller; - -import com.bazi.fullystocked.Services.ArticlesService; -import com.bazi.fullystocked.Services.LocationsService; -import com.bazi.fullystocked.Services.WorkersService; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; - -@Controller -@RequestMapping(value ="/manager") -public class ManagerController { - private final WorkersService workersService; - private final LocationsService locationsService; - private final ArticlesService articlesService; - - public ManagerController(WorkersService workersService, LocationsService locationsService, ArticlesService articlesService) { - this.workersService = workersService; - this.locationsService = locationsService; - this.articlesService = articlesService; - } - - @GetMapping - public String getManagerPage() - { - - return "homeManager"; - } - - @GetMapping("/noLocWorkers") - public String listWorkersWithNullLocation(Model model) - { - model.addAttribute("workers", workersService.findAllWithNoLocation()); - model.addAttribute("locations", locationsService.findAll()); - return "noLocWorkers"; - } - @PostMapping("/noLocWorkers/add") - public String addWorkerToLocation(@RequestParam Integer workerId, @RequestParam Integer locationId) - { - try{ - workersService.assignLocation(workerId, locationId); - return "redirect:/manager/noLocWorkers"; - } - catch (Exception e) - { - return "redirect:/manager/noLocWorkers?error="+e.getMessage(); - } - } - @GetMapping("/topWorkers") - public String listTopWorkersModel(Model model) - { - model.addAttribute("workers", workersService.findAllTopUsers()); - return "topWorkers"; - } - @GetMapping("/articleAnalysis") - public String getArticleAnalysis(Model model) - { - model.addAttribute("articles", articlesService.getArticleAnalysis()); - return "articleAnalysis"; - } - @GetMapping("/locationAnalysis") - public String getLocationAnalysis(Model model) - { - model.addAttribute("locations", locationsService.getLocationAnalysis()); - return "locationAnalysis"; - } -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Web/Controller/OrderController.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Web/Controller/OrderController.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,311 +1,0 @@ -package com.bazi.fullystocked.Web.Controller; - -import com.bazi.fullystocked.Models.*; -import com.bazi.fullystocked.Models.Enumerations.OrderPriority; -import com.bazi.fullystocked.Models.Enumerations.OrderStatus; -import com.bazi.fullystocked.Models.Exceptions.InvalidArgumentsException; -import com.bazi.fullystocked.Models.SqlViews.ArticlesAtLocationReport; -import com.bazi.fullystocked.Services.*; -import org.springframework.stereotype.Controller; -import org.springframework.stereotype.Repository; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.*; -import java.util.*; - -import javax.servlet.http.HttpServletRequest; - -@Controller -@RequestMapping("/orders") -public class OrderController { - private final SuppliersService suppliersService; - private final OrdersService ordersService; - private final ArticlesService articlesService; - private final LocationsService locationsService; - private final OrderedArticlesService orderedArticlesService; - - public OrderController(SuppliersService suppliersService, OrdersService ordersService, ArticlesService articlesService, LocationsService locationsService, OrderedArticlesService orderedArticlesService) { - this.suppliersService = suppliersService; - this.ordersService = ordersService; - this.articlesService = articlesService; - this.locationsService = locationsService; - this.orderedArticlesService = orderedArticlesService; - } - - @GetMapping("/create") - public String createOrder(Model model) - { - model.addAttribute("suppliers", suppliersService.findAllSuppliersReport()); - return "createOrder"; - } - @PostMapping("/create") - public String createOrder(@RequestParam OrderPriority priority, - @RequestParam String remark, - @RequestParam Integer supplierId, - HttpServletRequest request, - Model model) - { - Orders order = null; - Managers manager = null; - try { - manager = (Managers) request.getSession().getAttribute("user"); - order=ordersService.create(priority, manager.getUserid(), supplierId).orElseThrow(InvalidArgumentsException::new); - if(remark!=null && !remark.isEmpty()) - { - ordersService.addManagerRemark(order.getOrderid(), remark); - } - - } - catch (Exception e) { - return "redirect:/orders/createOrder?error="+e.getMessage(); - } - model.addAttribute("orderId", order.getOrderid()); - model.addAttribute("articles", articlesService.findAllBySupplier(supplierId)); - return "selectOrderArticle"; - } - - @PostMapping("/articles/select") - public String getDetails(@RequestParam int orderId, @RequestParam int articleId, Model model) - { - if(ordersService.findById(orderId).isEmpty()) - { - return "redirect:/orders/create"; - } - try{ - model.addAttribute("orderId", orderId); - List articlesReport=articlesService.findAvailabilityAtAllLocations(articleId); - model.addAttribute("articlesReport",articlesReport); - model.addAttribute("locations", locationsService.findAll()); - return "addOrderArticle"; - } - catch(Exception e) - { - return "redirect:/orders/backToList/"+orderId+"?"+e.getMessage(); - } - } - - @PostMapping("/articles/add") - public String getDetails(@RequestParam int orderId, @RequestParam int articleId, @RequestParam int quantity, @RequestParam int locationId, HttpServletRequest request, Model model) - { - if(ordersService.findById(orderId).isEmpty()) - { - return "redirect:/orders/create"; - } - try - { - Managers u= (Managers) request.getSession().getAttribute("user"); - Orders order=ordersService.findById(orderId).orElseThrow(InvalidArgumentsException::new); - ordersService.addArticleToOrder(quantity, locationId, articleId, orderId); - model.addAttribute("orderId", orderId); - model.addAttribute("articles", articlesService.findAllBySupplier(order.getSupplier().getUserid())); - return "selectOrderArticle"; - } - catch(Exception e) - { - return "redirect:/orders/backToList/"+orderId+"?"+e.getMessage(); - } - } - - @GetMapping("/backToList/{orderId}") - public String backToList(@PathVariable int orderId, HttpServletRequest request, Model model, @RequestParam(required = false) String error) - { - Managers u=null; - try - { - u=(Managers) request.getSession().getAttribute("user"); - } - catch (Exception e) - { - return "redirect:/login"; - } - if(ordersService.findById(orderId).isEmpty()) - { - return "redirect:/orders/create"; - } - Orders order=ordersService.findById(orderId).get(); - if(!order.getManager().getUserid().equals(u.getUserid())) - { - return "redirect:/login"; - - } - model.addAttribute("orderId", orderId); - model.addAttribute("articles", articlesService.findAllBySupplier(order.getSupplier().getUserid())); - return "selectOrderArticle"; - } - - @PostMapping("/send") - public String sendOrder(@RequestParam Integer orderId) - { - if(ordersService.findById(orderId).isEmpty()) - { - return "redirect:/orders/create"; - } - ordersService.updateStatus(orderId, OrderStatus.SENT); - return "redirect:/manager"; - } - - @GetMapping("/manager/list") - public String listOrdersMan(Model model, HttpServletRequest request) - { - Managers m = (Managers) request.getSession().getAttribute("user"); - model.addAttribute("orders", ordersService.findAllByManagerReport(m.getUserid())); - return "managerOrders"; - } - @GetMapping("/supplier/list") - public String listOrdersSup(Model model, HttpServletRequest request) - { - Suppliers s = (Suppliers) request.getSession().getAttribute("user"); - model.addAttribute("orders", ordersService.findAllBySupplierReport(s.getUserid())); - return "supplierOrders"; - } - @GetMapping("/supplier/details/{id}") - public String orderDetailsSupplier(@PathVariable Integer id, Model model) - { - try - { - model.addAttribute("order", ordersService.findById(id).orElseThrow(InvalidArgumentsException::new)); - model.addAttribute("articles", orderedArticlesService.findAllByOrder(id)); - } - catch (Exception e) - { - return "redirect:/orders/supplier/list?error"+e.getMessage(); - } - return "suppOrderDetails"; - } - @GetMapping("/manager/details/{id}") - public String orderDetailsManager(@PathVariable Integer id, Model model) - { - try - { - model.addAttribute("order", ordersService.findById(id).orElseThrow(InvalidArgumentsException::new)); - model.addAttribute("articles", orderedArticlesService.findAllByOrder(id)); - } - catch (Exception e) - { - return "redirect:/orders/manager/list?error"+e.getMessage(); - } - return "managerOrderDetails"; - } - - @PostMapping("/supplier/offer") - public String createOffer(@RequestParam Integer articleId, @RequestParam Integer orderId, HttpServletRequest request, Model model) - { - Suppliers u=null; - try - { - u=(Suppliers) request.getSession().getAttribute("user"); - } - catch (Exception e) - { - return "redirect:/login"; - } - if(ordersService.findById(orderId).isEmpty()) - { - return "redirect:/orders/supplier/list"; - } - Orders order=ordersService.findById(orderId).get(); - if(!order.getSupplier().getUserid().equals(u.getUserid())) - { - return "redirect:/login"; - } - model.addAttribute("orderId", orderId); - try { - model.addAttribute("article", orderedArticlesService.findById(articleId).orElseThrow(InvalidArgumentsException::new)); - } - catch (Exception e) - { - return "redirect:/orders/supplier/list?error"+e.getMessage(); - } - return "createOffer"; - } - - @PostMapping("/supplier/offer/save") - public String saveOffer(@RequestParam int price, @RequestParam int quantity, @RequestParam int orderId, @RequestParam int articleId) - { - try { - orderedArticlesService.update(articleId, price, quantity); - } - catch (Exception e) - { - return "redirect:/orders/supplier/details/"+orderId+"?error="+e.getMessage(); - } - return "redirect:/orders/supplier/details/"+orderId; - } - - @PostMapping("/supplier/approve") - public String approveOrder(@RequestParam Integer orderId, HttpServletRequest request) - { - Suppliers u=null; - try - { - u=(Suppliers) request.getSession().getAttribute("user"); - } - catch (Exception e) - { - return "redirect:/login"; - } - if(ordersService.findById(orderId).isEmpty()) - { - return "redirect:/orders/supplier/list"; - } - Orders order=ordersService.findById(orderId).get(); - if(!order.getSupplier().getUserid().equals(u.getUserid())) - { - return "redirect:/login"; - } - try { - ordersService.updateStatus(orderId, OrderStatus.APPROVED); - } - catch (Exception e) - { - return "redirect:/orders/supplier/details/"+orderId+"?error="+e.getMessage(); - } - return "redirect:/orders/supplier/details/"+orderId; - } - @PostMapping("/manager/initiate") - public String initiateOrder(@RequestParam Integer orderId, HttpServletRequest request) - { - Managers u=null; - try - { - u=(Managers) request.getSession().getAttribute("user"); - } - catch (Exception e) - { - return "redirect:/login"; - } - if(ordersService.findById(orderId).isEmpty()) - { - return "redirect:/orders/manager/list"; - } - Orders order=ordersService.findById(orderId).get(); - if(!order.getManager().getUserid().equals(u.getUserid())) - { - return "redirect:/login"; - } - try{ - ordersService.updateStatus(orderId, OrderStatus.IN_PROGRESS);} - catch (Exception e) - { - return "redirect:/orders/manager/details/"+orderId+"?error="+e.getMessage(); - } - return "redirect:/orders/manager/details/"+orderId; - } - @GetMapping("/worker/list") - public String listOrdersWorker(Model model) - { - model.addAttribute("orders", ordersService.findByStatus(OrderStatus.IN_PROGRESS)); - return "workerOrders"; - } - @PostMapping("/worker/accept") - public String acceptOrder(@RequestParam Integer orderId) - { - try { - ordersService.updateStatus(orderId, OrderStatus.DELIVERED); - } - catch (Exception e) - { - return "redirect:/orders/worker/list"+e.getMessage(); - } - return "redirect:/orders/worker/list"; - } -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Web/Controller/QuestionsController.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Web/Controller/QuestionsController.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,197 +1,0 @@ -package com.bazi.fullystocked.Web.Controller; - -import com.bazi.fullystocked.Models.Exceptions.InvalidArgumentsException; -import com.bazi.fullystocked.Models.Managers; -import com.bazi.fullystocked.Models.Questions; -import com.bazi.fullystocked.Models.Workers; -import com.bazi.fullystocked.Services.AnswerService; -import com.bazi.fullystocked.Services.ManagersService; -import com.bazi.fullystocked.Services.QuestionsService; -import com.bazi.fullystocked.Services.StoredArticlesService; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletRequest; - -@Controller -@RequestMapping("/questions") -public class QuestionsController { - private final QuestionsService questionsService; - private final StoredArticlesService storedArticlesService; - private final ManagersService managersService; - private final AnswerService answerService; - - public QuestionsController(QuestionsService questionsService, StoredArticlesService storedArticlesService, ManagersService managersService, AnswerService answerService) { - this.questionsService = questionsService; - this.storedArticlesService = storedArticlesService; - this.managersService = managersService; - this.answerService = answerService; - } - - @GetMapping("/worker/create") - public String createQuestion(Model model) - { - model.addAttribute("managers", managersService.findAll()); - return "askAQuestion"; - } - @PostMapping("/worker/create") - public String createQuestion(@RequestParam String text, - @RequestParam Integer managerId, - HttpServletRequest request, - Model model) - { - try - { - Workers u= (Workers) request.getSession().getAttribute("user"); - Questions q = questionsService.create(text, u.getUserid(), managerId).orElseThrow(); - model.addAttribute("questionId", q.getQuestionid()); - model.addAttribute("articles", storedArticlesService.findByLocation(u.getLocation().getLocationid())); - return "selectQuestionArticle"; - } - catch (Exception e) - { - return "redirect:/questions/worker/create?error="+e.getMessage(); - } - } - @GetMapping("/worker/backToList/{questionId}") - public String backToList(@PathVariable int questionId, HttpServletRequest request, Model model, @RequestParam(required = false) String error) - { - Workers u=null; - try - { - u=(Workers) request.getSession().getAttribute("user"); - } - catch (Exception e) - { - return "redirect:/login"; - } - if(questionsService.findById(questionId).isEmpty()) - { - return "redirect:/questions/worker/create"; - } - Questions q = questionsService.findById(questionId).get(); - if(!q.getWorker().getUserid().equals(u.getUserid())) - { - return "redirect:/login"; - - } - model.addAttribute("questionId", q.getQuestionid()); - model.addAttribute("articles", storedArticlesService.findByLocation(u.getLocation().getLocationid())); - return "selectQuestionArticle"; - } - @PostMapping("/worker/addArticle") - public String addArticleToQuestion(@RequestParam Integer questionId, - @RequestParam Integer articleId, - HttpServletRequest request, - Model model) - { - try - { - Workers u= (Workers) request.getSession().getAttribute("user"); - if(storedArticlesService.findById(articleId).isEmpty()) - { - return "redirect:/worker/articles"; - } - if(!storedArticlesService.findById(articleId).get().getLocationid().equals(u.getLocation().getLocationid())) - { - return "redirect:/login"; - } - questionsService.addArticle(questionId, articleId); - model.addAttribute("questionId", questionId); - model.addAttribute("articles", storedArticlesService.findByLocation(u.getLocation().getLocationid())); - return "selectQuestionArticle"; - } - catch (Exception e) - { - return "redirect:/questions/worker/backToList/"+questionId+"?"+e.getMessage(); - } - } - - @GetMapping("/manager/list") - public String listQuestionsPerManager(HttpServletRequest request, Model model) - { - Managers m = (Managers) request.getSession().getAttribute("user"); - model.addAttribute("questions", questionsService.findAllByManager(m.getUserid())); - return "managerQuestions"; - } - @GetMapping("/manager/details/{id}") - public String questionDetailsManager(@PathVariable Integer id, Model model, HttpServletRequest request) - { - try { - Managers m = (Managers) request.getSession().getAttribute("user"); - Questions q = questionsService.findById(id).orElseThrow(InvalidArgumentsException::new); - if(!q.getManager().getUserid().equals(m.getUserid())) - { - throw new IllegalAccessException(); - } - model.addAttribute("question", q); - model.addAttribute("answers", answerService.findAllAnswersToQuestion(id)); - return "managerQuestionDetails"; - } - catch (Exception e) - { - return "redirect:/questions/manager/list?error="+e.getMessage(); - } - } - @GetMapping("/worker/list") - public String listQuestionsPerWorker(HttpServletRequest request, Model model) - { - Workers w= (Workers) request.getSession().getAttribute("user"); - model.addAttribute("questions", questionsService.findAllByWorker(w.getUserid())); - return "workerQuestions"; - } - @GetMapping("/worker/details/{id}") - public String questionDetailsWorker(@PathVariable Integer id, Model model, HttpServletRequest request) - { - try { - Workers w= (Workers) request.getSession().getAttribute("user"); - Questions q = questionsService.findById(id).orElseThrow(InvalidArgumentsException::new); - if(!q.getWorker().getUserid().equals(w.getUserid())) - { - throw new IllegalAccessException(); - } - model.addAttribute("question", q); - model.addAttribute("answers", answerService.findAllAnswersToQuestion(id)); - return "workerQuestionDetails"; - } - catch (Exception e) - { - return "redirect:/questions/manager/list?error="+e.getMessage(); - } - } - @PostMapping("/manager/answer") - public String answerAQuestion(@RequestParam Integer questionId, HttpServletRequest request, Model model) - { - try { - Managers m = (Managers) request.getSession().getAttribute("user"); - Questions q = questionsService.findById(questionId).orElseThrow(InvalidArgumentsException::new); - if(!q.getManager().getUserid().equals(m.getUserid())) - { - throw new IllegalAccessException(); - } - model.addAttribute("questionId", questionId); - return "createAnswer"; - } - catch (Exception e) - { - return "redirect:/questions/manager/details/"+questionId+"?error="+e.getMessage(); - } - } - @PostMapping("manager/answer/save") - public String saveAnswer(@RequestParam Integer questionId, @RequestParam String text) - { - /*try - { - answerService.create(questionId, text); - return "redirect:/questions/manager/details/"+questionId; - } - catch (Exception e) - { - return "redirect:/questions/manager/details/"+questionId+"?error="+e.getMessage(); - }*/ - answerService.create(questionId, text); - return "redirect:/questions/manager/details/"+questionId; - } - -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Web/Controller/RegisterController.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Web/Controller/RegisterController.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,78 +1,0 @@ -package com.bazi.fullystocked.Web.Controller; - -import com.bazi.fullystocked.Models.Exceptions.InvalidArgumentsException; -import com.bazi.fullystocked.Models.Exceptions.UsernameAlreadyExistsException; -import com.bazi.fullystocked.Models.User; -import com.bazi.fullystocked.Services.AuthService; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; - -import javax.servlet.http.HttpServletRequest; - -@Controller -@RequestMapping("/register") -public class RegisterController { - private final AuthService authService; - - public RegisterController( AuthService authService) { - this.authService = authService; - } - @GetMapping - public String getRegisterPage(@RequestParam(required = false) String error, Model model) - { - model.addAttribute("error", error); - return "register"; - } - @PostMapping - public String register(@RequestParam String ime, - @RequestParam String prezime, - @RequestParam String username, - @RequestParam String email - , @RequestParam String password - , @RequestParam String role, HttpServletRequest request) { - try { - if (role.equals("menadzer")) { - authService.registerManager(ime, prezime, username, email, password); - } else if (role.equals("magacioner")) { - authService.registerWorker(ime, prezime, username, email, password); - } else if (role.equals("dobavuvac")) { - User u = new User(ime, prezime, username, email, password); - request.getSession().setAttribute("user", u); - return "redirect:/register/registerSupplier"; - } - return "redirect:/login"; - } - catch (Exception exception) - { - return "redirect:/register?error="+exception.getMessage(); - } - } - @GetMapping("/registerSupplier") - public String getRegisterSupplier(@RequestParam(required = false) String error, Model model) - { - return "registerSupplier"; - } - @PostMapping("/registerSupplier") - public String registerSupplier(@RequestParam String sinfo, - @RequestParam String phone, - @RequestParam String street, - @RequestParam String broj, - @RequestParam String grad,HttpServletRequest request) - { - try { - User u = (User) request.getSession().getAttribute("user"); - authService.registerSupplier(u.getFirstname(), u.getLastname(), u.getUsername(), u.getEmail(), u.getUserpassword(), sinfo, phone, street, Integer.parseInt(broj), grad); - request.getSession().invalidate(); - return "redirect:/login"; - } - catch (Exception exception) - { - request.getSession().invalidate(); - return "redirect:/register?error="+exception.getMessage(); - } - } -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Web/Controller/SupplierController.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Web/Controller/SupplierController.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,34 +1,0 @@ -package com.bazi.fullystocked.Web.Controller; - -import com.bazi.fullystocked.Models.Suppliers; -import com.bazi.fullystocked.Services.SuppliersService; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; - -import javax.servlet.http.HttpServletRequest; - -@Controller -@RequestMapping(value ="/supplier") -public class SupplierController { - private final SuppliersService suppliersService; - - public SupplierController(SuppliersService suppliersService) { - this.suppliersService = suppliersService; - } - - @GetMapping - public String getSupplierPage() - { - - return "homeSupplier"; - } - @GetMapping("/categories") - public String getSupplierCategories(HttpServletRequest request, Model m) - { - Suppliers s= (Suppliers) request.getSession().getAttribute("user"); - m.addAttribute("categoires",suppliersService.findCategoriesBySupplier(s.getUserid())); - return "supplierCategories"; - } -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Web/Controller/WorkerController.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Web/Controller/WorkerController.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,120 +1,0 @@ -package com.bazi.fullystocked.Web.Controller; - -import com.bazi.fullystocked.Models.Enumerations.ArticleStatus; -import com.bazi.fullystocked.Models.Questions; -import com.bazi.fullystocked.Models.SqlViews.ArticlesReport; -import com.bazi.fullystocked.Models.Workers; -import com.bazi.fullystocked.Services.*; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletRequest; -import java.util.List; - -@Controller -@RequestMapping(value ="/worker") -public class WorkerController { - private final StoredArticlesService storedArticlesService; - private final ArticlesService articlesService; - private final OrderedArticlesService orderedArticlesService; - private final QuestionsService questionsService; - private final ManagersService managersService; - - public WorkerController(StoredArticlesService storedArticlesService, ArticlesService articlesService, OrderedArticlesService orderedArticlesService, QuestionsService questionsService, ManagersService managersService) { - this.storedArticlesService = storedArticlesService; - this.articlesService = articlesService; - this.orderedArticlesService = orderedArticlesService; - this.questionsService = questionsService; - this.managersService = managersService; - } - - @GetMapping - public String getWorkerPage() - { - - return "homeWorker"; - } - @GetMapping("/articles") - public String getArticles(HttpServletRequest request, Model model) - { - Workers u= (Workers) request.getSession().getAttribute("user"); - List articlesReport=storedArticlesService.findByLocation(u.getLocation().getLocationid()); - model.addAttribute("articles",articlesReport); - return "articles"; - } - @GetMapping("/articles/details/{id}") - public String getDetails(@PathVariable Integer id,Model model) - { - if(this.storedArticlesService.findById(id).isPresent()) - { - ArticlesReport articlesReport=this.storedArticlesService.findById(id).get(); - model.addAttribute("article",articlesReport); - model.addAttribute("categories", articlesService.findAllCategoriesByArticle(articlesReport.getArticleid())); - return "detailsArticle"; - } - return "redirect:/worker/articles?error=ArticleNotFound"; - } - @GetMapping("/deliveredArticles") - public String listDeliveredArticles(Model model, HttpServletRequest request) - { - Workers u= (Workers) request.getSession().getAttribute("user"); - model.addAttribute("articles", orderedArticlesService.findByStatusAtLocation(ArticleStatus.DELIVERED, u.getLocation().getLocationid())); - return "deliveredArticles"; - } - - @PostMapping("/deliveredArticles/process") - public String processOrderedArticle(@RequestParam Integer articleId, HttpServletRequest request) - { - try - { - Workers u= (Workers) request.getSession().getAttribute("user"); - if(orderedArticlesService.findById(articleId).isEmpty()) - { - return "redirect:/worker/deliveredArticles"; - } - if(!orderedArticlesService.findById(articleId).get().getLocationid().equals(u.getLocation().getLocationid())) - { - return "redirect:/login"; - } - storedArticlesService.updateFromOrder(articleId); - return "redirect:/worker/deliveredArticles"; - } - catch (Exception e) - { - return "redirect:/worker/deliveredArticles?error="+e.getMessage(); - } - } - - @PostMapping("/articles/askAQuestion") - public String askAQuestionForASingleArticle(@RequestParam Integer articleId, Model model) - { - model.addAttribute("articleId", articleId); - model.addAttribute("managers", managersService.findAll()); - return "AskAQuestionSingle"; - } - @PostMapping("/articles/askAQuestion/send") - public String sendQuestionSingle(@RequestParam Integer articleId, @RequestParam Integer managerId, @RequestParam String text, HttpServletRequest request) - { - try - { - Workers u= (Workers) request.getSession().getAttribute("user"); - if(storedArticlesService.findById(articleId).isEmpty()) - { - return "redirect:/worker/articles"; - } - if(!storedArticlesService.findById(articleId).get().getLocationid().equals(u.getLocation().getLocationid())) - { - return "redirect:/login"; - } - Questions q=questionsService.create(text, u.getUserid(), managerId).orElseThrow(); - questionsService.addArticle(q.getQuestionid(), articleId); - return "redirect:/worker"; - } - catch (Exception e) - { - return "redirect:/worker?error="+e.getMessage(); - } - } - -} Index: llyStocked/src/main/resources/application-prod.properties =================================================================== --- FullyStocked/src/main/resources/application-prod.properties (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,14 +1,0 @@ - -spring.datasource.url=jdbc:postgresql://localhost:5444/db_202223z_va_prj_fullystocked -spring.datasource.username= db_202223z_va_prj_fullystocked_owner -spring.datasource.password= c0d0d9b45532 - -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: llyStocked/src/main/resources/application.properties =================================================================== --- FullyStocked/src/main/resources/application.properties (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,4 +1,0 @@ - -server.port=9999 -spring.profiles.active=prod -spring.jpa.properties.hibernate.default_schema=project Index: llyStocked/src/main/resources/templates/AskAQuestionSingle.html =================================================================== --- FullyStocked/src/main/resources/templates/AskAQuestionSingle.html (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,82 +1,0 @@ - - - - - - - FullyStocked - - - -
-

Креирај прашање до менаџаер

-
-
-
-
-
- -
- -
-
-
-
- -
- -
-
- -
-
-
-
- -
-
-
-
- - Index: llyStocked/src/main/resources/templates/addArticleCategory.html =================================================================== --- FullyStocked/src/main/resources/templates/addArticleCategory.html (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,106 +1,0 @@ - - - - - - - FullyStocked - - - -
-

Додај категорија на артикл

-
-
-
-
-
-
-
-
- -
- - -
-
-
-
- -
- - -
-
-
-
-
-
- -
-
-
-
- - - Index: llyStocked/src/main/resources/templates/addInvoiceArticle.html =================================================================== --- FullyStocked/src/main/resources/templates/addInvoiceArticle.html (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,99 +1,0 @@ - - - - - - - FullyStocked - - - -
-
-
-
-
-

-
-
- -
-

Локација:

-

Количина:

-
- -
-

-

-
-
- Количина -
- -
-
-
- Цена -
- -
- - - -
-

-
- -
-

-

- -
-

-
-
- -
- project-image -
-
-
- - Index: llyStocked/src/main/resources/templates/addOrderArticle.html =================================================================== --- FullyStocked/src/main/resources/templates/addOrderArticle.html (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,120 +1,0 @@ - - - - - - - FullyStocked - - - - -
-
-
-
-
-

-
-
- -
-

Максимум дозволена количина по локација:

-
- -
-

-

-
-
- Количина -
- -
-
-
- За локација -
- -
- - - -
-

-
-
-

Достапност по магацини

-
    -
  • - - : - парчиња -
    • -
-
-
-

-

- -
-

-
- -
- -
- project-image -
-
-
- - Index: llyStocked/src/main/resources/templates/articleAnalysis.html =================================================================== --- FullyStocked/src/main/resources/templates/articleAnalysis.html (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,105 +1,0 @@ - - - - - - - FullyStocked - - - - -
-

Анализа на достапноста

-
- - - - - - - - - - - - - - - - - - -
- - - Име - - Локација - - Дефицитарен -
- - -
- - - Index: llyStocked/src/main/resources/templates/articles.html =================================================================== --- FullyStocked/src/main/resources/templates/articles.html (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,105 +1,0 @@ - - - - - - - FullyStocked - - - -
-

Артикли

-
- - - - - - - - - - - - - - - - - - - - - -
- Слика - - Име - - Количина - - -
- - - - -
- -
- -
- - - Index: llyStocked/src/main/resources/templates/askAQuestion.html =================================================================== --- FullyStocked/src/main/resources/templates/askAQuestion.html (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,81 +1,0 @@ - - - - - - - FullyStocked - - - -
-

Креирај прашање до менаџаер

-
-
-
-
-
- -
- -
-
-
-
- -
- -
-
-
-
-
-
- -
-
-
-
- - Index: llyStocked/src/main/resources/templates/createAnswer.html =================================================================== --- FullyStocked/src/main/resources/templates/createAnswer.html (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,81 +1,0 @@ - - - - - - - FullyStocked - - - -
-

Одговор на прашање

-
-
-
-
-
- -
- -
-
- - -
-
-
-
- -
-
-
-
- - Index: llyStocked/src/main/resources/templates/createArticle.html =================================================================== --- FullyStocked/src/main/resources/templates/createArticle.html (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,100 +1,0 @@ - - - - - - - FullyStocked - - - -
-

Креирање на артикл

-
-
-
-
-
- -
- -
-
-
-
- -
- -
-
-
-
- -
- -
-
-
-
- -
- -
-
-
-
-
-
- -
-
-
-
- - Index: llyStocked/src/main/resources/templates/createInv.html =================================================================== --- FullyStocked/src/main/resources/templates/createInv.html (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,99 +1,0 @@ - - - - - - - FullyStocked - - - -
-

Креирај фактура

-

Инфо за клиент

-
-
-
-
-
- -
- -
-
-
-
- -
- -
-
-
-
- -
- -
-
-
-
- -
- -
-
-
-
- -
- -
-
-
-
-
-
- -
-
-
-
- - Index: llyStocked/src/main/resources/templates/createOffer.html =================================================================== --- FullyStocked/src/main/resources/templates/createOffer.html (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,88 +1,0 @@ - - - - - - - FullyStocked - - - - - -
-
-
-
-
-

-
-
- - -
-

-

-
-
- Количина -
- -
-
-
- Цена -
- -
- - - -
-

-
- -
-

-

- -
-

-
-
- -
- project-image -
-
-
- - Index: llyStocked/src/main/resources/templates/createOrder.html =================================================================== --- FullyStocked/src/main/resources/templates/createOrder.html (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,105 +1,0 @@ - - - - - - - FullyStocked - - - - -
-

Креирај нарачка

-
-
-
-
-
- -
- -
-
-
-
- -
- -
-
-
-
- -
- -
-
-
-
-
-
- -
-
-
-
- - Index: llyStocked/src/main/resources/templates/deliveredArticles.html =================================================================== --- FullyStocked/src/main/resources/templates/deliveredArticles.html (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,116 +1,0 @@ - - - - - - - FullyStocked - - - -
-

Артикли

-
- - - - - - - - - - - - - - - - - - - - - - - - - -
- Слика - - Име - - Доставена количина - - Достапна количина - - Максимална дозволена количина - - -
- - - - - - -
- - -
- -
- - - Index: llyStocked/src/main/resources/templates/detailsArticle.html =================================================================== --- FullyStocked/src/main/resources/templates/detailsArticle.html (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,95 +1,0 @@ - - - - - - - FullyStocked - - - -
-
-
-
-
-

-
-
- -
-

Локација:

-

Количина:

-
- -
-

Категории:

-
    -
  • - -
    • -
-
- -
-

-

- - -
- -

-
- -
-

- « Назад - -

-
-
- -
- project-image -
-
-
- - Index: llyStocked/src/main/resources/templates/fragments/footer.html =================================================================== --- FullyStocked/src/main/resources/templates/fragments/footer.html (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,47 +1,0 @@ -
-
-
-
-
About
-
-

- Le Lorem Ipsum est simplement du faux texte employé dans la composition et la mise en page avant - impression. -

-
- -
-
Informations
-
- -
- -
-
Others links
-
- -
- -
-
Contact
-
-
    -
  • My company
    • -
  • email@example.com
    • -
  • + 33 12 14 15 16
    • -
  • + 33 12 14 15 16
    • -
-
-
-
-
Index: llyStocked/src/main/resources/templates/fragments/header.html =================================================================== --- FullyStocked/src/main/resources/templates/fragments/header.html (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,86 +1,0 @@ -
- - - - - -
Index: llyStocked/src/main/resources/templates/home.html =================================================================== --- FullyStocked/src/main/resources/templates/home.html (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,52 +1,0 @@ - -
- - - - - -
-
-
-

FullyStocked

-
-

Добредојдовте на FullyStocked

-

Доколку немате профил

-
- Регистрирај се -
-

Доколку имате профил

-
- Најави се -
-
- -
-
-

За апликацијата

-

- Овој систем претставува веб апликација која има за цел да и помогне на било која организација која содржи во нејзините рамки еден или повеќе магацини, во која таа чува одредени артикли од различни категории. - Главна придобивка од користењето на овој систем е тоа што комплетно го автоматизира и дигитализира досега рачниот начин на менаџирање на магацините и овозможува сите активности да се одвиваат покоординирано, поорганизирано, побезбедно и со помалку грешки. -

-
-
-
- Index: llyStocked/src/main/resources/templates/homeManager.html =================================================================== --- FullyStocked/src/main/resources/templates/homeManager.html (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,78 +1,0 @@ - - - - - - - FullyStocked - - - - - -
-

FullyStocked

-
-

Добредојдовте на FullyStocked

-

Информации за менаџер

-

Име:

-

Презиме:

-
- -
-
-

За апликацијата

-

- Овој систем претставува веб апликација која има за цел да и помогне на било која организација која содржи во нејзините рамки еден или повеќе магацини, во која таа чува одредени артикли од различни категории. - Главна придобивка од користењето на овој систем е тоа што комплетно го автоматизира и дигитализира досега рачниот начин на менаџирање на магацините и овозможува сите активности да се одвиваат покоординирано, поорганизирано, побезбедно и со помалку грешки. -

-
-
- - Index: llyStocked/src/main/resources/templates/homeSupplier.html =================================================================== --- FullyStocked/src/main/resources/templates/homeSupplier.html (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,61 +1,0 @@ - - - - - - - FullyStocked - - - - - -
-

FullyStocked

-
-

Добредојдовте на FullyStocked

-

Информации за добавувач

-

Добавувач:

-

Телефон:

-

Адреса:

-
- -
-
-

За апликацијата

-

- Овој систем претставува веб апликација која има за цел да и помогне на било која организација која содржи во нејзините рамки еден или повеќе магацини, во која таа чува одредени артикли од различни категории. - Главна придобивка од користењето на овој систем е тоа што комплетно го автоматизира и дигитализира досега рачниот начин на менаџирање на магацините и овозможува сите активности да се одвиваат покоординирано, поорганизирано, побезбедно и со помалку грешки. -

-
-
- - Index: llyStocked/src/main/resources/templates/homeWorker.html =================================================================== --- FullyStocked/src/main/resources/templates/homeWorker.html (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,70 +1,0 @@ - - - - - - - FullyStocked - - - - - -
-

FullyStocked

-
-

Добредојдовте на FullyStocked

-

Информации за магационерот

-

Име:

-

Презиме:

-

Локација:

-
- -
-
-

За апликацијата

-

- Овој систем претставува веб апликација која има за цел да и помогне на било која организација која содржи во нејзините рамки еден или повеќе магацини, во која таа чува одредени артикли од различни категории. - Главна придобивка од користењето на овој систем е тоа што комплетно го автоматизира и дигитализира досега рачниот начин на менаџирање на магацините и овозможува сите активности да се одвиваат покоординирано, поорганизирано, побезбедно и со помалку грешки. -

-
-
- - Index: llyStocked/src/main/resources/templates/locationAnalysis.html =================================================================== --- FullyStocked/src/main/resources/templates/locationAnalysis.html (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,101 +1,0 @@ - - - - - - - FullyStocked - - - - -
-

Профит на секој магацин

-
- - - - - - - - - - - - - - - - -
- - - Локација - - Профит -
- -
- - - Index: llyStocked/src/main/resources/templates/login.html =================================================================== --- FullyStocked/src/main/resources/templates/login.html (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,38 +1,0 @@ - - - - -
-
-
-
- Phone image -
-
-

Најави се

-
-
- - -
- -
- - -
- - - -
- -
- - -
-

Немаш профил? Регистрирај сe тука!

-
-
-
-
- Index: llyStocked/src/main/resources/templates/managerOrderDetails.html =================================================================== --- FullyStocked/src/main/resources/templates/managerOrderDetails.html (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,140 +1,0 @@ - - - - - - - FullyStocked - - - - - -
-

Детален приказ на нарачкa

-
-
-
-
-
-
Статус
-

-
-
-
-
Креирана на
-

-
-
-
-
Приоритет
-

-
-
-
-

-

- - -
- -

-
-
-

- « Назад - -

-
-
- -
-
-
Забелешка на менаџер
-

-
-
-
-
Забелешка на добавувач
-

-
-
- -
-
-
-
-
-
-

- Кванитет:
- Цена: -

-
-
-
-
-
- - - - Index: llyStocked/src/main/resources/templates/managerOrders.html =================================================================== --- FullyStocked/src/main/resources/templates/managerOrders.html (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,123 +1,0 @@ - - - - - - - FullyStocked - - - - - - -
-

Нарачки

-
- - - - - - - - - - - - - - - - - - - - - - - - - -
- - - Добавувач - - Статус - - Приоритет - - Забелешка - - Датум креирана - - -
-
- -
-
- - - - Index: llyStocked/src/main/resources/templates/managerQuestionDetails.html =================================================================== --- FullyStocked/src/main/resources/templates/managerQuestionDetails.html (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,127 +1,0 @@ - - - - - - - FullyStocked - - - - -
-

Детален приказ на прашање

-
-
-
-
-
-
Испратено од
-

-
-
-
-
Креирана на
-

-
-
-
-
Артикли
-
    -
  • - - -
    Достапност: - парчиња -
    • -
-
-
- -
-

-

- - -
- -

-
-
-

- « Назад - -

-
-
- -
-
-
Текст
-

-
-
- -
-
-
-

Одговори

-
-
-
Креирано на:
-

-

-
-
-
-
-
- - - Index: llyStocked/src/main/resources/templates/managerQuestions.html =================================================================== --- FullyStocked/src/main/resources/templates/managerQuestions.html (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,111 +1,0 @@ - - - - - - - FullyStocked - - - - -
-

Избери артикл

-
- - - - - - - - - - - - - - - - - - - -
- - - Испратено од - - Датум на креирање - - -
- - -
- -
- -
- - - Index: llyStocked/src/main/resources/templates/noLocWorkers.html =================================================================== --- FullyStocked/src/main/resources/templates/noLocWorkers.html (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,125 +1,0 @@ - - - - - - - FullyStocked - - - - -
-

Избери магационер

-
- - - - - - - - - - - - - - - - - - - - -
- - - Корисничко име - - Име - - Презиме - - -
- - - -
- -
-
- -
-
- -
-
-
- -
- - - Index: llyStocked/src/main/resources/templates/register.html =================================================================== --- FullyStocked/src/main/resources/templates/register.html (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,93 +1,0 @@ - - - - - -
-
-
-
-
-
-
-
- -

Регистрација

- -
- -
- -
- -
- -
- - -
-
-
- -
- - -
-
-
- -
- - -
-
- -
- -
- - -
-
- -
- -
- - -
-
-
- -
- - -
-
-
- -
- - -
-

Веќе имаш профил? Најави сe тука!

-
-
- - Sample image - -
-
-
-
-
-
-
-
- Index: llyStocked/src/main/resources/templates/registerSupplier.html =================================================================== --- FullyStocked/src/main/resources/templates/registerSupplier.html (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,76 +1,0 @@ - - - - - -
-
-
-
-
-
-
-
- -

Регистрација на добавувач

- -
- -
- -
- - -
-
-
- -
- - -
-
-
- -
- - -
-
- -
- -
- - -
-
- -
- -
- - -
-
-
- -
- -
- -
-
- - Sample image - -
-
-
-
-
-
-
-
- Index: llyStocked/src/main/resources/templates/selectInvArticle.html =================================================================== --- FullyStocked/src/main/resources/templates/selectInvArticle.html (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,107 +1,0 @@ - - - - - - - FullyStocked - - - -
-

Избери артикл

-
- - - - - - - - - - - - - - - - - - - - - -
- Слика - - Име - - Достапна количина - - -
- - - - -
- - - -
- -
- - - Index: llyStocked/src/main/resources/templates/selectOrderArticle.html =================================================================== --- FullyStocked/src/main/resources/templates/selectOrderArticle.html (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,123 +1,0 @@ - - - - - - - FullyStocked - - - - -
-

Избери артикл

-
- - - - - - - - - - - - - - - - - - - -
- - - Слика - - Име - - -
- - - -
- - - -
- -
-
-
-
-
- - -
-
-
- - - Index: llyStocked/src/main/resources/templates/selectQuestionArticle.html =================================================================== --- FullyStocked/src/main/resources/templates/selectQuestionArticle.html (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,113 +1,0 @@ - - - - - - - FullyStocked - - - -
-

Избери артикл

-
- - - - - - - - - - - - - - - - - - - - - -
- Слика - - Име - - Достапна количина - - -
- - - - -
- - - -
- -
-
-
-
- Испрати прашање -
-
- - - Index: llyStocked/src/main/resources/templates/suppOrderDetails.html =================================================================== --- FullyStocked/src/main/resources/templates/suppOrderDetails.html (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,127 +1,0 @@ - - - - - - - FullyStocked - - - - - -
-

Детален приказ на нарачкa

-
-
-
-
-
-
Статус
-

-
-
-
-
Креирана на
-

-
-
-
-
Приоритет
-

-
-
-
-

-

- - -
- -

-
-
-

- « Назад - -

-
-
- -
-
-
Забелешка на менаџер
-

-
-
-
-
Забелешка на добавувач
-

-
-
- -
-
-
-
-
-
-

- Кванитет:
- Цена: -

-
- - - -
-
-
-
-
-
- - - - Index: llyStocked/src/main/resources/templates/supplierCategories.html =================================================================== --- FullyStocked/src/main/resources/templates/supplierCategories.html (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,52 +1,0 @@ - - - - - - - FullyStocked - - - - - -
-

Категории што ги добавува добавувачот

-
-
-
    -
  • -
-
- - Index: llyStocked/src/main/resources/templates/supplierOrders.html =================================================================== --- FullyStocked/src/main/resources/templates/supplierOrders.html (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,104 +1,0 @@ - - - - - - - FullyStocked - - - - - -
-

Нарачки

-
- - - - - - - - - - - - - - - - - - - - - - - - - -
- - - Забелешка на менаџер - - Забелешка на добавувач - - Статус - - Приоритет - - Датум креирана - - -
-
- -
-
- - - - Index: llyStocked/src/main/resources/templates/topWorkers.html =================================================================== --- FullyStocked/src/main/resources/templates/topWorkers.html (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,126 +1,0 @@ - - - - - - - FullyStocked - - - - -
-

Најдобри магационери

-
- - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - Име - - Презиме - - Износ на најдобра фактура - - Највреден артикл - - Цена на артиклот - - Количина на артиклот - - Вкупна цена на артиклот -
- - - - - - -
- - - Index: llyStocked/src/main/resources/templates/workerOrders.html =================================================================== --- FullyStocked/src/main/resources/templates/workerOrders.html (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,112 +1,0 @@ - - - - - - - FullyStocked - - - -
-

Нарачки во тек

-
- - - - - - - - - - - - - - - - - - - - - - - - - -
- - - Добавувач - - Статус - - Приоритет - - Забелешка - - Датум креирана - - -
-
- - -
-
- - - - Index: llyStocked/src/main/resources/templates/workerQuestionDetails.html =================================================================== --- FullyStocked/src/main/resources/templates/workerQuestionDetails.html (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,108 +1,0 @@ - - - - - - - FullyStocked - - - -
-

Детален приказ на прашање

-
-
-
-
-
-
Испратено до
-

-
-
-
-
Креирана на
-

-
-
-
-
Артикли
-
    -
  • - - -
    Достапност: - парчиња -
    • -
-
-
- -
-

- « Назад - -

-
-
- -
-
-
Текст
-

-
-
- -
-
-
-

Одговори

-
-
-
Креирано на:
-

-

-
-
-
-
-
- - - Index: llyStocked/src/main/resources/templates/workerQuestions.html =================================================================== --- FullyStocked/src/main/resources/templates/workerQuestions.html (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,101 +1,0 @@ - - - - - - - FullyStocked - - - -
-

Избери артикл

-
- - - - - - - - - - - - - - - - - - - -
- - - Испратено до - - Датум на креирање - - -
- - -
- -
- -
- - - Index: llyStocked/src/test/java/com/bazi/fullystocked/FullyStockedApplicationTests.java =================================================================== --- FullyStocked/src/test/java/com/bazi/fullystocked/FullyStockedApplicationTests.java (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,13 +1,0 @@ -package com.bazi.fullystocked; - -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.context.SpringBootTest; - -@SpringBootTest -class FullyStockedApplicationTests { - - @Test - void contextLoads() { - } - -} Index: README.md =================================================================== --- README.md (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ README.md (revision 4b1b83812fe097cf4628da12546f220ade960da5) @@ -1,6 +1,1 @@ # FullyStocked - -Репозиториум за проектот по предметот Бази на податоци
-Членови:
-Бојан Трпески - 201091
-Дарко Сасански - 201065
Index: LScripts/AdditionalCreations.sql =================================================================== --- SQLScripts/AdditionalCreations.sql (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,83 +1,0 @@ ---- view za pregled na sostojbata na site artikli na bilo koja lokacija - -create or replace view articles_report as - select a.articleid, a.articlename, a.description, a.imageurl, s.quantity, l.locationname, l.locationid, s.sarticleid from articles a - left join storedarticles s on s.articleid=a.articleid - left join locations l on l.locationid=s.locationid - ---- view za pregled na koi kategorii pripagja sekoj artikl - -create or replace view articles_and_cats_report as - select c.categoryname, c.categoryid, a.articleid, a.articlename from categories c - left join article_belongs_to_category abtc on abtc.categoryid=c.categoryid - left join articles a on a.articleid=abtc.articleid - --- view za pregled na artiklite koi moze da gi dostavi sekoj od dobavuvacite - -create or replace view supplier_supplies_article as - select articlename, s.userid, a.articleid from articles a - left join article_belongs_to_category abtc on abtc.articleid=a.articleid - left join supplier_supplies_category ssc on ssc.categoryid=abtc.categoryid - left join suppliers s on s.userid=ssc.userid - --- view za pregled na artiklite i nivnata dostapnosta na site lokacii - -create or replace view articles_at_location as - select a.articleid, a.description, a.articlename, a.imageurl, a.maxquantityperlocation, s.sarticleid, s.quantity, s.locationid, l.locationname from articles a - left join storedarticles s on s.articleid=a.articleid - left join locations l on l.locationid=s.locationid - --- view za pregled na artiklite vo sekoja narachka - -create or replace view ordered_articles_report as - select a.articleid, a.description, a.articlename, a.imageurl, a.maxquantityperlocation, o.oarticleid, o.quantity, o.locationid, o.price, o.articlestatus, o.orderid, s.quantity as storedQuantity from orderedarticles o - left join articles a on o.articleid=a.articleid - left join storedarticles s on s.locationid=o.locationid and s.articleid=a.articleid - --- view za pregled na artiklite vo sekoja faktura - -create or replace view invoiced_articles_report as - select i.iarticleid, i.invoiceid, i.articleid, i.price, i.quantity, a.description, a.articlename, a.imageurl, a.maxquantityperlocation from invoicedarticles i - left join articles a on a.articleid=i.articleid - --- view za pregled na detalni informacii za narachkite - -create or replace view orders_report as - select o.orderid, o.supplierremark, o.managerremark, o.status, o.datecreated, o.priority, o.supplieruserid, s.supplierinfo, o.manageruserid from orders o - left join suppliers s on s.userid=o.supplieruserid - --- view za pregled na detalni informacii za dobavuvacite - -create or replace view suppliers_report as select u.userid, - u.username, - u.firstname, - u.lastname, - s.street, - s.streetnumber, - s.city, - s.phone, - s.supplierinfo - from users u - join suppliers s on s.userid = u.userid; - --- funkcija za popolnuvanje na razlicnite magacini - -CREATE OR REPLACE FUNCTION project.populatestorage() - RETURNS trigger - LANGUAGE plpgsql -AS $function$ - BEGIN - insert into project.storedarticles(quantity,locationid,articleid) select 0 as quantity, l.locationid, new.articleid as articleid from project.locations l; - return new; - END; -$function$ -; - --- triger za avtomatsko popolnuvanje na razlicnite magacini - -CREATE TRIGGER populateStorage - after insert on public.articles - for each row - execute procedure public.populatestoragefunc(); - - Index: LScripts/kreiranje.sql =================================================================== --- SQLScripts/kreiranje.sql (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,260 +1,0 @@ -drop schema if exists project cascade; -create schema project; - ---use project - -drop table if exists users cascade; -drop table if exists workers cascade; -drop table if exists managers cascade; -drop table if exists suppliers cascade; -drop table if exists articles cascade; -drop table if exists invoices cascade; -drop table if exists orders cascade; -drop table if exists categories cascade; -drop table if exists locations cascade; -drop table if exists questions cascade; -drop table if exists storedArticles cascade; -drop table if exists invoicedArticles cascade; -drop table if exists orderedArticles cascade; -drop table if exists answers cascade; -drop table if exists question_availability_for_storedarticle cascade; -drop table if exists article_belongs_to_category cascade; -drop table if exists supplier_supplies_category cascade; - -------------------------- - -create table users( - - userId serial primary key, - firstName varchar(100) not null, - lastName varchar(100) not null, - username varchar(100) unique not null, - email varchar(100) not null, - userPassword varchar(100) not null - -); - -------------------------- - -create table articles( - - articleId serial primary key, - description varchar(400) not null, - articleName varchar(100) not null, - imageURL varchar(200), - maxQuantityPerLocation integer not null - constraint ck_maxquantity_gt_0 check (maxQuantityPerLocation>0) - -); - -------------------------- - -create table categories( - - categoryId serial primary key, - categoryName varchar(100) not null, - description varchar(400) not null - -); - -------------------------- - -create table locations( - - locationId serial primary key, - locationName varchar(100) not null, - phone varchar(20) not null, - street varchar(100) not null, - streetNumber integer not null, - city varchar(20) not null - -); - -------------------------- - -create table workers( - - userId integer primary key, - locationId integer, - constraint fk_workers_id foreign key (userId) references users(userId) on delete cascade on update cascade, - constraint fk_workers_loc foreign key (locationId) references locations(locationId) - -); - -------------------------- - -create table managers( - - userId integer primary key, - constraint fk_managers_id foreign key (userId) references users(userId) on delete cascade on update cascade - -); - -------------------------- - -create table suppliers( - - userId integer primary key, - supplierInfo varchar(300) not null, - phone varchar(20) not null, - street varchar(100) not null, - streetNumber integer not null, - city varchar(100) not null, - constraint fk_suppliers_id foreign key (userId) references users(userId) on delete cascade on update cascade - -); - -------------------------- - -create table invoices( - invoiceId serial primary key, - customerName varchar(100), - customerPhone varchar(20), - street varchar(100), - streetNumber integer, - city varchar(100), - dateCreate timestamp default now(), - workerUserId integer not null, - constraint fk_invoice_worker foreign key (workerUserId) references workers(userId) - -); - -------------------------- - -create table orders( - - orderId serial primary key, - status varchar(50) not null, - supplierRemark varchar(400), - managerRemark varchar(400), - dateCreated timestamp default now(), - dateApproved timestamp, - dateDelivered timestamp, - priority varchar(50) not null, - managerUserId integer not null, - supplierUserId integer not null, - constraint fk_order_manager foreign key (managerUserId) references managers(userId), - constraint fk_order_supplier foreign key (supplierUserId) references suppliers(userId) - -); - -------------------------- - -create table storedArticles( - - sArticleId serial primary key, - quantity integer not null, - locationId integer not null, - articleId integer not null, - constraint fk_storedArt_article foreign key (articleId) references articles(articleId), - constraint fk_storedArt_location foreign key (locationId) references locations(locationId), - constraint ck_quantity_gt_0 check (quantity>=0) - -); - -------------------------- - -create table invoicedArticles( - - iArticleId serial primary key, - price integer not null, - quantity integer not null, - invoiceId integer not null, - articleId integer not null, - constraint fk_invoicedArt_article foreign key (articleId) references articles(articleId), - constraint fk_invoicedArt_invoice foreign key (invoiceId) references invoices(invoiceId), - constraint ck_price_gt_0 check (price>0), - constraint ck_quantity_gt_0 check (quantity>0) - -); - -------------------------- - -create table orderedArticles( - - oArticleId serial primary key, - price integer, - quantity integer not null, - articleStatus varchar(50) not null, - orderId integer not null, - locationId integer not null, - articleId integer not null, - constraint fk_orderedArt_article foreign key (articleId) references articles(articleId), - constraint fk_orderedArt_location foreign key (locationId) references locations(locationId), - constraint fk_orderedArt_order foreign key (orderId) references orders(orderId), - constraint ck_price_gt_0 check (price>0), - constraint ck_quantity_gt_0 check (quantity>0) - -); - -------------------------- - -create table questions( - - questionId serial primary key, - questionText varchar(500) not null, - dateCreated timestamp default now(), - workerUserId integer not null, - managerUserId integer not null, - constraint fk_question_worker foreign key (workerUserId) references workers(userId), - constraint fk_question_manager foreign key (managerUserId) references managers(userId) - -); - -------------------------- - -create table answers( - - answerId serial, - questionId integer, - answerText varchar(500) not null, - dateCreated timestamp default now(), - constraint fk_answer_question foreign key (questionId) references questions(questionId) on delete cascade on update cascade, - constraint pk_answer primary key(questionId, answerId) - -); - -------------------------- - -create table question_availability_for_storedarticle( - - questionId integer, - sArticleId integer, - constraint fk_question_sarticle_question foreign key (questionId) references questions(questionId), - constraint fk_question_sarticle_sarticle foreign key (sArticleId) references storedArticles(sArticleId) - -); - -------------------------- - -create table article_belongs_to_category( - - articleId integer, - categoryId integer, - constraint fk_article_category_article foreign key (articleId) references articles(articleId), - constraint fk_article_category_category foreign key (categoryId) references categories(categoryId) - -); - -------------------------- - -create table supplier_supplies_category( - - userId integer, - categoryId integer, - constraint fk_supplier_category_supplier foreign key (userId) references suppliers(userId), - constraint fk_supplier_category_category foreign key (categoryId) references categories(categoryId) - -); - -------------------------- - -alter table question_availability_for_storedarticle add constraint pk_question_availability_for_storedarticle primary key (questionId, sArticleId); - -------------------------- - -alter table article_belongs_to_category add constraint pk_article_belongs_to_category primary key (articleId, categoryId); - -------------------------- - -alter table supplier_supplies_category add constraint pk_supplier_supplies_category primary key (userId, categoryId); Index: LScripts/polnenje.sql =================================================================== --- SQLScripts/polnenje.sql (revision 99d8816b5d585c5f6c9385d3385378c3e8d8658d) +++ (revision ) @@ -1,113 +1,0 @@ -insert into users (firstname,lastname,username,email,userpassword) values -('Bojan','Trpeski','BojanT','bojan@gmail.com','1234'), -('Darko','Sasanski','DarkoS','darko@gmail.com','1111'), -('Trajko','Trajkovski','TrajkoT','trajko@gmail.com','2222'), -('Petko','Petkovski','PetkoP','petko@gmail.com','3333'), -('Andrej','Todorovski','AndrejT','andrej@gmail.com','4444'), -('Hristijan','Hristovski','HristijanH','hristijan@gmail.com','55555'), -('Stefan','Stefanovski','StefanS','stefan@gmail.com','6666'), -('Dimitar','Dimovski','DimitarD','dimitar@gmail.com','7777'), -('David','Davidovski','DavidD','david@gmail.com','8888'); - -insert into managers (userid) values -(2),(3),(6); - -insert into workers (userid) values -(4),(5),(7); - -insert into suppliers (userid,supplierinfo,phone,street,streetnumber,city) values -(8,'DHL','070123456','Ilindenska',123,'Skopje'), -(9,'FedEx','070555111','Partizanski Oderdi',15,'Skopje'), -(1,'Kargo Express','070789456','Jane Sandanski',55,'Skopje'); - - -insert into orders (status,supplierremark,priority,manageruserid,supplieruserid) values -('IN_PROGRESS','To be delivered','Low',2,1); -insert into orders (status,managerremark,priority,manageruserid,supplieruserid) values -('IN_PROGRESS','To be packed','Medium',3,8); -insert into orders (status,datecreated,dateapproved ,priority,manageruserid,supplieruserid) values -('DELIVERED','2022-10-11 11:53:45','2022-10-12 12:13:14','High',6,9); - -insert into articles (description,articlename,maxquantityperlocation) values -('Del za velosiped','Osovina',10), -('Novi televizori','Samsung TV 4K',15), -('Bluetooth audio','JBL GO 2',50), -('Domasen enterier','Agolna garnitura',5), -('Novi laptopi','Apple M1',100), -('Novi velosipedi','Focus',10), -('Domasen enterier','Biro',20), -('Debela Jakna','Addidas jakna',120), -('Jakna za skijanje','Nike jakna',150); - -insert into categories (categoryName,description) values -('Garderoba','Zimski jakni'), -('Tehnologija','Najnovi televizori, kompjuteri i audio uredi'), -('Velosipedizam','Se za velosipedi'), -('Mebel','Mebel za sekoj dom'); - -insert into locations (locationname,phone,street,streetnumber,city) values -('Magacin 1','078894563','Metodija Shatorov Sharlo',53,'Skopje'), -('Magacin 2','075321654','Boris Trajkovski',81,'Skopje'), -('Magacin 3','072125874','1.Maj',45,'Bitola'); - -update workers set locationid =1 where userid =4; -update workers set locationid =2 where userid =5; -update workers set locationid =3 where userid =7; - -insert into invoices (customername,customerphone,street,streetnumber,city,workeruserid) values -('Stojan','0789654123','Bulervar Srbija','155','Skopje',7), -('Marko','070456321','Ruzveltova','3','Skopje',4), -('Kristijan','075897125','ASNOM','47','Veles',5); - -insert into invoicedarticles (price,quantity,invoiceid,articleid) values -(6000,3,1,3), -(50000,1,3,5), -(20000,2,2,7); - -insert into storedarticles (quantity,locationid,articleid) values -(5,1,6), -(10,3,3), -(20,3,8), -(2,2,5), -(8,1,7); - -insert into orderedarticles (price,quantity,orderid,locationid,articleid, articlestatus) values -(100000,2,1,1,4, 'ORDERED'), -(2000,1,2,2,1, 'ORDERED'), -(15000,5,3,3,9, 'DELIVERED'); - -insert into questions (questiontext,datecreated,workeruserid,manageruserid) values -('Dali ke moze da naracate uste Focus velosipedi, nemame na zaliha?','2022-10-10 14:15:23',7,6), -('Dali se dosta 100 jakni?','2022-11-11 11:12:12',5,2), -('Dali ke moze da naracate novi JBL GO2 zvucnici, imame uste 10?','2022-11-15 13:51:23',4,3); - -insert into answers (questionId,answertext,datecreated) values -(1,'Da, ke naracam uste 5.','2022-10-11 08:14:14'), -(2,'Dovolno e 100 jakni.','2022-11-12 09:16:23'), -(3,'Sekako, ke naracam 100 parcinja.','2022-11-17 12:42:24'); - -insert into question_availability_for_storedarticle (questionId,sarticleid) values -(1,1), -(2,3), -(3,2); - -insert into supplier_supplies_category (userid,categoryid) values -(8,1), -(8,2), -(9,3), -(9,4), -(9,2), -(1,1), -(1,3), -(1,4); - -insert into article_belongs_to_category (articleId,categoryid) values -(1,2), -(2,1), -(3,1), -(4,3), -(5,1), -(6,2), -(7,3), -(8,4), -(9,4);