From 0d5c7c15769af498baffd40b032fb70ddb360e5f Mon Sep 17 00:00:00 2001 From: Jason Corchado Date: Tue, 13 Apr 2021 15:34:32 -0400 Subject: [PATCH 1/2] initial commit --- .mvn/wrapper/MavenWrapperDownloader.java | 150 +++++ .mvn/wrapper/maven-wrapper.properties | 2 + mvnw | 322 +++++++++++ mvnw.cmd | 182 ++++++ pom.xml | 64 +++ .../javaorders/JavaOrdersApplication.java | 15 + .../com/lambdaschool/javaorders/SeedData.java | 540 ++++++++++++++++++ .../config/H2ServerConfiguration.java | 48 ++ .../lambdaschool/javaorders/models/Agent.java | 113 ++++ .../javaorders/models/Customer.java | 176 ++++++ .../lambdaschool/javaorders/models/Order.java | 111 ++++ .../javaorders/models/Payment.java | 62 ++ .../repositories/AgentsRepository.java | 8 + .../repositories/CustomersRepository.java | 8 + .../repositories/OrdersRepository.java | 8 + .../repositories/PaymentRepository.java | 8 + .../javaorders/services/CustomerServices.java | 8 + .../services/CustomerServicesImpl.java | 19 + .../javaorders/services/PaymentServices.java | 8 + .../services/PaymentServicesImpl.java | 19 + src/main/resources/application.properties | 14 + src/main/resources/data.sql | 86 +++ .../JavaOrdersApplicationTests.java | 15 + target/classes/application.properties | 14 + target/classes/data.sql | 86 +++ 25 files changed, 2086 insertions(+) create mode 100644 .mvn/wrapper/MavenWrapperDownloader.java create mode 100644 .mvn/wrapper/maven-wrapper.properties create mode 100644 mvnw create mode 100644 mvnw.cmd create mode 100644 pom.xml create mode 100644 src/main/java/com/lambdaschool/javaorders/JavaOrdersApplication.java create mode 100644 src/main/java/com/lambdaschool/javaorders/SeedData.java create mode 100644 src/main/java/com/lambdaschool/javaorders/config/H2ServerConfiguration.java create mode 100644 src/main/java/com/lambdaschool/javaorders/models/Agent.java create mode 100644 src/main/java/com/lambdaschool/javaorders/models/Customer.java create mode 100644 src/main/java/com/lambdaschool/javaorders/models/Order.java create mode 100644 src/main/java/com/lambdaschool/javaorders/models/Payment.java create mode 100644 src/main/java/com/lambdaschool/javaorders/repositories/AgentsRepository.java create mode 100644 src/main/java/com/lambdaschool/javaorders/repositories/CustomersRepository.java create mode 100644 src/main/java/com/lambdaschool/javaorders/repositories/OrdersRepository.java create mode 100644 src/main/java/com/lambdaschool/javaorders/repositories/PaymentRepository.java create mode 100644 src/main/java/com/lambdaschool/javaorders/services/CustomerServices.java create mode 100644 src/main/java/com/lambdaschool/javaorders/services/CustomerServicesImpl.java create mode 100644 src/main/java/com/lambdaschool/javaorders/services/PaymentServices.java create mode 100644 src/main/java/com/lambdaschool/javaorders/services/PaymentServicesImpl.java create mode 100644 src/main/resources/application.properties create mode 100644 src/main/resources/data.sql create mode 100644 src/test/java/com/lambdaschool/javaorders/JavaOrdersApplicationTests.java create mode 100644 target/classes/application.properties create mode 100644 target/classes/data.sql diff --git a/.mvn/wrapper/MavenWrapperDownloader.java b/.mvn/wrapper/MavenWrapperDownloader.java new file mode 100644 index 0000000..f017ce6 --- /dev/null +++ b/.mvn/wrapper/MavenWrapperDownloader.java @@ -0,0 +1,150 @@ +/* + * Copyright 2007-present the original author or authors. + * + * Licensed 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. + */ + +import java.net.*; +import java.io.*; +import java.nio.channels.*; +import java.util.Properties; + +public class MavenWrapperDownloader +{ + + private static final String WRAPPER_VERSION = "0.5.6"; + + /** + * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided. + */ + private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/" + + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar"; + + /** + * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to + * use instead of the default one. + */ + private static final String MAVEN_WRAPPER_PROPERTIES_PATH = + ".mvn/wrapper/maven-wrapper.properties"; + + /** + * Path where the maven-wrapper.jar will be saved to. + */ + private static final String MAVEN_WRAPPER_JAR_PATH = + ".mvn/wrapper/maven-wrapper.jar"; + + /** + * Name of the property which should be used to override the default download url for the wrapper. + */ + private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl"; + + public static void main(String args[]) + { + System.out.println("- Downloader started"); + File baseDirectory = new File(args[0]); + System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath()); + + // If the maven-wrapper.properties exists, read it and check if it contains a custom + // wrapperUrl parameter. + File mavenWrapperPropertyFile = new File(baseDirectory, + MAVEN_WRAPPER_PROPERTIES_PATH); + String url = DEFAULT_DOWNLOAD_URL; + if (mavenWrapperPropertyFile.exists()) + { + FileInputStream mavenWrapperPropertyFileInputStream = null; + try + { + mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile); + Properties mavenWrapperProperties = new Properties(); + mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream); + url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, + url); + } catch (IOException e) + { + System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'"); + } finally + { + try + { + if (mavenWrapperPropertyFileInputStream != null) + { + mavenWrapperPropertyFileInputStream.close(); + } + } catch (IOException e) + { + // Ignore ... + } + } + } + System.out.println("- Downloading from: " + url); + + File outputFile = new File(baseDirectory.getAbsolutePath(), + MAVEN_WRAPPER_JAR_PATH); + if (!outputFile.getParentFile() + .exists()) + { + if (!outputFile.getParentFile() + .mkdirs()) + { + System.out.println( + "- ERROR creating output directory '" + outputFile.getParentFile() + .getAbsolutePath() + "'"); + } + } + System.out.println("- Downloading to: " + outputFile.getAbsolutePath()); + try + { + downloadFileFromURL(url, + outputFile); + System.out.println("Done"); + System.exit(0); + } catch (Throwable e) + { + System.out.println("- Error downloading"); + e.printStackTrace(); + System.exit(1); + } + } + + private static void downloadFileFromURL( + String urlString, + File destination) throws Exception + { + if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) + { + String username = System.getenv("MVNW_USERNAME"); + char[] password = System.getenv("MVNW_PASSWORD") + .toCharArray(); + Authenticator.setDefault(new Authenticator() + { + @Override + protected PasswordAuthentication getPasswordAuthentication() + { + return new PasswordAuthentication(username, + password); + } + }); + } + URL website = new URL(urlString); + ReadableByteChannel rbc; + rbc = Channels.newChannel(website.openStream()); + FileOutputStream fos = new FileOutputStream(destination); + fos.getChannel() + .transferFrom(rbc, + 0, + Long.MAX_VALUE); + fos.close(); + rbc.close(); + } + +} diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..642d572 --- /dev/null +++ b/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,2 @@ +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar diff --git a/mvnw b/mvnw new file mode 100644 index 0000000..3c8a553 --- /dev/null +++ b/mvnw @@ -0,0 +1,322 @@ +#!/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 /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="$(which 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/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + else + jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.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" + else + wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$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 \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/mvnw.cmd b/mvnw.cmd new file mode 100644 index 0000000..c8d4337 --- /dev/null +++ b/mvnw.cmd @@ -0,0 +1,182 @@ +@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 "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" +if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\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/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + +FOR /F "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%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.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 "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" +if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\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% + +exit /B %ERROR_CODE% diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..a70bb9f --- /dev/null +++ b/pom.xml @@ -0,0 +1,64 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 2.2.9.RELEASE + + + com.lambdaschool + java-orders + 0.0.1-SNAPSHOT + java-orders + Demo project for Spring Boot + + + 14 + + + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-devtools + runtime + true + + + com.h2database + h2 + + + + org.springframework.boot + spring-boot-starter-test + test + + + org.junit.vintage + junit-vintage-engine + + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + diff --git a/src/main/java/com/lambdaschool/javaorders/JavaOrdersApplication.java b/src/main/java/com/lambdaschool/javaorders/JavaOrdersApplication.java new file mode 100644 index 0000000..7caf3a6 --- /dev/null +++ b/src/main/java/com/lambdaschool/javaorders/JavaOrdersApplication.java @@ -0,0 +1,15 @@ +package com.lambdaschool.javaorders; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class JavaOrdersApplication +{ + + public static void main(String[] args) + { + SpringApplication.run(JavaOrdersApplication.class, args); + } + +} diff --git a/src/main/java/com/lambdaschool/javaorders/SeedData.java b/src/main/java/com/lambdaschool/javaorders/SeedData.java new file mode 100644 index 0000000..48347f2 --- /dev/null +++ b/src/main/java/com/lambdaschool/javaorders/SeedData.java @@ -0,0 +1,540 @@ +package com.lambdaschool.javaorders; + +// import com.github.javafaker.Faker; +import com.lambdaschool.javaorders.models.Agent; +import com.lambdaschool.javaorders.models.Customer; +import com.lambdaschool.javaorders.models.Order; +import com.lambdaschool.javaorders.models.Payment; +import com.lambdaschool.javaorders.repositories.AgentsRepository; +import com.lambdaschool.javaorders.repositories.CustomersRepository; +import com.lambdaschool.javaorders.repositories.OrdersRepository; +import com.lambdaschool.javaorders.repositories.PaymentRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.CommandLineRunner; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + +import java.util.HashSet; +import java.util.Locale; +import java.util.Random; +import java.util.Set; + + +@Transactional +@Component +public class SeedData implements CommandLineRunner +{ +//* +// * Connects the customer table to this SeedData method + + + @Autowired + private CustomersRepository custrepos; + +//* +// * Connects the agents table to this SeedData method + + + @Autowired + private AgentsRepository agentrepos; + +//* +// * Connects the orders table to this SeedData method + + + @Autowired + private OrdersRepository ordersrepos; + +/* + * Connects the payment table to this SeedData method*/ + + + @Autowired + private PaymentRepository paymentrepos; + +/* * Generates test, seed data for our application + * First a set of known data is seeded into our database. + * Second a random set of data using Java Faker is seeded into our database. + * Note this process does not remove data from the database. So if data exists in the database + * prior to running this process, that data remains in the database. + * + * @param args The parameter is required by the parent interface but is not used in this process.*/ + + + @Transactional + @Override + public void run(String[] args) throws Exception + { + Payment pay1 = new Payment("Cash"); + Payment pay2 = new Payment("Gift Card"); + Payment pay3 = new Payment("Credit Card"); + Payment pay4 = new Payment("Mobile Pay"); + + pay1 = paymentrepos.save(pay1); + pay2 = paymentrepos.save(pay2); + pay3 = paymentrepos.save(pay3); + pay4 = paymentrepos.save(pay4); + + Agent a01 = new Agent("Ramasundar", + "Bangalore", + 0.15, + "077-25814763", + ""); + Agent a02 = new Agent("Alex", + "London", + 0.13, + "075-12458969", + ""); + Agent a03 = new Agent("Alford", + "New York", + 0.12, + "044-25874365", + ""); + Agent a04 = new Agent("Ravi", + "Bangalore", + 0.15, + "077-45625874", + ""); + Agent a05 = new Agent("Santakumar", + "Chennai", + 0.14, + "007-22388644", + ""); + Agent a06 = new Agent("Lucida", + "San Jose", + 0.12, + "044-52981425", + ""); + Agent a07 = new Agent("Anderson", + "Brisban", + 0.13, + "045-21447739", + ""); + Agent a08 = new Agent("Subbarao", + "Bangalore", + 0.14, + "077-12346674", + ""); + Agent a09 = new Agent("Mukesh", + "Mumbai", + 0.11, + "029-12358964", + ""); + Agent a10 = new Agent("McDen", + "London", + 0.15, + "078-22255588", + ""); + Agent a11 = new Agent("Ivan", + "Torento", + 0.15, + "008-22544166", + ""); + Agent a12 = new Agent("Benjamin", + "Hampshair", + 0.11, + "008-22536178", + ""); + + Customer c01 = new Customer("Holmes", + "London", + "London", + "UK", + "2", + 6000.00, + 5000.00, + 7000.00, + 4000.00, + "BBBBBBB", + a03); + Customer c02 = new Customer("Micheal", + "New York", + "New York", + "USA", + "2", + 3000.00, + 5000.00, + 2000.00, + 6000.00, + "CCCCCCC", + a08); + Customer c03 = new Customer("Albert", + "New York", + "New York", + "USA", + "3", + 5000.00, + 7000.00, + 6000.00, + 6000.00, + "BBBBSBB", + a08); + Customer c04 = new Customer("Ravindran", + "Bangalore", + "Bangalore", + "India", + "2", + 5000.00, + 7000.00, + 4000.00, + 8000.00, + "AVAVAVA", + a11); + Customer c05 = new Customer("Cook", + "London", + "London", + "UK", + "2", + 4000.00, + 9000.00, + 7000.00, + 6000.00, + "FSDDSDF", + a06); + Customer c06 = new Customer("Stuart", + "London", + "London", + "UK", + "1", + 6000.00, + 8000.00, + 3000.00, + 11000.00, + "GFSGERS", + a03); + Customer c07 = new Customer("Bolt", + "New York", + "New York", + "USA", + "3", + 5000.00, + 7000.00, + 9000.00, + 3000.00, + "DDNRDRH", + a08); + Customer c08 = new Customer("Fleming", + "Brisban", + "Brisban", + "Australia", + "2", + 7000.00, + 7000.00, + 9000.00, + 5000.00, + "NHBGVFC", + a05); + Customer c09 = new Customer("Jacks", + "Brisban", + "Brisban", + "Australia", + "1", + 7000.00, + 7000.00, + 7000.00, + 7000.00, + "WERTGDF", + a05); + Customer c10 = new Customer("Yearannaidu", + "Chennai", + "Chennai", + "India", + "1", + 8000.00, + 7000.00, + 7000.00, + 8000.00, + "ZZZZBFV", + a10); + Customer c11 = new Customer("Sasikant", + "Mumbai", + "Mumbai", + "India", + "1", + 7000.00, + 11000.00, + 7000.00, + 11000.00, + "147-25896312", + a02); + Customer c12 = new Customer("Ramanathan", + "Chennai", + "Chennai", + "India", + "1", + 7000.00, + 11000.00, + 9000.00, + 9000.00, + "GHRDWSD", + a10); + Customer c13 = new Customer("Avinash", + "Mumbai", + "Mumbai", + "India", + "2", + 7000.00, + 11000.00, + 9000.00, + 9000.00, + "113-12345678", + a02); + Customer c14 = new Customer("Winston", + "Brisban", + "Brisban", + "Australia", + "1", + 5000.00, + 8000.00, + 7000.00, + 6000.00, + "AAAAAAA", + a05); + Customer c15 = new Customer("Karl", + "London", + "London", + "UK", + "0", + 4000.00, + 6000.00, + 7000.00, + 3000.00, + "AAAABAA", + a06); + Customer c16 = new Customer("Shilton", + "Torento", + "Torento", + "Canada", + "1", + 10000.00, + 7000.00, + 6000.00, + 11000.00, + "DDDDDDD", + a04); + Customer c17 = new Customer("Charles", + "Hampshair", + "Hampshair", + "UK", + "3", + 6000.00, + 4000.00, + 5000.00, + 5000.00, + "MMMMMMM", + a09); + Customer c18 = new Customer("Srinivas", + "Bangalore", + "Bangalore", + "India", + "2", + 8000.00, + 4000.00, + 3000.00, + 9000.00, + "AAAAAAB", + a07); + Customer c19 = new Customer("Steven", + "San Jose", + "San Jose", + "USA", + "1", + 5000.00, + 7000.00, + 9000.00, + 3000.00, + "KRFYGJK", + a10); + Customer c20 = new Customer("Karolina", + "Torento", + "Torento", + "Canada", + "1", + 7000.00, + 7000.00, + 9000.00, + 5000.00, + "HJKORED", + a04); + Customer c21 = new Customer("Martin", + "Torento", + "Torento", + "Canada", + "2", + 8000.00, + 7000.00, + 7000.00, + 8000.00, + "MJYURFD", + a04); + Customer c22 = new Customer("Ramesh", + "Mumbai", + "Mumbai", + "India", + "3", + 8000.00, + 7000.00, + 3000.00, + 12000.00, + "Phone No", + a02); + Customer c23 = new Customer("Rangarappa", + "Bangalore", + "Bangalore", + "India", + "2", + 8000.00, + 11000.00, + 7000.00, + 12000.00, + "AAAATGF", + a01); + Customer c24 = new Customer("Venkatpati", + "Bangalore", + "Bangalore", + "India", + "2", + 8000.00, + 11000.00, + 7000.00, + 12000.00, + "JRTVFDD", + a07); + Customer c25 = new Customer("Sundariya", + "Chennai", + "Chennai", + "India", + "3", + 7000.00, + 11000.00, + 7000.00, + 11000.00, + "PPHGRTS", + a10); + + Order o01 = new Order(1000.00, + 600.00, + c13, + "SOD"); + o01.addPayments(pay1); + + Order o02 = new Order(3000.00, + 500.00, + c19, + "SOD"); + o02.addPayments(pay2); + + Order o03 = new Order(4500.00, + 900.00, + c07, + "SOD"); + o03.addPayments(pay3); + o03.addPayments(pay2); + + Order o04 = new Order(2000.00, + 0.00, + c16, + "SOD"); + o04.addPayments(pay4); + + Order o05 = new Order(4000.00, + 600.00, + c22, + "SOD"); + o05.addPayments(pay2); + + Order o06 = new Order(2000.00, + 0.00, + c12, + "SOD"); + o06.addPayments(pay3); + + Order o07 = new Order(3500.00, + 2000.00, + c02, + "SOD"); + o07.addPayments(pay4); + + Order o08 = new Order(2500.00, + 400.00, + c03, + "SOD"); + o08.addPayments(pay1); + + Order o09 = new Order(500.00, + 0.00, + c23, + "SOD"); + o09.addPayments(pay3); + + Order o10 = new Order(4000.00, + 700.00, + c07, + "SOD"); + o10.addPayments(pay4); + + Order o11 = new Order(1500.00, + 600.00, + c08, + "SOD"); + o11.addPayments(pay2); + + Order o12 = new Order(2500.00, + 0.00, + c25, + "SOD"); + o12.addPayments(pay1); + + agentrepos.save(a01); + agentrepos.save(a02); + agentrepos.save(a03); + agentrepos.save(a04); + agentrepos.save(a05); + agentrepos.save(a06); + agentrepos.save(a07); + agentrepos.save(a08); + agentrepos.save(a09); + agentrepos.save(a10); + agentrepos.save(a11); + agentrepos.save(a12); + + custrepos.save(c01); + custrepos.save(c02); + custrepos.save(c03); + custrepos.save(c04); + custrepos.save(c05); + custrepos.save(c06); + custrepos.save(c07); + custrepos.save(c08); + custrepos.save(c09); + custrepos.save(c10); + custrepos.save(c11); + custrepos.save(c12); + custrepos.save(c13); + custrepos.save(c14); + custrepos.save(c15); + custrepos.save(c16); + custrepos.save(c17); + custrepos.save(c18); + custrepos.save(c19); + custrepos.save(c20); + custrepos.save(c21); + custrepos.save(c22); + custrepos.save(c23); + custrepos.save(c24); + custrepos.save(c25); + + ordersrepos.save(o01); + ordersrepos.save(o02); + ordersrepos.save(o03); + ordersrepos.save(o04); + ordersrepos.save(o05); + ordersrepos.save(o06); + ordersrepos.save(o07); + ordersrepos.save(o08); + ordersrepos.save(o09); + ordersrepos.save(o10); + ordersrepos.save(o11); + ordersrepos.save(o12); + } +} diff --git a/src/main/java/com/lambdaschool/javaorders/config/H2ServerConfiguration.java b/src/main/java/com/lambdaschool/javaorders/config/H2ServerConfiguration.java new file mode 100644 index 0000000..3c7db75 --- /dev/null +++ b/src/main/java/com/lambdaschool/javaorders/config/H2ServerConfiguration.java @@ -0,0 +1,48 @@ +package com.lambdaschool.javaorders.config; + +import org.h2.tools.Server; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +import java.sql.SQLException; + + +@Configuration +public class H2ServerConfiguration +{ + + @Value("${h2.tcp.port:9092}") + private String h2TcpPort; + + + @Value("${h2.web.port:8082}") + private String h2WebPort; + + + @Bean + @ConditionalOnExpression("${h2.tcp.enabled:true}") + public Server h2TcpServer() throws + SQLException + { + return Server.createTcpServer("-tcp", + "-tcpAllowOthers", + "-tcpPort", + h2TcpPort) + .start(); + } + + + @Bean + @ConditionalOnExpression("${h2.web.enabled:true}") + public Server h2WebServer() throws + SQLException + { + return Server.createWebServer("-web", + "-webAllowOthers", + "-webPort", + h2WebPort) + .start(); + } +} \ No newline at end of file diff --git a/src/main/java/com/lambdaschool/javaorders/models/Agent.java b/src/main/java/com/lambdaschool/javaorders/models/Agent.java new file mode 100644 index 0000000..8215b23 --- /dev/null +++ b/src/main/java/com/lambdaschool/javaorders/models/Agent.java @@ -0,0 +1,113 @@ +package com.lambdaschool.javaorders.models; + +import javax.persistence.*; +import java.util.ArrayList; +import java.util.List; + +@Entity +@Table(name = "agents") +public class Agent +{ + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + private long agentcode; // primary key + + private String agentname; + private String workingarea; + private double commission; + private String phone; + private String country; + + @OneToMany(mappedBy = "agent", cascade = CascadeType.ALL, orphanRemoval = true) + private List customers = new ArrayList<>(); + + + public Agent() + { + } + + public Agent( + String agentname, + String workingarea, + double commission, + String phone, + String country) + { + this.agentname = agentname; + this.workingarea = workingarea; + this.commission = commission; + this.phone = phone; + this.country = country; + } + + + public long getAgentcode() + { + return agentcode; + } + + public void setAgentcode(long agentcode) + { + this.agentcode = agentcode; + } + + public String getAgentname() + { + return agentname; + } + + public void setAgentname(String agentname) + { + this.agentname = agentname; + } + + public String getWorkingarea() + { + return workingarea; + } + + public void setWorkingarea(String workingarea) + { + this.workingarea = workingarea; + } + + public double getCommission() + { + return commission; + } + + public void setCommission(double commission) + { + this.commission = commission; + } + + public String getPhone() + { + return phone; + } + + public void setPhone(String phone) + { + this.phone = phone; + } + + public String getCountry() + { + return country; + } + + public void setCountry(String country) + { + this.country = country; + } + + public List getCustomers() + { + return customers; + } + + public void setCustomers(List customers) + { + this.customers = customers; + } +} diff --git a/src/main/java/com/lambdaschool/javaorders/models/Customer.java b/src/main/java/com/lambdaschool/javaorders/models/Customer.java new file mode 100644 index 0000000..f05592a --- /dev/null +++ b/src/main/java/com/lambdaschool/javaorders/models/Customer.java @@ -0,0 +1,176 @@ +package com.lambdaschool.javaorders.models; + +import javax.persistence.*; +import java.util.ArrayList; +import java.util.List; + +@Entity +@Table(name = "customers") +public class Customer +{ + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + private long custcode; // primary key + + @Column(nullable = false) + private String custname; + + private String custcity; + private String workingarea; + private String custcountry; + private String grade; + private double openingamt; + private double receiveamt; + private double paymentamt; + private double outstandingamt; + private String phone; + + @ManyToOne + @JoinColumn(name = "agentcode", nullable = false) + private Agent agent; + + @OneToMany(mappedBy = "customer", cascade = CascadeType.ALL, orphanRemoval = true) + private List orders = new ArrayList<>(); + + public Customer() + { + } + + public Customer( + String custname, + String custcity, + String workingarea, + String custcountry, + String grade, + double openingamt, + double receiveamt, + double paymentamt, + double outstandingamt, + String phone, + Agent agent) + { + this.custname = custname; + this.custcity = custcity; + this.workingarea = workingarea; + this.custcountry = custcountry; + this.grade = grade; + this.openingamt = openingamt; + this.receiveamt = receiveamt; + this.paymentamt = paymentamt; + this.outstandingamt = outstandingamt; + this.phone = phone; + this.agent = agent; + } + + + + public long getCustcode() + { + return custcode; + } + + public void setCustcode(long custcode) + { + this.custcode = custcode; + } + + public String getCustname() + { + return custname; + } + + public void setCustname(String custname) + { + this.custname = custname; + } + + public String getCustcity() + { + return custcity; + } + + public void setCustcity(String custcity) + { + this.custcity = custcity; + } + + public String getWorkingarea() + { + return workingarea; + } + + public void setWorkingarea(String workingarea) + { + this.workingarea = workingarea; + } + + public String getCustcountry() + { + return custcountry; + } + + public void setCustcountry(String custcountry) + { + this.custcountry = custcountry; + } + + public String getGrade() + { + return grade; + } + + public void setGrade(String grade) + { + this.grade = grade; + } + + public double getOpeningamt() + { + return openingamt; + } + + public void setOpeningamt(double openingamt) + { + this.openingamt = openingamt; + } + + public double getReceiveamt() + { + return receiveamt; + } + + public void setReceiveamt(double receiveamt) + { + this.receiveamt = receiveamt; + } + + public double getPaymentamt() + { + return paymentamt; + } + + public void setPaymentamt(double paymentamt) + { + this.paymentamt = paymentamt; + } + + public double getOutstandingamt() + { + return outstandingamt; + } + + public void setOutstandingamt(double outstandingamt) + { + this.outstandingamt = outstandingamt; + } + + public String getPhone() + { + return phone; + } + + public void setPhone(String phone) + { + this.phone = phone; + } +} diff --git a/src/main/java/com/lambdaschool/javaorders/models/Order.java b/src/main/java/com/lambdaschool/javaorders/models/Order.java new file mode 100644 index 0000000..21466fa --- /dev/null +++ b/src/main/java/com/lambdaschool/javaorders/models/Order.java @@ -0,0 +1,111 @@ +package com.lambdaschool.javaorders.models; + +import javax.persistence.*; +import java.util.HashSet; +import java.util.Set; + +@Entity +@Table(name = "orders") +public class Order +{ + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + private long ordnum; + + private double ordamount; + private double advanceamount; + private String orderdescription; + + @ManyToOne + @JoinColumn(name = "custcode", nullable = false) + private Customer customer; + + @ManyToMany + @JoinTable(name = "orderspayments", + joinColumns = @JoinColumn(name = "ordnum"), + inverseJoinColumns = @JoinColumn(name = "paymentid")) + private Set payments = new HashSet<>(); + + + public Order() + { + } + + public Order( + double ordamount, + double advanceamount, + Customer customer, + String orderdescription) + { + this.ordamount = ordamount; + this.advanceamount = advanceamount; + this.customer = customer; + this.orderdescription = orderdescription; + } + + + public long getOrdnum() + { + return ordnum; + } + + public void setOrdnum(long ordernum) + { + this.ordnum = ordnum; + } + + public double getOrdamount() + { + return ordamount; + } + + public void setOrdamount(double ordamount) + { + this.ordamount = ordamount; + } + + public double getAdvanceamount() + { + return advanceamount; + } + + public void setAdvanceamount(double advanceamount) + { + this.advanceamount = advanceamount; + } + + public String getOrderdescription() + { + return orderdescription; + } + + public void setOrderdescription(String orderdescription) + { + this.orderdescription = orderdescription; + } + + public Customer getCustomer() + { + return customer; + } + + public void setCustomer(Customer customer) + { + this.customer = customer; + } + + public Set getPayments() + { + return payments; + } + + public void setPayments(Set payments) + { + this.payments = payments; + } + + public void addPayments(Payment type) + { +// payments.add(type); + } +} diff --git a/src/main/java/com/lambdaschool/javaorders/models/Payment.java b/src/main/java/com/lambdaschool/javaorders/models/Payment.java new file mode 100644 index 0000000..4d84893 --- /dev/null +++ b/src/main/java/com/lambdaschool/javaorders/models/Payment.java @@ -0,0 +1,62 @@ +package com.lambdaschool.javaorders.models; + +import javax.persistence.*; +import java.util.HashSet; +import java.util.Set; + +@Entity +@Table(name = "payments") +public class Payment +{ + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + private long paymentid; + + @Column(unique = true, nullable = false) + private String type; + + @ManyToMany(mappedBy = "payments") + private Set orders = new HashSet<>(); + + + + public Payment() + { + } + + public Payment(String type) + { + this.type = type; + } + + + public long getPaymentid() + { + return paymentid; + } + + public void setPaymentid(long paymentid) + { + this.paymentid = paymentid; + } + + public String getType() + { + return type; + } + + public void setType(String type) + { + this.type = type; + } + + public Set getOrders() + { + return orders; + } + + public void setOrders(Set orders) + { + this.orders = orders; + } +} diff --git a/src/main/java/com/lambdaschool/javaorders/repositories/AgentsRepository.java b/src/main/java/com/lambdaschool/javaorders/repositories/AgentsRepository.java new file mode 100644 index 0000000..fda6ee8 --- /dev/null +++ b/src/main/java/com/lambdaschool/javaorders/repositories/AgentsRepository.java @@ -0,0 +1,8 @@ +package com.lambdaschool.javaorders.repositories; + +import com.lambdaschool.javaorders.models.Agent; +import org.springframework.data.repository.CrudRepository; + +public interface AgentsRepository extends CrudRepository +{ +} diff --git a/src/main/java/com/lambdaschool/javaorders/repositories/CustomersRepository.java b/src/main/java/com/lambdaschool/javaorders/repositories/CustomersRepository.java new file mode 100644 index 0000000..35781dd --- /dev/null +++ b/src/main/java/com/lambdaschool/javaorders/repositories/CustomersRepository.java @@ -0,0 +1,8 @@ +package com.lambdaschool.javaorders.repositories; + +import com.lambdaschool.javaorders.models.Customer; +import org.springframework.data.repository.CrudRepository; + +public interface CustomersRepository extends CrudRepository +{ +} diff --git a/src/main/java/com/lambdaschool/javaorders/repositories/OrdersRepository.java b/src/main/java/com/lambdaschool/javaorders/repositories/OrdersRepository.java new file mode 100644 index 0000000..7fa17fd --- /dev/null +++ b/src/main/java/com/lambdaschool/javaorders/repositories/OrdersRepository.java @@ -0,0 +1,8 @@ +package com.lambdaschool.javaorders.repositories; + +import com.lambdaschool.javaorders.models.Order; +import org.springframework.data.repository.CrudRepository; + +public interface OrdersRepository extends CrudRepository +{ +} diff --git a/src/main/java/com/lambdaschool/javaorders/repositories/PaymentRepository.java b/src/main/java/com/lambdaschool/javaorders/repositories/PaymentRepository.java new file mode 100644 index 0000000..83866b7 --- /dev/null +++ b/src/main/java/com/lambdaschool/javaorders/repositories/PaymentRepository.java @@ -0,0 +1,8 @@ +package com.lambdaschool.javaorders.repositories; + +import com.lambdaschool.javaorders.models.Payment; +import org.springframework.data.repository.CrudRepository; + +public interface PaymentRepository extends CrudRepository +{ +} diff --git a/src/main/java/com/lambdaschool/javaorders/services/CustomerServices.java b/src/main/java/com/lambdaschool/javaorders/services/CustomerServices.java new file mode 100644 index 0000000..2270999 --- /dev/null +++ b/src/main/java/com/lambdaschool/javaorders/services/CustomerServices.java @@ -0,0 +1,8 @@ +package com.lambdaschool.javaorders.services; + +import com.lambdaschool.javaorders.models.Customer; + +public interface CustomerServices +{ + Customer save(Customer customer); +} diff --git a/src/main/java/com/lambdaschool/javaorders/services/CustomerServicesImpl.java b/src/main/java/com/lambdaschool/javaorders/services/CustomerServicesImpl.java new file mode 100644 index 0000000..684ff73 --- /dev/null +++ b/src/main/java/com/lambdaschool/javaorders/services/CustomerServicesImpl.java @@ -0,0 +1,19 @@ +package com.lambdaschool.javaorders.services; + +import com.lambdaschool.javaorders.models.Customer; +import com.lambdaschool.javaorders.repositories.CustomersRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +@Service(value = "customerServices") +public class CustomerServicesImpl implements CustomerServices +{ + @Autowired + CustomersRepository custrepos; + + @Override + public Customer save(Customer customer) + { + return custrepos.save(customer); + } +} diff --git a/src/main/java/com/lambdaschool/javaorders/services/PaymentServices.java b/src/main/java/com/lambdaschool/javaorders/services/PaymentServices.java new file mode 100644 index 0000000..77a2f66 --- /dev/null +++ b/src/main/java/com/lambdaschool/javaorders/services/PaymentServices.java @@ -0,0 +1,8 @@ +package com.lambdaschool.javaorders.services; + +import com.lambdaschool.javaorders.models.Payment; + +public interface PaymentServices +{ + Payment save(Payment payment); +} diff --git a/src/main/java/com/lambdaschool/javaorders/services/PaymentServicesImpl.java b/src/main/java/com/lambdaschool/javaorders/services/PaymentServicesImpl.java new file mode 100644 index 0000000..a160dd5 --- /dev/null +++ b/src/main/java/com/lambdaschool/javaorders/services/PaymentServicesImpl.java @@ -0,0 +1,19 @@ +package com.lambdaschool.javaorders.services; + +import com.lambdaschool.javaorders.models.Payment; +import com.lambdaschool.javaorders.repositories.PaymentRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +@Service(value = "paymentServices") // value is name used in our program +public class PaymentServicesImpl implements PaymentServices +{ + @Autowired + PaymentRepository paymentrepos; + + @Override + public Payment save(Payment payment) + { + return paymentrepos.save(payment); + } +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties new file mode 100644 index 0000000..5562ac3 --- /dev/null +++ b/src/main/resources/application.properties @@ -0,0 +1,14 @@ + +spring.h2.console.enabled=true +spring.h2.console.path=/h2-console + +server.port=${PORT:2019} + +spring.jackson.serialization.fail-on-empty-beans=false + +spring.jpa.open-in-view=true + +spring.jpa.hibernate.ddl-auto=create + +spring.datasource.initialization-mode=never + diff --git a/src/main/resources/data.sql b/src/main/resources/data.sql new file mode 100644 index 0000000..88ff3de --- /dev/null +++ b/src/main/resources/data.sql @@ -0,0 +1,86 @@ +DELETE +FROM orders; + +DELETE +FROM customers; + +DELETE +FROM agents; + +INSERT INTO AGENTS (agentcode, agentname, workingarea, commission, phone, country) + VALUES (1, 'Ramasundar', 'Bangalore', 0.15, '077-25814763', ''), + (2, 'Alex', 'London', 0.13, '075-12458969', ''), + (3, 'Alford', 'New York', 0.12, '044-25874365', ''), + (4, 'Ravi', 'Bangalore', 0.15, '077-45625874', ''), + (5, 'Santakumar', 'Chennai', 0.14, '007-22388644', ''), + (6, 'Lucida', 'San Jose', 0.12, '044-52981425', ''), + (7, 'Anderson', 'Brisban', 0.13, '045-21447739', ''), + (8, 'Subbarao', 'Bangalore', 0.14, '077-12346674', ''), + (9, 'Mukesh', 'Mumbai', 0.11, '029-12358964', ''), + (10, 'McDen', 'London', 0.15, '078-22255588', ''), + (11, 'Ivan', 'Torento', 0.15, '008-22544166', ''), + (12, 'Benjamin', 'Hampshair', 0.11, '008-22536178', ''); + +INSERT INTO CUSTOMERS (custcode, custname, custcity, workingarea, custcountry, grade, openingamt, receiveamt, paymentamt, outstandingamt, phone, agentcode) + VALUES (1, 'Holmes', 'London', 'London', 'UK', '2', 6000.00, 5000.00, 7000.00, 4000.00, 'BBBBBBB', 3), + (2, 'Micheal', 'New York', 'New York', 'USA', '2', 3000.00, 5000.00, 2000.00, 6000.00, 'CCCCCCC', 8), + (3, 'Albert', 'New York', 'New York', 'USA', '3', 5000.00, 7000.00, 6000.00, 6000.00, 'BBBBSBB', 8), + (4, 'Ravindran', 'Bangalore', 'Bangalore', 'India', '2', 5000.00, 7000.00, 4000.00, 8000.00, 'AVAVAVA', 11), + (5, 'Cook', 'London', 'London', 'UK', '2', 4000.00, 9000.00, 7000.00, 6000.00, 'FSDDSDF', 6), + (6, 'Stuart', 'London', 'London', 'UK', '1', 6000.00, 8000.00, 3000.00, 11000.00, 'GFSGERS', 3), + (7, 'Bolt', 'New York', 'New York', 'USA', '3', 5000.00, 7000.00, 9000.00, 3000.00, 'DDNRDRH', 8), + (8, 'Fleming', 'Brisban', 'Brisban', 'Australia', '2', 7000.00, 7000.00, 9000.00, 5000.00, 'NHBGVFC', 5), + (9, 'Jacks', 'Brisban', 'Brisban', 'Australia', '1', 7000.00, 7000.00, 7000.00, 7000.00, 'WERTGDF', 5), + (10, 'Yearannaidu', 'Chennai', 'Chennai', 'India', '1', 8000.00, 7000.00, 7000.00, 8000.00, 'ZZZZBFV', 10), + (11, 'Sasikant', 'Mumbai', 'Mumbai', 'India', '1', 7000.00, 11000.00, 7000.00, 11000.00, '147-25896312', 2), + (12, 'Ramanathan', 'Chennai', 'Chennai', 'India', '1', 7000.00, 11000.00, 9000.00, 9000.00, 'GHRDWSD', 10), + (13, 'Avinash', 'Mumbai', 'Mumbai', 'India', '2', 7000.00, 11000.00, 9000.00, 9000.00, '113-12345678',2), + (14, 'Winston', 'Brisban', 'Brisban', 'Australia', '1', 5000.00, 8000.00, 7000.00, 6000.00, 'AAAAAAA', 5), + (15, 'Karl', 'London', 'London', 'UK', '0', 4000.00, 6000.00, 7000.00, 3000.00, 'AAAABAA', 6), + (16, 'Shilton', 'Torento', 'Torento', 'Canada', '1', 10000.00, 7000.00, 6000.00, 11000.00, 'DDDDDDD', 4), + (17, 'Charles', 'Hampshair', 'Hampshair', 'UK', '3', 6000.00, 4000.00, 5000.00, 5000.00, 'MMMMMMM', 9), + (18, 'Srinivas', 'Bangalore', 'Bangalore', 'India', '2', 8000.00, 4000.00, 3000.00, 9000.00, 'AAAAAAB', 7), + (19, 'Steven', 'San Jose', 'San Jose', 'USA', '1', 5000.00, 7000.00, 9000.00, 3000.00, 'KRFYGJK', 10), + (20, 'Karolina', 'Torento', 'Torento', 'Canada', '1', 7000.00, 7000.00, 9000.00, 5000.00, 'HJKORED', 4), + (21, 'Martin', 'Torento', 'Torento', 'Canada', '2', 8000.00, 7000.00, 7000.00, 8000.00, 'MJYURFD', 4), + (22, 'Ramesh', 'Mumbai', 'Mumbai', 'India', '3', 8000.00, 7000.00, 3000.00, 12000.00, 'Phone No', 2), + (23, 'Rangarappa', 'Bangalore', 'Bangalore', 'India', '2', 8000.00, 11000.00, 7000.00, 12000.00, 'AAAATGF', 1), + (24, 'Venkatpati', 'Bangalore', 'Bangalore', 'India', '2', 8000.00, 11000.00, 7000.00, 12000.00, 'JRTVFDD', 7), + (25, 'Sundariya', 'Chennai', 'Chennai', 'India', '3', 7000.00, 11000.00, 7000.00, 11000.00, 'PPHGRTS', 10); + +INSERT INTO ORDERS (ordnum, ordamount, advanceamount, custcode, orderdescription) + VALUES (1, 1000.00, 600.00, 13, 'SOD'), + (2, 3000.00, 500.00, 19, 'SOD'), + (3, 4500.00, 900.00, 7, 'SOD'), + (4, 2000.00, 0.00, 16, 'SOD'), + (5, 4000.00, 600.00, 22, 'SOD'), + (6, 2000.00, 0.00, 12, 'SOD'), + (7, 3500.00, 2000.00, 2, 'SOD'), + (8, 2500.00, 400.00, 03, 'SOD'), + (9, 500.00, 0.00, 23, 'SOD'), + (10, 4000.00, 700.00, 7, 'SOD'), + (11, 1500.00, 600.00, 8, 'SOD'), + (12, 2500.00, 0.00, 25, 'SOD'); + +INSERT INTO PAYMENTS (paymentid, type) + VALUES (1, 'Cash'), + (2, 'Gift Card'), + (3, 'Credit Card'), + (4, 'Mobile Pay'); + +INSERT INTO ORDERSPAYMENTS (ordnum, paymentid) + VALUES (1, 1), + (2, 2), + (3, 3), + (3, 2), + (4, 4), + (5, 2), + (6, 3), + (7, 4), + (8, 1), + (9, 3), + (10, 4), + (11, 2), + (12, 1); + + alter sequence hibernate_sequence restart with 50; diff --git a/src/test/java/com/lambdaschool/javaorders/JavaOrdersApplicationTests.java b/src/test/java/com/lambdaschool/javaorders/JavaOrdersApplicationTests.java new file mode 100644 index 0000000..8852597 --- /dev/null +++ b/src/test/java/com/lambdaschool/javaorders/JavaOrdersApplicationTests.java @@ -0,0 +1,15 @@ +package com.lambdaschool.javaorders; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class JavaOrdersApplicationTests +{ + + @Test + void contextLoads() + { + } + +} diff --git a/target/classes/application.properties b/target/classes/application.properties new file mode 100644 index 0000000..5562ac3 --- /dev/null +++ b/target/classes/application.properties @@ -0,0 +1,14 @@ + +spring.h2.console.enabled=true +spring.h2.console.path=/h2-console + +server.port=${PORT:2019} + +spring.jackson.serialization.fail-on-empty-beans=false + +spring.jpa.open-in-view=true + +spring.jpa.hibernate.ddl-auto=create + +spring.datasource.initialization-mode=never + diff --git a/target/classes/data.sql b/target/classes/data.sql new file mode 100644 index 0000000..88ff3de --- /dev/null +++ b/target/classes/data.sql @@ -0,0 +1,86 @@ +DELETE +FROM orders; + +DELETE +FROM customers; + +DELETE +FROM agents; + +INSERT INTO AGENTS (agentcode, agentname, workingarea, commission, phone, country) + VALUES (1, 'Ramasundar', 'Bangalore', 0.15, '077-25814763', ''), + (2, 'Alex', 'London', 0.13, '075-12458969', ''), + (3, 'Alford', 'New York', 0.12, '044-25874365', ''), + (4, 'Ravi', 'Bangalore', 0.15, '077-45625874', ''), + (5, 'Santakumar', 'Chennai', 0.14, '007-22388644', ''), + (6, 'Lucida', 'San Jose', 0.12, '044-52981425', ''), + (7, 'Anderson', 'Brisban', 0.13, '045-21447739', ''), + (8, 'Subbarao', 'Bangalore', 0.14, '077-12346674', ''), + (9, 'Mukesh', 'Mumbai', 0.11, '029-12358964', ''), + (10, 'McDen', 'London', 0.15, '078-22255588', ''), + (11, 'Ivan', 'Torento', 0.15, '008-22544166', ''), + (12, 'Benjamin', 'Hampshair', 0.11, '008-22536178', ''); + +INSERT INTO CUSTOMERS (custcode, custname, custcity, workingarea, custcountry, grade, openingamt, receiveamt, paymentamt, outstandingamt, phone, agentcode) + VALUES (1, 'Holmes', 'London', 'London', 'UK', '2', 6000.00, 5000.00, 7000.00, 4000.00, 'BBBBBBB', 3), + (2, 'Micheal', 'New York', 'New York', 'USA', '2', 3000.00, 5000.00, 2000.00, 6000.00, 'CCCCCCC', 8), + (3, 'Albert', 'New York', 'New York', 'USA', '3', 5000.00, 7000.00, 6000.00, 6000.00, 'BBBBSBB', 8), + (4, 'Ravindran', 'Bangalore', 'Bangalore', 'India', '2', 5000.00, 7000.00, 4000.00, 8000.00, 'AVAVAVA', 11), + (5, 'Cook', 'London', 'London', 'UK', '2', 4000.00, 9000.00, 7000.00, 6000.00, 'FSDDSDF', 6), + (6, 'Stuart', 'London', 'London', 'UK', '1', 6000.00, 8000.00, 3000.00, 11000.00, 'GFSGERS', 3), + (7, 'Bolt', 'New York', 'New York', 'USA', '3', 5000.00, 7000.00, 9000.00, 3000.00, 'DDNRDRH', 8), + (8, 'Fleming', 'Brisban', 'Brisban', 'Australia', '2', 7000.00, 7000.00, 9000.00, 5000.00, 'NHBGVFC', 5), + (9, 'Jacks', 'Brisban', 'Brisban', 'Australia', '1', 7000.00, 7000.00, 7000.00, 7000.00, 'WERTGDF', 5), + (10, 'Yearannaidu', 'Chennai', 'Chennai', 'India', '1', 8000.00, 7000.00, 7000.00, 8000.00, 'ZZZZBFV', 10), + (11, 'Sasikant', 'Mumbai', 'Mumbai', 'India', '1', 7000.00, 11000.00, 7000.00, 11000.00, '147-25896312', 2), + (12, 'Ramanathan', 'Chennai', 'Chennai', 'India', '1', 7000.00, 11000.00, 9000.00, 9000.00, 'GHRDWSD', 10), + (13, 'Avinash', 'Mumbai', 'Mumbai', 'India', '2', 7000.00, 11000.00, 9000.00, 9000.00, '113-12345678',2), + (14, 'Winston', 'Brisban', 'Brisban', 'Australia', '1', 5000.00, 8000.00, 7000.00, 6000.00, 'AAAAAAA', 5), + (15, 'Karl', 'London', 'London', 'UK', '0', 4000.00, 6000.00, 7000.00, 3000.00, 'AAAABAA', 6), + (16, 'Shilton', 'Torento', 'Torento', 'Canada', '1', 10000.00, 7000.00, 6000.00, 11000.00, 'DDDDDDD', 4), + (17, 'Charles', 'Hampshair', 'Hampshair', 'UK', '3', 6000.00, 4000.00, 5000.00, 5000.00, 'MMMMMMM', 9), + (18, 'Srinivas', 'Bangalore', 'Bangalore', 'India', '2', 8000.00, 4000.00, 3000.00, 9000.00, 'AAAAAAB', 7), + (19, 'Steven', 'San Jose', 'San Jose', 'USA', '1', 5000.00, 7000.00, 9000.00, 3000.00, 'KRFYGJK', 10), + (20, 'Karolina', 'Torento', 'Torento', 'Canada', '1', 7000.00, 7000.00, 9000.00, 5000.00, 'HJKORED', 4), + (21, 'Martin', 'Torento', 'Torento', 'Canada', '2', 8000.00, 7000.00, 7000.00, 8000.00, 'MJYURFD', 4), + (22, 'Ramesh', 'Mumbai', 'Mumbai', 'India', '3', 8000.00, 7000.00, 3000.00, 12000.00, 'Phone No', 2), + (23, 'Rangarappa', 'Bangalore', 'Bangalore', 'India', '2', 8000.00, 11000.00, 7000.00, 12000.00, 'AAAATGF', 1), + (24, 'Venkatpati', 'Bangalore', 'Bangalore', 'India', '2', 8000.00, 11000.00, 7000.00, 12000.00, 'JRTVFDD', 7), + (25, 'Sundariya', 'Chennai', 'Chennai', 'India', '3', 7000.00, 11000.00, 7000.00, 11000.00, 'PPHGRTS', 10); + +INSERT INTO ORDERS (ordnum, ordamount, advanceamount, custcode, orderdescription) + VALUES (1, 1000.00, 600.00, 13, 'SOD'), + (2, 3000.00, 500.00, 19, 'SOD'), + (3, 4500.00, 900.00, 7, 'SOD'), + (4, 2000.00, 0.00, 16, 'SOD'), + (5, 4000.00, 600.00, 22, 'SOD'), + (6, 2000.00, 0.00, 12, 'SOD'), + (7, 3500.00, 2000.00, 2, 'SOD'), + (8, 2500.00, 400.00, 03, 'SOD'), + (9, 500.00, 0.00, 23, 'SOD'), + (10, 4000.00, 700.00, 7, 'SOD'), + (11, 1500.00, 600.00, 8, 'SOD'), + (12, 2500.00, 0.00, 25, 'SOD'); + +INSERT INTO PAYMENTS (paymentid, type) + VALUES (1, 'Cash'), + (2, 'Gift Card'), + (3, 'Credit Card'), + (4, 'Mobile Pay'); + +INSERT INTO ORDERSPAYMENTS (ordnum, paymentid) + VALUES (1, 1), + (2, 2), + (3, 3), + (3, 2), + (4, 4), + (5, 2), + (6, 3), + (7, 4), + (8, 1), + (9, 3), + (10, 4), + (11, 2), + (12, 1); + + alter sequence hibernate_sequence restart with 50; From 0848352fbc03cbcb2f16cd4a2fa0d1e599ee850d Mon Sep 17 00:00:00 2001 From: Jason Corchado Date: Tue, 13 Apr 2021 18:11:28 -0400 Subject: [PATCH 2/2] mvp --- .../controllers/AgentController.java | 25 ++++++++++++ .../controllers/CustomerController.java | 40 +++++++++++++++++++ .../controllers/OrderController.java | 26 ++++++++++++ .../lambdaschool/javaorders/models/Agent.java | 4 ++ .../javaorders/models/Customer.java | 22 +++++++++- .../lambdaschool/javaorders/models/Order.java | 4 ++ .../javaorders/models/Payment.java | 3 ++ .../repositories/CustomersRepository.java | 6 +++ .../javaorders/services/AgentServices.java | 12 ++++++ .../services/AgentServicesImpl.java | 29 ++++++++++++++ .../javaorders/services/CustomerServices.java | 6 +++ .../services/CustomerServicesImpl.java | 23 +++++++++++ .../javaorders/services/OrderServices.java | 14 +++++++ .../services/OrderServicesImpl.java | 31 ++++++++++++++ .../javaorders/services/PaymentServices.java | 2 + 15 files changed, 245 insertions(+), 2 deletions(-) create mode 100644 src/main/java/com/lambdaschool/javaorders/controllers/AgentController.java create mode 100644 src/main/java/com/lambdaschool/javaorders/controllers/CustomerController.java create mode 100644 src/main/java/com/lambdaschool/javaorders/controllers/OrderController.java create mode 100644 src/main/java/com/lambdaschool/javaorders/services/AgentServices.java create mode 100644 src/main/java/com/lambdaschool/javaorders/services/AgentServicesImpl.java create mode 100644 src/main/java/com/lambdaschool/javaorders/services/OrderServices.java create mode 100644 src/main/java/com/lambdaschool/javaorders/services/OrderServicesImpl.java diff --git a/src/main/java/com/lambdaschool/javaorders/controllers/AgentController.java b/src/main/java/com/lambdaschool/javaorders/controllers/AgentController.java new file mode 100644 index 0000000..c3e1e61 --- /dev/null +++ b/src/main/java/com/lambdaschool/javaorders/controllers/AgentController.java @@ -0,0 +1,25 @@ +package com.lambdaschool.javaorders.controllers; + +import com.lambdaschool.javaorders.models.Agent; +import com.lambdaschool.javaorders.services.AgentServices; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/agents") +public class AgentController { + + @Autowired + private AgentServices agentServices; + + @GetMapping(value = "/agent/{agentcode}", produces = "application/json") + public ResponseEntity findAgentById(@PathVariable long agentcode){ + Agent rtnAgent = agentServices.findAgentById(agentcode); + return new ResponseEntity<>(rtnAgent, HttpStatus.OK); + } +} diff --git a/src/main/java/com/lambdaschool/javaorders/controllers/CustomerController.java b/src/main/java/com/lambdaschool/javaorders/controllers/CustomerController.java new file mode 100644 index 0000000..477403e --- /dev/null +++ b/src/main/java/com/lambdaschool/javaorders/controllers/CustomerController.java @@ -0,0 +1,40 @@ +package com.lambdaschool.javaorders.controllers; + +import com.lambdaschool.javaorders.models.Customer; +import com.lambdaschool.javaorders.services.CustomerServices; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@RestController +@RequestMapping("/customers") +public class CustomerController { + + @Autowired + private CustomerServices customerServices; + + @GetMapping(value = "/orders", produces = "application/json") + public ResponseEntity findAllOrders(){ + List rtnList = customerServices.findAllOrders(); + return new ResponseEntity<>(rtnList, HttpStatus.OK); + } + + @GetMapping(value = "/customer/{custcode}", produces = "application/json") + public ResponseEntity findCustomerById(@PathVariable long custcode){ + Customer rtnCust = customerServices.findCustomerById(custcode); + return new ResponseEntity<>(rtnCust, HttpStatus.OK); + } + + @GetMapping(value = "/namelike/{subname}", produces = "application/json") + public ResponseEntity findCustomersLikeName(@PathVariable String subname){ + List rtnList = customerServices.findByNameLike(subname); + return new ResponseEntity<>(rtnList, HttpStatus.OK); + } + +} diff --git a/src/main/java/com/lambdaschool/javaorders/controllers/OrderController.java b/src/main/java/com/lambdaschool/javaorders/controllers/OrderController.java new file mode 100644 index 0000000..f1a9c1a --- /dev/null +++ b/src/main/java/com/lambdaschool/javaorders/controllers/OrderController.java @@ -0,0 +1,26 @@ +package com.lambdaschool.javaorders.controllers; + +import com.lambdaschool.javaorders.models.Order; +import com.lambdaschool.javaorders.services.OrderServices; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("orders") +public class OrderController { + + @Autowired + private OrderServices orderServices; + + @GetMapping(value = "/order/{ordnum}", produces = "application/json") + public ResponseEntity findOrderById(@PathVariable long ordnum) + { + Order rtnOrder = orderServices.findOrderById(ordnum); + return new ResponseEntity<>(rtnOrder, HttpStatus.OK); + } +} diff --git a/src/main/java/com/lambdaschool/javaorders/models/Agent.java b/src/main/java/com/lambdaschool/javaorders/models/Agent.java index 8215b23..d9424db 100644 --- a/src/main/java/com/lambdaschool/javaorders/models/Agent.java +++ b/src/main/java/com/lambdaschool/javaorders/models/Agent.java @@ -1,5 +1,7 @@ package com.lambdaschool.javaorders.models; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + import javax.persistence.*; import java.util.ArrayList; import java.util.List; @@ -10,6 +12,7 @@ public class Agent { @Id @GeneratedValue(strategy = GenerationType.AUTO) + @Column(unique = true, nullable = false) private long agentcode; // primary key private String agentname; @@ -19,6 +22,7 @@ public class Agent private String country; @OneToMany(mappedBy = "agent", cascade = CascadeType.ALL, orphanRemoval = true) + @JsonIgnoreProperties(value = "agent", allowSetters = true) private List customers = new ArrayList<>(); diff --git a/src/main/java/com/lambdaschool/javaorders/models/Customer.java b/src/main/java/com/lambdaschool/javaorders/models/Customer.java index f05592a..bcacd3d 100644 --- a/src/main/java/com/lambdaschool/javaorders/models/Customer.java +++ b/src/main/java/com/lambdaschool/javaorders/models/Customer.java @@ -1,5 +1,7 @@ package com.lambdaschool.javaorders.models; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + import javax.persistence.*; import java.util.ArrayList; import java.util.List; @@ -10,6 +12,7 @@ public class Customer { @Id @GeneratedValue(strategy = GenerationType.AUTO) + @Column(unique = true, nullable = false) private long custcode; // primary key @Column(nullable = false) @@ -27,13 +30,14 @@ public class Customer @ManyToOne @JoinColumn(name = "agentcode", nullable = false) + @JsonIgnoreProperties(value = "customers", allowSetters = true) private Agent agent; @OneToMany(mappedBy = "customer", cascade = CascadeType.ALL, orphanRemoval = true) + @JsonIgnoreProperties(value = "customer", allowSetters = true) private List orders = new ArrayList<>(); - public Customer() - { + public Customer(){ } public Customer( @@ -62,7 +66,21 @@ public Customer( this.agent = agent; } + public Agent getAgent() { + return agent; + } + public void setAgent(Agent agent) { + this.agent = agent; + } + + public List getOrders() { + return orders; + } + + public void setOrders(List orders) { + this.orders = orders; + } public long getCustcode() { diff --git a/src/main/java/com/lambdaschool/javaorders/models/Order.java b/src/main/java/com/lambdaschool/javaorders/models/Order.java index 21466fa..65c58cb 100644 --- a/src/main/java/com/lambdaschool/javaorders/models/Order.java +++ b/src/main/java/com/lambdaschool/javaorders/models/Order.java @@ -1,5 +1,7 @@ package com.lambdaschool.javaorders.models; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + import javax.persistence.*; import java.util.HashSet; import java.util.Set; @@ -18,12 +20,14 @@ public class Order @ManyToOne @JoinColumn(name = "custcode", nullable = false) + @JsonIgnoreProperties(value = "order", allowSetters = true) private Customer customer; @ManyToMany @JoinTable(name = "orderspayments", joinColumns = @JoinColumn(name = "ordnum"), inverseJoinColumns = @JoinColumn(name = "paymentid")) + @JsonIgnoreProperties(value = "order", allowSetters = true) private Set payments = new HashSet<>(); diff --git a/src/main/java/com/lambdaschool/javaorders/models/Payment.java b/src/main/java/com/lambdaschool/javaorders/models/Payment.java index 4d84893..c0ee254 100644 --- a/src/main/java/com/lambdaschool/javaorders/models/Payment.java +++ b/src/main/java/com/lambdaschool/javaorders/models/Payment.java @@ -1,5 +1,7 @@ package com.lambdaschool.javaorders.models; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + import javax.persistence.*; import java.util.HashSet; import java.util.Set; @@ -16,6 +18,7 @@ public class Payment private String type; @ManyToMany(mappedBy = "payments") + @JsonIgnoreProperties(value = "payments", allowSetters = true) private Set orders = new HashSet<>(); diff --git a/src/main/java/com/lambdaschool/javaorders/repositories/CustomersRepository.java b/src/main/java/com/lambdaschool/javaorders/repositories/CustomersRepository.java index 35781dd..e914831 100644 --- a/src/main/java/com/lambdaschool/javaorders/repositories/CustomersRepository.java +++ b/src/main/java/com/lambdaschool/javaorders/repositories/CustomersRepository.java @@ -1,8 +1,14 @@ package com.lambdaschool.javaorders.repositories; import com.lambdaschool.javaorders.models.Customer; +import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.CrudRepository; +import java.util.List; + public interface CustomersRepository extends CrudRepository { + List findByCustnameContainingIgnoringCase(String likename); + + } diff --git a/src/main/java/com/lambdaschool/javaorders/services/AgentServices.java b/src/main/java/com/lambdaschool/javaorders/services/AgentServices.java new file mode 100644 index 0000000..6cd5f82 --- /dev/null +++ b/src/main/java/com/lambdaschool/javaorders/services/AgentServices.java @@ -0,0 +1,12 @@ +package com.lambdaschool.javaorders.services; + +import com.lambdaschool.javaorders.models.Agent; + +public interface AgentServices { + + Agent save (Agent agent); + + Agent findAgentById(long id); + + +} diff --git a/src/main/java/com/lambdaschool/javaorders/services/AgentServicesImpl.java b/src/main/java/com/lambdaschool/javaorders/services/AgentServicesImpl.java new file mode 100644 index 0000000..a7658ff --- /dev/null +++ b/src/main/java/com/lambdaschool/javaorders/services/AgentServicesImpl.java @@ -0,0 +1,29 @@ +package com.lambdaschool.javaorders.services; + +import com.lambdaschool.javaorders.models.Agent; +import com.lambdaschool.javaorders.repositories.AgentsRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.persistence.EntityNotFoundException; +import javax.transaction.Transactional; + +@Transactional +@Service(value = "agentServices") +public class AgentServicesImpl implements AgentServices { + + @Autowired + private AgentsRepository agentrepos; + + + @Override + public Agent save(Agent agent) { + return agentrepos.save(agent); + } + + @Override + public Agent findAgentById(long id) { + return agentrepos.findById(id) + .orElseThrow(() -> new EntityNotFoundException("Agent " + id + " NotFound!")); + } +} diff --git a/src/main/java/com/lambdaschool/javaorders/services/CustomerServices.java b/src/main/java/com/lambdaschool/javaorders/services/CustomerServices.java index 2270999..ec82c16 100644 --- a/src/main/java/com/lambdaschool/javaorders/services/CustomerServices.java +++ b/src/main/java/com/lambdaschool/javaorders/services/CustomerServices.java @@ -2,7 +2,13 @@ import com.lambdaschool.javaorders.models.Customer; +import java.util.List; + public interface CustomerServices { Customer save(Customer customer); + + List findAllOrders(); + Customer findCustomerById(long id); + List findByNameLike(String subname); } diff --git a/src/main/java/com/lambdaschool/javaorders/services/CustomerServicesImpl.java b/src/main/java/com/lambdaschool/javaorders/services/CustomerServicesImpl.java index 684ff73..bf42ae8 100644 --- a/src/main/java/com/lambdaschool/javaorders/services/CustomerServicesImpl.java +++ b/src/main/java/com/lambdaschool/javaorders/services/CustomerServicesImpl.java @@ -5,6 +5,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.persistence.EntityNotFoundException; +import java.util.ArrayList; +import java.util.List; + @Service(value = "customerServices") public class CustomerServicesImpl implements CustomerServices { @@ -16,4 +20,23 @@ public Customer save(Customer customer) { return custrepos.save(customer); } + + @Override + public List findAllOrders() { + List list = new ArrayList<>(); + custrepos.findAll().iterator().forEachRemaining(list::add); + return list; + } + + @Override + public Customer findCustomerById(long id) { + return custrepos.findById(id) + .orElseThrow(() -> new EntityNotFoundException("Customer " + id + " Not Found!")); + } + + @Override + public List findByNameLike(String subname) { + List rtnList = custrepos.findByCustnameContainingIgnoringCase(subname); + return rtnList; + } } diff --git a/src/main/java/com/lambdaschool/javaorders/services/OrderServices.java b/src/main/java/com/lambdaschool/javaorders/services/OrderServices.java new file mode 100644 index 0000000..e2e793b --- /dev/null +++ b/src/main/java/com/lambdaschool/javaorders/services/OrderServices.java @@ -0,0 +1,14 @@ +package com.lambdaschool.javaorders.services; + +import com.lambdaschool.javaorders.models.Order; + +import java.util.List; + +public interface OrderServices { + + Order save(Order order); + + Order findOrderById(long id); + + +} diff --git a/src/main/java/com/lambdaschool/javaorders/services/OrderServicesImpl.java b/src/main/java/com/lambdaschool/javaorders/services/OrderServicesImpl.java new file mode 100644 index 0000000..756c60b --- /dev/null +++ b/src/main/java/com/lambdaschool/javaorders/services/OrderServicesImpl.java @@ -0,0 +1,31 @@ +package com.lambdaschool.javaorders.services; + +import com.lambdaschool.javaorders.models.Order; +import com.lambdaschool.javaorders.repositories.OrdersRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.persistence.EntityNotFoundException; +import javax.transaction.Transactional; +import java.util.ArrayList; +import java.util.List; + +@Transactional +@Service(value = "orderServices") +public class OrderServicesImpl implements OrderServices{ + + @Autowired + private OrdersRepository orderrepos; + + @Override + public Order save(Order order) { + return orderrepos.save(order); + } + + @Override + public Order findOrderById(long id) { + return orderrepos.findById(id) + .orElseThrow(() -> new EntityNotFoundException("Order " + id + " Not Found!")); + } + +} diff --git a/src/main/java/com/lambdaschool/javaorders/services/PaymentServices.java b/src/main/java/com/lambdaschool/javaorders/services/PaymentServices.java index 77a2f66..394aaf1 100644 --- a/src/main/java/com/lambdaschool/javaorders/services/PaymentServices.java +++ b/src/main/java/com/lambdaschool/javaorders/services/PaymentServices.java @@ -5,4 +5,6 @@ public interface PaymentServices { Payment save(Payment payment); + + }