UserDTO and MeterReadingsDTO added

Muryginds · Jan 25, 2024 · dbdaad5 · dbdaad5
1 parent e2ed01f
commit dbdaad5
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 5 deletions.
diff --git a/src/main/java/ru/ylab/out/dto/MeterReadingsDTO.java b/src/main/java/ru/ylab/out/dto/MeterReadingsDTO.java
@@ -0,0 +1,15 @@
+package ru.ylab.out.dto;
+
+import lombok.Builder;
+import ru.ylab.enumerated.MeterType;
+
+import java.time.LocalDate;
+import java.util.Map;
+
+@Builder
+public record MeterReadingsDTO(
+        Long id,
+        UserDTO user,
+        LocalDate date,
+        Map<MeterType, Integer> readings) {
+}
diff --git a/src/main/java/ru/ylab/out/dto/UserDTO.java b/src/main/java/ru/ylab/out/dto/UserDTO.java
@@ -0,0 +1,10 @@
+package ru.ylab.out.dto;
+
+import lombok.Builder;
+
+@Builder
+public record UserDTO(
+        Long id,
+        String name
+        ) {
+}
diff --git a/src/main/java/ru/ylab/service/UserService.java b/src/main/java/ru/ylab/service/UserService.java
@@ -4,8 +4,9 @@
 import ru.ylab.entity.User;
 import ru.ylab.exception.UserAlreadyExistException;
 import ru.ylab.exception.UserAuthenticationException;
-import ru.ylab.dto.UserAuthenticationRequestDTO;
-import ru.ylab.dto.UserRegistrationRequestDTO;
+import ru.ylab.in.dto.UserAuthenticationRequestDTO;
+import ru.ylab.in.dto.UserRegistrationRequestDTO;
+import ru.ylab.out.dto.UserDTO;
 import ru.ylab.repository.UserRepository;
 import ru.ylab.security.PasswordEncoder;
 
@@ -16,25 +17,33 @@ public class UserService {
     @Getter
     private User currentUser;
 
-    public User registerUser(UserRegistrationRequestDTO requestDTO) {
+    public UserDTO registerUser(UserRegistrationRequestDTO requestDTO) {
         if (!checkUsernameExists(requestDTO.name())) {
             User user = User.builder()
                     .name(requestDTO.name())
                     .password(passwordEncoder.encode(requestDTO.password()))
                     .build();
             userRepository.save(user);
-            return user;
+            return UserDTO.builder()
+                    .id(user.getId())
+                    .name(user.getName())
+                    .build();
         }
         throw new UserAlreadyExistException(requestDTO.name());
     }
 
-    public User authenticate(UserAuthenticationRequestDTO requestDTO) {
+    public UserDTO authorize(UserAuthenticationRequestDTO requestDTO) {
         var user = userRepository.getUserByName(requestDTO.name())
                 .orElseThrow(UserAuthenticationException::new);
         if (!passwordEncoder.verify(requestDTO.password(), user.getPassword())) {
             throw new UserAuthenticationException();
         }
         return user;
+        return UserDTO.builder()
+                .id(user.getId())
+                .name(user.getName())
+                .build();
+    }
     }
 
     public boolean checkUsernameExists(String username) {