refactor: refactor parts of the code, improving its organization

Author: ABeatrizSC

iStudy-services/auth-ms/src/main/java/com/io/github/abeatrizsc/auth_ms/controllers/AuthController.java

@@ -5,63 +5,40 @@
 import com.io.github.abeatrizsc.auth_ms.exceptions.InvalidPasswordException;
 import com.io.github.abeatrizsc.auth_ms.exceptions.UserNotFoundException;
 import com.io.github.abeatrizsc.auth_ms.infra.security.TokenService;
+import com.io.github.abeatrizsc.auth_ms.services.AuthService;
 import com.io.github.abeatrizsc.auth_ms.services.UserService;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.Optional;
-
 @RestController
 @RequestMapping("/auth")
 @RequiredArgsConstructor
 public class AuthController {
-    private final UserService userService;
-    private final PasswordEncoder passwordEncoder;
-    private final TokenService tokenService;
+    private final AuthService authService;
 
     @PostMapping("/login")
     public ResponseEntity<LoginResponseDto> login(@Valid @RequestBody LoginRequestDto body){
-        User user = userService.findUserByEmail(body.getEmail()).orElseThrow(() -> new UserNotFoundException());
-
-        if(!passwordEncoder.matches(body.getPassword(), user.getPassword())) {
-            throw new InvalidPasswordException();
-        }
-
-        String token = tokenService.generateToken(user);
-        return ResponseEntity.ok(new LoginResponseDto(token));
+        LoginResponseDto loginResponseDto = authService.login(body);
+        return ResponseEntity.ok(loginResponseDto);
     }
 
-
     @PostMapping("/register")
     public ResponseEntity register(@Valid @RequestBody RegisterRequestDto body) {
-        Optional<User> user = userService.findUserByEmail(body.getEmail());
+        RegisterResponseDto registerResponseDto = authService.register(body);
 
-        if(user.isEmpty()) {
-            User newUser = new User();
-            newUser.setPassword(passwordEncoder.encode(body.getPassword()));
-            newUser.setEmail(body.getEmail());
-            newUser.setName(body.getName());
-            userService.create(newUser);
-
-            return ResponseEntity.status(HttpStatus.CREATED).body(new RegisterResponseDto("User created successfully!"));
-        }
-
-        throw new EmailAlreadyInUseException();
+        return ResponseEntity.status(HttpStatus.CREATED).body(registerResponseDto);
     }
 
     @GetMapping("/authenticated-user")
-    public String getAuthenticatedUser(HttpServletRequest request) {
-        var token = tokenService.recoverToken(request);
-
-        return tokenService.validateToken(token);
+    public String getAuthenticatedUserId(HttpServletRequest request) {
+        return authService.getAuthenticatedUserId(request);
     }
 }

iStudy-services/auth-ms/src/main/java/com/io/github/abeatrizsc/auth_ms/infra/security/SecurityConfig.java

@@ -4,8 +4,6 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.HttpMethod;
-import org.springframework.security.authentication.AuthenticationManager;
-import org.springframework.security.config.annotation.authentication.configuration.AuthenticationConfiguration;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.config.http.SessionCreationPolicy;
@@ -17,10 +15,6 @@
 @Configuration
 @EnableWebSecurity
 public class SecurityConfig {
-
-    @Autowired
-    private CustomUserDetailsService userDetailsService;
-
     @Autowired
     SecurityFilter securityFilter;
 
@@ -42,9 +36,4 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti
     public PasswordEncoder passwordEncoder() {
         return new BCryptPasswordEncoder();
     }
-
-    @Bean
-    public AuthenticationManager authenticationManager(AuthenticationConfiguration authenticationConfiguration) throws Exception {
-        return authenticationConfiguration.getAuthenticationManager();
-    }
 }

iStudy-services/auth-ms/src/main/java/com/io/github/abeatrizsc/auth_ms/services/AuthService.java

@@ -0,0 +1,57 @@
+package com.io.github.abeatrizsc.auth_ms.services;
+
+import com.io.github.abeatrizsc.auth_ms.domain.User;
+import com.io.github.abeatrizsc.auth_ms.dto.*;
+import com.io.github.abeatrizsc.auth_ms.exceptions.InvalidPasswordException;
+import com.io.github.abeatrizsc.auth_ms.exceptions.UserNotFoundException;
+import com.io.github.abeatrizsc.auth_ms.infra.security.TokenService;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.validation.Valid;
+import lombok.AllArgsConstructor;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.Optional;
+
+@Service
+@AllArgsConstructor
+public class AuthService {
+    private final UserService userService;
+    private final PasswordEncoder passwordEncoder;
+    private final TokenService tokenService;
+
+    public LoginResponseDto login(LoginRequestDto body){
+        User user = userService.findUserByEmail(body.getEmail()).orElseThrow(UserNotFoundException::new);
+
+        if(!passwordEncoder.matches(body.getPassword(), user.getPassword())) {
+            throw new InvalidPasswordException();
+        }
+
+        return new LoginResponseDto(tokenService.generateToken(user));
+    }
+
+    public RegisterResponseDto register(RegisterRequestDto body) {
+        Optional<User> user = userService.findUserByEmail(body.getEmail());
+
+        if(user.isEmpty()) {
+            User newUser = new User();
+            newUser.setPassword(passwordEncoder.encode(body.getPassword()));
+            newUser.setEmail(body.getEmail());
+            newUser.setName(body.getName());
+            userService.create(newUser);
+
+            return new RegisterResponseDto("User created successfully!");
+        }
+
+        throw new EmailAlreadyInUseException();
+    }
+
+    public String getAuthenticatedUserId(HttpServletRequest request) {
+        var token = tokenService.recoverToken(request);
+
+        return tokenService.validateToken(token);
+    }
+}

iStudy-services/auth-ms/src/main/java/com/io/github/abeatrizsc/auth_ms/services/UserService.java

@@ -12,6 +12,7 @@
 import com.io.github.abeatrizsc.auth_ms.repositories.UserRepository;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Optional;
 
@@ -30,10 +31,12 @@ public Optional<User> findUserByEmail(String email) {
         return repository.findByEmail(email);
     }
 
+    @Transactional
     public void create(User newUser) {
         repository.save(newUser);
     }
 
+    @Transactional
     public void updateAccount(String userId, UpdateAccountDto dto) {
         User user = findUserById(userId);
 
@@ -66,6 +69,7 @@ public Boolean areDifferentPasswords(String newPassword, String userPassword){
         return !securityConfig.passwordEncoder().matches(newPassword, userPassword);
     }
 
+    @Transactional
     public void deleteAccount(String id, DeleteAccountDto dto) {
         User user = findUserById(id);
 

iStudy-services/discipline-ms/src/main/java/io/github/abeatrizsc/discipline_ms/services/DisciplineService.java

@@ -26,10 +26,10 @@
 @Service
 @AllArgsConstructor
 public class DisciplineService {
-    private DisciplineRepository repository;
-    private TopicRepository topicRepository;
-    private AuthRequestUtils authRequestUtils;
-    private DisciplineEventPublisher disciplineEventPublisher;
+    private final DisciplineRepository repository;
+    private final TopicRepository topicRepository;
+    private final AuthRequestUtils authRequestUtils;
+    private final DisciplineEventPublisher disciplineEventPublisher;
 
     @Transactional
     public List<Discipline> save(DisciplineRequestDto requestDto) throws ConflictException {
@@ -49,8 +49,8 @@ public List<Discipline> save(DisciplineRequestDto requestDto) throws ConflictExc
     }
 
     @Transactional
-    public List<Discipline> update(String id, DisciplineRequestDto requestDto) throws ConflictException {
-        Discipline discipline = findById(id);
+    public List<Discipline> update(String disciplineId, DisciplineRequestDto requestDto) throws ConflictException {
+        Discipline discipline = findById(disciplineId);
 
         if (disciplineNameAlreadyExists(discipline.getId(), requestDto.getName(), discipline.getCreatedBy())) {
             throw new ConflictException("subject");
@@ -61,6 +61,7 @@ public List<Discipline> update(String id, DisciplineRequestDto requestDto) throw
 
         discipline.setName(requestDto.getName());
         discipline.setCategory(requestDto.getCategory());
+
         if (!discipline.getTotalTime().equals(LocalTime.MIDNIGHT) && discipline.getTotalTime() == discipline.getTimeCompleted()) {
             discipline.setIsCompleted(true);
         } else {

iStudy-services/discipline-ms/src/main/java/io/github/abeatrizsc/discipline_ms/services/TopicService.java

@@ -18,11 +18,11 @@
 @Service
 @AllArgsConstructor
 public class TopicService {
-    private TopicRepository repository;
-    private DisciplineService disciplineService;
-    private TopicMapper topicMapper;
-    private AuthRequestUtils authRequestUtils;
-    private DisciplineEventPublisher disciplineEventPublisher;
+    private final TopicRepository repository;
+    private final DisciplineService disciplineService;
+    private final TopicMapper topicMapper;
+    private final AuthRequestUtils authRequestUtils;
+    private final DisciplineEventPublisher disciplineEventPublisher;
 
     @Transactional
     public List<TopicResponseDto> save(TopicRequestDto requestDto) throws ConflictException {

iStudy-services/study-tracker-ms/src/main/java/com/io/github/abeatrizsc/study_tracker_ms/controllers/StudyController.java

@@ -19,7 +19,7 @@
 @RequestMapping("/studies")
 @AllArgsConstructor
 public class StudyController {
-    private StudyService service;
+    private final StudyService service;
 
     @GetMapping("/all")
     public ResponseEntity<List<Study>> getAll() {