diff --git a/out/artifacts/NTO_2024_jar/NTO-2024.jar b/out/artifacts/NTO_2024_jar/NTO-2024.jar index b3137be..0298bdc 100644 Binary files a/out/artifacts/NTO_2024_jar/NTO-2024.jar and b/out/artifacts/NTO_2024_jar/NTO-2024.jar differ diff --git a/src/main/java/com/example/nto/service/impl/EmployeeServiceImpl.java b/src/main/java/com/example/nto/service/impl/EmployeeServiceImpl.java index a01b871..ea4e866 100644 --- a/src/main/java/com/example/nto/service/impl/EmployeeServiceImpl.java +++ b/src/main/java/com/example/nto/service/impl/EmployeeServiceImpl.java @@ -64,6 +64,9 @@ public class EmployeeServiceImpl implements EmployeeService { if(optionalEnterType.isEmpty()) throw new IncorrectTypeException("Incorrect type"); + optionalEmployee.get().setLastVisit(enterDTO.getTime()); + employeeRepository.save(optionalEmployee.get()); + Enter enter = new Enter(); enter.setType(optionalEnterType.get()); enter.setTime(enterDTO.getTime()); diff --git a/src/main/resources/db.changelog/1.0/data/2025-02-19-0006-enters-data.xml b/src/main/resources/db.changelog/1.0/data/2025-02-19-0006-enters-data.xml new file mode 100644 index 0000000..ca779a2 --- /dev/null +++ b/src/main/resources/db.changelog/1.0/data/2025-02-19-0006-enters-data.xml @@ -0,0 +1,14 @@ + + + + + + + \ No newline at end of file diff --git a/src/main/resources/db.changelog/1.0/data/csv/2025-02-18-0001-employee-data.csv b/src/main/resources/db.changelog/1.0/data/csv/2025-02-18-0001-employee-data.csv index ab13f7c..60d9291 100644 --- a/src/main/resources/db.changelog/1.0/data/csv/2025-02-18-0001-employee-data.csv +++ b/src/main/resources/db.changelog/1.0/data/csv/2025-02-18-0001-employee-data.csv @@ -1,8 +1,8 @@ username;name;password;position;photo_url;last_visit -pivanov;Иванов Петр Федорович;$2a$12$sgNQzK6r02WoGZb0rJolB.AkVWYc.ZF0RtxZ6PXjhw8EhakqvoFU6;Разработчик;https://funnyducks.ru/upload/iblock/0cd/0cdeb7ec3ed6fddda0f90fccee05557d.jpg;2024-02-12T08:30:21 -ipetrov;Петров Иван Константинович;$2a$12$sgNQzK6r02WoGZb0rJolB.AkVWYc.ZF0RtxZ6PXjhw8EhakqvoFU6;Аналитик;https://funnyducks.ru/upload/iblock/0cd/0cdeb7ec3ed6fddda0f90fccee05557d.jpg;2024-02-13T08:35:44 -asemenov;Семенов Анатолий Анатольевич;$2a$12$sgNQzK6r02WoGZb0rJolB.AkVWYc.ZF0RtxZ6PXjhw8EhakqvoFU6;Разработчик;https://funnyducks.ru/upload/iblock/0cd/0cdeb7ec3ed6fddda0f90fccee05557d.jpg;2024-02-13T08:31:33 -afedorov;Федоров Александр Сергеевич;$2a$12$sgNQzK6r02WoGZb0rJolB.AkVWYc.ZF0RtxZ6PXjhw8EhakqvoFU6;Тестировщик;https://funnyducks.ru/upload/iblock/0cd/0cdeb7ec3ed6fddda0f90fccee05557d.jpg;2024-02-12T08:36:09 +pivanov;Иванов Петр Федорович;$2a$12$sgNQzK6r02WoGZb0rJolB.AkVWYc.ZF0RtxZ6PXjhw8EhakqvoFU6;Разработчик;https://funnyducks.ru/upload/iblock/0cd/0cdeb7ec3ed6fddda0f90fccee05557d.jpg;2025-02-20T14:48:33 +ipetrov;Петров Иван Константинович;$2a$12$sgNQzK6r02WoGZb0rJolB.AkVWYc.ZF0RtxZ6PXjhw8EhakqvoFU6;Аналитик;https://funnyducks.ru/upload/iblock/0cd/0cdeb7ec3ed6fddda0f90fccee05557d.jpg;2025-02-20T14:49:21 +asemenov;Семенов Анатолий Анатольевич;$2a$12$sgNQzK6r02WoGZb0rJolB.AkVWYc.ZF0RtxZ6PXjhw8EhakqvoFU6;Разработчик;https://funnyducks.ru/upload/iblock/0cd/0cdeb7ec3ed6fddda0f90fccee05557d.jpg;2025-02-20T14:50:46 +afedorov;Федоров Александр Сергеевич;$2a$12$sgNQzK6r02WoGZb0rJolB.AkVWYc.ZF0RtxZ6PXjhw8EhakqvoFU6;Тестировщик;https://funnyducks.ru/upload/iblock/0cd/0cdeb7ec3ed6fddda0f90fccee05557d.jpg;2025-02-20T14:51:12 diff --git a/src/main/resources/db.changelog/1.0/data/csv/2025-02-18-0004-employee-authority-data.csv b/src/main/resources/db.changelog/1.0/data/csv/2025-02-18-0004-employee-authority-data.csv index 251c878..de817aa 100644 --- a/src/main/resources/db.changelog/1.0/data/csv/2025-02-18-0004-employee-authority-data.csv +++ b/src/main/resources/db.changelog/1.0/data/csv/2025-02-18-0004-employee-authority-data.csv @@ -1,5 +1,5 @@ employee_id;authorities_id 1;1 2;2 -3;3 +3;1 4;1 \ No newline at end of file diff --git a/src/main/resources/db.changelog/1.0/data/csv/2025-02-19-0006-enters-data.csv b/src/main/resources/db.changelog/1.0/data/csv/2025-02-19-0006-enters-data.csv new file mode 100644 index 0000000..6257738 --- /dev/null +++ b/src/main/resources/db.changelog/1.0/data/csv/2025-02-19-0006-enters-data.csv @@ -0,0 +1,14 @@ +username;value;enter_type_id;time +pivanov;1234567890123456789;2;2025-02-20T14:32:12 +pivanov;9223372036854775807;2;2025-02-20T14:35:25 +pivanov;1122334455667788990;2;2025-02-20T14:48:33 +ipetrov;1234567890123456789;2;2025-02-20T14:32:12 +ipetrov;9223372036854775807;2;2025-02-20T14:35:25 +ipetrov;1122334455667788990;2;2025-02-20T14:49:21 +asemenov;1234567890123456789;2;2025-02-20T14:32:12 +asemenov;9223372036854775807;2;2025-02-20T14:35:25 +asemenov;1122334455667788990;2;2025-02-20T14:50:46 +afedorov;1234567890123456789;2;2025-02-20T14:32:12 +afedorov;9223372036854775807;2;2025-02-20T14:35:25 +afedorov;1122334455667788990;2;2025-02-20T14:51:12 + diff --git a/src/main/resources/db.changelog/1.0/db.changelog-master.xml b/src/main/resources/db.changelog/1.0/db.changelog-master.xml index bdcacd7..0d88b92 100644 --- a/src/main/resources/db.changelog/1.0/db.changelog-master.xml +++ b/src/main/resources/db.changelog/1.0/db.changelog-master.xml @@ -20,6 +20,7 @@ +