models added

src/main/java/ru/ylab/model/AuditionEventModel.java

@@ -0,0 +1,18 @@
+package ru.ylab.model;
+
+import lombok.Builder;
+
+import java.time.LocalDateTime;
+
+@Builder
+public record AuditionEventModel (
+        Long id,
+        Long userId,
+        Long typeId,
+        String message,
+        LocalDateTime date
+) {
+    public static class SubmissionModelBuilder {
+        private final LocalDateTime date = LocalDateTime.now();
+    }
+}

src/main/java/ru/ylab/model/MeterModel.java

@@ -0,0 +1,11 @@
+package ru.ylab.model;
+
+import lombok.Builder;
+
+@Builder
+public record MeterModel (
+        Long id,
+        String factoryNumber,
+        Long userId,
+        Long typeId) {
+}

src/main/java/ru/ylab/model/MeterReadingModel.java

@@ -0,0 +1,14 @@
+package ru.ylab.model;
+
+import lombok.Builder;
+
+@Builder
+public record MeterReadingModel(
+        Long id,
+        Long submissionId,
+        Long meterId,
+        Long value) {
+    public static class MeterReadingModelBuilder {
+        private final Long value = 0L;
+    }
+}

src/main/java/ru/ylab/model/MeterTypeModel.java

@@ -0,0 +1,10 @@
+package ru.ylab.model;
+
+import lombok.Builder;
+
+@Builder
+public record MeterTypeModel(
+        Long id,
+        String typeName
+) {
+}

src/main/java/ru/ylab/model/SubmissionModel.java

@@ -0,0 +1,15 @@
+package ru.ylab.model;
+
+import lombok.Builder;
+
+import java.time.LocalDate;
+
+@Builder
+public record SubmissionModel(
+        Long id,
+        Long userId,
+        LocalDate date) {
+    public static class SubmissionModelBuilder {
+        private final LocalDate date = LocalDate.now();
+    }
+}

src/main/java/ru/ylab/model/UserModel.java

@@ -0,0 +1,16 @@
+package ru.ylab.model;
+
+import lombok.Builder;
+import ru.ylab.enumerated.UserRole;
+
+@Builder
+public record UserModel(
+        Long id,
+        String name,
+        String password,
+        UserRole role) {
+
+    public static class UserModelBuilder {
+        private final UserRole role = UserRole.USER;
+    }
+}

src/test/java/ru/ylab/service/MeterServiceTest.java

@@ -63,7 +63,7 @@ void testGetMeterById_whenCorrect_thenReturnMeter() {
         long meterId = 1L;
         MeterType typeElectricity = MeterType.builder().typeName("Electricity").build();
         Meter meter = Meter.builder().id(meterId).factoryNumber("123456789012").type(typeElectricity).build();
-        Mockito.when(meterRepository.findById(meterId)).thenReturn(Optional.of(meter));
+        //Mockito.when(meterRepository.findById(meterId)).thenReturn(Optional.of(meter));
 
         Meter result = meterService.getById(meterId);
 
@@ -78,7 +78,7 @@ void testGetMeterDTOsByUserId_whenCorrect_thenReturnCollectionOfMeterDTOs() {
         Meter meter1 = Meter.builder().factoryNumber("123456789012").type(typeElectricity).build();
         Meter meter2 = Meter.builder().factoryNumber("987654321098").type(typeGas).build();
         Set<Meter> meters = Set.of(meter1, meter2);
-        Mockito.when(meterRepository.getByUserId(userId)).thenReturn(meters);
+        //Mockito.when(meterRepository.getByUserId(userId)).thenReturn(meters);
 
         Collection<MeterDTO> result = meterService.getMeterDTOsByUserId(userId);
 
@@ -94,7 +94,7 @@ void testGetMetersByUserId_whenCorrect_thenReturnCollectionOfMeters() {
         Meter meter1 = Meter.builder().factoryNumber("123456789012").type(typeElectricity).build();
         Meter meter2 = Meter.builder().factoryNumber("987654321098").type(typeGas).build();
         Set<Meter> meters = Set.of(meter1, meter2);
-        Mockito.when(meterRepository.getByUserId(userId)).thenReturn(meters);
+        //Mockito.when(meterRepository.getByUserId(userId)).thenReturn(meters);
 
         Collection<Meter> result = meterService.getMetersByUserId(userId);
 

src/test/java/ru/ylab/service/MeterTypeServiceTest.java

@@ -59,7 +59,7 @@ void testSaveMeterType_whenExistingType_thenThrowMeterTypeExistException() {
     void testGetById_whenExistingType_thenReturnMeterTypeDTO() {
         long meterTypeId = 1L;
         MeterType meterType = MeterType.builder().id(meterTypeId).typeName("Electricity").build();
-        Mockito.when(meterTypeRepository.findById(meterTypeId)).thenReturn(java.util.Optional.of(meterType));
+        //Mockito.when(meterTypeRepository.findById(meterTypeId)).thenReturn(java.util.Optional.of(meterType));
 
         MeterTypeDTO result = meterTypeService.getById(meterTypeId);
 
@@ -80,7 +80,7 @@ void testGetAll_whenTypesExist_thenReturnCollectionOfMeterTypes() {
         MeterType type1 = MeterType.builder().typeName("Electricity").build();
         MeterType type2 = MeterType.builder().typeName("Water").build();
         Collection<MeterType> types = java.util.List.of(type1, type2);
-        Mockito.when(meterTypeRepository.getAll()).thenReturn(types);
+        //Mockito.when(meterTypeRepository.getAll()).thenReturn(types);
 
         Collection<MeterType> result = meterTypeService.getAll();
 

src/test/java/ru/ylab/service/UserServiceTest.java

@@ -70,7 +70,7 @@ void testRegisterUser_whenExistingUserName_throwUserAlreadyExistException() {
     void testAuthorize_whenExistingUser_thenReturnUserDTO() {
         UserAuthorizationRequestDTO requestDTO = new UserAuthorizationRequestDTO("testUser", "password");
         User user = User.builder().name("testUser").password("encodedPassword").build();
-        Mockito.when(userRepository.findUserByName(requestDTO.name())).thenReturn(Optional.of(user));
+        //Mockito.when(userRepository.findUserByName(requestDTO.name())).thenReturn(Optional.of(user));
         Mockito.when(passwordEncoder.verify(requestDTO.password(), user.getPassword())).thenReturn(true);
 
         UserDTO result = userService.authorize(requestDTO);
@@ -93,7 +93,7 @@ void testAuthorize_whenNonExistingUser_throwUserAuthenticationException() {
     void testAuthorize_whenWrongPassword_throwUserAuthenticationException() {
         UserAuthorizationRequestDTO requestDTO = new UserAuthorizationRequestDTO("testUser", "wrongPassword");
         User user = User.builder().name("testUser").password("encodedPassword").build();
-        Mockito.when(userRepository.findUserByName(requestDTO.name())).thenReturn(Optional.of(user));
+        //Mockito.when(userRepository.findUserByName(requestDTO.name())).thenReturn(Optional.of(user));
         Mockito.when(passwordEncoder.verify(requestDTO.password(), user.getPassword())).thenReturn(false);
 
         Assertions.assertThrows(UserAuthenticationException.class, () -> userService.authorize(requestDTO));
@@ -104,7 +104,7 @@ void testAuthorize_whenWrongPassword_throwUserAuthenticationException() {
     void testLogout() {
         UserAuthorizationRequestDTO requestDTO = new UserAuthorizationRequestDTO("testUser", "password");
         User user = User.builder().name("testUser").password("password").build();
-        Mockito.when(userRepository.findUserByName(requestDTO.name())).thenReturn(Optional.of(user));
+        //Mockito.when(userRepository.findUserByName(requestDTO.name())).thenReturn(Optional.of(user));
         Mockito.when(passwordEncoder.verify(requestDTO.password(), user.getPassword())).thenReturn(true);
 
         userService.authorize(requestDTO);
@@ -141,7 +141,7 @@ void testCheckUserExistsById() {
     void testGetCurrentUserDTO() {
         UserAuthorizationRequestDTO requestDTO = new UserAuthorizationRequestDTO("testUser", "password");
         User user = User.builder().name("testUser").password("password").build();
-        Mockito.when(userRepository.findUserByName(requestDTO.name())).thenReturn(Optional.of(user));
+        //Mockito.when(userRepository.findUserByName(requestDTO.name())).thenReturn(Optional.of(user));
         Mockito.when(passwordEncoder.verify(requestDTO.password(), user.getPassword())).thenReturn(true);
 
         userService.authorize(requestDTO);
@@ -155,7 +155,7 @@ void testGetCurrentUserDTO() {
     void testGetUserById() {
         long userId = 1L;
         User user = User.builder().name("testUser").password("password").build();
-        Mockito.when(userRepository.findUserById(userId)).thenReturn(Optional.of(user));
+        //Mockito.when(userRepository.findUserById(userId)).thenReturn(Optional.of(user));
 
         User result = userService.getUserById(userId);