2ая лаба с тестами (проверить)

lab2/.gitignore

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

lab2/build.gradle

@@ -0,0 +1,28 @@
+plugins {
+	id 'java'
+	id 'org.springframework.boot' version '3.2.3'
+	id 'io.spring.dependency-management' version '1.1.4'
+}
+
+group = 'com.example'
+version = '0.0.1-SNAPSHOT'
+
+java {
+	sourceCompatibility = '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()
+}

lab2/gradle/wrapper/gradle-wrapper.properties

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

lab2/gradlew

@@ -0,0 +1,249 @@
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
+##############################################################################
+
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD=maximum
+
+warn () {
+    echo "$*"
+} >&2
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+} >&2
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD=$JAVA_HOME/jre/sh/java
+    else
+        JAVACMD=$JAVA_HOME/bin/java
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD=java
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"

lab2/gradlew.bat

@@ -0,0 +1,92 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

lab2/settings.gradle

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

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

@@ -0,0 +1,46 @@
+package com.example.demo;
+
+import java.util.Objects;
+import java.util.Date;
+
+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.news.model.NewEntity;
+import com.example.demo.news.service.NewService;
+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 NewService newService;
+	private final UserService userService;
+
+	public DemoApplication(NewService newService, UserService userService) {
+		this.newService = newService;
+		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 news values");
+			newService.create(new NewEntity(null, "День знаний", new Date(2023 - 9 - 01), "праздник",
+					"Университет торжественно отпраздновал День Знаний. На мероприятии присутствовало более 900 абитуриентов."));
+			newService.create(
+					new NewEntity(null, "Чемпионат ICPC", new Date(2023 - 10 - 11), "соревнование программирование",
+							"Студенты выступят на Чемпионате мира по программированию в Северной Евразии."));
+			newService.create(new NewEntity(null, "Новый год 2024", new Date(2024 - 1 - 01), "праздник",
+					"Администрация ulstu поздравляет студентов и преподавателей с Новым годом и желает крепкого здоровья и успешного Года Дракона!"));
+		}
+	}
+}

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

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

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

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

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

@@ -0,0 +1,15 @@
+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");
+    }
+}

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

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

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

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

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

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

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

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

lab2/src/main/java/com/example/demo/news/api/NewController.java

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

lab2/src/main/java/com/example/demo/news/api/NewDto.java

@@ -0,0 +1,67 @@
+package com.example.demo.news.api;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.PastOrPresent;
+import jakarta.validation.constraints.Size;
+
+public class NewDto {
+    private Long id;
+    @NotBlank
+    @Size(min = 1, max = 30)
+    private String title;
+    @NotNull
+    @PastOrPresent
+    private Date date;
+    @NotBlank
+    @Size(min = 1, max = 30)
+    private String tage;
+    @NotBlank
+    @Size(min = 1, max = 30)
+    private String text;
+
+    @JsonProperty(access = JsonProperty.Access.READ_ONLY)
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public Date getDate() {
+        return date;
+    }
+
+    public void setDate(Date date) {
+        this.date = date;
+    }
+
+    public String getTage() {
+        return tage;
+    }
+
+    public void setTage(String tage) {
+        this.tage = tage;
+    }
+
+    public String getText() {
+        return text;
+    }
+
+    public void setText(String text) {
+        this.text = text;
+    }
+}

lab2/src/main/java/com/example/demo/news/model/NewEntity.java

@@ -0,0 +1,77 @@
+package com.example.demo.news.model;
+
+import java.util.Date;
+import java.util.Objects;
+
+import com.example.demo.core.model.BaseEntity;
+
+public class NewEntity extends BaseEntity {
+    private String title;
+    private Date date;
+    private String tage;
+    private String text;
+
+    public NewEntity() {
+        super();
+    }
+
+    public NewEntity(Long id, String title, Date date, String tage, String text) {
+        super(id);
+        this.title = title;
+        this.date = date;
+        this.tage = tage;
+        this.text = text;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public Date getDate() {
+        return date;
+    }
+
+    public void setDate(Date date) {
+        this.date = date;
+    }
+
+    public String getTage() {
+        return tage;
+    }
+
+    public void setTage(String tage) {
+        this.tage = tage;
+    }
+
+    public String getText() {
+        return text;
+    }
+
+    public void setText(String text) {
+        this.text = text;
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id, title, date, tage, text);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null || getClass() != obj.getClass())
+            return false;
+        final NewEntity other = (NewEntity) obj;
+        return Objects.equals(other.getId(), id)
+                && Objects.equals(other.getTitle(), title)
+                && Objects.equals(other.getDate(), date)
+                && Objects.equals(other.getTage(), tage)
+                && Objects.equals(other.getText(), text);
+    }
+
+}

lab2/src/main/java/com/example/demo/news/repository/NewRepository.java

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

lab2/src/main/java/com/example/demo/news/service/NewService.java

@@ -0,0 +1,46 @@
+package com.example.demo.news.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.news.model.NewEntity;
+import com.example.demo.news.repository.NewRepository;
+
+@Service
+public class NewService {
+    private final NewRepository repository;
+
+    public NewService(NewRepository repository) {
+        this.repository = repository;
+    }
+
+    public List<NewEntity> getAll() {
+        return repository.getAll();
+    }
+
+    public NewEntity get(Long id) {
+        return Optional.ofNullable(repository.get(id))
+                .orElseThrow(() -> new NotFoundException(id));
+    }
+
+    public NewEntity create(NewEntity entity) {
+        return repository.create(entity);
+    }
+
+    public NewEntity update(Long id, NewEntity entity) {
+        final NewEntity existsEntity = get(id);
+        existsEntity.setTitle(entity.getTitle());
+        existsEntity.setDate(entity.getDate());
+        existsEntity.setTage(entity.getTage());
+        existsEntity.setText(entity.getText());
+        return repository.update(existsEntity);
+    }
+
+    public NewEntity delete(Long id) {
+        final NewEntity existsEntity = get(id);
+        return repository.delete(existsEntity);
+    }
+}

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

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

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

@@ -0,0 +1,78 @@
+package com.example.demo.users.api;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import jakarta.validation.constraints.Email;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Past;
+import jakarta.validation.constraints.Size;
+
+public class UserDto {
+    private Long id;
+    @NotBlank
+    @Size(min = 1, max = 30)
+    private String login;
+    @NotBlank
+    @Size(min = 8, max = 30)
+    private String password;
+    @NotBlank
+    @Size(min = 1, max = 30)
+    private String name;
+    @NotBlank
+    @Email
+    @Size(min = 1, max = 30)
+    private String email;
+    @Past
+    private Date birthDate;
+
+    @JsonProperty(access = JsonProperty.Access.READ_ONLY)
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getLogin() {
+        return login;
+    }
+
+    public void setLogin(String login) {
+        this.login = login;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    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;
+    }
+
+    public Date getBirthDate() {
+        return birthDate;
+    }
+
+    public void setBirthDate(Date birthDate) {
+        this.birthDate = birthDate;
+    }
+}

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

@@ -0,0 +1,90 @@
+package com.example.demo.users.model;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Objects;
+
+import com.example.demo.core.model.BaseEntity;
+
+public class UserEntity extends BaseEntity {
+    private String login;
+    private String password;
+    private String name;
+    private String email;
+    private Date birthDate;
+
+    public UserEntity() {
+        super();
+    }
+
+    public UserEntity(Long id, String login, String password, String name, String email, Date birthDate) {
+        super(id);
+        this.login = login;
+        this.password = password;
+        this.name = name;
+        this.email = email;
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        this.birthDate = birthDate;
+    }
+
+    public String getLogin() {
+        return login;
+    }
+
+    public void setLogin(String login) {
+        this.login = login;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getEmail() {
+        return name;
+    }
+
+    public void setEmail(String name) {
+        this.name = name;
+    }
+
+    public Date getBirthDate() {
+        return birthDate;
+    }
+
+    public void setBirthDate(Date birthDate) {
+        this.birthDate = birthDate;
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id, login, password, name, email, birthDate);
+    }
+
+    @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.getLogin(), login)
+                && Objects.equals(other.getPassword(), password)
+                && Objects.equals(other.getName(), name)
+                && Objects.equals(other.getEmail(), email)
+                && Objects.equals(other.getBirthDate(), birthDate);
+    }
+
+}

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

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

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

@@ -0,0 +1,47 @@
+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.setLogin(entity.getLogin());
+        existsEntity.setPassword(entity.getPassword());
+        existsEntity.setName(entity.getName());
+        existsEntity.setEmail(entity.getEmail());
+        existsEntity.setBirthDate(entity.getBirthDate());
+        return repository.update(existsEntity);
+    }
+
+    public UserEntity delete(Long id) {
+        final UserEntity existsEntity = get(id);
+        return repository.delete(existsEntity);
+    }
+}

lab2/src/main/resources/application.properties

@@ -0,0 +1 @@
+

lab2/src/test/java/com/example/demo/NewsServiceTest.java

@@ -0,0 +1,19 @@
+@SpringBootTest
+@TestMethodOrder(OrderAnnotation.class)
+class NewsServiceTest {
+    @Autowired
+    private NewsService newsService;
+
+    @Test
+    void getTest() {
+        Assertions.assertThrows(NotFoundException.class, () -> newsService.get(0L));
+    }
+
+    @Test
+    void createTest() {
+        newsService.create(new NewsEntity(null, "Название", "2024-02-10", "тэг", "текст новости"));
+        final NewsEntity last = newsService.create(new NewsEntity(null, "9 апреля", "2024-04-09", "весна", "просто наступил апрель"));
+        Assertions.assertEquals(1, newsService.getAll().size());
+        Assertions.assertEquals(last, newsService.get(1L));
+    }
+}

lab2/src/test/java/com/example/demo/UserServiceTest.java

@@ -0,0 +1,47 @@
+package com.example.demo;
+
+@SpringBootTest
+@TestMethodOrder(OrderAnnotation.class)
+class UserServiceTest {
+    @Autowired
+    private UserService userService;
+
+    @Test
+    void getTest() {
+        Assertions.assertThrows(NotFoundException.class, () -> userService.get(0L));
+    }
+
+    @Test
+    @Order(1)
+    void createTest() {
+        userService.create(new UserEntity(null, "beko", "111", "ddwwdd", "beko@mail.ru", "2004-04-04"));
+        userService.create(new UserEntity(null, "rara", "rara", "dererere", "rara@mail.ru", "2001-01-01"));
+        Assertions.assertEquals(1, userService.getAll().size());
+    }
+
+    @Test
+    @Order(2)
+    void updateTest() {
+        final String test = "TEST";
+        final UserEntity entity = userService.get(3L);
+        final String oldName = entity.getName();
+        final UserEntity newEntity = userService.update(1, new UserEntity(1L, test, test, test, "test@mail.ru", "2004-01-02"));
+        Assertions.assertEquals(2, userService.getAll().size());
+        Assertions.assertEquals(newEntity, userService.get(1L));
+        Assertions.assertEquals(test, newEntity.getName());
+        Assertions.assertEquals(oldName, newEntity.getName());
+    }
+
+    @Test
+    @Order(3)
+    void deleteTest() {
+        userService.delete(1L);
+        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, "1", "1", "1", "1@mail.ru", "2004-04-04"));
+        Assertions.assertEquals(2, userService.getAll().size());
+        Assertions.assertEquals(2L, newEntity.getId());
+    }
+}