Zakharov_Rostislav/Internet-programming_PIbd-23_ZakharovRA
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

global catastrofe

Browse Source
This commit is contained in:
Zakharov_Rostislav 2024-05-29 21:23:59 +04:00
parent 20bc1999f5
commit 451230933b
36 changed files with 87 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
SpringApp/library/src/main/java/com/ip/library/LibraryApplication.java
View File

@ -12,14 +12,14 @@ import org.springframework.boot.CommandLineRunner;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import com.ip.library.authors.model.AuthorEntity; import com.ip.library.controllers.authors.AuthorEntity;
import com.ip.library.authors.service.AuthorService; import com.ip.library.controllers.authors.AuthorService;
import com.ip.library.books.model.BookEntity; import com.ip.library.controllers.books.BookEntity;
import com.ip.library.books.service.BookService; import com.ip.library.controllers.books.BookService;
import com.ip.library.types.model.TypeEntity; import com.ip.library.controllers.types.TypeEntity;
import com.ip.library.types.service.TypeService; import com.ip.library.controllers.types.TypeService;
import com.ip.library.users.model.UserEntity; import com.ip.library.controllers.users.UserEntity;
import com.ip.library.users.service.UserService; import com.ip.library.controllers.users.UserService;
@SuppressWarnings("unused") @SuppressWarnings("unused")

6
SpringApp/library/src/main/java/com/ip/library/authors/api/AuthorController.java → SpringApp/library/src/main/java/com/ip/library/controllers/authors/AuthorController.java
View File

@ -1,4 +1,4 @@
package com.ip.library.authors.api; package com.ip.library.controllers.authors;
import java.util.List; import java.util.List;
@ -13,10 +13,8 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.ip.library.controllers.users.UserRole;
import com.ip.library.core.configuration.Constants; import com.ip.library.core.configuration.Constants;
import com.ip.library.users.model.UserRole;
import com.ip.library.authors.model.AuthorEntity;
import com.ip.library.authors.service.AuthorService;
import jakarta.validation.Valid; import jakarta.validation.Valid;

2
SpringApp/library/src/main/java/com/ip/library/authors/api/AuthorDto.java → SpringApp/library/src/main/java/com/ip/library/controllers/authors/AuthorDto.java
View File

@ -1,4 +1,4 @@
package com.ip.library.authors.api; package com.ip.library.controllers.authors;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;

6
SpringApp/library/src/main/java/com/ip/library/authors/model/AuthorEntity.java → SpringApp/library/src/main/java/com/ip/library/controllers/authors/AuthorEntity.java
View File

@ -1,11 +1,11 @@
package com.ip.library.authors.model; package com.ip.library.controllers.authors;
import java.util.HashSet; import java.util.HashSet;
import java.util.Objects; import java.util.Objects;
import java.util.Set; import java.util.Set;
import com.ip.library.authors_books.model.AuthorsBooksEntity; import com.ip.library.controllers.authors_books.AuthorsBooksEntity;
import com.ip.library.books.model.BookEntity; import com.ip.library.controllers.books.BookEntity;
import com.ip.library.core.model.BaseEntity; import com.ip.library.core.model.BaseEntity;
import jakarta.persistence.CascadeType; import jakarta.persistence.CascadeType;

4
SpringApp/library/src/main/java/com/ip/library/authors/repository/AuthorRepository.java → SpringApp/library/src/main/java/com/ip/library/controllers/authors/AuthorRepository.java
View File

@ -1,12 +1,10 @@
package com.ip.library.authors.repository; package com.ip.library.controllers.authors;
import java.util.Optional; import java.util.Optional;
import org.springframework.data.repository.CrudRepository; import org.springframework.data.repository.CrudRepository;
import org.springframework.data.repository.PagingAndSortingRepository; import org.springframework.data.repository.PagingAndSortingRepository;
import com.ip.library.authors.model.AuthorEntity;
public interface AuthorRepository extends public interface AuthorRepository extends
CrudRepository<AuthorEntity, Long>, CrudRepository<AuthorEntity, Long>,
PagingAndSortingRepository<AuthorEntity, Long> { PagingAndSortingRepository<AuthorEntity, Long> {

4
SpringApp/library/src/main/java/com/ip/library/authors/service/AuthorService.java → SpringApp/library/src/main/java/com/ip/library/controllers/authors/AuthorService.java
View File

@ -1,4 +1,4 @@
package com.ip.library.authors.service; package com.ip.library.controllers.authors;
import java.util.List; import java.util.List;
import java.util.stream.StreamSupport; import java.util.stream.StreamSupport;
@ -7,8 +7,6 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import com.ip.library.core.error.NotFoundException; import com.ip.library.core.error.NotFoundException;
import com.ip.library.authors.model.AuthorEntity;
import com.ip.library.authors.repository.AuthorRepository;
@Service @Service
public class AuthorService { public class AuthorService {

6
SpringApp/library/src/main/java/com/ip/library/authors_books/model/AuthorsBooksEntity.java → SpringApp/library/src/main/java/com/ip/library/controllers/authors_books/AuthorsBooksEntity.java
View File

@ -1,9 +1,9 @@
package com.ip.library.authors_books.model; package com.ip.library.controllers.authors_books;
import java.util.Objects; import java.util.Objects;
import com.ip.library.authors.model.AuthorEntity; import com.ip.library.controllers.authors.AuthorEntity;
import com.ip.library.books.model.BookEntity; import com.ip.library.controllers.books.BookEntity;
import jakarta.persistence.EmbeddedId; import jakarta.persistence.EmbeddedId;
import jakarta.persistence.Entity; import jakarta.persistence.Entity;

2
SpringApp/library/src/main/java/com/ip/library/authors_books/model/AuthorsBooksId.java → SpringApp/library/src/main/java/com/ip/library/controllers/authors_books/AuthorsBooksId.java
View File

@ -1,4 +1,4 @@
package com.ip.library.authors_books.model; package com.ip.library.controllers.authors_books;
import java.util.Objects; import java.util.Objects;
import java.util.Optional; import java.util.Optional;

8
SpringApp/library/src/main/java/com/ip/library/books/api/BookController.java → SpringApp/library/src/main/java/com/ip/library/controllers/books/BookController.java
View File

@ -1,4 +1,4 @@
package com.ip.library.books.api; package com.ip.library.controllers.books;
import java.util.List; import java.util.List;
@ -14,11 +14,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.ip.library.books.model.BookEntity; import com.ip.library.controllers.types.TypeService;
import com.ip.library.books.service.BookService; import com.ip.library.controllers.users.UserRole;
import com.ip.library.core.configuration.Constants; import com.ip.library.core.configuration.Constants;
import com.ip.library.types.service.TypeService;
import com.ip.library.users.model.UserRole;
import jakarta.validation.Valid; import jakarta.validation.Valid;

2
SpringApp/library/src/main/java/com/ip/library/books/api/BookDto.java → SpringApp/library/src/main/java/com/ip/library/controllers/books/BookDto.java
View File

@ -1,4 +1,4 @@
package com.ip.library.books.api; package com.ip.library.controllers.books;
import java.util.List; import java.util.List;

8
SpringApp/library/src/main/java/com/ip/library/books/model/BookEntity.java → SpringApp/library/src/main/java/com/ip/library/controllers/books/BookEntity.java
View File

@ -1,11 +1,10 @@
package com.ip.library.books.model; package com.ip.library.controllers.books;
import java.util.HashSet; import java.util.HashSet;
import java.util.Objects; import java.util.Objects;
import java.util.Set; import java.util.Set;
import com.ip.library.core.model.BaseEntity; import com.ip.library.core.model.BaseEntity;
import com.ip.library.types.model.TypeEntity;
import jakarta.persistence.CascadeType; import jakarta.persistence.CascadeType;
import jakarta.persistence.Column; import jakarta.persistence.Column;
@ -17,8 +16,9 @@ import jakarta.persistence.OneToMany;
import jakarta.persistence.OrderBy; import jakarta.persistence.OrderBy;
import jakarta.persistence.Table; import jakarta.persistence.Table;
import com.ip.library.authors.model.AuthorEntity; import com.ip.library.controllers.authors.AuthorEntity;
import com.ip.library.authors_books.model.AuthorsBooksEntity; import com.ip.library.controllers.authors_books.AuthorsBooksEntity;
import com.ip.library.controllers.types.TypeEntity;
@Entity @Entity
@Table(name = "books") @Table(name = "books")

4
SpringApp/library/src/main/java/com/ip/library/books/repository/BookRepository.java → SpringApp/library/src/main/java/com/ip/library/controllers/books/BookRepository.java
View File

@ -1,4 +1,4 @@
package com.ip.library.books.repository; package com.ip.library.controllers.books;
import java.util.List; import java.util.List;
import java.util.Optional; import java.util.Optional;
@ -9,8 +9,6 @@ import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.CrudRepository; import org.springframework.data.repository.CrudRepository;
import org.springframework.data.repository.PagingAndSortingRepository; import org.springframework.data.repository.PagingAndSortingRepository;
import com.ip.library.books.model.BookEntity;
public interface BookRepository extends public interface BookRepository extends
CrudRepository<BookEntity, Long>, CrudRepository<BookEntity, Long>,
PagingAndSortingRepository<BookEntity, Long> { PagingAndSortingRepository<BookEntity, Long> {

8
SpringApp/library/src/main/java/com/ip/library/books/service/BookService.java → SpringApp/library/src/main/java/com/ip/library/controllers/books/BookService.java
View File

@ -1,4 +1,4 @@
package com.ip.library.books.service; package com.ip.library.controllers.books;
import java.util.List; import java.util.List;
import java.util.stream.StreamSupport; import java.util.stream.StreamSupport;
@ -8,10 +8,8 @@ import org.springframework.data.domain.PageRequest;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import com.ip.library.authors.model.AuthorEntity; import com.ip.library.controllers.authors.AuthorEntity;
import com.ip.library.authors.service.AuthorService; import com.ip.library.controllers.authors.AuthorService;
import com.ip.library.books.model.BookEntity;
import com.ip.library.books.repository.BookRepository;
import com.ip.library.core.error.NotFoundException; import com.ip.library.core.error.NotFoundException;
@Service @Service

6
SpringApp/library/src/main/java/com/ip/library/favorites/model/FavoriteEntity.java → SpringApp/library/src/main/java/com/ip/library/controllers/favorites/FavoriteEntity.java
View File

@ -1,9 +1,9 @@
package com.ip.library.favorites.model; package com.ip.library.controllers.favorites;
import java.util.Objects; import java.util.Objects;
import com.ip.library.books.model.BookEntity; import com.ip.library.controllers.books.BookEntity;
import com.ip.library.users.model.UserEntity; import com.ip.library.controllers.users.UserEntity;
import jakarta.persistence.EmbeddedId; import jakarta.persistence.EmbeddedId;
import jakarta.persistence.Entity; import jakarta.persistence.Entity;

2
SpringApp/library/src/main/java/com/ip/library/favorites/model/UserBookId.java → SpringApp/library/src/main/java/com/ip/library/controllers/favorites/UserBookId.java
View File

@ -1,4 +1,4 @@
package com.ip.library.favorites.model; package com.ip.library.controllers.favorites;
import java.util.Objects; import java.util.Objects;
import java.util.Optional; import java.util.Optional;

6
SpringApp/library/src/main/java/com/ip/library/types/api/TypeController.java → SpringApp/library/src/main/java/com/ip/library/controllers/types/TypeController.java
View File

@ -1,4 +1,4 @@
package com.ip.library.types.api; package com.ip.library.controllers.types;
import java.util.List; import java.util.List;
@ -13,10 +13,8 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.ip.library.controllers.users.UserRole;
import com.ip.library.core.configuration.Constants; import com.ip.library.core.configuration.Constants;
import com.ip.library.types.model.TypeEntity;
import com.ip.library.types.service.TypeService;
import com.ip.library.users.model.UserRole;
import jakarta.validation.Valid; import jakarta.validation.Valid;

2
SpringApp/library/src/main/java/com/ip/library/types/api/TypeDto.java → SpringApp/library/src/main/java/com/ip/library/controllers/types/TypeDto.java
View File

@ -1,4 +1,4 @@
package com.ip.library.types.api; package com.ip.library.controllers.types;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;

2
SpringApp/library/src/main/java/com/ip/library/types/model/TypeEntity.java → SpringApp/library/src/main/java/com/ip/library/controllers/types/TypeEntity.java
View File

@ -1,4 +1,4 @@
package com.ip.library.types.model; package com.ip.library.controllers.types;
import java.util.Objects; import java.util.Objects;

4
SpringApp/library/src/main/java/com/ip/library/types/repository/TypeRepository.java → SpringApp/library/src/main/java/com/ip/library/controllers/types/TypeRepository.java
View File

@ -1,11 +1,9 @@
package com.ip.library.types.repository; package com.ip.library.controllers.types;
import java.util.Optional; import java.util.Optional;
import org.springframework.data.repository.CrudRepository; import org.springframework.data.repository.CrudRepository;
import com.ip.library.types.model.TypeEntity;
public interface TypeRepository extends CrudRepository<TypeEntity, Long> { public interface TypeRepository extends CrudRepository<TypeEntity, Long> {
Optional<TypeEntity> findByNameIgnoreCase(String name); Optional<TypeEntity> findByNameIgnoreCase(String name);
} }

4
SpringApp/library/src/main/java/com/ip/library/types/service/TypeService.java → SpringApp/library/src/main/java/com/ip/library/controllers/types/TypeService.java
View File

@ -1,4 +1,4 @@
package com.ip.library.types.service; package com.ip.library.controllers.types;
import java.util.List; import java.util.List;
import java.util.stream.StreamSupport; import java.util.stream.StreamSupport;
@ -7,8 +7,6 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import com.ip.library.core.error.NotFoundException; import com.ip.library.core.error.NotFoundException;
import com.ip.library.types.model.TypeEntity;
import com.ip.library.types.repository.TypeRepository;
@Service @Service
public class TypeService { public class TypeService {

4
SpringApp/library/src/main/java/com/ip/library/users/api/LoginController.java → SpringApp/library/src/main/java/com/ip/library/controllers/users/LoginController.java
View File

@ -1,4 +1,4 @@
package com.ip.library.users.api; package com.ip.library.controllers.users;
import java.util.Objects; import java.util.Objects;
@ -8,8 +8,6 @@ import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.ip.library.core.configuration.Constants; import com.ip.library.core.configuration.Constants;
import com.ip.library.users.model.UserEntity;
import com.ip.library.users.service.UserService;
@RestController @RestController
public class LoginController { public class LoginController {

8
SpringApp/library/src/main/java/com/ip/library/users/api/UserBookController.java → SpringApp/library/src/main/java/com/ip/library/controllers/users/UserBookController.java
View File

@ -1,4 +1,4 @@
package com.ip.library.users.api; package com.ip.library.controllers.users;
import java.util.List; import java.util.List;
@ -10,11 +10,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.ip.library.books.api.BookDto; import com.ip.library.controllers.books.BookDto;
import com.ip.library.books.model.BookEntity; import com.ip.library.controllers.books.BookEntity;
import com.ip.library.core.configuration.Constants; import com.ip.library.core.configuration.Constants;
import com.ip.library.users.model.UserRole;
import com.ip.library.users.service.UserService;
@RestController @RestController
@Secured(value = { UserRole.Secured.USER, UserRole.Secured.ADMIN }) @Secured(value = { UserRole.Secured.USER, UserRole.Secured.ADMIN })

5
SpringApp/library/src/main/java/com/ip/library/users/api/UserController.java → SpringApp/library/src/main/java/com/ip/library/controllers/users/UserController.java
View File

@ -1,4 +1,4 @@
package com.ip.library.users.api; package com.ip.library.controllers.users;
import org.modelmapper.ModelMapper; import org.modelmapper.ModelMapper;
import org.springframework.security.access.annotation.Secured; import org.springframework.security.access.annotation.Secured;
@ -15,9 +15,6 @@ import org.springframework.web.bind.annotation.RestController;
import com.ip.library.core.api.PageDto; import com.ip.library.core.api.PageDto;
import com.ip.library.core.api.PageDtoMapper; import com.ip.library.core.api.PageDtoMapper;
import com.ip.library.core.configuration.Constants; import com.ip.library.core.configuration.Constants;
import com.ip.library.users.model.UserEntity;
import com.ip.library.users.model.UserRole;
import com.ip.library.users.service.UserService;
import jakarta.validation.Valid; import jakarta.validation.Valid;

2
SpringApp/library/src/main/java/com/ip/library/users/api/UserDto.java → SpringApp/library/src/main/java/com/ip/library/controllers/users/UserDto.java
View File

@ -1,4 +1,4 @@
package com.ip.library.users.api; package com.ip.library.controllers.users;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;

6
SpringApp/library/src/main/java/com/ip/library/users/model/UserEntity.java → SpringApp/library/src/main/java/com/ip/library/controllers/users/UserEntity.java
View File

@ -1,12 +1,12 @@
package com.ip.library.users.model; package com.ip.library.controllers.users;
import java.util.HashSet; import java.util.HashSet;
import java.util.Objects; import java.util.Objects;
import java.util.Set; import java.util.Set;
import com.ip.library.books.model.BookEntity; import com.ip.library.controllers.books.BookEntity;
import com.ip.library.controllers.favorites.FavoriteEntity;
import com.ip.library.core.model.BaseEntity; import com.ip.library.core.model.BaseEntity;
import com.ip.library.favorites.model.FavoriteEntity;
import jakarta.persistence.CascadeType; import jakarta.persistence.CascadeType;
import jakarta.persistence.Column; import jakarta.persistence.Column;

5
SpringApp/library/src/main/java/com/ip/library/users/repository/UserRepository.java → SpringApp/library/src/main/java/com/ip/library/controllers/users/UserRepository.java
View File

@ -1,4 +1,4 @@
package com.ip.library.users.repository; package com.ip.library.controllers.users;
import java.util.List; import java.util.List;
import java.util.Optional; import java.util.Optional;
@ -9,8 +9,7 @@ import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.CrudRepository; import org.springframework.data.repository.CrudRepository;
import org.springframework.data.repository.PagingAndSortingRepository; import org.springframework.data.repository.PagingAndSortingRepository;
import com.ip.library.books.model.BookEntity; import com.ip.library.controllers.books.BookEntity;
import com.ip.library.users.model.UserEntity;
public interface UserRepository extends public interface UserRepository extends
CrudRepository<UserEntity, Long>, CrudRepository<UserEntity, Long>,

2
SpringApp/library/src/main/java/com/ip/library/users/model/UserRole.java → SpringApp/library/src/main/java/com/ip/library/controllers/users/UserRole.java
View File

@ -1,4 +1,4 @@
package com.ip.library.users.model; package com.ip.library.controllers.users;
import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.GrantedAuthority;

11
SpringApp/library/src/main/java/com/ip/library/users/service/UserService.java → SpringApp/library/src/main/java/com/ip/library/controllers/users/UserService.java
View File

@ -1,4 +1,4 @@
package com.ip.library.users.service; package com.ip.library.controllers.users;
import java.util.List; import java.util.List;
import java.util.Optional; import java.util.Optional;
@ -14,16 +14,13 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import com.ip.library.books.model.BookEntity; import com.ip.library.controllers.books.BookEntity;
import com.ip.library.books.service.BookService; import com.ip.library.controllers.books.BookService;
import com.ip.library.core.configuration.Constants; import com.ip.library.core.configuration.Constants;
import com.ip.library.core.error.NotFoundException; import com.ip.library.core.error.NotFoundException;
import com.ip.library.core.jwt.JwtException; import com.ip.library.core.jwt.JwtException;
import com.ip.library.core.jwt.JwtProvider; import com.ip.library.core.jwt.JwtProvider;
import com.ip.library.core.security.UserPrincipal; import com.ip.library.core.security.UserPrincipal;
import com.ip.library.users.model.UserEntity;
import com.ip.library.users.model.UserRole;
import com.ip.library.users.repository.UserRepository;
@Service @Service
public class UserService implements UserDetailsService{ public class UserService implements UserDetailsService{
@ -77,6 +74,8 @@ public class UserService implements UserDetailsService{
public UserEntity create(UserEntity entity) { public UserEntity create(UserEntity entity) {
if (entity == null) if (entity == null)
throw new IllegalArgumentException("Entity is null"); throw new IllegalArgumentException("Entity is null");
if (entity.getPassword() == null)
throw new IllegalArgumentException("Entity.GetPassword is null");
checkLoginUniqueness(entity.getLogin()); checkLoginUniqueness(entity.getLogin());
final String password = Optional.ofNullable(entity.getPassword()).orElse(""); final String password = Optional.ofNullable(entity.getPassword()).orElse("");
entity.setPassword( entity.setPassword(

2
SpringApp/library/src/main/java/com/ip/library/core/jwt/JwtFilter.java
View File

@ -10,7 +10,7 @@ import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import org.springframework.web.filter.OncePerRequestFilter; import org.springframework.web.filter.OncePerRequestFilter;
import com.ip.library.users.service.UserService; import com.ip.library.controllers.users.UserService;
import jakarta.servlet.FilterChain; import jakarta.servlet.FilterChain;
import jakarta.servlet.ServletException; import jakarta.servlet.ServletException;

4
SpringApp/library/src/main/java/com/ip/library/core/security/SecurityConfiguration.java
View File

@ -21,11 +21,11 @@ import org.springframework.web.cors.CorsConfiguration;
import org.springframework.web.cors.UrlBasedCorsConfigurationSource; import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
import org.springframework.web.filter.CorsFilter; import org.springframework.web.filter.CorsFilter;
import com.ip.library.controllers.users.UserRole;
import com.ip.library.controllers.users.UserService;
import com.ip.library.core.configuration.Constants; import com.ip.library.core.configuration.Constants;
import com.ip.library.core.error.AdviceController; import com.ip.library.core.error.AdviceController;
import com.ip.library.core.jwt.JwtFilter; import com.ip.library.core.jwt.JwtFilter;
import com.ip.library.users.model.UserRole;
import com.ip.library.users.service.UserService;
@Configuration @Configuration
@EnableWebSecurity @EnableWebSecurity

2
SpringApp/library/src/main/java/com/ip/library/core/security/UserPrincipal.java
View File

@ -6,7 +6,7 @@ import java.util.Set;
import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetails;
import com.ip.library.users.model.UserEntity; import com.ip.library.controllers.users.UserEntity;
public class UserPrincipal implements UserDetails { public class UserPrincipal implements UserDetails {
private final long id; private final long id;

4
SpringApp/library/src/test/java/com/ip/library/AuthorsTests.java
View File

@ -8,9 +8,9 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.dao.DataIntegrityViolationException; import org.springframework.dao.DataIntegrityViolationException;
import com.ip.library.controllers.authors.AuthorEntity;
import com.ip.library.controllers.authors.AuthorService;
import com.ip.library.core.error.NotFoundException; import com.ip.library.core.error.NotFoundException;
import com.ip.library.authors.model.AuthorEntity;
import com.ip.library.authors.service.AuthorService;
@SpringBootTest @SpringBootTest
class AuthorsTests { class AuthorsTests {

12
SpringApp/library/src/test/java/com/ip/library/BooksTests.java
View File

@ -11,12 +11,12 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.dao.DataIntegrityViolationException; import org.springframework.dao.DataIntegrityViolationException;
import com.ip.library.core.error.NotFoundException; import com.ip.library.core.error.NotFoundException;
import com.ip.library.types.model.TypeEntity; import com.ip.library.controllers.authors.AuthorEntity;
import com.ip.library.types.service.TypeService; import com.ip.library.controllers.authors.AuthorService;
import com.ip.library.authors.model.AuthorEntity; import com.ip.library.controllers.books.BookEntity;
import com.ip.library.authors.service.AuthorService; import com.ip.library.controllers.books.BookService;
import com.ip.library.books.model.BookEntity; import com.ip.library.controllers.types.TypeEntity;
import com.ip.library.books.service.BookService; import com.ip.library.controllers.types.TypeService;
@SpringBootTest @SpringBootTest
class BooksTests { class BooksTests {

12
SpringApp/library/src/test/java/com/ip/library/FavoritesTests.java
View File

@ -9,12 +9,12 @@ import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest;
import com.ip.library.books.model.BookEntity; import com.ip.library.controllers.books.BookEntity;
import com.ip.library.books.service.BookService; import com.ip.library.controllers.books.BookService;
import com.ip.library.types.model.TypeEntity; import com.ip.library.controllers.types.TypeEntity;
import com.ip.library.types.service.TypeService; import com.ip.library.controllers.types.TypeService;
import com.ip.library.users.model.UserEntity; import com.ip.library.controllers.users.UserEntity;
import com.ip.library.users.service.UserService; import com.ip.library.controllers.users.UserService;
@SpringBootTest @SpringBootTest
class FavoritesTests { class FavoritesTests {

4
SpringApp/library/src/test/java/com/ip/library/TypesTests.java
View File

@ -8,9 +8,9 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.dao.DataIntegrityViolationException; import org.springframework.dao.DataIntegrityViolationException;
import com.ip.library.controllers.types.TypeEntity;
import com.ip.library.controllers.types.TypeService;
import com.ip.library.core.error.NotFoundException; import com.ip.library.core.error.NotFoundException;
import com.ip.library.types.model.TypeEntity;
import com.ip.library.types.service.TypeService;
@SpringBootTest @SpringBootTest
class TypesTests { class TypesTests {

13
SpringApp/library/src/test/java/com/ip/library/UsersTests.java
View File

@ -7,16 +7,19 @@ import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.dao.DataIntegrityViolationException; import org.springframework.dao.DataIntegrityViolationException;
import org.springframework.security.crypto.password.PasswordEncoder;
import com.ip.library.controllers.users.UserEntity;
import com.ip.library.controllers.users.UserRole;
import com.ip.library.controllers.users.UserService;
import com.ip.library.core.error.NotFoundException; import com.ip.library.core.error.NotFoundException;
import com.ip.library.users.model.UserEntity;
import com.ip.library.users.model.UserRole;
import com.ip.library.users.service.UserService;
@SpringBootTest @SpringBootTest
class UsersTests { class UsersTests {
@Autowired @Autowired
private UserService userService; private UserService userService;
@Autowired
private PasswordEncoder passwordEncoder;
private UserEntity user; private UserEntity user;
@AfterEach @AfterEach
@ -36,7 +39,7 @@ class UsersTests {
void createTest() { void createTest() {
Assertions.assertEquals(3, userService.getAll().size()); Assertions.assertEquals(3, userService.getAll().size());
Assertions.assertEquals("user3", user.getLogin()); Assertions.assertEquals("user3", user.getLogin());
Assertions.assertEquals("aqw2sed45", user.getPassword()); Assertions.assertTrue(passwordEncoder.matches("aqw2sed45", user.getPassword()));
Assertions.assertEquals(UserRole.USER, user.getRole()); Assertions.assertEquals(UserRole.USER, user.getRole());
Assertions.assertEquals(0, user.getFavorites().size()); Assertions.assertEquals(0, user.getFavorites().size());
} }
@ -102,7 +105,7 @@ class UsersTests {
@Test @Test
void nullPasswordTest() { void nullPasswordTest() {
Assertions.assertThrows( Assertions.assertThrows(
DataIntegrityViolationException.class, IllegalArgumentException.class,
() -> userService.create(new UserEntity(user.getLogin() + "TEST", null)) () -> userService.create(new UserEntity(user.getLogin() + "TEST", null))
); );
Assertions.assertThrows( Assertions.assertThrows(