diff --git a/.gitignore b/.gitignore index 9154f4c..c2065bc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,26 +1,37 @@ -# ---> Java -# Compiled class file -*.class +HELP.md +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ -# Log file -*.log +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ -# BlueJ files -*.ctxt +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ -# Mobile Tools for Java (J2ME) -.mtj.tmp/ - -# Package Files # -*.jar -*.war -*.nar -*.ear -*.zip -*.tar.gz -*.rar - -# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml -hs_err_pid* -replay_pid* +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +### VS Code ### +.vscode/ diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..50664e6 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,9 @@ +FROM openjdk:21 + +WORKDIR /app + +COPY . /app + +COPY wait-for-it.sh /usr/local/bin/ +RUN chmod +x /usr/local/bin/wait-for-it.sh +RUN microdnf install findutils \ No newline at end of file diff --git a/README.md b/README.md index 9db6d99..e69de29 100644 --- a/README.md +++ b/README.md @@ -1,2 +0,0 @@ -# InternerProgramming - diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..a048eca --- /dev/null +++ b/build.gradle @@ -0,0 +1,28 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '3.2.3' + id 'io.spring.dependency-management' version '1.1.4' +} + +group = 'com.example' +version = '0.0.1-SNAPSHOT' + +java { + sourceCompatibility = '21' +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-web:3.2.3' + implementation 'org.springframework.boot:spring-boot-starter-data-jpa:3.2.3' + implementation 'org.postgresql:postgresql:42.7.2' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' + testImplementation 'org.springframework.boot:spring-boot-starter-test' +} + +tasks.named('test') { + useJUnitPlatform() +} diff --git a/compose.yaml b/compose.yaml new file mode 100644 index 0000000..82aa607 --- /dev/null +++ b/compose.yaml @@ -0,0 +1,41 @@ +version: '3.8' +services: + db: + image: postgres:16 + environment: + - POSTGRES_USER=postgres + - POSTGRES_PASSWORD=postgres + - POSTGRES_DB=onlineshop + volumes: + - pgdbdata:/var/lib/postgresql/data/ + ports: + - "5432:5432" + networks: + - main_network + spring: + build: + context: . + dockerfile: Dockerfile + volumes: + - ./:/app + environment: + POSTGRES_URL: jdbc:postgresql://db:5432/onlineshop + POSTGRES_USERNAME: postgres + POSTGRES_PASSWORD: postgres + links: + - db:db + depends_on: + - db + networks: + - main_network + command: ["bash", "run_backend.sh"] + ports: + - "8080:8080" + + +networks: + main_network: + driver: bridge + +volumes: + pgdbdata: null \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..d64cd49 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..1af9e09 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..1aa94a4 --- /dev/null +++ b/gradlew @@ -0,0 +1,249 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original 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 POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# 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 ;; #( + MSYS* | 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 + if ! command -v java >/dev/null 2>&1 + then + 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 +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# 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"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..6689b85 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,92 @@ +@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=. +@rem This is normally unused +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% equ 0 goto execute + +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 execute + +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 + +: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 %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 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! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/run_backend.sh b/run_backend.sh new file mode 100644 index 0000000..e9b8f23 --- /dev/null +++ b/run_backend.sh @@ -0,0 +1,2 @@ +/usr/local/bin/wait-for-it.sh db:5432 -t 15 +bash gradlew bootRun \ No newline at end of file diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..51f7a8f --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'onlineshop' diff --git a/src/main/java/com/example/onlineshop/OnlineshopApplication.java b/src/main/java/com/example/onlineshop/OnlineshopApplication.java new file mode 100644 index 0000000..590484a --- /dev/null +++ b/src/main/java/com/example/onlineshop/OnlineshopApplication.java @@ -0,0 +1,14 @@ +package com.example.onlineshop; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + + +@SpringBootApplication +public class OnlineshopApplication { + + public static void main(String[] args) { + SpringApplication.run(OnlineshopApplication.class, args); + } + +} diff --git a/src/main/java/com/example/onlineshop/config/AppStartup.java b/src/main/java/com/example/onlineshop/config/AppStartup.java new file mode 100644 index 0000000..0c53e9f --- /dev/null +++ b/src/main/java/com/example/onlineshop/config/AppStartup.java @@ -0,0 +1,21 @@ +package com.example.onlineshop.config; + +import org.springframework.boot.context.event.ApplicationReadyEvent; +import org.springframework.context.event.EventListener; +import org.springframework.stereotype.Component; + +import com.example.onlineshop.service.DataInit; + +@Component +public class AppStartup { + private final DataInit dataInit; + + public AppStartup(DataInit dataInit) { + this.dataInit = dataInit; + } + + @EventListener(ApplicationReadyEvent.class) + public void onApplicationReadyEvent() { + dataInit.initData(); + } +} diff --git a/src/main/java/com/example/onlineshop/controllers/ProductController.java b/src/main/java/com/example/onlineshop/controllers/ProductController.java new file mode 100644 index 0000000..89c28d7 --- /dev/null +++ b/src/main/java/com/example/onlineshop/controllers/ProductController.java @@ -0,0 +1,41 @@ +package com.example.onlineshop.controllers; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import com.example.onlineshop.models.Product; +import com.example.onlineshop.service.ProductService; + +import java.util.List; + +@RestController +@RequestMapping("/product") +public class ProductController { + @Autowired + private ProductService productService; + + @GetMapping + public List getAllProducts() { + return productService.getAllProducts(); + } + + @GetMapping("/{id}") + public Product getProductById(@PathVariable Long id) { + return productService.getProductById(id); + } + + @PostMapping + public Product createProduct(@RequestBody Product product) { + return productService.createProduct(product); + } + + @PutMapping("/{id}") + public Product updateProduct(@PathVariable Long id, @RequestBody Product product) { + return productService.updateProduct(id, product); + } + + @DeleteMapping("/{id}") + public void deleteProduct(@PathVariable Long id) { + productService.deleteProduct(id); + } +} diff --git a/src/main/java/com/example/onlineshop/models/Category.java b/src/main/java/com/example/onlineshop/models/Category.java new file mode 100644 index 0000000..7061e4b --- /dev/null +++ b/src/main/java/com/example/onlineshop/models/Category.java @@ -0,0 +1,45 @@ +package com.example.onlineshop.models; + +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Column; + +@Entity +public class Category { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(unique = true, nullable = false) + private String name; + + public Category() {} + + public Category (Long id, String name) { + this.id = id; + this.name = name; + } + + public void setId(Long id){ + this.id = id; + } + + public Long getId(){ + return this.id; + } + + public void setName(String name){ + this.name = name; + } + + public String getName(){ + return this.name; + } + + @Override + public String toString(){ + return "Category: id=" + this.id + ", name=" + this.name; + } +} diff --git a/src/main/java/com/example/onlineshop/models/Product.java b/src/main/java/com/example/onlineshop/models/Product.java new file mode 100644 index 0000000..df56b9b --- /dev/null +++ b/src/main/java/com/example/onlineshop/models/Product.java @@ -0,0 +1,109 @@ +package com.example.onlineshop.models; + +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.Column; + +@Entity +public class Product { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(unique = true, nullable = false) + private String name; + + @Column(nullable = false) + private double price; + + @ManyToOne + @JoinColumn(name = "category_id", nullable = false) + private Category category; + + @Column(nullable = false, columnDefinition = "TEXT") + private String info; + + @ManyToOne + @JoinColumn(name = "size_id", nullable = false) + private Size size; + + @Column(columnDefinition = "TEXT") + private String photo; + + public Product() {} + + public Product(Long id, String name, double price, Category category, String info, Size size, String photo){ + this.id = id; + this.name = name; + this.price = price; + this.category = category; + this.info = info; + this.size = size; + this.photo = photo; + } + + public void setId(Long id){ + this.id = id; + } + + public Long getId(){ + return this.id; + } + + public void setName(String name){ + this.name = name; + } + + public String getName(){ + return this.name; + } + + public void setPrice(double price){ + this.price = price; + } + + public double getPrice(){ + return this.price; + } + + public Category getCategory(){ + return this.category; + } + + public void setCategory(Category category){ + this.category = category; + } + + public void setInfo(String info){ + this.info = info; + } + + public String getInfo(){ + return this.info; + } + + public Size getSize(){ + return this.size; + } + + public void setSize(Size size){ + this.size = size; + } + + public String getPhoto(){ + return this.photo; + } + + public void setPhoto(String photo){ + this.photo = photo; + } + + @Override + public String toString(){ + return "Product: id=" + this.id + ", name=" + this.name; + } +} diff --git a/src/main/java/com/example/onlineshop/models/Size.java b/src/main/java/com/example/onlineshop/models/Size.java new file mode 100644 index 0000000..c2a25e5 --- /dev/null +++ b/src/main/java/com/example/onlineshop/models/Size.java @@ -0,0 +1,45 @@ +package com.example.onlineshop.models; + +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Column; + +@Entity +public class Size { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(unique = true, nullable = false) + private String name; + + public Size(){} + + public Size (Long id, String name) { + this.id = id; + this.name = name; + } + + public void setId(Long id){ + this.id = id; + } + + public Long getId(){ + return this.id; + } + + public void setName(String name){ + this.name = name; + } + + public String getName(){ + return this.name; + } + + @Override + public String toString(){ + return "Size: id=" + this.id + ", name=" + this.name; + } +} diff --git a/src/main/java/com/example/onlineshop/repository/CategoryRepository.java b/src/main/java/com/example/onlineshop/repository/CategoryRepository.java new file mode 100644 index 0000000..eefad56 --- /dev/null +++ b/src/main/java/com/example/onlineshop/repository/CategoryRepository.java @@ -0,0 +1,8 @@ +package com.example.onlineshop.repository; + +import org.springframework.data.jpa.repository.JpaRepository; +import com.example.onlineshop.models.Category; + +public interface CategoryRepository extends JpaRepository { + +} diff --git a/src/main/java/com/example/onlineshop/repository/ProductRepository.java b/src/main/java/com/example/onlineshop/repository/ProductRepository.java new file mode 100644 index 0000000..8446fb3 --- /dev/null +++ b/src/main/java/com/example/onlineshop/repository/ProductRepository.java @@ -0,0 +1,8 @@ +package com.example.onlineshop.repository; + +import org.springframework.data.jpa.repository.JpaRepository; +import com.example.onlineshop.models.Product; + +public interface ProductRepository extends JpaRepository { + +} diff --git a/src/main/java/com/example/onlineshop/repository/SizeRepository.java b/src/main/java/com/example/onlineshop/repository/SizeRepository.java new file mode 100644 index 0000000..c4779aa --- /dev/null +++ b/src/main/java/com/example/onlineshop/repository/SizeRepository.java @@ -0,0 +1,8 @@ +package com.example.onlineshop.repository; + +import org.springframework.data.jpa.repository.JpaRepository; +import com.example.onlineshop.models.Size; + +public interface SizeRepository extends JpaRepository { + +} diff --git a/src/main/java/com/example/onlineshop/service/DataInit.java b/src/main/java/com/example/onlineshop/service/DataInit.java new file mode 100644 index 0000000..cc2ab5f --- /dev/null +++ b/src/main/java/com/example/onlineshop/service/DataInit.java @@ -0,0 +1,44 @@ +package com.example.onlineshop.service; + +import org.springframework.stereotype.Service; + +import com.example.onlineshop.models.Category; +import com.example.onlineshop.models.Size; +import com.example.onlineshop.repository.CategoryRepository; +import com.example.onlineshop.repository.SizeRepository; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class DataInit { + private final CategoryRepository categoryRepository; + private final SizeRepository sizeRepository; + + public DataInit(CategoryRepository categoryRepository, SizeRepository sizeRepository) { + this.categoryRepository = categoryRepository; + this.sizeRepository = sizeRepository; + } + + public void initData() { + if (categoryRepository.count() == 0) { + String[] categoryArray = {"Футболки", "Шорты", "Штаны", "Кроссовки", "Куртки"}; + + for (String category : categoryArray){ + Category tmpCategory = new Category(); + tmpCategory.setName(category); + categoryRepository.save(tmpCategory); + } + } + + if (sizeRepository.count() == 0){ + String[] sizeArray = {"S", "M", "L", "XS", "XL"}; + + for (String size : sizeArray){ + Size tmpSize = new Size(); + tmpSize.setName(size); + sizeRepository.save(tmpSize); + } + } + } +} diff --git a/src/main/java/com/example/onlineshop/service/ProductService.java b/src/main/java/com/example/onlineshop/service/ProductService.java new file mode 100644 index 0000000..7a2a584 --- /dev/null +++ b/src/main/java/com/example/onlineshop/service/ProductService.java @@ -0,0 +1,43 @@ +package com.example.onlineshop.service; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import com.example.onlineshop.models.Product; +import com.example.onlineshop.repository.ProductRepository; + +import java.util.List; + +@Service +public class ProductService { + @Autowired + private ProductRepository productRepository; + + public List getAllProducts() { + return productRepository.findAll(); + } + + public Product getProductById(Long id) { + return productRepository.findById(id) + .orElseThrow(() -> new RuntimeException("Product not found with id: " + id)); + } + + public Product createProduct(Product product) { + return productRepository.save(product); + } + + public Product updateProduct(Long id, Product product) { + if (!productRepository.existsById(id)) { + throw new RuntimeException("Product not found with id: " + id); + } + product.setId(id); + return productRepository.save(product); + } + + public void deleteProduct(Long id) { + if (!productRepository.existsById(id)) { + throw new RuntimeException("Product not found with id: " + id); + } + productRepository.deleteById(id); + } +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties new file mode 100644 index 0000000..e099bfe --- /dev/null +++ b/src/main/resources/application.properties @@ -0,0 +1,9 @@ +spring: + docker: + compose: + file: "./compose.yml" +spring.datasource.url=${POSTGRES_URL} +spring.datasource.username=${POSTGRES_USERNAME} +spring.datasource.password=${POSTGRES_PASSWORD} +spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect +spring.jpa.generate-ddl=true \ No newline at end of file diff --git a/src/test/java/com/example/onlineshop/OnlineshopApplicationTests.java b/src/test/java/com/example/onlineshop/OnlineshopApplicationTests.java new file mode 100644 index 0000000..f3be847 --- /dev/null +++ b/src/test/java/com/example/onlineshop/OnlineshopApplicationTests.java @@ -0,0 +1,13 @@ +package com.example.onlineshop; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class OnlineshopApplicationTests { + + @Test + void contextLoads() { + } + +} diff --git a/target/classes/com/example/onlineshop/OnlineshopApplication.class b/target/classes/com/example/onlineshop/OnlineshopApplication.class new file mode 100644 index 0000000..8ae2cca Binary files /dev/null and b/target/classes/com/example/onlineshop/OnlineshopApplication.class differ diff --git a/target/test-classes/com/example/onlineshop/OnlineshopApplicationTests.class b/target/test-classes/com/example/onlineshop/OnlineshopApplicationTests.class new file mode 100644 index 0000000..e718cc1 Binary files /dev/null and b/target/test-classes/com/example/onlineshop/OnlineshopApplicationTests.class differ diff --git a/wait-for-it.sh b/wait-for-it.sh new file mode 100755 index 0000000..3974640 --- /dev/null +++ b/wait-for-it.sh @@ -0,0 +1,182 @@ +#!/usr/bin/env bash +# Use this script to test if a given TCP host/port are available + +WAITFORIT_cmdname=${0##*/} + +echoerr() { if [[ $WAITFORIT_QUIET -ne 1 ]]; then echo "$@" 1>&2; fi } + +usage() +{ + cat << USAGE >&2 +Usage: + $WAITFORIT_cmdname host:port [-s] [-t timeout] [-- command args] + -h HOST | --host=HOST Host or IP under test + -p PORT | --port=PORT TCP port under test + Alternatively, you specify the host and port as host:port + -s | --strict Only execute subcommand if the test succeeds + -q | --quiet Don't output any status messages + -t TIMEOUT | --timeout=TIMEOUT + Timeout in seconds, zero for no timeout + -- COMMAND ARGS Execute command with args after the test finishes +USAGE + exit 1 +} + +wait_for() +{ + if [[ $WAITFORIT_TIMEOUT -gt 0 ]]; then + echoerr "$WAITFORIT_cmdname: waiting $WAITFORIT_TIMEOUT seconds for $WAITFORIT_HOST:$WAITFORIT_PORT" + else + echoerr "$WAITFORIT_cmdname: waiting for $WAITFORIT_HOST:$WAITFORIT_PORT without a timeout" + fi + WAITFORIT_start_ts=$(date +%s) + while : + do + if [[ $WAITFORIT_ISBUSY -eq 1 ]]; then + nc -z $WAITFORIT_HOST $WAITFORIT_PORT + WAITFORIT_result=$? + else + (echo -n > /dev/tcp/$WAITFORIT_HOST/$WAITFORIT_PORT) >/dev/null 2>&1 + WAITFORIT_result=$? + fi + if [[ $WAITFORIT_result -eq 0 ]]; then + WAITFORIT_end_ts=$(date +%s) + echoerr "$WAITFORIT_cmdname: $WAITFORIT_HOST:$WAITFORIT_PORT is available after $((WAITFORIT_end_ts - WAITFORIT_start_ts)) seconds" + break + fi + sleep 1 + done + return $WAITFORIT_result +} + +wait_for_wrapper() +{ + # In order to support SIGINT during timeout: http://unix.stackexchange.com/a/57692 + if [[ $WAITFORIT_QUIET -eq 1 ]]; then + timeout $WAITFORIT_BUSYTIMEFLAG $WAITFORIT_TIMEOUT $0 --quiet --child --host=$WAITFORIT_HOST --port=$WAITFORIT_PORT --timeout=$WAITFORIT_TIMEOUT & + else + timeout $WAITFORIT_BUSYTIMEFLAG $WAITFORIT_TIMEOUT $0 --child --host=$WAITFORIT_HOST --port=$WAITFORIT_PORT --timeout=$WAITFORIT_TIMEOUT & + fi + WAITFORIT_PID=$! + trap "kill -INT -$WAITFORIT_PID" INT + wait $WAITFORIT_PID + WAITFORIT_RESULT=$? + if [[ $WAITFORIT_RESULT -ne 0 ]]; then + echoerr "$WAITFORIT_cmdname: timeout occurred after waiting $WAITFORIT_TIMEOUT seconds for $WAITFORIT_HOST:$WAITFORIT_PORT" + fi + return $WAITFORIT_RESULT +} + +# process arguments +while [[ $# -gt 0 ]] +do + case "$1" in + *:* ) + WAITFORIT_hostport=(${1//:/ }) + WAITFORIT_HOST=${WAITFORIT_hostport[0]} + WAITFORIT_PORT=${WAITFORIT_hostport[1]} + shift 1 + ;; + --child) + WAITFORIT_CHILD=1 + shift 1 + ;; + -q | --quiet) + WAITFORIT_QUIET=1 + shift 1 + ;; + -s | --strict) + WAITFORIT_STRICT=1 + shift 1 + ;; + -h) + WAITFORIT_HOST="$2" + if [[ $WAITFORIT_HOST == "" ]]; then break; fi + shift 2 + ;; + --host=*) + WAITFORIT_HOST="${1#*=}" + shift 1 + ;; + -p) + WAITFORIT_PORT="$2" + if [[ $WAITFORIT_PORT == "" ]]; then break; fi + shift 2 + ;; + --port=*) + WAITFORIT_PORT="${1#*=}" + shift 1 + ;; + -t) + WAITFORIT_TIMEOUT="$2" + if [[ $WAITFORIT_TIMEOUT == "" ]]; then break; fi + shift 2 + ;; + --timeout=*) + WAITFORIT_TIMEOUT="${1#*=}" + shift 1 + ;; + --) + shift + WAITFORIT_CLI=("$@") + break + ;; + --help) + usage + ;; + *) + echoerr "Unknown argument: $1" + usage + ;; + esac +done + +if [[ "$WAITFORIT_HOST" == "" || "$WAITFORIT_PORT" == "" ]]; then + echoerr "Error: you need to provide a host and port to test." + usage +fi + +WAITFORIT_TIMEOUT=${WAITFORIT_TIMEOUT:-15} +WAITFORIT_STRICT=${WAITFORIT_STRICT:-0} +WAITFORIT_CHILD=${WAITFORIT_CHILD:-0} +WAITFORIT_QUIET=${WAITFORIT_QUIET:-0} + +# Check to see if timeout is from busybox? +WAITFORIT_TIMEOUT_PATH=$(type -p timeout) +WAITFORIT_TIMEOUT_PATH=$(realpath $WAITFORIT_TIMEOUT_PATH 2>/dev/null || readlink -f $WAITFORIT_TIMEOUT_PATH) + +WAITFORIT_BUSYTIMEFLAG="" +if [[ $WAITFORIT_TIMEOUT_PATH =~ "busybox" ]]; then + WAITFORIT_ISBUSY=1 + # Check if busybox timeout uses -t flag + # (recent Alpine versions don't support -t anymore) + if timeout &>/dev/stdout | grep -q -e '-t '; then + WAITFORIT_BUSYTIMEFLAG="-t" + fi +else + WAITFORIT_ISBUSY=0 +fi + +if [[ $WAITFORIT_CHILD -gt 0 ]]; then + wait_for + WAITFORIT_RESULT=$? + exit $WAITFORIT_RESULT +else + if [[ $WAITFORIT_TIMEOUT -gt 0 ]]; then + wait_for_wrapper + WAITFORIT_RESULT=$? + else + wait_for + WAITFORIT_RESULT=$? + fi +fi + +if [[ $WAITFORIT_CLI != "" ]]; then + if [[ $WAITFORIT_RESULT -ne 0 && $WAITFORIT_STRICT -eq 1 ]]; then + echoerr "$WAITFORIT_cmdname: strict mode, refusing to execute subprocess" + exit $WAITFORIT_RESULT + fi + exec "${WAITFORIT_CLI[@]}" +else + exit $WAITFORIT_RESULT +fi \ No newline at end of file