Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 48 additions & 4 deletions NauJava/pom.xml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>4.0.3</version>
<relativePath/> <!-- lookup parent from repository -->
<relativePath/>
</parent>
<groupId>ru.andrmuratov</groupId>
<artifactId>NauJava</artifactId>
Expand All @@ -30,16 +30,60 @@
<java.version>21</java.version>
</properties>
<dependencies>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator-test</artifactId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
</dependency>

<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<scope>runtime</scope>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-thymeleaf</artifactId>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-rest</artifactId>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId>
</dependency>

<dependency>
<groupId>org.thymeleaf.extras</groupId>
<artifactId>thymeleaf-extras-springsecurity6</artifactId>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-test</artifactId>
<scope>test</scope>
</dependency>

</dependencies>

<build>
Expand All @@ -51,4 +95,4 @@
</plugins>
</build>

</project>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@

@SpringBootApplication
public class NauJavaApplication {

public static void main(String[] args) {
SpringApplication.run(NauJavaApplication.class, args);
}

}
}
10 changes: 5 additions & 5 deletions NauJava/src/main/java/ru/andrmuratov/NauJava/config/Config.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Scope;
import org.springframework.boot.CommandLineRunner;
//import org.springframework.boot.CommandLineRunner;
import org.springframework.beans.factory.annotation.Value;
import jakarta.annotation.PostConstruct;
import ru.andrmuratov.NauJava.entity.Task;
Expand Down Expand Up @@ -33,8 +33,8 @@ public List<Task> taskContainer() {
return new ArrayList<>();
}

@Bean
public CommandLineRunner run(CommandProcessor processor) {
return args -> processor.start();
}
// @Bean
// public CommandLineRunner run(CommandProcessor processor) {
// return args -> processor.start();
// }
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package ru.andrmuratov.NauJava.controller;

import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;

@Controller
public class LoginController {

@GetMapping("/login")
public String loginPage() {
return "login";
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
package ru.andrmuratov.NauJava.controller;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import ru.andrmuratov.NauJava.entity.User;
import ru.andrmuratov.NauJava.repository.UserRepository;

@Controller
public class RegistrationController {

private final UserRepository userRepository;
private final PasswordEncoder passwordEncoder;

@Autowired
public RegistrationController(UserRepository userRepository, PasswordEncoder passwordEncoder) {
this.userRepository = userRepository;
this.passwordEncoder = passwordEncoder;
}

@GetMapping("/registration")
public String registrationPage() {
return "registration";
}

@PostMapping("/registration")
public String registerUser(User user, Model model) {
if (userRepository.findByUsername(user.getUsername()).isPresent()) {
model.addAttribute("message", "User already exists");
return "registration";
}

user.setPassword(passwordEncoder.encode(user.getPassword()));

if (user.getRole() == null || user.getRole().isEmpty()) {
user.setRole("USER");
}

userRepository.save(user);
return "redirect:/login";
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
package ru.andrmuratov.NauJava.controller;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import ru.andrmuratov.NauJava.entity.User;
import ru.andrmuratov.NauJava.repository.UserRepository;

import java.util.List;
import java.util.Optional;

@RestController
@RequestMapping("/api/users")
public class UserController {

private final UserRepository userRepository;

@Autowired
public UserController(UserRepository userRepository) {
this.userRepository = userRepository;
}

@GetMapping("/by-username")
public Optional<User> findByUsername(@RequestParam String username) {
return userRepository.findByUsername(username);
}

@GetMapping("/by-role")
public List<User> findByRole(@RequestParam String role) {
return userRepository.findByRoleJPQL(role);
}

@GetMapping("/by-role-email")
public List<User> findByRoleAndEmail(@RequestParam String role, @RequestParam String email) {
return userRepository.findByRoleAndEmailContaining(role, email);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
package ru.andrmuratov.NauJava.controller;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import ru.andrmuratov.NauJava.entity.User;
import ru.andrmuratov.NauJava.repository.UserRepository;

@Controller
@RequestMapping("/users")
public class UserViewController {

private final UserRepository userRepository;

@Autowired
public UserViewController(UserRepository userRepository) {
this.userRepository = userRepository;
}

@GetMapping("/list")
public String listUsers(Model model) {
Iterable<User> users = userRepository.findAll();
model.addAttribute("users", users);
return "user-list";
}
}

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package ru.andrmuratov.NauJava.dao;

import ru.andrmuratov.NauJava.entity.User;
import java.util.List;

public interface UserRepositoryCustom {
List<User> findByNameCriteria(String name);
List<User> findByRoleCriteria(String role);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
package ru.andrmuratov.NauJava.dao;

import jakarta.persistence.EntityManager;
import jakarta.persistence.criteria.CriteriaBuilder;
import jakarta.persistence.criteria.CriteriaQuery;
import jakarta.persistence.criteria.Predicate;
import jakarta.persistence.criteria.Root;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Repository;
import ru.andrmuratov.NauJava.entity.User;

import java.util.List;

@Repository
public class UserRepositoryImpl implements UserRepositoryCustom {

private final EntityManager entityManager;

@Autowired
public UserRepositoryImpl(EntityManager entityManager) {
this.entityManager = entityManager;
}

@Override
public List<User> findByNameCriteria(String name) {
CriteriaBuilder cb = entityManager.getCriteriaBuilder();
CriteriaQuery<User> cq = cb.createQuery(User.class);
Root<User> root = cq.from(User.class);
Predicate predicate = cb.equal(root.get("name"), name);
cq.select(root).where(predicate);
return entityManager.createQuery(cq).getResultList();
}

@Override
public List<User> findByRoleCriteria(String role) {
CriteriaBuilder cb = entityManager.getCriteriaBuilder();
CriteriaQuery<User> cq = cb.createQuery(User.class);
Root<User> root = cq.from(User.class);
Predicate predicate = cb.equal(root.get("role"), role);
cq.select(root).where(predicate);
return entityManager.createQuery(cq).getResultList();
}
}
Loading