lab1 =)
This commit is contained in:
BIN
.gradle/8.14.3/checksums/checksums.lock
Normal file
BIN
.gradle/8.14.3/checksums/checksums.lock
Normal file
Binary file not shown.
BIN
.gradle/8.14.3/executionHistory/executionHistory.bin
Normal file
BIN
.gradle/8.14.3/executionHistory/executionHistory.bin
Normal file
Binary file not shown.
BIN
.gradle/8.14.3/executionHistory/executionHistory.lock
Normal file
BIN
.gradle/8.14.3/executionHistory/executionHistory.lock
Normal file
Binary file not shown.
BIN
.gradle/8.14.3/fileChanges/last-build.bin
Normal file
BIN
.gradle/8.14.3/fileChanges/last-build.bin
Normal file
Binary file not shown.
BIN
.gradle/8.14.3/fileHashes/fileHashes.bin
Normal file
BIN
.gradle/8.14.3/fileHashes/fileHashes.bin
Normal file
Binary file not shown.
BIN
.gradle/8.14.3/fileHashes/fileHashes.lock
Normal file
BIN
.gradle/8.14.3/fileHashes/fileHashes.lock
Normal file
Binary file not shown.
BIN
.gradle/8.14.3/fileHashes/resourceHashesCache.bin
Normal file
BIN
.gradle/8.14.3/fileHashes/resourceHashesCache.bin
Normal file
Binary file not shown.
0
.gradle/8.14.3/gc.properties
Normal file
0
.gradle/8.14.3/gc.properties
Normal file
BIN
.gradle/buildOutputCleanup/buildOutputCleanup.lock
Normal file
BIN
.gradle/buildOutputCleanup/buildOutputCleanup.lock
Normal file
Binary file not shown.
2
.gradle/buildOutputCleanup/cache.properties
Normal file
2
.gradle/buildOutputCleanup/cache.properties
Normal file
@@ -0,0 +1,2 @@
|
||||
#Fri Sep 26 20:26:20 SAMT 2025
|
||||
gradle.version=8.14.3
|
||||
BIN
.gradle/buildOutputCleanup/outputFiles.bin
Normal file
BIN
.gradle/buildOutputCleanup/outputFiles.bin
Normal file
Binary file not shown.
BIN
.gradle/file-system.probe
Normal file
BIN
.gradle/file-system.probe
Normal file
Binary file not shown.
0
.gradle/vcs-1/gc.properties
Normal file
0
.gradle/vcs-1/gc.properties
Normal file
22
HELP.md
Normal file
22
HELP.md
Normal file
@@ -0,0 +1,22 @@
|
||||
# Getting Started
|
||||
|
||||
### Reference Documentation
|
||||
For further reference, please consider the following sections:
|
||||
|
||||
* [Official Gradle documentation](https://docs.gradle.org)
|
||||
* [Spring Boot Gradle Plugin Reference Guide](https://docs.spring.io/spring-boot/3.5.5/gradle-plugin)
|
||||
* [Create an OCI image](https://docs.spring.io/spring-boot/3.5.5/gradle-plugin/packaging-oci-image.html)
|
||||
* [Spring Web](https://docs.spring.io/spring-boot/3.5.5/reference/web/servlet.html)
|
||||
|
||||
### Guides
|
||||
The following guides illustrate how to use some features concretely:
|
||||
|
||||
* [Building a RESTful Web Service](https://spring.io/guides/gs/rest-service/)
|
||||
* [Serving Web Content with Spring MVC](https://spring.io/guides/gs/serving-web-content/)
|
||||
* [Building REST services with Spring](https://spring.io/guides/tutorials/rest/)
|
||||
|
||||
### Additional Links
|
||||
These additional references should also help you:
|
||||
|
||||
* [Gradle Build Scans – insights for your project's build](https://scans.gradle.com#gradle)
|
||||
|
||||
32
build.gradle
Normal file
32
build.gradle
Normal file
@@ -0,0 +1,32 @@
|
||||
plugins {
|
||||
id 'java'
|
||||
id 'org.springframework.boot' version '3.5.5'
|
||||
id 'io.spring.dependency-management' version '1.1.7'
|
||||
}
|
||||
|
||||
group = 'com.example'
|
||||
version = '0.0.1-SNAPSHOT'
|
||||
description = 'Demo project for Spring Boot'
|
||||
|
||||
java {
|
||||
toolchain {
|
||||
languageVersion = JavaLanguageVersion.of(21)
|
||||
}
|
||||
}
|
||||
|
||||
repositories {
|
||||
mavenCentral()
|
||||
}
|
||||
|
||||
dependencies {
|
||||
implementation 'org.springframework.boot:spring-boot-starter-web'
|
||||
testImplementation 'org.springframework.boot:spring-boot-starter-test'
|
||||
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
|
||||
implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
|
||||
}
|
||||
|
||||
|
||||
|
||||
tasks.named('test') {
|
||||
useJUnitPlatform()
|
||||
}
|
||||
BIN
build/classes/java/main/com/example/config/CorsConfig$1.class
Normal file
BIN
build/classes/java/main/com/example/config/CorsConfig$1.class
Normal file
Binary file not shown.
BIN
build/classes/java/main/com/example/config/CorsConfig.class
Normal file
BIN
build/classes/java/main/com/example/config/CorsConfig.class
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
build/classes/java/main/com/example/dto/CustomerDTO.class
Normal file
BIN
build/classes/java/main/com/example/dto/CustomerDTO.class
Normal file
Binary file not shown.
BIN
build/classes/java/main/com/example/dto/DeliveryDTO.class
Normal file
BIN
build/classes/java/main/com/example/dto/DeliveryDTO.class
Normal file
Binary file not shown.
BIN
build/classes/java/main/com/example/dto/OrderDTO.class
Normal file
BIN
build/classes/java/main/com/example/dto/OrderDTO.class
Normal file
Binary file not shown.
Binary file not shown.
BIN
build/libs/demo-0.0.1-SNAPSHOT-plain.jar
Normal file
BIN
build/libs/demo-0.0.1-SNAPSHOT-plain.jar
Normal file
Binary file not shown.
BIN
build/libs/demo-0.0.1-SNAPSHOT.jar
Normal file
BIN
build/libs/demo-0.0.1-SNAPSHOT.jar
Normal file
Binary file not shown.
663
build/reports/problems/problems-report.html
Normal file
663
build/reports/problems/problems-report.html
Normal file
File diff suppressed because one or more lines are too long
@@ -0,0 +1,135 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
|
||||
<meta http-equiv="x-ua-compatible" content="IE=edge"/>
|
||||
<title>Test results - DemoApplicationTests</title>
|
||||
<link href="../css/base-style.css" rel="stylesheet" type="text/css"/>
|
||||
<link href="../css/style.css" rel="stylesheet" type="text/css"/>
|
||||
<script src="../js/report.js" type="text/javascript"></script>
|
||||
</head>
|
||||
<body>
|
||||
<div id="content">
|
||||
<h1>DemoApplicationTests</h1>
|
||||
<div class="breadcrumbs">
|
||||
<a href="../index.html">all</a> >
|
||||
<a href="../packages/com.example.demo.html">com.example.demo</a> > DemoApplicationTests</div>
|
||||
<div id="summary">
|
||||
<table>
|
||||
<tr>
|
||||
<td>
|
||||
<div class="summaryGroup">
|
||||
<table>
|
||||
<tr>
|
||||
<td>
|
||||
<div class="infoBox" id="tests">
|
||||
<div class="counter">1</div>
|
||||
<p>tests</p>
|
||||
</div>
|
||||
</td>
|
||||
<td>
|
||||
<div class="infoBox" id="failures">
|
||||
<div class="counter">0</div>
|
||||
<p>failures</p>
|
||||
</div>
|
||||
</td>
|
||||
<td>
|
||||
<div class="infoBox" id="ignored">
|
||||
<div class="counter">0</div>
|
||||
<p>ignored</p>
|
||||
</div>
|
||||
</td>
|
||||
<td>
|
||||
<div class="infoBox" id="duration">
|
||||
<div class="counter">0.383s</div>
|
||||
<p>duration</p>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
</td>
|
||||
<td>
|
||||
<div class="infoBox success" id="successRate">
|
||||
<div class="percent">100%</div>
|
||||
<p>successful</p>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
<div class="tab-container">
|
||||
<ul class="tabLinks">
|
||||
<li>
|
||||
<a href="#">Tests</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="#">Standard output</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="#">Standard error</a>
|
||||
</li>
|
||||
</ul>
|
||||
<div class="tab">
|
||||
<h2>Tests</h2>
|
||||
<table>
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Test</th>
|
||||
<th>Duration</th>
|
||||
<th>Result</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tr>
|
||||
<td class="success">contextLoads()</td>
|
||||
<td class="success">0.383s</td>
|
||||
<td class="success">passed</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
<div class="tab">
|
||||
<h2>Standard output</h2>
|
||||
<span class="code">
|
||||
<pre>09:05:47.895 [Test worker] INFO org.springframework.test.context.support.AnnotationConfigContextLoaderUtils -- Could not detect default configuration classes for test class [com.example.demo.DemoApplicationTests]: DemoApplicationTests does not declare any static, non-private, non-final, nested classes annotated with @Configuration.
|
||||
09:05:47.937 [Test worker] INFO org.springframework.boot.test.context.SpringBootTestContextBootstrapper -- Found @SpringBootConfiguration com.example.demo.DemoApplication for test class com.example.demo.DemoApplicationTests
|
||||
|
||||
. ____ _ __ _ _
|
||||
/\\ / ___'_ __ _ _(_)_ __ __ _ \ \ \ \
|
||||
( ( )\___ | '_ | '_| | '_ \/ _` | \ \ \ \
|
||||
\\/ ___)| |_)| | | | | || (_| | ) ) ) )
|
||||
' |____| .__|_| |_|_| |_\__, | / / / /
|
||||
=========|_|==============|___/=/_/_/_/
|
||||
|
||||
:: Spring Boot :: (v3.5.5)
|
||||
|
||||
2025-09-13T09:05:48.075+04:00 INFO 56029 --- [demo] [ Test worker] com.example.demo.DemoApplicationTests : Starting DemoApplicationTests using Java 21.0.3 with PID 56029 (started by floom in /Users/floom/demo)
|
||||
2025-09-13T09:05:48.075+04:00 INFO 56029 --- [demo] [ Test worker] com.example.demo.DemoApplicationTests : No active profile set, falling back to 1 default profile: "default"
|
||||
2025-09-13T09:05:48.407+04:00 INFO 56029 --- [demo] [ Test worker] o.s.v.b.OptionalValidatorFactoryBean : Failed to set up a Bean Validation provider: jakarta.validation.NoProviderFoundException: Unable to create a Configuration, because no Jakarta Bean Validation provider could be found. Add a provider like Hibernate Validator (RI) to your classpath.
|
||||
2025-09-13T09:05:48.517+04:00 INFO 56029 --- [demo] [ Test worker] com.example.demo.DemoApplicationTests : Started DemoApplicationTests in 0.531 seconds (process running for 0.945)
|
||||
</pre>
|
||||
</span>
|
||||
</div>
|
||||
<div class="tab">
|
||||
<h2>Standard error</h2>
|
||||
<span class="code">
|
||||
<pre>Mockito is currently self-attaching to enable the inline-mock-maker. This will no longer work in future releases of the JDK. Please add Mockito as an agent to your build as described in Mockito's documentation: https://javadoc.io/doc/org.mockito/mockito-core/latest/org.mockito/org/mockito/Mockito.html#0.3
|
||||
WARNING: A Java agent has been loaded dynamically (/Users/floom/.gradle/caches/modules-2/files-2.1/net.bytebuddy/byte-buddy-agent/1.17.7/fbf3d6d649ed37fc9e9c59480a05be0a26e3c2da/byte-buddy-agent-1.17.7.jar)
|
||||
WARNING: If a serviceability tool is in use, please run with -XX:+EnableDynamicAgentLoading to hide this warning
|
||||
WARNING: If a serviceability tool is not in use, please run with -Djdk.instrument.traceUsage for more information
|
||||
WARNING: Dynamic loading of agents will be disallowed by default in a future release
|
||||
</pre>
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
<div id="footer">
|
||||
<p>
|
||||
<div>
|
||||
<label class="hidden" id="label-for-line-wrapping-toggle" for="line-wrapping-toggle">Wrap lines
|
||||
<input id="line-wrapping-toggle" type="checkbox" autocomplete="off"/>
|
||||
</label>
|
||||
</div>Generated by
|
||||
<a href="https://www.gradle.org">Gradle 8.14.3</a> at 13 сент. 2025 г., 09:05:48</p>
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
174
build/reports/tests/test/css/base-style.css
Normal file
174
build/reports/tests/test/css/base-style.css
Normal file
@@ -0,0 +1,174 @@
|
||||
|
||||
body {
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
font-family: sans-serif;
|
||||
font-size: 12pt;
|
||||
}
|
||||
|
||||
body, a, a:visited {
|
||||
color: #303030;
|
||||
}
|
||||
|
||||
#content {
|
||||
padding: 30px 50px;
|
||||
}
|
||||
|
||||
#content h1 {
|
||||
font-size: 160%;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
|
||||
#footer {
|
||||
margin-top: 100px;
|
||||
font-size: 80%;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
#footer, #footer a {
|
||||
color: #a0a0a0;
|
||||
}
|
||||
|
||||
#line-wrapping-toggle {
|
||||
vertical-align: middle;
|
||||
}
|
||||
|
||||
#label-for-line-wrapping-toggle {
|
||||
vertical-align: middle;
|
||||
}
|
||||
|
||||
ul {
|
||||
margin-left: 0;
|
||||
}
|
||||
|
||||
h1, h2, h3 {
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
h2 {
|
||||
font-size: 120%;
|
||||
}
|
||||
|
||||
.tab-container .tab-container {
|
||||
margin-left: 8px;
|
||||
}
|
||||
|
||||
ul.tabLinks {
|
||||
padding: 0;
|
||||
margin-bottom: 0;
|
||||
overflow: auto;
|
||||
min-width: 800px;
|
||||
width: auto;
|
||||
border-bottom: solid 1px #aaa;
|
||||
}
|
||||
|
||||
ul.tabLinks li {
|
||||
float: left;
|
||||
height: 100%;
|
||||
list-style: none;
|
||||
padding: 5px 10px;
|
||||
border-radius: 7px 7px 0 0;
|
||||
border: solid 1px transparent;
|
||||
border-bottom: none;
|
||||
margin-right: 6px;
|
||||
background-color: #f0f0f0;
|
||||
}
|
||||
|
||||
ul.tabLinks li.deselected > a {
|
||||
color: #6d6d6d;
|
||||
}
|
||||
|
||||
ul.tabLinks li:hover {
|
||||
background-color: #fafafa;
|
||||
}
|
||||
|
||||
ul.tabLinks li.selected {
|
||||
background-color: #c5f0f5;
|
||||
border-color: #aaa;
|
||||
}
|
||||
|
||||
ul.tabLinks a {
|
||||
font-size: 120%;
|
||||
display: block;
|
||||
outline: none;
|
||||
text-decoration: none;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
ul.tabLinks li h2 {
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
div.tab {
|
||||
}
|
||||
|
||||
div.selected {
|
||||
display: block;
|
||||
}
|
||||
|
||||
div.deselected {
|
||||
display: none;
|
||||
}
|
||||
|
||||
div.tab table {
|
||||
min-width: 350px;
|
||||
width: auto;
|
||||
border-collapse: collapse;
|
||||
}
|
||||
|
||||
div.tab th, div.tab table {
|
||||
border-bottom: solid 1px #d0d0d0;
|
||||
}
|
||||
|
||||
div.tab th {
|
||||
text-align: left;
|
||||
white-space: nowrap;
|
||||
padding-left: 6em;
|
||||
}
|
||||
|
||||
div.tab th:first-child {
|
||||
padding-left: 0;
|
||||
}
|
||||
|
||||
div.tab td {
|
||||
white-space: nowrap;
|
||||
padding-left: 6em;
|
||||
padding-top: 5px;
|
||||
padding-bottom: 5px;
|
||||
}
|
||||
|
||||
div.tab td:first-child {
|
||||
padding-left: 0;
|
||||
}
|
||||
|
||||
div.tab td.numeric, div.tab th.numeric {
|
||||
text-align: right;
|
||||
}
|
||||
|
||||
span.code {
|
||||
display: inline-block;
|
||||
margin-top: 0;
|
||||
margin-bottom: 1em;
|
||||
}
|
||||
|
||||
span.code pre {
|
||||
font-size: 11pt;
|
||||
padding: 10px;
|
||||
margin: 0;
|
||||
background-color: #f7f7f7;
|
||||
border: solid 1px #d0d0d0;
|
||||
min-width: 700px;
|
||||
width: auto;
|
||||
}
|
||||
|
||||
span.wrapped pre {
|
||||
word-wrap: break-word;
|
||||
white-space: pre-wrap;
|
||||
word-break: break-all;
|
||||
}
|
||||
|
||||
label.hidden {
|
||||
display: none;
|
||||
}
|
||||
84
build/reports/tests/test/css/style.css
Normal file
84
build/reports/tests/test/css/style.css
Normal file
@@ -0,0 +1,84 @@
|
||||
|
||||
#summary {
|
||||
margin-top: 30px;
|
||||
margin-bottom: 40px;
|
||||
}
|
||||
|
||||
#summary table {
|
||||
border-collapse: collapse;
|
||||
}
|
||||
|
||||
#summary td {
|
||||
vertical-align: top;
|
||||
}
|
||||
|
||||
.breadcrumbs, .breadcrumbs a {
|
||||
color: #606060;
|
||||
}
|
||||
|
||||
.infoBox {
|
||||
width: 110px;
|
||||
padding-top: 15px;
|
||||
padding-bottom: 15px;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.infoBox p {
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.counter, .percent {
|
||||
font-size: 120%;
|
||||
font-weight: bold;
|
||||
margin-bottom: 8px;
|
||||
}
|
||||
|
||||
#duration {
|
||||
width: 125px;
|
||||
}
|
||||
|
||||
#successRate, .summaryGroup {
|
||||
border: solid 2px #d0d0d0;
|
||||
-moz-border-radius: 10px;
|
||||
border-radius: 10px;
|
||||
}
|
||||
|
||||
#successRate {
|
||||
width: 140px;
|
||||
margin-left: 35px;
|
||||
}
|
||||
|
||||
#successRate .percent {
|
||||
font-size: 180%;
|
||||
}
|
||||
|
||||
.success, .success a {
|
||||
color: #008000;
|
||||
}
|
||||
|
||||
div.success, #successRate.success {
|
||||
background-color: #bbd9bb;
|
||||
border-color: #008000;
|
||||
}
|
||||
|
||||
.failures, .failures a {
|
||||
color: #b60808;
|
||||
}
|
||||
|
||||
.skipped, .skipped a {
|
||||
color: #c09853;
|
||||
}
|
||||
|
||||
div.failures, #successRate.failures {
|
||||
background-color: #ecdada;
|
||||
border-color: #b60808;
|
||||
}
|
||||
|
||||
ul.linkList {
|
||||
padding-left: 0;
|
||||
}
|
||||
|
||||
ul.linkList li {
|
||||
list-style: none;
|
||||
margin-bottom: 5px;
|
||||
}
|
||||
133
build/reports/tests/test/index.html
Normal file
133
build/reports/tests/test/index.html
Normal file
@@ -0,0 +1,133 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
|
||||
<meta http-equiv="x-ua-compatible" content="IE=edge"/>
|
||||
<title>Test results - Test Summary</title>
|
||||
<link href="css/base-style.css" rel="stylesheet" type="text/css"/>
|
||||
<link href="css/style.css" rel="stylesheet" type="text/css"/>
|
||||
<script src="js/report.js" type="text/javascript"></script>
|
||||
</head>
|
||||
<body>
|
||||
<div id="content">
|
||||
<h1>Test Summary</h1>
|
||||
<div id="summary">
|
||||
<table>
|
||||
<tr>
|
||||
<td>
|
||||
<div class="summaryGroup">
|
||||
<table>
|
||||
<tr>
|
||||
<td>
|
||||
<div class="infoBox" id="tests">
|
||||
<div class="counter">1</div>
|
||||
<p>tests</p>
|
||||
</div>
|
||||
</td>
|
||||
<td>
|
||||
<div class="infoBox" id="failures">
|
||||
<div class="counter">0</div>
|
||||
<p>failures</p>
|
||||
</div>
|
||||
</td>
|
||||
<td>
|
||||
<div class="infoBox" id="ignored">
|
||||
<div class="counter">0</div>
|
||||
<p>ignored</p>
|
||||
</div>
|
||||
</td>
|
||||
<td>
|
||||
<div class="infoBox" id="duration">
|
||||
<div class="counter">0.383s</div>
|
||||
<p>duration</p>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
</td>
|
||||
<td>
|
||||
<div class="infoBox success" id="successRate">
|
||||
<div class="percent">100%</div>
|
||||
<p>successful</p>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
<div class="tab-container">
|
||||
<ul class="tabLinks">
|
||||
<li>
|
||||
<a href="#">Packages</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="#">Classes</a>
|
||||
</li>
|
||||
</ul>
|
||||
<div class="tab">
|
||||
<h2>Packages</h2>
|
||||
<table>
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Package</th>
|
||||
<th>Tests</th>
|
||||
<th>Failures</th>
|
||||
<th>Ignored</th>
|
||||
<th>Duration</th>
|
||||
<th>Success rate</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr>
|
||||
<td class="success">
|
||||
<a href="packages/com.example.demo.html">com.example.demo</a>
|
||||
</td>
|
||||
<td>1</td>
|
||||
<td>0</td>
|
||||
<td>0</td>
|
||||
<td>0.383s</td>
|
||||
<td class="success">100%</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<div class="tab">
|
||||
<h2>Classes</h2>
|
||||
<table>
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Class</th>
|
||||
<th>Tests</th>
|
||||
<th>Failures</th>
|
||||
<th>Ignored</th>
|
||||
<th>Duration</th>
|
||||
<th>Success rate</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr>
|
||||
<td class="success">
|
||||
<a href="classes/com.example.demo.DemoApplicationTests.html">com.example.demo.DemoApplicationTests</a>
|
||||
</td>
|
||||
<td>1</td>
|
||||
<td>0</td>
|
||||
<td>0</td>
|
||||
<td>0.383s</td>
|
||||
<td class="success">100%</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
<div id="footer">
|
||||
<p>
|
||||
<div>
|
||||
<label class="hidden" id="label-for-line-wrapping-toggle" for="line-wrapping-toggle">Wrap lines
|
||||
<input id="line-wrapping-toggle" type="checkbox" autocomplete="off"/>
|
||||
</label>
|
||||
</div>Generated by
|
||||
<a href="https://www.gradle.org">Gradle 8.14.3</a> at 13 сент. 2025 г., 09:05:48</p>
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
218
build/reports/tests/test/js/report.js
Normal file
218
build/reports/tests/test/js/report.js
Normal file
@@ -0,0 +1,218 @@
|
||||
(function (window, document) {
|
||||
"use strict";
|
||||
|
||||
function changeElementClass(element, classValue) {
|
||||
if (element.getAttribute("className")) {
|
||||
element.setAttribute("className", classValue);
|
||||
} else {
|
||||
element.setAttribute("class", classValue);
|
||||
}
|
||||
}
|
||||
|
||||
function getClassAttribute(element) {
|
||||
if (element.getAttribute("className")) {
|
||||
return element.getAttribute("className");
|
||||
} else {
|
||||
return element.getAttribute("class");
|
||||
}
|
||||
}
|
||||
|
||||
function addClass(element, classValue) {
|
||||
changeElementClass(element, getClassAttribute(element) + " " + classValue);
|
||||
}
|
||||
|
||||
function removeClass(element, classValue) {
|
||||
changeElementClass(element, getClassAttribute(element).replace(classValue, ""));
|
||||
}
|
||||
|
||||
function getCheckBox() {
|
||||
return document.getElementById("line-wrapping-toggle");
|
||||
}
|
||||
|
||||
function getLabelForCheckBox() {
|
||||
return document.getElementById("label-for-line-wrapping-toggle");
|
||||
}
|
||||
|
||||
function findCodeBlocks() {
|
||||
const codeBlocks = [];
|
||||
const tabContainers = getTabContainers();
|
||||
for (let i = 0; i < tabContainers.length; i++) {
|
||||
const spans = tabContainers[i].getElementsByTagName("span");
|
||||
for (let i = 0; i < spans.length; ++i) {
|
||||
if (spans[i].className.indexOf("code") >= 0) {
|
||||
codeBlocks.push(spans[i]);
|
||||
}
|
||||
}
|
||||
}
|
||||
return codeBlocks;
|
||||
}
|
||||
|
||||
function forAllCodeBlocks(operation) {
|
||||
const codeBlocks = findCodeBlocks();
|
||||
|
||||
for (let i = 0; i < codeBlocks.length; ++i) {
|
||||
operation(codeBlocks[i], "wrapped");
|
||||
}
|
||||
}
|
||||
|
||||
function toggleLineWrapping() {
|
||||
const checkBox = getCheckBox();
|
||||
|
||||
if (checkBox.checked) {
|
||||
forAllCodeBlocks(addClass);
|
||||
} else {
|
||||
forAllCodeBlocks(removeClass);
|
||||
}
|
||||
}
|
||||
|
||||
function initControls() {
|
||||
if (findCodeBlocks().length > 0) {
|
||||
const checkBox = getCheckBox();
|
||||
const label = getLabelForCheckBox();
|
||||
|
||||
checkBox.onclick = toggleLineWrapping;
|
||||
checkBox.checked = false;
|
||||
|
||||
removeClass(label, "hidden");
|
||||
}
|
||||
}
|
||||
|
||||
class TabManager {
|
||||
baseId;
|
||||
tabs;
|
||||
titles;
|
||||
headers;
|
||||
|
||||
constructor(baseId, tabs, titles, headers) {
|
||||
this.baseId = baseId;
|
||||
this.tabs = tabs;
|
||||
this.titles = titles;
|
||||
this.headers = headers;
|
||||
}
|
||||
|
||||
select(i) {
|
||||
this.deselectAll();
|
||||
|
||||
changeElementClass(this.tabs[i], "tab selected");
|
||||
changeElementClass(this.headers[i], "selected");
|
||||
|
||||
while (this.headers[i].firstChild) {
|
||||
this.headers[i].removeChild(this.headers[i].firstChild);
|
||||
}
|
||||
|
||||
const a = document.createElement("a");
|
||||
|
||||
a.appendChild(document.createTextNode(this.titles[i]));
|
||||
this.headers[i].appendChild(a);
|
||||
}
|
||||
|
||||
deselectAll() {
|
||||
for (let i = 0; i < this.tabs.length; i++) {
|
||||
changeElementClass(this.tabs[i], "tab deselected");
|
||||
changeElementClass(this.headers[i], "deselected");
|
||||
|
||||
while (this.headers[i].firstChild) {
|
||||
this.headers[i].removeChild(this.headers[i].firstChild);
|
||||
}
|
||||
|
||||
const a = document.createElement("a");
|
||||
|
||||
const id = this.baseId + "-tab" + i;
|
||||
a.setAttribute("id", id);
|
||||
a.setAttribute("href", "#tab" + i);
|
||||
a.onclick = () => {
|
||||
this.select(i);
|
||||
return false;
|
||||
};
|
||||
a.appendChild(document.createTextNode(this.titles[i]));
|
||||
|
||||
this.headers[i].appendChild(a);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function getTabContainers() {
|
||||
const tabContainers = Array.from(document.getElementsByClassName("tab-container"));
|
||||
|
||||
// Used by existing TabbedPageRenderer users, which have not adjusted to use TabsRenderer yet.
|
||||
const legacyContainer = document.getElementById("tabs");
|
||||
if (legacyContainer) {
|
||||
tabContainers.push(legacyContainer);
|
||||
}
|
||||
|
||||
return tabContainers;
|
||||
}
|
||||
|
||||
function initTabs() {
|
||||
let tabGroups = 0;
|
||||
|
||||
function createTab(num, container) {
|
||||
const tabElems = findTabs(container);
|
||||
const tabManager = new TabManager("tabs" + num, tabElems, findTitles(tabElems), findHeaders(container));
|
||||
tabManager.select(0);
|
||||
}
|
||||
|
||||
const tabContainers = getTabContainers();
|
||||
|
||||
for (let i = 0; i < tabContainers.length; i++) {
|
||||
createTab(tabGroups, tabContainers[i]);
|
||||
tabGroups++;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
function findTabs(container) {
|
||||
return findChildElements(container, "DIV", "tab");
|
||||
}
|
||||
|
||||
function findHeaders(container) {
|
||||
const owner = findChildElements(container, "UL", "tabLinks");
|
||||
return findChildElements(owner[0], "LI", null);
|
||||
}
|
||||
|
||||
function findTitles(tabs) {
|
||||
const titles = [];
|
||||
|
||||
for (let i = 0; i < tabs.length; i++) {
|
||||
const tab = tabs[i];
|
||||
const header = findChildElements(tab, "H2", null)[0];
|
||||
|
||||
header.parentNode.removeChild(header);
|
||||
|
||||
if (header.innerText) {
|
||||
titles.push(header.innerText);
|
||||
} else {
|
||||
titles.push(header.textContent);
|
||||
}
|
||||
}
|
||||
|
||||
return titles;
|
||||
}
|
||||
|
||||
function findChildElements(container, name, targetClass) {
|
||||
const elements = [];
|
||||
const children = container.childNodes;
|
||||
|
||||
for (let i = 0; i < children.length; i++) {
|
||||
const child = children.item(i);
|
||||
|
||||
if (child.nodeType === 1 && child.nodeName === name) {
|
||||
if (targetClass && child.className.indexOf(targetClass) < 0) {
|
||||
continue;
|
||||
}
|
||||
|
||||
elements.push(child);
|
||||
}
|
||||
}
|
||||
|
||||
return elements;
|
||||
}
|
||||
|
||||
// Entry point.
|
||||
|
||||
window.onload = function() {
|
||||
initTabs();
|
||||
initControls();
|
||||
};
|
||||
} (window, window.document));
|
||||
103
build/reports/tests/test/packages/com.example.demo.html
Normal file
103
build/reports/tests/test/packages/com.example.demo.html
Normal file
@@ -0,0 +1,103 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
|
||||
<meta http-equiv="x-ua-compatible" content="IE=edge"/>
|
||||
<title>Test results - Package com.example.demo</title>
|
||||
<link href="../css/base-style.css" rel="stylesheet" type="text/css"/>
|
||||
<link href="../css/style.css" rel="stylesheet" type="text/css"/>
|
||||
<script src="../js/report.js" type="text/javascript"></script>
|
||||
</head>
|
||||
<body>
|
||||
<div id="content">
|
||||
<h1>Package com.example.demo</h1>
|
||||
<div class="breadcrumbs">
|
||||
<a href="../index.html">all</a> > com.example.demo</div>
|
||||
<div id="summary">
|
||||
<table>
|
||||
<tr>
|
||||
<td>
|
||||
<div class="summaryGroup">
|
||||
<table>
|
||||
<tr>
|
||||
<td>
|
||||
<div class="infoBox" id="tests">
|
||||
<div class="counter">1</div>
|
||||
<p>tests</p>
|
||||
</div>
|
||||
</td>
|
||||
<td>
|
||||
<div class="infoBox" id="failures">
|
||||
<div class="counter">0</div>
|
||||
<p>failures</p>
|
||||
</div>
|
||||
</td>
|
||||
<td>
|
||||
<div class="infoBox" id="ignored">
|
||||
<div class="counter">0</div>
|
||||
<p>ignored</p>
|
||||
</div>
|
||||
</td>
|
||||
<td>
|
||||
<div class="infoBox" id="duration">
|
||||
<div class="counter">0.383s</div>
|
||||
<p>duration</p>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
</td>
|
||||
<td>
|
||||
<div class="infoBox success" id="successRate">
|
||||
<div class="percent">100%</div>
|
||||
<p>successful</p>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
<div class="tab-container">
|
||||
<ul class="tabLinks">
|
||||
<li>
|
||||
<a href="#">Classes</a>
|
||||
</li>
|
||||
</ul>
|
||||
<div class="tab">
|
||||
<h2>Classes</h2>
|
||||
<table>
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Class</th>
|
||||
<th>Tests</th>
|
||||
<th>Failures</th>
|
||||
<th>Ignored</th>
|
||||
<th>Duration</th>
|
||||
<th>Success rate</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tr>
|
||||
<td class="success">
|
||||
<a href="../classes/com.example.demo.DemoApplicationTests.html">DemoApplicationTests</a>
|
||||
</td>
|
||||
<td>1</td>
|
||||
<td>0</td>
|
||||
<td>0</td>
|
||||
<td>0.383s</td>
|
||||
<td class="success">100%</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
<div id="footer">
|
||||
<p>
|
||||
<div>
|
||||
<label class="hidden" id="label-for-line-wrapping-toggle" for="line-wrapping-toggle">Wrap lines
|
||||
<input id="line-wrapping-toggle" type="checkbox" autocomplete="off"/>
|
||||
</label>
|
||||
</div>Generated by
|
||||
<a href="https://www.gradle.org">Gradle 8.14.3</a> at 13 сент. 2025 г., 09:05:48</p>
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
1
build/resolvedMainClassName
Normal file
1
build/resolvedMainClassName
Normal file
@@ -0,0 +1 @@
|
||||
com.example.controller.DemoApplication
|
||||
1
build/resources/main/application.properties
Normal file
1
build/resources/main/application.properties
Normal file
@@ -0,0 +1 @@
|
||||
spring.application.name=demo
|
||||
@@ -0,0 +1,28 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<testsuite name="com.example.demo.DemoApplicationTests" tests="1" skipped="0" failures="0" errors="0" timestamp="2025-09-13T05:05:48.521Z" hostname="MacBook-Air-Oleg.local" time="0.383">
|
||||
<properties/>
|
||||
<testcase name="contextLoads()" classname="com.example.demo.DemoApplicationTests" time="0.383"/>
|
||||
<system-out><![CDATA[09:05:47.895 [Test worker] INFO org.springframework.test.context.support.AnnotationConfigContextLoaderUtils -- Could not detect default configuration classes for test class [com.example.demo.DemoApplicationTests]: DemoApplicationTests does not declare any static, non-private, non-final, nested classes annotated with @Configuration.
|
||||
09:05:47.937 [Test worker] INFO org.springframework.boot.test.context.SpringBootTestContextBootstrapper -- Found @SpringBootConfiguration com.example.demo.DemoApplication for test class com.example.demo.DemoApplicationTests
|
||||
|
||||
. ____ _ __ _ _
|
||||
/\\ / ___'_ __ _ _(_)_ __ __ _ \ \ \ \
|
||||
( ( )\___ | '_ | '_| | '_ \/ _` | \ \ \ \
|
||||
\\/ ___)| |_)| | | | | || (_| | ) ) ) )
|
||||
' |____| .__|_| |_|_| |_\__, | / / / /
|
||||
=========|_|==============|___/=/_/_/_/
|
||||
|
||||
:: Spring Boot :: (v3.5.5)
|
||||
|
||||
2025-09-13T09:05:48.075+04:00 INFO 56029 --- [demo] [ Test worker] com.example.demo.DemoApplicationTests : Starting DemoApplicationTests using Java 21.0.3 with PID 56029 (started by floom in /Users/floom/demo)
|
||||
2025-09-13T09:05:48.075+04:00 INFO 56029 --- [demo] [ Test worker] com.example.demo.DemoApplicationTests : No active profile set, falling back to 1 default profile: "default"
|
||||
2025-09-13T09:05:48.407+04:00 INFO 56029 --- [demo] [ Test worker] o.s.v.b.OptionalValidatorFactoryBean : Failed to set up a Bean Validation provider: jakarta.validation.NoProviderFoundException: Unable to create a Configuration, because no Jakarta Bean Validation provider could be found. Add a provider like Hibernate Validator (RI) to your classpath.
|
||||
2025-09-13T09:05:48.517+04:00 INFO 56029 --- [demo] [ Test worker] com.example.demo.DemoApplicationTests : Started DemoApplicationTests in 0.531 seconds (process running for 0.945)
|
||||
]]></system-out>
|
||||
<system-err><![CDATA[Mockito is currently self-attaching to enable the inline-mock-maker. This will no longer work in future releases of the JDK. Please add Mockito as an agent to your build as described in Mockito's documentation: https://javadoc.io/doc/org.mockito/mockito-core/latest/org.mockito/org/mockito/Mockito.html#0.3
|
||||
WARNING: A Java agent has been loaded dynamically (/Users/floom/.gradle/caches/modules-2/files-2.1/net.bytebuddy/byte-buddy-agent/1.17.7/fbf3d6d649ed37fc9e9c59480a05be0a26e3c2da/byte-buddy-agent-1.17.7.jar)
|
||||
WARNING: If a serviceability tool is in use, please run with -XX:+EnableDynamicAgentLoading to hide this warning
|
||||
WARNING: If a serviceability tool is not in use, please run with -Djdk.instrument.traceUsage for more information
|
||||
WARNING: Dynamic loading of agents will be disallowed by default in a future release
|
||||
]]></system-err>
|
||||
</testsuite>
|
||||
BIN
build/test-results/test/binary/output.bin
Normal file
BIN
build/test-results/test/binary/output.bin
Normal file
Binary file not shown.
BIN
build/test-results/test/binary/output.bin.idx
Normal file
BIN
build/test-results/test/binary/output.bin.idx
Normal file
Binary file not shown.
BIN
build/test-results/test/binary/results.bin
Normal file
BIN
build/test-results/test/binary/results.bin
Normal file
Binary file not shown.
12
build/tmp/bootJar/MANIFEST.MF
Normal file
12
build/tmp/bootJar/MANIFEST.MF
Normal file
@@ -0,0 +1,12 @@
|
||||
Manifest-Version: 1.0
|
||||
Main-Class: org.springframework.boot.loader.launch.JarLauncher
|
||||
Start-Class: com.example.demo.DemoApplication
|
||||
Spring-Boot-Version: 3.5.5
|
||||
Spring-Boot-Classes: BOOT-INF/classes/
|
||||
Spring-Boot-Lib: BOOT-INF/lib/
|
||||
Spring-Boot-Classpath-Index: BOOT-INF/classpath.idx
|
||||
Spring-Boot-Layers-Index: BOOT-INF/layers.idx
|
||||
Build-Jdk-Spec: 21
|
||||
Implementation-Title: demo
|
||||
Implementation-Version: 0.0.1-SNAPSHOT
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
build/tmp/compileJava/previous-compilation-data.bin
Normal file
BIN
build/tmp/compileJava/previous-compilation-data.bin
Normal file
Binary file not shown.
BIN
build/tmp/compileTestJava/previous-compilation-data.bin
Normal file
BIN
build/tmp/compileTestJava/previous-compilation-data.bin
Normal file
Binary file not shown.
2
build/tmp/jar/MANIFEST.MF
Normal file
2
build/tmp/jar/MANIFEST.MF
Normal file
@@ -0,0 +1,2 @@
|
||||
Manifest-Version: 1.0
|
||||
|
||||
1104
package-lock.json → front/package-lock.json
generated
1104
package-lock.json → front/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
|
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.5 KiB |
24
front/src/App.jsx
Normal file
24
front/src/App.jsx
Normal file
@@ -0,0 +1,24 @@
|
||||
import { useState } from 'react';
|
||||
import Header from './components/Header';
|
||||
import Footer from './components/Footer';
|
||||
import DeliveryList from './components/DeliveryList';
|
||||
import OrderList from './components/OrderList';
|
||||
import './App.css';
|
||||
|
||||
function App() {
|
||||
const [currentView, setCurrentView] = useState('orders'); // 'orders' или 'deliveries'
|
||||
|
||||
return (
|
||||
<div className="App">
|
||||
<Header onViewChange={setCurrentView} currentView={currentView} />
|
||||
|
||||
<main style={{ padding: '20px', minHeight: '80vh' }}>
|
||||
{currentView === 'orders' ? <OrderList /> : <DeliveryList />}
|
||||
</main>
|
||||
|
||||
<Footer />
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
export default App;
|
||||
|
Before Width: | Height: | Size: 4.0 KiB After Width: | Height: | Size: 4.0 KiB |
@@ -36,7 +36,7 @@ const DeliveryForm = ({ delivery, onSubmit, onCancel }) => {
|
||||
<form className="delivery-form" onSubmit={handleSubmit}>
|
||||
<h3>{delivery ? 'Редактировать доставку' : 'Добавить новую доставку'}</h3>
|
||||
|
||||
<label>
|
||||
<label style={{ color: 'black', margin: '0 0 15px 0' }}>
|
||||
Трек-номер:
|
||||
<input
|
||||
type="text"
|
||||
@@ -49,7 +49,7 @@ const DeliveryForm = ({ delivery, onSubmit, onCancel }) => {
|
||||
/>
|
||||
</label>
|
||||
|
||||
<label>
|
||||
<label style={{ color: 'black', margin: '0 0 15px 0' }}>
|
||||
Направление:
|
||||
<input
|
||||
type="text"
|
||||
@@ -60,7 +60,7 @@ const DeliveryForm = ({ delivery, onSubmit, onCancel }) => {
|
||||
/>
|
||||
</label>
|
||||
|
||||
<label>
|
||||
<label style={{ color: 'black', margin: '0 0 15px 0' }}>
|
||||
Статус:
|
||||
<select
|
||||
name="status"
|
||||
@@ -74,7 +74,7 @@ const DeliveryForm = ({ delivery, onSubmit, onCancel }) => {
|
||||
</select>
|
||||
</label>
|
||||
|
||||
<label>
|
||||
<label style={{ color: 'black', margin: '0 0 15px 0' }}>
|
||||
Клиент:
|
||||
<input
|
||||
type="text"
|
||||
@@ -28,7 +28,6 @@ const DeliveryList = () => {
|
||||
<div className="delivery-list">
|
||||
<div className="list-header">
|
||||
<h2>Список доставок</h2>
|
||||
<Link to="/stats" className="stats-link">Статистика</Link>
|
||||
</div>
|
||||
|
||||
<DeliveryForm
|
||||
16
front/src/components/Footer.jsx
Normal file
16
front/src/components/Footer.jsx
Normal file
@@ -0,0 +1,16 @@
|
||||
function Footer() {
|
||||
return (
|
||||
<footer style={{
|
||||
background: '#333',
|
||||
color: 'white',
|
||||
padding: '20px',
|
||||
textAlign: 'center',
|
||||
marginTop: '40px'
|
||||
}}>
|
||||
<p>© 2025 Система управления доставками.</p>
|
||||
<p>Кудринский Олег ПИбд-31</p>
|
||||
</footer>
|
||||
);
|
||||
}
|
||||
|
||||
export default Footer;
|
||||
64
front/src/components/Header.jsx
Normal file
64
front/src/components/Header.jsx
Normal file
@@ -0,0 +1,64 @@
|
||||
function Header({ onViewChange, currentView }) {
|
||||
const headerStyle = {
|
||||
background: '#2c3e50',
|
||||
color: 'white',
|
||||
padding: '1rem 2rem',
|
||||
boxShadow: '0 2px 4px rgba(0,0,0,0.1)'
|
||||
};
|
||||
|
||||
const navStyle = {
|
||||
display: 'flex',
|
||||
justifyContent: 'space-between',
|
||||
alignItems: 'center'
|
||||
};
|
||||
|
||||
const titleStyle = {
|
||||
margin: 0,
|
||||
fontSize: '24px'
|
||||
};
|
||||
|
||||
const tabsStyle = {
|
||||
display: 'flex',
|
||||
gap: '20px'
|
||||
};
|
||||
|
||||
const tabStyle = (isActive) => ({
|
||||
padding: '10px 20px',
|
||||
background: isActive ? '#3498db' : 'transparent',
|
||||
border: 'none',
|
||||
color: 'white',
|
||||
borderRadius: '5px',
|
||||
cursor: 'pointer',
|
||||
fontWeight: isActive ? 'bold' : 'normal',
|
||||
transition: 'background 0.3s'
|
||||
});
|
||||
|
||||
return (
|
||||
<header style={headerStyle}>
|
||||
<div style={navStyle}>
|
||||
<h1 style={titleStyle}>Ivanich Logistics (Система управления доставками)</h1>
|
||||
|
||||
<nav style={tabsStyle}>
|
||||
<button
|
||||
style={tabStyle(currentView === 'orders')}
|
||||
onClick={() => onViewChange('orders')}
|
||||
>
|
||||
Заказы
|
||||
</button>
|
||||
<button
|
||||
style={tabStyle(currentView === 'deliveries')}
|
||||
onClick={() => onViewChange('deliveries')}
|
||||
>
|
||||
Доставки
|
||||
</button>
|
||||
</nav>
|
||||
</div>
|
||||
|
||||
<div style={{ marginTop: '10px', fontSize: '14px', opacity: '0.8' }}>
|
||||
|
||||
</div>
|
||||
</header>
|
||||
);
|
||||
}
|
||||
|
||||
export default Header;
|
||||
101
front/src/components/OrderFilter.jsx
Normal file
101
front/src/components/OrderFilter.jsx
Normal file
@@ -0,0 +1,101 @@
|
||||
import { useState } from 'react';
|
||||
|
||||
function OrderFilter({ onFilterChange }) {
|
||||
const [filters, setFilters] = useState({
|
||||
status: '',
|
||||
sortBy: 'id'
|
||||
});
|
||||
|
||||
const statusOptions = ['Все', 'В пути', 'Доставлено', 'Обработка', 'Отменен'];
|
||||
const sortOptions = [
|
||||
{ value: 'id', label: 'По ID' },
|
||||
{ value: 'status', label: 'По статусу' },
|
||||
{ value: 'customer', label: 'По клиенту' }
|
||||
];
|
||||
|
||||
const handleFilterChange = (filterType, value) => {
|
||||
const newFilters = {
|
||||
...filters,
|
||||
[filterType]: value
|
||||
};
|
||||
setFilters(newFilters);
|
||||
onFilterChange(newFilters);
|
||||
};
|
||||
|
||||
const clearFilters = () => {
|
||||
const clearedFilters = { status: '', sortBy: 'id' };
|
||||
setFilters(clearedFilters);
|
||||
onFilterChange(clearedFilters);
|
||||
};
|
||||
|
||||
return (
|
||||
<div style={{
|
||||
margin: '20px 0',
|
||||
padding: '15px',
|
||||
border: '1px solid #ddd',
|
||||
borderRadius: '5px',
|
||||
background: '#f9f9f9'
|
||||
}}>
|
||||
<h4 style={{ color: 'black', margin: '0 0 15px 0' }}>Фильтры и сортировка заказов</h4>
|
||||
|
||||
<div style={{ display: 'flex', gap: '15px', alignItems: 'center', flexWrap: 'wrap' }}>
|
||||
{/* Фильтр по статусу */}
|
||||
<div>
|
||||
<label style={{ marginRight: '5px' }}>Статус: </label>
|
||||
<select
|
||||
value={filters.status}
|
||||
onChange={(e) => handleFilterChange('status', e.target.value)}
|
||||
style={{ padding: '5px' }}
|
||||
>
|
||||
{statusOptions.map(option => (
|
||||
<option key={option} value={option === 'Все' ? '' : option}>
|
||||
{option}
|
||||
</option>
|
||||
))}
|
||||
</select>
|
||||
</div>
|
||||
|
||||
{/* Сортировка */}
|
||||
<div>
|
||||
<label style={{ marginRight: '5px' }}>Сортировка: </label>
|
||||
<select
|
||||
value={filters.sortBy}
|
||||
onChange={(e) => handleFilterChange('sortBy', e.target.value)}
|
||||
style={{ padding: '5px' }}
|
||||
>
|
||||
{sortOptions.map(option => (
|
||||
<option key={option.value} value={option.value}>
|
||||
{option.label}
|
||||
</option>
|
||||
))}
|
||||
</select>
|
||||
</div>
|
||||
|
||||
{/* Кнопка сброса */}
|
||||
<button
|
||||
onClick={clearFilters}
|
||||
style={{
|
||||
padding: '5px 10px',
|
||||
background: '#666',
|
||||
color: 'white',
|
||||
border: 'none',
|
||||
borderRadius: '3px'
|
||||
}}
|
||||
>
|
||||
Сбросить
|
||||
</button>
|
||||
</div>
|
||||
|
||||
{/* Показать активные фильтры */}
|
||||
{(filters.status || filters.sortBy !== 'id') && (
|
||||
<div style={{ marginTop: '10px', fontSize: '14px', color: '#666' }}>
|
||||
Активно:
|
||||
{filters.status && ` Статус: ${filters.status}`}
|
||||
{filters.sortBy !== 'id' && ` Сортировка: ${sortOptions.find(o => o.value === filters.sortBy)?.label}`}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
export default OrderFilter;
|
||||
85
front/src/components/OrderForm.jsx
Normal file
85
front/src/components/OrderForm.jsx
Normal file
@@ -0,0 +1,85 @@
|
||||
import { useState, useEffect } from 'react';
|
||||
|
||||
function OrderForm({ customers, deliveries, onSubmit, editOrder }) {
|
||||
const [formData, setFormData] = useState({
|
||||
customerId: '',
|
||||
deliveryId: '',
|
||||
status: 'В пути'
|
||||
});
|
||||
|
||||
useEffect(() => {
|
||||
if (editOrder) {
|
||||
setFormData({
|
||||
customerId: editOrder.customer?.id || '',
|
||||
deliveryId: editOrder.delivery?.id || '',
|
||||
status: editOrder.status || 'В пути'
|
||||
});
|
||||
}
|
||||
}, [editOrder]);
|
||||
|
||||
const handleSubmit = (e) => {
|
||||
e.preventDefault();
|
||||
onSubmit(formData);
|
||||
if (!editOrder) {
|
||||
setFormData({ customerId: '', deliveryId: '', status: 'В пути' });
|
||||
}
|
||||
};
|
||||
|
||||
const statusOptions = ['В пути', 'Доставлено', 'Обработка', 'Отменен'];
|
||||
|
||||
return (
|
||||
<form onSubmit={handleSubmit} style={{ margin: '20px 0', padding: '20px', border: '1px solid #ddd' }}>
|
||||
<h3>{editOrder ? 'Редактировать заказ' : 'Создать новый заказ'}</h3>
|
||||
|
||||
<div style={{ marginBottom: '10px' }}>
|
||||
<label>Клиент: </label>
|
||||
<select
|
||||
value={formData.customerId}
|
||||
onChange={(e) => setFormData({...formData, customerId: e.target.value})}
|
||||
required
|
||||
>
|
||||
<option value="">Выберите клиента</option>
|
||||
{customers.map(customer => (
|
||||
<option key={customer.id} value={customer.id}>
|
||||
{customer.name} ({customer.email})
|
||||
</option>
|
||||
))}
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div style={{ marginBottom: '10px' }}>
|
||||
<label>Доставка: </label>
|
||||
<select
|
||||
value={formData.deliveryId}
|
||||
onChange={(e) => setFormData({...formData, deliveryId: e.target.value})}
|
||||
required
|
||||
>
|
||||
<option value="">Выберите доставку</option>
|
||||
{deliveries.map(delivery => (
|
||||
<option key={delivery.id} value={delivery.id}>
|
||||
{delivery.trackingNumber} - {delivery.destination}
|
||||
</option>
|
||||
))}
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div style={{ marginBottom: '10px' }}>
|
||||
<label>Статус: </label>
|
||||
<select
|
||||
value={formData.status}
|
||||
onChange={(e) => setFormData({...formData, status: e.target.value})}
|
||||
>
|
||||
{statusOptions.map(status => (
|
||||
<option key={status} value={status}>{status}</option>
|
||||
))}
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<button type="submit" style={{ padding: '10px 20px' }}>
|
||||
{editOrder ? 'Обновить заказ' : 'Создать заказ'}
|
||||
</button>
|
||||
</form>
|
||||
);
|
||||
}
|
||||
|
||||
export default OrderForm;
|
||||
35
front/src/components/OrderItem.jsx
Normal file
35
front/src/components/OrderItem.jsx
Normal file
@@ -0,0 +1,35 @@
|
||||
function OrderItem({ order, onEdit, onDelete }) {
|
||||
return (
|
||||
<div style={{
|
||||
border: '1px solid #ccc',
|
||||
padding: '15px',
|
||||
margin: '10px 0',
|
||||
borderRadius: '5px'
|
||||
}}>
|
||||
<h4>Заказ #{order.id}</h4>
|
||||
<p><strong>Клиент:</strong> {order.customer?.name} ({order.customer?.email})</p>
|
||||
<p><strong>Доставка:</strong> {order.delivery?.trackingNumber} - {order.delivery?.destination}</p>
|
||||
<p><strong>Статус:</strong>
|
||||
<span style={{
|
||||
color: order.status === 'Доставлено' ? 'green' :
|
||||
order.status === 'В пути' ? 'orange' : 'gray',
|
||||
fontWeight: 'bold',
|
||||
marginLeft: '10px'
|
||||
}}>
|
||||
{order.status}
|
||||
</span>
|
||||
</p>
|
||||
|
||||
<div style={{ marginTop: '10px' }}>
|
||||
<button onClick={() => onEdit(order)} style={{ marginRight: '10px' }}>
|
||||
Редактировать
|
||||
</button>
|
||||
<button onClick={() => onDelete(order.id)} style={{ background: '#ff4444', color: 'white' }}>
|
||||
Удалить
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
export default OrderItem;
|
||||
164
front/src/components/OrderList.jsx
Normal file
164
front/src/components/OrderList.jsx
Normal file
@@ -0,0 +1,164 @@
|
||||
import { useState, useEffect } from 'react';
|
||||
import OrderItem from './OrderItem';
|
||||
import OrderFilter from './OrderFilter';
|
||||
import OrderStats from './OrderStats';
|
||||
import OrderForm from './OrderForm';
|
||||
|
||||
function OrderList() {
|
||||
const [orders, setOrders] = useState([]);
|
||||
const [customers, setCustomers] = useState([]);
|
||||
const [deliveries, setDeliveries] = useState([]);
|
||||
const [filteredOrders, setFilteredOrders] = useState([]);
|
||||
const [editingOrder, setEditingOrder] = useState(null);
|
||||
const [loading, setLoading] = useState(true);
|
||||
|
||||
useEffect(() => {
|
||||
loadData();
|
||||
}, []);
|
||||
|
||||
const loadData = async () => {
|
||||
setLoading(true);
|
||||
try {
|
||||
const [ordersRes, customersRes, deliveriesRes] = await Promise.all([
|
||||
fetch('http://localhost:8080/api/orders'),
|
||||
fetch('http://localhost:8080/api/customers'),
|
||||
fetch('http://localhost:8080/api/deliveries')
|
||||
]);
|
||||
|
||||
if (!ordersRes.ok) throw new Error('Ошибка загрузки заказов');
|
||||
if (!customersRes.ok) throw new Error('Ошибка загрузки клиентов');
|
||||
if (!deliveriesRes.ok) throw new Error('Ошибка загрузки доставок');
|
||||
|
||||
const ordersData = await ordersRes.json();
|
||||
const customersData = await customersRes.json();
|
||||
const deliveriesData = await deliveriesRes.json();
|
||||
|
||||
setOrders(ordersData);
|
||||
setFilteredOrders(ordersData);
|
||||
setCustomers(customersData);
|
||||
setDeliveries(deliveriesData);
|
||||
} catch (error) {
|
||||
console.error('Ошибка загрузки данных:', error);
|
||||
setOrders([]);
|
||||
setFilteredOrders([]);
|
||||
setCustomers([]);
|
||||
setDeliveries([]);
|
||||
} finally {
|
||||
setLoading(false);
|
||||
}
|
||||
};
|
||||
|
||||
const handleFilterChange = (filters) => {
|
||||
let filtered = orders;
|
||||
|
||||
if (filters.status) {
|
||||
filtered = filtered.filter(order => order.status === filters.status);
|
||||
}
|
||||
|
||||
if (filters.sortBy === 'status') {
|
||||
filtered = [...filtered].sort((a, b) => a.status.localeCompare(b.status));
|
||||
} else if (filters.sortBy === 'customer') {
|
||||
filtered = [...filtered].sort((a, b) => (a.customer?.name || '').localeCompare(b.customer?.name || ''));
|
||||
}
|
||||
|
||||
setFilteredOrders(filtered);
|
||||
};
|
||||
|
||||
const handleCreateOrder = async (orderData) => {
|
||||
try {
|
||||
const customer = customers.find(c => c.id === orderData.customerId);
|
||||
const delivery = deliveries.find(d => d.id === orderData.deliveryId);
|
||||
|
||||
if (!customer || !delivery) {
|
||||
alert('Ошибка: клиент или доставка не найдены');
|
||||
return;
|
||||
}
|
||||
|
||||
const newOrder = {
|
||||
customer: customer,
|
||||
delivery: delivery,
|
||||
status: orderData.status
|
||||
};
|
||||
|
||||
const response = await fetch('http://localhost:8080/api/orders', {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
'Accept': 'application/json'
|
||||
},
|
||||
body: JSON.stringify(newOrder)
|
||||
});
|
||||
|
||||
if (!response.ok) {
|
||||
throw new Error(`HTTP error! status: ${response.status}`);
|
||||
}
|
||||
|
||||
const createdOrder = await response.json();
|
||||
console.log('Создан заказ:', createdOrder);
|
||||
|
||||
await loadData();
|
||||
setEditingOrder(null);
|
||||
} catch (error) {
|
||||
console.error('Ошибка создания заказа:', error);
|
||||
alert('Ошибка при создании заказа: ' + error.message);
|
||||
}
|
||||
};
|
||||
|
||||
const handleDeleteOrder = async (orderId) => {
|
||||
if (window.confirm('Удалить этот заказ?')) {
|
||||
try {
|
||||
const response = await fetch(`http://localhost:8080/api/orders/${orderId}`, {
|
||||
method: 'DELETE'
|
||||
});
|
||||
|
||||
if (!response.ok) {
|
||||
throw new Error(`HTTP error! status: ${response.status}`);
|
||||
}
|
||||
|
||||
await loadData();
|
||||
} catch (error) {
|
||||
console.error('Ошибка удаления заказа:', error);
|
||||
alert('Ошибка при удалении заказа: ' + error.message);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
if (loading) {
|
||||
return <div>Загрузка...</div>;
|
||||
}
|
||||
|
||||
return (
|
||||
<div style={{ maxWidth: '1200px', margin: '0 auto' }}>
|
||||
<h2>Управление заказами</h2>
|
||||
|
||||
<OrderStats orders={orders} />
|
||||
|
||||
<OrderForm
|
||||
customers={customers}
|
||||
deliveries={deliveries}
|
||||
onSubmit={handleCreateOrder}
|
||||
editOrder={editingOrder}
|
||||
/>
|
||||
|
||||
<OrderFilter onFilterChange={handleFilterChange} />
|
||||
|
||||
<div>
|
||||
<h3>Список заказов ({filteredOrders.length})</h3>
|
||||
{filteredOrders.length === 0 ? (
|
||||
<p>Заказы не найдены</p>
|
||||
) : (
|
||||
filteredOrders.map(order => (
|
||||
<OrderItem
|
||||
key={order.id}
|
||||
order={order}
|
||||
onEdit={setEditingOrder}
|
||||
onDelete={handleDeleteOrder}
|
||||
/>
|
||||
))
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
export default OrderList;
|
||||
48
front/src/components/OrderStats.jsx
Normal file
48
front/src/components/OrderStats.jsx
Normal file
@@ -0,0 +1,48 @@
|
||||
function OrderStats({ orders }) {
|
||||
// Подсчет статистики
|
||||
const stats = {
|
||||
total: orders.length,
|
||||
delivered: orders.filter(o => o.status === 'Доставлено').length,
|
||||
inTransit: orders.filter(o => o.status === 'В пути').length,
|
||||
processing: orders.filter(o => o.status === 'Обработка').length,
|
||||
cancelled: orders.filter(o => o.status === 'Отменен').length
|
||||
};
|
||||
|
||||
const percentage = (part, total) => total > 0 ? ((part / total) * 100).toFixed(1) : 0;
|
||||
|
||||
return (
|
||||
<div style={{
|
||||
margin: '20px 0',
|
||||
padding: '15px',
|
||||
border: '1px solid #ddd',
|
||||
borderRadius: '5px',
|
||||
background: '#f0f8ff'
|
||||
}}>
|
||||
<h4 style={{ color: 'black', margin: '0 0 15px 0' }}>Статистика заказов</h4>
|
||||
|
||||
<div style={{ display: 'flex', justifyContent: 'space-around', flexWrap: 'wrap', gap: '10px' }}>
|
||||
<div style={{ textAlign: 'center' }}>
|
||||
<div style={{ fontSize: '24px', fontWeight: 'bold', color: '#333' }}>{stats.total}</div>
|
||||
<div style={{ fontSize: '14px', color: '#666' }}>Всего</div>
|
||||
</div>
|
||||
|
||||
<div style={{ textAlign: 'center' }}>
|
||||
<div style={{ fontSize: '24px', fontWeight: 'bold', color: 'green' }}>{stats.delivered}</div>
|
||||
<div style={{ fontSize: '14px', color: '#666' }}>Доставлено ({percentage(stats.delivered, stats.total)}%)</div>
|
||||
</div>
|
||||
|
||||
<div style={{ textAlign: 'center' }}>
|
||||
<div style={{ fontSize: '24px', fontWeight: 'bold', color: 'orange' }}>{stats.inTransit}</div>
|
||||
<div style={{ fontSize: '14px', color: '#666' }}>В пути ({percentage(stats.inTransit, stats.total)}%)</div>
|
||||
</div>
|
||||
|
||||
<div style={{ textAlign: 'center' }}>
|
||||
<div style={{ fontSize: '24px', fontWeight: 'bold', color: 'blue' }}>{stats.processing}</div>
|
||||
<div style={{ fontSize: '14px', color: '#666' }}>Обработка ({percentage(stats.processing, stats.total)}%)</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
export default OrderStats;
|
||||
@@ -1,6 +1,6 @@
|
||||
import { useState, useEffect } from 'react';
|
||||
|
||||
const API_URL = 'http://localhost:3001/deliveries';
|
||||
const API_URL = 'http://localhost:8080/api/deliveries';
|
||||
|
||||
export const useDeliveries = () => {
|
||||
const [deliveries, setDeliveries] = useState([]);
|
||||
@@ -84,4 +84,4 @@ export const useDeliveries = () => {
|
||||
getStats,
|
||||
refetch: fetchDeliveries
|
||||
};
|
||||
};
|
||||
};
|
||||
15
front/vite.config.js
Normal file
15
front/vite.config.js
Normal file
@@ -0,0 +1,15 @@
|
||||
import { defineConfig } from "vite";
|
||||
import react from "@vitejs/plugin-react";
|
||||
|
||||
export default defineConfig({
|
||||
plugins: [react()],
|
||||
server: {
|
||||
proxy: {
|
||||
"/api": {
|
||||
target: "http://localhost:8080",
|
||||
changeOrigin: true,
|
||||
secure: false,
|
||||
},
|
||||
},
|
||||
},
|
||||
});
|
||||
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Normal file
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Normal file
Binary file not shown.
7
gradle/wrapper/gradle-wrapper.properties
vendored
Normal file
7
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
|
||||
251
gradlew
vendored
Executable file
251
gradlew
vendored
Executable file
@@ -0,0 +1,251 @@
|
||||
#!/bin/sh
|
||||
|
||||
#
|
||||
# Copyright © 2015-2021 the original authors.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# https://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
#
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
#
|
||||
|
||||
##############################################################################
|
||||
#
|
||||
# Gradle start up script for POSIX generated by Gradle.
|
||||
#
|
||||
# Important for running:
|
||||
#
|
||||
# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
|
||||
# noncompliant, but you have some other compliant shell such as ksh or
|
||||
# bash, then to run this script, type that shell name before the whole
|
||||
# command line, like:
|
||||
#
|
||||
# ksh Gradle
|
||||
#
|
||||
# Busybox and similar reduced shells will NOT work, because this script
|
||||
# requires all of these POSIX shell features:
|
||||
# * functions;
|
||||
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
|
||||
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
|
||||
# * compound commands having a testable exit status, especially «case»;
|
||||
# * various built-in commands including «command», «set», and «ulimit».
|
||||
#
|
||||
# Important for patching:
|
||||
#
|
||||
# (2) This script targets any POSIX shell, so it avoids extensions provided
|
||||
# by Bash, Ksh, etc; in particular arrays are avoided.
|
||||
#
|
||||
# The "traditional" practice of packing multiple parameters into a
|
||||
# space-separated string is a well documented source of bugs and security
|
||||
# problems, so this is (mostly) avoided, by progressively accumulating
|
||||
# options in "$@", and eventually passing that to Java.
|
||||
#
|
||||
# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
|
||||
# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
|
||||
# see the in-line comments for details.
|
||||
#
|
||||
# There are tweaks for specific operating systems such as AIX, CygWin,
|
||||
# Darwin, MinGW, and NonStop.
|
||||
#
|
||||
# (3) This script is generated from the Groovy template
|
||||
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
||||
# within the Gradle project.
|
||||
#
|
||||
# You can find Gradle at https://github.com/gradle/gradle/.
|
||||
#
|
||||
##############################################################################
|
||||
|
||||
# Attempt to set APP_HOME
|
||||
|
||||
# Resolve links: $0 may be a link
|
||||
app_path=$0
|
||||
|
||||
# Need this for daisy-chained symlinks.
|
||||
while
|
||||
APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
|
||||
[ -h "$app_path" ]
|
||||
do
|
||||
ls=$( ls -ld "$app_path" )
|
||||
link=${ls#*' -> '}
|
||||
case $link in #(
|
||||
/*) app_path=$link ;; #(
|
||||
*) app_path=$APP_HOME$link ;;
|
||||
esac
|
||||
done
|
||||
|
||||
# This is normally unused
|
||||
# shellcheck disable=SC2034
|
||||
APP_BASE_NAME=${0##*/}
|
||||
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
|
||||
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
|
||||
|
||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||
MAX_FD=maximum
|
||||
|
||||
warn () {
|
||||
echo "$*"
|
||||
} >&2
|
||||
|
||||
die () {
|
||||
echo
|
||||
echo "$*"
|
||||
echo
|
||||
exit 1
|
||||
} >&2
|
||||
|
||||
# OS specific support (must be 'true' or 'false').
|
||||
cygwin=false
|
||||
msys=false
|
||||
darwin=false
|
||||
nonstop=false
|
||||
case "$( uname )" in #(
|
||||
CYGWIN* ) cygwin=true ;; #(
|
||||
Darwin* ) darwin=true ;; #(
|
||||
MSYS* | MINGW* ) msys=true ;; #(
|
||||
NONSTOP* ) nonstop=true ;;
|
||||
esac
|
||||
|
||||
CLASSPATH="\\\"\\\""
|
||||
|
||||
|
||||
# Determine the Java command to use to start the JVM.
|
||||
if [ -n "$JAVA_HOME" ] ; then
|
||||
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
|
||||
# IBM's JDK on AIX uses strange locations for the executables
|
||||
JAVACMD=$JAVA_HOME/jre/sh/java
|
||||
else
|
||||
JAVACMD=$JAVA_HOME/bin/java
|
||||
fi
|
||||
if [ ! -x "$JAVACMD" ] ; then
|
||||
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
|
||||
|
||||
Please set the JAVA_HOME variable in your environment to match the
|
||||
location of your Java installation."
|
||||
fi
|
||||
else
|
||||
JAVACMD=java
|
||||
if ! command -v java >/dev/null 2>&1
|
||||
then
|
||||
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||
|
||||
Please set the JAVA_HOME variable in your environment to match the
|
||||
location of your Java installation."
|
||||
fi
|
||||
fi
|
||||
|
||||
# Increase the maximum file descriptors if we can.
|
||||
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
||||
case $MAX_FD in #(
|
||||
max*)
|
||||
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
|
||||
# shellcheck disable=SC2039,SC3045
|
||||
MAX_FD=$( ulimit -H -n ) ||
|
||||
warn "Could not query maximum file descriptor limit"
|
||||
esac
|
||||
case $MAX_FD in #(
|
||||
'' | soft) :;; #(
|
||||
*)
|
||||
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
|
||||
# shellcheck disable=SC2039,SC3045
|
||||
ulimit -n "$MAX_FD" ||
|
||||
warn "Could not set maximum file descriptor limit to $MAX_FD"
|
||||
esac
|
||||
fi
|
||||
|
||||
# Collect all arguments for the java command, stacking in reverse order:
|
||||
# * args from the command line
|
||||
# * the main class name
|
||||
# * -classpath
|
||||
# * -D...appname settings
|
||||
# * --module-path (only if needed)
|
||||
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
|
||||
|
||||
# For Cygwin or MSYS, switch paths to Windows format before running java
|
||||
if "$cygwin" || "$msys" ; then
|
||||
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
|
||||
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
|
||||
|
||||
JAVACMD=$( cygpath --unix "$JAVACMD" )
|
||||
|
||||
# Now convert the arguments - kludge to limit ourselves to /bin/sh
|
||||
for arg do
|
||||
if
|
||||
case $arg in #(
|
||||
-*) false ;; # don't mess with options #(
|
||||
/?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
|
||||
[ -e "$t" ] ;; #(
|
||||
*) false ;;
|
||||
esac
|
||||
then
|
||||
arg=$( cygpath --path --ignore --mixed "$arg" )
|
||||
fi
|
||||
# Roll the args list around exactly as many times as the number of
|
||||
# args, so each arg winds up back in the position where it started, but
|
||||
# possibly modified.
|
||||
#
|
||||
# NB: a `for` loop captures its iteration list before it begins, so
|
||||
# changing the positional parameters here affects neither the number of
|
||||
# iterations, nor the values presented in `arg`.
|
||||
shift # remove old arg
|
||||
set -- "$@" "$arg" # push replacement arg
|
||||
done
|
||||
fi
|
||||
|
||||
|
||||
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
||||
|
||||
# Collect all arguments for the java command:
|
||||
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
|
||||
# and any embedded shellness will be escaped.
|
||||
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
|
||||
# treated as '${Hostname}' itself on the command line.
|
||||
|
||||
set -- \
|
||||
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
||||
-classpath "$CLASSPATH" \
|
||||
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
|
||||
"$@"
|
||||
|
||||
# Stop when "xargs" is not available.
|
||||
if ! command -v xargs >/dev/null 2>&1
|
||||
then
|
||||
die "xargs is not available"
|
||||
fi
|
||||
|
||||
# Use "xargs" to parse quoted args.
|
||||
#
|
||||
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
|
||||
#
|
||||
# In Bash we could simply go:
|
||||
#
|
||||
# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
|
||||
# set -- "${ARGS[@]}" "$@"
|
||||
#
|
||||
# but POSIX shell has neither arrays nor command substitution, so instead we
|
||||
# post-process each arg (as a line of input to sed) to backslash-escape any
|
||||
# character that might be a shell metacharacter, then use eval to reverse
|
||||
# that process (while maintaining the separation between arguments), and wrap
|
||||
# the whole thing up as a single "set" statement.
|
||||
#
|
||||
# This will of course break if any of these variables contains a newline or
|
||||
# an unmatched quote.
|
||||
#
|
||||
|
||||
eval "set -- $(
|
||||
printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
|
||||
xargs -n1 |
|
||||
sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
|
||||
tr '\n' ' '
|
||||
)" '"$@"'
|
||||
|
||||
exec "$JAVACMD" "$@"
|
||||
94
gradlew.bat
vendored
Normal file
94
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
|
||||
1
settings.gradle
Normal file
1
settings.gradle
Normal file
@@ -0,0 +1 @@
|
||||
rootProject.name = 'demo'
|
||||
22
src/App.jsx
22
src/App.jsx
@@ -1,22 +0,0 @@
|
||||
import { Routes, Route } from 'react-router-dom';
|
||||
import Header from './components/Header';
|
||||
import DeliveryList from './components/DeliveryList';
|
||||
import DeliveryStats from './components/DeliveryStats';
|
||||
import './App.css';
|
||||
|
||||
function App() {
|
||||
return (
|
||||
<div className="app">
|
||||
<Header />
|
||||
<div className="container">
|
||||
<Routes>
|
||||
<Route path="/" element={<DeliveryList />} />
|
||||
<Route path="/deliveries" element={<DeliveryList />} />
|
||||
<Route path="/stats" element={<DeliveryStats />} />
|
||||
</Routes>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
export default App;
|
||||
@@ -1,10 +0,0 @@
|
||||
const Header = () => {
|
||||
return (
|
||||
<header className="header">
|
||||
<h1>Ivanich Logistics</h1>
|
||||
<p>Система управления доставками из Poizon</p>
|
||||
</header>
|
||||
)
|
||||
}
|
||||
|
||||
export default Header
|
||||
23
src/main/java/com/example/config/CorsConfig.java
Normal file
23
src/main/java/com/example/config/CorsConfig.java
Normal file
@@ -0,0 +1,23 @@
|
||||
package com.example.config;
|
||||
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
import org.springframework.web.servlet.config.annotation.CorsRegistry;
|
||||
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
|
||||
|
||||
@Configuration
|
||||
public class CorsConfig {
|
||||
|
||||
@Bean
|
||||
public WebMvcConfigurer corsConfigurer() {
|
||||
return new WebMvcConfigurer() {
|
||||
@Override
|
||||
public void addCorsMappings(CorsRegistry registry) {
|
||||
registry.addMapping("/api/**")
|
||||
.allowedOrigins("http://localhost:5173")
|
||||
.allowedMethods("GET","POST","PUT","DELETE");
|
||||
}
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
62
src/main/java/com/example/controller/CustomerController.java
Normal file
62
src/main/java/com/example/controller/CustomerController.java
Normal file
@@ -0,0 +1,62 @@
|
||||
package com.example.controller;
|
||||
|
||||
import com.example.dto.CustomerDTO;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Optional;
|
||||
|
||||
@CrossOrigin(origins = "http://localhost:5173")
|
||||
@RestController
|
||||
@RequestMapping("/api/customers")
|
||||
@Tag(name = "Customer API", description = "Операции с клиентами")
|
||||
public class CustomerController {
|
||||
|
||||
private final List<CustomerDTO> customers = new ArrayList<>();
|
||||
|
||||
public CustomerController() {
|
||||
customers.add(new CustomerDTO("c1", "Иванов Иван", "ivanov@example.com"));
|
||||
customers.add(new CustomerDTO("c2", "Петров Петр", "petrov@example.com"));
|
||||
}
|
||||
|
||||
@GetMapping
|
||||
@Operation(summary = "Получить всех клиентов")
|
||||
public List<CustomerDTO> getAll() {
|
||||
return customers;
|
||||
}
|
||||
|
||||
@GetMapping("/{id}")
|
||||
@Operation(summary = "Получить клиента по ID")
|
||||
public CustomerDTO getOne(@PathVariable String id) {
|
||||
return customers.stream().filter(c -> c.getId().equals(id)).findFirst().orElse(null);
|
||||
}
|
||||
|
||||
@PostMapping
|
||||
@Operation(summary = "Создать нового клиента")
|
||||
public CustomerDTO create(@RequestBody CustomerDTO customer) {
|
||||
customers.add(customer);
|
||||
return customer;
|
||||
}
|
||||
|
||||
@PutMapping("/{id}")
|
||||
@Operation(summary = "Обновить данные клиента")
|
||||
public CustomerDTO update(@PathVariable String id, @RequestBody CustomerDTO updated) {
|
||||
Optional<CustomerDTO> existing = customers.stream().filter(c -> c.getId().equals(id)).findFirst();
|
||||
if (existing.isPresent()) {
|
||||
CustomerDTO c = existing.get();
|
||||
c.setName(updated.getName());
|
||||
c.setEmail(updated.getEmail());
|
||||
return c;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
@DeleteMapping("/{id}")
|
||||
@Operation(summary = "Удалить клиента")
|
||||
public void delete(@PathVariable String id) {
|
||||
customers.removeIf(c -> c.getId().equals(id));
|
||||
}
|
||||
}
|
||||
68
src/main/java/com/example/controller/DeliveryController.java
Normal file
68
src/main/java/com/example/controller/DeliveryController.java
Normal file
@@ -0,0 +1,68 @@
|
||||
package com.example.controller;
|
||||
|
||||
import com.example.dto.DeliveryDTO;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
@CrossOrigin(origins = "http://localhost:5173")
|
||||
@RestController
|
||||
@RequestMapping("/api/deliveries")
|
||||
@Tag(name = "Delivery API", description = "Операции с доставками")
|
||||
public class DeliveryController {
|
||||
|
||||
private final List<DeliveryDTO> deliveries = new ArrayList<>();
|
||||
|
||||
public DeliveryController() {
|
||||
deliveries.add(new DeliveryDTO("578a","IVN012021","гоголя10","Доставлено","Парт петрович wwww"));
|
||||
deliveries.add(new DeliveryDTO("0e0f","IVN123456","Москва","В пути","1Иванов Иван"));
|
||||
}
|
||||
|
||||
@GetMapping
|
||||
@Operation(summary = "Получить все доставки")
|
||||
public List<DeliveryDTO> getAll() {
|
||||
return deliveries;
|
||||
}
|
||||
|
||||
@GetMapping("/{id}")
|
||||
@Operation(summary = "Получить доставку по ID")
|
||||
public DeliveryDTO getOne(@PathVariable String id) {
|
||||
return deliveries.stream()
|
||||
.filter(d -> d.getId().equals(id))
|
||||
.findFirst()
|
||||
.orElseThrow(() -> new RuntimeException("Delivery not found"));
|
||||
}
|
||||
|
||||
@PostMapping
|
||||
@Operation(summary = "Создать новую доставку")
|
||||
public DeliveryDTO create(@RequestBody DeliveryDTO delivery) {
|
||||
if (delivery.getId() == null || delivery.getId().isEmpty()) {
|
||||
delivery.setId(UUID.randomUUID().toString());
|
||||
}
|
||||
deliveries.add(delivery);
|
||||
return delivery;
|
||||
}
|
||||
|
||||
@PutMapping("/{id}")
|
||||
@Operation(summary = "Обновить данные доставки")
|
||||
public DeliveryDTO update(@PathVariable String id, @RequestBody DeliveryDTO updated) {
|
||||
for (int i = 0; i < deliveries.size(); i++) {
|
||||
if (deliveries.get(i).getId().equals(id)) {
|
||||
updated.setId(id);
|
||||
deliveries.set(i, updated);
|
||||
return updated;
|
||||
}
|
||||
}
|
||||
throw new RuntimeException("Delivery not found");
|
||||
}
|
||||
|
||||
@DeleteMapping("/{id}")
|
||||
@Operation(summary = "Удалить доставку")
|
||||
public void delete(@PathVariable String id) {
|
||||
deliveries.removeIf(d -> d.getId().equals(id));
|
||||
}
|
||||
}
|
||||
13
src/main/java/com/example/controller/DemoApplication.java
Normal file
13
src/main/java/com/example/controller/DemoApplication.java
Normal file
@@ -0,0 +1,13 @@
|
||||
package com.example.controller;
|
||||
|
||||
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
src/main/java/com/example/controller/HelloController.java
Normal file
15
src/main/java/com/example/controller/HelloController.java
Normal file
@@ -0,0 +1,15 @@
|
||||
package com.example.controller;
|
||||
|
||||
import org.springframework.web.bind.annotation.CrossOrigin;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
@RestController
|
||||
@CrossOrigin(origins = "http://localhost:5173")
|
||||
public class HelloController {
|
||||
|
||||
@GetMapping("/")
|
||||
public String home() {
|
||||
return "Приложение запущено!";
|
||||
}
|
||||
}
|
||||
116
src/main/java/com/example/controller/OrderController.java
Normal file
116
src/main/java/com/example/controller/OrderController.java
Normal file
@@ -0,0 +1,116 @@
|
||||
package com.example.controller;
|
||||
|
||||
import com.example.dto.OrderDTO;
|
||||
import com.example.dto.CustomerDTO;
|
||||
import com.example.dto.DeliveryDTO;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Comparator;
|
||||
import java.util.List;
|
||||
import java.util.Optional;
|
||||
|
||||
@RestController
|
||||
@CrossOrigin(origins = "http://localhost:5173")
|
||||
@RequestMapping("/api/orders")
|
||||
@Tag(name = "Order API", description = "Операции с заказами")
|
||||
public class OrderController {
|
||||
|
||||
private final List<OrderDTO> orders = new ArrayList<>();
|
||||
private final CustomerController customerController;
|
||||
private final DeliveryController deliveryController;
|
||||
|
||||
// Конструктор с внедрением зависимостей
|
||||
public OrderController(CustomerController customerController, DeliveryController deliveryController) {
|
||||
this.customerController = customerController;
|
||||
this.deliveryController = deliveryController;
|
||||
initializeTestData();
|
||||
}
|
||||
|
||||
private void initializeTestData() {
|
||||
// Создаем тестовых клиентов и доставки напрямую
|
||||
CustomerDTO customer1 = new CustomerDTO("c1", "Иванов Иван", "ivanov@example.com");
|
||||
CustomerDTO customer2 = new CustomerDTO("c2", "Петров Петр", "petrov@example.com");
|
||||
|
||||
DeliveryDTO delivery1 = new DeliveryDTO("578a", "IVN012021", "гоголя10", "Доставлено", "Парт петрович wwww");
|
||||
DeliveryDTO delivery2 = new DeliveryDTO("0e0f", "IVN123456", "Москва", "В пути", "1Иванов Иван");
|
||||
|
||||
// Создаем заказы с полными объектами
|
||||
orders.add(new OrderDTO("o1", customer1, delivery1, "Доставлено"));
|
||||
orders.add(new OrderDTO("o2", customer2, delivery2, "В пути"));
|
||||
}
|
||||
|
||||
// READ all
|
||||
@GetMapping
|
||||
@Operation(summary = "Получить все заказы")
|
||||
public List<OrderDTO> getAll() {
|
||||
return orders;
|
||||
}
|
||||
|
||||
// READ one
|
||||
@GetMapping("/{id}")
|
||||
@Operation(summary = "Получить заказ по ID")
|
||||
public OrderDTO getOne(@PathVariable String id) {
|
||||
return orders.stream()
|
||||
.filter(o -> o.getId().equals(id))
|
||||
.findFirst()
|
||||
.orElse(null);
|
||||
}
|
||||
|
||||
// Фильтрация по статусу
|
||||
@GetMapping("/status/{status}")
|
||||
@Operation(summary = "Получить заказы по статусу")
|
||||
public List<OrderDTO> getOrdersByStatus(@PathVariable String status) {
|
||||
return orders.stream()
|
||||
.filter(o -> o.getStatus().equalsIgnoreCase(status))
|
||||
.toList();
|
||||
}
|
||||
|
||||
// Сортировка по статусу
|
||||
@GetMapping("/sorted/by-status")
|
||||
@Operation(summary = "Получить заказы отсортированные по статусу")
|
||||
public List<OrderDTO> getOrdersSortedByStatus() {
|
||||
return orders.stream()
|
||||
.sorted(Comparator.comparing(OrderDTO::getStatus))
|
||||
.toList();
|
||||
}
|
||||
|
||||
// CREATE
|
||||
@PostMapping
|
||||
@Operation(summary = "Создать новый заказ")
|
||||
public OrderDTO create(@RequestBody OrderDTO order) {
|
||||
// Генерируем ID если не указан
|
||||
if (order.getId() == null || order.getId().isEmpty()) {
|
||||
order.setId("order_" + System.currentTimeMillis());
|
||||
}
|
||||
orders.add(order);
|
||||
return order;
|
||||
}
|
||||
|
||||
// UPDATE
|
||||
@PutMapping("/{id}")
|
||||
@Operation(summary = "Обновить заказ")
|
||||
public OrderDTO update(@PathVariable String id, @RequestBody OrderDTO updatedOrder) {
|
||||
Optional<OrderDTO> existing = orders.stream()
|
||||
.filter(o -> o.getId().equals(id))
|
||||
.findFirst();
|
||||
|
||||
if (existing.isPresent()) {
|
||||
OrderDTO order = existing.get();
|
||||
order.setCustomer(updatedOrder.getCustomer());
|
||||
order.setDelivery(updatedOrder.getDelivery());
|
||||
order.setStatus(updatedOrder.getStatus());
|
||||
return order;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
// DELETE
|
||||
@DeleteMapping("/{id}")
|
||||
@Operation(summary = "Удалить заказ")
|
||||
public void delete(@PathVariable String id) {
|
||||
orders.removeIf(o -> o.getId().equals(id));
|
||||
}
|
||||
}
|
||||
58
src/main/java/com/example/dto/CustomerDTO.java
Normal file
58
src/main/java/com/example/dto/CustomerDTO.java
Normal file
@@ -0,0 +1,58 @@
|
||||
package com.example.dto;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public class CustomerDTO {
|
||||
private String id;
|
||||
private String name;
|
||||
private String email;
|
||||
private List<OrderDTO> orders = new ArrayList<>();
|
||||
|
||||
// Конструкторы
|
||||
public CustomerDTO() {}
|
||||
|
||||
public CustomerDTO(String id, String name, String email) {
|
||||
this.id = id;
|
||||
this.name = name;
|
||||
this.email = email;
|
||||
}
|
||||
|
||||
// Основные геттеры и сеттеры
|
||||
public String getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(String id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
public void setName(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public String getEmail() {
|
||||
return email;
|
||||
}
|
||||
|
||||
public void setEmail(String email) {
|
||||
this.email = email;
|
||||
}
|
||||
|
||||
// Геттеры и сеттеры для orders
|
||||
public List<OrderDTO> getOrders() {
|
||||
return orders;
|
||||
}
|
||||
|
||||
public void setOrders(List<OrderDTO> orders) {
|
||||
this.orders = orders;
|
||||
}
|
||||
|
||||
public void addOrder(OrderDTO order) {
|
||||
this.orders.add(order);
|
||||
}
|
||||
}
|
||||
BIN
src/main/java/com/example/dto/DeliveryDTO.class
Normal file
BIN
src/main/java/com/example/dto/DeliveryDTO.class
Normal file
Binary file not shown.
34
src/main/java/com/example/dto/DeliveryDTO.java
Normal file
34
src/main/java/com/example/dto/DeliveryDTO.java
Normal file
@@ -0,0 +1,34 @@
|
||||
package com.example.dto;
|
||||
|
||||
public class DeliveryDTO {
|
||||
private String id;
|
||||
private String trackingNumber;
|
||||
private String destination;
|
||||
private String status;
|
||||
private String customer;
|
||||
|
||||
public DeliveryDTO() {}
|
||||
|
||||
public DeliveryDTO(String id, String trackingNumber, String destination, String status, String customer) {
|
||||
this.id = id;
|
||||
this.trackingNumber = trackingNumber;
|
||||
this.destination = destination;
|
||||
this.status = status;
|
||||
this.customer = customer;
|
||||
}
|
||||
|
||||
public String getId() { return id; }
|
||||
public void setId(String id) { this.id = id; }
|
||||
|
||||
public String getTrackingNumber() { return trackingNumber; }
|
||||
public void setTrackingNumber(String trackingNumber) { this.trackingNumber = trackingNumber; }
|
||||
|
||||
public String getDestination() { return destination; }
|
||||
public void setDestination(String destination) { this.destination = destination; }
|
||||
|
||||
public String getStatus() { return status; }
|
||||
public void setStatus(String status) { this.status = status; }
|
||||
|
||||
public String getCustomer() { return customer; }
|
||||
public void setCustomer(String customer) { this.customer = customer; }
|
||||
}
|
||||
51
src/main/java/com/example/dto/OrderDTO.java
Normal file
51
src/main/java/com/example/dto/OrderDTO.java
Normal file
@@ -0,0 +1,51 @@
|
||||
package com.example.dto;
|
||||
|
||||
public class OrderDTO {
|
||||
private String id;
|
||||
private CustomerDTO customer; // объект вместо customerId
|
||||
private DeliveryDTO delivery; // объект вместо deliveryId
|
||||
private String status;
|
||||
|
||||
// Конструкторы
|
||||
public OrderDTO() {}
|
||||
|
||||
public OrderDTO(String id, CustomerDTO customer, DeliveryDTO delivery, String status) {
|
||||
this.id = id;
|
||||
this.customer = customer;
|
||||
this.delivery = delivery;
|
||||
this.status = status;
|
||||
}
|
||||
|
||||
// Геттеры и сеттеры
|
||||
public String getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(String id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public CustomerDTO getCustomer() {
|
||||
return customer;
|
||||
}
|
||||
|
||||
public void setCustomer(CustomerDTO customer) {
|
||||
this.customer = customer;
|
||||
}
|
||||
|
||||
public DeliveryDTO getDelivery() {
|
||||
return delivery;
|
||||
}
|
||||
|
||||
public void setDelivery(DeliveryDTO delivery) {
|
||||
this.delivery = delivery;
|
||||
}
|
||||
|
||||
public String getStatus() {
|
||||
return status;
|
||||
}
|
||||
|
||||
public void setStatus(String status) {
|
||||
this.status = status;
|
||||
}
|
||||
}
|
||||
1
src/main/resources/application.properties
Normal file
1
src/main/resources/application.properties
Normal file
@@ -0,0 +1 @@
|
||||
spring.application.name=demo
|
||||
13
src/test/java/com/example/demo/DemoApplicationTests.java
Normal file
13
src/test/java/com/example/demo/DemoApplicationTests.java
Normal file
@@ -0,0 +1,13 @@
|
||||
package com.example.demo;
|
||||
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.springframework.boot.test.context.SpringBootTest;
|
||||
|
||||
@SpringBootTest
|
||||
class DemoApplicationTests {
|
||||
|
||||
@Test
|
||||
void contextLoads() {
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,7 +0,0 @@
|
||||
import { defineConfig } from 'vite'
|
||||
import react from '@vitejs/plugin-react'
|
||||
|
||||
// https://vite.dev/config/
|
||||
export default defineConfig({
|
||||
plugins: [react()],
|
||||
})
|
||||
Reference in New Issue
Block a user