Compare commits
9 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| a73685f3b3 | |||
| e620af3165 | |||
| 13a162f744 | |||
| 6f91e433fa | |||
|
7eff23080c | ||
|
|
951bf3001f | ||
|
|
a15ed7c52b | ||
|
|
edbbe4d2b1 | ||
|
|
7330e6e550 |
2
.gitignore
vendored
2
.gitignore
vendored
@ -4,6 +4,8 @@ build/
|
||||
!gradle/wrapper/gradle-wrapper.jar
|
||||
!**/src/main/**/build/
|
||||
!**/src/test/**/build/
|
||||
data.mv.db
|
||||
data.trace.db
|
||||
|
||||
### STS ###
|
||||
.apt_generated
|
||||
|
||||
@ -6,7 +6,7 @@ plugins {
|
||||
|
||||
group = 'com.kalyshev'
|
||||
version = '0.0.1-SNAPSHOT'
|
||||
sourceCompatibility = '17'
|
||||
sourceCompatibility = '1.19'
|
||||
|
||||
repositories {
|
||||
mavenCentral()
|
||||
@ -14,6 +14,12 @@ repositories {
|
||||
|
||||
dependencies {
|
||||
implementation 'org.springframework.boot:spring-boot-starter-web'
|
||||
|
||||
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
|
||||
implementation 'com.h2database:h2:2.1.210'
|
||||
|
||||
implementation group: 'org.springdoc', name: 'springdoc-openapi-ui', version: '1.6.5'
|
||||
|
||||
testImplementation 'org.springframework.boot:spring-boot-starter-test'
|
||||
}
|
||||
|
||||
|
||||
@ -1,49 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
|
||||
<title>Тестовое приложение</title>
|
||||
<link href="/node_modules/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
|
||||
</head>
|
||||
<body style="padding: 10px;">
|
||||
<h2>Конвертр текста!</h2>
|
||||
<form class="needs-validation" novalidate>
|
||||
<div class="mb-3">
|
||||
<label for="input" class="form-label">Ваш текст</label>
|
||||
<input type="text" class="form-control" id="input" required>
|
||||
<div class="invalid-feedback">Пожалуйста, введите текст</div>
|
||||
</div>
|
||||
<div class="mb-3">
|
||||
<div class="form-check">
|
||||
<input class="form-check-input" type="radio" name="radio" id="radioUppercase" checked>
|
||||
<label class="form-check-label" for="radioUppercase">Undercase</label>
|
||||
</div>
|
||||
</div>
|
||||
<div class="mb-3">
|
||||
<div class="form-check">
|
||||
<input class="form-check-input" type="radio" name="radio" id="radioLowcase">
|
||||
<label class="form-check-label" for="radioLowcase">Lowcase</label>
|
||||
</div>
|
||||
</div>
|
||||
<div class="mb-3">
|
||||
<div class="form-check">
|
||||
<input class="form-check-input" type="radio" name="radio" id="radioSplit">
|
||||
<label class="form-check-label" for="radioSplit">Split</label>
|
||||
<input type="text" class="form-control" id="inputSplitBy">
|
||||
</div>
|
||||
</div>
|
||||
<div class="mb-3">
|
||||
<div class="form-check">
|
||||
<input class="form-check-input" type="radio" name="radio" id="radioReplace">
|
||||
<label class="form-check-label" for="radioReplace">Replace</label>
|
||||
<input type="text" class="form-control" id="inputReplaceOld" maxlength="1">
|
||||
<input type="text" class="form-control" id="inputReplaceNew" maxlength="1">
|
||||
</div>
|
||||
</div>
|
||||
<button type="submit" class="btn btn-primary">Обработать</button>
|
||||
</form>
|
||||
<h2>Результат:</h2>
|
||||
<p id="result"></p>
|
||||
</body>
|
||||
<script src="index.js"></script>
|
||||
</html>
|
||||
@ -1,41 +0,0 @@
|
||||
document.addEventListener('DOMContentLoaded', function() {
|
||||
var forms = document.querySelectorAll('.needs-validation');
|
||||
|
||||
Array.from(forms).forEach(form => {
|
||||
form.addEventListener('submit', event => {
|
||||
if (!form.checkValidity()) {
|
||||
event.preventDefault();
|
||||
event.stopPropagation();
|
||||
}
|
||||
|
||||
form.classList.add('was-validated');
|
||||
}, false);
|
||||
});
|
||||
});
|
||||
|
||||
document.getElementsByClassName("needs-validation")[0].addEventListener('submit', async function(event) {
|
||||
event.preventDefault();
|
||||
url = ""
|
||||
if (document.getElementById("radioUppercase").checked) {
|
||||
url = "http://localhost:8080/uppercase?value=" + document.getElementById("input").value
|
||||
}
|
||||
if (document.getElementById("radioLowcase").checked) {
|
||||
url = "http://localhost:8080/lowercase?value=" + document.getElementById("input").value
|
||||
}
|
||||
if (document.getElementById("radioSplit").checked) {
|
||||
url = "http://localhost:8080/split?value=" + document.getElementById("input").value + "&splitBy=" + document.getElementById("inputSplitBy").value
|
||||
}
|
||||
if (document.getElementById("radioReplace").checked) {
|
||||
url = "http://localhost:8080/replace?value=" + document.getElementById("input").value + "&old=" + document.getElementById("inputReplaceOld").value + "&new=" + document.getElementById("inputReplaceNew").value
|
||||
}
|
||||
if (url == "") {
|
||||
document.getElementById("result").innerHTML = "Выберите действие!"
|
||||
}
|
||||
// performFetch(url).then(data => {document.getElementById("result").innerHTML = data})
|
||||
document.getElementById("result").innerHTML = await performFetch(url)
|
||||
});
|
||||
|
||||
async function performFetch(url) {
|
||||
let resp = await fetch(url)
|
||||
return await resp.text()
|
||||
}
|
||||
472
front/package-lock.json
generated
472
front/package-lock.json
generated
@ -1,472 +0,0 @@
|
||||
{
|
||||
"name": "front",
|
||||
"version": "1.0.0",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "front",
|
||||
"version": "1.0.0",
|
||||
"dependencies": {
|
||||
"bootstrap": "5.2.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"http-server": "14.1.1"
|
||||
}
|
||||
},
|
||||
"node_modules/@popperjs/core": {
|
||||
"version": "2.11.6",
|
||||
"resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.6.tgz",
|
||||
"integrity": "sha512-50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw==",
|
||||
"peer": true,
|
||||
"funding": {
|
||||
"type": "opencollective",
|
||||
"url": "https://opencollective.com/popperjs"
|
||||
}
|
||||
},
|
||||
"node_modules/ansi-styles": {
|
||||
"version": "4.3.0",
|
||||
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
|
||||
"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
|
||||
"dev": true,
|
||||
"dependencies": {
|
||||
"color-convert": "^2.0.1"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=8"
|
||||
},
|
||||
"funding": {
|
||||
"url": "https://github.com/chalk/ansi-styles?sponsor=1"
|
||||
}
|
||||
},
|
||||
"node_modules/async": {
|
||||
"version": "2.6.4",
|
||||
"resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
|
||||
"integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
|
||||
"dev": true,
|
||||
"dependencies": {
|
||||
"lodash": "^4.17.14"
|
||||
}
|
||||
},
|
||||
"node_modules/basic-auth": {
|
||||
"version": "2.0.1",
|
||||
"resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.1.tgz",
|
||||
"integrity": "sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==",
|
||||
"dev": true,
|
||||
"dependencies": {
|
||||
"safe-buffer": "5.1.2"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">= 0.8"
|
||||
}
|
||||
},
|
||||
"node_modules/bootstrap": {
|
||||
"version": "5.2.1",
|
||||
"resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.2.1.tgz",
|
||||
"integrity": "sha512-UQi3v2NpVPEi1n35dmRRzBJFlgvWHYwyem6yHhuT6afYF+sziEt46McRbT//kVXZ7b1YUYEVGdXEH74Nx3xzGA==",
|
||||
"funding": [
|
||||
{
|
||||
"type": "github",
|
||||
"url": "https://github.com/sponsors/twbs"
|
||||
},
|
||||
{
|
||||
"type": "opencollective",
|
||||
"url": "https://opencollective.com/bootstrap"
|
||||
}
|
||||
],
|
||||
"peerDependencies": {
|
||||
"@popperjs/core": "^2.11.6"
|
||||
}
|
||||
},
|
||||
"node_modules/call-bind": {
|
||||
"version": "1.0.2",
|
||||
"resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
|
||||
"integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
|
||||
"dev": true,
|
||||
"dependencies": {
|
||||
"function-bind": "^1.1.1",
|
||||
"get-intrinsic": "^1.0.2"
|
||||
},
|
||||
"funding": {
|
||||
"url": "https://github.com/sponsors/ljharb"
|
||||
}
|
||||
},
|
||||
"node_modules/chalk": {
|
||||
"version": "4.1.2",
|
||||
"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
|
||||
"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
|
||||
"dev": true,
|
||||
"dependencies": {
|
||||
"ansi-styles": "^4.1.0",
|
||||
"supports-color": "^7.1.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=10"
|
||||
},
|
||||
"funding": {
|
||||
"url": "https://github.com/chalk/chalk?sponsor=1"
|
||||
}
|
||||
},
|
||||
"node_modules/color-convert": {
|
||||
"version": "2.0.1",
|
||||
"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
|
||||
"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
|
||||
"dev": true,
|
||||
"dependencies": {
|
||||
"color-name": "~1.1.4"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=7.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/color-name": {
|
||||
"version": "1.1.4",
|
||||
"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
|
||||
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
|
||||
"dev": true
|
||||
},
|
||||
"node_modules/corser": {
|
||||
"version": "2.0.1",
|
||||
"resolved": "https://registry.npmjs.org/corser/-/corser-2.0.1.tgz",
|
||||
"integrity": "sha512-utCYNzRSQIZNPIcGZdQc92UVJYAhtGAteCFg0yRaFm8f0P+CPtyGyHXJcGXnffjCybUCEx3FQ2G7U3/o9eIkVQ==",
|
||||
"dev": true,
|
||||
"engines": {
|
||||
"node": ">= 0.4.0"
|
||||
}
|
||||
},
|
||||
"node_modules/debug": {
|
||||
"version": "3.2.7",
|
||||
"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
|
||||
"integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
|
||||
"dev": true,
|
||||
"dependencies": {
|
||||
"ms": "^2.1.1"
|
||||
}
|
||||
},
|
||||
"node_modules/eventemitter3": {
|
||||
"version": "4.0.7",
|
||||
"resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
|
||||
"integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==",
|
||||
"dev": true
|
||||
},
|
||||
"node_modules/follow-redirects": {
|
||||
"version": "1.15.2",
|
||||
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
|
||||
"integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
|
||||
"dev": true,
|
||||
"funding": [
|
||||
{
|
||||
"type": "individual",
|
||||
"url": "https://github.com/sponsors/RubenVerborgh"
|
||||
}
|
||||
],
|
||||
"engines": {
|
||||
"node": ">=4.0"
|
||||
},
|
||||
"peerDependenciesMeta": {
|
||||
"debug": {
|
||||
"optional": true
|
||||
}
|
||||
}
|
||||
},
|
||||
"node_modules/function-bind": {
|
||||
"version": "1.1.1",
|
||||
"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
|
||||
"integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
|
||||
"dev": true
|
||||
},
|
||||
"node_modules/get-intrinsic": {
|
||||
"version": "1.2.0",
|
||||
"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.0.tgz",
|
||||
"integrity": "sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==",
|
||||
"dev": true,
|
||||
"dependencies": {
|
||||
"function-bind": "^1.1.1",
|
||||
"has": "^1.0.3",
|
||||
"has-symbols": "^1.0.3"
|
||||
},
|
||||
"funding": {
|
||||
"url": "https://github.com/sponsors/ljharb"
|
||||
}
|
||||
},
|
||||
"node_modules/has": {
|
||||
"version": "1.0.3",
|
||||
"resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
|
||||
"integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
|
||||
"dev": true,
|
||||
"dependencies": {
|
||||
"function-bind": "^1.1.1"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">= 0.4.0"
|
||||
}
|
||||
},
|
||||
"node_modules/has-flag": {
|
||||
"version": "4.0.0",
|
||||
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
|
||||
"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
|
||||
"dev": true,
|
||||
"engines": {
|
||||
"node": ">=8"
|
||||
}
|
||||
},
|
||||
"node_modules/has-symbols": {
|
||||
"version": "1.0.3",
|
||||
"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
|
||||
"integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
|
||||
"dev": true,
|
||||
"engines": {
|
||||
"node": ">= 0.4"
|
||||
},
|
||||
"funding": {
|
||||
"url": "https://github.com/sponsors/ljharb"
|
||||
}
|
||||
},
|
||||
"node_modules/he": {
|
||||
"version": "1.2.0",
|
||||
"resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
|
||||
"integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
|
||||
"dev": true,
|
||||
"bin": {
|
||||
"he": "bin/he"
|
||||
}
|
||||
},
|
||||
"node_modules/html-encoding-sniffer": {
|
||||
"version": "3.0.0",
|
||||
"resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz",
|
||||
"integrity": "sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==",
|
||||
"dev": true,
|
||||
"dependencies": {
|
||||
"whatwg-encoding": "^2.0.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=12"
|
||||
}
|
||||
},
|
||||
"node_modules/http-proxy": {
|
||||
"version": "1.18.1",
|
||||
"resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz",
|
||||
"integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==",
|
||||
"dev": true,
|
||||
"dependencies": {
|
||||
"eventemitter3": "^4.0.0",
|
||||
"follow-redirects": "^1.0.0",
|
||||
"requires-port": "^1.0.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=8.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/http-server": {
|
||||
"version": "14.1.1",
|
||||
"resolved": "https://registry.npmjs.org/http-server/-/http-server-14.1.1.tgz",
|
||||
"integrity": "sha512-+cbxadF40UXd9T01zUHgA+rlo2Bg1Srer4+B4NwIHdaGxAGGv59nYRnGGDJ9LBk7alpS0US+J+bLLdQOOkJq4A==",
|
||||
"dev": true,
|
||||
"dependencies": {
|
||||
"basic-auth": "^2.0.1",
|
||||
"chalk": "^4.1.2",
|
||||
"corser": "^2.0.1",
|
||||
"he": "^1.2.0",
|
||||
"html-encoding-sniffer": "^3.0.0",
|
||||
"http-proxy": "^1.18.1",
|
||||
"mime": "^1.6.0",
|
||||
"minimist": "^1.2.6",
|
||||
"opener": "^1.5.1",
|
||||
"portfinder": "^1.0.28",
|
||||
"secure-compare": "3.0.1",
|
||||
"union": "~0.5.0",
|
||||
"url-join": "^4.0.1"
|
||||
},
|
||||
"bin": {
|
||||
"http-server": "bin/http-server"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=12"
|
||||
}
|
||||
},
|
||||
"node_modules/iconv-lite": {
|
||||
"version": "0.6.3",
|
||||
"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
|
||||
"integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
|
||||
"dev": true,
|
||||
"dependencies": {
|
||||
"safer-buffer": ">= 2.1.2 < 3.0.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=0.10.0"
|
||||
}
|
||||
},
|
||||
"node_modules/lodash": {
|
||||
"version": "4.17.21",
|
||||
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
|
||||
"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
|
||||
"dev": true
|
||||
},
|
||||
"node_modules/mime": {
|
||||
"version": "1.6.0",
|
||||
"resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
|
||||
"integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
|
||||
"dev": true,
|
||||
"bin": {
|
||||
"mime": "cli.js"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=4"
|
||||
}
|
||||
},
|
||||
"node_modules/minimist": {
|
||||
"version": "1.2.8",
|
||||
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
|
||||
"integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
|
||||
"dev": true,
|
||||
"funding": {
|
||||
"url": "https://github.com/sponsors/ljharb"
|
||||
}
|
||||
},
|
||||
"node_modules/mkdirp": {
|
||||
"version": "0.5.6",
|
||||
"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
|
||||
"integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
|
||||
"dev": true,
|
||||
"dependencies": {
|
||||
"minimist": "^1.2.6"
|
||||
},
|
||||
"bin": {
|
||||
"mkdirp": "bin/cmd.js"
|
||||
}
|
||||
},
|
||||
"node_modules/ms": {
|
||||
"version": "2.1.3",
|
||||
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
|
||||
"integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
|
||||
"dev": true
|
||||
},
|
||||
"node_modules/object-inspect": {
|
||||
"version": "1.12.3",
|
||||
"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
|
||||
"integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==",
|
||||
"dev": true,
|
||||
"funding": {
|
||||
"url": "https://github.com/sponsors/ljharb"
|
||||
}
|
||||
},
|
||||
"node_modules/opener": {
|
||||
"version": "1.5.2",
|
||||
"resolved": "https://registry.npmjs.org/opener/-/opener-1.5.2.tgz",
|
||||
"integrity": "sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==",
|
||||
"dev": true,
|
||||
"bin": {
|
||||
"opener": "bin/opener-bin.js"
|
||||
}
|
||||
},
|
||||
"node_modules/portfinder": {
|
||||
"version": "1.0.32",
|
||||
"resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.32.tgz",
|
||||
"integrity": "sha512-on2ZJVVDXRADWE6jnQaX0ioEylzgBpQk8r55NE4wjXW1ZxO+BgDlY6DXwj20i0V8eB4SenDQ00WEaxfiIQPcxg==",
|
||||
"dev": true,
|
||||
"dependencies": {
|
||||
"async": "^2.6.4",
|
||||
"debug": "^3.2.7",
|
||||
"mkdirp": "^0.5.6"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">= 0.12.0"
|
||||
}
|
||||
},
|
||||
"node_modules/qs": {
|
||||
"version": "6.11.0",
|
||||
"resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
|
||||
"integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
|
||||
"dev": true,
|
||||
"dependencies": {
|
||||
"side-channel": "^1.0.4"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=0.6"
|
||||
},
|
||||
"funding": {
|
||||
"url": "https://github.com/sponsors/ljharb"
|
||||
}
|
||||
},
|
||||
"node_modules/requires-port": {
|
||||
"version": "1.0.0",
|
||||
"resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
|
||||
"integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
|
||||
"dev": true
|
||||
},
|
||||
"node_modules/safe-buffer": {
|
||||
"version": "5.1.2",
|
||||
"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
|
||||
"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
|
||||
"dev": true
|
||||
},
|
||||
"node_modules/safer-buffer": {
|
||||
"version": "2.1.2",
|
||||
"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
|
||||
"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
|
||||
"dev": true
|
||||
},
|
||||
"node_modules/secure-compare": {
|
||||
"version": "3.0.1",
|
||||
"resolved": "https://registry.npmjs.org/secure-compare/-/secure-compare-3.0.1.tgz",
|
||||
"integrity": "sha512-AckIIV90rPDcBcglUwXPF3kg0P0qmPsPXAj6BBEENQE1p5yA1xfmDJzfi1Tappj37Pv2mVbKpL3Z1T+Nn7k1Qw==",
|
||||
"dev": true
|
||||
},
|
||||
"node_modules/side-channel": {
|
||||
"version": "1.0.4",
|
||||
"resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
|
||||
"integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
|
||||
"dev": true,
|
||||
"dependencies": {
|
||||
"call-bind": "^1.0.0",
|
||||
"get-intrinsic": "^1.0.2",
|
||||
"object-inspect": "^1.9.0"
|
||||
},
|
||||
"funding": {
|
||||
"url": "https://github.com/sponsors/ljharb"
|
||||
}
|
||||
},
|
||||
"node_modules/supports-color": {
|
||||
"version": "7.2.0",
|
||||
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
|
||||
"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
|
||||
"dev": true,
|
||||
"dependencies": {
|
||||
"has-flag": "^4.0.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=8"
|
||||
}
|
||||
},
|
||||
"node_modules/union": {
|
||||
"version": "0.5.0",
|
||||
"resolved": "https://registry.npmjs.org/union/-/union-0.5.0.tgz",
|
||||
"integrity": "sha512-N6uOhuW6zO95P3Mel2I2zMsbsanvvtgn6jVqJv4vbVcz/JN0OkL9suomjQGmWtxJQXOCqUJvquc1sMeNz/IwlA==",
|
||||
"dev": true,
|
||||
"dependencies": {
|
||||
"qs": "^6.4.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">= 0.8.0"
|
||||
}
|
||||
},
|
||||
"node_modules/url-join": {
|
||||
"version": "4.0.1",
|
||||
"resolved": "https://registry.npmjs.org/url-join/-/url-join-4.0.1.tgz",
|
||||
"integrity": "sha512-jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA==",
|
||||
"dev": true
|
||||
},
|
||||
"node_modules/whatwg-encoding": {
|
||||
"version": "2.0.0",
|
||||
"resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz",
|
||||
"integrity": "sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==",
|
||||
"dev": true,
|
||||
"dependencies": {
|
||||
"iconv-lite": "0.6.3"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=12"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,15 +0,0 @@
|
||||
{
|
||||
"name": "front",
|
||||
"version": "1.0.0",
|
||||
"main": "index.html",
|
||||
"scripts": {
|
||||
"web-server": "http-server -p 3000 ./",
|
||||
"start": "npm run web-server"
|
||||
},
|
||||
"dependencies": {
|
||||
"bootstrap": "5.2.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"http-server": "14.1.1"
|
||||
}
|
||||
}
|
||||
@ -1,13 +0,0 @@
|
||||
package com.kalyshev.yan;
|
||||
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
@RestController
|
||||
public class LowercaseController {
|
||||
@GetMapping("/lowercase")
|
||||
public String lowercase(@RequestParam(value = "value", defaultValue = "None") String value) {
|
||||
return value.toLowerCase();
|
||||
}
|
||||
}
|
||||
@ -1,15 +0,0 @@
|
||||
package com.kalyshev.yan;
|
||||
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
@RestController
|
||||
public class ReplaceController {
|
||||
@GetMapping("/replace")
|
||||
public String replace(@RequestParam(value = "value", defaultValue = "None") String value,
|
||||
@RequestParam(value = "old", defaultValue = "") char oldChar,
|
||||
@RequestParam(value = "new", defaultValue = "") char newChar) {
|
||||
return value.replace(oldChar, newChar);
|
||||
}
|
||||
}
|
||||
@ -1,20 +0,0 @@
|
||||
package com.kalyshev.yan;
|
||||
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
@RestController
|
||||
public class SplitController {
|
||||
@GetMapping("/split")
|
||||
public String split(@RequestParam(value = "value", defaultValue = "None") String value,
|
||||
@RequestParam(value = "splitBy", defaultValue = " ") String splitBy) {
|
||||
String[] temp = value.split(splitBy);
|
||||
String res = "";
|
||||
for (int i = 0; i < temp.length; i++) {
|
||||
res += temp[i];
|
||||
res += "; ";
|
||||
}
|
||||
return res;
|
||||
}
|
||||
}
|
||||
@ -1,13 +0,0 @@
|
||||
package com.kalyshev.yan;
|
||||
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
@RestController
|
||||
public class UppercaseController {
|
||||
@GetMapping("/uppercase")
|
||||
public String uppercase(@RequestParam(value = "value", defaultValue = "None") String value) {
|
||||
return value.toUpperCase();
|
||||
}
|
||||
}
|
||||
@ -1,13 +0,0 @@
|
||||
package com.kalyshev.yan;
|
||||
|
||||
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 WebConfiguration implements WebMvcConfigurer {
|
||||
@Override
|
||||
public void addCorsMappings(CorsRegistry registry) {
|
||||
registry.addMapping("/**").allowedMethods("*");
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,68 @@
|
||||
package com.kalyshev.yan.cabinet.controller;
|
||||
|
||||
import com.kalyshev.yan.computer.model.Computer;
|
||||
import org.springframework.web.bind.annotation.DeleteMapping;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PatchMapping;
|
||||
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.RestController;
|
||||
import com.kalyshev.yan.cabinet.model.Cabinet;
|
||||
import com.kalyshev.yan.cabinet.service.CabinetService;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/cabinet")
|
||||
public class CabinetController {
|
||||
private final CabinetService cabinetService;
|
||||
|
||||
public CabinetController(CabinetService cabinetService) {
|
||||
this.cabinetService = cabinetService;
|
||||
}
|
||||
|
||||
@GetMapping("/{id}")
|
||||
public Cabinet getCabinet(@PathVariable Long id) {
|
||||
return cabinetService.findCabinet(id);
|
||||
}
|
||||
|
||||
@GetMapping("/")
|
||||
public List<Cabinet> getCabinets() {
|
||||
return cabinetService.findAllCabinets();
|
||||
}
|
||||
|
||||
@GetMapping("/{id}/computers")
|
||||
public List<Computer> getCabinetComputers(@PathVariable Long id) {
|
||||
return cabinetService.listComputers(id);
|
||||
}
|
||||
|
||||
@PostMapping("/")
|
||||
public Cabinet createCabinet(@RequestParam("number") String number) {
|
||||
return cabinetService.addCabinet(number);
|
||||
}
|
||||
|
||||
@PostMapping("/computer")
|
||||
public Computer createCabinetComputer(@RequestParam("computerId") Long computerId,
|
||||
@RequestParam("cabinetId") Long cabinetId) {
|
||||
return cabinetService.addComputer(computerId, cabinetId);
|
||||
}
|
||||
|
||||
@PatchMapping("/{id}")
|
||||
public Cabinet updateCabinet(@PathVariable Long id,
|
||||
@RequestParam("number") String number) {
|
||||
return cabinetService.updateCabinet(id, number);
|
||||
}
|
||||
|
||||
@DeleteMapping("/{id}")
|
||||
public Cabinet deleteCabinet(@PathVariable Long id) {
|
||||
return cabinetService.deleteCabinet(id);
|
||||
}
|
||||
|
||||
@DeleteMapping("/{cabinetId}/computer")
|
||||
public Computer deleteCabinetComputer(@PathVariable Long cabinetId,
|
||||
@RequestParam("computerId") Long computerId) {
|
||||
return cabinetService.deleteComputer(computerId, cabinetId);
|
||||
}
|
||||
}
|
||||
71
src/main/java/com/kalyshev/yan/cabinet/model/Cabinet.java
Normal file
71
src/main/java/com/kalyshev/yan/cabinet/model/Cabinet.java
Normal file
@ -0,0 +1,71 @@
|
||||
package com.kalyshev.yan.cabinet.model;
|
||||
|
||||
import com.kalyshev.yan.computer.model.Computer;
|
||||
import jakarta.persistence.*;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
|
||||
@Entity
|
||||
@Table(name = "cabinet")
|
||||
public class Cabinet {
|
||||
@Id
|
||||
@GeneratedValue
|
||||
private Long id;
|
||||
private String number;
|
||||
@OneToMany(cascade = {CascadeType.MERGE})
|
||||
private List<Computer> computers;
|
||||
|
||||
public Cabinet() {
|
||||
}
|
||||
public Cabinet(String number) {
|
||||
this.number = number;
|
||||
}
|
||||
public Long getId() {
|
||||
return id;
|
||||
}
|
||||
public String getnumber() {
|
||||
return number;
|
||||
}
|
||||
public void setnumber(String number) {
|
||||
this.number = number;
|
||||
}
|
||||
public List<Computer> getComputers() {
|
||||
return computers;
|
||||
}
|
||||
public void addComputer(Computer computer){
|
||||
if (computers == null){
|
||||
this.computers = new ArrayList<>();
|
||||
}
|
||||
if (!computers.contains(computer)) {
|
||||
this.computers.add(computer);
|
||||
computer.setCabinet(this);
|
||||
}
|
||||
}
|
||||
public void removeComputer(Computer computer){
|
||||
if (computers.contains(computer))
|
||||
this.computers.remove(computer);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean equals(Object o) {
|
||||
if (this == o) return true;
|
||||
if (o == null || getClass() != o.getClass()) return false;
|
||||
Cabinet cabinet = (Cabinet) o;
|
||||
return Objects.equals(id, cabinet.id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
return Objects.hash(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "Cabinet{" +
|
||||
"id=" + id +
|
||||
", number='" + number + '\'' +
|
||||
'}';
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,110 @@
|
||||
package com.kalyshev.yan.cabinet.service;
|
||||
|
||||
import com.kalyshev.yan.computer.model.Computer;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import org.springframework.util.StringUtils;
|
||||
import com.kalyshev.yan.cabinet.model.Cabinet;
|
||||
|
||||
import jakarta.persistence.EntityManager;
|
||||
import jakarta.persistence.EntityNotFoundException;
|
||||
import jakarta.persistence.PersistenceContext;
|
||||
import java.util.List;
|
||||
|
||||
@Service
|
||||
public class CabinetService {
|
||||
@PersistenceContext
|
||||
private EntityManager em;
|
||||
|
||||
@Transactional
|
||||
public Cabinet addCabinet(String number) {
|
||||
if (!StringUtils.hasText(number)) {
|
||||
throw new IllegalArgumentException("Cabinet number is null or empty");
|
||||
}
|
||||
final Cabinet cabinet = new Cabinet(number);
|
||||
em.persist(cabinet);
|
||||
return cabinet;
|
||||
}
|
||||
|
||||
@Transactional(readOnly = true)
|
||||
public Cabinet findCabinet(Long id) {
|
||||
final Cabinet cabinet = em.find(Cabinet.class, id);
|
||||
if (cabinet == null) {
|
||||
throw new EntityNotFoundException(String.format("Cabinet with id [%s] is not found", id));
|
||||
}
|
||||
return cabinet;
|
||||
}
|
||||
|
||||
@Transactional(readOnly = true)
|
||||
public List<Cabinet> findAllCabinets() {
|
||||
return em.createQuery("select s from Cabinet s", Cabinet.class)
|
||||
.getResultList();
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public Cabinet updateCabinet(Long id, String number) {
|
||||
if (!StringUtils.hasText(number)) {
|
||||
throw new IllegalArgumentException("Cabinet number is null or empty");
|
||||
}
|
||||
final Cabinet currentCabinet = findCabinet(id);
|
||||
currentCabinet.setnumber(number);
|
||||
return em.merge(currentCabinet);
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public Cabinet deleteCabinet(Long id) {
|
||||
final Cabinet currentCabinet = findCabinet(id);
|
||||
int size = currentCabinet.getComputers().size();
|
||||
for (int i = 0; i < size; i++) {
|
||||
Computer temp = currentCabinet.getComputers().get(i);
|
||||
temp.setCabinet(null);
|
||||
currentCabinet.removeComputer(temp);
|
||||
em.remove(temp);
|
||||
}
|
||||
em.remove(currentCabinet);
|
||||
return currentCabinet;
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public void deleteAllCabinets() {
|
||||
em.createQuery("delete from Cabinet").executeUpdate();
|
||||
}
|
||||
|
||||
|
||||
@Transactional
|
||||
public List<Computer> listComputers(Long id) {
|
||||
if ((Object)id == null) {
|
||||
throw new IllegalArgumentException("Cabinet id is null or empty");
|
||||
}
|
||||
final Cabinet cabinet = em.find(Cabinet.class, id);
|
||||
return cabinet.getComputers();
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public Computer addComputer(Long computerId, Long cabinetId) {
|
||||
if ((Object)computerId == null) {
|
||||
throw new IllegalArgumentException("Computer id is null or empty");
|
||||
}
|
||||
if ((Object)cabinetId == null) {
|
||||
throw new IllegalArgumentException("Cabinet id is null or empty");
|
||||
}
|
||||
final Computer computer = em.find(Computer.class, computerId);
|
||||
final Cabinet cabinet = em.find(Cabinet.class, cabinetId);
|
||||
cabinet.addComputer(computer);
|
||||
return computer;
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public Computer deleteComputer(Long computerId, Long cabinetId) {
|
||||
if ((Object)computerId == null) {
|
||||
throw new IllegalArgumentException("Computer id is null or empty");
|
||||
}
|
||||
if ((Object)cabinetId == null) {
|
||||
throw new IllegalArgumentException("Cabinet id is null or empty");
|
||||
}
|
||||
final Computer computer = em.find(Computer.class, computerId);
|
||||
final Cabinet cabinet = em.find(Cabinet.class, cabinetId);
|
||||
cabinet.removeComputer(computer);
|
||||
return computer;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,68 @@
|
||||
package com.kalyshev.yan.computer.controller;
|
||||
|
||||
import com.kalyshev.yan.cabinet.model.Cabinet;
|
||||
import org.springframework.web.bind.annotation.DeleteMapping;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PatchMapping;
|
||||
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.RestController;
|
||||
import com.kalyshev.yan.computer.model.Computer;
|
||||
import com.kalyshev.yan.computer.service.ComputerService;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/computer")
|
||||
public class ComputerController {
|
||||
private final ComputerService computerService;
|
||||
|
||||
public ComputerController(ComputerService computerService) {
|
||||
this.computerService = computerService;
|
||||
}
|
||||
|
||||
@GetMapping("/{id}")
|
||||
public Computer getStudent(@PathVariable Long id) {
|
||||
return computerService.findComputer(id);
|
||||
}
|
||||
|
||||
@GetMapping("/")
|
||||
public List<Computer> getComputers() {
|
||||
return computerService.findAllComputers();
|
||||
}
|
||||
|
||||
@GetMapping("/{id}/computers")
|
||||
public Cabinet getComputersCabinet(@PathVariable Long id) {
|
||||
return computerService.getCabinet(id);
|
||||
}
|
||||
|
||||
@PostMapping("/")
|
||||
public Computer createComputer(@RequestParam("modelName") String modelName,
|
||||
@RequestParam("serialNum") String serialNum,
|
||||
@RequestParam("monitorId") Long monitorId,
|
||||
@RequestParam("cabinetId") Long cabinetId) {
|
||||
return computerService.addComputer(modelName, serialNum, monitorId, cabinetId);
|
||||
}
|
||||
|
||||
@PostMapping("/cabinet")
|
||||
public Cabinet setCabinetComputer(@RequestParam("computerId") Long computerId,
|
||||
@RequestParam("cabinetId") Long cabinetId) {
|
||||
return computerService.setCabinet(cabinetId, computerId);
|
||||
}
|
||||
|
||||
@PatchMapping("/{id}")
|
||||
public Computer updateComputer(@PathVariable Long id,
|
||||
@RequestParam("modelName") String modelName,
|
||||
@RequestParam("serialNum") String serialNum,
|
||||
@RequestParam("monitorId") Long monitorId,
|
||||
@RequestParam("cabinetId") Long cabinetId) {
|
||||
return computerService.updateComputer(id, modelName, serialNum, monitorId, cabinetId);
|
||||
}
|
||||
|
||||
@DeleteMapping("/{id}")
|
||||
public Computer deleteComputer(@PathVariable Long id) {
|
||||
return computerService.deleteComputer(id);
|
||||
}
|
||||
}
|
||||
82
src/main/java/com/kalyshev/yan/computer/model/Computer.java
Normal file
82
src/main/java/com/kalyshev/yan/computer/model/Computer.java
Normal file
@ -0,0 +1,82 @@
|
||||
package com.kalyshev.yan.computer.model;
|
||||
|
||||
import com.kalyshev.yan.cabinet.model.Cabinet;
|
||||
import com.kalyshev.yan.monitor.model.Monitor;
|
||||
import jakarta.persistence.*;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
|
||||
@Entity
|
||||
@Table(name = "computer")
|
||||
public class Computer {
|
||||
@Id
|
||||
@GeneratedValue
|
||||
private Long id;
|
||||
private String modelName;
|
||||
private String serialNum;
|
||||
@ManyToOne( cascade = {CascadeType.MERGE}, fetch = FetchType.EAGER)
|
||||
@JoinColumn(name = "cabinets", nullable = true)
|
||||
private Cabinet cabinet;
|
||||
@OneToOne()
|
||||
@JoinColumn(name = "monitor_id")
|
||||
private Monitor monitor;
|
||||
|
||||
public Computer() {
|
||||
}
|
||||
public Computer(String modelName, String serialNum) {
|
||||
this.modelName = modelName;
|
||||
this.serialNum = serialNum;
|
||||
}
|
||||
|
||||
public Long getId() {
|
||||
return id;
|
||||
}
|
||||
public String getmodelName() {
|
||||
return modelName;
|
||||
}
|
||||
public void setmodelName(String modelName) {
|
||||
this.modelName = modelName;
|
||||
}
|
||||
public String getserialNum() {
|
||||
return serialNum;
|
||||
}
|
||||
public void setserialNum(String serialNum) { this.serialNum = serialNum; }
|
||||
public Cabinet getCabinet() { return cabinet; }
|
||||
public void setCabinet(Cabinet cabinet) { this.cabinet = cabinet; }
|
||||
|
||||
public Monitor getMonitor() {
|
||||
return monitor;
|
||||
}
|
||||
public void setMonitor(Monitor monitor) {
|
||||
this.monitor = monitor;
|
||||
}
|
||||
public Monitor removeMonitor() {
|
||||
Monitor temp = this.monitor;
|
||||
this.monitor = null;
|
||||
return temp;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean equals(Object o) {
|
||||
if (this == o) return true;
|
||||
if (o == null || getClass() != o.getClass()) return false;
|
||||
Computer computer = (Computer) o;
|
||||
return Objects.equals(id, computer.id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
return Objects.hash(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "Computer{" +
|
||||
"id=" + id +
|
||||
", modelName='" + modelName + '\'' +
|
||||
", serialNum='" + serialNum + '\'' +
|
||||
'}';
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,126 @@
|
||||
package com.kalyshev.yan.computer.service;
|
||||
|
||||
import com.kalyshev.yan.cabinet.model.Cabinet;
|
||||
import com.kalyshev.yan.monitor.model.Monitor;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import org.springframework.util.StringUtils;
|
||||
import com.kalyshev.yan.computer.model.Computer;
|
||||
|
||||
import jakarta.persistence.EntityManager;
|
||||
import jakarta.persistence.EntityNotFoundException;
|
||||
import jakarta.persistence.PersistenceContext;
|
||||
import java.util.List;
|
||||
|
||||
@Service
|
||||
public class ComputerService {
|
||||
private static final Logger log = LoggerFactory.getLogger(ComputerService.class);
|
||||
@PersistenceContext
|
||||
private EntityManager em;
|
||||
|
||||
@Transactional
|
||||
public Computer addComputer(String modelName, String serialNum, Long monitorId, Long cabinetId) {
|
||||
if (!StringUtils.hasText(modelName)) {
|
||||
throw new IllegalArgumentException("Computer model name is null or empty");
|
||||
}
|
||||
if (!StringUtils.hasText(serialNum)) {
|
||||
throw new IllegalArgumentException("Computer serial number is null or empty");
|
||||
}
|
||||
final Computer computer = new Computer(modelName, serialNum);
|
||||
if (monitorId != null) {
|
||||
final Monitor monitor = em.find(Monitor.class, monitorId);
|
||||
if (monitor == null) {
|
||||
throw new IllegalArgumentException(String.format("Monitor with id [%s] not found", monitorId));
|
||||
}
|
||||
computer.setMonitor(monitor);
|
||||
}
|
||||
if (cabinetId != null) {
|
||||
final Cabinet cabinet = em.find(Cabinet.class, cabinetId);
|
||||
if (cabinet == null) {
|
||||
throw new IllegalArgumentException(String.format("Cabinet with id [%s] not found", cabinetId));
|
||||
}
|
||||
computer.setCabinet(cabinet);
|
||||
}
|
||||
em.persist(computer);
|
||||
return computer;
|
||||
}
|
||||
|
||||
@Transactional(readOnly = true)
|
||||
public Computer findComputer(Long id) {
|
||||
final Computer computer = em.find(Computer.class, id);
|
||||
if (computer == null) {
|
||||
throw new EntityNotFoundException(String.format("Computer with id [%s] not found", id));
|
||||
}
|
||||
return computer;
|
||||
}
|
||||
|
||||
@Transactional(readOnly = true)
|
||||
public List<Computer> findAllComputers() {
|
||||
return em.createQuery("select s from Computer s", Computer.class)
|
||||
.getResultList();
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public Computer updateComputer(Long id, String modelName, String serialNum, Long monitorId, Long cabinetId) {
|
||||
if (!(StringUtils.hasText(modelName) || StringUtils.hasText(serialNum))) {
|
||||
throw new IllegalArgumentException("Need at least one argument");
|
||||
}
|
||||
final Computer currentComputer = findComputer(id);
|
||||
if (modelName != null) {
|
||||
currentComputer.setmodelName(modelName);
|
||||
}
|
||||
if (serialNum != null) {
|
||||
currentComputer.setserialNum(serialNum);
|
||||
}
|
||||
if (monitorId != null) {
|
||||
Monitor monitor = em.find(Monitor.class, monitorId);
|
||||
currentComputer.setMonitor(monitor);
|
||||
}
|
||||
if (cabinetId != null) {
|
||||
Cabinet cabinet = em.find(Cabinet.class, cabinetId);
|
||||
currentComputer.setCabinet(cabinet);
|
||||
}
|
||||
return em.merge(currentComputer);
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public Computer deleteComputer(Long id) {
|
||||
final Computer currentComputer = findComputer(id);
|
||||
Cabinet currentComputerCabinet = currentComputer.getCabinet();
|
||||
if (currentComputerCabinet != null) {
|
||||
currentComputerCabinet.removeComputer(currentComputer);
|
||||
}
|
||||
em.remove(currentComputer);
|
||||
return currentComputer;
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public void deleteAllComputers() {
|
||||
em.createQuery("delete from Computer").executeUpdate();
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public Cabinet getCabinet(Long id) {
|
||||
if ((Object)id == null) {
|
||||
throw new IllegalArgumentException("Computer id is null or empty");
|
||||
}
|
||||
final Computer computer = em.find(Computer.class, id);
|
||||
return computer.getCabinet();
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public Cabinet setCabinet(Long cabinetId, Long computerId) {
|
||||
if ((Object)computerId == null) {
|
||||
throw new IllegalArgumentException("Computer id is null or empty");
|
||||
}
|
||||
if ((Object)cabinetId == null) {
|
||||
throw new IllegalArgumentException("Cabinet id is null or empty");
|
||||
}
|
||||
final Computer computer = em.find(Computer.class, computerId);
|
||||
final Cabinet cabinet = em.find(Cabinet.class, cabinetId);
|
||||
computer.setCabinet(cabinet);
|
||||
return cabinet;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,50 @@
|
||||
package com.kalyshev.yan.monitor.controller;
|
||||
|
||||
import com.kalyshev.yan.monitor.model.Monitor;
|
||||
import com.kalyshev.yan.monitor.service.MonitorService;
|
||||
import org.springframework.web.bind.annotation.DeleteMapping;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PatchMapping;
|
||||
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.RestController;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/monitor")
|
||||
public class MonitorController {
|
||||
private final MonitorService monitorService;
|
||||
|
||||
public MonitorController(MonitorService monitorService) {
|
||||
this.monitorService = monitorService;
|
||||
}
|
||||
|
||||
@GetMapping("/{id}")
|
||||
public Monitor getMonitor(@PathVariable Long id) {
|
||||
return monitorService.findMonitor(id);
|
||||
}
|
||||
|
||||
@GetMapping("/")
|
||||
public List<Monitor> getMonitors() {
|
||||
return monitorService.findAllMonitors();
|
||||
}
|
||||
|
||||
@PostMapping("/")
|
||||
public Monitor createMonitor(@RequestParam("modelName") String modelName) {
|
||||
return monitorService.addMonitor(modelName);
|
||||
}
|
||||
|
||||
@PatchMapping("/{id}")
|
||||
public Monitor updateMonitor(@PathVariable Long id,
|
||||
@RequestParam("modelName") String modelName) {
|
||||
return monitorService.updateMonitor(id, modelName);
|
||||
}
|
||||
|
||||
@DeleteMapping("/{id}")
|
||||
public Monitor deleteMonitor(@PathVariable Long id) {
|
||||
return monitorService.deleteMonitor(id);
|
||||
}
|
||||
}
|
||||
53
src/main/java/com/kalyshev/yan/monitor/model/Monitor.java
Normal file
53
src/main/java/com/kalyshev/yan/monitor/model/Monitor.java
Normal file
@ -0,0 +1,53 @@
|
||||
package com.kalyshev.yan.monitor.model;
|
||||
|
||||
import com.kalyshev.yan.computer.model.Computer;
|
||||
import jakarta.persistence.*;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
|
||||
@Entity
|
||||
@Table(name = "monitor")
|
||||
public class Monitor {
|
||||
@Id
|
||||
@GeneratedValue
|
||||
private Long id;
|
||||
private String modelName;
|
||||
|
||||
public Monitor() {
|
||||
}
|
||||
public Monitor(String modelName) {
|
||||
this.modelName = modelName;
|
||||
}
|
||||
|
||||
public Long getId() {
|
||||
return id;
|
||||
}
|
||||
public String getmodelName() {
|
||||
return modelName;
|
||||
}
|
||||
public void setmodelName(String modelName) {
|
||||
this.modelName = modelName;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean equals(Object o) {
|
||||
if (this == o) return true;
|
||||
if (o == null || getClass() != o.getClass()) return false;
|
||||
Monitor computer = (Monitor) o;
|
||||
return Objects.equals(id, computer.id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
return Objects.hash(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "Monitor{" +
|
||||
"id=" + id +
|
||||
", modelName='" + modelName + '\'' +
|
||||
'}';
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,85 @@
|
||||
package com.kalyshev.yan.monitor.service;
|
||||
|
||||
import com.kalyshev.yan.computer.model.Computer;
|
||||
import jakarta.persistence.TypedQuery;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import org.springframework.util.StringUtils;
|
||||
import com.kalyshev.yan.monitor.model.Monitor;
|
||||
|
||||
import jakarta.persistence.EntityManager;
|
||||
import jakarta.persistence.EntityNotFoundException;
|
||||
import jakarta.persistence.PersistenceContext;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
|
||||
@Service
|
||||
public class MonitorService {
|
||||
private static final Logger log = LoggerFactory.getLogger(MonitorService.class);
|
||||
@PersistenceContext
|
||||
private EntityManager em;
|
||||
|
||||
@Transactional
|
||||
public Monitor addMonitor(String modelName) {
|
||||
if (!StringUtils.hasText(modelName)) {
|
||||
throw new IllegalArgumentException("Monitor model name is null or empty");
|
||||
}
|
||||
final Monitor monitor = new Monitor(modelName);
|
||||
em.persist(monitor);
|
||||
return monitor;
|
||||
}
|
||||
|
||||
@Transactional(readOnly = true)
|
||||
public Monitor findMonitor(Long id) {
|
||||
final Monitor monitor = em.find(Monitor.class, id);
|
||||
if (monitor == null) {
|
||||
throw new EntityNotFoundException(String.format("Monitor with id [%s] is not found", id));
|
||||
}
|
||||
return monitor;
|
||||
}
|
||||
|
||||
@Transactional(readOnly = true)
|
||||
public List<Monitor> findAllMonitors() {
|
||||
return em.createQuery("select s from Monitor s", Monitor.class)
|
||||
.getResultList();
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public Monitor updateMonitor(Long id, String modelName) {
|
||||
if (!StringUtils.hasText(modelName)) {
|
||||
throw new IllegalArgumentException("Monitor model name is null or empty");
|
||||
}
|
||||
final Monitor currentMonitor = findMonitor(id);
|
||||
currentMonitor.setmodelName(modelName);
|
||||
return em.merge(currentMonitor);
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public Monitor deleteMonitor(Long id) {
|
||||
final Monitor currentMonitor = findMonitor(id);
|
||||
em.remove(currentMonitor);
|
||||
return currentMonitor;
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public void deleteAllMonitors() {
|
||||
List<Computer> listComps = em.createQuery("select s from Computer s", Computer.class).getResultList();
|
||||
for (int i = 0; i < listComps.size(); i++){
|
||||
listComps.get(i).removeMonitor();
|
||||
}
|
||||
List<Monitor> listMons = em.createQuery("select s from Monitor s", Monitor.class).getResultList();
|
||||
for (int i = 0; i < listMons.size(); i++){
|
||||
deleteMonitor(listMons.get(i).getId());
|
||||
}
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public Computer getComputer(Long id) {
|
||||
Computer computer = em.createQuery("select s from Computer s where s.monitor.id = :id", Computer.class)
|
||||
.setParameter("id", id)
|
||||
.getSingleResult();
|
||||
return computer;
|
||||
}
|
||||
}
|
||||
@ -1 +1,11 @@
|
||||
|
||||
spring.main.banner-mode=off
|
||||
#server.port=8080
|
||||
spring.datasource.url=jdbc:h2:file:./data
|
||||
spring.datasource.driverClassName=org.h2.Driver
|
||||
spring.datasource.username=sa
|
||||
spring.datasource.password=password
|
||||
spring.jpa.database-platform=org.hibernate.dialect.H2Dialect
|
||||
spring.jpa.hibernate.ddl-auto=update
|
||||
spring.h2.console.enabled=true
|
||||
spring.h2.console.settings.trace=false
|
||||
spring.h2.console.settings.web-allow-others=false
|
||||
66
src/test/java/com/kalyshev/yan/JpaCabinetTests.java
Normal file
66
src/test/java/com/kalyshev/yan/JpaCabinetTests.java
Normal file
@ -0,0 +1,66 @@
|
||||
package com.kalyshev.yan;
|
||||
|
||||
import com.kalyshev.yan.cabinet.model.Cabinet;
|
||||
import com.kalyshev.yan.cabinet.service.CabinetService;
|
||||
import com.kalyshev.yan.computer.model.Computer;
|
||||
import com.kalyshev.yan.computer.service.ComputerService;
|
||||
import com.kalyshev.yan.monitor.model.Monitor;
|
||||
import com.kalyshev.yan.monitor.service.MonitorService;
|
||||
import jakarta.persistence.EntityNotFoundException;
|
||||
import org.junit.jupiter.api.Assertions;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.boot.test.context.SpringBootTest;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@SpringBootTest
|
||||
public class JpaCabinetTests {
|
||||
private static final Logger log = LoggerFactory.getLogger(JpaCabinetTests.class);
|
||||
@Autowired
|
||||
private ComputerService computerService;
|
||||
@Autowired
|
||||
private MonitorService monitorService;
|
||||
@Autowired
|
||||
private CabinetService cabinetService;
|
||||
|
||||
@Test
|
||||
void testCabinetCreate() {
|
||||
cabinetService.deleteAllCabinets();
|
||||
final Cabinet cabinet = cabinetService.addCabinet("18");
|
||||
log.info(cabinet.toString());
|
||||
Assertions.assertNotNull(cabinet.getId());
|
||||
}
|
||||
@Test
|
||||
void testCabinetRead() {
|
||||
cabinetService.deleteAllCabinets();
|
||||
final Cabinet cabinet = cabinetService.addCabinet("18");
|
||||
log.info(cabinet.toString());
|
||||
final Cabinet findCabinet = cabinetService.findCabinet(cabinet.getId());
|
||||
log.info(findCabinet.toString());
|
||||
Assertions.assertEquals(cabinet, findCabinet);
|
||||
}
|
||||
@Test
|
||||
void testCabinetReadNotFound() {
|
||||
cabinetService.deleteAllCabinets();
|
||||
Assertions.assertThrows(EntityNotFoundException.class, () -> cabinetService.findCabinet(-1L));
|
||||
}
|
||||
@Test
|
||||
void testCabinetReadAll() {
|
||||
cabinetService.deleteAllCabinets();
|
||||
cabinetService.addCabinet("18");
|
||||
cabinetService.addCabinet("19");
|
||||
final List<Cabinet> cabinets = cabinetService.findAllCabinets();
|
||||
log.info(cabinets.toString());
|
||||
Assertions.assertEquals(cabinets.size(), 2);
|
||||
}
|
||||
@Test
|
||||
void testComputerReadAllEmpty() {
|
||||
cabinetService.deleteAllCabinets();
|
||||
final List<Cabinet> cabinets = cabinetService.findAllCabinets();
|
||||
log.info(cabinets.toString());
|
||||
Assertions.assertEquals(cabinets.size(), 0);
|
||||
}
|
||||
}
|
||||
85
src/test/java/com/kalyshev/yan/JpaComputerCabinetTests.java
Normal file
85
src/test/java/com/kalyshev/yan/JpaComputerCabinetTests.java
Normal file
@ -0,0 +1,85 @@
|
||||
package com.kalyshev.yan;
|
||||
|
||||
import com.kalyshev.yan.cabinet.model.Cabinet;
|
||||
import com.kalyshev.yan.cabinet.service.CabinetService;
|
||||
import com.kalyshev.yan.computer.model.Computer;
|
||||
import com.kalyshev.yan.computer.service.ComputerService;
|
||||
import com.kalyshev.yan.monitor.model.Monitor;
|
||||
import com.kalyshev.yan.monitor.service.MonitorService;
|
||||
import org.junit.jupiter.api.Assertions;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.boot.test.context.SpringBootTest;
|
||||
|
||||
@SpringBootTest
|
||||
public class JpaComputerCabinetTests {
|
||||
private static final Logger log = LoggerFactory.getLogger(JpaCabinetTests.class);
|
||||
@Autowired
|
||||
private ComputerService computerService;
|
||||
@Autowired
|
||||
private MonitorService monitorService;
|
||||
@Autowired
|
||||
private CabinetService cabinetService;
|
||||
|
||||
@Test
|
||||
void testCabinetAddOneToMany() {
|
||||
cabinetService.deleteAllCabinets();
|
||||
computerService.deleteAllComputers();
|
||||
monitorService.deleteAllMonitors();
|
||||
final Cabinet cabinet = cabinetService.addCabinet("18");
|
||||
final Monitor monitor = monitorService.addMonitor("Asus");
|
||||
final Computer computer = computerService.addComputer("PC", "78457h", monitor.getId(), null);
|
||||
cabinet.addComputer(computer);
|
||||
log.info(cabinet.toString());
|
||||
log.info(computer.toString());
|
||||
Assertions.assertEquals(cabinet.getComputers().get(0).getserialNum(), computer.getserialNum());
|
||||
}
|
||||
|
||||
@Test
|
||||
void testCabinetDeleteOneToMany() {
|
||||
cabinetService.deleteAllCabinets();
|
||||
computerService.deleteAllComputers();
|
||||
monitorService.deleteAllMonitors();
|
||||
final Cabinet cabinet = cabinetService.addCabinet("18");
|
||||
final Monitor monitor = monitorService.addMonitor("Asus");
|
||||
final Computer computer = computerService.addComputer("PC", "78457h", monitor.getId(), null);
|
||||
cabinet.addComputer(computer);
|
||||
log.info(cabinet.toString());
|
||||
log.info(computer.toString());
|
||||
Assertions.assertEquals(cabinet.getComputers().get(0).getserialNum(), computer.getserialNum());
|
||||
cabinet.removeComputer(computer);
|
||||
Assertions.assertEquals(cabinet.getComputers().size(), 0);
|
||||
}
|
||||
|
||||
@Test
|
||||
void testComputerAddManyToMany() {
|
||||
cabinetService.deleteAllCabinets();
|
||||
computerService.deleteAllComputers();
|
||||
monitorService.deleteAllMonitors();
|
||||
final Cabinet cabinet = cabinetService.addCabinet("18");
|
||||
final Monitor monitor = monitorService.addMonitor("Asus");
|
||||
final Computer computer = computerService.addComputer("PC", "78457h", monitor.getId(), null);
|
||||
computer.setCabinet(cabinet);
|
||||
log.info(cabinet.toString());
|
||||
log.info(computer.toString());
|
||||
Assertions.assertEquals(computer.getCabinet().getnumber(), cabinet.getnumber());
|
||||
}
|
||||
|
||||
@Test
|
||||
void testComputerDeleteManyToMany() {
|
||||
cabinetService.deleteAllCabinets();
|
||||
computerService.deleteAllComputers();
|
||||
monitorService.deleteAllMonitors();
|
||||
final Cabinet cabinet = cabinetService.addCabinet("18");
|
||||
final Monitor monitor = monitorService.addMonitor("Asus");
|
||||
final Computer computer = computerService.addComputer("PC", "78457h", monitor.getId(), null);
|
||||
computer.setCabinet(cabinet);
|
||||
log.info(cabinet.toString());
|
||||
log.info(computer.toString());
|
||||
Assertions.assertEquals(computer.getCabinet().getnumber(), cabinet.getnumber());
|
||||
computer.setCabinet(null);
|
||||
Assertions.assertNull(computer.getCabinet());
|
||||
}
|
||||
}
|
||||
88
src/test/java/com/kalyshev/yan/JpaComputerTests.java
Normal file
88
src/test/java/com/kalyshev/yan/JpaComputerTests.java
Normal file
@ -0,0 +1,88 @@
|
||||
package com.kalyshev.yan;
|
||||
|
||||
import com.kalyshev.yan.cabinet.model.Cabinet;
|
||||
import com.kalyshev.yan.cabinet.service.CabinetService;
|
||||
import com.kalyshev.yan.computer.model.Computer;
|
||||
import com.kalyshev.yan.computer.service.ComputerService;
|
||||
import com.kalyshev.yan.monitor.model.Monitor;
|
||||
import com.kalyshev.yan.monitor.service.MonitorService;
|
||||
import jakarta.persistence.EntityNotFoundException;
|
||||
import org.junit.jupiter.api.Assertions;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.boot.test.context.SpringBootTest;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@SpringBootTest
|
||||
public class JpaComputerTests {
|
||||
private static final Logger log = LoggerFactory.getLogger(JpaComputerTests.class);
|
||||
@Autowired
|
||||
private ComputerService computerService;
|
||||
@Autowired
|
||||
private MonitorService monitorService;
|
||||
@Autowired
|
||||
private CabinetService cabinetService;
|
||||
|
||||
@Test
|
||||
void testComputerPartialCreate() {
|
||||
computerService.deleteAllComputers();
|
||||
final Monitor monitor = monitorService.addMonitor("Asus");
|
||||
final Computer computer = computerService.addComputer("Computer", "w7894572", monitor.getId(), null);
|
||||
log.info(computer.toString());
|
||||
Assertions.assertNotNull(computer.getId());
|
||||
Assertions.assertNull(computer.getCabinet());
|
||||
}
|
||||
@Test
|
||||
void testComputerFullCreate() {
|
||||
computerService.deleteAllComputers();
|
||||
final Monitor monitor = monitorService.addMonitor("Asus");
|
||||
final Cabinet cabinet = cabinetService.addCabinet("18a");
|
||||
final Computer computer = computerService.addComputer("Computer", "w7894572", monitor.getId(), cabinet.getId());
|
||||
log.info(computer.toString());
|
||||
Assertions.assertNotNull(computer.getId());
|
||||
Assertions.assertEquals(cabinet, computer.getCabinet());
|
||||
}
|
||||
@Test
|
||||
void testComputerDelete() {
|
||||
computerService.deleteAllComputers();
|
||||
final Monitor monitor = monitorService.addMonitor("Asus");
|
||||
final Computer computer = computerService.addComputer("Computer", "w7894572", null, null);
|
||||
log.info(computer.toString());
|
||||
computerService.deleteComputer(computer.getId());
|
||||
Assertions.assertThrows(EntityNotFoundException.class, () -> computerService.findComputer(computer.getId()));
|
||||
}
|
||||
@Test
|
||||
void testComputerRead() {
|
||||
computerService.deleteAllComputers();
|
||||
final Computer computer = computerService.addComputer("Computer", "w7894572", null, null);
|
||||
log.info(computer.toString());
|
||||
final Computer findComputer = computerService.findComputer(computer.getId());
|
||||
log.info(findComputer.toString());
|
||||
Assertions.assertEquals(computer, findComputer);
|
||||
}
|
||||
@Test
|
||||
void testComputerReadNotFound() {
|
||||
computerService.deleteAllComputers();
|
||||
Assertions.assertThrows(EntityNotFoundException.class, () -> computerService.findComputer(-1L));
|
||||
}
|
||||
@Test
|
||||
void testComputerReadAll() {
|
||||
computerService.deleteAllComputers();
|
||||
final Monitor monitor = monitorService.addMonitor("Asus");
|
||||
computerService.addComputer("Computer", "w7894572", null, null);
|
||||
computerService.addComputer("Another comp", "3453s", null, null);
|
||||
final List<Computer> computers = computerService.findAllComputers();
|
||||
log.info(computers.toString());
|
||||
Assertions.assertEquals(computers.size(), 2);
|
||||
}
|
||||
@Test
|
||||
void testComputerReadAllEmpty() {
|
||||
computerService.deleteAllComputers();
|
||||
final List<Computer> computers = computerService.findAllComputers();
|
||||
log.info(computers.toString());
|
||||
Assertions.assertEquals(computers.size(), 0);
|
||||
}
|
||||
}
|
||||
80
src/test/java/com/kalyshev/yan/JpaMonitorTests.java
Normal file
80
src/test/java/com/kalyshev/yan/JpaMonitorTests.java
Normal file
@ -0,0 +1,80 @@
|
||||
package com.kalyshev.yan;
|
||||
|
||||
import com.kalyshev.yan.cabinet.service.CabinetService;
|
||||
import com.kalyshev.yan.computer.model.Computer;
|
||||
import com.kalyshev.yan.computer.service.ComputerService;
|
||||
import com.kalyshev.yan.monitor.model.Monitor;
|
||||
import com.kalyshev.yan.monitor.service.MonitorService;
|
||||
import jakarta.persistence.EntityNotFoundException;
|
||||
import org.junit.jupiter.api.Assertions;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.junit.jupiter.api.function.Executable;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.boot.test.context.SpringBootTest;
|
||||
|
||||
import java.util.List;
|
||||
@SpringBootTest
|
||||
public class JpaMonitorTests {
|
||||
private static final Logger log = LoggerFactory.getLogger(JpaMonitorTests.class);
|
||||
@Autowired
|
||||
private MonitorService monitorService;
|
||||
@Autowired
|
||||
private ComputerService computerService;
|
||||
@Test
|
||||
void testMonitorCreate() {
|
||||
monitorService.deleteAllMonitors();
|
||||
final Monitor monitor = monitorService.addMonitor("Asus");
|
||||
log.info(monitor.toString());
|
||||
Assertions.assertNotNull(monitor.getId());
|
||||
}
|
||||
@Test
|
||||
void testMonitorRead() {
|
||||
monitorService.deleteAllMonitors();
|
||||
final Monitor monitor = monitorService.addMonitor("Asus");
|
||||
log.info(monitor.toString());
|
||||
final Monitor findMonitor = monitorService.findMonitor(monitor.getId());
|
||||
log.info(findMonitor.toString());
|
||||
Assertions.assertEquals(monitor, findMonitor);
|
||||
}
|
||||
@Test
|
||||
void testMonitorDelete() {
|
||||
monitorService.deleteAllMonitors();
|
||||
final Monitor monitor = monitorService.addMonitor("Asus");
|
||||
log.info(monitor.toString());
|
||||
monitorService.deleteMonitor(monitor.getId());
|
||||
Assertions.assertThrows(EntityNotFoundException.class, () -> monitorService.findMonitor(monitor.getId()));
|
||||
}
|
||||
@Test
|
||||
void testMonitorReadNotFound() {
|
||||
monitorService.deleteAllMonitors();
|
||||
Assertions.assertThrows(EntityNotFoundException.class, () -> monitorService.findMonitor(-1L));
|
||||
}
|
||||
@Test
|
||||
void testMonitorReadAll() {
|
||||
monitorService.deleteAllMonitors();
|
||||
monitorService.addMonitor("Asus");
|
||||
monitorService.addMonitor("HP");
|
||||
final List<Monitor> monitors = monitorService.findAllMonitors();
|
||||
log.info(monitors.toString());
|
||||
Assertions.assertEquals(monitors.size(), 2);
|
||||
}
|
||||
@Test
|
||||
void testMonitorReadAllEmpty() {
|
||||
monitorService.deleteAllMonitors();
|
||||
final List<Monitor> monitors = monitorService.findAllMonitors();
|
||||
log.info(monitors.toString());
|
||||
Assertions.assertEquals(monitors.size(), 0);
|
||||
}
|
||||
@Test
|
||||
void testMonitorGetComputer() {
|
||||
monitorService.deleteAllMonitors();
|
||||
computerService.deleteAllComputers();
|
||||
Monitor monitor = monitorService.addMonitor("Asus");
|
||||
Computer computer = computerService.addComputer("Model", "6sfv4", monitor.getId(), null);
|
||||
log.info(computer.toString());
|
||||
Computer fetchedComputer = monitorService.getComputer(monitor.getId());
|
||||
Assertions.assertEquals(computer, fetchedComputer);
|
||||
}
|
||||
}
|
||||
@ -1,13 +0,0 @@
|
||||
package com.kalyshev.yan;
|
||||
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.springframework.boot.test.context.SpringBootTest;
|
||||
|
||||
@SpringBootTest
|
||||
class YanApplicationTests {
|
||||
|
||||
@Test
|
||||
void contextLoads() {
|
||||
}
|
||||
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user