Compare commits
17 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6b3b802c97 | ||
|
|
545facb7b0 | ||
|
|
13099842b7 | ||
|
|
43898296d1 | ||
|
|
ea8b6591c2 | ||
|
|
14ae167d61 | ||
|
|
9dddb11baf | ||
|
|
2c210e6657 | ||
|
|
c7dc979193 | ||
|
|
17014bcb67 | ||
|
|
4a409b63d7 | ||
|
|
12007bd3ea | ||
|
|
743b7c1c6a | ||
|
|
499b51d2e1 | ||
|
|
51875bcc5e | ||
|
|
51545137be | ||
|
|
0dd5c03d7d |
14
.gitignore
vendored
14
.gitignore
vendored
@@ -1,14 +0,0 @@
|
||||
# ---> VisualStudioCode
|
||||
.vscode/*
|
||||
!.vscode/settings.json
|
||||
!.vscode/tasks.json
|
||||
!.vscode/launch.json
|
||||
!.vscode/extensions.json
|
||||
!.vscode/*.code-snippets
|
||||
|
||||
# Local History for Visual Studio Code
|
||||
.history/
|
||||
|
||||
# Built Visual Studio Code Extensions
|
||||
*.vsix
|
||||
|
||||
3
.idea/.gitignore
generated
vendored
Normal file
3
.idea/.gitignore
generated
vendored
Normal file
@@ -0,0 +1,3 @@
|
||||
# Default ignored files
|
||||
/shelf/
|
||||
/workspace.xml
|
||||
9
.idea/internetDev.iml
generated
Normal file
9
.idea/internetDev.iml
generated
Normal file
@@ -0,0 +1,9 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<module type="JAVA_MODULE" version="4">
|
||||
<component name="NewModuleRootManager" inherit-compiler-output="true">
|
||||
<exclude-output />
|
||||
<content url="file://$MODULE_DIR$" />
|
||||
<orderEntry type="inheritedJdk" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
</component>
|
||||
</module>
|
||||
6
.idea/misc.xml
generated
Normal file
6
.idea/misc.xml
generated
Normal file
@@ -0,0 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="ProjectRootManager" version="2" project-jdk-name="21" project-jdk-type="JavaSDK">
|
||||
<output url="file://$PROJECT_DIR$/out" />
|
||||
</component>
|
||||
</project>
|
||||
8
.idea/modules.xml
generated
Normal file
8
.idea/modules.xml
generated
Normal file
@@ -0,0 +1,8 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="ProjectModuleManager">
|
||||
<modules>
|
||||
<module fileurl="file://$PROJECT_DIR$/.idea/internetDev.iml" filepath="$PROJECT_DIR$/.idea/internetDev.iml" />
|
||||
</modules>
|
||||
</component>
|
||||
</project>
|
||||
6
.idea/vcs.xml
generated
Normal file
6
.idea/vcs.xml
generated
Normal file
@@ -0,0 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="VcsDirectoryMappings">
|
||||
<mapping directory="" vcs="Git" />
|
||||
</component>
|
||||
</project>
|
||||
Binary file not shown.
38
catalog.html
38
catalog.html
@@ -1,38 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="ru">
|
||||
<link rel="stylesheet" href="styles.css">
|
||||
<head>
|
||||
<title>Каталог</title>
|
||||
</head>
|
||||
<body>
|
||||
|
||||
<h3>Тут разбита музыка на жанры</h3>
|
||||
<p>Инфа будет +- такая</p>
|
||||
<div class="list">
|
||||
<ul class="punk-list">
|
||||
<li>
|
||||
<div class="item">
|
||||
<img class="catalog" src="pankrock.jpg" alt="Панк-Рок" width=200>
|
||||
<a href="punkrock.html">Панк-Рок</a>
|
||||
</div>
|
||||
</li>
|
||||
<li>
|
||||
<div class="item">
|
||||
<img class="catalog" src="psy.png" alt="Психоделический рок" width=200>
|
||||
<a href="">Психоделика</a>
|
||||
</div>
|
||||
</li>
|
||||
<li>
|
||||
<div class="item">
|
||||
<img class="catalog" src="garajnipunk.jpg" alt="Гаражный-панк" width=200>
|
||||
<a href="">Гражный-панк</a>
|
||||
</div>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<a href="index.html"> Вернуться назад</a>
|
||||
|
||||
</body>
|
||||
|
||||
</html>
|
||||
3
demo/.gitattributes
vendored
Normal file
3
demo/.gitattributes
vendored
Normal file
@@ -0,0 +1,3 @@
|
||||
/gradlew text eol=lf
|
||||
*.bat text eol=crlf
|
||||
*.jar binary
|
||||
37
demo/.gitignore
vendored
Normal file
37
demo/.gitignore
vendored
Normal file
@@ -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/
|
||||
0
demo/Configure
Normal file
0
demo/Configure
Normal file
50
demo/build.front.gradle
Normal file
50
demo/build.front.gradle
Normal file
@@ -0,0 +1,50 @@
|
||||
apply plugin: "com.github.node-gradle.node"
|
||||
|
||||
logger.quiet("Configure front builder")
|
||||
|
||||
ext {
|
||||
frontDir = file("${project.projectDir}/punkrock-react")
|
||||
staticDir = file("${project.projectDir}/src/main/resources/static")
|
||||
if (!frontDir.exists()) {
|
||||
throw new GradleException("Frontend app directory is not exists")
|
||||
}
|
||||
logger.quiet("Webapp dir is {}", frontDir.toString())
|
||||
}
|
||||
|
||||
node {
|
||||
version = "22.17.1"
|
||||
npmVersion = "10.9.2"
|
||||
download = true
|
||||
}
|
||||
|
||||
tasks.register("frontDepsInstall", NpmTask) {
|
||||
group = "front"
|
||||
description = "Installs dependencies from package.json"
|
||||
logger.quiet(description)
|
||||
workingDir = frontDir
|
||||
args = ["install"]
|
||||
}
|
||||
|
||||
tasks.register("frontBuild", NpmTask) {
|
||||
group = "front"
|
||||
description = "Build frontend webapp"
|
||||
logger.quiet(description)
|
||||
workingDir = frontDir
|
||||
dependsOn frontDepsInstall
|
||||
args = ["run", "build"]
|
||||
}
|
||||
|
||||
tasks.register("copyFrontend", org.gradle.api.tasks.Copy) {
|
||||
group = "front"
|
||||
description = "Copy built frontend to static resources"
|
||||
dependsOn frontBuild
|
||||
from("${frontDir}/build")
|
||||
into(staticDir)
|
||||
includeEmptyDirs = false
|
||||
}
|
||||
|
||||
if (frontDir.exists()) {
|
||||
processResources.dependsOn copyFrontend
|
||||
bootJar.dependsOn copyFrontend
|
||||
}
|
||||
|
||||
107
demo/build.gradle
Normal file
107
demo/build.gradle
Normal file
@@ -0,0 +1,107 @@
|
||||
plugins {
|
||||
id 'java'
|
||||
id 'org.springframework.boot' version '3.2.5'
|
||||
id 'io.spring.dependency-management' version '1.1.5'
|
||||
id 'com.github.node-gradle.node' version '7.1.0' apply false
|
||||
id 'org.liquibase.gradle' version '2.2.2' apply false
|
||||
}
|
||||
|
||||
group = 'com.example'
|
||||
version = '0.0.1-SNAPSHOT'
|
||||
description = 'Demo project for Spring Boot'
|
||||
|
||||
java {
|
||||
toolchain {
|
||||
languageVersion = JavaLanguageVersion.of(21)
|
||||
}
|
||||
}
|
||||
|
||||
repositories {
|
||||
mavenCentral()
|
||||
}
|
||||
|
||||
ext {
|
||||
springdocVersion = "2.2.0"
|
||||
h2Version = "2.4.240"
|
||||
postgresVersion = "42.7.8"
|
||||
liquibaseVersion = "4.33.0"
|
||||
thymeleafLayoutVersion = "3.4.0"
|
||||
bootstrapVersion = "5.3.3"
|
||||
bootstrapIconsVersion = "1.11.3"
|
||||
|
||||
springProfiles = []
|
||||
if (project.hasProperty("front")) {
|
||||
springProfiles.add("front")
|
||||
}
|
||||
if (project.hasProperty("prod")) {
|
||||
springProfiles.add("prod")
|
||||
} else {
|
||||
springProfiles.add("dev")
|
||||
}
|
||||
currentProfiles = springProfiles.join(",")
|
||||
logger.quiet("Current profiles are: " + currentProfiles)
|
||||
}
|
||||
|
||||
if (springProfiles.contains("front")) {
|
||||
apply from: "build.front.gradle"
|
||||
}
|
||||
if (springProfiles.contains("dev")) {
|
||||
apply from: "build.migrations.gradle"
|
||||
}
|
||||
|
||||
dependencies {
|
||||
implementation 'org.springframework.boot:spring-boot-starter-web'
|
||||
implementation 'org.springframework.boot:spring-boot-starter-validation'
|
||||
implementation 'org.springframework.boot:spring-boot-starter-security'
|
||||
|
||||
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
|
||||
runtimeOnly "org.liquibase:liquibase-core:${liquibaseVersion}"
|
||||
|
||||
if (springProfiles.contains("prod")) {
|
||||
runtimeOnly "org.postgresql:postgresql:${postgresVersion}"
|
||||
} else {
|
||||
runtimeOnly "org.postgresql:postgresql:${postgresVersion}"
|
||||
runtimeOnly "com.h2database:h2:${h2Version}"
|
||||
}
|
||||
|
||||
if (!springProfiles.contains("front")) {
|
||||
implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
|
||||
implementation "nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect:${thymeleafLayoutVersion}"
|
||||
implementation "org.thymeleaf.extras:thymeleaf-extras-springsecurity6"
|
||||
developmentOnly 'org.springframework.boot:spring-boot-devtools'
|
||||
runtimeOnly "org.webjars.npm:bootstrap:${bootstrapVersion}"
|
||||
runtimeOnly "org.webjars.npm:bootstrap-icons:${bootstrapIconsVersion}"
|
||||
// Добавляем implementation для OpenAPI, чтобы Swagger UI был доступен в runtime
|
||||
implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:${springdocVersion}"
|
||||
} else {
|
||||
implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:${springdocVersion}"
|
||||
}
|
||||
|
||||
testImplementation 'org.springframework.boot:spring-boot-starter-test'
|
||||
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
|
||||
}
|
||||
|
||||
bootRun {
|
||||
def currentArgs = ["--spring.profiles.active=" + currentProfiles]
|
||||
if (project.hasProperty("args")) {
|
||||
currentArgs.addAll(project.args.split(","))
|
||||
}
|
||||
args currentArgs
|
||||
}
|
||||
|
||||
bootJar {
|
||||
archiveFileName = String.format("%s-%s.jar", rootProject.name, version)
|
||||
}
|
||||
|
||||
test {
|
||||
systemProperty "spring.profiles.active", currentProfiles
|
||||
useJUnitPlatform()
|
||||
}
|
||||
|
||||
processResources {
|
||||
filesMatching("**/application.yml") {
|
||||
filter { line ->
|
||||
line.replace("active: dev", "active: ${currentProfiles}")
|
||||
}
|
||||
}
|
||||
}
|
||||
61
demo/build.migrations.gradle
Normal file
61
demo/build.migrations.gradle
Normal file
@@ -0,0 +1,61 @@
|
||||
apply plugin: "org.liquibase.gradle"
|
||||
|
||||
logger.quiet("Configure migrations generator")
|
||||
|
||||
ext {
|
||||
picocliVersion = "4.7.7"
|
||||
timestamp = new Date().format("yyyy-MM-dd-HHmmss")
|
||||
}
|
||||
|
||||
liquibase {
|
||||
activities {
|
||||
main {
|
||||
changelogFile "db/master.yml"
|
||||
url "jdbc:h2:file:./data"
|
||||
username "sa"
|
||||
password "sa"
|
||||
referenceUrl "hibernate:spring:com.example.demo.entity?dialect=org.hibernate.dialect.H2Dialect"
|
||||
logLevel "warn"
|
||||
}
|
||||
}
|
||||
}
|
||||
update.dependsOn processResources
|
||||
|
||||
dependencies {
|
||||
liquibaseRuntime "org.liquibase.ext:liquibase-hibernate6:${liquibaseVersion}"
|
||||
liquibaseRuntime "info.picocli:picocli:${picocliVersion}"
|
||||
liquibaseRuntime sourceSets.main.runtimeClasspath
|
||||
liquibaseRuntime sourceSets.main.output
|
||||
}
|
||||
|
||||
tasks.register("generateFull") {
|
||||
group = "migrations"
|
||||
description = "Generate changelog from existing database"
|
||||
doFirst(){
|
||||
liquibase {
|
||||
activities {
|
||||
main {
|
||||
changeLogFile "src/main/resources/db/generated-full-${timestamp}.yml"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
finalizedBy generateChangelog
|
||||
}
|
||||
|
||||
tasks.register("generateDiff") {
|
||||
group = "liquibase"
|
||||
description = "Generate diff between DB and JPA entities"
|
||||
doFirst(){
|
||||
liquibase {
|
||||
activities {
|
||||
main {
|
||||
changeLogFile "src/main/resources/db/generated-diff-${timestamp}.yml"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
finalizedBy diffChangelog
|
||||
}
|
||||
diffChangelog.dependsOn compileJava
|
||||
|
||||
BIN
demo/data.mv.db
Normal file
BIN
demo/data.mv.db
Normal file
Binary file not shown.
4
demo/data.trace.db
Normal file
4
demo/data.trace.db
Normal file
@@ -0,0 +1,4 @@
|
||||
2025-12-12 17:34:35.260933+04:00 jdbc[3]: exception
|
||||
org.h2.jdbc.JdbcSQLSyntaxErrorException: Таблица "DATABASECHANGELOGLOCK" не найдена
|
||||
Table "DATABASECHANGELOGLOCK" not found; SQL statement:
|
||||
SELECT COUNT(*) FROM PUBLIC.DATABASECHANGELOGLOCK [42102-240]
|
||||
BIN
demo/gradle/wrapper/gradle-wrapper.jar
vendored
Normal file
BIN
demo/gradle/wrapper/gradle-wrapper.jar
vendored
Normal file
Binary file not shown.
7
demo/gradle/wrapper/gradle-wrapper.properties
vendored
Normal file
7
demo/gradle/wrapper/gradle-wrapper.properties
vendored
Normal file
@@ -0,0 +1,7 @@
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
|
||||
networkTimeout=10000
|
||||
validateDistributionUrl=true
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
0
demo/gradlew
vendored
Normal file
0
demo/gradlew
vendored
Normal file
94
demo/gradlew.bat
vendored
Normal file
94
demo/gradlew.bat
vendored
Normal file
@@ -0,0 +1,94 @@
|
||||
@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
|
||||
@rem SPDX-License-Identifier: Apache-2.0
|
||||
@rem
|
||||
|
||||
@if "%DEBUG%"=="" @echo off
|
||||
@rem ##########################################################################
|
||||
@rem
|
||||
@rem Gradle startup script for Windows
|
||||
@rem
|
||||
@rem ##########################################################################
|
||||
|
||||
@rem Set local scope for the variables with windows NT shell
|
||||
if "%OS%"=="Windows_NT" setlocal
|
||||
|
||||
set DIRNAME=%~dp0
|
||||
if "%DIRNAME%"=="" set DIRNAME=.
|
||||
@rem This is normally unused
|
||||
set APP_BASE_NAME=%~n0
|
||||
set APP_HOME=%DIRNAME%
|
||||
|
||||
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
|
||||
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
|
||||
|
||||
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
|
||||
|
||||
@rem Find java.exe
|
||||
if defined JAVA_HOME goto findJavaFromJavaHome
|
||||
|
||||
set JAVA_EXE=java.exe
|
||||
%JAVA_EXE% -version >NUL 2>&1
|
||||
if %ERRORLEVEL% equ 0 goto execute
|
||||
|
||||
echo. 1>&2
|
||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
|
||||
echo. 1>&2
|
||||
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
||||
echo location of your Java installation. 1>&2
|
||||
|
||||
goto fail
|
||||
|
||||
:findJavaFromJavaHome
|
||||
set JAVA_HOME=%JAVA_HOME:"=%
|
||||
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
||||
|
||||
if exist "%JAVA_EXE%" goto execute
|
||||
|
||||
echo. 1>&2
|
||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
|
||||
echo. 1>&2
|
||||
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
||||
echo location of your Java installation. 1>&2
|
||||
|
||||
goto fail
|
||||
|
||||
:execute
|
||||
@rem Setup the command line
|
||||
|
||||
set CLASSPATH=
|
||||
|
||||
|
||||
@rem Execute Gradle
|
||||
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
|
||||
|
||||
: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
|
||||
6
demo/package-lock.json
generated
Normal file
6
demo/package-lock.json
generated
Normal file
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"name": "demo",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {}
|
||||
}
|
||||
1
demo/settings.gradle
Normal file
1
demo/settings.gradle
Normal file
@@ -0,0 +1 @@
|
||||
rootProject.name = 'demo'
|
||||
13
demo/src/main/java/com/example/demo/DemoApplication.java
Normal file
13
demo/src/main/java/com/example/demo/DemoApplication.java
Normal file
@@ -0,0 +1,13 @@
|
||||
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);
|
||||
}
|
||||
|
||||
}
|
||||
15
demo/src/main/java/com/example/demo/api/PageHelper.java
Normal file
15
demo/src/main/java/com/example/demo/api/PageHelper.java
Normal file
@@ -0,0 +1,15 @@
|
||||
package com.example.demo.api;
|
||||
|
||||
import org.springframework.data.domain.PageRequest;
|
||||
import org.springframework.data.domain.Pageable;
|
||||
import org.springframework.data.domain.Sort;
|
||||
|
||||
public class PageHelper {
|
||||
private PageHelper() {
|
||||
}
|
||||
|
||||
public static Pageable toPageable(int page, int size) {
|
||||
return PageRequest.of(page - 1, size, Sort.by("id"));
|
||||
}
|
||||
}
|
||||
|
||||
40
demo/src/main/java/com/example/demo/api/PageRs.java
Normal file
40
demo/src/main/java/com/example/demo/api/PageRs.java
Normal file
@@ -0,0 +1,40 @@
|
||||
package com.example.demo.api;
|
||||
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import java.util.Optional;
|
||||
import java.util.function.Function;
|
||||
|
||||
import org.springframework.data.domain.Page;
|
||||
|
||||
public record PageRs<D>(
|
||||
List<D> items,
|
||||
int itemsCount,
|
||||
int currentPage,
|
||||
int currentSize,
|
||||
int totalPages,
|
||||
long totalItems,
|
||||
boolean isFirst,
|
||||
boolean isLast,
|
||||
boolean hasNext,
|
||||
boolean hasPrevious) {
|
||||
|
||||
public List<D> items() {
|
||||
return Optional.ofNullable(items).orElse(Collections.emptyList());
|
||||
}
|
||||
|
||||
public static <D, E> PageRs<D> from(Page<E> page, Function<E, D> mapper) {
|
||||
return new PageRs<>(
|
||||
page.getContent().stream().map(mapper::apply).toList(),
|
||||
page.getNumberOfElements(),
|
||||
page.getNumber() + 1,
|
||||
page.getSize(),
|
||||
page.getTotalPages(),
|
||||
page.getTotalElements(),
|
||||
page.isFirst(),
|
||||
page.isLast(),
|
||||
page.hasNext(),
|
||||
page.hasPrevious());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
package com.example.demo.config;
|
||||
|
||||
import io.swagger.v3.oas.models.OpenAPI;
|
||||
import io.swagger.v3.oas.models.info.Contact;
|
||||
import io.swagger.v3.oas.models.info.Info;
|
||||
import io.swagger.v3.oas.models.security.SecurityRequirement;
|
||||
import io.swagger.v3.oas.models.security.SecurityScheme;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
|
||||
@Configuration
|
||||
public class OpenApiConfig {
|
||||
|
||||
@Bean
|
||||
public OpenAPI customOpenAPI() {
|
||||
return new OpenAPI()
|
||||
.info(new Info()
|
||||
.title("Punk Rock API")
|
||||
.version("1.0.0")
|
||||
.description("REST API для управления данными о панк-рок исполнителях")
|
||||
.contact(new Contact()
|
||||
.name("Developer")
|
||||
.email("developer@example.com")))
|
||||
.addSecurityItem(new SecurityRequirement().addList("basicAuth"))
|
||||
.components(new io.swagger.v3.oas.models.Components()
|
||||
.addSecuritySchemes("basicAuth", new SecurityScheme()
|
||||
.type(SecurityScheme.Type.HTTP)
|
||||
.scheme("basic")
|
||||
.description("HTTP Basic Authentication")));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
package com.example.demo.configuration;
|
||||
|
||||
public class Constants {
|
||||
public static final String DEV_ORIGIN = "http://localhost:5173";
|
||||
public static final String API_URL = "/api";
|
||||
public static final String MVC_REDIRECT = "redirect:";
|
||||
public static final String LOGIN_URL = "/login";
|
||||
|
||||
private Constants() {
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,17 @@
|
||||
package com.example.demo.configuration;
|
||||
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
import org.springframework.context.annotation.Profile;
|
||||
import org.springframework.lang.NonNull;
|
||||
import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
|
||||
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
|
||||
|
||||
@Profile("!front")
|
||||
@Configuration
|
||||
public class MvcWebConfiguration implements WebMvcConfigurer {
|
||||
@Override
|
||||
public void addViewControllers(@NonNull ViewControllerRegistry registry) {
|
||||
registry.addRedirectViewController("/", "/page-artists");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,20 @@
|
||||
package com.example.demo.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(Constants.API_URL + "/**")
|
||||
.allowedMethods("GET", "POST", "PUT", "DELETE", "OPTIONS")
|
||||
.allowedOrigins("http://localhost:3000", "http://localhost:5173", Constants.DEV_ORIGIN)
|
||||
.allowedHeaders("*")
|
||||
.allowCredentials(true);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,58 @@
|
||||
package com.example.demo.controller;
|
||||
|
||||
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 jakarta.validation.Valid;
|
||||
import jakarta.validation.constraints.Min;
|
||||
import com.example.demo.api.PageHelper;
|
||||
import com.example.demo.api.PageRs;
|
||||
import com.example.demo.configuration.Constants;
|
||||
import com.example.demo.dto.ArtistRq;
|
||||
import com.example.demo.dto.ArtistRs;
|
||||
import com.example.demo.service.ArtistService;
|
||||
|
||||
@RestController
|
||||
@RequestMapping(Constants.API_URL + ArtistController.URL)
|
||||
public class ArtistController {
|
||||
public static final String URL = "/artists";
|
||||
private final ArtistService artistService;
|
||||
|
||||
public ArtistController(ArtistService artistService) {
|
||||
this.artistService = artistService;
|
||||
}
|
||||
|
||||
@GetMapping
|
||||
public PageRs<ArtistRs> getAll(
|
||||
@RequestParam(defaultValue = "1") @Min(1) int page,
|
||||
@RequestParam(defaultValue = "3") @Min(1) int size) {
|
||||
return artistService.getAll(PageHelper.toPageable(page, size));
|
||||
}
|
||||
|
||||
@GetMapping("/{id}")
|
||||
public ArtistRs get(@PathVariable Long id) {
|
||||
return artistService.get(id);
|
||||
}
|
||||
|
||||
@PostMapping
|
||||
public ArtistRs create(@RequestBody @Valid ArtistRq dto) {
|
||||
return artistService.create(dto);
|
||||
}
|
||||
|
||||
@PutMapping("/{id}")
|
||||
public ArtistRs update(@PathVariable Long id, @RequestBody @Valid ArtistRq dto) {
|
||||
return artistService.update(id, dto);
|
||||
}
|
||||
|
||||
@DeleteMapping("/{id}")
|
||||
public ArtistRs delete(@PathVariable Long id) {
|
||||
return artistService.delete(id);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,54 @@
|
||||
package com.example.demo.controller;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
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 jakarta.validation.Valid;
|
||||
import com.example.demo.configuration.Constants;
|
||||
import com.example.demo.dto.CountryRq;
|
||||
import com.example.demo.dto.CountryRs;
|
||||
import com.example.demo.service.CountryService;
|
||||
|
||||
@RestController
|
||||
@RequestMapping(Constants.API_URL + CountryController.URL)
|
||||
public class CountryController {
|
||||
public static final String URL = "/countries";
|
||||
private final CountryService countryService;
|
||||
|
||||
public CountryController(CountryService countryService) {
|
||||
this.countryService = countryService;
|
||||
}
|
||||
|
||||
@GetMapping
|
||||
public List<CountryRs> getAll() {
|
||||
return countryService.getAll();
|
||||
}
|
||||
|
||||
@GetMapping("/{id}")
|
||||
public CountryRs get(@PathVariable Long id) {
|
||||
return countryService.get(id);
|
||||
}
|
||||
|
||||
@PostMapping
|
||||
public CountryRs create(@RequestBody @Valid CountryRq dto) {
|
||||
return countryService.create(dto);
|
||||
}
|
||||
|
||||
@PutMapping("/{id}")
|
||||
public CountryRs update(@PathVariable Long id, @RequestBody @Valid CountryRq dto) {
|
||||
return countryService.update(id, dto);
|
||||
}
|
||||
|
||||
@DeleteMapping("/{id}")
|
||||
public CountryRs delete(@PathVariable Long id) {
|
||||
return countryService.delete(id);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,54 @@
|
||||
package com.example.demo.controller;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
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 jakarta.validation.Valid;
|
||||
import com.example.demo.configuration.Constants;
|
||||
import com.example.demo.dto.EpochRq;
|
||||
import com.example.demo.dto.EpochRs;
|
||||
import com.example.demo.service.EpochService;
|
||||
|
||||
@RestController
|
||||
@RequestMapping(Constants.API_URL + EpochController.URL)
|
||||
public class EpochController {
|
||||
public static final String URL = "/epochs";
|
||||
private final EpochService epochService;
|
||||
|
||||
public EpochController(EpochService epochService) {
|
||||
this.epochService = epochService;
|
||||
}
|
||||
|
||||
@GetMapping
|
||||
public List<EpochRs> getAll() {
|
||||
return epochService.getAll();
|
||||
}
|
||||
|
||||
@GetMapping("/{id}")
|
||||
public EpochRs get(@PathVariable Long id) {
|
||||
return epochService.get(id);
|
||||
}
|
||||
|
||||
@PostMapping
|
||||
public EpochRs create(@RequestBody @Valid EpochRq dto) {
|
||||
return epochService.create(dto);
|
||||
}
|
||||
|
||||
@PutMapping("/{id}")
|
||||
public EpochRs update(@PathVariable Long id, @RequestBody @Valid EpochRq dto) {
|
||||
return epochService.update(id, dto);
|
||||
}
|
||||
|
||||
@DeleteMapping("/{id}")
|
||||
public EpochRs delete(@PathVariable Long id) {
|
||||
return epochService.delete(id);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
package com.example.demo.controller;
|
||||
|
||||
import org.springframework.context.annotation.Profile;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
|
||||
@Profile("front")
|
||||
@Controller
|
||||
public class SpaController {
|
||||
@GetMapping(value = "/{path:^(?!api|assets|images|swagger-ui|.*\\.[a-zA-Z0-9]{2,10}).*}/**")
|
||||
public String forwardToIndex(@PathVariable(required = false) String path) {
|
||||
return "forward:/index.html";
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,39 @@
|
||||
package com.example.demo.controller.mvc;
|
||||
|
||||
import org.springframework.context.annotation.Scope;
|
||||
import org.springframework.context.annotation.ScopedProxyMode;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.web.context.WebApplicationContext;
|
||||
|
||||
@Component
|
||||
@Scope(value = WebApplicationContext.SCOPE_SESSION, proxyMode = ScopedProxyMode.TARGET_CLASS)
|
||||
public class ArtistFilterSession {
|
||||
private Long countryId;
|
||||
private Long epochId;
|
||||
|
||||
public Long getCountryId() {
|
||||
return countryId;
|
||||
}
|
||||
|
||||
public void setCountryId(Long countryId) {
|
||||
this.countryId = countryId;
|
||||
}
|
||||
|
||||
public Long getEpochId() {
|
||||
return epochId;
|
||||
}
|
||||
|
||||
public void setEpochId(Long epochId) {
|
||||
this.epochId = epochId;
|
||||
}
|
||||
|
||||
public void clearFilters() {
|
||||
this.countryId = null;
|
||||
this.epochId = null;
|
||||
}
|
||||
|
||||
public boolean hasFilters() {
|
||||
return countryId != null || epochId != null;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,179 @@
|
||||
package com.example.demo.controller.mvc;
|
||||
|
||||
import static com.example.demo.configuration.Constants.MVC_REDIRECT;
|
||||
|
||||
import org.springframework.context.annotation.Profile;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.validation.BindingResult;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.bind.annotation.SessionAttributes;
|
||||
import org.springframework.web.bind.support.SessionStatus;
|
||||
import org.springframework.web.servlet.mvc.support.RedirectAttributes;
|
||||
|
||||
import jakarta.validation.Valid;
|
||||
import com.example.demo.api.PageHelper;
|
||||
import com.example.demo.api.PageRs;
|
||||
import com.example.demo.dto.ArtistRs;
|
||||
import com.example.demo.dto.mvc.ArtistFormDto;
|
||||
import com.example.demo.service.ArtistService;
|
||||
import com.example.demo.service.CountryService;
|
||||
import com.example.demo.service.EpochService;
|
||||
|
||||
@Profile("!front")
|
||||
@SessionAttributes(ArtistMvcController.ATR_COUNTRIES)
|
||||
@Controller
|
||||
@RequestMapping("/" + ArtistMvcController.VIEW)
|
||||
public class ArtistMvcController {
|
||||
public static final String VIEW = "page-artists";
|
||||
private static final String VIEW_EDIT = "page-artists-edit";
|
||||
|
||||
private static final String ATR_ARTIST = "artist";
|
||||
public static final String ATR_COUNTRIES = "countries";
|
||||
public static final String ATR_EPOCHS = "epochs";
|
||||
private static final String ATR_PAGE = "page";
|
||||
private static final String ATR_ARTISTS = "artists";
|
||||
|
||||
private final ArtistService artistService;
|
||||
private final CountryService countryService;
|
||||
private final EpochService epochService;
|
||||
private final ArtistFilterSession filterSession;
|
||||
|
||||
public ArtistMvcController(
|
||||
ArtistService artistService,
|
||||
CountryService countryService,
|
||||
EpochService epochService,
|
||||
ArtistFilterSession filterSession) {
|
||||
this.artistService = artistService;
|
||||
this.countryService = countryService;
|
||||
this.epochService = epochService;
|
||||
this.filterSession = filterSession;
|
||||
}
|
||||
|
||||
@GetMapping
|
||||
public String getAll(
|
||||
@RequestParam(defaultValue = "1") int page,
|
||||
@RequestParam(defaultValue = "3") int size,
|
||||
@RequestParam(required = false) Long countryId,
|
||||
@RequestParam(required = false) Long epochId,
|
||||
SessionStatus sessionStatus,
|
||||
Model model) {
|
||||
if (countryId != null) {
|
||||
filterSession.setCountryId(countryId);
|
||||
}
|
||||
if (epochId != null) {
|
||||
filterSession.setEpochId(epochId);
|
||||
}
|
||||
|
||||
final PageRs<ArtistRs> artists = artistService.getAllFiltered(
|
||||
filterSession.getCountryId(),
|
||||
filterSession.getEpochId(),
|
||||
PageHelper.toPageable(page, size));
|
||||
|
||||
if (artists.itemsCount() == 0 && page > 1) {
|
||||
return MVC_REDIRECT + "/" + VIEW;
|
||||
}
|
||||
|
||||
model.addAttribute(ATR_ARTISTS, artists);
|
||||
model.addAttribute(ATR_PAGE, page);
|
||||
model.addAttribute(ATR_COUNTRIES, countryService.getAll());
|
||||
model.addAttribute(ATR_EPOCHS, epochService.getAll());
|
||||
model.addAttribute("selectedCountryId", filterSession.getCountryId());
|
||||
model.addAttribute("selectedEpochId", filterSession.getEpochId());
|
||||
sessionStatus.setComplete();
|
||||
return VIEW;
|
||||
}
|
||||
|
||||
@PostMapping("/filter")
|
||||
public String applyFilter(
|
||||
@RequestParam(required = false) Long countryId,
|
||||
@RequestParam(required = false) Long epochId,
|
||||
RedirectAttributes redirectAttributes) {
|
||||
filterSession.setCountryId(countryId);
|
||||
filterSession.setEpochId(epochId);
|
||||
redirectAttributes.addAttribute(ATR_PAGE, 1);
|
||||
return MVC_REDIRECT + "/" + VIEW;
|
||||
}
|
||||
|
||||
@PostMapping("/filter/clear")
|
||||
public String clearFilter(RedirectAttributes redirectAttributes) {
|
||||
filterSession.clearFilters();
|
||||
redirectAttributes.addAttribute(ATR_PAGE, 1);
|
||||
return MVC_REDIRECT + "/" + VIEW;
|
||||
}
|
||||
|
||||
@GetMapping(value = { "/edit", "/edit/" })
|
||||
public String create(@RequestParam(defaultValue = "1") int page, Model model) {
|
||||
final ArtistFormDto artist = ArtistFormDto.empty();
|
||||
model.addAttribute(ATR_ARTIST, artist);
|
||||
model.addAttribute(ATR_COUNTRIES, countryService.getAll());
|
||||
model.addAttribute(ATR_EPOCHS, epochService.getAll());
|
||||
model.addAttribute(ATR_PAGE, page);
|
||||
return VIEW_EDIT;
|
||||
}
|
||||
|
||||
@PostMapping(value = { "/edit", "/edit/" })
|
||||
public String create(
|
||||
@RequestParam(defaultValue = "1") int page,
|
||||
@ModelAttribute(name = ATR_ARTIST) @Valid ArtistFormDto dto,
|
||||
BindingResult bindingResult,
|
||||
Model model,
|
||||
RedirectAttributes redirectAttributes) {
|
||||
if (bindingResult.hasErrors()) {
|
||||
model.addAttribute(ATR_COUNTRIES, countryService.getAll());
|
||||
model.addAttribute(ATR_EPOCHS, epochService.getAll());
|
||||
model.addAttribute(ATR_PAGE, page);
|
||||
return VIEW_EDIT;
|
||||
}
|
||||
artistService.create(dto.toRq());
|
||||
redirectAttributes.addAttribute(ATR_PAGE, page);
|
||||
redirectAttributes.addFlashAttribute("successSave", true);
|
||||
return MVC_REDIRECT + "/" + VIEW;
|
||||
}
|
||||
|
||||
@GetMapping("/edit/{id:\\d+}")
|
||||
public String update(@PathVariable Long id, @RequestParam(defaultValue = "1") int page, Model model) {
|
||||
final ArtistFormDto artist = ArtistFormDto.fromRs(artistService.get(id));
|
||||
model.addAttribute(ATR_ARTIST, artist);
|
||||
model.addAttribute(ATR_COUNTRIES, countryService.getAll());
|
||||
model.addAttribute(ATR_EPOCHS, epochService.getAll());
|
||||
model.addAttribute(ATR_PAGE, page);
|
||||
return VIEW_EDIT;
|
||||
}
|
||||
|
||||
@PostMapping("/edit/{id:\\d+}")
|
||||
public String update(
|
||||
@PathVariable Long id,
|
||||
@RequestParam(defaultValue = "1") int page,
|
||||
@ModelAttribute(name = ATR_ARTIST) @Valid ArtistFormDto dto,
|
||||
BindingResult bindingResult,
|
||||
Model model,
|
||||
RedirectAttributes redirectAttributes) {
|
||||
if (bindingResult.hasErrors()) {
|
||||
model.addAttribute(ATR_COUNTRIES, countryService.getAll());
|
||||
model.addAttribute(ATR_EPOCHS, epochService.getAll());
|
||||
model.addAttribute(ATR_PAGE, page);
|
||||
return VIEW_EDIT;
|
||||
}
|
||||
artistService.update(id, dto.toRq());
|
||||
redirectAttributes.addAttribute(ATR_PAGE, page);
|
||||
redirectAttributes.addFlashAttribute("successSave", true);
|
||||
return MVC_REDIRECT + "/" + VIEW;
|
||||
}
|
||||
|
||||
@PostMapping("/delete/{id:\\d+}")
|
||||
public String delete(
|
||||
@PathVariable Long id,
|
||||
@RequestParam(defaultValue = "1") int page,
|
||||
RedirectAttributes redirectAttributes) {
|
||||
artistService.delete(id);
|
||||
redirectAttributes.addAttribute(ATR_PAGE, page);
|
||||
return MVC_REDIRECT + "/" + VIEW;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,121 @@
|
||||
package com.example.demo.controller.mvc;
|
||||
|
||||
import static com.example.demo.configuration.Constants.MVC_REDIRECT;
|
||||
|
||||
import org.springframework.context.annotation.Profile;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.validation.BindingResult;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.bind.annotation.SessionAttributes;
|
||||
import org.springframework.web.bind.support.SessionStatus;
|
||||
import org.springframework.web.servlet.mvc.support.RedirectAttributes;
|
||||
|
||||
import jakarta.validation.Valid;
|
||||
import com.example.demo.api.PageHelper;
|
||||
import com.example.demo.api.PageRs;
|
||||
import com.example.demo.dto.CountryRs;
|
||||
import com.example.demo.dto.mvc.CountryFormDto;
|
||||
import com.example.demo.service.CountryService;
|
||||
|
||||
@Profile("!front")
|
||||
@SessionAttributes(CountryMvcController.ATR_COUNTRIES)
|
||||
@Controller
|
||||
@RequestMapping("/" + CountryMvcController.VIEW)
|
||||
public class CountryMvcController {
|
||||
public static final String VIEW = "page-countries";
|
||||
private static final String VIEW_EDIT = "page-countries-edit";
|
||||
|
||||
private static final String ATR_COUNTRY = "country";
|
||||
public static final String ATR_COUNTRIES = "countries";
|
||||
private static final String ATR_PAGE = "page";
|
||||
|
||||
private final CountryService countryService;
|
||||
|
||||
public CountryMvcController(CountryService countryService) {
|
||||
this.countryService = countryService;
|
||||
}
|
||||
|
||||
@GetMapping
|
||||
public String getAll(
|
||||
@RequestParam(defaultValue = "1") int page,
|
||||
@RequestParam(defaultValue = "10") int size,
|
||||
SessionStatus sessionStatus,
|
||||
Model model) {
|
||||
final PageRs<CountryRs> countries = countryService.getAll(PageHelper.toPageable(page, size));
|
||||
if (countries.itemsCount() == 0 && page > 1) {
|
||||
return MVC_REDIRECT + "/" + VIEW;
|
||||
}
|
||||
model.addAttribute(ATR_COUNTRIES, countries);
|
||||
model.addAttribute(ATR_PAGE, page);
|
||||
sessionStatus.setComplete();
|
||||
return VIEW;
|
||||
}
|
||||
|
||||
@GetMapping(value = { "/edit", "/edit/" })
|
||||
public String create(@RequestParam(defaultValue = "1") int page, Model model) {
|
||||
final CountryFormDto country = CountryFormDto.empty();
|
||||
model.addAttribute(ATR_COUNTRY, country);
|
||||
model.addAttribute(ATR_PAGE, page);
|
||||
return VIEW_EDIT;
|
||||
}
|
||||
|
||||
@PostMapping(value = { "/edit", "/edit/" })
|
||||
public String create(
|
||||
@RequestParam(defaultValue = "1") int page,
|
||||
@ModelAttribute(name = ATR_COUNTRY) @Valid CountryFormDto dto,
|
||||
BindingResult bindingResult,
|
||||
Model model,
|
||||
RedirectAttributes redirectAttributes) {
|
||||
if (bindingResult.hasErrors()) {
|
||||
model.addAttribute(ATR_PAGE, page);
|
||||
return VIEW_EDIT;
|
||||
}
|
||||
countryService.create(dto.toRq());
|
||||
redirectAttributes.addAttribute(ATR_PAGE, page);
|
||||
redirectAttributes.addFlashAttribute("successSave", true);
|
||||
return MVC_REDIRECT + "/" + VIEW;
|
||||
}
|
||||
|
||||
@GetMapping("/edit/{id:\\d+}")
|
||||
public String update(@PathVariable Long id, @RequestParam(defaultValue = "1") int page, Model model) {
|
||||
final CountryFormDto country = CountryFormDto.fromRs(countryService.get(id));
|
||||
model.addAttribute(ATR_COUNTRY, country);
|
||||
model.addAttribute(ATR_PAGE, page);
|
||||
return VIEW_EDIT;
|
||||
}
|
||||
|
||||
@PostMapping("/edit/{id:\\d+}")
|
||||
public String update(
|
||||
@PathVariable Long id,
|
||||
@RequestParam(defaultValue = "1") int page,
|
||||
@ModelAttribute(name = ATR_COUNTRY) @Valid CountryFormDto dto,
|
||||
BindingResult bindingResult,
|
||||
Model model,
|
||||
RedirectAttributes redirectAttributes) {
|
||||
if (bindingResult.hasErrors()) {
|
||||
model.addAttribute(ATR_PAGE, page);
|
||||
return VIEW_EDIT;
|
||||
}
|
||||
countryService.update(id, dto.toRq());
|
||||
redirectAttributes.addAttribute(ATR_PAGE, page);
|
||||
redirectAttributes.addFlashAttribute("successSave", true);
|
||||
return MVC_REDIRECT + "/" + VIEW;
|
||||
}
|
||||
|
||||
@PostMapping("/delete/{id:\\d+}")
|
||||
public String delete(
|
||||
@PathVariable Long id,
|
||||
@RequestParam(defaultValue = "1") int page,
|
||||
RedirectAttributes redirectAttributes) {
|
||||
countryService.delete(id);
|
||||
redirectAttributes.addAttribute(ATR_PAGE, page);
|
||||
return MVC_REDIRECT + "/" + VIEW;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,21 @@
|
||||
package com.example.demo.controller.mvc;
|
||||
|
||||
import org.springframework.context.annotation.Profile;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
|
||||
import com.example.demo.configuration.Constants;
|
||||
|
||||
@Profile("!front")
|
||||
@Controller
|
||||
@RequestMapping(Constants.LOGIN_URL)
|
||||
public class LoginMvcController {
|
||||
public static final String VIEW = "login";
|
||||
|
||||
@GetMapping
|
||||
public String getLogin() {
|
||||
return VIEW;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,41 @@
|
||||
package com.example.demo.controller.mvc;
|
||||
|
||||
import org.springframework.context.annotation.Profile;
|
||||
import org.springframework.security.core.Authentication;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
|
||||
import com.example.demo.dto.UserRs;
|
||||
import com.example.demo.security.UserPrincipal;
|
||||
import com.example.demo.service.UserService;
|
||||
|
||||
@Profile("!front")
|
||||
@Controller
|
||||
@RequestMapping("/page-user")
|
||||
public class UserMvcController {
|
||||
public static final String VIEW = "page-user";
|
||||
|
||||
private final UserService userService;
|
||||
|
||||
public UserMvcController(UserService userService) {
|
||||
this.userService = userService;
|
||||
}
|
||||
|
||||
@GetMapping
|
||||
public String getUserProfile(Authentication authentication, Model model) {
|
||||
if (authentication != null && authentication.getPrincipal() instanceof UserPrincipal) {
|
||||
UserPrincipal principal = (UserPrincipal) authentication.getPrincipal();
|
||||
String username = principal.getUsername();
|
||||
|
||||
UserRs user = userService.get(username);
|
||||
|
||||
model.addAttribute("user", user);
|
||||
model.addAttribute("username", user.login());
|
||||
model.addAttribute("role", user.role());
|
||||
}
|
||||
return VIEW;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,62 @@
|
||||
package com.example.demo.controller.mvc;
|
||||
|
||||
import org.springframework.context.annotation.Profile;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.validation.BindingResult;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
|
||||
import jakarta.validation.Valid;
|
||||
import com.example.demo.configuration.Constants;
|
||||
import com.example.demo.dto.mvc.UserSignupFormDto;
|
||||
import com.example.demo.error.AlreadyExistsException;
|
||||
import com.example.demo.error.PasswordConfirmationException;
|
||||
import com.example.demo.service.UserService;
|
||||
|
||||
@Profile("!front")
|
||||
@Controller
|
||||
@RequestMapping("/" + UserSignupMvcController.VIEW)
|
||||
public class UserSignupMvcController {
|
||||
public static final String VIEW = "signup";
|
||||
|
||||
private static final String ATR_USER = "user";
|
||||
|
||||
private UserService userService;
|
||||
|
||||
public UserSignupMvcController(UserService userService) {
|
||||
this.userService = userService;
|
||||
}
|
||||
|
||||
@GetMapping
|
||||
public String getSignup(Model model) {
|
||||
model.addAttribute(ATR_USER, UserSignupFormDto.empty());
|
||||
return VIEW;
|
||||
}
|
||||
|
||||
@PostMapping
|
||||
public String signup(
|
||||
@ModelAttribute(name = ATR_USER) @Valid UserSignupFormDto dto,
|
||||
BindingResult bindingResult,
|
||||
Model model) {
|
||||
if (bindingResult.hasErrors()) {
|
||||
return VIEW;
|
||||
}
|
||||
try {
|
||||
userService.create(dto.toRq());
|
||||
} catch (AlreadyExistsException ae) {
|
||||
bindingResult.rejectValue("login", "signup:login", ae.getMessage());
|
||||
model.addAttribute(ATR_USER, dto);
|
||||
return VIEW;
|
||||
} catch (PasswordConfirmationException pce) {
|
||||
bindingResult.rejectValue("password", "signup:password", pce.getMessage());
|
||||
bindingResult.rejectValue("passwordConfirm", "signup:passwordConfirm", pce.getMessage());
|
||||
model.addAttribute(ATR_USER, dto);
|
||||
return VIEW;
|
||||
}
|
||||
return "redirect:" + Constants.LOGIN_URL + "?signup";
|
||||
}
|
||||
}
|
||||
|
||||
59
demo/src/main/java/com/example/demo/dto/ArtistDto.java
Normal file
59
demo/src/main/java/com/example/demo/dto/ArtistDto.java
Normal file
@@ -0,0 +1,59 @@
|
||||
package com.example.demo.dto;
|
||||
|
||||
public class ArtistDto {
|
||||
private Integer id;
|
||||
private String name;
|
||||
private String description;
|
||||
private Integer epochId;
|
||||
private Integer countryId;
|
||||
|
||||
public ArtistDto() {}
|
||||
|
||||
public ArtistDto(Integer id, String name, String description, Integer epochId, Integer countryId) {
|
||||
this.id = id;
|
||||
this.name = name;
|
||||
this.description = description;
|
||||
this.epochId = epochId;
|
||||
this.countryId = countryId;
|
||||
}
|
||||
|
||||
public Integer getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(Integer id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
public void setName(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public String getDescription() {
|
||||
return description;
|
||||
}
|
||||
|
||||
public void setDescription(String description) {
|
||||
this.description = description;
|
||||
}
|
||||
|
||||
public Integer getEpochId() {
|
||||
return epochId;
|
||||
}
|
||||
|
||||
public void setEpochId(Integer epochId) {
|
||||
this.epochId = epochId;
|
||||
}
|
||||
|
||||
public Integer getCountryId() {
|
||||
return countryId;
|
||||
}
|
||||
|
||||
public void setCountryId(Integer countryId) {
|
||||
this.countryId = countryId;
|
||||
}
|
||||
}
|
||||
47
demo/src/main/java/com/example/demo/dto/ArtistRq.java
Normal file
47
demo/src/main/java/com/example/demo/dto/ArtistRq.java
Normal file
@@ -0,0 +1,47 @@
|
||||
package com.example.demo.dto;
|
||||
|
||||
import jakarta.validation.constraints.NotBlank;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
|
||||
public class ArtistRq {
|
||||
@NotBlank
|
||||
private String name;
|
||||
private String description;
|
||||
@NotNull
|
||||
private Long epochId;
|
||||
@NotNull
|
||||
private Long countryId;
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
public void setName(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public String getDescription() {
|
||||
return description;
|
||||
}
|
||||
|
||||
public void setDescription(String description) {
|
||||
this.description = description;
|
||||
}
|
||||
|
||||
public Long getEpochId() {
|
||||
return epochId;
|
||||
}
|
||||
|
||||
public void setEpochId(Long epochId) {
|
||||
this.epochId = epochId;
|
||||
}
|
||||
|
||||
public Long getCountryId() {
|
||||
return countryId;
|
||||
}
|
||||
|
||||
public void setCountryId(Long countryId) {
|
||||
this.countryId = countryId;
|
||||
}
|
||||
}
|
||||
|
||||
50
demo/src/main/java/com/example/demo/dto/ArtistRs.java
Normal file
50
demo/src/main/java/com/example/demo/dto/ArtistRs.java
Normal file
@@ -0,0 +1,50 @@
|
||||
package com.example.demo.dto;
|
||||
|
||||
public class ArtistRs {
|
||||
private Long id;
|
||||
private String name;
|
||||
private String description;
|
||||
private EpochRs epoch;
|
||||
private CountryRs country;
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
public String getDescription() {
|
||||
return description;
|
||||
}
|
||||
|
||||
public void setDescription(String description) {
|
||||
this.description = description;
|
||||
}
|
||||
|
||||
public EpochRs getEpoch() {
|
||||
return epoch;
|
||||
}
|
||||
|
||||
public void setEpoch(EpochRs epoch) {
|
||||
this.epoch = epoch;
|
||||
}
|
||||
|
||||
public CountryRs getCountry() {
|
||||
return country;
|
||||
}
|
||||
|
||||
public void setCountry(CountryRs country) {
|
||||
this.country = country;
|
||||
}
|
||||
}
|
||||
|
||||
29
demo/src/main/java/com/example/demo/dto/CountryDto.java
Normal file
29
demo/src/main/java/com/example/demo/dto/CountryDto.java
Normal file
@@ -0,0 +1,29 @@
|
||||
package com.example.demo.dto;
|
||||
|
||||
public class CountryDto {
|
||||
private Integer id;
|
||||
private String name;
|
||||
|
||||
public CountryDto() {}
|
||||
|
||||
public CountryDto(Integer id, String name) {
|
||||
this.id = id;
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public Integer getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(Integer id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
public void setName(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
}
|
||||
17
demo/src/main/java/com/example/demo/dto/CountryRq.java
Normal file
17
demo/src/main/java/com/example/demo/dto/CountryRq.java
Normal file
@@ -0,0 +1,17 @@
|
||||
package com.example.demo.dto;
|
||||
|
||||
import jakarta.validation.constraints.NotBlank;
|
||||
|
||||
public class CountryRq {
|
||||
@NotBlank
|
||||
private String name;
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
public void setName(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
}
|
||||
|
||||
23
demo/src/main/java/com/example/demo/dto/CountryRs.java
Normal file
23
demo/src/main/java/com/example/demo/dto/CountryRs.java
Normal file
@@ -0,0 +1,23 @@
|
||||
package com.example.demo.dto;
|
||||
|
||||
public class CountryRs {
|
||||
private Long id;
|
||||
private String name;
|
||||
|
||||
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;
|
||||
}
|
||||
}
|
||||
|
||||
29
demo/src/main/java/com/example/demo/dto/EpochDto.java
Normal file
29
demo/src/main/java/com/example/demo/dto/EpochDto.java
Normal file
@@ -0,0 +1,29 @@
|
||||
package com.example.demo.dto;
|
||||
|
||||
public class EpochDto {
|
||||
private Integer id;
|
||||
private String name;
|
||||
|
||||
public EpochDto() {}
|
||||
|
||||
public EpochDto(Integer id, String name) {
|
||||
this.id = id;
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public Integer getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(Integer id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
public void setName(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
}
|
||||
17
demo/src/main/java/com/example/demo/dto/EpochRq.java
Normal file
17
demo/src/main/java/com/example/demo/dto/EpochRq.java
Normal file
@@ -0,0 +1,17 @@
|
||||
package com.example.demo.dto;
|
||||
|
||||
import jakarta.validation.constraints.NotBlank;
|
||||
|
||||
public class EpochRq {
|
||||
@NotBlank
|
||||
private String name;
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
public void setName(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
}
|
||||
|
||||
23
demo/src/main/java/com/example/demo/dto/EpochRs.java
Normal file
23
demo/src/main/java/com/example/demo/dto/EpochRs.java
Normal file
@@ -0,0 +1,23 @@
|
||||
package com.example.demo.dto;
|
||||
|
||||
public class EpochRs {
|
||||
private Long id;
|
||||
private String name;
|
||||
|
||||
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;
|
||||
}
|
||||
}
|
||||
|
||||
11
demo/src/main/java/com/example/demo/dto/UserRq.java
Normal file
11
demo/src/main/java/com/example/demo/dto/UserRq.java
Normal file
@@ -0,0 +1,11 @@
|
||||
package com.example.demo.dto;
|
||||
|
||||
import jakarta.validation.constraints.NotBlank;
|
||||
import jakarta.validation.constraints.Size;
|
||||
|
||||
public record UserRq(
|
||||
@NotBlank @Size(min = 3, max = 20) String login,
|
||||
@NotBlank @Size(min = 3, max = 60) String password,
|
||||
@NotBlank @Size(min = 3, max = 60) String passwordConfirm) {
|
||||
}
|
||||
|
||||
11
demo/src/main/java/com/example/demo/dto/UserRs.java
Normal file
11
demo/src/main/java/com/example/demo/dto/UserRs.java
Normal file
@@ -0,0 +1,11 @@
|
||||
package com.example.demo.dto;
|
||||
|
||||
import com.example.demo.entity.UserEntity;
|
||||
import com.example.demo.entity.UserRole;
|
||||
|
||||
public record UserRs(Long id, String login, UserRole role) {
|
||||
public static UserRs from(UserEntity entity) {
|
||||
return new UserRs(entity.getId(), entity.getLogin(), entity.getRole());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,42 @@
|
||||
package com.example.demo.dto.mvc;
|
||||
|
||||
import java.util.Optional;
|
||||
|
||||
import jakarta.validation.constraints.NotBlank;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import jakarta.validation.constraints.Min;
|
||||
import com.example.demo.dto.ArtistRq;
|
||||
import com.example.demo.dto.ArtistRs;
|
||||
import com.example.demo.dto.CountryRs;
|
||||
import com.example.demo.dto.EpochRs;
|
||||
|
||||
public record ArtistFormDto(
|
||||
Long id,
|
||||
@NotBlank String name,
|
||||
String description,
|
||||
@NotNull @Min(1) Long epochId,
|
||||
@NotNull @Min(1) Long countryId) {
|
||||
|
||||
public static ArtistFormDto empty() {
|
||||
return new ArtistFormDto(null, null, null, -1L, -1L);
|
||||
}
|
||||
|
||||
public static ArtistFormDto fromRs(ArtistRs item) {
|
||||
return new ArtistFormDto(
|
||||
item.getId(),
|
||||
item.getName(),
|
||||
item.getDescription(),
|
||||
Optional.ofNullable(item.getEpoch()).map(EpochRs::getId).orElse(-1L),
|
||||
Optional.ofNullable(item.getCountry()).map(CountryRs::getId).orElse(-1L));
|
||||
}
|
||||
|
||||
public ArtistRq toRq() {
|
||||
ArtistRq rq = new ArtistRq();
|
||||
rq.setName(name);
|
||||
rq.setDescription(description);
|
||||
rq.setEpochId(epochId);
|
||||
rq.setCountryId(countryId);
|
||||
return rq;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,25 @@
|
||||
package com.example.demo.dto.mvc;
|
||||
|
||||
import jakarta.validation.constraints.NotBlank;
|
||||
import com.example.demo.dto.CountryRq;
|
||||
import com.example.demo.dto.CountryRs;
|
||||
|
||||
public record CountryFormDto(
|
||||
Long id,
|
||||
@NotBlank String name) {
|
||||
|
||||
public static CountryFormDto empty() {
|
||||
return new CountryFormDto(null, null);
|
||||
}
|
||||
|
||||
public static CountryFormDto fromRs(CountryRs item) {
|
||||
return new CountryFormDto(item.getId(), item.getName());
|
||||
}
|
||||
|
||||
public CountryRq toRq() {
|
||||
CountryRq rq = new CountryRq();
|
||||
rq.setName(name);
|
||||
return rq;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,20 @@
|
||||
package com.example.demo.dto.mvc;
|
||||
|
||||
import jakarta.validation.constraints.NotBlank;
|
||||
import jakarta.validation.constraints.Size;
|
||||
import com.example.demo.dto.UserRq;
|
||||
|
||||
public record UserSignupFormDto(
|
||||
@NotBlank @Size(min = 3, max = 20) String login,
|
||||
@NotBlank @Size(min = 3, max = 60) String password,
|
||||
@NotBlank @Size(min = 3, max = 60) String passwordConfirm) {
|
||||
|
||||
public static UserSignupFormDto empty() {
|
||||
return new UserSignupFormDto(null, null, null);
|
||||
}
|
||||
|
||||
public UserRq toRq() {
|
||||
return new UserRq(login, password, passwordConfirm);
|
||||
}
|
||||
}
|
||||
|
||||
92
demo/src/main/java/com/example/demo/entity/ArtistEntity.java
Normal file
92
demo/src/main/java/com/example/demo/entity/ArtistEntity.java
Normal file
@@ -0,0 +1,92 @@
|
||||
package com.example.demo.entity;
|
||||
|
||||
import jakarta.persistence.Column;
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.JoinColumn;
|
||||
import jakarta.persistence.ManyToOne;
|
||||
import jakarta.persistence.Table;
|
||||
|
||||
@Entity
|
||||
@Table(name = "artists")
|
||||
public class ArtistEntity extends BaseEntity {
|
||||
@Column(nullable = false)
|
||||
private String name;
|
||||
|
||||
@Column(columnDefinition = "text")
|
||||
private String description;
|
||||
|
||||
@JoinColumn(name = "epoch_id", nullable = false)
|
||||
@ManyToOne
|
||||
private EpochEntity epoch;
|
||||
|
||||
@JoinColumn(name = "country_id", nullable = false)
|
||||
@ManyToOne
|
||||
private CountryEntity country;
|
||||
|
||||
public ArtistEntity() {
|
||||
super();
|
||||
}
|
||||
|
||||
public ArtistEntity(String name, String description, EpochEntity epoch, CountryEntity country) {
|
||||
this();
|
||||
this.name = name;
|
||||
this.description = description;
|
||||
setEpoch(epoch);
|
||||
setCountry(country);
|
||||
}
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
public void setName(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public String getDescription() {
|
||||
return description;
|
||||
}
|
||||
|
||||
public void setDescription(String description) {
|
||||
this.description = description;
|
||||
}
|
||||
|
||||
public EpochEntity getEpoch() {
|
||||
return epoch;
|
||||
}
|
||||
|
||||
public void setEpoch(EpochEntity epoch) {
|
||||
if (this.epoch == epoch) {
|
||||
return;
|
||||
}
|
||||
if (this.epoch != null) {
|
||||
EpochEntity oldEpoch = this.epoch;
|
||||
this.epoch = null;
|
||||
oldEpoch.removeArtist(this);
|
||||
}
|
||||
this.epoch = epoch;
|
||||
if (epoch != null) {
|
||||
epoch.addArtist(this);
|
||||
}
|
||||
}
|
||||
|
||||
public CountryEntity getCountry() {
|
||||
return country;
|
||||
}
|
||||
|
||||
public void setCountry(CountryEntity country) {
|
||||
if (this.country == country) {
|
||||
return;
|
||||
}
|
||||
if (this.country != null) {
|
||||
CountryEntity oldCountry = this.country;
|
||||
this.country = null;
|
||||
oldCountry.removeArtist(this);
|
||||
}
|
||||
this.country = country;
|
||||
if (country != null) {
|
||||
country.addArtist(this);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
27
demo/src/main/java/com/example/demo/entity/BaseEntity.java
Normal file
27
demo/src/main/java/com/example/demo/entity/BaseEntity.java
Normal file
@@ -0,0 +1,27 @@
|
||||
package com.example.demo.entity;
|
||||
|
||||
import jakarta.persistence.GeneratedValue;
|
||||
import jakarta.persistence.GenerationType;
|
||||
import jakarta.persistence.Id;
|
||||
import jakarta.persistence.MappedSuperclass;
|
||||
import jakarta.persistence.SequenceGenerator;
|
||||
|
||||
@MappedSuperclass
|
||||
public abstract class BaseEntity {
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.SEQUENCE)
|
||||
@SequenceGenerator(name = "hibernate_sequence")
|
||||
protected Long id;
|
||||
|
||||
protected BaseEntity() {
|
||||
}
|
||||
|
||||
public Long getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(Long id) {
|
||||
this.id = id;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,61 @@
|
||||
package com.example.demo.entity;
|
||||
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
|
||||
import jakarta.persistence.Column;
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.OneToMany;
|
||||
import jakarta.persistence.OrderBy;
|
||||
import jakarta.persistence.Table;
|
||||
|
||||
@Entity
|
||||
@Table(name = "countries")
|
||||
public class CountryEntity extends BaseEntity {
|
||||
@Column(nullable = false)
|
||||
private String name;
|
||||
|
||||
@OneToMany(mappedBy = "country")
|
||||
@OrderBy("id ASC")
|
||||
private Set<ArtistEntity> artists = new HashSet<>();
|
||||
|
||||
public CountryEntity() {
|
||||
super();
|
||||
}
|
||||
|
||||
public CountryEntity(String name) {
|
||||
this();
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
public void setName(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public Set<ArtistEntity> getArtists() {
|
||||
return artists;
|
||||
}
|
||||
|
||||
public void addArtist(ArtistEntity artist) {
|
||||
if (!artists.contains(artist)) {
|
||||
artists.add(artist);
|
||||
if (artist.getCountry() != this) {
|
||||
artist.setCountry(this);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void removeArtist(ArtistEntity artist) {
|
||||
if (artists.contains(artist)) {
|
||||
artists.remove(artist);
|
||||
if (artist.getCountry() == this) {
|
||||
artist.setCountry(null);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
61
demo/src/main/java/com/example/demo/entity/EpochEntity.java
Normal file
61
demo/src/main/java/com/example/demo/entity/EpochEntity.java
Normal file
@@ -0,0 +1,61 @@
|
||||
package com.example.demo.entity;
|
||||
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
|
||||
import jakarta.persistence.Column;
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.OneToMany;
|
||||
import jakarta.persistence.OrderBy;
|
||||
import jakarta.persistence.Table;
|
||||
|
||||
@Entity
|
||||
@Table(name = "epochs")
|
||||
public class EpochEntity extends BaseEntity {
|
||||
@Column(nullable = false)
|
||||
private String name;
|
||||
|
||||
@OneToMany(mappedBy = "epoch")
|
||||
@OrderBy("id ASC")
|
||||
private Set<ArtistEntity> artists = new HashSet<>();
|
||||
|
||||
public EpochEntity() {
|
||||
super();
|
||||
}
|
||||
|
||||
public EpochEntity(String name) {
|
||||
this();
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
public void setName(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public Set<ArtistEntity> getArtists() {
|
||||
return artists;
|
||||
}
|
||||
|
||||
public void addArtist(ArtistEntity artist) {
|
||||
if (!artists.contains(artist)) {
|
||||
artists.add(artist);
|
||||
if (artist.getEpoch() != this) {
|
||||
artist.setEpoch(this);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void removeArtist(ArtistEntity artist) {
|
||||
if (artists.contains(artist)) {
|
||||
artists.remove(artist);
|
||||
if (artist.getEpoch() == this) {
|
||||
artist.setEpoch(null);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
52
demo/src/main/java/com/example/demo/entity/UserEntity.java
Normal file
52
demo/src/main/java/com/example/demo/entity/UserEntity.java
Normal file
@@ -0,0 +1,52 @@
|
||||
package com.example.demo.entity;
|
||||
|
||||
import jakarta.persistence.Column;
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.EnumType;
|
||||
import jakarta.persistence.Enumerated;
|
||||
import jakarta.persistence.Table;
|
||||
|
||||
@Entity
|
||||
@Table(name = "sec_users")
|
||||
public class UserEntity extends BaseEntity {
|
||||
@Column(nullable = false, unique = true, length = 20)
|
||||
private String login;
|
||||
@Column(nullable = false, length = 255)
|
||||
private String password;
|
||||
@Enumerated(EnumType.STRING)
|
||||
private UserRole role;
|
||||
|
||||
public UserEntity() {
|
||||
}
|
||||
|
||||
public UserEntity(String login, String password) {
|
||||
this.login = login;
|
||||
this.password = password;
|
||||
this.role = UserRole.USER;
|
||||
}
|
||||
|
||||
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 UserRole getRole() {
|
||||
return role;
|
||||
}
|
||||
|
||||
public void setRole(UserRole role) {
|
||||
this.role = role;
|
||||
}
|
||||
}
|
||||
|
||||
14
demo/src/main/java/com/example/demo/entity/UserRole.java
Normal file
14
demo/src/main/java/com/example/demo/entity/UserRole.java
Normal file
@@ -0,0 +1,14 @@
|
||||
package com.example.demo.entity;
|
||||
|
||||
import org.springframework.security.core.GrantedAuthority;
|
||||
|
||||
public enum UserRole implements GrantedAuthority {
|
||||
ADMIN,
|
||||
USER;
|
||||
|
||||
@Override
|
||||
public String getAuthority() {
|
||||
return "ROLE_" + this.name();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,8 @@
|
||||
package com.example.demo.entity.projection;
|
||||
|
||||
public interface ArtistStatsProjection {
|
||||
Long getTotalArtists();
|
||||
Long getArtistsWithDescription();
|
||||
Long getArtistsWithoutDescription();
|
||||
}
|
||||
|
||||
@@ -0,0 +1,9 @@
|
||||
package com.example.demo.entity.projection;
|
||||
|
||||
import com.example.demo.entity.CountryEntity;
|
||||
|
||||
public interface CountryStatsProjection {
|
||||
CountryEntity getCountry();
|
||||
Long getArtistsCount();
|
||||
}
|
||||
|
||||
@@ -0,0 +1,9 @@
|
||||
package com.example.demo.entity.projection;
|
||||
|
||||
import com.example.demo.entity.EpochEntity;
|
||||
|
||||
public interface EpochStatsProjection {
|
||||
EpochEntity getEpoch();
|
||||
Long getArtistsCount();
|
||||
}
|
||||
|
||||
@@ -0,0 +1,8 @@
|
||||
package com.example.demo.error;
|
||||
|
||||
public class AlreadyExistsException extends RuntimeException {
|
||||
public AlreadyExistsException(Class<?> entityClass, String identifier) {
|
||||
super(String.format("%s with identifier '%s' already exists", entityClass.getSimpleName(), identifier));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,12 @@
|
||||
package com.example.demo.error;
|
||||
|
||||
public class NotFoundException extends RuntimeException {
|
||||
public <T> NotFoundException(Class<T> entClass, Long id) {
|
||||
super(String.format("%s with id %s is not found", entClass.getSimpleName(), id));
|
||||
}
|
||||
|
||||
public <T> NotFoundException(Class<T> entClass, String field, String value) {
|
||||
super(String.format("%s with %s '%s' is not found", entClass.getSimpleName(), field, value));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,8 @@
|
||||
package com.example.demo.error;
|
||||
|
||||
public class PasswordConfirmationException extends RuntimeException {
|
||||
public PasswordConfirmationException() {
|
||||
super("Passwords do not match");
|
||||
}
|
||||
}
|
||||
|
||||
51
demo/src/main/java/com/example/demo/mapper/ArtistMapper.java
Normal file
51
demo/src/main/java/com/example/demo/mapper/ArtistMapper.java
Normal file
@@ -0,0 +1,51 @@
|
||||
package com.example.demo.mapper;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.stream.StreamSupport;
|
||||
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import com.example.demo.dto.ArtistRq;
|
||||
import com.example.demo.dto.ArtistRs;
|
||||
import com.example.demo.entity.ArtistEntity;
|
||||
|
||||
@Component
|
||||
public class ArtistMapper {
|
||||
private final EpochMapper epochMapper;
|
||||
private final CountryMapper countryMapper;
|
||||
|
||||
public ArtistMapper(EpochMapper epochMapper, CountryMapper countryMapper) {
|
||||
this.epochMapper = epochMapper;
|
||||
this.countryMapper = countryMapper;
|
||||
}
|
||||
|
||||
public ArtistRq toRqDto(String name, String description, Long epochId, Long countryId) {
|
||||
final ArtistRq dto = new ArtistRq();
|
||||
dto.setName(name);
|
||||
dto.setDescription(description);
|
||||
dto.setEpochId(epochId);
|
||||
dto.setCountryId(countryId);
|
||||
return dto;
|
||||
}
|
||||
|
||||
public ArtistRs toRsDto(ArtistEntity entity) {
|
||||
final ArtistRs dto = new ArtistRs();
|
||||
dto.setId(entity.getId());
|
||||
dto.setName(entity.getName());
|
||||
dto.setDescription(entity.getDescription());
|
||||
if (entity.getEpoch() != null) {
|
||||
dto.setEpoch(epochMapper.toRsDto(entity.getEpoch()));
|
||||
}
|
||||
if (entity.getCountry() != null) {
|
||||
dto.setCountry(countryMapper.toRsDto(entity.getCountry()));
|
||||
}
|
||||
return dto;
|
||||
}
|
||||
|
||||
public List<ArtistRs> toRsDtoList(Iterable<ArtistEntity> entities) {
|
||||
return StreamSupport.stream(entities.spliterator(), false)
|
||||
.map(this::toRsDto)
|
||||
.toList();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,33 @@
|
||||
package com.example.demo.mapper;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.stream.StreamSupport;
|
||||
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import com.example.demo.dto.CountryRq;
|
||||
import com.example.demo.dto.CountryRs;
|
||||
import com.example.demo.entity.CountryEntity;
|
||||
|
||||
@Component
|
||||
public class CountryMapper {
|
||||
public CountryRq toRqDto(String name) {
|
||||
final CountryRq dto = new CountryRq();
|
||||
dto.setName(name);
|
||||
return dto;
|
||||
}
|
||||
|
||||
public CountryRs toRsDto(CountryEntity entity) {
|
||||
final CountryRs dto = new CountryRs();
|
||||
dto.setId(entity.getId());
|
||||
dto.setName(entity.getName());
|
||||
return dto;
|
||||
}
|
||||
|
||||
public List<CountryRs> toRsDtoList(Iterable<CountryEntity> entities) {
|
||||
return StreamSupport.stream(entities.spliterator(), false)
|
||||
.map(this::toRsDto)
|
||||
.toList();
|
||||
}
|
||||
}
|
||||
|
||||
33
demo/src/main/java/com/example/demo/mapper/EpochMapper.java
Normal file
33
demo/src/main/java/com/example/demo/mapper/EpochMapper.java
Normal file
@@ -0,0 +1,33 @@
|
||||
package com.example.demo.mapper;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.stream.StreamSupport;
|
||||
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import com.example.demo.dto.EpochRq;
|
||||
import com.example.demo.dto.EpochRs;
|
||||
import com.example.demo.entity.EpochEntity;
|
||||
|
||||
@Component
|
||||
public class EpochMapper {
|
||||
public EpochRq toRqDto(String name) {
|
||||
final EpochRq dto = new EpochRq();
|
||||
dto.setName(name);
|
||||
return dto;
|
||||
}
|
||||
|
||||
public EpochRs toRsDto(EpochEntity entity) {
|
||||
final EpochRs dto = new EpochRs();
|
||||
dto.setId(entity.getId());
|
||||
dto.setName(entity.getName());
|
||||
return dto;
|
||||
}
|
||||
|
||||
public List<EpochRs> toRsDtoList(Iterable<EpochEntity> entities) {
|
||||
return StreamSupport.stream(entities.spliterator(), false)
|
||||
.map(this::toRsDto)
|
||||
.toList();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,47 @@
|
||||
package com.example.demo.repository;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import org.springframework.data.domain.Page;
|
||||
import org.springframework.data.domain.Pageable;
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
import org.springframework.data.jpa.repository.Query;
|
||||
import org.springframework.data.repository.query.Param;
|
||||
|
||||
import com.example.demo.entity.ArtistEntity;
|
||||
import com.example.demo.entity.projection.ArtistStatsProjection;
|
||||
|
||||
public interface ArtistRepository extends JpaRepository<ArtistEntity, Long> {
|
||||
List<ArtistEntity> findByEpochId(Long epochId);
|
||||
|
||||
List<ArtistEntity> findByCountryId(Long countryId);
|
||||
|
||||
List<ArtistEntity> findByEpochIdAndCountryId(Long epochId, Long countryId);
|
||||
|
||||
Page<ArtistEntity> findByEpochId(Long epochId, Pageable pageable);
|
||||
|
||||
Page<ArtistEntity> findByCountryId(Long countryId, Pageable pageable);
|
||||
|
||||
Page<ArtistEntity> findByEpochIdAndCountryId(Long epochId, Long countryId, Pageable pageable);
|
||||
|
||||
@Query("select count(a) as totalArtists, " +
|
||||
"sum(case when a.description is not null and length(a.description) > 0 then 1 else 0 end) as artistsWithDescription, " +
|
||||
"sum(case when a.description is null or length(a.description) = 0 then 1 else 0 end) as artistsWithoutDescription " +
|
||||
"from ArtistEntity a")
|
||||
ArtistStatsProjection getArtistsStatistics();
|
||||
|
||||
@Query("select count(a) as totalArtists, " +
|
||||
"sum(case when a.description is not null and length(a.description) > 0 then 1 else 0 end) as artistsWithDescription, " +
|
||||
"sum(case when a.description is null or length(a.description) = 0 then 1 else 0 end) as artistsWithoutDescription " +
|
||||
"from ArtistEntity a " +
|
||||
"where a.epoch.id = :epochId")
|
||||
ArtistStatsProjection getArtistsStatisticsByEpoch(@Param("epochId") Long epochId);
|
||||
|
||||
@Query("select count(a) as totalArtists, " +
|
||||
"sum(case when a.description is not null and length(a.description) > 0 then 1 else 0 end) as artistsWithDescription, " +
|
||||
"sum(case when a.description is null or length(a.description) = 0 then 1 else 0 end) as artistsWithoutDescription " +
|
||||
"from ArtistEntity a " +
|
||||
"where a.country.id = :countryId")
|
||||
ArtistStatsProjection getArtistsStatisticsByCountry(@Param("countryId") Long countryId);
|
||||
}
|
||||
|
||||
@@ -0,0 +1,28 @@
|
||||
package com.example.demo.repository;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Optional;
|
||||
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
import org.springframework.data.jpa.repository.Query;
|
||||
import org.springframework.data.repository.query.Param;
|
||||
|
||||
import com.example.demo.entity.CountryEntity;
|
||||
import com.example.demo.entity.projection.CountryStatsProjection;
|
||||
|
||||
public interface CountryRepository extends JpaRepository<CountryEntity, Long> {
|
||||
Optional<CountryEntity> findOneByNameIgnoreCase(String name);
|
||||
|
||||
@Query("select c as country, count(a) as artistsCount " +
|
||||
"from CountryEntity c left join c.artists a " +
|
||||
"group by c " +
|
||||
"order by c.id")
|
||||
List<CountryStatsProjection> getAllCountriesStatistics();
|
||||
|
||||
@Query("select c as country, count(a) as artistsCount " +
|
||||
"from CountryEntity c left join c.artists a " +
|
||||
"where c.id = :countryId " +
|
||||
"group by c")
|
||||
CountryStatsProjection getCountryStatistics(@Param("countryId") Long countryId);
|
||||
}
|
||||
|
||||
@@ -0,0 +1,28 @@
|
||||
package com.example.demo.repository;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Optional;
|
||||
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
import org.springframework.data.jpa.repository.Query;
|
||||
import org.springframework.data.repository.query.Param;
|
||||
|
||||
import com.example.demo.entity.EpochEntity;
|
||||
import com.example.demo.entity.projection.EpochStatsProjection;
|
||||
|
||||
public interface EpochRepository extends JpaRepository<EpochEntity, Long> {
|
||||
Optional<EpochEntity> findOneByNameIgnoreCase(String name);
|
||||
|
||||
@Query("select e as epoch, count(a) as artistsCount " +
|
||||
"from EpochEntity e left join e.artists a " +
|
||||
"group by e " +
|
||||
"order by e.id")
|
||||
List<EpochStatsProjection> getAllEpochsStatistics();
|
||||
|
||||
@Query("select e as epoch, count(a) as artistsCount " +
|
||||
"from EpochEntity e left join e.artists a " +
|
||||
"where e.id = :epochId " +
|
||||
"group by e")
|
||||
EpochStatsProjection getEpochStatistics(@Param("epochId") Long epochId);
|
||||
}
|
||||
|
||||
@@ -0,0 +1,12 @@
|
||||
package com.example.demo.repository;
|
||||
|
||||
import java.util.Optional;
|
||||
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
|
||||
import com.example.demo.entity.UserEntity;
|
||||
|
||||
public interface UserRepository extends JpaRepository<UserEntity, Long> {
|
||||
Optional<UserEntity> findByLoginIgnoreCase(String login);
|
||||
}
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
package com.example.demo.security;
|
||||
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
|
||||
import org.springframework.security.crypto.password.PasswordEncoder;
|
||||
|
||||
@Configuration
|
||||
public class PasswordEncoderConfiguration {
|
||||
@Bean
|
||||
PasswordEncoder passwordEncoder() {
|
||||
return new BCryptPasswordEncoder();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,84 @@
|
||||
package com.example.demo.security;
|
||||
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
import org.springframework.context.annotation.Profile;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.security.config.Customizer;
|
||||
import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity;
|
||||
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
|
||||
import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
|
||||
import org.springframework.security.config.annotation.web.configurers.HeadersConfigurer.FrameOptionsConfig;
|
||||
import org.springframework.security.web.SecurityFilterChain;
|
||||
import org.springframework.security.web.authentication.HttpStatusEntryPoint;
|
||||
import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
|
||||
import org.springframework.security.web.util.matcher.RequestMatcher;
|
||||
|
||||
import com.example.demo.configuration.Constants;
|
||||
import com.example.demo.controller.mvc.UserSignupMvcController;
|
||||
import com.example.demo.entity.UserRole;
|
||||
import com.example.demo.service.UserService;
|
||||
|
||||
@Profile("!front")
|
||||
@Configuration
|
||||
@EnableMethodSecurity
|
||||
public class SecurityMvcConfiguration {
|
||||
|
||||
private final UserService userService;
|
||||
|
||||
public SecurityMvcConfiguration(UserService userService) {
|
||||
this.userService = userService;
|
||||
}
|
||||
|
||||
@Bean
|
||||
SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Exception {
|
||||
httpSecurity.headers(headers -> headers.frameOptions(FrameOptionsConfig::sameOrigin));
|
||||
httpSecurity.csrf(AbstractHttpConfigurer::disable);
|
||||
httpSecurity.cors(Customizer.withDefaults());
|
||||
|
||||
// Настраиваем обработку исключений для API - возвращаем 401 вместо редиректа на логин
|
||||
RequestMatcher apiMatcher = new AntPathRequestMatcher(Constants.API_URL + "/**");
|
||||
httpSecurity.exceptionHandling(exceptions -> exceptions
|
||||
.defaultAuthenticationEntryPointFor(
|
||||
new HttpStatusEntryPoint(HttpStatus.UNAUTHORIZED),
|
||||
apiMatcher)
|
||||
.defaultAccessDeniedHandlerFor(
|
||||
(request, response, accessDeniedException) -> {
|
||||
response.setStatus(HttpStatus.FORBIDDEN.value());
|
||||
},
|
||||
apiMatcher));
|
||||
|
||||
// Настраиваем HTTP Basic аутентификацию для API endpoints
|
||||
httpSecurity.httpBasic(basic -> basic.authenticationEntryPoint(
|
||||
new HttpStatusEntryPoint(HttpStatus.UNAUTHORIZED)));
|
||||
|
||||
httpSecurity.authorizeHttpRequests(requests -> requests
|
||||
.requestMatchers("/css/**", "/js/**", "/webjars/**", "/images/**", "/icon.svg", "/favicon.ico")
|
||||
.permitAll()
|
||||
.requestMatchers("/swagger-ui.html", "/swagger-ui/**", "/v3/api-docs/**", "/api-docs/**", "/api/swagger-ui.html")
|
||||
.hasAuthority(UserRole.ADMIN.getAuthority())
|
||||
.requestMatchers(Constants.LOGIN_URL, "/login/**").permitAll()
|
||||
.requestMatchers("/" + UserSignupMvcController.VIEW).anonymous()
|
||||
.requestMatchers("/error").permitAll()
|
||||
.requestMatchers("/api/**").hasAuthority(UserRole.ADMIN.getAuthority())
|
||||
.requestMatchers("/h2-console/**").hasAuthority(UserRole.ADMIN.getAuthority())
|
||||
.anyRequest().authenticated());
|
||||
|
||||
httpSecurity.userDetailsService(userService);
|
||||
|
||||
httpSecurity.formLogin(formLogin -> formLogin
|
||||
.loginPage(Constants.LOGIN_URL)
|
||||
.defaultSuccessUrl("/", true)
|
||||
.permitAll());
|
||||
|
||||
httpSecurity.rememberMe(rememberMe -> rememberMe.key("some-key"));
|
||||
|
||||
httpSecurity.logout(logout -> logout
|
||||
.logoutRequestMatcher(new AntPathRequestMatcher("/logout", "POST"))
|
||||
.deleteCookies("JSESSIONID")
|
||||
.permitAll());
|
||||
|
||||
return httpSecurity.build();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,75 @@
|
||||
package com.example.demo.security;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.Set;
|
||||
|
||||
import org.springframework.security.core.GrantedAuthority;
|
||||
import org.springframework.security.core.userdetails.UserDetails;
|
||||
|
||||
import com.example.demo.entity.UserEntity;
|
||||
import com.example.demo.entity.UserRole;
|
||||
|
||||
public class UserPrincipal implements UserDetails {
|
||||
private final Long id;
|
||||
private final String username;
|
||||
private final String password;
|
||||
private final Set<? extends GrantedAuthority> roles;
|
||||
private final boolean active;
|
||||
|
||||
private UserPrincipal(
|
||||
Long id, String username, String password, Set<? extends GrantedAuthority> roles, boolean active) {
|
||||
this.id = id;
|
||||
this.username = username;
|
||||
this.password = password;
|
||||
this.roles = roles;
|
||||
this.active = active;
|
||||
}
|
||||
|
||||
public UserPrincipal(UserEntity user) {
|
||||
this.id = user.getId();
|
||||
this.username = user.getLogin();
|
||||
this.password = user.getPassword();
|
||||
this.roles = Set.of(user.getRole());
|
||||
this.active = true;
|
||||
}
|
||||
|
||||
public Long getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getUsername() {
|
||||
return username;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getPassword() {
|
||||
return password;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Collection<? extends GrantedAuthority> getAuthorities() {
|
||||
return roles;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isEnabled() {
|
||||
return active;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isAccountNonExpired() {
|
||||
return isEnabled();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isAccountNonLocked() {
|
||||
return isEnabled();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isCredentialsNonExpired() {
|
||||
return isEnabled();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,99 @@
|
||||
package com.example.demo.service;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import org.springframework.data.domain.Page;
|
||||
import org.springframework.data.domain.Pageable;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Propagation;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import com.example.demo.api.PageRs;
|
||||
import com.example.demo.dto.ArtistRq;
|
||||
import com.example.demo.dto.ArtistRs;
|
||||
import com.example.demo.entity.ArtistEntity;
|
||||
import com.example.demo.entity.CountryEntity;
|
||||
import com.example.demo.entity.EpochEntity;
|
||||
import com.example.demo.error.NotFoundException;
|
||||
import com.example.demo.mapper.ArtistMapper;
|
||||
import com.example.demo.repository.ArtistRepository;
|
||||
|
||||
@Service
|
||||
public class ArtistService {
|
||||
private final ArtistRepository repository;
|
||||
private final EpochService epochService;
|
||||
private final CountryService countryService;
|
||||
private final ArtistMapper mapper;
|
||||
|
||||
public ArtistService(ArtistRepository repository, EpochService epochService,
|
||||
CountryService countryService, ArtistMapper mapper) {
|
||||
this.repository = repository;
|
||||
this.epochService = epochService;
|
||||
this.countryService = countryService;
|
||||
this.mapper = mapper;
|
||||
}
|
||||
|
||||
@Transactional(propagation = Propagation.MANDATORY)
|
||||
public ArtistEntity getEntity(Long id) {
|
||||
return repository.findById(id)
|
||||
.orElseThrow(() -> new NotFoundException(ArtistEntity.class, id));
|
||||
}
|
||||
|
||||
@Transactional(readOnly = true)
|
||||
public PageRs<ArtistRs> getAll(Pageable pageable) {
|
||||
return PageRs.from(repository.findAll(pageable), mapper::toRsDto);
|
||||
}
|
||||
|
||||
@Transactional(readOnly = true)
|
||||
public PageRs<ArtistRs> getAllFiltered(Long countryId, Long epochId, Pageable pageable) {
|
||||
Page<ArtistEntity> page;
|
||||
if (countryId != null && epochId != null) {
|
||||
page = repository.findByEpochIdAndCountryId(epochId, countryId, pageable);
|
||||
} else if (countryId != null) {
|
||||
page = repository.findByCountryId(countryId, pageable);
|
||||
} else if (epochId != null) {
|
||||
page = repository.findByEpochId(epochId, pageable);
|
||||
} else {
|
||||
page = repository.findAll(pageable);
|
||||
}
|
||||
return PageRs.from(page, mapper::toRsDto);
|
||||
}
|
||||
|
||||
@Transactional(readOnly = true)
|
||||
public ArtistRs get(Long id) {
|
||||
final ArtistEntity entity = getEntity(id);
|
||||
return mapper.toRsDto(entity);
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public ArtistRs create(ArtistRq dto) {
|
||||
final EpochEntity epoch = epochService.getEntity(dto.getEpochId());
|
||||
final CountryEntity country = countryService.getEntity(dto.getCountryId());
|
||||
ArtistEntity entity = new ArtistEntity(
|
||||
dto.getName(),
|
||||
dto.getDescription(),
|
||||
epoch,
|
||||
country);
|
||||
entity = repository.save(entity);
|
||||
return mapper.toRsDto(entity);
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public ArtistRs update(Long id, ArtistRq dto) {
|
||||
ArtistEntity entity = getEntity(id);
|
||||
entity.setName(dto.getName());
|
||||
entity.setDescription(dto.getDescription());
|
||||
entity.setEpoch(epochService.getEntity(dto.getEpochId()));
|
||||
entity.setCountry(countryService.getEntity(dto.getCountryId()));
|
||||
entity = repository.save(entity);
|
||||
return mapper.toRsDto(entity);
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public ArtistRs delete(Long id) {
|
||||
final ArtistEntity entity = getEntity(id);
|
||||
repository.delete(entity);
|
||||
return mapper.toRsDto(entity);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,72 @@
|
||||
package com.example.demo.service;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import org.springframework.data.domain.Pageable;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Propagation;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import com.example.demo.api.PageRs;
|
||||
import com.example.demo.dto.CountryRq;
|
||||
import com.example.demo.dto.CountryRs;
|
||||
import com.example.demo.entity.CountryEntity;
|
||||
import com.example.demo.error.NotFoundException;
|
||||
import com.example.demo.mapper.CountryMapper;
|
||||
import com.example.demo.repository.CountryRepository;
|
||||
|
||||
@Service
|
||||
public class CountryService {
|
||||
private final CountryRepository repository;
|
||||
private final CountryMapper mapper;
|
||||
|
||||
public CountryService(CountryRepository repository, CountryMapper mapper) {
|
||||
this.repository = repository;
|
||||
this.mapper = mapper;
|
||||
}
|
||||
|
||||
@Transactional(propagation = Propagation.MANDATORY)
|
||||
public CountryEntity getEntity(Long id) {
|
||||
return repository.findById(id)
|
||||
.orElseThrow(() -> new NotFoundException(CountryEntity.class, id));
|
||||
}
|
||||
|
||||
@Transactional(readOnly = true)
|
||||
public List<CountryRs> getAll() {
|
||||
return mapper.toRsDtoList(repository.findAll());
|
||||
}
|
||||
|
||||
@Transactional(readOnly = true)
|
||||
public PageRs<CountryRs> getAll(Pageable pageable) {
|
||||
return PageRs.from(repository.findAll(pageable), mapper::toRsDto);
|
||||
}
|
||||
|
||||
@Transactional(readOnly = true)
|
||||
public CountryRs get(Long id) {
|
||||
final CountryEntity entity = getEntity(id);
|
||||
return mapper.toRsDto(entity);
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public CountryRs create(CountryRq dto) {
|
||||
CountryEntity entity = new CountryEntity(dto.getName());
|
||||
entity = repository.save(entity);
|
||||
return mapper.toRsDto(entity);
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public CountryRs update(Long id, CountryRq dto) {
|
||||
CountryEntity entity = getEntity(id);
|
||||
entity.setName(dto.getName());
|
||||
entity = repository.save(entity);
|
||||
return mapper.toRsDto(entity);
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public CountryRs delete(Long id) {
|
||||
final CountryEntity entity = getEntity(id);
|
||||
repository.delete(entity);
|
||||
return mapper.toRsDto(entity);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,65 @@
|
||||
package com.example.demo.service;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Propagation;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import com.example.demo.dto.EpochRq;
|
||||
import com.example.demo.dto.EpochRs;
|
||||
import com.example.demo.entity.EpochEntity;
|
||||
import com.example.demo.error.NotFoundException;
|
||||
import com.example.demo.mapper.EpochMapper;
|
||||
import com.example.demo.repository.EpochRepository;
|
||||
|
||||
@Service
|
||||
public class EpochService {
|
||||
private final EpochRepository repository;
|
||||
private final EpochMapper mapper;
|
||||
|
||||
public EpochService(EpochRepository repository, EpochMapper mapper) {
|
||||
this.repository = repository;
|
||||
this.mapper = mapper;
|
||||
}
|
||||
|
||||
@Transactional(propagation = Propagation.MANDATORY)
|
||||
public EpochEntity getEntity(Long id) {
|
||||
return repository.findById(id)
|
||||
.orElseThrow(() -> new NotFoundException(EpochEntity.class, id));
|
||||
}
|
||||
|
||||
@Transactional(readOnly = true)
|
||||
public List<EpochRs> getAll() {
|
||||
return mapper.toRsDtoList(repository.findAll());
|
||||
}
|
||||
|
||||
@Transactional(readOnly = true)
|
||||
public EpochRs get(Long id) {
|
||||
final EpochEntity entity = getEntity(id);
|
||||
return mapper.toRsDto(entity);
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public EpochRs create(EpochRq dto) {
|
||||
EpochEntity entity = new EpochEntity(dto.getName());
|
||||
entity = repository.save(entity);
|
||||
return mapper.toRsDto(entity);
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public EpochRs update(Long id, EpochRq dto) {
|
||||
EpochEntity entity = getEntity(id);
|
||||
entity.setName(dto.getName());
|
||||
entity = repository.save(entity);
|
||||
return mapper.toRsDto(entity);
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public EpochRs delete(Long id) {
|
||||
final EpochEntity entity = getEntity(id);
|
||||
repository.delete(entity);
|
||||
return mapper.toRsDto(entity);
|
||||
}
|
||||
}
|
||||
|
||||
74
demo/src/main/java/com/example/demo/service/UserService.java
Normal file
74
demo/src/main/java/com/example/demo/service/UserService.java
Normal file
@@ -0,0 +1,74 @@
|
||||
package com.example.demo.service;
|
||||
|
||||
import java.util.Objects;
|
||||
|
||||
import org.springframework.security.core.userdetails.UserDetails;
|
||||
import org.springframework.security.core.userdetails.UserDetailsService;
|
||||
import org.springframework.security.core.userdetails.UsernameNotFoundException;
|
||||
import org.springframework.security.crypto.password.PasswordEncoder;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Propagation;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import com.example.demo.dto.UserRq;
|
||||
import com.example.demo.dto.UserRs;
|
||||
import com.example.demo.entity.UserEntity;
|
||||
import com.example.demo.error.AlreadyExistsException;
|
||||
import com.example.demo.error.NotFoundException;
|
||||
import com.example.demo.error.PasswordConfirmationException;
|
||||
import com.example.demo.repository.UserRepository;
|
||||
import com.example.demo.security.UserPrincipal;
|
||||
|
||||
@Service
|
||||
public class UserService implements UserDetailsService {
|
||||
private final UserRepository repository;
|
||||
private final PasswordEncoder passwordEncoder;
|
||||
|
||||
public UserService(UserRepository repository, PasswordEncoder passwordEncoder) {
|
||||
this.repository = repository;
|
||||
this.passwordEncoder = passwordEncoder;
|
||||
}
|
||||
|
||||
@Transactional(propagation = Propagation.MANDATORY)
|
||||
public UserEntity getEntity(Long id) {
|
||||
return repository.findById(id)
|
||||
.orElseThrow(() -> new NotFoundException(UserEntity.class, id));
|
||||
}
|
||||
|
||||
@Transactional(propagation = Propagation.MANDATORY)
|
||||
public UserEntity getEntityByLogin(String login) {
|
||||
return repository.findByLoginIgnoreCase(login)
|
||||
.orElseThrow(() -> new NotFoundException(UserEntity.class, "login", login));
|
||||
}
|
||||
|
||||
@Transactional(readOnly = true)
|
||||
public UserRs get(String login) {
|
||||
final UserEntity entity = getEntityByLogin(login);
|
||||
return UserRs.from(entity);
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public UserRs create(UserRq dto) {
|
||||
if (repository.findByLoginIgnoreCase(dto.login()).isPresent()) {
|
||||
throw new AlreadyExistsException(UserEntity.class, dto.login());
|
||||
}
|
||||
if (!Objects.equals(dto.password(), dto.passwordConfirm())) {
|
||||
throw new PasswordConfirmationException();
|
||||
}
|
||||
UserEntity entity = new UserEntity(dto.login(), passwordEncoder.encode(dto.password()));
|
||||
entity = repository.save(entity);
|
||||
return UserRs.from(entity);
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional(readOnly = true)
|
||||
public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
|
||||
try {
|
||||
final UserEntity existsUser = getEntityByLogin(username);
|
||||
return new UserPrincipal(existsUser);
|
||||
} catch (NotFoundException e) {
|
||||
throw new UsernameNotFoundException(e.getMessage());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
21
demo/src/main/resources/application-dev.yml
Normal file
21
demo/src/main/resources/application-dev.yml
Normal file
@@ -0,0 +1,21 @@
|
||||
# Available levels: TRACE, DEBUG, INFO, WARN, ERROR, FATAL, OFF
|
||||
logging:
|
||||
level:
|
||||
com:
|
||||
example:
|
||||
demo: DEBUG
|
||||
spring:
|
||||
datasource:
|
||||
url: jdbc:h2:file:./data
|
||||
username: sa
|
||||
password: sa
|
||||
driver-class-name: org.h2.Driver
|
||||
h2:
|
||||
console:
|
||||
enabled: true
|
||||
jpa:
|
||||
show-sql: false
|
||||
properties:
|
||||
hibernate:
|
||||
format-sql: false
|
||||
|
||||
20
demo/src/main/resources/application-prod.yml
Normal file
20
demo/src/main/resources/application-prod.yml
Normal file
@@ -0,0 +1,20 @@
|
||||
# Available levels: TRACE, DEBUG, INFO, WARN, ERROR, FATAL, OFF
|
||||
logging:
|
||||
level:
|
||||
com:
|
||||
example:
|
||||
demo: INFO
|
||||
spring:
|
||||
datasource:
|
||||
url: jdbc:postgresql://127.0.0.1/demo
|
||||
username: postgres
|
||||
password: postgres
|
||||
driver-class-name: org.postgresql.Driver
|
||||
jpa:
|
||||
show-sql: false
|
||||
properties:
|
||||
hibernate:
|
||||
jdbc:
|
||||
lob:
|
||||
non_contextual_creation: true
|
||||
|
||||
12
demo/src/main/resources/application.properties
Normal file
12
demo/src/main/resources/application.properties
Normal file
@@ -0,0 +1,12 @@
|
||||
spring.application.name=demo
|
||||
server.port=8080
|
||||
springdoc.api-docs.path=/api-docs
|
||||
springdoc.swagger-ui.path=/swagger-ui.html
|
||||
|
||||
spring.datasource.url=jdbc:h2:file:./data
|
||||
spring.datasource.username=sa
|
||||
spring.datasource.password=sa
|
||||
spring.datasource.driver-class-name=org.h2.Driver
|
||||
spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.H2Dialect
|
||||
spring.jpa.hibernate.ddl-auto=update
|
||||
spring.h2.console.enabled=true
|
||||
39
demo/src/main/resources/application.yml
Normal file
39
demo/src/main/resources/application.yml
Normal file
@@ -0,0 +1,39 @@
|
||||
spring:
|
||||
main:
|
||||
banner-mode: off
|
||||
application:
|
||||
name: demo
|
||||
profiles:
|
||||
active: dev
|
||||
datasource:
|
||||
url: jdbc:h2:file:./data
|
||||
username: sa
|
||||
password: sa
|
||||
driver-class-name: org.h2.Driver
|
||||
h2:
|
||||
console:
|
||||
enabled: true
|
||||
jpa:
|
||||
hibernate:
|
||||
ddl-auto: validate
|
||||
open-in-view: false
|
||||
properties:
|
||||
hibernate:
|
||||
dialect: org.hibernate.dialect.H2Dialect
|
||||
jdbc:
|
||||
lob:
|
||||
non_contextual_creation: true
|
||||
liquibase:
|
||||
enabled: true
|
||||
drop-first: false
|
||||
change-log: classpath:db/master.yml
|
||||
server:
|
||||
port: 8080
|
||||
springdoc:
|
||||
api-docs:
|
||||
path: /api-docs
|
||||
swagger-ui:
|
||||
path: /swagger-ui.html
|
||||
persist-authorization: true
|
||||
|
||||
|
||||
20
demo/src/main/resources/db/changes/0-sequences.yml
Normal file
20
demo/src/main/resources/db/changes/0-sequences.yml
Normal file
@@ -0,0 +1,20 @@
|
||||
databaseChangeLog:
|
||||
- changeSet:
|
||||
id: create-sequences
|
||||
author: user
|
||||
preConditions:
|
||||
- onFail: MARK_RAN
|
||||
- not:
|
||||
- sequenceExists:
|
||||
sequenceName: hibernate_sequence
|
||||
schemaName: public
|
||||
changes:
|
||||
- createSequence:
|
||||
sequenceName: hibernate_sequence
|
||||
schemaName: public
|
||||
startValue: 1
|
||||
incrementBy: 50
|
||||
minValue: 1
|
||||
cycle: false
|
||||
dataType: bigint
|
||||
|
||||
73
demo/src/main/resources/db/changes/1-tables.yml
Normal file
73
demo/src/main/resources/db/changes/1-tables.yml
Normal file
@@ -0,0 +1,73 @@
|
||||
databaseChangeLog:
|
||||
- changeSet:
|
||||
id: create-tables
|
||||
author: user
|
||||
preConditions:
|
||||
- onFail: MARK_RAN
|
||||
- not:
|
||||
- tableExists:
|
||||
tableName: epochs
|
||||
changes:
|
||||
- createTable:
|
||||
tableName: epochs
|
||||
columns:
|
||||
- column:
|
||||
name: id
|
||||
type: BIGINT
|
||||
constraints:
|
||||
primaryKey: true
|
||||
nullable: false
|
||||
primaryKeyName: pk_epochs
|
||||
- column:
|
||||
name: name
|
||||
type: VARCHAR(255)
|
||||
constraints:
|
||||
nullable: false
|
||||
- createTable:
|
||||
tableName: countries
|
||||
columns:
|
||||
- column:
|
||||
name: id
|
||||
type: BIGINT
|
||||
constraints:
|
||||
primaryKey: true
|
||||
nullable: false
|
||||
primaryKeyName: pk_countries
|
||||
- column:
|
||||
name: name
|
||||
type: VARCHAR(255)
|
||||
constraints:
|
||||
nullable: false
|
||||
- createTable:
|
||||
tableName: artists
|
||||
columns:
|
||||
- column:
|
||||
name: id
|
||||
type: BIGINT
|
||||
constraints:
|
||||
primaryKey: true
|
||||
nullable: false
|
||||
primaryKeyName: pk_artists
|
||||
- column:
|
||||
name: name
|
||||
type: VARCHAR(255)
|
||||
constraints:
|
||||
nullable: false
|
||||
- column:
|
||||
name: description
|
||||
type: TEXT
|
||||
- column:
|
||||
name: epoch_id
|
||||
type: BIGINT
|
||||
constraints:
|
||||
nullable: false
|
||||
foreignKeyName: fk_artists_epoch
|
||||
references: epochs(id)
|
||||
- column:
|
||||
name: country_id
|
||||
type: BIGINT
|
||||
constraints:
|
||||
nullable: false
|
||||
foreignKeyName: fk_artists_country
|
||||
references: countries(id)
|
||||
|
||||
37
demo/src/main/resources/db/changes/2-users-table.yml
Normal file
37
demo/src/main/resources/db/changes/2-users-table.yml
Normal file
@@ -0,0 +1,37 @@
|
||||
databaseChangeLog:
|
||||
- changeSet:
|
||||
id: create-users-table
|
||||
author: user
|
||||
preConditions:
|
||||
- onFail: MARK_RAN
|
||||
- not:
|
||||
- tableExists:
|
||||
tableName: sec_users
|
||||
changes:
|
||||
- createTable:
|
||||
tableName: sec_users
|
||||
columns:
|
||||
- column:
|
||||
name: id
|
||||
type: BIGINT
|
||||
constraints:
|
||||
primaryKey: true
|
||||
nullable: false
|
||||
primaryKeyName: pk_sec_users
|
||||
- column:
|
||||
name: login
|
||||
type: VARCHAR(20)
|
||||
constraints:
|
||||
nullable: false
|
||||
unique: true
|
||||
- column:
|
||||
name: password
|
||||
type: VARCHAR(255)
|
||||
constraints:
|
||||
nullable: false
|
||||
- column:
|
||||
name: role
|
||||
type: VARCHAR(20)
|
||||
constraints:
|
||||
nullable: false
|
||||
|
||||
6
demo/src/main/resources/db/master.yml
Normal file
6
demo/src/main/resources/db/master.yml
Normal file
@@ -0,0 +1,6 @@
|
||||
databaseChangeLog:
|
||||
- includeAll:
|
||||
path: changes/
|
||||
relativeToChangelogFile: true
|
||||
errorIfMissingOrEmpty: false
|
||||
|
||||
39
demo/src/main/resources/public/css/style.css
Normal file
39
demo/src/main/resources/public/css/style.css
Normal file
@@ -0,0 +1,39 @@
|
||||
:root {
|
||||
--punk-primary: blueviolet;
|
||||
--punk-dark: #121212;
|
||||
}
|
||||
|
||||
.text-punk {
|
||||
color: var(--punk-primary) !important;
|
||||
}
|
||||
|
||||
.border-punk {
|
||||
border-color: var(--punk-primary) !important;
|
||||
}
|
||||
|
||||
.bg-punk {
|
||||
background-color: var(--punk-primary) !important;
|
||||
}
|
||||
|
||||
.page-link {
|
||||
background-color: transparent;
|
||||
border-color: var(--punk-primary);
|
||||
color: var(--punk-primary);
|
||||
}
|
||||
|
||||
.page-link:hover {
|
||||
background-color: var(--punk-primary);
|
||||
color: white;
|
||||
border-color: var(--punk-primary);
|
||||
}
|
||||
|
||||
.page-item.active .page-link {
|
||||
background-color: var(--punk-primary);
|
||||
border-color: var(--punk-primary);
|
||||
color: white;
|
||||
}
|
||||
|
||||
.nav-link.active {
|
||||
color: var(--punk-primary) !important;
|
||||
}
|
||||
|
||||
16
demo/src/main/resources/static/index.html
Normal file
16
demo/src/main/resources/static/index.html
Normal file
@@ -0,0 +1,16 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="ru">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<link href="/styles.css" rel="stylesheet">
|
||||
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet">
|
||||
<link href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.3/font/bootstrap-icons.min.css" rel="stylesheet">
|
||||
<title>Панкуха</title>
|
||||
</head>
|
||||
<body class="bg-dark text-light">
|
||||
<div id="root"></div>
|
||||
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js"></script>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
67
demo/src/main/resources/templates/default.html
Normal file
67
demo/src/main/resources/templates/default.html
Normal file
@@ -0,0 +1,67 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="ru" xmlns:th="http://www.thymeleaf.org" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" xmlns:sec="http://www.thymeleaf.org/thymeleaf-extras-springsecurity6">
|
||||
<head>
|
||||
<meta charset="UTF-8" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||
<title layout:title-pattern="$LAYOUT_TITLE - $CONTENT_TITLE">Панк-рок исполнители</title>
|
||||
<link rel="icon" type="image/svg+xml" href="/icon.svg" />
|
||||
<script type="text/javascript" src="/webjars/bootstrap/5.3.3/dist/js/bootstrap.bundle.min.js"></script>
|
||||
<link rel="stylesheet" href="/webjars/bootstrap/5.3.3/dist/css/bootstrap.min.css" />
|
||||
<link rel="stylesheet" href="/webjars/bootstrap-icons/1.11.3/font/bootstrap-icons.min.css" />
|
||||
<link rel="stylesheet" href="/css/style.css" />
|
||||
<th:block layout:fragment="css"></th:block>
|
||||
</head>
|
||||
<body class="bg-dark text-light">
|
||||
<div class="d-flex flex-column min-vh-100">
|
||||
<header>
|
||||
<nav class="navbar navbar-expand-md navbar-dark bg-dark border-bottom border-punk">
|
||||
<div class="container-fluid">
|
||||
<a class="navbar-brand text-punk" th:href="@{/}">
|
||||
<i class="bi bi-music-note-beamed"></i>
|
||||
Панк-рок
|
||||
</a>
|
||||
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNav">
|
||||
<span class="navbar-toggler-icon"></span>
|
||||
</button>
|
||||
<div class="navbar-collapse collapse justify-content-end" id="navbarNav">
|
||||
<div class="navbar-nav">
|
||||
<a class="nav-link" th:href="@{/page-artists}">
|
||||
Исполнители
|
||||
</a>
|
||||
<a class="nav-link" th:href="@{/page-countries}">
|
||||
Страны
|
||||
</a>
|
||||
<a class="nav-link" th:href="@{/swagger-ui.html}" target="_blank" sec:authorize="hasRole('ADMIN')">Swagger</a>
|
||||
<th:block sec:authorize="isAuthenticated()">
|
||||
<div class="nav-item dropdown">
|
||||
<a class="nav-link dropdown-toggle" href="#" id="userDropdown" role="button" data-bs-toggle="dropdown" aria-expanded="false">
|
||||
<i class="bi bi-person-circle"></i>
|
||||
<span sec:authentication="name"></span>
|
||||
</a>
|
||||
<ul class="dropdown-menu dropdown-menu-end" aria-labelledby="userDropdown">
|
||||
<li>
|
||||
<a class="dropdown-item" th:href="@{/page-user}">Профиль</a>
|
||||
</li>
|
||||
<li>
|
||||
<form th:action="@{/logout}" method="post" class="d-inline">
|
||||
<button class="dropdown-item" type="submit">Выйти</button>
|
||||
</form>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</th:block>
|
||||
<a class="nav-link" th:href="@{/login}" sec:authorize="!isAuthenticated()">Войти</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</nav>
|
||||
</header>
|
||||
<main class="flex-grow-1 container-fluid p-4" layout:fragment="content"></main>
|
||||
<footer class="d-flex flex-shrink-0 align-items-center justify-content-center bg-dark border-top border-punk py-3">
|
||||
<span class="text-muted">Панк-рок исполнители, [[${#dates.year(#dates.createNow())}]]</span>
|
||||
</footer>
|
||||
</div>
|
||||
<th:block layout:fragment="js"></th:block>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
76
demo/src/main/resources/templates/f-artists.html
Normal file
76
demo/src/main/resources/templates/f-artists.html
Normal file
@@ -0,0 +1,76 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="ru" xmlns:th="http://www.thymeleaf.org">
|
||||
<head>
|
||||
<title></title>
|
||||
</head>
|
||||
<body>
|
||||
<th:block th:fragment="draw (items, totalPages, currentPage)">
|
||||
<th:block th:with="isEmpty=${items.size() == 0}">
|
||||
<div class="table-responsive">
|
||||
<table class="table table-dark table-hover table-sm">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>№</th>
|
||||
<th>Название</th>
|
||||
<th>Описание</th>
|
||||
<th>Эпоха</th>
|
||||
<th>Страна</th>
|
||||
<th></th>
|
||||
<th></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<th:block th:if="${isEmpty}">
|
||||
<tr>
|
||||
<td class="text-center" colspan="100">
|
||||
<h5 class="text-center text-muted">Данные отсутствуют</h5>
|
||||
</td>
|
||||
</tr>
|
||||
</th:block>
|
||||
<th:block th:unless="${isEmpty}">
|
||||
<tr th:each="artist : ${items}">
|
||||
<td th:text="${artist.id}"></td>
|
||||
<td th:text="${artist.name}"></td>
|
||||
<td>
|
||||
<span th:if="${artist.description != null and artist.description.length() > 0}" th:text="${#strings.abbreviate(artist.description, 50)}"></span>
|
||||
<span th:unless="${artist.description != null and artist.description.length() > 0}" class="text-muted">-</span>
|
||||
</td>
|
||||
<td th:text="${artist.epoch?.name}"></td>
|
||||
<td th:text="${artist.country?.name}"></td>
|
||||
<td class="p-1">
|
||||
<a
|
||||
class="btn btn-warning btn-sm"
|
||||
th:href="@{/page-artists/edit/{id}(id=${artist.id},page=${currentPage})}"
|
||||
>
|
||||
<i class="bi bi-pencil-fill"></i>
|
||||
</a>
|
||||
</td>
|
||||
<td class="p-1">
|
||||
<form
|
||||
th:action="@{/page-artists/delete/{id}(id=${artist.id},page=${currentPage})}"
|
||||
method="post"
|
||||
>
|
||||
<button
|
||||
class="btn btn-danger btn-sm"
|
||||
onclick="return confirm('Вы уверены?')"
|
||||
>
|
||||
<i class="bi bi-trash-fill"></i>
|
||||
</button>
|
||||
</form>
|
||||
</td>
|
||||
</tr>
|
||||
</th:block>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<th:block
|
||||
th:replace="~{ f-pagination :: draw (
|
||||
path='page-artists',
|
||||
totalPages=${totalPages},
|
||||
currentPage=${currentPage}) }"
|
||||
/>
|
||||
</th:block>
|
||||
</th:block>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
67
demo/src/main/resources/templates/f-countries.html
Normal file
67
demo/src/main/resources/templates/f-countries.html
Normal file
@@ -0,0 +1,67 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="ru" xmlns:th="http://www.thymeleaf.org">
|
||||
<head>
|
||||
<title></title>
|
||||
</head>
|
||||
<body>
|
||||
<th:block th:fragment="draw (items, totalPages, currentPage)">
|
||||
<th:block th:with="isEmpty=${items.size() == 0}">
|
||||
<div class="table-responsive">
|
||||
<table class="table table-dark table-hover table-sm">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>№</th>
|
||||
<th>Название</th>
|
||||
<th></th>
|
||||
<th></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<th:block th:if="${isEmpty}">
|
||||
<tr>
|
||||
<td class="text-center" colspan="100">
|
||||
<h5 class="text-center text-muted">Данные отсутствуют</h5>
|
||||
</td>
|
||||
</tr>
|
||||
</th:block>
|
||||
<th:block th:unless="${isEmpty}">
|
||||
<tr th:each="country : ${items}">
|
||||
<td th:text="${country.id}"></td>
|
||||
<td th:text="${country.name}"></td>
|
||||
<td class="p-1">
|
||||
<a
|
||||
class="btn btn-warning btn-sm"
|
||||
th:href="@{/page-countries/edit/{id}(id=${country.id},page=${currentPage})}"
|
||||
>
|
||||
<i class="bi bi-pencil-fill"></i>
|
||||
</a>
|
||||
</td>
|
||||
<td class="p-1">
|
||||
<form
|
||||
th:action="@{/page-countries/delete/{id}(id=${country.id},page=${currentPage})}"
|
||||
method="post"
|
||||
>
|
||||
<button
|
||||
class="btn btn-danger btn-sm"
|
||||
onclick="return confirm('Вы уверены?')"
|
||||
>
|
||||
<i class="bi bi-trash-fill"></i>
|
||||
</button>
|
||||
</form>
|
||||
</td>
|
||||
</tr>
|
||||
</th:block>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<th:block
|
||||
th:replace="~{ f-pagination :: draw (
|
||||
path='page-countries',
|
||||
totalPages=${totalPages},
|
||||
currentPage=${currentPage}) }"
|
||||
/>
|
||||
</th:block>
|
||||
</th:block>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
56
demo/src/main/resources/templates/f-pagination.html
Normal file
56
demo/src/main/resources/templates/f-pagination.html
Normal file
@@ -0,0 +1,56 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="ru" xmlns:th="http://www.thymeleaf.org">
|
||||
<head>
|
||||
<title></title>
|
||||
</head>
|
||||
<body>
|
||||
<th:block th:fragment="draw (path, totalPages, currentPage)">
|
||||
<nav th:if="${totalPages > 1}" th:with="maxPage=2">
|
||||
<ul
|
||||
class="pagination justify-content-center"
|
||||
th:with="seqFrom=${currentPage - maxPage < 1 ? 1 : currentPage - maxPage},
|
||||
seqTo=${currentPage + maxPage > totalPages ? totalPages : currentPage + maxPage}"
|
||||
>
|
||||
<th:block th:if="${currentPage > maxPage + 1}">
|
||||
<li class="page-item">
|
||||
<a class="page-link" aria-label="Previous" th:href="@{/{url}(url=${path})}">
|
||||
<span aria-hidden="true">«</span>
|
||||
</a>
|
||||
</li>
|
||||
<li class="page-item disabled">
|
||||
<span class="page-link" aria-label="Previous">
|
||||
<span aria-hidden="true">…</span>
|
||||
</span>
|
||||
</li>
|
||||
</th:block>
|
||||
<li
|
||||
class="page-item"
|
||||
th:each="page : ${#numbers.sequence(seqFrom, seqTo)}"
|
||||
th:classappend="${page == currentPage} ? 'active' : ''"
|
||||
>
|
||||
<a class="page-link" th:href="@{/{url}?page={page}(url=${path},page=${page})}">
|
||||
<span th:text="${page}" />
|
||||
</a>
|
||||
</li>
|
||||
<th:block th:if="${currentPage < totalPages - maxPage}">
|
||||
<li class="page-item disabled">
|
||||
<span class="page-link" aria-label="Previous">
|
||||
<span aria-hidden="true">…</span>
|
||||
</span>
|
||||
</li>
|
||||
<li class="page-item">
|
||||
<a
|
||||
class="page-link"
|
||||
aria-label="Next"
|
||||
th:href="@{/{url}?page={page}(url=${path},page=${totalPages})}"
|
||||
>
|
||||
<span aria-hidden="true">»</span>
|
||||
</a>
|
||||
</li>
|
||||
</th:block>
|
||||
</ul>
|
||||
</nav>
|
||||
</th:block>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
51
demo/src/main/resources/templates/login.html
Normal file
51
demo/src/main/resources/templates/login.html
Normal file
@@ -0,0 +1,51 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="ru" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{default}">
|
||||
<head>
|
||||
<title>Вход</title>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<main layout:fragment="content">
|
||||
<div class="row justify-content-center">
|
||||
<form action="#" th:action="@{/login}" method="post" class="col col-md-6">
|
||||
<div th:if="${param.error}" class="alert alert-danger">Неверный логин или пароль</div>
|
||||
<div th:if="${param.logout}" class="alert alert-success">Выход успешно произведен</div>
|
||||
<div th:if="${param.signup}" class="alert alert-success">Пользователь успешно создан</div>
|
||||
<div class="mb-3">
|
||||
<label for="username" class="form-label">Имя пользователя</label>
|
||||
<input
|
||||
type="text"
|
||||
id="username"
|
||||
name="username"
|
||||
class="form-control"
|
||||
minlength="3"
|
||||
maxlength="20"
|
||||
required
|
||||
/>
|
||||
</div>
|
||||
<div class="mb-3">
|
||||
<label for="password" class="form-label">Пароль</label>
|
||||
<input
|
||||
type="password"
|
||||
id="password"
|
||||
name="password"
|
||||
class="form-control"
|
||||
minlength="3"
|
||||
maxlength="60"
|
||||
required
|
||||
/>
|
||||
</div>
|
||||
<div class="form-check mb-3">
|
||||
<input class="form-check-input" type="checkbox" id="remember-me" name="remember-me" checked />
|
||||
<label class="form-check-label" for="remember-me">Запомнить меня</label>
|
||||
</div>
|
||||
<div class="mb-3 d-flex flex-row">
|
||||
<button class="btn btn-primary me-2" type="submit">Войти</button>
|
||||
<a class="btn btn-secondary" th:href="@{/signup}">Регистрация</a>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</main>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
86
demo/src/main/resources/templates/page-artists-edit.html
Normal file
86
demo/src/main/resources/templates/page-artists-edit.html
Normal file
@@ -0,0 +1,86 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="ru" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{default}">
|
||||
<head>
|
||||
<title>Редактировать исполнителя</title>
|
||||
</head>
|
||||
<body>
|
||||
<main layout:fragment="content">
|
||||
<div class="row">
|
||||
<div class="col-md-8">
|
||||
<form
|
||||
th:action="@{/page-artists/edit/{id}(id=${artist.id},page=${page})}"
|
||||
th:object="${artist}"
|
||||
method="post"
|
||||
>
|
||||
<div th:if="${successSave}" class="alert alert-success mb-2" role="alert">
|
||||
Данные успешно записаны
|
||||
</div>
|
||||
<div class="mb-2" th:with="hasError=${#fields.hasErrors('name')}">
|
||||
<label for="name" class="form-label">Название</label>
|
||||
<input
|
||||
type="text"
|
||||
th:field="*{name}"
|
||||
id="name"
|
||||
class="form-control bg-dark text-light"
|
||||
th:classappend="${hasError ? 'is-invalid' : ''}"
|
||||
/>
|
||||
<div th:if="${hasError}" th:errors="*{name}" class="invalid-feedback"></div>
|
||||
</div>
|
||||
<div class="mb-2" th:with="hasError=${#fields.hasErrors('description')}">
|
||||
<label for="description" class="form-label">Описание</label>
|
||||
<textarea
|
||||
th:field="*{description}"
|
||||
id="description"
|
||||
class="form-control bg-dark text-light"
|
||||
rows="4"
|
||||
th:classappend="${hasError ? 'is-invalid' : ''}"
|
||||
></textarea>
|
||||
<div th:if="${hasError}" th:errors="*{description}" class="invalid-feedback"></div>
|
||||
</div>
|
||||
<div class="mb-2" th:with="hasError=${#fields.hasErrors('epochId')}">
|
||||
<label for="epochId" class="form-label">Эпоха</label>
|
||||
<select
|
||||
th:field="*{epochId}"
|
||||
id="epochId"
|
||||
class="form-select bg-dark text-light"
|
||||
th:classappend="${hasError ? 'is-invalid' : ''}"
|
||||
>
|
||||
<option selected value="">Выберите эпоху</option>
|
||||
<option
|
||||
th:each="epoch : ${epochs}"
|
||||
th:value="${epoch.id}"
|
||||
th:selected="${epoch.id==epochId}"
|
||||
th:text="${epoch.name}"
|
||||
></option>
|
||||
</select>
|
||||
<div th:if="${hasError}" th:errors="*{epochId}" class="invalid-feedback"></div>
|
||||
</div>
|
||||
<div class="mb-2" th:with="hasError=${#fields.hasErrors('countryId')}">
|
||||
<label for="countryId" class="form-label">Страна</label>
|
||||
<select
|
||||
th:field="*{countryId}"
|
||||
id="countryId"
|
||||
class="form-select bg-dark text-light"
|
||||
th:classappend="${hasError ? 'is-invalid' : ''}"
|
||||
>
|
||||
<option selected value="">Выберите страну</option>
|
||||
<option
|
||||
th:each="country : ${countries}"
|
||||
th:value="${country.id}"
|
||||
th:selected="${country.id==countryId}"
|
||||
th:text="${country.name}"
|
||||
></option>
|
||||
</select>
|
||||
<div th:if="${hasError}" th:errors="*{countryId}" class="invalid-feedback"></div>
|
||||
</div>
|
||||
<div class="text-center">
|
||||
<button class="btn btn-primary" type="submit">Сохранить</button>
|
||||
<a class="btn btn-secondary mx-2" th:href="@{/page-artists(page=${page})}">Отмена</a>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</main>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
59
demo/src/main/resources/templates/page-artists.html
Normal file
59
demo/src/main/resources/templates/page-artists.html
Normal file
@@ -0,0 +1,59 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="ru" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{default}">
|
||||
<head>
|
||||
<title>Исполнители</title>
|
||||
</head>
|
||||
<body>
|
||||
<main layout:fragment="content">
|
||||
<div class="mb-3">
|
||||
<a class="btn btn-primary" th:href="@{/page-artists/edit(page=${page})}">
|
||||
<i class="bi bi-plus-circle-fill me-2"></i>Создать нового исполнителя
|
||||
</a>
|
||||
</div>
|
||||
|
||||
<div class="card bg-dark border-punk mb-3">
|
||||
<div class="card-body">
|
||||
<h5 class="card-title text-punk">Фильтры</h5>
|
||||
<form th:action="@{/page-artists/filter}" method="post" class="row g-3">
|
||||
<div class="col-md-4">
|
||||
<label for="countryId" class="form-label">Страна</label>
|
||||
<select id="countryId" name="countryId" class="form-select bg-dark text-light">
|
||||
<option value="">Все страны</option>
|
||||
<option
|
||||
th:each="country : ${countries}"
|
||||
th:value="${country.id}"
|
||||
th:selected="${country.id == selectedCountryId}"
|
||||
th:text="${country.name}"
|
||||
></option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<label for="epochId" class="form-label">Эпоха</label>
|
||||
<select id="epochId" name="epochId" class="form-select bg-dark text-light">
|
||||
<option value="">Все эпохи</option>
|
||||
<option
|
||||
th:each="epoch : ${epochs}"
|
||||
th:value="${epoch.id}"
|
||||
th:selected="${epoch.id == selectedEpochId}"
|
||||
th:text="${epoch.name}"
|
||||
></option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="col-md-4 d-flex align-items-end">
|
||||
<button type="submit" class="btn btn-outline-primary me-2">Применить</button>
|
||||
<a th:href="@{/page-artists/filter/clear}" class="btn btn-outline-secondary">Сбросить</a>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<th:block
|
||||
th:replace="~{ f-artists :: draw (
|
||||
items=${artists.items},
|
||||
totalPages=${artists.totalPages},
|
||||
currentPage=${artists.currentPage}) }"
|
||||
/>
|
||||
</main>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
39
demo/src/main/resources/templates/page-countries-edit.html
Normal file
39
demo/src/main/resources/templates/page-countries-edit.html
Normal file
@@ -0,0 +1,39 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="ru" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{default}">
|
||||
<head>
|
||||
<title>Редактировать страну</title>
|
||||
</head>
|
||||
<body>
|
||||
<main layout:fragment="content">
|
||||
<div class="row">
|
||||
<div class="col-md-6">
|
||||
<form
|
||||
th:action="@{/page-countries/edit/{id}(id=${country.id},page=${page})}"
|
||||
th:object="${country}"
|
||||
method="post"
|
||||
>
|
||||
<div th:if="${successSave}" class="alert alert-success mb-2" role="alert">
|
||||
Данные успешно записаны
|
||||
</div>
|
||||
<div class="mb-2" th:with="hasError=${#fields.hasErrors('name')}">
|
||||
<label for="name" class="form-label">Название</label>
|
||||
<input
|
||||
type="text"
|
||||
th:field="*{name}"
|
||||
id="name"
|
||||
class="form-control bg-dark text-light"
|
||||
th:classappend="${hasError ? 'is-invalid' : ''}"
|
||||
/>
|
||||
<div th:if="${hasError}" th:errors="*{name}" class="invalid-feedback"></div>
|
||||
</div>
|
||||
<div class="text-center">
|
||||
<button class="btn btn-primary" type="submit">Сохранить</button>
|
||||
<a class="btn btn-secondary mx-2" th:href="@{/page-countries(page=${page})}">Отмена</a>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</main>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user