diff --git a/.gradle/8.5/checksums/checksums.lock b/.gradle/8.5/checksums/checksums.lock new file mode 100644 index 0000000..027f156 Binary files /dev/null and b/.gradle/8.5/checksums/checksums.lock differ diff --git a/.gradle/8.5/checksums/sha1-checksums.bin b/.gradle/8.5/checksums/sha1-checksums.bin new file mode 100644 index 0000000..a703c8c Binary files /dev/null and b/.gradle/8.5/checksums/sha1-checksums.bin differ diff --git a/.gradle/8.5/dependencies-accessors/dependencies-accessors.lock b/.gradle/8.5/dependencies-accessors/dependencies-accessors.lock new file mode 100644 index 0000000..3a889e7 Binary files /dev/null and b/.gradle/8.5/dependencies-accessors/dependencies-accessors.lock differ diff --git a/.gradle/8.5/dependencies-accessors/gc.properties b/.gradle/8.5/dependencies-accessors/gc.properties new file mode 100644 index 0000000..e69de29 diff --git a/.gradle/8.5/executionHistory/executionHistory.bin b/.gradle/8.5/executionHistory/executionHistory.bin new file mode 100644 index 0000000..473fd4f Binary files /dev/null and b/.gradle/8.5/executionHistory/executionHistory.bin differ diff --git a/.gradle/8.5/executionHistory/executionHistory.lock b/.gradle/8.5/executionHistory/executionHistory.lock new file mode 100644 index 0000000..9899111 Binary files /dev/null and b/.gradle/8.5/executionHistory/executionHistory.lock differ diff --git a/.gradle/8.5/fileChanges/last-build.bin b/.gradle/8.5/fileChanges/last-build.bin new file mode 100644 index 0000000..f76dd23 Binary files /dev/null and b/.gradle/8.5/fileChanges/last-build.bin differ diff --git a/.gradle/8.5/fileHashes/fileHashes.bin b/.gradle/8.5/fileHashes/fileHashes.bin new file mode 100644 index 0000000..a42e5c6 Binary files /dev/null and b/.gradle/8.5/fileHashes/fileHashes.bin differ diff --git a/.gradle/8.5/fileHashes/fileHashes.lock b/.gradle/8.5/fileHashes/fileHashes.lock new file mode 100644 index 0000000..bd92cc4 Binary files /dev/null and b/.gradle/8.5/fileHashes/fileHashes.lock differ diff --git a/.gradle/8.5/fileHashes/resourceHashesCache.bin b/.gradle/8.5/fileHashes/resourceHashesCache.bin new file mode 100644 index 0000000..d8446d8 Binary files /dev/null and b/.gradle/8.5/fileHashes/resourceHashesCache.bin differ diff --git a/.gradle/8.5/gc.properties b/.gradle/8.5/gc.properties new file mode 100644 index 0000000..e69de29 diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock new file mode 100644 index 0000000..dbde567 Binary files /dev/null and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/.gradle/buildOutputCleanup/cache.properties b/.gradle/buildOutputCleanup/cache.properties new file mode 100644 index 0000000..724155b --- /dev/null +++ b/.gradle/buildOutputCleanup/cache.properties @@ -0,0 +1,2 @@ +#Fri Apr 26 13:56:55 GMT+04:00 2024 +gradle.version=8.5 diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin new file mode 100644 index 0000000..0c10862 Binary files /dev/null and b/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/.gradle/file-system.probe b/.gradle/file-system.probe new file mode 100644 index 0000000..fafdde4 Binary files /dev/null and b/.gradle/file-system.probe differ diff --git a/.gradle/vcs-1/gc.properties b/.gradle/vcs-1/gc.properties new file mode 100644 index 0000000..e69de29 diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000..8b7fb54 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,24 @@ +{ + "configurations": [ + { + "type": "java", + "name": "Spring Boot-DemoApplication", + "request": "launch", + "cwd": "${workspaceFolder}", + "mainClass": "com.example.demo.DemoApplication", + "projectName": "demo", + "args": "", + "envFile": "${workspaceFolder}/.env" + }, + { + "type": "java", + "name": "Spring Boot-DemoApplication", + "request": "launch", + "cwd": "${workspaceFolder}", + "mainClass": "com.example.demo.DemoApplication", + "projectName": "Pibd-21_Alekseev_I.S._Internet_Programming_Backend", + "args": "", + "envFile": "${workspaceFolder}/.env" + } + ] +} \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..7b016a8 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "java.compile.nullAnalysis.mode": "automatic" +} \ No newline at end of file diff --git a/bin/main/application.properties b/bin/main/application.properties new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/bin/main/application.properties @@ -0,0 +1 @@ + diff --git a/bin/main/com/example/demo/DemoApplication.class b/bin/main/com/example/demo/DemoApplication.class new file mode 100644 index 0000000..7fbc5de Binary files /dev/null and b/bin/main/com/example/demo/DemoApplication.class differ diff --git a/bin/main/com/example/demo/comments/api/CommentController.class b/bin/main/com/example/demo/comments/api/CommentController.class new file mode 100644 index 0000000..dc26edc Binary files /dev/null and b/bin/main/com/example/demo/comments/api/CommentController.class differ diff --git a/bin/main/com/example/demo/comments/api/CommentDto.class b/bin/main/com/example/demo/comments/api/CommentDto.class new file mode 100644 index 0000000..b7f0041 Binary files /dev/null and b/bin/main/com/example/demo/comments/api/CommentDto.class differ diff --git a/bin/main/com/example/demo/comments/model/CommentEntity.class b/bin/main/com/example/demo/comments/model/CommentEntity.class new file mode 100644 index 0000000..1724062 Binary files /dev/null and b/bin/main/com/example/demo/comments/model/CommentEntity.class differ diff --git a/bin/main/com/example/demo/comments/repository/CommentRepository.class b/bin/main/com/example/demo/comments/repository/CommentRepository.class new file mode 100644 index 0000000..e7e629a Binary files /dev/null and b/bin/main/com/example/demo/comments/repository/CommentRepository.class differ diff --git a/bin/main/com/example/demo/comments/service/CommentService.class b/bin/main/com/example/demo/comments/service/CommentService.class new file mode 100644 index 0000000..0951fa4 Binary files /dev/null and b/bin/main/com/example/demo/comments/service/CommentService.class differ diff --git a/bin/main/com/example/demo/core/configuration/Constants.class b/bin/main/com/example/demo/core/configuration/Constants.class new file mode 100644 index 0000000..6bed80e Binary files /dev/null and b/bin/main/com/example/demo/core/configuration/Constants.class differ diff --git a/bin/main/com/example/demo/core/configuration/MapperConfiguration.class b/bin/main/com/example/demo/core/configuration/MapperConfiguration.class new file mode 100644 index 0000000..5204601 Binary files /dev/null and b/bin/main/com/example/demo/core/configuration/MapperConfiguration.class differ diff --git a/bin/main/com/example/demo/core/configuration/WebConfiguration.class b/bin/main/com/example/demo/core/configuration/WebConfiguration.class new file mode 100644 index 0000000..bbe56ed Binary files /dev/null and b/bin/main/com/example/demo/core/configuration/WebConfiguration.class differ diff --git a/bin/main/com/example/demo/core/error/NotFoundException.class b/bin/main/com/example/demo/core/error/NotFoundException.class new file mode 100644 index 0000000..7b89f8e Binary files /dev/null and b/bin/main/com/example/demo/core/error/NotFoundException.class differ diff --git a/bin/main/com/example/demo/core/model/BaseEntity.class b/bin/main/com/example/demo/core/model/BaseEntity.class new file mode 100644 index 0000000..212a0c4 Binary files /dev/null and b/bin/main/com/example/demo/core/model/BaseEntity.class differ diff --git a/bin/main/com/example/demo/core/repository/CommonRepository.class b/bin/main/com/example/demo/core/repository/CommonRepository.class new file mode 100644 index 0000000..533d503 Binary files /dev/null and b/bin/main/com/example/demo/core/repository/CommonRepository.class differ diff --git a/bin/main/com/example/demo/core/repository/MapRepository.class b/bin/main/com/example/demo/core/repository/MapRepository.class new file mode 100644 index 0000000..c2ac286 Binary files /dev/null and b/bin/main/com/example/demo/core/repository/MapRepository.class differ diff --git a/bin/main/com/example/demo/houses/api/HouseController.class b/bin/main/com/example/demo/houses/api/HouseController.class new file mode 100644 index 0000000..218cdac Binary files /dev/null and b/bin/main/com/example/demo/houses/api/HouseController.class differ diff --git a/bin/main/com/example/demo/houses/api/HouseDto.class b/bin/main/com/example/demo/houses/api/HouseDto.class new file mode 100644 index 0000000..7fd6d73 Binary files /dev/null and b/bin/main/com/example/demo/houses/api/HouseDto.class differ diff --git a/bin/main/com/example/demo/houses/api/PropertyStatus.class b/bin/main/com/example/demo/houses/api/PropertyStatus.class new file mode 100644 index 0000000..ea04f97 Binary files /dev/null and b/bin/main/com/example/demo/houses/api/PropertyStatus.class differ diff --git a/bin/main/com/example/demo/houses/model/HouseEntity.class b/bin/main/com/example/demo/houses/model/HouseEntity.class new file mode 100644 index 0000000..9378eda Binary files /dev/null and b/bin/main/com/example/demo/houses/model/HouseEntity.class differ diff --git a/bin/main/com/example/demo/houses/repository/HouseRepository.class b/bin/main/com/example/demo/houses/repository/HouseRepository.class new file mode 100644 index 0000000..d0ae485 Binary files /dev/null and b/bin/main/com/example/demo/houses/repository/HouseRepository.class differ diff --git a/bin/main/com/example/demo/houses/service/HouseService.class b/bin/main/com/example/demo/houses/service/HouseService.class new file mode 100644 index 0000000..4f02ee6 Binary files /dev/null and b/bin/main/com/example/demo/houses/service/HouseService.class differ diff --git a/bin/main/com/example/demo/materials/api/MaterialContoller.class b/bin/main/com/example/demo/materials/api/MaterialContoller.class new file mode 100644 index 0000000..12daae9 Binary files /dev/null and b/bin/main/com/example/demo/materials/api/MaterialContoller.class differ diff --git a/bin/main/com/example/demo/materials/api/MaterialDto.class b/bin/main/com/example/demo/materials/api/MaterialDto.class new file mode 100644 index 0000000..26b2aa4 Binary files /dev/null and b/bin/main/com/example/demo/materials/api/MaterialDto.class differ diff --git a/bin/main/com/example/demo/materials/model/MaterialEntity.class b/bin/main/com/example/demo/materials/model/MaterialEntity.class new file mode 100644 index 0000000..659c560 Binary files /dev/null and b/bin/main/com/example/demo/materials/model/MaterialEntity.class differ diff --git a/bin/main/com/example/demo/materials/repository/MaterialRepository.class b/bin/main/com/example/demo/materials/repository/MaterialRepository.class new file mode 100644 index 0000000..6c25978 Binary files /dev/null and b/bin/main/com/example/demo/materials/repository/MaterialRepository.class differ diff --git a/bin/main/com/example/demo/materials/service/MaterialService.class b/bin/main/com/example/demo/materials/service/MaterialService.class new file mode 100644 index 0000000..983978d Binary files /dev/null and b/bin/main/com/example/demo/materials/service/MaterialService.class differ diff --git a/bin/main/com/example/demo/speaker/api/SpeakerController.class b/bin/main/com/example/demo/speaker/api/SpeakerController.class new file mode 100644 index 0000000..e9919c6 Binary files /dev/null and b/bin/main/com/example/demo/speaker/api/SpeakerController.class differ diff --git a/bin/main/com/example/demo/speaker/configuration/SpeakerConfiguration.class b/bin/main/com/example/demo/speaker/configuration/SpeakerConfiguration.class new file mode 100644 index 0000000..f06043f Binary files /dev/null and b/bin/main/com/example/demo/speaker/configuration/SpeakerConfiguration.class differ diff --git a/bin/main/com/example/demo/speaker/domain/Speaker.class b/bin/main/com/example/demo/speaker/domain/Speaker.class new file mode 100644 index 0000000..d3c4c60 Binary files /dev/null and b/bin/main/com/example/demo/speaker/domain/Speaker.class differ diff --git a/bin/main/com/example/demo/speaker/domain/SpeakerDeu.class b/bin/main/com/example/demo/speaker/domain/SpeakerDeu.class new file mode 100644 index 0000000..92fa2a3 Binary files /dev/null and b/bin/main/com/example/demo/speaker/domain/SpeakerDeu.class differ diff --git a/bin/main/com/example/demo/speaker/domain/SpeakerEng.class b/bin/main/com/example/demo/speaker/domain/SpeakerEng.class new file mode 100644 index 0000000..711ef87 Binary files /dev/null and b/bin/main/com/example/demo/speaker/domain/SpeakerEng.class differ diff --git a/bin/main/com/example/demo/speaker/domain/SpeakerRus.class b/bin/main/com/example/demo/speaker/domain/SpeakerRus.class new file mode 100644 index 0000000..7129f51 Binary files /dev/null and b/bin/main/com/example/demo/speaker/domain/SpeakerRus.class differ diff --git a/bin/main/com/example/demo/speaker/service/SpeakerService.class b/bin/main/com/example/demo/speaker/service/SpeakerService.class new file mode 100644 index 0000000..9a373b5 Binary files /dev/null and b/bin/main/com/example/demo/speaker/service/SpeakerService.class differ diff --git a/bin/main/com/example/demo/types/api/TypeController.class b/bin/main/com/example/demo/types/api/TypeController.class new file mode 100644 index 0000000..6e99665 Binary files /dev/null and b/bin/main/com/example/demo/types/api/TypeController.class differ diff --git a/bin/main/com/example/demo/types/api/TypeDto.class b/bin/main/com/example/demo/types/api/TypeDto.class new file mode 100644 index 0000000..1c0c584 Binary files /dev/null and b/bin/main/com/example/demo/types/api/TypeDto.class differ diff --git a/bin/main/com/example/demo/types/model/TypeEntity.class b/bin/main/com/example/demo/types/model/TypeEntity.class new file mode 100644 index 0000000..b7b3a49 Binary files /dev/null and b/bin/main/com/example/demo/types/model/TypeEntity.class differ diff --git a/bin/main/com/example/demo/types/repository/TypeRepository.class b/bin/main/com/example/demo/types/repository/TypeRepository.class new file mode 100644 index 0000000..89e818b Binary files /dev/null and b/bin/main/com/example/demo/types/repository/TypeRepository.class differ diff --git a/bin/main/com/example/demo/types/service/TypeService.class b/bin/main/com/example/demo/types/service/TypeService.class new file mode 100644 index 0000000..b6e51ec Binary files /dev/null and b/bin/main/com/example/demo/types/service/TypeService.class differ diff --git a/bin/main/com/example/demo/users/api/UserController.class b/bin/main/com/example/demo/users/api/UserController.class new file mode 100644 index 0000000..29a7b10 Binary files /dev/null and b/bin/main/com/example/demo/users/api/UserController.class differ diff --git a/bin/main/com/example/demo/users/api/UserDto.class b/bin/main/com/example/demo/users/api/UserDto.class new file mode 100644 index 0000000..35fd55b Binary files /dev/null and b/bin/main/com/example/demo/users/api/UserDto.class differ diff --git a/bin/main/com/example/demo/users/model/UserEntity.class b/bin/main/com/example/demo/users/model/UserEntity.class new file mode 100644 index 0000000..3e13ce2 Binary files /dev/null and b/bin/main/com/example/demo/users/model/UserEntity.class differ diff --git a/bin/main/com/example/demo/users/repository/UserRepository.class b/bin/main/com/example/demo/users/repository/UserRepository.class new file mode 100644 index 0000000..5f2bc4e Binary files /dev/null and b/bin/main/com/example/demo/users/repository/UserRepository.class differ diff --git a/bin/main/com/example/demo/users/service/UserService.class b/bin/main/com/example/demo/users/service/UserService.class new file mode 100644 index 0000000..66d69b2 Binary files /dev/null and b/bin/main/com/example/demo/users/service/UserService.class differ diff --git a/bin/test/com/example/demo/CommentServiceTests.class b/bin/test/com/example/demo/CommentServiceTests.class new file mode 100644 index 0000000..7336e9e Binary files /dev/null and b/bin/test/com/example/demo/CommentServiceTests.class differ diff --git a/bin/test/com/example/demo/HouseServiceTests.class b/bin/test/com/example/demo/HouseServiceTests.class new file mode 100644 index 0000000..ccba01f Binary files /dev/null and b/bin/test/com/example/demo/HouseServiceTests.class differ diff --git a/bin/test/com/example/demo/MaterialServiceTests.class b/bin/test/com/example/demo/MaterialServiceTests.class new file mode 100644 index 0000000..5dd3a42 Binary files /dev/null and b/bin/test/com/example/demo/MaterialServiceTests.class differ diff --git a/bin/test/com/example/demo/SpeakerSrviceTests.class b/bin/test/com/example/demo/SpeakerSrviceTests.class new file mode 100644 index 0000000..d4a4d2e Binary files /dev/null and b/bin/test/com/example/demo/SpeakerSrviceTests.class differ diff --git a/bin/test/com/example/demo/TypeServiceTests.class b/bin/test/com/example/demo/TypeServiceTests.class new file mode 100644 index 0000000..a6eed39 Binary files /dev/null and b/bin/test/com/example/demo/TypeServiceTests.class differ diff --git a/bin/test/com/example/demo/UserServiceTests.class b/bin/test/com/example/demo/UserServiceTests.class new file mode 100644 index 0000000..e25b5bb Binary files /dev/null and b/bin/test/com/example/demo/UserServiceTests.class differ diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..b7867b9 --- /dev/null +++ b/build.gradle @@ -0,0 +1,28 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '3.2.3' + id 'io.spring.dependency-management' version '1.1.4' +} + +group = 'com.example' +version = '0.0.1-SNAPSHOT' + +java { + sourceCompatibility = '17' +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-web' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' + implementation 'org.modelmapper:modelmapper:3.2.0' + + testImplementation 'org.springframework.boot:spring-boot-starter-test' +} + +tasks.named('test') { + useJUnitPlatform() +} diff --git a/build/classes/java/main/com/example/demo/DemoApplication.class b/build/classes/java/main/com/example/demo/DemoApplication.class new file mode 100644 index 0000000..9580a81 Binary files /dev/null and b/build/classes/java/main/com/example/demo/DemoApplication.class differ diff --git a/build/classes/java/main/com/example/demo/comments/api/CommentController.class b/build/classes/java/main/com/example/demo/comments/api/CommentController.class new file mode 100644 index 0000000..bb6619c Binary files /dev/null and b/build/classes/java/main/com/example/demo/comments/api/CommentController.class differ diff --git a/build/classes/java/main/com/example/demo/comments/api/CommentDto.class b/build/classes/java/main/com/example/demo/comments/api/CommentDto.class new file mode 100644 index 0000000..c2c8e7e Binary files /dev/null and b/build/classes/java/main/com/example/demo/comments/api/CommentDto.class differ diff --git a/build/classes/java/main/com/example/demo/comments/model/CommentEntity.class b/build/classes/java/main/com/example/demo/comments/model/CommentEntity.class new file mode 100644 index 0000000..11a3b4c Binary files /dev/null and b/build/classes/java/main/com/example/demo/comments/model/CommentEntity.class differ diff --git a/build/classes/java/main/com/example/demo/comments/repository/CommentRepository.class b/build/classes/java/main/com/example/demo/comments/repository/CommentRepository.class new file mode 100644 index 0000000..a097f4d Binary files /dev/null and b/build/classes/java/main/com/example/demo/comments/repository/CommentRepository.class differ diff --git a/build/classes/java/main/com/example/demo/comments/service/CommentService.class b/build/classes/java/main/com/example/demo/comments/service/CommentService.class new file mode 100644 index 0000000..885e16b Binary files /dev/null and b/build/classes/java/main/com/example/demo/comments/service/CommentService.class differ diff --git a/build/classes/java/main/com/example/demo/core/configuration/Constants.class b/build/classes/java/main/com/example/demo/core/configuration/Constants.class new file mode 100644 index 0000000..951e204 Binary files /dev/null and b/build/classes/java/main/com/example/demo/core/configuration/Constants.class differ diff --git a/build/classes/java/main/com/example/demo/core/configuration/MapperConfiguration.class b/build/classes/java/main/com/example/demo/core/configuration/MapperConfiguration.class new file mode 100644 index 0000000..11aa632 Binary files /dev/null and b/build/classes/java/main/com/example/demo/core/configuration/MapperConfiguration.class differ diff --git a/build/classes/java/main/com/example/demo/core/configuration/WebConfiguration.class b/build/classes/java/main/com/example/demo/core/configuration/WebConfiguration.class new file mode 100644 index 0000000..fcf79f2 Binary files /dev/null and b/build/classes/java/main/com/example/demo/core/configuration/WebConfiguration.class differ diff --git a/build/classes/java/main/com/example/demo/core/error/NotFoundException.class b/build/classes/java/main/com/example/demo/core/error/NotFoundException.class new file mode 100644 index 0000000..5735c07 Binary files /dev/null and b/build/classes/java/main/com/example/demo/core/error/NotFoundException.class differ diff --git a/build/classes/java/main/com/example/demo/core/model/BaseEntity.class b/build/classes/java/main/com/example/demo/core/model/BaseEntity.class new file mode 100644 index 0000000..a38a632 Binary files /dev/null and b/build/classes/java/main/com/example/demo/core/model/BaseEntity.class differ diff --git a/build/classes/java/main/com/example/demo/core/repository/CommonRepository.class b/build/classes/java/main/com/example/demo/core/repository/CommonRepository.class new file mode 100644 index 0000000..ea33307 Binary files /dev/null and b/build/classes/java/main/com/example/demo/core/repository/CommonRepository.class differ diff --git a/build/classes/java/main/com/example/demo/core/repository/MapRepository.class b/build/classes/java/main/com/example/demo/core/repository/MapRepository.class new file mode 100644 index 0000000..bb3a39e Binary files /dev/null and b/build/classes/java/main/com/example/demo/core/repository/MapRepository.class differ diff --git a/build/classes/java/main/com/example/demo/houses/api/HouseController.class b/build/classes/java/main/com/example/demo/houses/api/HouseController.class new file mode 100644 index 0000000..8e245da Binary files /dev/null and b/build/classes/java/main/com/example/demo/houses/api/HouseController.class differ diff --git a/build/classes/java/main/com/example/demo/houses/api/HouseDto.class b/build/classes/java/main/com/example/demo/houses/api/HouseDto.class new file mode 100644 index 0000000..87fc5bf Binary files /dev/null and b/build/classes/java/main/com/example/demo/houses/api/HouseDto.class differ diff --git a/build/classes/java/main/com/example/demo/houses/api/PropertyStatus.class b/build/classes/java/main/com/example/demo/houses/api/PropertyStatus.class new file mode 100644 index 0000000..78fe0fe Binary files /dev/null and b/build/classes/java/main/com/example/demo/houses/api/PropertyStatus.class differ diff --git a/build/classes/java/main/com/example/demo/houses/model/HouseEntity.class b/build/classes/java/main/com/example/demo/houses/model/HouseEntity.class new file mode 100644 index 0000000..b4c75bb Binary files /dev/null and b/build/classes/java/main/com/example/demo/houses/model/HouseEntity.class differ diff --git a/build/classes/java/main/com/example/demo/houses/repository/HouseRepository.class b/build/classes/java/main/com/example/demo/houses/repository/HouseRepository.class new file mode 100644 index 0000000..d8e15f0 Binary files /dev/null and b/build/classes/java/main/com/example/demo/houses/repository/HouseRepository.class differ diff --git a/build/classes/java/main/com/example/demo/houses/service/HouseService.class b/build/classes/java/main/com/example/demo/houses/service/HouseService.class new file mode 100644 index 0000000..671c4f3 Binary files /dev/null and b/build/classes/java/main/com/example/demo/houses/service/HouseService.class differ diff --git a/build/classes/java/main/com/example/demo/materials/api/MaterialContoller.class b/build/classes/java/main/com/example/demo/materials/api/MaterialContoller.class new file mode 100644 index 0000000..585e385 Binary files /dev/null and b/build/classes/java/main/com/example/demo/materials/api/MaterialContoller.class differ diff --git a/build/classes/java/main/com/example/demo/materials/api/MaterialDto.class b/build/classes/java/main/com/example/demo/materials/api/MaterialDto.class new file mode 100644 index 0000000..6e657ed Binary files /dev/null and b/build/classes/java/main/com/example/demo/materials/api/MaterialDto.class differ diff --git a/build/classes/java/main/com/example/demo/materials/model/MaterialEntity.class b/build/classes/java/main/com/example/demo/materials/model/MaterialEntity.class new file mode 100644 index 0000000..d06bf2f Binary files /dev/null and b/build/classes/java/main/com/example/demo/materials/model/MaterialEntity.class differ diff --git a/build/classes/java/main/com/example/demo/materials/repository/MaterialRepository.class b/build/classes/java/main/com/example/demo/materials/repository/MaterialRepository.class new file mode 100644 index 0000000..5edc961 Binary files /dev/null and b/build/classes/java/main/com/example/demo/materials/repository/MaterialRepository.class differ diff --git a/build/classes/java/main/com/example/demo/materials/service/MaterialService.class b/build/classes/java/main/com/example/demo/materials/service/MaterialService.class new file mode 100644 index 0000000..2202b3b Binary files /dev/null and b/build/classes/java/main/com/example/demo/materials/service/MaterialService.class differ diff --git a/build/classes/java/main/com/example/demo/speaker/api/SpeakerController.class b/build/classes/java/main/com/example/demo/speaker/api/SpeakerController.class new file mode 100644 index 0000000..b2f8cd9 Binary files /dev/null and b/build/classes/java/main/com/example/demo/speaker/api/SpeakerController.class differ diff --git a/build/classes/java/main/com/example/demo/speaker/configuration/SpeakerConfiguration.class b/build/classes/java/main/com/example/demo/speaker/configuration/SpeakerConfiguration.class new file mode 100644 index 0000000..95d70c3 Binary files /dev/null and b/build/classes/java/main/com/example/demo/speaker/configuration/SpeakerConfiguration.class differ diff --git a/build/classes/java/main/com/example/demo/speaker/domain/Speaker.class b/build/classes/java/main/com/example/demo/speaker/domain/Speaker.class new file mode 100644 index 0000000..d3c4c60 Binary files /dev/null and b/build/classes/java/main/com/example/demo/speaker/domain/Speaker.class differ diff --git a/build/classes/java/main/com/example/demo/speaker/domain/SpeakerDeu.class b/build/classes/java/main/com/example/demo/speaker/domain/SpeakerDeu.class new file mode 100644 index 0000000..3cc186a Binary files /dev/null and b/build/classes/java/main/com/example/demo/speaker/domain/SpeakerDeu.class differ diff --git a/build/classes/java/main/com/example/demo/speaker/domain/SpeakerEng.class b/build/classes/java/main/com/example/demo/speaker/domain/SpeakerEng.class new file mode 100644 index 0000000..99ca807 Binary files /dev/null and b/build/classes/java/main/com/example/demo/speaker/domain/SpeakerEng.class differ diff --git a/build/classes/java/main/com/example/demo/speaker/domain/SpeakerRus.class b/build/classes/java/main/com/example/demo/speaker/domain/SpeakerRus.class new file mode 100644 index 0000000..0d24246 Binary files /dev/null and b/build/classes/java/main/com/example/demo/speaker/domain/SpeakerRus.class differ diff --git a/build/classes/java/main/com/example/demo/speaker/service/SpeakerService.class b/build/classes/java/main/com/example/demo/speaker/service/SpeakerService.class new file mode 100644 index 0000000..bf75e6b Binary files /dev/null and b/build/classes/java/main/com/example/demo/speaker/service/SpeakerService.class differ diff --git a/build/classes/java/main/com/example/demo/types/api/TypeController.class b/build/classes/java/main/com/example/demo/types/api/TypeController.class new file mode 100644 index 0000000..2020fd8 Binary files /dev/null and b/build/classes/java/main/com/example/demo/types/api/TypeController.class differ diff --git a/build/classes/java/main/com/example/demo/types/api/TypeDto.class b/build/classes/java/main/com/example/demo/types/api/TypeDto.class new file mode 100644 index 0000000..8e7311c Binary files /dev/null and b/build/classes/java/main/com/example/demo/types/api/TypeDto.class differ diff --git a/build/classes/java/main/com/example/demo/types/model/TypeEntity.class b/build/classes/java/main/com/example/demo/types/model/TypeEntity.class new file mode 100644 index 0000000..9862f08 Binary files /dev/null and b/build/classes/java/main/com/example/demo/types/model/TypeEntity.class differ diff --git a/build/classes/java/main/com/example/demo/types/repository/TypeRepository.class b/build/classes/java/main/com/example/demo/types/repository/TypeRepository.class new file mode 100644 index 0000000..18069c5 Binary files /dev/null and b/build/classes/java/main/com/example/demo/types/repository/TypeRepository.class differ diff --git a/build/classes/java/main/com/example/demo/types/service/TypeService.class b/build/classes/java/main/com/example/demo/types/service/TypeService.class new file mode 100644 index 0000000..a8b70a0 Binary files /dev/null and b/build/classes/java/main/com/example/demo/types/service/TypeService.class differ diff --git a/build/classes/java/main/com/example/demo/users/api/UserController.class b/build/classes/java/main/com/example/demo/users/api/UserController.class new file mode 100644 index 0000000..4307cae Binary files /dev/null and b/build/classes/java/main/com/example/demo/users/api/UserController.class differ diff --git a/build/classes/java/main/com/example/demo/users/api/UserDto.class b/build/classes/java/main/com/example/demo/users/api/UserDto.class new file mode 100644 index 0000000..66a6af2 Binary files /dev/null and b/build/classes/java/main/com/example/demo/users/api/UserDto.class differ diff --git a/build/classes/java/main/com/example/demo/users/model/UserEntity.class b/build/classes/java/main/com/example/demo/users/model/UserEntity.class new file mode 100644 index 0000000..1b1fb27 Binary files /dev/null and b/build/classes/java/main/com/example/demo/users/model/UserEntity.class differ diff --git a/build/classes/java/main/com/example/demo/users/repository/UserRepository.class b/build/classes/java/main/com/example/demo/users/repository/UserRepository.class new file mode 100644 index 0000000..dff53f4 Binary files /dev/null and b/build/classes/java/main/com/example/demo/users/repository/UserRepository.class differ diff --git a/build/classes/java/main/com/example/demo/users/service/UserService.class b/build/classes/java/main/com/example/demo/users/service/UserService.class new file mode 100644 index 0000000..d042ef5 Binary files /dev/null and b/build/classes/java/main/com/example/demo/users/service/UserService.class differ diff --git a/build/classes/java/test/com/example/demo/CommentServiceTests.class b/build/classes/java/test/com/example/demo/CommentServiceTests.class new file mode 100644 index 0000000..810b6fc Binary files /dev/null and b/build/classes/java/test/com/example/demo/CommentServiceTests.class differ diff --git a/build/classes/java/test/com/example/demo/HouseServiceTests.class b/build/classes/java/test/com/example/demo/HouseServiceTests.class new file mode 100644 index 0000000..5c37657 Binary files /dev/null and b/build/classes/java/test/com/example/demo/HouseServiceTests.class differ diff --git a/build/classes/java/test/com/example/demo/MaterialServiceTests.class b/build/classes/java/test/com/example/demo/MaterialServiceTests.class new file mode 100644 index 0000000..e65c282 Binary files /dev/null and b/build/classes/java/test/com/example/demo/MaterialServiceTests.class differ diff --git a/build/classes/java/test/com/example/demo/SpeakerSrviceTests.class b/build/classes/java/test/com/example/demo/SpeakerSrviceTests.class new file mode 100644 index 0000000..513d07e Binary files /dev/null and b/build/classes/java/test/com/example/demo/SpeakerSrviceTests.class differ diff --git a/build/classes/java/test/com/example/demo/TypeServiceTests.class b/build/classes/java/test/com/example/demo/TypeServiceTests.class new file mode 100644 index 0000000..770fac0 Binary files /dev/null and b/build/classes/java/test/com/example/demo/TypeServiceTests.class differ diff --git a/build/classes/java/test/com/example/demo/UserServiceTests.class b/build/classes/java/test/com/example/demo/UserServiceTests.class new file mode 100644 index 0000000..76e1c32 Binary files /dev/null and b/build/classes/java/test/com/example/demo/UserServiceTests.class differ diff --git a/build/resources/main/application.properties b/build/resources/main/application.properties new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/build/resources/main/application.properties @@ -0,0 +1 @@ + diff --git a/build/tmp/compileJava/previous-compilation-data.bin b/build/tmp/compileJava/previous-compilation-data.bin new file mode 100644 index 0000000..ac30c5a Binary files /dev/null and b/build/tmp/compileJava/previous-compilation-data.bin differ diff --git a/build/tmp/compileTestJava/previous-compilation-data.bin b/build/tmp/compileTestJava/previous-compilation-data.bin new file mode 100644 index 0000000..69663f4 Binary files /dev/null and b/build/tmp/compileTestJava/previous-compilation-data.bin differ diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..d64cd49 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..1af9e09 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..1aa94a4 --- /dev/null +++ b/gradlew @@ -0,0 +1,249 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..93e3f59 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,92 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..0a383dd --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'demo' diff --git a/src/main/java/com/example/demo/DemoApplication.java b/src/main/java/com/example/demo/DemoApplication.java new file mode 100644 index 0000000..c9ab04b --- /dev/null +++ b/src/main/java/com/example/demo/DemoApplication.java @@ -0,0 +1,76 @@ +package com.example.demo; + +import java.util.Objects; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.boot.CommandLineRunner; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +import com.example.demo.types.model.TypeEntity; +import com.example.demo.types.service.TypeService; +import com.example.demo.houses.model.HouseEntity; +import com.example.demo.houses.service.HouseService; +import com.example.demo.materials.model.MaterialEntity; +import com.example.demo.materials.service.MaterialService; +import com.example.demo.users.model.UserEntity; +import com.example.demo.users.service.UserService; +import com.example.demo.comments.model.CommentEntity; +import com.example.demo.comments.service.CommentService; + +@SpringBootApplication +public class DemoApplication implements CommandLineRunner { + private final Logger log = LoggerFactory.getLogger(DemoApplication.class); + + private final TypeService typeService; + private final HouseService itemService; + private final MaterialService materialService; + private final UserService userService; + private final CommentService commentService; + + public DemoApplication(TypeService typeService, HouseService itemService, + MaterialService materialService, UserService userService, CommentService commentService) { + this.typeService = typeService; + this.itemService = itemService; + this.materialService = materialService; + this.userService = userService; + this.commentService = commentService; + } + + public static void main(String[] args) { + SpringApplication.run(DemoApplication.class, args); + } + + @Override + public void run(String... args) throws Exception { + if (args.length > 0 && Objects.equals("--populate", args[0])) { + log.info("Create default types values"); + final var type1 = typeService.create(new TypeEntity(null, "Дом")); + final var type2 = typeService.create(new TypeEntity(null, "Дача")); + final var type3 = typeService.create(new TypeEntity(null, "Вилла")); + + log.info("Create default materials values"); + final var material1 = materialService.create(new MaterialEntity(null, "Дерево")); + final var material2 = materialService.create(new MaterialEntity(null, "Кирпич")); + final var material3 = materialService.create(new MaterialEntity(null, "Камень")); + + log.info("Create default user values"); + final var user1 = userService.create(new UserEntity(null, "admin", "admin@gmail.com", "admin")); + final var user2 = userService.create(new UserEntity(null, "Vanya", "vanya@gmail.com", "vanya")); + + log.info("Create default items values"); + final var house1 = itemService.create( + new HouseEntity(null, type1, 17500000.00, "Тайский дракон", material1, 4)); + final var house2 = itemService.create(new HouseEntity(null, type2, 122423.00, "dfdsfds sdf", material2, 3)); + itemService.create(new HouseEntity(null, type3, 1111111.00, "sdc1 дракон", material3, 3)); + itemService.create(new HouseEntity(null, type3, 1234567788.00, "Снек За Бу Горский", material3, 5)); + + log.info("Create default comment values"); + commentService.create(new CommentEntity(null, house1, user1, "Класс класс класс", null, 5)); + commentService.create(new CommentEntity(null, house1, user1, "Живу пол года, изменений не видно", null, 3)); + commentService.create(new CommentEntity(null, house2, user1, "Прошлый дом была лучше", null, 4)); + commentService.create(new CommentEntity(null, house2, user2, "Необычно", null, 5)); + } + } +} diff --git a/src/main/java/com/example/demo/comments/api/CommentController.java b/src/main/java/com/example/demo/comments/api/CommentController.java new file mode 100644 index 0000000..6344b33 --- /dev/null +++ b/src/main/java/com/example/demo/comments/api/CommentController.java @@ -0,0 +1,78 @@ +package com.example.demo.comments.api; + +import java.util.List; + +import org.modelmapper.ModelMapper; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import com.example.demo.comments.model.CommentEntity; +import com.example.demo.comments.service.CommentService; +import com.example.demo.core.configuration.Constants; +import com.example.demo.houses.service.HouseService; +import com.example.demo.users.service.UserService; + +import jakarta.validation.Valid; + +@RestController +@RequestMapping(Constants.API_URL + "/comment") +public class CommentController { + private final CommentService commentService; + private final HouseService houseService; + private final UserService userService; + private final ModelMapper modelMapper; + + public CommentController( + CommentService commentService, + HouseService houseService, + UserService userService, ModelMapper modelMapper) { + this.commentService = commentService; + this.houseService = houseService; + this.userService = userService; + this.modelMapper = modelMapper; + } + + private CommentDto toDto(CommentEntity entity) { + return modelMapper.map(entity, CommentDto.class); + } + + private CommentEntity toEntity(CommentDto dto) { + final CommentEntity entity = modelMapper.map(dto, CommentEntity.class); + entity.setHouse(houseService.get(dto.getHouseId())); + entity.setUser(userService.get(dto.getUserId())); + return entity; + } + + @GetMapping + public List getAll(@RequestParam(name = "HouseId", defaultValue = "0") Long HouseId, + @RequestParam(name = "userId", defaultValue = "0") Long userId) { + return commentService.getAll(HouseId, userId).stream().map(this::toDto).toList(); + } + + @GetMapping("/{id}") + public CommentDto get(@PathVariable(name = "id") Long id) { + return toDto(commentService.get(id)); + } + + @PostMapping + public CommentDto create(@RequestBody @Valid CommentDto dto) { + return toDto(commentService.create(toEntity(dto))); + } + + @PutMapping("/{id}") + public CommentDto update(@PathVariable(name = "id") Long id, @RequestBody CommentDto dto) { + return toDto(commentService.update(id, toEntity(dto))); + } + + @DeleteMapping("/{id}") + public CommentDto delete(@PathVariable(name = "id") Long id) { + return toDto(commentService.delete(id)); + } +} diff --git a/src/main/java/com/example/demo/comments/api/CommentDto.java b/src/main/java/com/example/demo/comments/api/CommentDto.java new file mode 100644 index 0000000..a750ab8 --- /dev/null +++ b/src/main/java/com/example/demo/comments/api/CommentDto.java @@ -0,0 +1,79 @@ +package com.example.demo.comments.api; + +import com.fasterxml.jackson.annotation.JsonProperty; + +import java.util.Date; + +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; + +public class CommentDto { + private Long id; + @NotNull + @Min(1) + private Long houseId; + @NotNull + @Min(1) + private Long userId; + @NotNull + @Min(1) + private String description; + @NotNull + @Min(1) + private Date date; + @NotNull + @Min(1) + @Max(5) + private Double rating; + + + @JsonProperty(access = JsonProperty.Access.READ_ONLY) + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getHouseId() { + return houseId; + } + + public void setHouseId(Long houseId) { + this.houseId = houseId; + } + + public Long getUserId() { + return userId; + } + + public void setUserId(Long userId) { + this.userId = userId; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public Date getDate() { + return date; + } + + public void setDate(Date date) { + this.date = date; + } + + public Double getRating() { + return rating; + } + + public void setRating(Double rating) { + this.rating = rating; + } +} diff --git a/src/main/java/com/example/demo/comments/model/CommentEntity.java b/src/main/java/com/example/demo/comments/model/CommentEntity.java new file mode 100644 index 0000000..dc573da --- /dev/null +++ b/src/main/java/com/example/demo/comments/model/CommentEntity.java @@ -0,0 +1,90 @@ +package com.example.demo.comments.model; + +import java.util.Objects; + +import java.util.Date; + +import com.example.demo.core.model.BaseEntity; +import com.example.demo.houses.model.HouseEntity; +import com.example.demo.users.model.UserEntity; + +public class CommentEntity extends BaseEntity { + private HouseEntity house; + private UserEntity user; + private String description; + private Date date; + private double rating; + + public CommentEntity() { + super(); + } + + public CommentEntity(Long id, HouseEntity house, UserEntity user, String description, Date date, double rating) { + super(id); + this.house = house; + this.user = user; + this.description = description; + this.date = date; + this.rating = rating; + } + + public HouseEntity getHouse() { + return house; + } + + public void setHouse(HouseEntity house) { + this.house = house; + } + + public UserEntity getUser() { + return user; + } + + public void setUser(UserEntity user) { + this.user = user; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public Date getDate() { + return date; + } + + public void setDate(Date date) { + this.date = date; + } + + public double getRating() { + return rating; + } + + public void setRating(double rating) { + this.rating = rating; + } + + @Override + public int hashCode() { + return Objects.hash(id, house, user, description, date, rating); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null || getClass() != obj.getClass()) + return false; + final CommentEntity other = (CommentEntity) obj; + return Objects.equals(other.getId(), id) + && Objects.equals(other.getHouse(), house) + && Objects.equals(other.getUser(), user) + && Objects.equals(other.getDescription(), description) + && Objects.equals(other.getDate(), date) + && Objects.equals(other.getRating(), rating); + } +} diff --git a/src/main/java/com/example/demo/comments/repository/CommentRepository.java b/src/main/java/com/example/demo/comments/repository/CommentRepository.java new file mode 100644 index 0000000..b60c20f --- /dev/null +++ b/src/main/java/com/example/demo/comments/repository/CommentRepository.java @@ -0,0 +1,10 @@ +package com.example.demo.comments.repository; + +import org.springframework.stereotype.Repository; + +import com.example.demo.comments.model.CommentEntity; +import com.example.demo.core.repository.MapRepository; + +@Repository +public class CommentRepository extends MapRepository { +} diff --git a/src/main/java/com/example/demo/comments/service/CommentService.java b/src/main/java/com/example/demo/comments/service/CommentService.java new file mode 100644 index 0000000..0564900 --- /dev/null +++ b/src/main/java/com/example/demo/comments/service/CommentService.java @@ -0,0 +1,63 @@ +package com.example.demo.comments.service; + +import java.util.List; +import java.util.Objects; +import java.util.Optional; +import java.util.stream.Stream; + +import org.springframework.stereotype.Service; + +import com.example.demo.comments.model.CommentEntity; +import com.example.demo.comments.repository.CommentRepository; +import com.example.demo.core.error.NotFoundException; + +@Service +public class CommentService { + private final CommentRepository repository; + + public CommentService(CommentRepository repository) { + this.repository = repository; + } + + public List getAll(Long houseId, Long userId) { + Stream stream = repository.getAll().stream(); + + if (!Objects.equals(houseId, 0L)) { + stream = stream.filter(item -> item.getHouse().getId().equals(houseId)); + } + if (houseId == null || houseId < 0) { + throw new IllegalArgumentException("House ID must be greater than 0."); + } + if (!Objects.equals(userId, 0L)) { + stream = stream.filter(item -> item.getUser().getId().equals(userId)); + } + if (userId == null || userId < 0) { + throw new IllegalArgumentException("User ID must be greater than 0."); + } + return stream.toList(); + } + + public CommentEntity get(Long id) { + return Optional.ofNullable(repository.get(id)) + .orElseThrow(() -> new NotFoundException(id)); + } + + public CommentEntity create(CommentEntity entity) { + return repository.create(entity); + } + + public CommentEntity update(Long id, CommentEntity entity) { + final CommentEntity existsEntity = get(id); + existsEntity.setHouse(entity.getHouse()); + existsEntity.setUser(entity.getUser()); + existsEntity.setDescription(entity.getDescription()); + existsEntity.setDate(entity.getDate()); + existsEntity.setRating(entity.getRating()); + return repository.update(existsEntity); + } + + public CommentEntity delete(Long id) { + final CommentEntity existsEntity = get(id); + return repository.delete(existsEntity); + } +} diff --git a/src/main/java/com/example/demo/core/configuration/Constants.java b/src/main/java/com/example/demo/core/configuration/Constants.java new file mode 100644 index 0000000..d9c6b7c --- /dev/null +++ b/src/main/java/com/example/demo/core/configuration/Constants.java @@ -0,0 +1,8 @@ +package com.example.demo.core.configuration; + +public class Constants { + public static final String API_URL = "/api/1.0"; + + private Constants() { + } +} diff --git a/src/main/java/com/example/demo/core/configuration/MapperConfiguration.java b/src/main/java/com/example/demo/core/configuration/MapperConfiguration.java new file mode 100644 index 0000000..a5ad6f3 --- /dev/null +++ b/src/main/java/com/example/demo/core/configuration/MapperConfiguration.java @@ -0,0 +1,13 @@ +package com.example.demo.core.configuration; + +import org.modelmapper.ModelMapper; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class MapperConfiguration { + @Bean + ModelMapper modelMapper() { + return new ModelMapper(); + } +} diff --git a/src/main/java/com/example/demo/core/configuration/WebConfiguration.java b/src/main/java/com/example/demo/core/configuration/WebConfiguration.java new file mode 100644 index 0000000..762e85a --- /dev/null +++ b/src/main/java/com/example/demo/core/configuration/WebConfiguration.java @@ -0,0 +1,15 @@ +package com.example.demo.core.configuration; + +import org.springframework.context.annotation.Configuration; +import org.springframework.lang.NonNull; +import org.springframework.web.servlet.config.annotation.CorsRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +@Configuration +public class WebConfiguration implements WebMvcConfigurer { + @Override + public void addCorsMappings(@NonNull CorsRegistry registry) { + registry.addMapping("/**") + .allowedMethods("GET", "POST", "PUT", "DELETE"); + } +} diff --git a/src/main/java/com/example/demo/core/error/NotFoundException.java b/src/main/java/com/example/demo/core/error/NotFoundException.java new file mode 100644 index 0000000..586af3c --- /dev/null +++ b/src/main/java/com/example/demo/core/error/NotFoundException.java @@ -0,0 +1,7 @@ +package com.example.demo.core.error; + +public class NotFoundException extends RuntimeException { + public NotFoundException(Long id) { + super(String.format("Entity with id [%s] is not found or not exists", id)); + } +} diff --git a/src/main/java/com/example/demo/core/model/BaseEntity.java b/src/main/java/com/example/demo/core/model/BaseEntity.java new file mode 100644 index 0000000..674ddfb --- /dev/null +++ b/src/main/java/com/example/demo/core/model/BaseEntity.java @@ -0,0 +1,20 @@ +package com.example.demo.core.model; + +public abstract class BaseEntity { + protected Long id; + + protected BaseEntity() { + } + + protected BaseEntity(Long id) { + this.id = id; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } +} diff --git a/src/main/java/com/example/demo/core/repository/CommonRepository.java b/src/main/java/com/example/demo/core/repository/CommonRepository.java new file mode 100644 index 0000000..85e1e6d --- /dev/null +++ b/src/main/java/com/example/demo/core/repository/CommonRepository.java @@ -0,0 +1,17 @@ +package com.example.demo.core.repository; + +import java.util.List; + +public interface CommonRepository { + List getAll(); + + E get(T id); + + E create(E entity); + + E update(E entity); + + E delete(E entity); + + void deleteAll(); +} diff --git a/src/main/java/com/example/demo/core/repository/MapRepository.java b/src/main/java/com/example/demo/core/repository/MapRepository.java new file mode 100644 index 0000000..6809ac2 --- /dev/null +++ b/src/main/java/com/example/demo/core/repository/MapRepository.java @@ -0,0 +1,57 @@ +package com.example.demo.core.repository; + +import java.util.List; +import java.util.Map; +import java.util.TreeMap; + +import com.example.demo.core.model.BaseEntity; + +public abstract class MapRepository implements CommonRepository { + private final Map entities = new TreeMap<>(); + private Long lastId = 0L; + + protected MapRepository() { + } + + @Override + public List getAll() { + return entities.values().stream().toList(); + } + + @Override + public E get(Long id) { + return entities.get(id); + } + + @Override + public E create(E entity) { + lastId++; + entity.setId(lastId); + entities.put(lastId, entity); + return entity; + } + + @Override + public E update(E entity) { + if (get(entity.getId()) == null) { + return null; + } + entities.put(entity.getId(), entity); + return entity; + } + + @Override + public E delete(E entity) { + if (get(entity.getId()) == null) { + return null; + } + entities.remove(entity.getId()); + return entity; + } + + @Override + public void deleteAll() { + lastId = 0L; + entities.clear(); + } +} diff --git a/src/main/java/com/example/demo/houses/api/HouseController.java b/src/main/java/com/example/demo/houses/api/HouseController.java new file mode 100644 index 0000000..9da19a2 --- /dev/null +++ b/src/main/java/com/example/demo/houses/api/HouseController.java @@ -0,0 +1,76 @@ +package com.example.demo.houses.api; + +import java.util.List; + +import org.modelmapper.ModelMapper; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import com.example.demo.core.configuration.Constants; +import com.example.demo.types.service.TypeService; +import com.example.demo.houses.model.HouseEntity; +import com.example.demo.houses.service.HouseService; +import com.example.demo.materials.service.MaterialService; + +import jakarta.validation.Valid; + +@RestController +@RequestMapping(Constants.API_URL + "/house") +public class HouseController { + private final HouseService houseService; + private final TypeService typeService; + private final MaterialService materialService; + private final ModelMapper modelMapper; + + public HouseController(HouseService houseService, TypeService typeService, + MaterialService materialService, ModelMapper modelMapper) { + this.houseService = houseService; + this.typeService = typeService; + this.materialService = materialService; + this.modelMapper = modelMapper; + } + + private HouseDto toDto(HouseEntity entity) { + return modelMapper.map(entity, HouseDto.class); + } + + private HouseEntity toEntity(HouseDto dto) { + final HouseEntity entity = modelMapper.map(dto, HouseEntity.class); + entity.setType(typeService.get(dto.getTypeId())); + entity.setMaterial(materialService.get(dto.getMaterialId())); + return entity; + } + + @GetMapping + public List getAll(@RequestParam(name = "typeId", defaultValue = "0") Long typeId, + @RequestParam(name = "materialId", required = false) Long materialId) { + return houseService.getAll(typeId, materialId).stream().map(this::toDto).toList(); + } + + @GetMapping("/{id}") + public HouseDto get(@PathVariable(name = "id") Long id) { + return toDto(houseService.get(id)); + } + + @PostMapping + public HouseDto create(@RequestBody @Valid HouseDto dto) { + return toDto(houseService.create(toEntity(dto))); + } + + @PutMapping("/{id}") + public HouseDto update(@PathVariable(name = "id") Long id, @RequestBody HouseDto dto) { + return toDto(houseService.update(id, toEntity(dto))); + } + + @DeleteMapping("/{id}") + public HouseDto delete(@PathVariable(name = "id") Long id) { + return toDto(houseService.delete(id)); + } +} diff --git a/src/main/java/com/example/demo/houses/api/HouseDto.java b/src/main/java/com/example/demo/houses/api/HouseDto.java new file mode 100644 index 0000000..b7ad973 --- /dev/null +++ b/src/main/java/com/example/demo/houses/api/HouseDto.java @@ -0,0 +1,76 @@ +package com.example.demo.houses.api; + +import com.fasterxml.jackson.annotation.JsonProperty; + +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; + +public class HouseDto { + private Long id; + @NotNull + @Min(1) + private Long typeId; + @NotNull + @Min(1) + private Double price; + @NotNull + @Min(1) + private String name; + @NotNull + @Min(1) + private Long materialId; + @NotNull + @Min(0) + @Max(5) + private Double rating; + + @JsonProperty(access = JsonProperty.Access.READ_ONLY) + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getTypeId() { + return typeId; + } + + public void setTypeId(Long typeId) { + this.typeId = typeId; + } + + public Double getPrice() { + return price; + } + + public void setPrice(Double price) { + this.price = price; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Long getMaterialId() { + return materialId; + } + + public void setMaterialId(Long materialId) { + this.materialId = materialId; + } + + public Double getRating() { + return rating; + } + + public void setRating(Double rating) { + this.rating = rating; + } +} diff --git a/src/main/java/com/example/demo/houses/api/PropertyStatus.java b/src/main/java/com/example/demo/houses/api/PropertyStatus.java new file mode 100644 index 0000000..416450e --- /dev/null +++ b/src/main/java/com/example/demo/houses/api/PropertyStatus.java @@ -0,0 +1,6 @@ +package com.example.demo.houses.api; + +public enum PropertyStatus { + SALE, + PURCHASE +} diff --git a/src/main/java/com/example/demo/houses/model/HouseEntity.java b/src/main/java/com/example/demo/houses/model/HouseEntity.java new file mode 100644 index 0000000..d47152f --- /dev/null +++ b/src/main/java/com/example/demo/houses/model/HouseEntity.java @@ -0,0 +1,88 @@ +package com.example.demo.houses.model; + +import java.util.Objects; + +import com.example.demo.core.model.BaseEntity; +import com.example.demo.types.model.TypeEntity; +import com.example.demo.materials.model.MaterialEntity; + +public class HouseEntity extends BaseEntity { + private TypeEntity type; + private Double price; + private String name; + private MaterialEntity material; + private double rating; + + public HouseEntity() { + super(); + } + + public HouseEntity(Long id, TypeEntity type, Double price, String name, MaterialEntity material, double rating) { + super(id); + this.type = type; + this.price = price; + this.name = name; + this.material = material; + this.rating = rating; + } + + public TypeEntity getType() { + return type; + } + + public void setType(TypeEntity type) { + this.type = type; + } + + public Double getPrice() { + return price; + } + + public void setPrice(Double price) { + this.price = price; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public MaterialEntity getMaterial() { + return material; + } + + public void setMaterial(MaterialEntity material) { + this.material = material; + } + + public double getRating() { + return rating; + } + + public void setRating(double rating) { + this.rating = rating; + } + + @Override + public int hashCode() { + return Objects.hash(id, type, price, name, material, rating); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null || getClass() != obj.getClass()) + return false; + final HouseEntity other = (HouseEntity) obj; + return Objects.equals(other.getId(), id) + && Objects.equals(other.getType(), type) + && Objects.equals(other.getPrice(), price) + && Objects.equals(other.getName(), name) + && Objects.equals(other.getMaterial(), material) + && Double.compare(other.getRating(), rating) == 0; + } +} diff --git a/src/main/java/com/example/demo/houses/repository/HouseRepository.java b/src/main/java/com/example/demo/houses/repository/HouseRepository.java new file mode 100644 index 0000000..fefa600 --- /dev/null +++ b/src/main/java/com/example/demo/houses/repository/HouseRepository.java @@ -0,0 +1,10 @@ +package com.example.demo.houses.repository; + +import org.springframework.stereotype.Repository; + +import com.example.demo.core.repository.MapRepository; +import com.example.demo.houses.model.HouseEntity; + +@Repository +public class HouseRepository extends MapRepository { +} diff --git a/src/main/java/com/example/demo/houses/service/HouseService.java b/src/main/java/com/example/demo/houses/service/HouseService.java new file mode 100644 index 0000000..0456fad --- /dev/null +++ b/src/main/java/com/example/demo/houses/service/HouseService.java @@ -0,0 +1,77 @@ +package com.example.demo.houses.service; + +import java.util.List; +import java.util.Objects; +import java.util.Optional; +import java.util.stream.Stream; + +import org.springframework.stereotype.Service; + +import com.example.demo.comments.model.CommentEntity; +import com.example.demo.comments.service.CommentService; +import com.example.demo.core.error.NotFoundException; +import com.example.demo.houses.model.HouseEntity; +import com.example.demo.houses.repository.HouseRepository; + +@Service +public class HouseService { + private final HouseRepository repository; + CommentService commentService; + + public HouseService(HouseRepository repository, CommentService commentService) { + this.repository = repository; + this.commentService = commentService; + } + + public List getAll(Long typeId, Long materialId) { + Stream stream = repository.getAll().stream(); + + if (!Objects.equals(typeId, 0L)) { + stream = stream.filter(item -> item.getType().getId().equals(typeId)); + } + if (!Objects.equals(materialId, 0L)) { + stream = stream.filter(item -> item.getMaterial().getId().equals(materialId)); + } + + return stream.map(this::calculateAverageRating).toList(); + } + + public HouseEntity get(Long id) { + return calculateAverageRating(Optional.ofNullable(repository.get(id)) + .orElseThrow(() -> new NotFoundException(id))); + } + + public HouseEntity create(HouseEntity entity) { + return repository.create(entity); + } + + public HouseEntity update(Long id, HouseEntity entity) { + final HouseEntity existsEntity = get(id); + existsEntity.setType(entity.getType()); + existsEntity.setPrice(entity.getPrice()); + existsEntity.setName(entity.getName()); + existsEntity.setMaterial(entity.getMaterial()); + existsEntity.setRating(entity.getRating()); + return repository.update(existsEntity); + } + + public HouseEntity delete(Long id) { + final HouseEntity existsEntity = get(id); + return repository.delete(existsEntity); + } + + public HouseEntity calculateAverageRating(HouseEntity house) { + List comments = commentService.getAll(house.getId(), 0L); + if (comments.isEmpty()) { + house.setRating(0); + } else { + double sum = 0; + for (CommentEntity comment : comments) { + sum += comment.getRating(); + } + double averageRating = sum / comments.size(); + house.setRating(averageRating); + } + return house; + } +} diff --git a/src/main/java/com/example/demo/materials/api/MaterialContoller.java b/src/main/java/com/example/demo/materials/api/MaterialContoller.java new file mode 100644 index 0000000..0bbd330 --- /dev/null +++ b/src/main/java/com/example/demo/materials/api/MaterialContoller.java @@ -0,0 +1,64 @@ +package com.example.demo.materials.api; + +import java.util.List; + +import org.modelmapper.ModelMapper; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.example.demo.core.configuration.Constants; +import com.example.demo.materials.model.MaterialEntity; +import com.example.demo.materials.service.MaterialService; + +import jakarta.validation.Valid; + +@RestController +@RequestMapping(Constants.API_URL + "/material") +public class MaterialContoller { + private final MaterialService materialService; + private final ModelMapper modelMapper; + + public MaterialContoller(MaterialService materialService, ModelMapper modelMapper) { + this.materialService = materialService; + this.modelMapper = modelMapper; + } + + private MaterialDto toDto(MaterialEntity entity) { + return modelMapper.map(entity, MaterialDto.class); + } + + private MaterialEntity toEntity(MaterialDto dto) { + return modelMapper.map(dto, MaterialEntity.class); + } + + @GetMapping + public List getAll() { + return materialService.getAll().stream().map(this::toDto).toList(); + } + + @GetMapping("/{id}") + public MaterialDto get(@PathVariable(name = "id") Long id) { + return toDto(materialService.get(id)); + } + + @PostMapping + public MaterialDto create(@RequestBody @Valid MaterialDto dto) { + return toDto(materialService.create(toEntity(dto))); + } + + @PutMapping("/{id}") + public MaterialDto update(@PathVariable(name = "id") Long id, @RequestBody MaterialDto dto) { + return toDto(materialService.update(id, toEntity(dto))); + } + + @DeleteMapping("/{id}") + public MaterialDto delete(@PathVariable(name = "id") Long id) { + return toDto(materialService.delete(id)); + } +} diff --git a/src/main/java/com/example/demo/materials/api/MaterialDto.java b/src/main/java/com/example/demo/materials/api/MaterialDto.java new file mode 100644 index 0000000..d4d5e82 --- /dev/null +++ b/src/main/java/com/example/demo/materials/api/MaterialDto.java @@ -0,0 +1,28 @@ +package com.example.demo.materials.api; + +import com.fasterxml.jackson.annotation.JsonProperty; + +import jakarta.validation.constraints.NotBlank; + +public class MaterialDto { + private Long id; + @NotBlank + private String name; + + @JsonProperty(access = JsonProperty.Access.READ_ONLY) + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} diff --git a/src/main/java/com/example/demo/materials/model/MaterialEntity.java b/src/main/java/com/example/demo/materials/model/MaterialEntity.java new file mode 100644 index 0000000..a86d479 --- /dev/null +++ b/src/main/java/com/example/demo/materials/model/MaterialEntity.java @@ -0,0 +1,42 @@ +package com.example.demo.materials.model; + +import java.util.Objects; + +import com.example.demo.core.model.BaseEntity; + +public class MaterialEntity extends BaseEntity { + private String name; + + public MaterialEntity() { + super(); + } + + public MaterialEntity(Long id, String name) { + super(id); + this.name = name; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + @Override + public int hashCode() { + return Objects.hash(id, name); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null || getClass() != obj.getClass()) + return false; + final MaterialEntity other = (MaterialEntity) obj; + return Objects.equals(other.getId(), id) + && Objects.equals(other.getName(), name); + } +} diff --git a/src/main/java/com/example/demo/materials/repository/MaterialRepository.java b/src/main/java/com/example/demo/materials/repository/MaterialRepository.java new file mode 100644 index 0000000..86612ad --- /dev/null +++ b/src/main/java/com/example/demo/materials/repository/MaterialRepository.java @@ -0,0 +1,10 @@ +package com.example.demo.materials.repository; + +import org.springframework.stereotype.Repository; + +import com.example.demo.core.repository.MapRepository; +import com.example.demo.materials.model.MaterialEntity; + +@Repository +public class MaterialRepository extends MapRepository { +} diff --git a/src/main/java/com/example/demo/materials/service/MaterialService.java b/src/main/java/com/example/demo/materials/service/MaterialService.java new file mode 100644 index 0000000..781c314 --- /dev/null +++ b/src/main/java/com/example/demo/materials/service/MaterialService.java @@ -0,0 +1,43 @@ +package com.example.demo.materials.service; + +import java.util.List; +import java.util.Optional; + +import org.springframework.stereotype.Service; + +import com.example.demo.core.error.NotFoundException; +import com.example.demo.materials.model.MaterialEntity; +import com.example.demo.materials.repository.MaterialRepository; + +@Service +public class MaterialService { + private final MaterialRepository repository; + + public MaterialService(MaterialRepository repository) { + this.repository = repository; + } + + public List getAll() { + return repository.getAll(); + } + + public MaterialEntity get(Long id) { + return Optional.ofNullable(repository.get(id)) + .orElseThrow(() -> new NotFoundException(id)); + } + + public MaterialEntity create(MaterialEntity entity) { + return repository.create(entity); + } + + public MaterialEntity update(Long id, MaterialEntity entity) { + final MaterialEntity existsEntity = get(id); + existsEntity.setName(entity.getName()); + return repository.update(existsEntity); + } + + public MaterialEntity delete(Long id) { + final MaterialEntity existsEntity = get(id); + return repository.delete(existsEntity); + } +} diff --git a/src/main/java/com/example/demo/speaker/api/SpeakerController.java b/src/main/java/com/example/demo/speaker/api/SpeakerController.java new file mode 100644 index 0000000..293296d --- /dev/null +++ b/src/main/java/com/example/demo/speaker/api/SpeakerController.java @@ -0,0 +1,23 @@ +package com.example.demo.speaker.api; + +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import com.example.demo.speaker.service.SpeakerService; + +@RestController +public class SpeakerController { + private final SpeakerService speakerService; + + public SpeakerController(SpeakerService speakerService) { + this.speakerService = speakerService; + } + + @GetMapping + public String hello( + @RequestParam(value = "name", defaultValue = "Мир") String name, + @RequestParam(value = "lang", defaultValue = "ru") String lang) { + return speakerService.say(name, lang); + } +} diff --git a/src/main/java/com/example/demo/speaker/configuration/SpeakerConfiguration.java b/src/main/java/com/example/demo/speaker/configuration/SpeakerConfiguration.java new file mode 100644 index 0000000..0ef7cda --- /dev/null +++ b/src/main/java/com/example/demo/speaker/configuration/SpeakerConfiguration.java @@ -0,0 +1,27 @@ +package com.example.demo.speaker.configuration; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +import com.example.demo.speaker.domain.Speaker; +import com.example.demo.speaker.domain.SpeakerEng; +import com.example.demo.speaker.domain.SpeakerRus; + +@Configuration +public class SpeakerConfiguration { + private final Logger log = LoggerFactory.getLogger(SpeakerConfiguration.class); + + @Bean(value = "ru", initMethod = "init", destroyMethod = "destroy") + public SpeakerRus createRusSpeaker() { + log.info("Call createRusSpeaker()"); + return new SpeakerRus(); + } + + @Bean(value = "en") + public Speaker createEngSpeaker() { + log.info("Call createEngSpeaker()"); + return new SpeakerEng(); + } +} diff --git a/src/main/java/com/example/demo/speaker/domain/Speaker.java b/src/main/java/com/example/demo/speaker/domain/Speaker.java new file mode 100644 index 0000000..27a0a29 --- /dev/null +++ b/src/main/java/com/example/demo/speaker/domain/Speaker.java @@ -0,0 +1,5 @@ +package com.example.demo.speaker.domain; + +public interface Speaker { + String say(); +} diff --git a/src/main/java/com/example/demo/speaker/domain/SpeakerDeu.java b/src/main/java/com/example/demo/speaker/domain/SpeakerDeu.java new file mode 100644 index 0000000..5909864 --- /dev/null +++ b/src/main/java/com/example/demo/speaker/domain/SpeakerDeu.java @@ -0,0 +1,28 @@ +package com.example.demo.speaker.domain; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; + +@Component(value = "de") +public class SpeakerDeu implements Speaker { + private final Logger log = LoggerFactory.getLogger(SpeakerDeu.class); + + @Override + public String say() { + return "Hallo"; + } + + @PostConstruct + public void init() { + log.info("SpeakerDeu.init()"); + } + + @PreDestroy + public void destroy() { + log.info("SpeakerDeu.destroy()"); + } +} diff --git a/src/main/java/com/example/demo/speaker/domain/SpeakerEng.java b/src/main/java/com/example/demo/speaker/domain/SpeakerEng.java new file mode 100644 index 0000000..a310403 --- /dev/null +++ b/src/main/java/com/example/demo/speaker/domain/SpeakerEng.java @@ -0,0 +1,26 @@ +package com.example.demo.speaker.domain; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.DisposableBean; +import org.springframework.beans.factory.InitializingBean; + +public class SpeakerEng implements Speaker, InitializingBean, DisposableBean { + private final Logger log = LoggerFactory.getLogger(SpeakerEng.class); + + @Override + public String say() { + return "Hello"; + } + + @Override + public void afterPropertiesSet() { + log.info("SpeakerEng.afterPropertiesSet()"); + } + + @Override + public void destroy() { + log.info("SpeakerEng.destroy()"); + + } +} diff --git a/src/main/java/com/example/demo/speaker/domain/SpeakerRus.java b/src/main/java/com/example/demo/speaker/domain/SpeakerRus.java new file mode 100644 index 0000000..d6ed18e --- /dev/null +++ b/src/main/java/com/example/demo/speaker/domain/SpeakerRus.java @@ -0,0 +1,21 @@ +package com.example.demo.speaker.domain; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class SpeakerRus implements Speaker { + private final Logger log = LoggerFactory.getLogger(SpeakerRus.class); + + @Override + public String say() { + return "Привет"; + } + + public void init() { + log.info("SpeakerRus.init()"); + } + + public void destroy() { + log.info("SpeakerRus.destroy()"); + } +} diff --git a/src/main/java/com/example/demo/speaker/service/SpeakerService.java b/src/main/java/com/example/demo/speaker/service/SpeakerService.java new file mode 100644 index 0000000..db81ba4 --- /dev/null +++ b/src/main/java/com/example/demo/speaker/service/SpeakerService.java @@ -0,0 +1,20 @@ +package com.example.demo.speaker.service; + +import org.springframework.context.ApplicationContext; +import org.springframework.stereotype.Service; + +import com.example.demo.speaker.domain.Speaker; + +@Service +public class SpeakerService { + private final ApplicationContext applicationContext; + + public SpeakerService(ApplicationContext applicationContext) { + this.applicationContext = applicationContext; + } + + public String say(String name, String lang) { + final Speaker speaker = (Speaker) applicationContext.getBean(lang); + return String.format("%s, %s!", speaker.say(), name); + } +} diff --git a/src/main/java/com/example/demo/types/api/TypeController.java b/src/main/java/com/example/demo/types/api/TypeController.java new file mode 100644 index 0000000..81f07cf --- /dev/null +++ b/src/main/java/com/example/demo/types/api/TypeController.java @@ -0,0 +1,64 @@ +package com.example.demo.types.api; + +import java.util.List; + +import org.modelmapper.ModelMapper; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.example.demo.core.configuration.Constants; +import com.example.demo.types.model.TypeEntity; +import com.example.demo.types.service.TypeService; + +import jakarta.validation.Valid; + +@RestController +@RequestMapping(Constants.API_URL + "/type") +public class TypeController { + private final TypeService typeService; + private final ModelMapper modelMapper; + + public TypeController(TypeService typeService, ModelMapper modelMapper) { + this.typeService = typeService; + this.modelMapper = modelMapper; + } + + private TypeDto toDto(TypeEntity entity) { + return modelMapper.map(entity, TypeDto.class); + } + + private TypeEntity toEntity(TypeDto dto) { + return modelMapper.map(dto, TypeEntity.class); + } + + @GetMapping + public List getAll() { + return typeService.getAll().stream().map(this::toDto).toList(); + } + + @GetMapping("/{id}") + public TypeDto get(@PathVariable(name = "id") Long id) { + return toDto(typeService.get(id)); + } + + @PostMapping + public TypeDto create(@RequestBody @Valid TypeDto dto) { + return toDto(typeService.create(toEntity(dto))); + } + + @PutMapping("/{id}") + public TypeDto update(@PathVariable(name = "id") Long id, @RequestBody TypeDto dto) { + return toDto(typeService.update(id, toEntity(dto))); + } + + @DeleteMapping("/{id}") + public TypeDto delete(@PathVariable(name = "id") Long id) { + return toDto(typeService.delete(id)); + } +} diff --git a/src/main/java/com/example/demo/types/api/TypeDto.java b/src/main/java/com/example/demo/types/api/TypeDto.java new file mode 100644 index 0000000..c559680 --- /dev/null +++ b/src/main/java/com/example/demo/types/api/TypeDto.java @@ -0,0 +1,28 @@ +package com.example.demo.types.api; + +import com.fasterxml.jackson.annotation.JsonProperty; + +import jakarta.validation.constraints.NotBlank; + +public class TypeDto { + private Long id; + @NotBlank + private String name; + + @JsonProperty(access = JsonProperty.Access.READ_ONLY) + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} diff --git a/src/main/java/com/example/demo/types/model/TypeEntity.java b/src/main/java/com/example/demo/types/model/TypeEntity.java new file mode 100644 index 0000000..fd90bdb --- /dev/null +++ b/src/main/java/com/example/demo/types/model/TypeEntity.java @@ -0,0 +1,43 @@ +package com.example.demo.types.model; + +import java.util.Objects; + +import com.example.demo.core.model.BaseEntity; + +public class TypeEntity extends BaseEntity { + private String name; + + public TypeEntity() { + super(); + } + + public TypeEntity(Long id, String name) { + super(id); + this.name = name; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + @Override + public int hashCode() { + return Objects.hash(id, name); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null || getClass() != obj.getClass()) + return false; + final TypeEntity other = (TypeEntity) obj; + return Objects.equals(other.getId(), id) + && Objects.equals(other.getName(), name); + } + +} diff --git a/src/main/java/com/example/demo/types/repository/TypeRepository.java b/src/main/java/com/example/demo/types/repository/TypeRepository.java new file mode 100644 index 0000000..1c29ea2 --- /dev/null +++ b/src/main/java/com/example/demo/types/repository/TypeRepository.java @@ -0,0 +1,10 @@ +package com.example.demo.types.repository; + +import org.springframework.stereotype.Repository; + +import com.example.demo.core.repository.MapRepository; +import com.example.demo.types.model.TypeEntity; + +@Repository +public class TypeRepository extends MapRepository { +} diff --git a/src/main/java/com/example/demo/types/service/TypeService.java b/src/main/java/com/example/demo/types/service/TypeService.java new file mode 100644 index 0000000..e71b030 --- /dev/null +++ b/src/main/java/com/example/demo/types/service/TypeService.java @@ -0,0 +1,43 @@ +package com.example.demo.types.service; + +import java.util.List; +import java.util.Optional; + +import org.springframework.stereotype.Service; + +import com.example.demo.core.error.NotFoundException; +import com.example.demo.types.model.TypeEntity; +import com.example.demo.types.repository.TypeRepository; + +@Service +public class TypeService { + private final TypeRepository repository; + + public TypeService(TypeRepository repository) { + this.repository = repository; + } + + public List getAll() { + return repository.getAll(); + } + + public TypeEntity get(Long id) { + return Optional.ofNullable(repository.get(id)) + .orElseThrow(() -> new NotFoundException(id)); + } + + public TypeEntity create(TypeEntity entity) { + return repository.create(entity); + } + + public TypeEntity update(Long id, TypeEntity entity) { + final TypeEntity existsEntity = get(id); + existsEntity.setName(entity.getName()); + return repository.update(existsEntity); + } + + public TypeEntity delete(Long id) { + final TypeEntity existsEntity = get(id); + return repository.delete(existsEntity); + } +} diff --git a/src/main/java/com/example/demo/users/api/UserController.java b/src/main/java/com/example/demo/users/api/UserController.java new file mode 100644 index 0000000..1d00e35 --- /dev/null +++ b/src/main/java/com/example/demo/users/api/UserController.java @@ -0,0 +1,64 @@ +package com.example.demo.users.api; + +import java.util.List; + +import org.modelmapper.ModelMapper; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.example.demo.core.configuration.Constants; +import com.example.demo.users.model.UserEntity; +import com.example.demo.users.service.UserService; + +import jakarta.validation.Valid; + +@RestController +@RequestMapping(Constants.API_URL + "/user") +public class UserController { + private final UserService userService; + private final ModelMapper modelMapper; + + public UserController(UserService userService, ModelMapper modelMapper) { + this.userService = userService; + this.modelMapper = modelMapper; + } + + private UserDto toDto(UserEntity entity) { + return modelMapper.map(entity, UserDto.class); + } + + private UserEntity toEntity(UserDto dto) { + return modelMapper.map(dto, UserEntity.class); + } + + @GetMapping + public List getAll() { + return userService.getAll().stream().map(this::toDto).toList(); + } + + @GetMapping("/{id}") + public UserDto get(@PathVariable(name = "id") Long id) { + return toDto(userService.get(id)); + } + + @PostMapping + public UserDto create(@RequestBody @Valid UserDto dto) { + return toDto(userService.create(toEntity(dto))); + } + + @PutMapping("/{id}") + public UserDto update(@PathVariable(name = "id") Long id, @RequestBody UserDto dto) { + return toDto(userService.update(id, toEntity(dto))); + } + + @DeleteMapping("/{id}") + public UserDto delete(@PathVariable(name = "id") Long id) { + return toDto(userService.delete(id)); + } +} diff --git a/src/main/java/com/example/demo/users/api/UserDto.java b/src/main/java/com/example/demo/users/api/UserDto.java new file mode 100644 index 0000000..283cc85 --- /dev/null +++ b/src/main/java/com/example/demo/users/api/UserDto.java @@ -0,0 +1,49 @@ +package com.example.demo.users.api; + +import com.fasterxml.jackson.annotation.JsonProperty; + +import jakarta.validation.constraints.NotBlank; + +public class UserDto { + private Long id; + @NotBlank + private String name; + @NotBlank + private String email; + @NotBlank + private String password; + + @JsonProperty(access = JsonProperty.Access.READ_ONLY) + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + +} diff --git a/src/main/java/com/example/demo/users/model/UserEntity.java b/src/main/java/com/example/demo/users/model/UserEntity.java new file mode 100644 index 0000000..de0e140 --- /dev/null +++ b/src/main/java/com/example/demo/users/model/UserEntity.java @@ -0,0 +1,64 @@ +package com.example.demo.users.model; + +import java.util.Objects; + +import com.example.demo.core.model.BaseEntity; + +public class UserEntity extends BaseEntity { + private String name; + private String email; + private String password; + + public UserEntity() { + super(); + } + + public UserEntity(Long id, String name, String email, String password) { + super(id); + this.name = name; + this.email = email; + this.password = password; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + @Override + public int hashCode() { + return Objects.hash(id, name, email, password); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null || getClass() != obj.getClass()) + return false; + final UserEntity other = (UserEntity) obj; + return Objects.equals(other.getId(), id) + && Objects.equals(other.getName(), name) + && Objects.equals(other.getName(), email) + && Objects.equals(other.getName(), password); + } +} diff --git a/src/main/java/com/example/demo/users/repository/UserRepository.java b/src/main/java/com/example/demo/users/repository/UserRepository.java new file mode 100644 index 0000000..dbc0e52 --- /dev/null +++ b/src/main/java/com/example/demo/users/repository/UserRepository.java @@ -0,0 +1,11 @@ +package com.example.demo.users.repository; + +import org.springframework.stereotype.Repository; + +import com.example.demo.core.repository.MapRepository; +import com.example.demo.users.model.UserEntity; + +@Repository +public class UserRepository extends MapRepository { + +} diff --git a/src/main/java/com/example/demo/users/service/UserService.java b/src/main/java/com/example/demo/users/service/UserService.java new file mode 100644 index 0000000..4e5f338 --- /dev/null +++ b/src/main/java/com/example/demo/users/service/UserService.java @@ -0,0 +1,43 @@ +package com.example.demo.users.service; + +import java.util.List; +import java.util.Optional; + +import org.springframework.stereotype.Service; + +import com.example.demo.core.error.NotFoundException; +import com.example.demo.users.model.UserEntity; +import com.example.demo.users.repository.UserRepository; + +@Service +public class UserService { + private final UserRepository repository; + + public UserService(UserRepository repository) { + this.repository = repository; + } + + public List getAll() { + return repository.getAll(); + } + + public UserEntity get(Long id) { + return Optional.ofNullable(repository.get(id)) + .orElseThrow(() -> new NotFoundException(id)); + } + + public UserEntity create(UserEntity entity) { + return repository.create(entity); + } + + public UserEntity update(Long id, UserEntity entity) { + final UserEntity existsEntity = get(id); + existsEntity.setName(entity.getName()); + return repository.update(existsEntity); + } + + public UserEntity delete(Long id) { + final UserEntity existsEntity = get(id); + return repository.delete(existsEntity); + } +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/src/main/resources/application.properties @@ -0,0 +1 @@ + diff --git a/src/test/java/com/example/demo/CommentServiceTests.java b/src/test/java/com/example/demo/CommentServiceTests.java new file mode 100644 index 0000000..c169d12 --- /dev/null +++ b/src/test/java/com/example/demo/CommentServiceTests.java @@ -0,0 +1,81 @@ +package com.example.demo; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.MethodOrderer.OrderAnnotation; +import org.junit.jupiter.api.Order; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; + +import com.example.demo.comments.model.CommentEntity; +import com.example.demo.comments.service.CommentService; +import com.example.demo.core.error.NotFoundException; +import com.example.demo.users.model.UserEntity; +import com.example.demo.types.model.TypeEntity; +import com.example.demo.houses.model.HouseEntity; +import com.example.demo.materials.model.MaterialEntity; + +@SpringBootTest +@TestMethodOrder(OrderAnnotation.class) +public class CommentServiceTests { + @Autowired + private CommentService commentService; + + @Test + void getTest() { + Assertions.assertThrows(NotFoundException.class, () -> commentService.get(0L)); + } + + @Test + @Order(1) + void createTest() { + HouseEntity ae1 = new HouseEntity(null, null, 122423.00, + "Red Dragon", null, -1); + UserEntity ue1 = new UserEntity(null, "vanya", "vanya@gmail.com", "vanya"); + HouseEntity ae2 = new HouseEntity(null, null, 12.00, + "Vanya", null, -1); + UserEntity ue2 = new UserEntity(null, "baron", "baron@gmail.com", "12345"); + commentService.create(new CommentEntity(null, ae1, ue1, "Digital disigne and very hipe house", null, 3.5)); + commentService.create( + new CommentEntity(null, ae1, ue2, "Maybe is cool, but i don`t like this aria", null, 4.5)); + final CommentEntity last = commentService + .create(new CommentEntity(null, ae2, ue1, "Okey, its okey", null, 2.5)); + Assertions.assertEquals(3, commentService.getAll(0L, 0L).size()); + Assertions.assertEquals(last, commentService.get(3L)); + } + + @Test + @Order(2) + void updateTest() { + final String testName = "TEST"; + final CommentEntity entity = commentService.get(3L); + final String oldName = entity.getDescription(); + final CommentEntity newEntity = commentService.update(3L, new CommentEntity(null, new HouseEntity(null, null, + 122423.00, + "dfdsfds sdf", null, -1), + new UserEntity(null, "admin", "admin@gmail.com", "admin"), testName, null, 5)); + Assertions.assertEquals(3, commentService.getAll(0L, 0L).size()); + Assertions.assertEquals(newEntity, commentService.get(3L)); + Assertions.assertEquals(testName, newEntity.getDescription()); + Assertions.assertNotEquals(oldName, newEntity.getDescription()); + } + + @Test + @Order(3) + void deleteTest() { + commentService.delete(3L); + Assertions.assertEquals(2, commentService.getAll(0L, 0L).size()); + final CommentEntity last = commentService.get(2L); + Assertions.assertEquals(2L, last.getId()); + + final CommentEntity newEntity = commentService.create(new CommentEntity(null, + new HouseEntity(null, new TypeEntity(null, "Однокомнатная"), + 122423.00, + "dfdsfds sdf", + new MaterialEntity(null, "Ульяновск"), -1), + new UserEntity(null, "admin", "admin@gmail.com", "admin"), "Cool", null, 4)); + Assertions.assertEquals(3, commentService.getAll(0L, 0L).size()); + Assertions.assertEquals(4L, newEntity.getId()); + } +} diff --git a/src/test/java/com/example/demo/HouseServiceTests.java b/src/test/java/com/example/demo/HouseServiceTests.java new file mode 100644 index 0000000..46db281 --- /dev/null +++ b/src/test/java/com/example/demo/HouseServiceTests.java @@ -0,0 +1,73 @@ +package com.example.demo; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.MethodOrderer.OrderAnnotation; +import org.junit.jupiter.api.Order; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; + +import com.example.demo.core.error.NotFoundException; +import com.example.demo.types.model.TypeEntity; +import com.example.demo.houses.model.HouseEntity; +import com.example.demo.houses.service.HouseService; +import com.example.demo.materials.model.MaterialEntity; + +@SpringBootTest +@TestMethodOrder(OrderAnnotation.class) +public class HouseServiceTests { + @Autowired + private HouseService lineService; + + @Test + void getTest() { + Assertions.assertThrows(NotFoundException.class, () -> lineService.get(0L)); + } + + @Test + @Order(1) + void createTest() { + lineService.create(new HouseEntity(null, new TypeEntity(null, "Дача"), 122423.00, + "dfdsfds sdf", new MaterialEntity(null, "Кирпич"), 5)); + lineService.create(new HouseEntity(null, new TypeEntity(null, "Вилла"), 122423.00, + "dfdsfds sdf", new MaterialEntity(null, "Камень"), 5)); + final HouseEntity last = lineService + .create(new HouseEntity(null, new TypeEntity(null, "Дом"), 122423.00, + "dfdsfds sdf", new MaterialEntity(null, "Кирпич"), 5)); + Assertions.assertEquals(3, lineService.getAll(0L, 0L).size()); + Assertions.assertEquals(last, lineService.get(3L)); + } + + @Test + @Order(2) + void updateTest() { + final String testName = "TEST"; + final HouseEntity entity = lineService.get(3L); + final String oldName = entity.getName(); + final HouseEntity newEntity = lineService.update(3L, + new HouseEntity(1L, new TypeEntity(null, "name"), + 0.00, testName, + new MaterialEntity(null, "name"), 5)); + Assertions.assertEquals(3, lineService.getAll(0L, 0L).size()); + Assertions.assertEquals(newEntity, lineService.get(3L)); + Assertions.assertEquals(testName, newEntity.getName()); + Assertions.assertNotEquals(oldName, newEntity.getName()); + } + + @Test + @Order(3) + void deleteTest() { + lineService.delete(3L); + Assertions.assertEquals(2, lineService.getAll(0L, 0L).size()); + final HouseEntity last = lineService.get(2L); + Assertions.assertEquals(2L, last.getId()); + + final HouseEntity newEntity = lineService + .create(new HouseEntity(null, new TypeEntity(null, "name"), + 122423.00,"name", + new MaterialEntity(null, "name"), 3.5)); + Assertions.assertEquals(3, lineService.getAll(0L, 0L).size()); + Assertions.assertEquals(4L, newEntity.getId()); + } +} diff --git a/src/test/java/com/example/demo/MaterialServiceTests.java b/src/test/java/com/example/demo/MaterialServiceTests.java new file mode 100644 index 0000000..10782ff --- /dev/null +++ b/src/test/java/com/example/demo/MaterialServiceTests.java @@ -0,0 +1,61 @@ +package com.example.demo; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.MethodOrderer.OrderAnnotation; +import org.junit.jupiter.api.Order; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; + +import com.example.demo.core.error.NotFoundException; +import com.example.demo.materials.model.MaterialEntity; +import com.example.demo.materials.service.MaterialService; + +@SpringBootTest +@TestMethodOrder(OrderAnnotation.class) +public class MaterialServiceTests { + @Autowired + private MaterialService materialService; + + @Test + void getTest() { + Assertions.assertThrows(NotFoundException.class, () -> materialService.get(0L)); + } + + @Test + @Order(1) + void createTest() { + materialService.create(new MaterialEntity(null, "Ульяновск")); + materialService.create(new MaterialEntity(null, "Москва")); + final MaterialEntity last = materialService.create(new MaterialEntity(null, "Санкт-Петербург")); + Assertions.assertEquals(3, materialService.getAll().size()); + Assertions.assertEquals(last, materialService.get(3L)); + } + + @Test + @Order(2) + void updateTest() { + final String test = "TEST"; + final MaterialEntity entity = materialService.get(3L); + final String oldName = entity.getName(); + final MaterialEntity newEntity = materialService.update(3L, new MaterialEntity(1L, test)); + Assertions.assertEquals(3, materialService.getAll().size()); + Assertions.assertEquals(newEntity, materialService.get(3L)); + Assertions.assertEquals(test, newEntity.getName()); + Assertions.assertNotEquals(oldName, newEntity.getName()); + } + + @Test + @Order(3) + void deleteTest() { + materialService.delete(3L); + Assertions.assertEquals(2, materialService.getAll().size()); + final MaterialEntity last = materialService.get(2L); + Assertions.assertEquals(2L, last.getId()); + + final MaterialEntity newEntity = materialService.create(new MaterialEntity(null, "Санкт-Петербург")); + Assertions.assertEquals(3, materialService.getAll().size()); + Assertions.assertEquals(4L, newEntity.getId()); + } +} diff --git a/src/test/java/com/example/demo/SpeakerSrviceTests.java b/src/test/java/com/example/demo/SpeakerSrviceTests.java new file mode 100644 index 0000000..d8624d3 --- /dev/null +++ b/src/test/java/com/example/demo/SpeakerSrviceTests.java @@ -0,0 +1,38 @@ +package com.example.demo; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.NoSuchBeanDefinitionException; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; + +import com.example.demo.speaker.service.SpeakerService; + +@SpringBootTest +class SpeakerSrviceTests { + @Autowired + SpeakerService speakerService; + + @Test + void testSpeakerRus() { + final String res = speakerService.say("Мир", "ru"); + Assertions.assertEquals("Привет, Мир!", res); + } + + @Test + void testSpeakerEng() { + final String res = speakerService.say("World", "en"); + Assertions.assertEquals("Hello, World!", res); + } + + @Test + void testSpeakerDeu() { + final String res = speakerService.say("Welt", "de"); + Assertions.assertEquals("Hallo, Welt!", res); + } + + @Test + void testSpeakerErrorWired() { + Assertions.assertThrows(NoSuchBeanDefinitionException.class, () -> speakerService.say("Мир", "rus")); + } +} diff --git a/src/test/java/com/example/demo/TypeServiceTests.java b/src/test/java/com/example/demo/TypeServiceTests.java new file mode 100644 index 0000000..97eeae0 --- /dev/null +++ b/src/test/java/com/example/demo/TypeServiceTests.java @@ -0,0 +1,61 @@ +package com.example.demo; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.MethodOrderer.OrderAnnotation; +import org.junit.jupiter.api.Order; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; + +import com.example.demo.core.error.NotFoundException; +import com.example.demo.types.model.TypeEntity; +import com.example.demo.types.service.TypeService; + +@SpringBootTest +@TestMethodOrder(OrderAnnotation.class) +class TypeServiceTests { + @Autowired + private TypeService typeService; + + @Test + void getTest() { + Assertions.assertThrows(NotFoundException.class, () -> typeService.get(0L)); + } + + @Test + @Order(1) + void createTest() { + typeService.create(new TypeEntity(null, "Однокомнатная")); + typeService.create(new TypeEntity(null, "Двухкомнатная")); + final TypeEntity last = typeService.create(new TypeEntity(null, "Трехкомнатная")); + Assertions.assertEquals(3, typeService.getAll().size()); + Assertions.assertEquals(last, typeService.get(3L)); + } + + @Test + @Order(2) + void updateTest() { + final String test = "TEST"; + final TypeEntity entity = typeService.get(3L); + final String oldName = entity.getName(); + final TypeEntity newEntity = typeService.update(3L, new TypeEntity(1L, test)); + Assertions.assertEquals(3, typeService.getAll().size()); + Assertions.assertEquals(newEntity, typeService.get(3L)); + Assertions.assertEquals(test, newEntity.getName()); + Assertions.assertNotEquals(oldName, newEntity.getName()); + } + + @Test + @Order(3) + void deleteTest() { + typeService.delete(3L); + Assertions.assertEquals(2, typeService.getAll().size()); + final TypeEntity last = typeService.get(2L); + Assertions.assertEquals(2L, last.getId()); + + final TypeEntity newEntity = typeService.create(new TypeEntity(null, "Двухкомнатная")); + Assertions.assertEquals(3, typeService.getAll().size()); + Assertions.assertEquals(4L, newEntity.getId()); + } +} diff --git a/src/test/java/com/example/demo/UserServiceTests.java b/src/test/java/com/example/demo/UserServiceTests.java new file mode 100644 index 0000000..667741f --- /dev/null +++ b/src/test/java/com/example/demo/UserServiceTests.java @@ -0,0 +1,61 @@ +package com.example.demo; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.MethodOrderer.OrderAnnotation; +import org.junit.jupiter.api.Order; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; + +import com.example.demo.core.error.NotFoundException; +import com.example.demo.users.model.UserEntity; +import com.example.demo.users.service.UserService; + +@SpringBootTest +@TestMethodOrder(OrderAnnotation.class) +public class UserServiceTests { + @Autowired + private UserService userService; + + @Test + void getTest() { + Assertions.assertThrows(NotFoundException.class, () -> userService.get(0L)); + } + + @Test + @Order(1) + void createTest() { + userService.create(new UserEntity(null, "admin", "admin@gmail.com", "admin")); + userService.create(new UserEntity(null, "user1", "user1@gmail.com", "user1")); + final UserEntity last = userService.create(new UserEntity(null, "user2", "user2@gmail.com", "user2")); + Assertions.assertEquals(3, userService.getAll().size()); + Assertions.assertEquals(last, userService.get(3L)); + } + + @Test + @Order(2) + void updateTest() { + final String test = "TEST"; + final UserEntity entity = userService.get(3L); + final String oldName = entity.getName(); + final UserEntity newEntity = userService.update(3L, new UserEntity(1L, test, "user2@gmail.com", "user2")); + Assertions.assertEquals(3, userService.getAll().size()); + Assertions.assertEquals(newEntity, userService.get(3L)); + Assertions.assertEquals(test, newEntity.getName()); + Assertions.assertNotEquals(oldName, newEntity.getName()); + } + + @Test + @Order(3) + void deleteTest() { + userService.delete(3L); + Assertions.assertEquals(2, userService.getAll().size()); + final UserEntity last = userService.get(2L); + Assertions.assertEquals(2L, last.getId()); + + final UserEntity newEntity = userService.create(new UserEntity(null, "admin", "admin", null)); + Assertions.assertEquals(3, userService.getAll().size()); + Assertions.assertEquals(4L, newEntity.getId()); + } +}