лаб2сем2/demo — копия(лаб2)/.vscode/launch.json

@@ -1,14 +0,0 @@
-{
-    "configurations": [
-        {
-            "type": "java",
-            "name": "Spring Boot-DemoApplication<demo>",
-            "request": "launch",
-            "cwd": "${workspaceFolder}",
-            "mainClass": "com.example.demo.DemoApplication",
-            "projectName": "demo",
-            "args": "",
-            "envFile": "${workspaceFolder}/.env"
-        }
-    ]
-}

лаб2сем2/demo — копия(лаб2)/.vscode/settings.json

@@ -1,3 +0,0 @@
-{
-    "java.dependency.packagePresentation": "hierarchical"
-}

лаб2сем2/demo — копия(лаб2)/demo/.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/

лаб2сем2/demo — копия(лаб2)/demo/build.gradle

@@ -1,27 +0,0 @@
-plugins {
-	id 'java'
-	id 'org.springframework.boot' version '3.2.2'
-	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'
-	testImplementation 'org.springframework.boot:spring-boot-starter-test'
-	implementation 'org.modelmapper:modelmapper:3.2.0'
-}
-
-tasks.named('test') {
-	useJUnitPlatform()
-}

лаб2сем2/demo — копия(лаб2)/demo/gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +0,0 @@
-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

лаб2сем2/demo — копия(лаб2)/demo/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" "$@"

лаб2сем2/demo — копия(лаб2)/demo/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.
-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

лаб2сем2/demo — копия(лаб2)/demo/settings.gradle

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

лаб2сем2/demo — копия(лаб2)/demo/src/main/java/com/example/demo/DemoApplication.java

@@ -1,13 +0,0 @@
-package com.example.demo;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-@SpringBootApplication
-public class DemoApplication {
-
-	public static void main(String[] args) {
-		SpringApplication.run(DemoApplication.class, args);
-	}
-
-}

лаб2сем2/demo — копия(лаб2)/demo/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() {
-    }
-}

лаб2сем2/demo — копия(лаб2)/demo/src/main/java/com/example/demo/core/configuration/MapperConfiguration.java

@@ -1,13 +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();
-    }
-}

лаб2сем2/demo — копия(лаб2)/demo/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");
-    }
-}

лаб2сем2/demo — копия(лаб2)/demo/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));
-    }
-}

лаб2сем2/demo — копия(лаб2)/demo/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;
-    }
-}

лаб2сем2/demo — копия(лаб2)/demo/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();
-}

лаб2сем2/demo — копия(лаб2)/demo/src/main/java/com/example/demo/core/repository/MapRepository.java

@@ -1,57 +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();
-    }
-}

лаб2сем2/demo — копия(лаб2)/demo/src/main/java/com/example/demo/core/utils/Formatter.java

@@ -1,19 +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 final 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);
-    }
-}

лаб2сем2/demo — копия(лаб2)/demo/src/main/java/com/example/demo/items/api/ItemController.java

@@ -1,74 +0,0 @@
-package com.example.demo.items.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.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.example.demo.core.configuration.Constants;
-import com.example.demo.items.model.ItemEntity;
-import com.example.demo.items.service.ItemService;
-import com.example.demo.types.service.TypeService;
-import com.example.demo.sizes.service.SizeService;
-
-import jakarta.validation.Valid;
-
-@RestController
-@RequestMapping(Constants.API_URL + "/item")
-
-public class ItemController {
-    private final ItemService itemService;
-    private final TypeService typeService;
-    private final SizeService sizeService;
-    private final ModelMapper modelMapper;
-
-    public ItemController(ItemService itemService, TypeService typeService, SizeService sizeService, ModelMapper modelMapper) {
-        this.itemService = itemService;
-        this.typeService = typeService;
-        this.sizeService = sizeService;
-        this.modelMapper = modelMapper;
-    }
-
-    private ItemDto toDto(ItemEntity entity) {
-        return modelMapper.map(entity, ItemDto.class);
-    }
-
-    private ItemEntity toEntity(ItemDto dto) {
-        final ItemEntity entity = modelMapper.map(dto, ItemEntity.class);
-        entity.setType(typeService.get(dto.getTypeId()));
-        entity.setSize(sizeService.get(dto.getSizeId()));
-        return entity;
-    }
-
-    @GetMapping
-    public List<ItemDto> getAll(@RequestParam(name = "typeId", defaultValue = "0") Long typeId, @RequestParam(name = "sizeId", defaultValue = "0") Long sizeId) {
-        return itemService.getAll(typeId, sizeId).stream().map(this::toDto).toList();
-    }
-
-    @GetMapping("/{id}")
-    public ItemDto get(@PathVariable(name = "id") Long id) {
-        return toDto(itemService.get(id));
-    }
-
-    @PostMapping
-    public ItemDto create(@RequestBody @Valid ItemDto dto) {
-        return toDto(itemService.create(toEntity(dto)));
-    }
-
-    @PutMapping("/{id}")
-    public ItemDto update(@PathVariable(name = "id") Long id, @RequestBody ItemDto dto) {
-        return toDto(itemService.update(id, toEntity(dto)));
-    }
-
-    @DeleteMapping("/{id}")
-    public ItemDto delete(@PathVariable(name = "id") Long id) {
-        return toDto(itemService.delete(id));
-    }
-}

лаб2сем2/demo — копия(лаб2)/demo/src/main/java/com/example/demo/items/api/ItemDto.java

@@ -1,70 +0,0 @@
-package com.example.demo.items.api;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import jakarta.validation.constraints.Min;
-import jakarta.validation.constraints.NotNull;
-
-public class ItemDto {
-    private Long id;
-    @NotNull
-    @Min(1)
-    private Long typeId;
-    @NotNull
-    @Min(1)
-    private Long sizeId;
-    @NotNull
-    @Min(1)
-    private Double price;
-    @NotNull
-    private String nameItem;
-    @NotNull
-    private String image;
-
-    @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 Long getSizeId() {
-        return sizeId;
-    }
-
-    public void setSizeId(Long sizeId) {
-        this.sizeId = sizeId;
-    }
-
-    public Double getPrice() {
-        return price;
-    }
-
-    public void setPrice(Double price) {
-        this.price = price;
-    }
-
-    public String getNameItem() {
-        return nameItem;
-    }
-
-    public void setNameItem(String nameItem) {
-        this.nameItem = nameItem;
-    }
-    public String getImage() {
-        return image;
-    }
-
-    public void setImage(String image) {
-        this.image = image;
-    }
-
-}

лаб2сем2/demo — копия(лаб2)/demo/src/main/java/com/example/demo/items/model/ItemEntity.java

@@ -1,90 +0,0 @@
-package com.example.demo.items.model;
-import java.util.Objects;
-
-import com.example.demo.core.model.BaseEntity;
-import com.example.demo.types.model.TypeEntity;
-
-import jakarta.validation.constraints.Size;
-
-import com.example.demo.sizes.model.SizeEntity;
-
-public class ItemEntity extends BaseEntity {
-    private TypeEntity type;
-    private SizeEntity size;
-    private Double price;
-    private String nameItem;
-    private String image;
-
-    public ItemEntity() {
-        super();
-    }
-
-    public ItemEntity(Long id, TypeEntity type, SizeEntity size, Double price, String nameItem, String image) {
-        super(id);
-        this.type = type;
-        this.size = size;
-        this.price = price;
-        this.nameItem = nameItem;
-        this.image = image;
-    }
-
-    public TypeEntity getType() {
-        return type;
-    }
-
-    public void setType(TypeEntity type) {
-        this.type = type;
-    }
-
-    public SizeEntity getSize() {
-        return size;
-    }
-
-    public void setSize(SizeEntity size) {
-        this.size = size;
-    } 
-
-    public Double getPrice() {
-        return price;
-    }
-
-    public void setPrice(Double price) {
-        this.price = price;
-    }
-
-    public String getNameItem() {
-        return nameItem;
-    }
-
-    public void setNameItem(String nameItem) {
-        this.nameItem = nameItem;
-    }
-
-    public String getImage() {
-        return image;
-    }
-
-    public void setImage(String image) {
-        this.image = image;
-    } 
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(id, type, size, price, nameItem, image);
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj)
-            return true;
-        if (obj == null || getClass() != obj.getClass())
-            return false;
-        final ItemEntity other = (ItemEntity) obj;
-        return Objects.equals(other.getId(), id)
-                && Objects.equals(other.getType(), type)
-                && Objects.equals(other.getSize(), size)
-                && Objects.equals(other.getPrice(), price)
-                && Objects.equals(other.getNameItem(), nameItem)
-                && Objects.equals(other.getImage(), image);
-    }
-}

лаб2сем2/demo — копия(лаб2)/demo/src/main/java/com/example/demo/items/repository/ItemRepository.java

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

лаб2сем2/demo — копия(лаб2)/demo/src/main/java/com/example/demo/items/service/ItemService.java

@@ -1,52 +0,0 @@
-package com.example.demo.items.service;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-
-import org.springframework.stereotype.Service;
-
-import com.example.demo.core.error.NotFoundException;
-import com.example.demo.items.model.ItemEntity;
-import com.example.demo.items.repository.ItemRepository;
-
-@Service
-public class ItemService {
-    private final ItemRepository repository;
-
-    public ItemService(ItemRepository repository) {
-        this.repository = repository;
-    }
-
-    public List<ItemEntity> getAll(Long typeId, Long sizeId) {
-        if (Objects.equals(typeId, 0L) && Objects.equals(sizeId, 0L)) {
-            return repository.getAll();
-        }
-        return repository.getAll().stream()
-                .filter(item ->item.getType().getId().equals(typeId) && item.getSize().getId().equals(sizeId))
-                .toList();
-    }
-
-    public ItemEntity get(Long id) {
-        return Optional.ofNullable(repository.get(id))
-                .orElseThrow(() -> new NotFoundException(id));
-    }
-
-    public ItemEntity create(ItemEntity entity) {
-        return repository.create(entity);
-    }
-
-    public ItemEntity update(Long id, ItemEntity entity) {
-        final ItemEntity existsEntity = get(id);
-        existsEntity.setType(entity.getType());
-        existsEntity.setSize(entity.getSize());
-        existsEntity.setPrice(entity.getPrice());
-        existsEntity.setNameItem(entity.getNameItem());
-        existsEntity.setImage(entity.getImage());
-        return repository.update(existsEntity);
-    }
-
-    public ItemEntity delete(Long id) {
-        final ItemEntity existsEntity = get(id);
-        return repository.delete(existsEntity);
-    }
-}

лаб2сем2/demo — копия(лаб2)/demo/src/main/java/com/example/demo/orders/api/OrderController.java

@@ -1,75 +0,0 @@
-package com.example.demo.orders.api;
-import java.util.List;
-import java.text.ParseException;
-
-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.core.configuration.Constants;
-import com.example.demo.orders.model.OrderEntity;
-import com.example.demo.orders.service.OrderService;
-import com.example.demo.items.service.ItemService;
-import com.example.demo.core.utils.Formatter;
-
-import jakarta.validation.Valid;
-
-@RestController
-@RequestMapping(Constants.API_URL + "/order")
-
-public class OrderController {
-    private final OrderService orderService;
-    private final ItemService itemService;
-    private final ModelMapper modelMapper;
-
-    public OrderController(OrderService orderService, ItemService itemService, ModelMapper modelMapper) {
-        this.orderService = orderService;
-        this.itemService = itemService;
-        this.modelMapper = modelMapper;
-    }
-
-    private OrderDto toDto(OrderEntity entity) {
-        OrderDto dto = modelMapper.map(entity, OrderDto.class);
-        dto.setDate(Formatter.format(entity.getDate()));
-        return dto;
-    }
-
-    private OrderEntity toEntity(OrderDto dto)  throws ParseException {
-        final OrderEntity entity = modelMapper.map(dto, OrderEntity.class);
-        entity.setItem(itemService.get(dto.getItemId()));
-        entity.setDate(Formatter.parse(dto.getDate()));
-        return entity;
-    }
-
-    @GetMapping
-    public List<OrderDto> getAll(@RequestParam(name = "itemId", defaultValue = "0") Long itemId) {
-        return orderService.getAll(itemId).stream().map(this::toDto).toList();
-    }
-
-    @GetMapping("/{id}")
-    public OrderDto get(@PathVariable(name = "id") Long id) {
-        return toDto(orderService.get(id));
-    }
-
-    @PostMapping
-    public OrderDto create(@RequestBody @Valid OrderDto dto) throws ParseException{
-        return toDto(orderService.create(toEntity(dto)));
-    }
-
-    @PutMapping("/{id}")
-    public OrderDto update(@PathVariable(name = "id") Long id, @RequestBody OrderDto dto) throws ParseException{
-        return toDto(orderService.update(id, toEntity(dto)));
-    }
-
-    @DeleteMapping("/{id}")
-    public OrderDto delete(@PathVariable(name = "id") Long id) {
-        return toDto(orderService.delete(id));
-    }
-}

лаб2сем2/demo — копия(лаб2)/demo/src/main/java/com/example/demo/orders/api/OrderDto.java

@@ -1,63 +0,0 @@
-package com.example.demo.orders.api;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import jakarta.validation.constraints.Min;
-import jakarta.validation.constraints.NotNull;
-public class OrderDto {
-    private Long id;
-    @NotNull
-    @Min(1)
-    private Long itemId;
-    @NotNull
-    @Min(1)
-    private Double itemPrice;
-    @NotNull
-    @Min(1)
-    private Integer count;
-    @NotNull
-    private String date;
-    @NotNull
-    @JsonProperty(access = JsonProperty.Access.READ_ONLY)
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getItemId() {
-        return itemId;
-    }
-
-    public void setItemId(Long typeId) {
-        this.itemId = typeId;
-    }
-    @JsonProperty(access = JsonProperty.Access.READ_ONLY)
-    public Double getItemPrice() {
-        return itemPrice;
-    }
-    @JsonProperty(access = JsonProperty.Access.READ_ONLY)
-    public void setItemPrice(Double price) {
-        this.itemPrice = price;
-    }
-
-    public Integer getCount() {
-        return count;
-    }
-
-    public void setCount(Integer count) {
-        this.count = count;
-    }
-    public String getDate(){
-        return date;
-    }
-    public void setDate(String date) {
-        this.date = date;
-    }
-
-    @JsonProperty(access = JsonProperty.Access.READ_ONLY)
-    public Double getSum() {
-        return itemPrice * count;
-    }
-}

лаб2сем2/demo — копия(лаб2)/demo/src/main/java/com/example/demo/orders/model/OrderEntity.java

@@ -1,62 +0,0 @@
-package com.example.demo.orders.model;
-import java.util.Date;
-import java.util.Objects;
-import com.example.demo.core.model.BaseEntity;
-import com.example.demo.items.model.ItemEntity;
-import com.example.demo.sizes.model.SizeEntity;
-import com.example.demo.types.model.TypeEntity;
-
-import jakarta.validation.constraints.Size;
-
-public class OrderEntity extends BaseEntity{
-    private ItemEntity item;
-    private Integer count;
-    private Date date;
-    public OrderEntity(){
-        super();
-    }
-    public OrderEntity(Long id, ItemEntity item,Integer count, Date date) {
-        super(id);
-        this.item = item;
-        this.count = count;
-        this.date = date;
-    }
-    public ItemEntity getItem() {
-        return item;
-    }
-
-    public void setItem(ItemEntity item) {
-        this.item = item;
-    }
-    
-    public Integer getCount() {
-        return count;
-    }
-
-    public void setCount(Integer count) {
-        this.count = count;
-    }
-    public Date getDate(){
-        return date;
-    }
-    public void setDate(Date date){
-        this.date = date;
-    }
-    @Override
-    public int hashCode() {
-        return Objects.hash(id, item, count, date);
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj)
-            return true;
-        if (obj == null || getClass() != obj.getClass())
-            return false;
-        final OrderEntity other = (OrderEntity) obj;
-        return Objects.equals(other.getId(), id)
-                && Objects.equals(other.getItem(), item)
-                && Objects.equals(other.getCount(), count)
-                && Objects.equals(other.getDate(), date);
-    }
-}

лаб2сем2/demo — копия(лаб2)/demo/src/main/java/com/example/demo/orders/repository/OrderRepository.java

@@ -1,10 +0,0 @@
-package com.example.demo.orders.repository;
-import org.springframework.stereotype.Repository;
-
-import com.example.demo.core.repository.MapRepository;
-import com.example.demo.orders.model.OrderEntity;
-
-@Repository
-public class OrderRepository extends MapRepository<OrderEntity> {
-
-}

лаб2сем2/demo — копия(лаб2)/demo/src/main/java/com/example/demo/orders/service/OrderService.java

@@ -1,50 +0,0 @@
-package com.example.demo.orders.service;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-
-import org.springframework.stereotype.Service;
-
-import com.example.demo.core.error.NotFoundException;
-import com.example.demo.orders.model.OrderEntity;
-import com.example.demo.orders.repository.OrderRepository;
-
-@Service
-public class OrderService {
-    private final OrderRepository repository;
-
-    public OrderService(OrderRepository repository) {
-        this.repository = repository;
-    }
-
-    public List<OrderEntity> getAll(Long itemId) {
-        if (Objects.equals(itemId, 0L)) {
-            return repository.getAll();
-        }
-        return repository.getAll().stream()
-                .filter(item -> item.getItem().getId().equals(itemId))
-                .toList();
-    }
-
-    public OrderEntity get(Long id) {
-        return Optional.ofNullable(repository.get(id))
-                .orElseThrow(() -> new NotFoundException(id));
-    }
-
-    public OrderEntity create(OrderEntity entity) {
-        return repository.create(entity);
-    }
-
-    public OrderEntity update(Long id, OrderEntity entity) {
-        final OrderEntity existsEntity = get(id);
-        existsEntity.setItem(entity.getItem());
-        existsEntity.setCount(entity.getCount());
-        existsEntity.setDate(entity.getDate());
-        return repository.update(existsEntity);
-    }
-
-    public OrderEntity delete(Long id) {
-        final OrderEntity existsEntity = get(id);
-        return repository.delete(existsEntity);
-    }
-}

лаб2сем2/demo — копия(лаб2)/demo/src/main/java/com/example/demo/sizes/api/SizeController.java

@@ -1,64 +0,0 @@
-package com.example.demo.sizes.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.sizes.api.SizeDto;
-import com.example.demo.sizes.model.SizeEntity;
-import com.example.demo.sizes.service.SizeService;
-
-import jakarta.validation.Valid;
-
-@RestController
-@RequestMapping(Constants.API_URL + "/size")
-public class SizeController {
-    private final SizeService sizeService;
-    private final ModelMapper modelMapper;
-
-    public SizeController(SizeService sizeService, ModelMapper modelMapper) {
-        this.sizeService = sizeService;
-        this.modelMapper = modelMapper;
-    }
-
-    private SizeDto toDto(SizeEntity entity) {
-        return modelMapper.map(entity, SizeDto.class);
-    }
-
-    private SizeEntity toEntity(SizeDto dto) {
-        return modelMapper.map(dto, SizeEntity.class);
-    }
-
-    @GetMapping
-    public List<SizeDto> getAll() {
-        return sizeService.getAll().stream().map(this::toDto).toList();
-    }
-
-    @GetMapping("/{id}")
-    public SizeDto get(@PathVariable(name = "id") Long id) {
-        return toDto(sizeService.get(id));
-    }
-
-    @PostMapping
-    public SizeDto create(@RequestBody @Valid SizeDto dto) {
-        return toDto(sizeService.create(toEntity(dto)));
-    }
-
-    @PutMapping("/{id}")
-    public SizeDto update(@PathVariable(name = "id") Long id, @RequestBody SizeDto dto) {
-        return toDto(sizeService.update(id, toEntity(dto)));
-    }
-
-    @DeleteMapping("/{id}")
-    public SizeDto delete(@PathVariable(name = "id") Long id) {
-        return toDto(sizeService.delete(id));
-    }
-}

лаб2сем2/demo — копия(лаб2)/demo/src/main/java/com/example/demo/sizes/api/SizeDto.java

@@ -1,27 +0,0 @@
-package com.example.demo.sizes.api;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import jakarta.validation.constraints.NotBlank;
-
-public class SizeDto {
-    private Long id;
-    @NotBlank
-    private String size;
-
-    @JsonProperty(access = JsonProperty.Access.READ_ONLY)
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getSize() {
-        return size;
-    }
-
-    public void setSize(String size) {
-        this.size = size;
-    }
-}

лаб2сем2/demo — копия(лаб2)/demo/src/main/java/com/example/demo/sizes/model/SizeEntity.java

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

лаб2сем2/demo — копия(лаб2)/demo/src/main/java/com/example/demo/sizes/repository/SizeRepository.java

@@ -1,10 +0,0 @@
-package com.example.demo.sizes.repository;
-import org.springframework.stereotype.Repository;
-
-import com.example.demo.core.repository.MapRepository;
-import com.example.demo.sizes.model.SizeEntity;
-
-@Repository
-public class SizeRepository extends MapRepository<SizeEntity> {
-
-}

лаб2сем2/demo — копия(лаб2)/demo/src/main/java/com/example/demo/sizes/service/SizeService.java

@@ -1,44 +0,0 @@
-package com.example.demo.sizes.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.sizes.model.SizeEntity;
-import com.example.demo.sizes.repository.SizeRepository;
-
-
-
-@Service
-public class SizeService {
-    private final SizeRepository repository;
-
-    public SizeService(SizeRepository repository) {
-        this.repository = repository;
-    }
-
-    public List<SizeEntity> getAll() {
-        return repository.getAll();
-    }
-
-    public SizeEntity get(Long id) {
-        return Optional.ofNullable(repository.get(id))
-                .orElseThrow(() -> new NotFoundException(id));
-    }
-
-    public SizeEntity create(SizeEntity entity) {
-        return repository.create(entity);
-    }
-
-    public SizeEntity update(Long id, SizeEntity entity) {
-        final SizeEntity existsEntity = get(id);
-        existsEntity.setSize(entity.getSize());
-        return repository.update(existsEntity);
-    }
-
-    public SizeEntity delete(Long id) {
-        final SizeEntity existsEntity = get(id);
-        return repository.delete(existsEntity);
-    }
-}

лаб2сем2/demo — копия(лаб2)/demo/src/main/java/com/example/demo/types/api/TypeController.java

@@ -1,63 +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));
-    }
-}

лаб2сем2/demo — копия(лаб2)/demo/src/main/java/com/example/demo/types/api/TypeDto.java

@@ -1,27 +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;
-    }
-}

лаб2сем2/demo — копия(лаб2)/demo/src/main/java/com/example/demo/types/model/TypeEntity.java

@@ -1,43 +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);
-    }
-
-}

лаб2сем2/demo — копия(лаб2)/demo/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>{
-
-}

лаб2сем2/demo — копия(лаб2)/demo/src/main/java/com/example/demo/types/service/TypeService.java

@@ -1,42 +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);
-    }
-}

лаб2сем2/demo — копия(лаб2)/demo/src/main/resources/application.properties

@@ -1 +0,0 @@
-

лаб2сем2/demo — копия(лаб2)/demo/src/test/java/com/example/demo/DemoApplicationTests.java

@@ -1,13 +0,0 @@
-package com.example.demo;
-
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-
-@SpringBootTest
-class DemoApplicationTests {
-
-	@Test
-	void contextLoads() {
-	}
-
-}

лаб2сем2/demo — копия(лаб2)/demo/src/test/java/com/example/demo/ItemServiceTests.java

@@ -1,67 +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.core.error.NotFoundException;
-import com.example.demo.items.model.ItemEntity;
-import com.example.demo.items.service.ItemService;
-import com.example.demo.sizes.model.SizeEntity;
-import com.example.demo.types.model.TypeEntity;
-
-@SpringBootTest
-@TestMethodOrder(OrderAnnotation.class)
-public class ItemServiceTests {
-    @Autowired
-    private ItemService itemService;
-    @Test
-	void getTest() {
-		Assertions.assertThrows(NotFoundException.class, () -> itemService.get(0L));
-	}
-    @Test
-	@Order(1)
-	void createTest() {
-        itemService.create(new ItemEntity(null, new TypeEntity(null, "платье1"),
-        new SizeEntity(null, "38-40"),
-        10.0, "item1", "image1"));
-        itemService.create(new ItemEntity(null, new TypeEntity(null, "платье2"),
-        new SizeEntity(null, "40-42"),
-        20.0, "item2", "image2"));
-        final ItemEntity last = itemService.create(new ItemEntity(null, new TypeEntity(null, "платье3"),
-        new SizeEntity(null, "42-44"),
-        30.0, "item3", "image3"));
-        Assertions.assertEquals(3, itemService.getAll(0L,0L).size());
-		Assertions.assertEquals(last, itemService.get(3L));
-    }
-    @Test
-	@Order(2)
-	void updateTest() {
-        final String test = "TEST";
-		final ItemEntity entity = itemService.get(3L);
-		final String oldName = entity.getNameItem();
-        final ItemEntity newEntity = itemService.update(3L, new ItemEntity(1L,new TypeEntity(null, "платье3"),
-        new SizeEntity(null, "42-44"),
-        30.0, test, test ));
-        Assertions.assertEquals(3, itemService.getAll(0L, 0L).size());
-		Assertions.assertEquals(newEntity, itemService.get(3L));
-		Assertions.assertEquals(test, newEntity.getNameItem());
-		Assertions.assertNotEquals(oldName, newEntity.getNameItem());
-    }
-    @Test
-	@Order(3)
-	void deleteTest() {
-        itemService.delete(3L);
-		Assertions.assertEquals(2, itemService.getAll(0L,0L).size());
-		final ItemEntity last = itemService.get(2L);
-		Assertions.assertEquals(2L, last.getId());
-        final ItemEntity newEntity = itemService.create(new ItemEntity(null, new TypeEntity(null, "платье3"),
-        new SizeEntity(null, "38-40"),
-        10.0, "item32", "image32"));
-        Assertions.assertEquals(3, itemService.getAll(0L,0L).size());
-		Assertions.assertEquals(4L, newEntity.getId());
-    }
-}

лаб2сем2/demo — копия(лаб2)/demo/src/test/java/com/example/demo/OrderServiceTests.java

@@ -1,71 +0,0 @@
-package com.example.demo;
-import java.util.Date;
-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.core.error.NotFoundException;
-import com.example.demo.items.model.ItemEntity;
-import com.example.demo.orders.model.OrderEntity;
-import com.example.demo.orders.service.OrderService;
-import com.example.demo.sizes.model.SizeEntity;
-import com.example.demo.types.model.TypeEntity;
-
-@SpringBootTest
-@TestMethodOrder(OrderAnnotation.class)
-public class OrderServiceTests {
-    @Autowired
-    private OrderService orderService;
-    @Test
-	void getTest() {
-		Assertions.assertThrows(NotFoundException.class, () -> orderService.get(0L));
-	}
-    @Test
-	@Order(1)
-	void createTest() {
-        orderService.create(new OrderEntity(null, new ItemEntity(null, new TypeEntity(null, "платье1"),
-        new SizeEntity(null, "38-40"),
-        10.0, "item1", "image1"),10, new Date()));
-        orderService.create(new OrderEntity(null,new ItemEntity(null, new TypeEntity(null, "платье2"),
-        new SizeEntity(null, "38-40"),
-        20.0, "item2", "image2") , 20, new Date()));
-        final OrderEntity last = orderService.create(new OrderEntity(null,new ItemEntity(null, new TypeEntity(null, "платье3"),
-        new SizeEntity(null, "38-40"),
-        30.0, "item3", "image3")  , 30, new Date()));
-        Assertions.assertEquals(3, orderService.getAll(0L).size());
-		Assertions.assertEquals(last, orderService.get(3L));
-    }
-    @Test
-	@Order(2)
-	void updateTest() {
-        final Integer test = 1000;
-		final OrderEntity entity = orderService.get(3L);
-		final Integer oldCount = entity.getCount();
-        final OrderEntity newEntity = orderService.update(3L, new OrderEntity
-        (1L, new ItemEntity(null, new TypeEntity(null, "платье3"),
-        new SizeEntity(null, "38-40"),
-        10.0, "item3", "image3") , test, new Date() ));
-        Assertions.assertEquals(3, orderService.getAll(0L).size());
-		Assertions.assertEquals(newEntity, orderService.get(3L));
-		Assertions.assertEquals(test, newEntity.getCount());
-		Assertions.assertNotEquals(oldCount, newEntity.getCount());
-    }
-    @Test
-	@Order(3)
-	void deleteTest() {
-        orderService.delete(3L);
-		Assertions.assertEquals(2, orderService.getAll(0L).size());
-		final OrderEntity last = orderService.get(2L);
-		Assertions.assertEquals(2L, last.getId());
-        final OrderEntity newEntity = orderService.create(new OrderEntity(null, new ItemEntity
-        (null, new TypeEntity(null, "платье3"),
-        new SizeEntity(null, "38-40"),
-        10.0, "item3", "image3") , 10, new Date()));
-        Assertions.assertEquals(3, orderService.getAll(0L).size());
-		Assertions.assertEquals(4L, newEntity.getId());
-    }
-}

лаб2сем2/demo — копия(лаб2)/demo/src/test/java/com/example/demo/SizeServiceTests.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.core.error.NotFoundException;
-import com.example.demo.sizes.model.SizeEntity;
-import com.example.demo.sizes.service.SizeService;
-
-@SpringBootTest
-@TestMethodOrder(OrderAnnotation.class)
-
-public class SizeServiceTests {
-    @Autowired
-	private SizeService sizeService;
-
-	@Test
-	void getTest() {
-		Assertions.assertThrows(NotFoundException.class, () -> sizeService.get(0L));
-	}
-
-	@Test
-	@Order(1)
-	void createTest() {
-		sizeService.create(new SizeEntity(null, "38-40"));
-		sizeService.create(new SizeEntity(null, "40-42"));
-		final SizeEntity last = sizeService.create(new SizeEntity(null, "42-44"));
-		Assertions.assertEquals(3, sizeService.getAll().size());
-		Assertions.assertEquals(last, sizeService.get(3L));
-	}
-
-	@Test
-	@Order(2)
-	void updateTest() {
-		final String test = "TEST";
-		final SizeEntity entity = sizeService.get(3L);
-		final String oldName = entity.getSize();
-		final SizeEntity newEntity = sizeService.update(3L, new SizeEntity(1L, test));
-		Assertions.assertEquals(3, sizeService.getAll().size());
-		Assertions.assertEquals(newEntity, sizeService.get(3L));
-		Assertions.assertEquals(test, newEntity.getSize());
-		Assertions.assertNotEquals(oldName, newEntity.getSize());
-	}
-
-	@Test
-	@Order(3)
-	void deleteTest() {
-		sizeService.delete(3L);
-		Assertions.assertEquals(2, sizeService.getAll().size());
-		final SizeEntity last = sizeService.get(2L);
-		Assertions.assertEquals(2L, last.getId());
-
-		final SizeEntity newEntity = sizeService.create(new SizeEntity(null, "платье3"));
-		Assertions.assertEquals(3, sizeService.getAll().size());
-		Assertions.assertEquals(4L, newEntity.getId());
-	}
-}

лаб2сем2/demo — копия(лаб2)/demo/src/test/java/com/example/demo/TypeServiceTests.java

@@ -1,60 +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.core.error.NotFoundException;
-import com.example.demo.types.model.TypeEntity;
-import com.example.demo.types.service.TypeService;
-
-@SpringBootTest
-@TestMethodOrder(OrderAnnotation.class)
-public 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, "платье1"));
-		typeService.create(new TypeEntity(null, "платье2"));
-		final TypeEntity last = typeService.create(new TypeEntity(null, "платье3"));
-		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, "платье3"));
-		Assertions.assertEquals(3, typeService.getAll().size());
-		Assertions.assertEquals(4L, newEntity.getId());
-	}
-}