From 62d811db1d121178764acf6413faac8d563ba68e Mon Sep 17 00:00:00 2001 From: CodeSteak Date: Tue, 12 May 2020 22:41:08 +0200 Subject: [PATCH] Implement First Draft of Supplier API --- supplier/.gitignore | 32 +++ supplier/build.gradle | 29 +++ supplier/config/bank.json | 26 +++ supplier/config/hans-and-more.json | 34 ++++ supplier/gradlew | 183 ++++++++++++++++++ supplier/gradlew.bat | 103 ++++++++++ supplier/settings.gradle | 1 + .../java/org/hso/ecommerce/supplier/App.java | 11 ++ .../supplier/ConfigurationReader.java | 45 +++++ .../ecommerce/supplier/RequestController.java | 88 +++++++++ .../hso/ecommerce/supplier/data/Article.java | 11 ++ .../hso/ecommerce/supplier/data/Order.java | 9 + .../supplier/data/OrderConfirmation.java | 12 ++ .../hso/ecommerce/supplier/data/Supplier.java | 21 ++ .../supplier/data/SupplierDiscount.java | 6 + .../src/main/resources/application.properties | 2 + 16 files changed, 613 insertions(+) create mode 100644 supplier/.gitignore create mode 100644 supplier/build.gradle create mode 100644 supplier/config/bank.json create mode 100644 supplier/config/hans-and-more.json create mode 100755 supplier/gradlew create mode 100644 supplier/gradlew.bat create mode 100644 supplier/settings.gradle create mode 100644 supplier/src/main/java/org/hso/ecommerce/supplier/App.java create mode 100644 supplier/src/main/java/org/hso/ecommerce/supplier/ConfigurationReader.java create mode 100644 supplier/src/main/java/org/hso/ecommerce/supplier/RequestController.java create mode 100644 supplier/src/main/java/org/hso/ecommerce/supplier/data/Article.java create mode 100644 supplier/src/main/java/org/hso/ecommerce/supplier/data/Order.java create mode 100644 supplier/src/main/java/org/hso/ecommerce/supplier/data/OrderConfirmation.java create mode 100644 supplier/src/main/java/org/hso/ecommerce/supplier/data/Supplier.java create mode 100644 supplier/src/main/java/org/hso/ecommerce/supplier/data/SupplierDiscount.java create mode 100644 supplier/src/main/resources/application.properties diff --git a/supplier/.gitignore b/supplier/.gitignore new file mode 100644 index 0000000..6c01878 --- /dev/null +++ b/supplier/.gitignore @@ -0,0 +1,32 @@ +HELP.md +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/** +!**/src/test/** + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr +out/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ diff --git a/supplier/build.gradle b/supplier/build.gradle new file mode 100644 index 0000000..1e309d1 --- /dev/null +++ b/supplier/build.gradle @@ -0,0 +1,29 @@ +plugins { + id 'org.springframework.boot' version '2.2.7.RELEASE' + id 'io.spring.dependency-management' version '1.0.9.RELEASE' + id 'java' +} + +group = 'org.hso.ecommerce' +version = '0.0.1-SNAPSHOT' +sourceCompatibility = '11' + +apply plugin: 'java' +apply plugin: 'idea' +apply plugin: 'org.springframework.boot' +apply plugin: 'io.spring.dependency-management' + +repositories { + mavenCentral() +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-web' + testImplementation('org.springframework.boot:spring-boot-starter-test') { + exclude group: 'org.junit.vintage', module: 'junit-vintage-engine' + } +} + +test { + useJUnitPlatform() +} diff --git a/supplier/config/bank.json b/supplier/config/bank.json new file mode 100644 index 0000000..14cf837 --- /dev/null +++ b/supplier/config/bank.json @@ -0,0 +1,26 @@ +{ + "id" : "bank", + "name" : "Bank of Cheese", + "discount" : { + "minimumDailySalesVolumeNetCent": 100, + "percentDiscount": 1 + }, + "articles": [ + { + "title": "Big Mac", + "manufacturer": "Mc Donalds", + "articleNumber": "0x1 BIGMAC", + "vatPercent": 7, + "pricePerUnitNet": 700, + "shouldBeAdvertised": true + }, + { + "title": "500£ Schein", + "manufacturer": "Bank", + "articleNumber": "500", + "vatPercent": 0, + "pricePerUnitNet": 50000, + "shouldBeAdvertised": false + } + ] +} \ No newline at end of file diff --git a/supplier/config/hans-and-more.json b/supplier/config/hans-and-more.json new file mode 100644 index 0000000..b925ddf --- /dev/null +++ b/supplier/config/hans-and-more.json @@ -0,0 +1,34 @@ +{ + "id" : "hans", + "name" : "Hans and more", + "discount" : { + "minimumDailySalesVolumeNetCent": 100000, + "percentDiscount": 2 + }, + "articles": [ + { + "title": "Big Mac", + "manufacturer": "Mc Donalds", + "articleNumber": "0x1 BIGMAC", + "vatPercent": 7, + "pricePerUnitNet": 700, + "shouldBeAdvertised": true + }, + { + "title": "Pommes", + "manufacturer": "Mc Donalds", + "articleNumber": "0x1 POmes", + "vatPercent": 7, + "pricePerUnitNet": 100, + "shouldBeAdvertised": false + }, + { + "title": "Milchshake Premium 19%", + "manufacturer": "Mc Donalds", + "articleNumber": "0x2", + "vatPercent": 19, + "pricePerUnitNet": 50, + "shouldBeAdvertised": true + } + ] +} \ No newline at end of file diff --git a/supplier/gradlew b/supplier/gradlew new file mode 100755 index 0000000..2fe81a7 --- /dev/null +++ b/supplier/gradlew @@ -0,0 +1,183 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 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. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +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 +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +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 + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=`expr $i + 1` + done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=`save "$@"` + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +exec "$JAVACMD" "$@" diff --git a/supplier/gradlew.bat b/supplier/gradlew.bat new file mode 100644 index 0000000..9109989 --- /dev/null +++ b/supplier/gradlew.bat @@ -0,0 +1,103 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem 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, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/supplier/settings.gradle b/supplier/settings.gradle new file mode 100644 index 0000000..9a7e6c7 --- /dev/null +++ b/supplier/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'supplier' diff --git a/supplier/src/main/java/org/hso/ecommerce/supplier/App.java b/supplier/src/main/java/org/hso/ecommerce/supplier/App.java new file mode 100644 index 0000000..bb8b42d --- /dev/null +++ b/supplier/src/main/java/org/hso/ecommerce/supplier/App.java @@ -0,0 +1,11 @@ +package org.hso.ecommerce.supplier; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class App { + public static void main(String[] args) { + SpringApplication.run(App.class, args); + } +} diff --git a/supplier/src/main/java/org/hso/ecommerce/supplier/ConfigurationReader.java b/supplier/src/main/java/org/hso/ecommerce/supplier/ConfigurationReader.java new file mode 100644 index 0000000..f4e4e20 --- /dev/null +++ b/supplier/src/main/java/org/hso/ecommerce/supplier/ConfigurationReader.java @@ -0,0 +1,45 @@ +package org.hso.ecommerce.supplier; + +import com.fasterxml.jackson.databind.ObjectMapper; +import org.hso.ecommerce.supplier.data.Supplier; + +import java.io.File; +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; + +public class ConfigurationReader { + + public static List read() throws IOException { + File dir = new File("./config/"); + + System.out.println("Loading Config in " + dir.getAbsolutePath()); + ArrayList ret = Files.list(dir.toPath()).map(path -> { + + System.out.println("Iterating over; " + path); + if (path.toString().endsWith(".json")) { + try { + String jsonData = Files.readString(path, StandardCharsets.UTF_8); + ObjectMapper objectMapper = new ObjectMapper(); + Supplier sup = (Supplier)objectMapper.readValue(jsonData, Supplier.class); + System.out.println("Loaded " + sup.id); + return sup; + } catch (IOException e) { + e.printStackTrace(); + } + } else { + System.out.println("Skipping because of file extension."); + } + return null; + }).collect(Collectors.toCollection(ArrayList::new)); + + ret.removeIf(Objects::isNull); + + return ret; + } +} + diff --git a/supplier/src/main/java/org/hso/ecommerce/supplier/RequestController.java b/supplier/src/main/java/org/hso/ecommerce/supplier/RequestController.java new file mode 100644 index 0000000..239a8ac --- /dev/null +++ b/supplier/src/main/java/org/hso/ecommerce/supplier/RequestController.java @@ -0,0 +1,88 @@ +package org.hso.ecommerce.supplier; + +import org.hso.ecommerce.supplier.data.Article; +import org.hso.ecommerce.supplier.data.Order; +import org.hso.ecommerce.supplier.data.OrderConfirmation; +import org.hso.ecommerce.supplier.data.Supplier; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.PostConstruct; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.List; + +@RestController +public class RequestController { + + private final HashMap dailySalesVolumeCent = new HashMap<>(); + private final HashMap knownSuppliers = new HashMap<>(); + private final SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); + + @PostConstruct + public void init() throws IOException { + for (Supplier s : ConfigurationReader.read()) { + knownSuppliers.put(s.id, s); + } + } + + + @GetMapping("/") + public List index() { + return new ArrayList<>(knownSuppliers.values()); + } + + @GetMapping("/{supplier}/") + public Supplier supplier(HttpServletResponse res, @PathVariable("supplier") String supplierName) { + Supplier s = knownSuppliers.get(supplierName); + if(s == null) { + res.setStatus(HttpServletResponse.SC_NOT_FOUND); + } + return s; + } + + @PostMapping("/{supplier}/order") + public OrderConfirmation order(HttpServletResponse res, @PathVariable("supplier") String supplierName, @RequestBody Order order) { + Supplier s = knownSuppliers.get(supplierName); + if(s == null) { + res.setStatus(HttpServletResponse.SC_NOT_FOUND); + return null; + } + + String dateKey = simpleDateFormat.format(new Date()); + int dailyVolume = dailySalesVolumeCent.getOrDefault(dateKey,0); + + Article a = s.findArticle(order.manufacturer, order.articleNumber); + if(a == null) { + res.setStatus(HttpServletResponse.SC_BAD_REQUEST); + return null; + } + + int priceNet = a.pricePerUnitNet * order.quantity; + int discount = 0; + if(dailyVolume >= s.discount.minimumDailySalesVolumeNetCent) { + discount = (priceNet * s.discount.percentDiscount) / 100; + } + + OrderConfirmation confirmation = new OrderConfirmation(); + confirmation.articleNumber = order.articleNumber; + confirmation.discountNetCent = discount; + confirmation.pricePerUnitNetCent = a.pricePerUnitNet; + confirmation.manufacturer = a.manufacturer; + confirmation.quantity = order.quantity; + confirmation.totalPriceNetCharged = priceNet - discount; + + if (confirmation.totalPriceNetCharged > order.maxTotalPriceCentNet) { + res.setStatus(HttpServletResponse.SC_EXPECTATION_FAILED); + return null; + } + + dailyVolume += confirmation.totalPriceNetCharged; + dailySalesVolumeCent.put(dateKey, dailyVolume); + + return confirmation; + } +} diff --git a/supplier/src/main/java/org/hso/ecommerce/supplier/data/Article.java b/supplier/src/main/java/org/hso/ecommerce/supplier/data/Article.java new file mode 100644 index 0000000..3556096 --- /dev/null +++ b/supplier/src/main/java/org/hso/ecommerce/supplier/data/Article.java @@ -0,0 +1,11 @@ +package org.hso.ecommerce.supplier.data; + +public class Article { + public String title; + public String manufacturer; + public String articleNumber; + + public int vatPercent; + public int pricePerUnitNet; + public boolean shouldBeAdvertised; +} diff --git a/supplier/src/main/java/org/hso/ecommerce/supplier/data/Order.java b/supplier/src/main/java/org/hso/ecommerce/supplier/data/Order.java new file mode 100644 index 0000000..f7e6a19 --- /dev/null +++ b/supplier/src/main/java/org/hso/ecommerce/supplier/data/Order.java @@ -0,0 +1,9 @@ +package org.hso.ecommerce.supplier.data; + +public class Order { + public String manufacturer; + public String articleNumber; + + public int quantity; + public int maxTotalPriceCentNet; +} diff --git a/supplier/src/main/java/org/hso/ecommerce/supplier/data/OrderConfirmation.java b/supplier/src/main/java/org/hso/ecommerce/supplier/data/OrderConfirmation.java new file mode 100644 index 0000000..f5e8101 --- /dev/null +++ b/supplier/src/main/java/org/hso/ecommerce/supplier/data/OrderConfirmation.java @@ -0,0 +1,12 @@ +package org.hso.ecommerce.supplier.data; + +public class OrderConfirmation { + public String manufacturer; + public String articleNumber; + + public int quantity; + + public int pricePerUnitNetCent; + public int discountNetCent; + public int totalPriceNetCharged; +} diff --git a/supplier/src/main/java/org/hso/ecommerce/supplier/data/Supplier.java b/supplier/src/main/java/org/hso/ecommerce/supplier/data/Supplier.java new file mode 100644 index 0000000..4028a27 --- /dev/null +++ b/supplier/src/main/java/org/hso/ecommerce/supplier/data/Supplier.java @@ -0,0 +1,21 @@ +package org.hso.ecommerce.supplier.data; + +import java.util.List; + +public class Supplier { + + public String id; + public String name; + public SupplierDiscount discount; + public List
articles; + + public Article findArticle(String manufacturer, String articleNumber) { + for(Article a : articles) { + if(a.manufacturer.equals(manufacturer) && a.articleNumber.equals(articleNumber)) { + return a; + } + } + + return null; + } +} diff --git a/supplier/src/main/java/org/hso/ecommerce/supplier/data/SupplierDiscount.java b/supplier/src/main/java/org/hso/ecommerce/supplier/data/SupplierDiscount.java new file mode 100644 index 0000000..14e537c --- /dev/null +++ b/supplier/src/main/java/org/hso/ecommerce/supplier/data/SupplierDiscount.java @@ -0,0 +1,6 @@ +package org.hso.ecommerce.supplier.data; + +public class SupplierDiscount { + public int minimumDailySalesVolumeNetCent; + public int percentDiscount; +} diff --git a/supplier/src/main/resources/application.properties b/supplier/src/main/resources/application.properties new file mode 100644 index 0000000..c0d1914 --- /dev/null +++ b/supplier/src/main/resources/application.properties @@ -0,0 +1,2 @@ +server.address=::1 +server.port=8081