revert cc9a0ca78a

revert Удалить 'README.md'

.gitignore

@@ -1,37 +0,0 @@
-HELP.md
-.gradle
-build/
-!gradle/wrapper/gradle-wrapper.jar
-!**/src/main/**/build/
-!**/src/test/**/build/
-
-### STS ###
-.apt_generated
-.classpath
-.factorypath
-.project
-.settings
-.springBeans
-.sts4-cache
-bin/
-!**/src/main/**/bin/
-!**/src/test/**/bin/
-
-### IntelliJ IDEA ###
-.idea
-*.iws
-*.iml
-*.ipr
-out/
-!**/src/main/**/out/
-!**/src/test/**/out/
-
-### NetBeans ###
-/nbproject/private/
-/nbbuild/
-/dist/
-/nbdist/
-/.nb-gradle/
-
-### VS Code ###
-.vscode/

README.md

@@ -0,0 +1 @@
+# IevlewaMD_PIbd-21_InternetProgramming_2sem

build.gradle

@@ -1,28 +0,0 @@
-plugins {
-	id 'java'
-	id 'org.springframework.boot' version '3.2.5'
-	id 'io.spring.dependency-management' version '1.1.4'
-}
-
-group = 'com.example'
-version = '0.0.1-SNAPSHOT'
-
-java {
-	sourceCompatibility = '17'
-}
-
-repositories {
-	mavenCentral()
-}
-
-dependencies {
-	implementation 'org.springframework.boot:spring-boot-starter-web'
-	implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
-	implementation 'org.modelmapper:modelmapper:3.2.0'
-
-	testImplementation 'org.springframework.boot:spring-boot-starter-test'
-}
-
-tasks.named('test') {
-	useJUnitPlatform()
-}

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +0,0 @@
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
-networkTimeout=10000
-validateDistributionUrl=true
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists

gradlew

@@ -1,249 +0,0 @@
-#!/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" "$@"

gradlew.bat

@@ -1,92 +0,0 @@
-@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. 1>&2
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
-echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation. 1>&2
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto execute
-
-echo. 1>&2
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
-echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation. 1>&2
-
-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

settings.gradle

@@ -1 +0,0 @@
-rootProject.name = 'demo'

src/main/java/com/example/demo/DemoApplication.java

@@ -1,120 +0,0 @@
-package com.example.demo;
-
-import java.util.Objects;
-import java.time.LocalDate;
-import java.time.format.DateTimeFormatter;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.boot.CommandLineRunner;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-import com.example.demo.ivents.model.IventEntity;
-import com.example.demo.ivents.service.IventService;
-import com.example.demo.types.model.TypeEntity;
-import com.example.demo.types.service.TypeService;
-import com.example.demo.places.model.PlaceEntity;
-import com.example.demo.places.service.PlaceService;
-import com.example.demo.users.model.UserEntity;
-import com.example.demo.users.service.UserService;
-
-@SpringBootApplication
-public class DemoApplication implements CommandLineRunner {
-	private final Logger log = LoggerFactory.getLogger(DemoApplication.class);
-
-	private final TypeService typeService;
-	private final PlaceService placeService;
-	private final IventService iventService;
-	private final UserService userService;
-
-	public DemoApplication(PlaceService placeService, TypeService typeService, IventService iventService, UserService userService) {
-		this.placeService = placeService;
-		this.typeService = typeService;
-		this.iventService = iventService;
-		this.userService = userService;
-	}
-
-	public static void main(String[] args) {
-		SpringApplication.run(DemoApplication.class, args);
-	}
-
-	@Override
-	public void run(String... args) throws Exception {
-
-		if (args.length > 0 && Objects.equals("--populate", args[0])) {
-			log.info("Create default categories values");
-			DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-        	LocalDate _date = LocalDate.parse("2023-10-15", formatter);
-
-			final var type1 = typeService.create(new TypeEntity(null, "Концерт"));
-			final var type2 = typeService.create(new TypeEntity(null, "Кино"));
-			final var type3 = typeService.create(new TypeEntity(null, "Театр"));
-
-			final var place1 = placeService.create(new PlaceEntity(null, "US, California"));
-			final var place2 = placeService.create(new PlaceEntity(null, "Germany, Berlin"));
-			final var place3 = placeService.create(new PlaceEntity(null, "UK, London"));
-
-			log.info("Create default books values");
-			iventService.create(new IventEntity(
-				null, 
-				"Slipknot", 
-				type1,  
-				_date, 
-				"Slipknot - американская ню-метал группа, основанная в 1995 году. Они известны своим агрессивным звучанием, смешением хардкор-панк и тяжелого метала с индастриалом и элементами альтернативного рока.",
-				"Участники группы Slipknot - это:<....>", 
-				2500.33, 
-				30, 
-				place1));
-
-			iventService.create(new IventEntity(
-				null, 
-				"Placebo", 
-				type1,  
-				_date, 
-				"Placebo - британская альтернативная рок-группа, основанная в 1994 году. Они известны своим уникальным звучанием, погружающим слушателей в меланхоличную атмосферу и наполняющим музыку эмоциональным содержанием.",
-				"Группа Placebo состояла из следующих участников:<....>", 
-				2500.33, 
-				30, 
-				place2));
-
-			iventService.create(new IventEntity(
-				null, 
-				"Radiohead", 
-				type1,  
-				_date, 
-				"Radiohead - британская рок-группа, образованная в 1985 году.",
-				"Участниками Radiohead являются:<....>", 
-				2500.33, 
-				30, 
-				place3));
-
-			iventService.create(new IventEntity(
-				null, 
-				"Сияние", 
-				type2,  
-				_date, 
-				"\"Сияние\" - это психологический триллер режиссера Стэнли Кубрика, вышедший в 1980 году.",
-				"Актеры:<....>", 
-				2500.33, 
-				45, 
-				place3));
-
-			iventService.create(new IventEntity(
-				null, 
-				"Мастер и Маргарита", 
-				type3,  
-				_date, 
-				"тут должно быть описание",
-				"Автор: М. А. Булгаков", 
-				2500.33, 
-				30, 
-				place2));
-
-			log.info("Create default users values");
-			userService.create(new UserEntity(null, "Admin", "Admin@gmail.com", "admin"));
-			userService.create(new UserEntity(null, "Milana", "milana@gmail.com", "milana"));
-			userService.create(new UserEntity(null, "TestUser", "user@gmail.com", "test"));
-		}
-	}
-}

src/main/java/com/example/demo/core/configuration/Constants.java

@@ -1,8 +0,0 @@
-package com.example.demo.core.configuration;
-
-public class Constants {
-    public static final String API_URL = "/api/1.0";
-
-    private Constants() {
-    }
-}

src/main/java/com/example/demo/core/configuration/MapperConfiguration.java

@@ -1,16 +0,0 @@
-package com.example.demo.core.configuration;
-
-import org.modelmapper.ModelMapper;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-
-@Configuration
-public class MapperConfiguration {
-    @Bean
-    ModelMapper modelMapper() {
-        return new ModelMapper();
-
-        
-    }
-}

src/main/java/com/example/demo/core/configuration/WebConfiguration.java

@@ -1,15 +0,0 @@
-package com.example.demo.core.configuration;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.lang.NonNull;
-import org.springframework.web.servlet.config.annotation.CorsRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-
-@Configuration
-public class WebConfiguration implements WebMvcConfigurer {
-    @Override
-    public void addCorsMappings(@NonNull CorsRegistry registry) {
-        registry.addMapping("/**")
-                .allowedMethods("GET", "POST", "PUT", "DELETE");
-    }
-}

src/main/java/com/example/demo/core/error/NotFoundException.java

@@ -1,7 +0,0 @@
-package com.example.demo.core.error;
-
-public class NotFoundException extends RuntimeException {
-    public NotFoundException(Long id) {
-        super(String.format("Entity with id [%s] is not found or not exists", id));
-    }
-}

src/main/java/com/example/demo/core/model/BaseEntity.java

@@ -1,20 +0,0 @@
-package com.example.demo.core.model;
-
-public abstract class BaseEntity {
-    protected Long id;
-
-    protected BaseEntity() {
-    }
-
-    protected BaseEntity(Long id) {
-        this.id = id;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-}

src/main/java/com/example/demo/core/repository/CommonRepository.java

@@ -1,17 +0,0 @@
-package com.example.demo.core.repository;
-
-import java.util.List;
-
-public interface CommonRepository<E, T> {
-    List<E> getAll();
-
-    E get(T id);
-
-    E create(E entity);
-
-    E update(E entity);
-
-    E delete(E entity);
-
-    void deleteAll();
-}

src/main/java/com/example/demo/core/repository/MapRepository.java

@@ -1,58 +0,0 @@
-package com.example.demo.core.repository;
-
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-
-import com.example.demo.core.model.BaseEntity;
-
-public abstract class MapRepository<E extends BaseEntity> implements CommonRepository<E, Long> {
-    private final Map<Long, E> entities = new TreeMap<>();
-    private Long lastId = 0L;
-
-    protected MapRepository() {
-    }
-
-    @Override
-    public List<E> getAll() {
-        return entities.values().stream().toList();
-    }
-
-    @Override
-    public E get(Long id) {
-        return entities.get(id);
-    }
-
-    @Override
-    public E create(E entity) {
-        lastId++;
-        entity.setId(lastId);
-        entities.put(lastId, entity);
-        return entity;
-    }
-
-    @Override
-    public E update(E entity) {
-        if (get(entity.getId()) == null) {
-            return null;
-        }
-        entities.put(entity.getId(), entity);
-        return entity;
-    }
-
-    @Override
-    public E delete(E entity) {
-        if (get(entity.getId()) == null) {
-            return null;
-        }
-        entities.remove(entity.getId());
-        return entity;
-    }
-
-    @Override
-    public void deleteAll() {
-        lastId = 0L;
-        entities.clear();
-    }
-}
-

src/main/java/com/example/demo/core/utils/Formatter.java

@@ -1,20 +0,0 @@
-package com.example.demo.core.utils;
-
-import java.util.Date;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-
-public final class Formatter {
-    private Formatter() {
-    }
-
-    private static SimpleDateFormat dateFormatter = new SimpleDateFormat("yyyy-MM-dd");
-
-    public static String format(Date date) {
-        return dateFormatter.format(date);
-    }
-
-    public static Date parse(String date) throws ParseException {
-        return dateFormatter.parse(date);
-    }
-}

src/main/java/com/example/demo/ivents/api/IventController.java

@@ -1,87 +0,0 @@
-package com.example.demo.ivents.api;
-
-import java.time.LocalDate;
-import java.time.format.DateTimeFormatter;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import org.modelmapper.ModelMapper;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.example.demo.ivents.model.IventEntity;
-import com.example.demo.ivents.service.IventService;
-import com.example.demo.core.configuration.Constants;
-import com.example.demo.types.service.TypeService;
-import com.example.demo.places.service.PlaceService;
-
-import jakarta.validation.Valid;
-
-@RestController
-@RequestMapping(Constants.API_URL + "/ivents")
-public class IventController {
-    private final IventService iventService;
-    private final TypeService typeService;
-    private final PlaceService placeService;
-    private final ModelMapper modelMapper;
-
-    public IventController(IventService iventService, TypeService typeService, 
-            PlaceService placeService, ModelMapper modelMapper) {
-        this.iventService = iventService;
-        this.typeService = typeService;
-        this.placeService = placeService;
-        this.modelMapper = modelMapper;
-    }
-
-    private IventDto toDto(IventEntity entity) {
-        return modelMapper.map(entity, IventDto.class);
-    }
-
-    private IventEntity toEntity(IventDto dto) {
-        final IventEntity entity = modelMapper.map(dto, IventEntity.class);
-        entity.setType(typeService.get(dto.getTypeId()));
-        entity.setPlace(placeService.get(dto.getPlaceId()));
-        return entity;
-    }
-
-
-
-    @GetMapping
-    public List<IventDto> getAll( 
-        @RequestParam(name = "typeId", defaultValue = "0") Long typeId,
-        @RequestParam(name = "placeId", defaultValue = "0") Long placeId,
-        @RequestParam(name = "startDate", defaultValue = "0001-01-01") String startDate,
-        @RequestParam(name = "endDate", defaultValue = "9999-12-31") String endDate) {
-            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-        	LocalDate _startDate = LocalDate.parse(startDate, formatter);
-            LocalDate _endDate = LocalDate.parse(endDate, formatter);
-        return iventService.getAll(typeId, placeId, _startDate, _endDate).stream().map(this::toDto).toList();
-    }
-
-    @GetMapping("/{id}")
-    public IventDto get(@PathVariable(name = "id") Long id) {
-        return toDto(iventService.get(id));
-    }
-
-    @PostMapping
-    public IventDto create(@RequestBody @Valid IventDto dto) {
-        return toDto(iventService.create(toEntity(dto)));
-    }
-
-    @PutMapping("/{id}")
-    public IventDto update(@PathVariable(name = "id") Long id, @RequestBody IventDto dto) {
-        return toDto(iventService.update(id, toEntity(dto)));
-    }
-
-    @DeleteMapping("/{id}")
-    public IventDto delete(@PathVariable(name = "id") Long id) {
-        return toDto(iventService.delete(id));
-    }
-}

src/main/java/com/example/demo/ivents/api/IventDto.java

@@ -1,111 +0,0 @@
-package com.example.demo.ivents.api;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import java.time.LocalDate;
-
-import jakarta.validation.constraints.Min;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
-
-public class IventDto {
-    private Long id;
-    @NotBlank
-    private String itName;
-    @NotNull
-    @Min(1)
-    private Long typeId;
-    @NotNull
-    private LocalDate date;
-    @NotBlank
-    private String description;
-    @NotBlank
-    private String other;
-    @NotNull
-    @Min(1)
-    private Double price;
-    @NotNull
-    @Min(1)
-    private Integer count;
-    @NotNull
-    @Min(1)
-    private Long placeId;
-
-    @JsonProperty(access = JsonProperty.Access.READ_ONLY)
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getTypeId() {
-        return typeId;
-    }
-
-    public void setTypeId(Long typeId) {
-        this.typeId = typeId;
-    }
-
-    public String getName() {
-        return itName;
-    }
-
-    public void setName(String itName) {
-        this.itName = itName;
-    }
-
-    public LocalDate getDate() {
-        return date;
-    }
-
-    public void setDate(LocalDate date) {
-        this.date = date;
-    }
-
-    public String getDesc() {
-        return description;
-    }
-
-    public void setDesc(String description) {
-        this.description = description;
-    }
-
-    public String getOther() {
-        return other;
-    }
-
-    public void setOther(String other) {
-        this.other = other;
-    }
-
-    public Double getPrice() {
-        return price;
-    }
-
-    public void setPrice(Double price) {
-        this.price = price;
-    }
-
-    public Integer getCount() {
-        return count;
-    }
-
-    public void setCount(Integer count) {
-        this.count = count;
-    }
-
-    public Long getPlaceId() {
-        return placeId;
-    }
-
-    public void setPLaceId(Long placeId) {
-        this.placeId = placeId;
-    }
-
-    @JsonProperty(access = JsonProperty.Access.READ_ONLY)
-    public Double getSum() {
-        return price * count;
-    }
-}
-

src/main/java/com/example/demo/ivents/model/IventEntity.java

@@ -1,124 +0,0 @@
-package com.example.demo.ivents.model;
-
-import java.util.Objects;
-import java.time.LocalDate;
-
-import com.example.demo.core.model.BaseEntity;
-import com.example.demo.types.model.TypeEntity;
-import com.example.demo.places.model.PlaceEntity;
-
-public class IventEntity extends BaseEntity {
-    private String name;
-    private TypeEntity type;
-    private LocalDate date;
-    private String description;
-    private String other;
-    private Double price;
-    private Integer count;
-    private PlaceEntity place;
-
-    public IventEntity() {
-        super();
-    }
-
-    public IventEntity(Long id, String name, TypeEntity type, LocalDate date, 
-    String description, String other, Double price, Integer count, PlaceEntity place) {
-        super(id);
-        this.name = name;
-        this.type = type;
-        this.date = date;
-        this.description = description;
-        this.other = other;
-        this.price = price;
-        this.count = count;
-        this.place = place;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public TypeEntity getType() {
-        return type;
-    }
-
-    public void setType(TypeEntity type) {
-        this.type = type;
-    }
-
-    public LocalDate getDate() {
-        return date;
-    }
-
-    public void setDate(LocalDate date) {
-        this.date = date;
-    }
-
-    public String getDesc() {
-        return description;
-    }
-
-    public void setDesc(String description) {
-        this.description = description;
-    }
-
-    public String getOther() {
-        return other;
-    }
-
-    public void setOther(String other) {
-        this.other = other;
-    }
-
-    public Double getPrice() {
-        return price;
-    }
-
-    public void setPrice(Double price) {
-        this.price = price;
-    }
-
-    public Integer getCount() {
-        return count;
-    }
-
-    public void setCount(Integer count) {
-        this.count = count;
-    }
-
-    public PlaceEntity getPlace() {
-        return place;
-    }
-
-    public void setPlace(PlaceEntity place) {
-        this.place = place;
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(id, name, type, date, description, other, price, count, place);
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj)
-            return true;
-        if (obj == null || getClass() != obj.getClass())
-            return false;
-        final IventEntity otheren = (IventEntity) obj;
-        return Objects.equals(otheren.getId(), id)
-                && Objects.equals(otheren.getName(), name)
-                && Objects.equals(otheren.getType(), type)
-                && Objects.equals(otheren.getDate(), date)
-                && Objects.equals(otheren.getDesc(), description)
-                && Objects.equals(otheren.getOther(), other)
-                && Objects.equals(otheren.getPrice(), price)
-                && Objects.equals(otheren.getCount(), count)
-                && Objects.equals(otheren.getPlace(), place);
-    }
-}
-

src/main/java/com/example/demo/ivents/repository/IventRepository.java

@@ -1,11 +0,0 @@
-package com.example.demo.ivents.repository;
-
-import org.springframework.stereotype.Repository;
-
-import com.example.demo.core.repository.MapRepository;
-import com.example.demo.ivents.model.IventEntity;
-
-@Repository
-public class IventRepository extends MapRepository<IventEntity> {
-}
-

src/main/java/com/example/demo/ivents/service/IventService.java

@@ -1,91 +0,0 @@
-package com.example.demo.ivents.service;
-
-import java.time.LocalDate;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
-import org.springframework.stereotype.Service;
-
-import com.example.demo.core.error.NotFoundException;
-import com.example.demo.ivents.model.IventEntity;
-import com.example.demo.ivents.repository.IventRepository;
-
-@Service
-public class IventService {
-    private final IventRepository repository;
-
-    public IventService(IventRepository repository) {
-        this.repository = repository;
-    }
-    
-    public List<IventEntity> getAll(Long typeId, Long placeId, LocalDate startDate, LocalDate endDate) {
-        List<IventEntity> result = repository.getAll();
-
-        if (startDate != null || endDate != null) {
-            LocalDate start = Objects.requireNonNullElse(startDate, LocalDate.MIN);
-            LocalDate end = Objects.requireNonNullElse(endDate, LocalDate.now());
-    
-            result = result.stream()
-                    .filter(item -> (startDate == null || item.getDate().isAfter(start.minusDays(1)))
-                            && (endDate == null || item.getDate().isBefore(end.plusDays(1)))
-                    )
-                    .collect(Collectors.toList());
-        }
-
-        if (!Objects.equals(typeId, 0L)){
-            result = result.stream()
-            .filter(item -> item.getType().getId().equals(typeId))
-            .toList();
-        }
-        
-        if (!Objects.equals(placeId, 0L)){
-            result = result.stream()
-            .filter(item -> item.getPlace().getId().equals(placeId))
-            .toList();
-        }
-        return result;
-    }
-
-    public List<IventEntity> getAllDate(LocalDate startDate, LocalDate endDate) {
-        if (startDate == null) {
-            throw new IllegalArgumentException("Дата 'от' должна быть указана");
-        }
-        LocalDate end = Objects.requireNonNullElse(endDate, LocalDate.now());
-        return repository.getAll().stream()
-                .filter(item -> item.getDate().isAfter(startDate.minusDays(1)) && item.getDate().isBefore(end.plusDays(1))) // использование методов isAfter и isBefore для LocalDate
-                .collect(Collectors.toList());
-    }
-
-    public List<IventEntity> getAll() {
-        return repository.getAll();
-    }
-
-    public IventEntity get(Long id) {
-        return Optional.ofNullable(repository.get(id))
-                .orElseThrow(() -> new NotFoundException(id));
-    }
-
-    public IventEntity create(IventEntity entity) {
-        return repository.create(entity);
-    }
-
-    public IventEntity update(Long id, IventEntity entity) {
-        final IventEntity existsEntity = get(id);
-        existsEntity.setName(entity.getName());
-        existsEntity.setType(entity.getType());
-        existsEntity.setDate(entity.getDate());
-        existsEntity.setDesc(entity.getDesc());
-        existsEntity.setOther(entity.getOther());
-        existsEntity.setPrice(entity.getPrice());
-        existsEntity.setCount(entity.getCount());
-        existsEntity.setPlace(entity.getPlace());
-        return repository.update(existsEntity);
-    }
-
-    public IventEntity delete(Long id) {
-        final IventEntity existsEntity = get(id);
-        return repository.delete(existsEntity);
-    }
-}

src/main/java/com/example/demo/places/api/PlaceController.java

@@ -1,65 +0,0 @@
-package com.example.demo.places.api;
-
-import java.util.List;
-
-import org.modelmapper.ModelMapper;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.example.demo.core.configuration.Constants;
-import com.example.demo.places.model.PlaceEntity;
-import com.example.demo.places.service.PlaceService;
-
-import jakarta.validation.Valid;
-
-@RestController
-@RequestMapping(Constants.API_URL + "/place")
-public class PlaceController {
-    private final PlaceService placeService;
-    private final ModelMapper modelMapper;
-
-    public PlaceController(PlaceService placeService, ModelMapper modelMapper) {
-        this.placeService = placeService;
-        this.modelMapper = modelMapper;
-    }
-
-    private PlaceDto toDto(PlaceEntity entity) {
-        return modelMapper.map(entity, PlaceDto.class);
-    }
-
-    private PlaceEntity toEntity(PlaceDto dto) {
-        return modelMapper.map(dto, PlaceEntity.class);
-    }
-
-    @GetMapping
-    public List<PlaceDto> getAll() {
-        return placeService.getAll().stream().map(this::toDto).toList();
-    }
-
-    @GetMapping("/{id}")
-    public PlaceDto get(@PathVariable(name = "id") Long id) {
-        return toDto(placeService.get(id));
-    }
-
-    @PostMapping
-    public PlaceDto create(@RequestBody @Valid PlaceDto dto) {
-        return toDto(placeService.create(toEntity(dto)));
-    }
-
-    @PutMapping("/{id}")
-    public PlaceDto update(@PathVariable(name = "id") Long id, @RequestBody PlaceDto dto) {
-        return toDto(placeService.update(id, toEntity(dto)));
-    }
-
-    @DeleteMapping("/{id}")
-    public PlaceDto delete(@PathVariable(name = "id") Long id) {
-        return toDto(placeService.delete(id));
-    }
-}
-

src/main/java/com/example/demo/places/api/PlaceDto.java

@@ -1,29 +0,0 @@
-package com.example.demo.places.api;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import jakarta.validation.constraints.NotBlank;
-
-public class PlaceDto {
-    private Long id;
-    @NotBlank
-    private String name;
-
-    @JsonProperty(access = JsonProperty.Access.READ_ONLY)
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-}
-

src/main/java/com/example/demo/places/model/PlaceEntity.java

@@ -1,44 +0,0 @@
-package com.example.demo.places.model;
-
-import java.util.Objects;
-
-import com.example.demo.core.model.BaseEntity;
-
-public class PlaceEntity extends BaseEntity {
-    private String name;
-
-    public PlaceEntity() {
-        super();
-    }
-
-    public PlaceEntity(Long id, String name) {
-        super(id);
-        this.name = name;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(id, name);
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj)
-            return true;
-        if (obj == null || getClass() != obj.getClass())
-            return false;
-        final PlaceEntity other = (PlaceEntity) obj;
-        return Objects.equals(other.getId(), id)
-                && Objects.equals(other.getName(), name);
-    }
-
-}
-

src/main/java/com/example/demo/places/repository/PlaceRepository.java

@@ -1,11 +0,0 @@
-package com.example.demo.places.repository;
-
-import org.springframework.stereotype.Repository;
-
-import com.example.demo.core.repository.MapRepository;
-import com.example.demo.places.model.PlaceEntity;
-
-@Repository
-public class PlaceRepository extends MapRepository<PlaceEntity> {
-}
-

src/main/java/com/example/demo/places/service/PlaceService.java

@@ -1,44 +0,0 @@
-package com.example.demo.places.service;
-
-import java.util.List;
-import java.util.Optional;
-
-import org.springframework.stereotype.Service;
-
-import com.example.demo.core.error.NotFoundException;
-import com.example.demo.places.model.PlaceEntity;
-import com.example.demo.places.repository.PlaceRepository;
-
-@Service
-public class PlaceService {
-    private final PlaceRepository repository;
-
-    public PlaceService(PlaceRepository repository) {
-        this.repository = repository;
-    }
-
-    public List<PlaceEntity> getAll() {
-        return repository.getAll();
-    }
-
-    public PlaceEntity get(Long id) {
-        return Optional.ofNullable(repository.get(id))
-                .orElseThrow(() -> new NotFoundException(id));
-    }
-
-    public PlaceEntity create(PlaceEntity entity) {
-        return repository.create(entity);
-    }
-
-    public PlaceEntity update(Long id, PlaceEntity entity) {
-        final PlaceEntity existsEntity = get(id);
-        existsEntity.setName(entity.getName());
-        return repository.update(existsEntity);
-    }
-
-    public PlaceEntity delete(Long id) {
-        final PlaceEntity existsEntity = get(id);
-        return repository.delete(existsEntity);
-    }
-}
-

src/main/java/com/example/demo/types/api/TypeController.java

@@ -1,65 +0,0 @@
-package com.example.demo.types.api;
-
-import java.util.List;
-
-import org.modelmapper.ModelMapper;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.example.demo.core.configuration.Constants;
-import com.example.demo.types.model.TypeEntity;
-import com.example.demo.types.service.TypeService;
-
-import jakarta.validation.Valid;
-
-@RestController
-@RequestMapping(Constants.API_URL + "/type")
-public class TypeController {
-    private final TypeService typeService;
-    private final ModelMapper modelMapper;
-
-    public TypeController(TypeService typeService, ModelMapper modelMapper) {
-        this.typeService = typeService;
-        this.modelMapper = modelMapper;
-    }
-
-    private TypeDto toDto(TypeEntity entity) {
-        return modelMapper.map(entity, TypeDto.class);
-    }
-
-    private TypeEntity toEntity(TypeDto dto) {
-        return modelMapper.map(dto, TypeEntity.class);
-    }
-
-    @GetMapping
-    public List<TypeDto> getAll() {
-        return typeService.getAll().stream().map(this::toDto).toList();
-    }
-
-    @GetMapping("/{id}")
-    public TypeDto get(@PathVariable(name = "id") Long id) {
-        return toDto(typeService.get(id));
-    }
-
-    @PostMapping
-    public TypeDto create(@RequestBody @Valid TypeDto dto) {
-        return toDto(typeService.create(toEntity(dto)));
-    }
-
-    @PutMapping("/{id}")
-    public TypeDto update(@PathVariable(name = "id") Long id, @RequestBody TypeDto dto) {
-        return toDto(typeService.update(id, toEntity(dto)));
-    }
-
-    @DeleteMapping("/{id}")
-    public TypeDto delete(@PathVariable(name = "id") Long id) {
-        return toDto(typeService.delete(id));
-    }
-}
-

src/main/java/com/example/demo/types/api/TypeDto.java

@@ -1,29 +0,0 @@
-package com.example.demo.types.api;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import jakarta.validation.constraints.NotBlank;
-
-public class TypeDto {
-    private Long id;
-    @NotBlank
-    private String name;
-
-    @JsonProperty(access = JsonProperty.Access.READ_ONLY)
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-}
-

src/main/java/com/example/demo/types/model/TypeEntity.java

@@ -1,44 +0,0 @@
-package com.example.demo.types.model;
-
-import java.util.Objects;
-
-import com.example.demo.core.model.BaseEntity;
-
-public class TypeEntity extends BaseEntity {
-    private String name;
-
-    public TypeEntity() {
-        super();
-    }
-
-    public TypeEntity(Long id, String name) {
-        super(id);
-        this.name = name;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(id, name);
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj)
-            return true;
-        if (obj == null || getClass() != obj.getClass())
-            return false;
-        final TypeEntity other = (TypeEntity) obj;
-        return Objects.equals(other.getId(), id)
-                && Objects.equals(other.getName(), name);
-    }
-
-}
-

src/main/java/com/example/demo/types/repository/TypeRepository.java

@@ -1,11 +0,0 @@
-package com.example.demo.types.repository;
-
-import org.springframework.stereotype.Repository;
-
-import com.example.demo.core.repository.MapRepository;
-import com.example.demo.types.model.TypeEntity;
-
-@Repository
-public class TypeRepository extends MapRepository<TypeEntity> {
-}
-

src/main/java/com/example/demo/types/service/TypeService.java

@@ -1,44 +0,0 @@
-package com.example.demo.types.service;
-
-import java.util.List;
-import java.util.Optional;
-
-import org.springframework.stereotype.Service;
-
-import com.example.demo.core.error.NotFoundException;
-import com.example.demo.types.model.TypeEntity;
-import com.example.demo.types.repository.TypeRepository;
-
-@Service
-public class TypeService {
-    private final TypeRepository repository;
-
-    public TypeService(TypeRepository repository) {
-        this.repository = repository;
-    }
-
-    public List<TypeEntity> getAll() {
-        return repository.getAll();
-    }
-
-    public TypeEntity get(Long id) {
-        return Optional.ofNullable(repository.get(id))
-                .orElseThrow(() -> new NotFoundException(id));
-    }
-
-    public TypeEntity create(TypeEntity entity) {
-        return repository.create(entity);
-    }
-
-    public TypeEntity update(Long id, TypeEntity entity) {
-        final TypeEntity existsEntity = get(id);
-        existsEntity.setName(entity.getName());
-        return repository.update(existsEntity);
-    }
-
-    public TypeEntity delete(Long id) {
-        final TypeEntity existsEntity = get(id);
-        return repository.delete(existsEntity);
-    }
-}
-

src/main/java/com/example/demo/users/api/UserController.java

@@ -1,64 +0,0 @@
-package com.example.demo.users.api;
-
-import java.util.List;
-
-import org.modelmapper.ModelMapper;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.example.demo.core.configuration.Constants;
-import com.example.demo.users.model.UserEntity;
-import com.example.demo.users.service.UserService;
-
-import jakarta.validation.Valid;
-
-@RestController
-@RequestMapping(Constants.API_URL + "/user")
-public class UserController {
-    private final UserService userService;
-    private final ModelMapper modelMapper;
-
-    public UserController(UserService userService, ModelMapper modelMapper) {
-        this.userService = userService;
-        this.modelMapper = modelMapper;
-    }
-
-    private UserDto toDto(UserEntity entity) {
-        return modelMapper.map(entity, UserDto.class);
-    }
-
-    private UserEntity toEntity(UserDto dto) {
-        return modelMapper.map(dto, UserEntity.class);
-    }
-
-    @GetMapping
-    public List<UserDto> getAll() {
-        return userService.getAll().stream().map(this::toDto).toList();
-    }
-
-    @GetMapping("/{id}")
-    public UserDto get(@PathVariable(name = "id") Long id) {
-        return toDto(userService.get(id));
-    }
-
-    @PostMapping
-    public UserDto create(@RequestBody @Valid UserDto dto) {
-        return toDto(userService.create(toEntity(dto)));
-    }
-
-    @PutMapping("/{id}")
-    public UserDto update(@PathVariable(name = "id") Long id, @RequestBody UserDto dto) {
-        return toDto(userService.update(id, toEntity(dto)));
-    }
-
-    @DeleteMapping("/{id}")
-    public UserDto delete(@PathVariable(name = "id") Long id) {
-        return toDto(userService.delete(id));
-    }
-}

src/main/java/com/example/demo/users/api/UserDto.java

@@ -1,49 +0,0 @@
-package com.example.demo.users.api;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import jakarta.validation.constraints.NotBlank;
-
-public class UserDto {
-    private Long id;
-    @NotBlank
-    private String handle;
-    @NotBlank
-    private String email;
-    @NotBlank
-    private String password;
-
-    @JsonProperty(access = JsonProperty.Access.READ_ONLY)
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getHandle() {
-        return handle;
-    }
-
-    public void setHandle(String handle) {
-        this.handle = handle;
-    }
-
-    public String getEmail() {
-        return email;
-    }
-
-    public void setEmail(String email) {
-        this.email = email;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-}
-

src/main/java/com/example/demo/users/model/UserEntity.java

@@ -1,66 +0,0 @@
-package com.example.demo.users.model;
-
-import java.util.Objects;
-
-import com.example.demo.core.model.BaseEntity;
-
-public class UserEntity extends BaseEntity {
-    private String handle;
-    private String email;
-    private String password;
-
-    public UserEntity() {
-        super();
-    }
-
-    public UserEntity(Long id, String handle, String email, String password) {
-        super(id);
-        this.handle = handle;
-        this.email = email;
-        this.password = password;
-    }
-
-    public String getHandle() {
-        return handle;
-    }
-
-    public void setHandle(String handle) {
-        this.handle = handle;
-    }
-
-    public String getEmail() {
-        return email;
-    }
-
-    public void setEmail(String email) {
-        this.email = email;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(id, handle, email, password);
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj)
-            return true;
-        if (obj == null || getClass() != obj.getClass())
-            return false;
-        final UserEntity other = (UserEntity) obj;
-        return Objects.equals(other.getId(), id)
-                && Objects.equals(other.getHandle(), handle)
-                && Objects.equals(other.getEmail(), email)
-                && Objects.equals(other.getPassword(), password);
-    }
-
-}
-

src/main/java/com/example/demo/users/repository/UserRepository.java

@@ -1,11 +0,0 @@
-package com.example.demo.users.repository;
-
-import org.springframework.stereotype.Repository;
-
-import com.example.demo.core.repository.MapRepository;
-import com.example.demo.users.model.UserEntity;
-
-@Repository
-public class UserRepository extends MapRepository<UserEntity> {
-}
-

src/main/java/com/example/demo/users/service/UserService.java

@@ -1,44 +0,0 @@
-package com.example.demo.users.service;
-
-import java.util.List;
-import java.util.Optional;
-
-import org.springframework.stereotype.Service;
-
-import com.example.demo.core.error.NotFoundException;
-import com.example.demo.users.model.UserEntity;
-import com.example.demo.users.repository.UserRepository;
-
-@Service
-public class UserService {
-    private final UserRepository repository;
-
-    public UserService(UserRepository repository) {
-        this.repository = repository;
-    }
-
-    public List<UserEntity> getAll() {
-        return repository.getAll();
-    }
-
-    public UserEntity get(Long id) {
-        return Optional.ofNullable(repository.get(id))
-                .orElseThrow(() -> new NotFoundException(id));
-    }
-
-    public UserEntity create(UserEntity entity) {
-        return repository.create(entity);
-    }
-
-    public UserEntity update(Long id, UserEntity entity) {
-        final UserEntity existsEntity = get(id);
-        existsEntity.setHandle(entity.getHandle());
-        return repository.update(existsEntity);
-    }
-
-    public UserEntity delete(Long id) {
-        final UserEntity existsEntity = get(id);
-        return repository.delete(existsEntity);
-    }
-}
-

src/main/resources/application.properties

@@ -1,2 +0,0 @@
-spring.application.name=demo
-server.port=8081

src/test/java/com/example/demo/IventServiceTests.java

@@ -1,143 +0,0 @@
-package com.example.demo;
-
-import java.time.LocalDate;
-import java.util.List;
-
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.MethodOrderer.OrderAnnotation;
-import org.junit.jupiter.api.Order;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestMethodOrder;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-
-import com.example.demo.ivents.model.IventEntity;
-import com.example.demo.ivents.service.IventService;
-import com.example.demo.types.model.TypeEntity;
-import com.example.demo.types.service.TypeService;
-import com.example.demo.places.model.PlaceEntity;
-import com.example.demo.places.service.PlaceService;
-import com.example.demo.core.error.NotFoundException;
-
-@SpringBootTest
-@TestMethodOrder(OrderAnnotation.class)
-class IventServiceTests {
-    @Autowired
-    private TypeService typeService;
-
-    @Autowired
-    private PlaceService placeService;
-
-    @Autowired
-    private IventService iventService;
-
-    @Test
-    void getTest() {
-        Assertions.assertThrows(NotFoundException.class, () -> iventService.get(0L));
-    }
-
-    @Test
-    @Order(1)
-    void createTest() {
-        final TypeEntity type = typeService.create(new TypeEntity(null, "Концерт"));
-        final PlaceEntity place = placeService.create(new PlaceEntity(null, "USA, California"));
-
-        iventService.create(new IventEntity(
-            null, 
-            "Slipknot", 
-            type,  
-            LocalDate.of(2023, 10, 15), 
-            "Slipknot - американская ню-метал группа, основанная в 1995 году. Они известны своим агрессивным звучанием, смешением хардкор-панк и тяжелого метала с индастриалом и элементами альтернативного рока.",
-            "Участники группы Slipknot - это:<....>", 
-            2500.33, 
-            30, 
-            place));
-        iventService.create(new IventEntity(
-            null, 
-            "Placebo", 
-            type,  
-            LocalDate.of(2024, 2, 13), 
-            "Placebo - британская альтернативная рок-группа, основанная в 1994 году. Они известны своим уникальным звучанием, погружающим слушателей в меланхоличную атмосферу и наполняющим музыку эмоциональным содержанием.",
-            "Группа Placebo состояла из следующих участников:<....>", 
-            2500.33, 
-            30, 
-            place));
-        final IventEntity last = iventService.create(new IventEntity(
-            null, 
-            "Radiohead", 
-            type,  
-            LocalDate.of(2024, 2, 15), 
-            "Radiohead - британская рок-группа, образованная в 1985 году.",
-            "Участниками Radiohead являются:<....>", 
-            2500.33, 
-            30, 
-            place));
-        Assertions.assertEquals(3, iventService.getAll().size());
-        Assertions.assertEquals(last, iventService.get(3L));
-    }
-
-    @Test
-    @Order(2)
-    void sortDates() {
-        LocalDate start = LocalDate.of(2024, 1, 15);
-        LocalDate end = LocalDate.of(2024, 5, 15);
-
-        List<IventEntity> list = iventService.getAll(0L, 0L, start, end);
-
-        Assertions.assertEquals(2, list.size());
-    }
-
-    @Test
-    @Order(3)
-    void updateTest() {
-        final TypeEntity type = typeService.create(new TypeEntity(null, "Кино"));
-        final PlaceEntity place = placeService.create(new PlaceEntity(null, "Germany, Berlin"));
-        final String test = "TEST";
-        final IventEntity entity = iventService.get(3L);
-        final TypeEntity oldType = entity.getType();
-        final PlaceEntity oldPlace = entity.getPlace();
-        final String oldName = entity.getName();
-        final IventEntity newEntity = iventService.update(3L, new IventEntity(
-            null, 
-            test, 
-            type,  
-            LocalDate.of(2023, 10, 15), 
-            "Radiohead - британская рок-группа, образованная в 1985 году.",
-            "Участниками Radiohead являются:<....>", 
-            2500.33, 
-            30, 
-            place));
-        Assertions.assertEquals(3, iventService.getAll().size());
-        Assertions.assertEquals(newEntity, iventService.get(3L));
-        Assertions.assertEquals(test, newEntity.getName());
-        Assertions.assertEquals(type, newEntity.getType());
-        Assertions.assertEquals(place, newEntity.getPlace());
-        Assertions.assertNotEquals(oldName, newEntity.getName());
-        Assertions.assertNotEquals(oldType, newEntity.getType());
-        Assertions.assertNotEquals(oldPlace, newEntity.getPlace());
-    }
-
-    @Test
-    @Order(4)
-    void deleteTest() {
-        iventService.delete(3L);
-        Assertions.assertEquals(2, iventService.getAll().size());
-        final IventEntity last = iventService.get(2L);
-        Assertions.assertEquals(2L, last.getId());
-
-        final TypeEntity type = typeService.create(new TypeEntity(null, "Концерт"));
-        final PlaceEntity place = placeService.create(new PlaceEntity(null, "USA, California"));
-        final IventEntity newEntity = iventService.create(new IventEntity(
-            null, 
-            "Deftones", 
-            type,  
-            LocalDate.of(2023, 10, 15), 
-            "Deftones - американская альтернативная метал-группа, сформированная в 1988 году. ",
-            "Участники Deftones:<....>", 
-            2550.33, 
-            25, 
-            place));
-        Assertions.assertEquals(3, iventService.getAll().size());
-        Assertions.assertEquals(4L, newEntity.getId());
-    }
-}

src/test/java/com/example/demo/PlaceServiceTests.java

@@ -1,62 +0,0 @@
-package com.example.demo;
-
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.MethodOrderer.OrderAnnotation;
-import org.junit.jupiter.api.Order;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestMethodOrder;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-
-import com.example.demo.places.model.PlaceEntity;
-import com.example.demo.places.service.PlaceService;
-import com.example.demo.core.error.NotFoundException;
-
-@SpringBootTest
-@TestMethodOrder(OrderAnnotation.class)
-class PlaceServiceTests {
-	@Autowired
-	private PlaceService placeService;
-
-	@Test
-	void getTest() {
-		Assertions.assertThrows(NotFoundException.class, () -> placeService.get(0L));
-	}
-
-	@Test
-	@Order(1)
-	void createTest() {
-		placeService.create(new PlaceEntity(null, "USA, California"));
-		placeService.create(new PlaceEntity(null, "Germany, Berlin"));
-		final PlaceEntity last = placeService.create(new PlaceEntity(null, "UK, London"));
-		Assertions.assertEquals(3, placeService.getAll().size());
-		Assertions.assertEquals(last, placeService.get(3L));
-	}
-
-	@Test
-	@Order(2)
-	void updateTest() {
-		final String test = "TEST";
-		final PlaceEntity entity = placeService.get(3L);
-		final String oldName = entity.getName();
-		final PlaceEntity newEntity = placeService.update(3L, new PlaceEntity(1L, test));
-		Assertions.assertEquals(3, placeService.getAll().size());
-		Assertions.assertEquals(newEntity, placeService.get(3L));
-		Assertions.assertEquals(test, newEntity.getName());
-		Assertions.assertNotEquals(oldName, newEntity.getName());
-	}
-
-	@Test
-	@Order(3)
-	void deleteTest() {
-		placeService.delete(3L);
-		Assertions.assertEquals(2, placeService.getAll().size());
-		final PlaceEntity last = placeService.get(2L);
-		Assertions.assertEquals(2L, last.getId());
-
-		final PlaceEntity newEntity = placeService.create(new PlaceEntity(null, "UK, London"));
-		Assertions.assertEquals(3, placeService.getAll().size());
-		Assertions.assertEquals(4L, newEntity.getId());
-	}
-}
-

src/test/java/com/example/demo/TypeServiceTests.java

@@ -1,61 +0,0 @@
-package com.example.demo;
-
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.MethodOrderer.OrderAnnotation;
-import org.junit.jupiter.api.Order;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestMethodOrder;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-
-import com.example.demo.types.model.TypeEntity;
-import com.example.demo.types.service.TypeService;
-import com.example.demo.core.error.NotFoundException;
-
-@SpringBootTest
-@TestMethodOrder(OrderAnnotation.class)
-class TypeServiceTests {
-	@Autowired
-	private TypeService typeService;
-
-	@Test
-	void getTest() {
-		Assertions.assertThrows(NotFoundException.class, () -> typeService.get(0L));
-	}
-
-	@Test
-	@Order(1)
-	void createTest() {
-		typeService.create(new TypeEntity(null, "Кино"));
-		typeService.create(new TypeEntity(null, "Концерт"));
-		final TypeEntity last = typeService.create(new TypeEntity(null, "Театр"));
-		Assertions.assertEquals(3, typeService.getAll().size());
-		Assertions.assertEquals(last, typeService.get(3L));
-	}
-
-	@Test
-	@Order(2)
-	void updateTest() {
-		final String test = "TEST";
-		final TypeEntity entity = typeService.get(3L);
-		final String oldName = entity.getName();
-		final TypeEntity newEntity = typeService.update(3L, new TypeEntity(1L, test));
-		Assertions.assertEquals(3, typeService.getAll().size());
-		Assertions.assertEquals(newEntity, typeService.get(3L));
-		Assertions.assertEquals(test, newEntity.getName());
-		Assertions.assertNotEquals(oldName, newEntity.getName());
-	}
-
-	@Test
-	@Order(3)
-	void deleteTest() {
-		typeService.delete(3L);
-		Assertions.assertEquals(2, typeService.getAll().size());
-		final TypeEntity last = typeService.get(2L);
-		Assertions.assertEquals(2L, last.getId());
-
-		final TypeEntity newEntity = typeService.create(new TypeEntity(null, "Театр"));
-		Assertions.assertEquals(3, typeService.getAll().size());
-		Assertions.assertEquals(4L, newEntity.getId());
-	}
-}

src/test/java/com/example/demo/UserServiceTests.java

@@ -1,62 +0,0 @@
-package com.example.demo;
-
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.MethodOrderer.OrderAnnotation;
-import org.junit.jupiter.api.Order;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestMethodOrder;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-
-import com.example.demo.users.model.UserEntity;
-import com.example.demo.users.service.UserService;
-import com.example.demo.core.error.NotFoundException;
-
-@SpringBootTest
-@TestMethodOrder(OrderAnnotation.class)
-class UserServiceTests {
-    @Autowired
-    private UserService userService;
-
-    @Test
-    void getTest() {
-        Assertions.assertThrows(NotFoundException.class, () -> userService.get(0L));
-    }
-
-    @Test
-    @Order(1)
-    void createTest() {
-        userService.create(new UserEntity(null, "Admin", "admin@gmail.com", "admin"));
-        userService.create(new UserEntity(null, "Milana", "milana@gmail.com", "milana"));
-        final UserEntity last = userService.create(new UserEntity(null, "TestUser", "user@gmail.com", "test"));
-        Assertions.assertEquals(3, userService.getAll().size());
-        Assertions.assertEquals(last, userService.get(3L));
-    }
-
-    @Test
-    @Order(2)
-    void updateTest() {
-        final String test = "TEST";
-        final UserEntity entity = userService.get(3L);
-        final String oldName = entity.getHandle();
-        final UserEntity newEntity = userService.update(3L, new UserEntity(1L, test, "user@gmail.com", "test"));
-        Assertions.assertEquals(3, userService.getAll().size());
-        Assertions.assertEquals(newEntity, userService.get(3L));
-        Assertions.assertEquals(test, newEntity.getHandle());
-        Assertions.assertNotEquals(oldName, newEntity.getHandle());
-    }
-
-    @Test
-    @Order(3)
-    void deleteTest() {
-        userService.delete(3L);
-        Assertions.assertEquals(2, userService.getAll().size());
-        final UserEntity last = userService.get(2L);
-        Assertions.assertEquals(2L, last.getId());
-
-        final UserEntity newEntity = userService.create(new UserEntity(null, "TestUser", "user@gmail.com", "test"));
-        Assertions.assertEquals(3, userService.getAll().size());
-        Assertions.assertEquals(4L, newEntity.getId());
-    }
-}
-