Index: src/main/java/mk/ukim/finki/synergymed/exceptions/EmailAlreadyExistsException.java =================================================================== --- src/main/java/mk/ukim/finki/synergymed/exceptions/EmailAlreadyExistsException.java (revision f18f0d5ffce613bcef773f61b40359bd3b040b9a) +++ src/main/java/mk/ukim/finki/synergymed/exceptions/EmailAlreadyExistsException.java (revision f18f0d5ffce613bcef773f61b40359bd3b040b9a) @@ -0,0 +1,7 @@ +package mk.ukim.finki.synergymed.exceptions; + +public class EmailAlreadyExistsException extends RuntimeException{ + public EmailAlreadyExistsException(String message) { + super(message); + } +} Index: src/main/java/mk/ukim/finki/synergymed/exceptions/PasswordsMismatchException.java =================================================================== --- src/main/java/mk/ukim/finki/synergymed/exceptions/PasswordsMismatchException.java (revision f18f0d5ffce613bcef773f61b40359bd3b040b9a) +++ src/main/java/mk/ukim/finki/synergymed/exceptions/PasswordsMismatchException.java (revision f18f0d5ffce613bcef773f61b40359bd3b040b9a) @@ -0,0 +1,7 @@ +package mk.ukim.finki.synergymed.exceptions; + +public class PasswordsMismatchException extends RuntimeException{ + public PasswordsMismatchException(String message){ + super(message); + } +} Index: src/main/java/mk/ukim/finki/synergymed/exceptions/UsernameAlreadyExistsException.java =================================================================== --- src/main/java/mk/ukim/finki/synergymed/exceptions/UsernameAlreadyExistsException.java (revision f18f0d5ffce613bcef773f61b40359bd3b040b9a) +++ src/main/java/mk/ukim/finki/synergymed/exceptions/UsernameAlreadyExistsException.java (revision f18f0d5ffce613bcef773f61b40359bd3b040b9a) @@ -0,0 +1,7 @@ +package mk.ukim.finki.synergymed.exceptions; + +public class UsernameAlreadyExistsException extends RuntimeException{ + public UsernameAlreadyExistsException(String message){ + super(message); + } +} Index: src/main/java/mk/ukim/finki/synergymed/models/User.java =================================================================== --- src/main/java/mk/ukim/finki/synergymed/models/User.java (revision cba2493e293bfef2dc6f079a07bfbe26d91c30e9) +++ src/main/java/mk/ukim/finki/synergymed/models/User.java (revision f18f0d5ffce613bcef773f61b40359bd3b040b9a) @@ -39,5 +39,5 @@ private String gender; - @Column(name = "date_created", nullable = false) + @Column(name = "date_created", nullable = false, insertable = false, updatable = false) private LocalDate dateCreated; Index: src/main/java/mk/ukim/finki/synergymed/service/UserService.java =================================================================== --- src/main/java/mk/ukim/finki/synergymed/service/UserService.java (revision cba2493e293bfef2dc6f079a07bfbe26d91c30e9) +++ src/main/java/mk/ukim/finki/synergymed/service/UserService.java (revision f18f0d5ffce613bcef773f61b40359bd3b040b9a) @@ -3,6 +3,16 @@ import mk.ukim.finki.synergymed.models.User; +import java.time.LocalDate; + public interface UserService { User findUserById(Integer id); User findUserByUsername(String username); + User register(String firstName, + String lastName, + String username, + String password, + String repeatPassword, + String email, + String gender, + LocalDate dateOfBirth); } Index: src/main/java/mk/ukim/finki/synergymed/service/impl/UserServiceImpl.java =================================================================== --- src/main/java/mk/ukim/finki/synergymed/service/impl/UserServiceImpl.java (revision cba2493e293bfef2dc6f079a07bfbe26d91c30e9) +++ src/main/java/mk/ukim/finki/synergymed/service/impl/UserServiceImpl.java (revision f18f0d5ffce613bcef773f61b40359bd3b040b9a) @@ -1,10 +1,16 @@ package mk.ukim.finki.synergymed.service.impl; +import org.springframework.transaction.annotation.Transactional; import lombok.RequiredArgsConstructor; -import mk.ukim.finki.synergymed.exceptions.UserNotFoundException; +import mk.ukim.finki.synergymed.exceptions.*; +import mk.ukim.finki.synergymed.models.Client; import mk.ukim.finki.synergymed.models.User; +import mk.ukim.finki.synergymed.repositories.ClientRepository; import mk.ukim.finki.synergymed.repositories.UserRepository; import mk.ukim.finki.synergymed.service.UserService; +import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; + +import java.time.LocalDate; @Service @@ -12,4 +18,7 @@ public class UserServiceImpl implements UserService { private final UserRepository userRepository; + private final ClientRepository clientRepository; + private final PasswordEncoder passwordEncoder; + @Override public User findUserById(Integer id) { @@ -25,3 +34,40 @@ .orElseThrow(UserNotFoundException::new); } + + @Transactional + @Override + public User register(String firstName, String lastName, String username, String password, String repeatPassword, String email, String gender, LocalDate dateOfBirth) { + if (username == null || password == null || username.isEmpty() || password.isEmpty()) { + throw new InvalidInputException(); + } + if (!password.equals(repeatPassword)) { + throw new PasswordsMismatchException("Passwords do not match."); + } + if (this.userRepository.findByUsername(username).isPresent()) { + throw new UsernameAlreadyExistsException("Username already exists."); + } + if(this.userRepository.findByEmail(email).isPresent()){ + throw new EmailAlreadyExistsException("Email address already exists."); + } + + + User user = new User(); + user.setFirstName(firstName); + user.setLastName(lastName); + user.setUsername(username); + user.setHashedPassword(passwordEncoder.encode(password)); + user.setEmail(email); + user.setGender(gender); + user.setDateOfBirth(dateOfBirth); + + User savedUser = userRepository.save(user); + + Client client = new Client(); + client.setUsers(savedUser); + client.setIsVerified(false); + + clientRepository.save(client); + + return savedUser; + } } Index: src/main/java/mk/ukim/finki/synergymed/web/RegisterController.java =================================================================== --- src/main/java/mk/ukim/finki/synergymed/web/RegisterController.java (revision f18f0d5ffce613bcef773f61b40359bd3b040b9a) +++ src/main/java/mk/ukim/finki/synergymed/web/RegisterController.java (revision f18f0d5ffce613bcef773f61b40359bd3b040b9a) @@ -0,0 +1,49 @@ +package mk.ukim.finki.synergymed.web; + +import lombok.RequiredArgsConstructor; +import mk.ukim.finki.synergymed.service.UserService; +import org.springframework.format.annotation.DateTimeFormat; +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 org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; + +import java.time.LocalDate; + +@Controller +@RequiredArgsConstructor +@RequestMapping("/register") +public class RegisterController { + + private final UserService userService; + + @GetMapping + public String getSignupPage(){ + return "register"; + } + + @PostMapping + public String signup(Model model, + @RequestParam String firstName, + @RequestParam String lastName, + @RequestParam String username, + @RequestParam String password, + @RequestParam String repeatPassword, + @RequestParam String email, + @RequestParam String gender, + @RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate dateOfBirth){ + try { + userService.register(firstName, lastName, username, password, repeatPassword, email, gender, dateOfBirth); + return "register-success"; + + } catch (RuntimeException ex) { + model.addAttribute("hasError", true); + model.addAttribute("error", ex.getMessage()); + + return "register"; + } + } +} + Index: src/main/resources/application.properties =================================================================== --- src/main/resources/application.properties (revision cba2493e293bfef2dc6f079a07bfbe26d91c30e9) +++ src/main/resources/application.properties (revision f18f0d5ffce613bcef773f61b40359bd3b040b9a) @@ -2,7 +2,7 @@ # Database connection -spring.datasource.url=jdbc:postgresql://localhost:5432/SynergyMed +spring.datasource.url=jdbc:postgresql://localhost:5432/synergymed spring.datasource.username=postgres -spring.datasource.password=1234 +spring.datasource.password=postgres spring.jpa.properties.hibernate.default_schema=synergymed spring.datasource.driver-class-name=org.postgresql.Driver Index: src/main/resources/templates/register-success.html =================================================================== --- src/main/resources/templates/register-success.html (revision f18f0d5ffce613bcef773f61b40359bd3b040b9a) +++ src/main/resources/templates/register-success.html (revision f18f0d5ffce613bcef773f61b40359bd3b040b9a) @@ -0,0 +1,274 @@ + + + + + + SynergyMed - Успешна Регистрација + + + +
+
+
+ + + +
+

SynergyMed

+

Успешно создавање на сметка

+
+ +
+
+

Честитки!

+

Вашата сметка е успешно создадена. Сега можете да се најавите и да ги користите сите функционалности на SynergyMed платформата.

+
+ +
+

Што можете да правите:

+
    +
  • Online купување на продукти од нашите аптеки
    • +
  • Преглед на медицинската историја
    • +
  • Менаџирање на вашиот здравствен профил
    • +
  • Следење на здравствените показатели
    • +
+
+ +
+ + Назад на почетна +
+
+ +
+

© 2025 SynergyMed. Сите права задржани.

+
+
+ + + + Index: src/main/resources/templates/register.html =================================================================== --- src/main/resources/templates/register.html (revision f18f0d5ffce613bcef773f61b40359bd3b040b9a) +++ src/main/resources/templates/register.html (revision f18f0d5ffce613bcef773f61b40359bd3b040b9a) @@ -0,0 +1,385 @@ + + + + + + SynergyMed - Регистрација + + + +
+
+

SynergyMed

+

Создајте вашата нова сметка за да започнете.

+
+ +
+ +
+ Грешка при регистрација +
+ +
+
+
+ + +
+ +
+ + +
+
+ +
+ + +
+ +
+ + +
+ +
+
+ + +
+ +
+ + +
+
+ +
+
+ + +
+ +
+ + +
+
+ + +
+ + +
+ +
+

© 2025 SynergyMed. Сите права задржани.

+
+
+ + + +