diff --git a/core/src/main/java/cz/muni/fi/pa165/core/common/DomainFacade.java b/core/src/main/java/cz/muni/fi/pa165/core/common/DomainFacade.java
index 223739051b446989f73445815f87b519bbae3c0b..408ecd5f9add5267e0b2cf87cc737547ae874468 100644
--- a/core/src/main/java/cz/muni/fi/pa165/core/common/DomainFacade.java
+++ b/core/src/main/java/cz/muni/fi/pa165/core/common/DomainFacade.java
@@ -2,10 +2,7 @@ package cz.muni.fi.pa165.core.common;
import cz.muni.fi.pa165.model.dto.common.DomainObjectDto;
import cz.muni.fi.pa165.model.dto.common.Result;
-import org.springframework.dao.DataIntegrityViolationException;
import org.springframework.data.domain.Pageable;
-import org.springframework.http.HttpStatus;
-import org.springframework.web.server.ResponseStatusException;
import java.util.List;
diff --git a/core/src/main/java/cz/muni/fi/pa165/core/common/DomainObject.java b/core/src/main/java/cz/muni/fi/pa165/core/common/DomainObject.java
index d27f0df747994f91b0ec9305aa551b34164a709b..494073dca0eb43cdee6aac198dd38b6b13bf3d07 100644
--- a/core/src/main/java/cz/muni/fi/pa165/core/common/DomainObject.java
+++ b/core/src/main/java/cz/muni/fi/pa165/core/common/DomainObject.java
@@ -5,15 +5,15 @@ import jakarta.persistence.MappedSuperclass;
import lombok.Getter;
import lombok.Setter;
-import java.time.LocalDateTime;
+import java.time.Instant;
import java.util.UUID;
@Getter
@Setter
@MappedSuperclass
public abstract class DomainObject {
- @Id
- private String id = UUID.randomUUID().toString();
- private LocalDateTime createdDateTime;
- private LocalDateTime deletedDateTime;
+ @Id
+ private String id = UUID.randomUUID().toString();
+ private Instant createdAt;
+ private Instant deletedAt;
}
diff --git a/core/src/main/java/cz/muni/fi/pa165/core/common/DomainService.java b/core/src/main/java/cz/muni/fi/pa165/core/common/DomainService.java
index f24bb511d262d6d203fa9642d927b23927deb80f..ca937345df68455a17c55bcf85897f66fc3cc82f 100644
--- a/core/src/main/java/cz/muni/fi/pa165/core/common/DomainService.java
+++ b/core/src/main/java/cz/muni/fi/pa165/core/common/DomainService.java
@@ -7,6 +7,7 @@ import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.transaction.annotation.Transactional;
+import java.time.Instant;
import java.time.LocalDateTime;
import java.util.Arrays;
import java.util.List;
@@ -36,7 +37,7 @@ public abstract class DomainService<T extends DomainObject> {
*/
@Transactional
public T create(T entity) {
- entity.setCreatedDateTime(LocalDateTime.now());
+ entity.setCreatedAt(Instant.now());
return getRepository().save(entity);
}
@@ -58,7 +59,7 @@ public abstract class DomainService<T extends DomainObject> {
*/
@Transactional(readOnly = true)
public List<T> findAll() {
- return getRepository().findAll().stream().filter(entity -> entity.getDeletedDateTime() == null).toList();
+ return getRepository().findAll().stream().filter(entity -> entity.getDeletedAt() == null).toList();
}
/**
@@ -83,7 +84,7 @@ public abstract class DomainService<T extends DomainObject> {
public T findById(String id) {
return getRepository()
.findById(id)
- .filter(entity -> entity.getDeletedDateTime() == null)
+ .filter(entity -> entity.getDeletedAt() == null)
.orElseThrow(() -> new EntityNotFoundException("Entity with '" + id + "' not found."));
}
@@ -94,7 +95,7 @@ public abstract class DomainService<T extends DomainObject> {
@Transactional
public void deleteAll() {
List<T> entities = findAll();
- entities.stream().forEach(entity -> entity.setDeletedDateTime(LocalDateTime.now()));
+ entities.stream().forEach(entity -> entity.setDeletedAt(Instant.now()));
getRepository().saveAll(entities);
}
@@ -118,7 +119,7 @@ public abstract class DomainService<T extends DomainObject> {
T entity = findById(id);
if (entity == null)
throw new EntityNotFoundException("Entity '" + id + "' not found.");
- entity.setDeletedDateTime(LocalDateTime.now());
+ entity.setDeletedAt(Instant.now());
getRepository().save(entity);
return entity;
}
diff --git a/core/src/main/java/cz/muni/fi/pa165/core/company/CompanyService.java b/core/src/main/java/cz/muni/fi/pa165/core/company/CompanyService.java
index 847630486f7227e80ed11a428f3ec0ca027cd4ce..a79b309e4824526d9a52c53a61fc86c81d87a6fe 100644
--- a/core/src/main/java/cz/muni/fi/pa165/core/company/CompanyService.java
+++ b/core/src/main/java/cz/muni/fi/pa165/core/company/CompanyService.java
@@ -1,7 +1,6 @@
package cz.muni.fi.pa165.core.company;
import cz.muni.fi.pa165.core.common.DomainService;
-import cz.muni.fi.pa165.core.user.User;
import lombok.Getter;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -21,7 +20,7 @@ public class CompanyService extends DomainService<Company> {
public Company findByName(String name) {
return getRepository()
.findByName(name)
- .filter(entity -> entity.getDeletedDateTime() == null)
+ .filter(entity -> entity.getDeletedAt() == null)
.orElse(null);
}
}
diff --git a/core/src/main/java/cz/muni/fi/pa165/core/device/DeviceService.java b/core/src/main/java/cz/muni/fi/pa165/core/device/DeviceService.java
index 06df84d2b9ab798a5311233103d5377792c0108d..82f33383c4437121a75fc961479df7dd7fb3d389 100644
--- a/core/src/main/java/cz/muni/fi/pa165/core/device/DeviceService.java
+++ b/core/src/main/java/cz/muni/fi/pa165/core/device/DeviceService.java
@@ -1,7 +1,6 @@
package cz.muni.fi.pa165.core.device;
import cz.muni.fi.pa165.core.common.DomainService;
-import cz.muni.fi.pa165.core.company.Company;
import lombok.Getter;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -22,7 +21,7 @@ public class DeviceService extends DomainService<Device> {
public Device findByName(String name) {
return getRepository()
.findByName(name)
- .filter(entity -> entity.getDeletedDateTime() == null)
+ .filter(entity -> entity.getDeletedAt() == null)
.orElse(null);
}
}
diff --git a/core/src/main/java/cz/muni/fi/pa165/core/smartmeter/SmartMeterService.java b/core/src/main/java/cz/muni/fi/pa165/core/smartmeter/SmartMeterService.java
index 0474175fed7dd2f882e2eb3ac3cb0d774e218807..ef48f8418e78384ed5c72ab7bc9c172d0567afb7 100644
--- a/core/src/main/java/cz/muni/fi/pa165/core/smartmeter/SmartMeterService.java
+++ b/core/src/main/java/cz/muni/fi/pa165/core/smartmeter/SmartMeterService.java
@@ -1,7 +1,6 @@
package cz.muni.fi.pa165.core.smartmeter;
import cz.muni.fi.pa165.core.common.DomainService;
-import cz.muni.fi.pa165.core.device.Device;
import lombok.Getter;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -20,7 +19,7 @@ public class SmartMeterService extends DomainService<SmartMeter> {
public SmartMeter findByName(String name) {
return getRepository()
.findByName(name)
- .filter(entity -> entity.getDeletedDateTime() == null)
+ .filter(entity -> entity.getDeletedAt() == null)
.orElse(null);
}
diff --git a/core/src/main/java/cz/muni/fi/pa165/core/user/UserService.java b/core/src/main/java/cz/muni/fi/pa165/core/user/UserService.java
index f51fd173d55f10369f68665b61dd0e4a7a1cc5bb..6c2df0e57b45c8db18899e6e1df5c13c62a8defd 100644
--- a/core/src/main/java/cz/muni/fi/pa165/core/user/UserService.java
+++ b/core/src/main/java/cz/muni/fi/pa165/core/user/UserService.java
@@ -1,14 +1,12 @@
package cz.muni.fi.pa165.core.user;
import cz.muni.fi.pa165.core.common.DomainService;
-import jakarta.persistence.EntityNotFoundException;
import lombok.Getter;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime;
-import java.util.List;
@Service
public class UserService extends DomainService<User> {
@@ -26,7 +24,7 @@ public class UserService extends DomainService<User> {
public User findByUsername(String username) {
return getRepository()
.findByUsername(username)
- .filter(entity -> entity.getDeletedDateTime() == null)
+ .filter(entity -> entity.getDeletedAt() == null)
.orElse(null);
}
@@ -43,7 +41,7 @@ public class UserService extends DomainService<User> {
public boolean loginCheck(String userId, String password) {
return getRepository()
.findByIdAndPassword(userId, password)
- .filter(entity -> entity.getDeletedDateTime() == null)
+ .filter(entity -> entity.getDeletedAt() == null)
.isPresent();
}
}
diff --git a/core/src/test/java/cz/muni/fi/pa165/core/company/CompanyServiceTest.java b/core/src/test/java/cz/muni/fi/pa165/core/company/CompanyServiceTest.java
index 74b1ede9bc941886203d05d236b55339b13bb03a..a9df4026d55149c21d4a5dd6b3efdbb9ad078ba5 100644
--- a/core/src/test/java/cz/muni/fi/pa165/core/company/CompanyServiceTest.java
+++ b/core/src/test/java/cz/muni/fi/pa165/core/company/CompanyServiceTest.java
@@ -122,7 +122,7 @@ public class CompanyServiceTest {
verify(companyRepositoryMock).findById(company.getId());
verify(companyRepositoryMock).save(company); // soft delete
- assertNotNull(deletedCompany.getDeletedDateTime());
+ assertNotNull(deletedCompany.getDeletedAt());
assertEquals(company, deletedCompany);
}
diff --git a/core/src/test/java/cz/muni/fi/pa165/core/device/DeviceServiceTest.java b/core/src/test/java/cz/muni/fi/pa165/core/device/DeviceServiceTest.java
index 061694aaa3defa78a1dc40e73a8ebbc5296db4b4..f5fc4cd6b4274db674df6eb2829981a0358ce87c 100644
--- a/core/src/test/java/cz/muni/fi/pa165/core/device/DeviceServiceTest.java
+++ b/core/src/test/java/cz/muni/fi/pa165/core/device/DeviceServiceTest.java
@@ -140,7 +140,7 @@ public class DeviceServiceTest {
verify(deviceRepositoryMock).findById(device.getId());
verify(deviceRepositoryMock).save(device); // soft delete
- assertNotNull(deletedDevice.getDeletedDateTime());
+ assertNotNull(deletedDevice.getDeletedAt());
assertEquals(device, deletedDevice);
}
diff --git a/core/src/test/java/cz/muni/fi/pa165/core/device/UnitTestDeviceJPA.java b/core/src/test/java/cz/muni/fi/pa165/core/device/UnitTestDeviceJPA.java
index 59780a3fbf03ac4197735053ec8d3e2db7a95d41..4b0f4ac1081abf3546dd40f40f267ce6510881a3 100644
--- a/core/src/test/java/cz/muni/fi/pa165/core/device/UnitTestDeviceJPA.java
+++ b/core/src/test/java/cz/muni/fi/pa165/core/device/UnitTestDeviceJPA.java
@@ -118,7 +118,7 @@ public class UnitTestDeviceJPA {
assertThat(checkDevice.getId()).isEqualTo(device2.getId());
assertThat(checkDevice.getName()).isEqualTo(device2.getName());
assertThat(checkDevice.getCompany()).isEqualTo(device2.getCompany());
- assertThat(checkDevice.getCreatedDateTime()).isEqualTo(device2.getCreatedDateTime());
+ assertThat(checkDevice.getCreatedAt()).isEqualTo(device2.getCreatedAt());
}
@Test
diff --git a/core/src/test/java/cz/muni/fi/pa165/core/metrics/MetricsServiceTest.java b/core/src/test/java/cz/muni/fi/pa165/core/metrics/MetricsServiceTest.java
index 553a94a280df24b3795fae78d3e76acaf3b01da6..225df5a55f6cc2018a66b4e6811d8ebd008566b6 100644
--- a/core/src/test/java/cz/muni/fi/pa165/core/metrics/MetricsServiceTest.java
+++ b/core/src/test/java/cz/muni/fi/pa165/core/metrics/MetricsServiceTest.java
@@ -398,7 +398,7 @@ class MetricsServiceTest {
verify(metricsRepository).findById(metrics1.getId());
verify(metricsRepository).save(metrics1); // soft delete
- assertNotNull(deletedMetrics.getDeletedDateTime());
+ assertNotNull(deletedMetrics.getDeletedAt());
assertEquals(metrics1, deletedMetrics);
}
diff --git a/core/src/test/java/cz/muni/fi/pa165/core/smartmeter/SmartMeterServiceTest.java b/core/src/test/java/cz/muni/fi/pa165/core/smartmeter/SmartMeterServiceTest.java
index 7927c2dcda193b62f113f175acbebeca087cd817..d2935ab34c2d7a3f687b8a6c66fbc67522069f1e 100644
--- a/core/src/test/java/cz/muni/fi/pa165/core/smartmeter/SmartMeterServiceTest.java
+++ b/core/src/test/java/cz/muni/fi/pa165/core/smartmeter/SmartMeterServiceTest.java
@@ -170,7 +170,7 @@ public class SmartMeterServiceTest {
verify(smartMeterRepositoryMock).findById(smartMeter.getId());
verify(smartMeterRepositoryMock).save(smartMeter); // soft delete
- assertNotNull(deletedSmartMeter.getDeletedDateTime());
+ assertNotNull(deletedSmartMeter.getDeletedAt());
assertEquals(smartMeter, deletedSmartMeter);
}
diff --git a/core/src/test/java/cz/muni/fi/pa165/core/user/UserServiceTest.java b/core/src/test/java/cz/muni/fi/pa165/core/user/UserServiceTest.java
index efc8ffd9ac748e4ba1472df876862013ba83b10e..f395329688553988038175c557d139b6fd6314cb 100644
--- a/core/src/test/java/cz/muni/fi/pa165/core/user/UserServiceTest.java
+++ b/core/src/test/java/cz/muni/fi/pa165/core/user/UserServiceTest.java
@@ -1,7 +1,5 @@
package cz.muni.fi.pa165.core.user;
-import cz.muni.fi.pa165.core.company.Company;
-import cz.muni.fi.pa165.core.device.Device;
import cz.muni.fi.pa165.core.house.House;
import cz.muni.fi.pa165.core.house.HouseService;
import cz.muni.fi.pa165.core.metrics.Metrics;
@@ -11,12 +9,10 @@ import cz.muni.fi.pa165.core.smartmeter.SmartMeterService;
import cz.muni.fi.pa165.core.user.roles.HouseRole;
import cz.muni.fi.pa165.core.user.roles.RoleService;
import cz.muni.fi.pa165.model.dto.role.enums.HouseRoleEnum;
-import org.junit.Assert;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.InjectMocks;
import org.mockito.Mock;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageImpl;
import org.springframework.data.domain.PageRequest;
@@ -150,7 +146,7 @@ public class UserServiceTest {
verify(userReposiroyMock).findById(user.getId());
verify(userReposiroyMock).save(user); // soft delete
- assertNotNull(deletedUser.getDeletedDateTime());
+ assertNotNull(deletedUser.getDeletedAt());
assertEquals(user, deletedUser);
}
diff --git a/core/src/test/java/cz/muni/fi/pa165/core/user/roles/CompanyRoleServiceTest.java b/core/src/test/java/cz/muni/fi/pa165/core/user/roles/CompanyRoleServiceTest.java
index f904f293f1c16b380323644bbf059a30300c68b2..d8cd63868e8c74da86a292771bcd40da57f55a0e 100644
--- a/core/src/test/java/cz/muni/fi/pa165/core/user/roles/CompanyRoleServiceTest.java
+++ b/core/src/test/java/cz/muni/fi/pa165/core/user/roles/CompanyRoleServiceTest.java
@@ -1,11 +1,8 @@
package cz.muni.fi.pa165.core.user.roles;
import cz.muni.fi.pa165.core.company.Company;
-import cz.muni.fi.pa165.core.house.House;
-import cz.muni.fi.pa165.core.metrics.Metrics;
import cz.muni.fi.pa165.core.user.User;
import cz.muni.fi.pa165.model.dto.role.enums.CompanyRoleEnum;
-import cz.muni.fi.pa165.model.dto.role.enums.HouseRoleEnum;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.InjectMocks;
@@ -363,7 +360,7 @@ class CompanyRoleServiceTest {
verify(roleRepository).findById(companyRole1.getId());
verify(roleRepository).save(companyRole1); // soft delete
- assertNotNull(deletedCompanyRole.getDeletedDateTime());
+ assertNotNull(deletedCompanyRole.getDeletedAt());
assertEquals(companyRole1, deletedCompanyRole);
}
diff --git a/core/src/test/java/cz/muni/fi/pa165/core/user/roles/HouseRoleServiceTest.java b/core/src/test/java/cz/muni/fi/pa165/core/user/roles/HouseRoleServiceTest.java
index 60b98675fe422d785fc4ece502e1fe240859942a..de1c13a7f5fd836c51b38c59da277645aec4d22a 100644
--- a/core/src/test/java/cz/muni/fi/pa165/core/user/roles/HouseRoleServiceTest.java
+++ b/core/src/test/java/cz/muni/fi/pa165/core/user/roles/HouseRoleServiceTest.java
@@ -1,7 +1,6 @@
package cz.muni.fi.pa165.core.user.roles;
import cz.muni.fi.pa165.core.house.House;
-import cz.muni.fi.pa165.core.metrics.Metrics;
import cz.muni.fi.pa165.core.user.User;
import cz.muni.fi.pa165.model.dto.role.enums.HouseRoleEnum;
import org.junit.jupiter.api.BeforeEach;
@@ -386,7 +385,7 @@ class HouseRoleServiceTest {
verify(roleRepository).findById(houseRole1.getId());
verify(roleRepository).save(houseRole1); // soft delete
- assertNotNull(deletedHouseRole.getDeletedDateTime());
+ assertNotNull(deletedHouseRole.getDeletedAt());
assertEquals(houseRole1, deletedHouseRole);
}