Commit 5eae12fc authored by Siiri Tann's avatar Siiri Tann
Browse files

Merge branch 'develop' into 'master'

Release: merge 'develop' into 'master' created by Siiri Tann

See merge request teis/classifiers-service!109
parents 1396824d b42897b7
# Changelog
## [1.25.0] - 2021-09-27
* TEIS-2293: removed unused classifier definition and related items, updated drivers infringement status classifier item
name
* TEIS-2403: added classifier item links for existing city/parish and county classifier items
* TEIS-2220: new ms endpoint for getting classifierItems by definition
* TEIS-2222: added new classifier definitions, items, attribute definitions and attribute values for accidents
* TEIS-2212: added file context types for accidents
* TEIS-2408: added new classifiers and updated existing ones for accidents; removed AccidentInvestigationStatus
classifier items and classifier definition
* TEIS-2226: added drivers inspections' object types
* TEIS-2189: added new classifiers for drivers inspections
* TEIS-2188: added new object type for drivers inspection
* TEIS-2225: added new classifiers for drivers inspections
## [1.24.0] - 2021-06-14
* TEIS-2177: added classifier definitions and items for drivers inspection.
......
theGroup=ee.sm.ti.teis
theVersion=1.24.0
commonsVersion=1.26.0
officeApiGatewayVersion=1.26.0
theVersion=1.25.0
commonsVersion=1.27.0
officeApiGatewayVersion=1.27.0
schedulerVersion=1.15.0
pluginVersion=1.3.0
......@@ -4,15 +4,17 @@ import ee.sm.ti.teis.ClassifierTestBase;
import ee.sm.ti.teis.classifiers.classifier.item.listener.ClassifierItemsMsListener;
import ee.sm.ti.teis.classifiers.classifier.item.listener.ClassifierItemsMsListener.ClassifierItemsResponseMessage;
import ee.sm.ti.teis.domain.ClassifierItem;
import ee.sm.ti.teis.domain.ClassifierItemsByDefinition;
import ee.sm.ti.teis.servicerequest.RequestMetaDTO;
import org.junit.jupiter.api.Test;
import javax.inject.Inject;
import java.util.stream.Collectors;
import static ee.sm.ti.teis.classifiers.classifier.item.listener.ClassifierItemsMsListener.ClassifierItemResponseMessage;
import static ee.sm.ti.teis.classifiers.rabbit.QueueConfig.ClassifierItemDomainRequest;
import static ee.sm.ti.teis.classifiers.rabbit.QueueConfig.ClassifierItemsDomainRequest;
import static ee.sm.ti.teis.classifiers.rabbit.QueueConfig.*;
import static ee.sm.ti.teis.servicerequest.UserType.OFFICIAL_USER;
import static ee.sm.ti.teis.utils.TestUtils.assertBadRequest;
import static ee.sm.ti.teis.utils.TestUtils.assertResponseNotFound;
import static java.util.UUID.randomUUID;
import static org.assertj.core.api.Assertions.assertThat;
......@@ -107,4 +109,33 @@ class ClassifierItemsMsListenerTest extends ClassifierTestBase {
assertThat(252).isEqualTo(defaultValue.getPayload().size());
}
@Test
void getMsCurrentClassifierItemsByDefinition_idMissing_badRequest() {
ClassifierItemsByDefinition itemPayload = new ClassifierItemsByDefinition();
itemPayload.setDefinitionId(null);
ClassifierItemsByDefinitionDomainRequest domainsRequest = new ClassifierItemsByDefinitionDomainRequest();
domainsRequest.setPayload(itemPayload, REQUEST_META_DTO);
ClassifierItemsMsListener.ClassifierItemsByDefinitionResponseMessage response =
classifierItemsMsListener.getMsCurrentClassifierItemsByDefinition(domainsRequest);
assertBadRequest(response.getError());
}
@Test
void getMsCurrentClassifierItemsByDefinition_success() {
ClassifierItemsByDefinition itemPayload = new ClassifierItemsByDefinition();
itemPayload.setDefinitionId("TEST_EDITABLENONHIERARCHICAL");
ClassifierItemsByDefinitionDomainRequest domainsRequest = new ClassifierItemsByDefinitionDomainRequest();
domainsRequest.setPayload(itemPayload, REQUEST_META_DTO);
ClassifierItemsMsListener.ClassifierItemsByDefinitionResponseMessage response =
classifierItemsMsListener.getMsCurrentClassifierItemsByDefinition(domainsRequest);
assertThat(response.getPayload()).size().isGreaterThanOrEqualTo(2);
assertThat(response.getPayload().stream().map(ClassifierItem::getId).collect(Collectors.toList()))
.contains("TEST_EDITABLENONHIERARCHICAL__TEST001", "TEST_EDITABLENONHIERARCHICAL__TEST003")
.doesNotContain("TEST_EDITABLENONHIERARCHICAL__TEST002");
}
}
......@@ -51,7 +51,7 @@ class ClassifierItemsPublicListenerTest extends ClassifierTestBase {
@Test
void getClassifierItemByIdAndLinkedTarget_empty_result() {
itemPayload.setId("CITY_OR_PARISH__0130");
itemPayload.setId("COUNTRY__AF");
itemPayload.setLinkedItems(LinkedItems.BOTH);
itemRequest.setPayload(itemPayload, REQUEST_META_DTO);
ClassifierItemResponse response = classifierItemsPublicListener.getClassifierItem(itemRequest);
......
......@@ -39,6 +39,15 @@ public class ClassifierItemsMsListener {
return resultDTO;
}
@RabbitListener(queues = {MS_CLASSIFIER_ITEMS_BY_DEFINITION_QUEUE})
public ClassifierItemsByDefinitionResponseMessage getMsCurrentClassifierItemsByDefinition(ClassifierItemsByDefinitionDomainRequest requestDTO) {
List<ClassifierItem> classifierItems =
classifierItemBusinessService.getListByDefinition(requestDTO.getPayload().getDefinitionId());
ClassifierItemsByDefinitionResponseMessage resultDTO = new ClassifierItemsByDefinitionResponseMessage();
resultDTO.setPayload(classifierItems, requestDTO.getRequestMetaDTO());
return resultDTO;
}
private ClassifierItemSearchFilterDto composeSearchFilterDto(ClassifierItem payload) {
ClassifierItemSearchFilterDto search = new ClassifierItemSearchFilterDto();
if (payload.getAttributes() != null) {
......@@ -57,4 +66,7 @@ public class ClassifierItemsMsListener {
public static class ClassifierItemsResponseMessage extends DomainQueryResponseDto<List<ClassifierItem>, ErrorDTO> {
}
public static class ClassifierItemsByDefinitionResponseMessage extends DomainQueryResponseDto<List<ClassifierItem>, ErrorDTO> {
}
}
......@@ -30,6 +30,7 @@ import org.springframework.validation.annotation.Validated;
import javax.transaction.Transactional;
import javax.validation.Valid;
import javax.validation.constraints.NotBlank;
import java.util.List;
import java.util.Optional;
import java.util.regex.Matcher;
......@@ -202,12 +203,16 @@ public class ClassifierItemBusinessService {
return classifierItemMapper.toDomainDto(classifierItemEntity);
}
public List<ClassifierItemDto> getList(
@Valid @ValidClassifierSearchFilter ClassifierItemSearchFilterDto search) {
public List<ClassifierItemDto> getList(@Valid @ValidClassifierSearchFilter ClassifierItemSearchFilterDto search) {
List<ClassifierItemEntity> classifierItems = classifierItemDataService.getFilteredClassifierItems(search);
return classifierItemMapper.toDtoList(classifierItems);
}
public List<ClassifierItem> getListByDefinition(@NotBlank String definitionId) {
List<ClassifierItemEntity> classifierItems = classifierItemDataService.getCurrentClassifierItemsByDefinitionId(definitionId);
return classifierItemMapper.toDomainList(classifierItems);
}
public ClassifierItemDto geByDefinitionAndCode(String classifierDefinitionId, String code) {
ClassifierItemEntity classifierItemEntity = classifierItemDataService.getClassifierItemByDefinitionAndCode(
classifierDefinitionId, code);
......
......@@ -10,6 +10,7 @@ import ee.sm.ti.teis.configuration.QueueList;
import ee.sm.ti.teis.configuration.TeisQueue;
import ee.sm.ti.teis.domain.ClassifierDefinition;
import ee.sm.ti.teis.domain.ClassifierItem;
import ee.sm.ti.teis.domain.ClassifierItemsByDefinition;
import ee.sm.ti.teis.domainrequest.DomainQueryDTO;
import ee.sm.ti.teis.domainrequest.DomainRequestDTO;
import ee.sm.ti.teis.servicecommon.util.TestDataImportService;
......@@ -22,6 +23,7 @@ public class QueueConfig implements QueueList {
public static final String GW_CLASSIFIER_DEFINITION_DEFAULT_VALUE_QUEUE = "classifier-service.gw.classifierDefinitionDefaultValueRequests";
public static final String MS_CLASSIFIER_ITEM_QUEUE = "classifier-service.ms.classifierItemRequests";
public static final String MS_CLASSIFIER_ITEMS_QUEUE = "classifier-service.ms.classifierItemsRequests";
public static final String MS_CLASSIFIER_ITEMS_BY_DEFINITION_QUEUE = "classifier-service.ms.classifierItemsByDefinitionRequests";
public static final String MS_CLASSIFIER_DEFINITION_QUEUE = "classifier-service.ms.classifierDefinitionRequests";
public static final String CS_CLASSIFIER_ITEM_QUEUE = "classifier-service.cs.classifierItemsCacheRequests";
public static final String CS_CLASSIFIER_DEFINITION_QUEUE = "classifier-service.cs.classifierDefinitionsCacheRequests";
......@@ -33,6 +35,7 @@ public class QueueConfig implements QueueList {
addGwQueue(queues, "gwClassifierItemsQueue", ClassifierItemsRequest.ROUTING_KEY, GW_CLASSIFIER_ITEMS_QUEUE);
addMsQueue(queues, "msClassifierItemsQueue", new ClassifierItemsDomainRequest().routingKey(), MS_CLASSIFIER_ITEMS_QUEUE);
addMsQueue(queues, "msClassifierItemsByDefinitionQueue", new ClassifierItemsByDefinitionDomainRequest().routingKey(), MS_CLASSIFIER_ITEMS_BY_DEFINITION_QUEUE);
addGwQueue(queues, "gwClassifierItemQueue", ClassifierItemRequest.ROUTING_KEY, GW_CLASSIFIER_ITEM_QUEUE);
addMsQueue(queues, "msClassifierItemQueue", new ClassifierItemDomainRequest().routingKey(), MS_CLASSIFIER_ITEM_QUEUE);
addGwQueue(queues, "gwClassifierDefinitionDefaultValueQueue", ClassifierDefinitionRequest.ROUTING_KEY, GW_CLASSIFIER_DEFINITION_DEFAULT_VALUE_QUEUE);
......@@ -53,6 +56,9 @@ public class QueueConfig implements QueueList {
public static class ClassifierItemsDomainRequest extends DomainQueryDTO<ClassifierItem, ErrorDTO> {
}
public static class ClassifierItemsByDefinitionDomainRequest extends DomainQueryDTO<ClassifierItemsByDefinition, ErrorDTO> {
}
public static class ClassifierDefinitionDomainRequest extends DomainRequestDTO<ClassifierDefinition, ErrorDTO> {
}
}
--liquibase formatted sql
--changeset kristel:2021-05-31.TEIS-2177.add-drivers-inspections-classifier-data.sql
INSERT INTO classifier_definition (id, default_value, name, editable, hierarchical, ordered, object_status, created_at) VALUES
('DRIVERS_INSPECTION_SETTINGS_STATUS', 'ACTIVE', 'Sõidukijuhtide kontrollis seadistuste (kõrvalekallete ja raskusastmete tüübid) staatus', false, false, true, 'CURRENT', now()),
('DRIVERS_VIOLATION_CATEGORY', null, 'Sõidukijuhtide tööaja nõuetest kõrvalekaldumise teema', true, false, true, 'CURRENT', now());
INSERT INTO classifier_item (id, code, classifier_definition_id, upper_classifier_item_id, name, seq_no, editable, valid_from, valid_until, object_status, created_at) VALUES
('DRIVERS_INSPECTION_SETTINGS_STATUS__ACTIVE', 'ACTIVE', 'DRIVERS_INSPECTION_SETTINGS_STATUS', null, 'Kasutusel', 1, false, now(), null, 'CURRENT', now()),
('DRIVERS_INSPECTION_SETTINGS_STATUS__INACTIVE', 'INACTIVE', 'DRIVERS_INSPECTION_SETTINGS_STATUS', null, 'Mitte kasutusel', 2, false, now(), null, 'CURRENT', now()),
('DRIVERS_VIOLATION_CATEGORY__REST_BREAK', 'REST_BREAK', 'DRIVERS_VIOLATION_CATEGORY', null, 'Puhkepaus', 1, true, now(), null, 'CURRENT', now()),
('DRIVERS_VIOLATION_CATEGORY__REST_PERIOD', 'REST_PERIOD', 'DRIVERS_VIOLATION_CATEGORY', null, 'Puhkeperiood', 2, true, now(), null, 'CURRENT', now());
UPDATE execution_trigger SET execute = true WHERE id = 'cache-reinitialize';
--liquibase formatted sql
--changeset kristel:2021-07-12.add-object-type-drivers-inspection
INSERT INTO classifier_item (id, classifier_definition_id, code, editable, name, object_status, seq_no, upper_classifier_item_id, valid_from, valid_until, level)
VALUES ('OBJECT_TYPE__DRIVERS_INSPECTION', 'OBJECT_TYPE', 'DRIVERS_INSPECTION', false, 'Sõidukijuhtide tööaja nõuete täitmise kontroll', 'CURRENT', 17, null, now(), null, null);
\ No newline at end of file
--liquibase formatted sql
--changeset kristel:2021-07-22.add-drivers-infringement-status
INSERT INTO classifier_definition (id, default_value, name, editable, hierarchical, ordered, object_status, created_at) VALUES
('DRIVERS_INFRINGEMENT_STATUS', 'ACTIVE', 'Sõidukijuhtide tööaja nõuetest kõrvalekaldumise staatus', false, false, true, 'CURRENT', now());
INSERT INTO classifier_item (id, classifier_definition_id, code, editable, name, object_status, seq_no, upper_classifier_item_id, valid_from, valid_until, level) VALUES
('DRIVERS_INFRINGEMENT_STATUS__ACCEPTED', 'DRIVERS_INFRINGEMENT_STATUS', 'ACCEPTED', false, 'Põhjendatud', 'CURRENT', 1, null, now(), null, null),
('DRIVERS_INFRINGEMENT_STATUS__DECLINED', 'DRIVERS_INFRINGEMENT_STATUS', 'DECLINED', false, 'Põhjendmata rikkumine', 'CURRENT', 2, null, now(), null, null),
('DRIVERS_INFRINGEMENT_STATUS__UNIMPORTANT', 'DRIVERS_INFRINGEMENT_STATUS', 'UNIMPORTANT', false, 'Ebaoluline', 'CURRENT', 3, null, now(), null, null);
\ No newline at end of file
--liquibase formatted sql
--changeset kristel:2021-08-05.TEIS-2226.add-drivers-inspections-object-types
INSERT INTO classifier_item (id, classifier_definition_id, code, editable, name, object_status, seq_no, upper_classifier_item_id, valid_from, valid_until, level) VALUES
('OBJECT_TYPE__DRIVERS_VIOLATION', 'OBJECT_TYPE', 'DRIVERS_VIOLATION', false, 'Tööaja nõuetest kõrvalekallete kogum', 'CURRENT', 18, null, now(), null, null),
('OBJECT_TYPE__DRIVERS_VIOLATION_FILE', 'OBJECT_TYPE', 'DRIVERS_VIOLATION_FILE', false, 'Tööaja nõuetest kõrvalekallete kogumi failid', 'CURRENT', 19, null, now(), null, null),
('OBJECT_TYPE__DRIVERS_INFRINGEMENT', 'OBJECT_TYPE', 'DRIVERS_INFRINGEMENT', false, 'Tööaja nõuetest kõrvalekaldumiste andmed', 'CURRENT', 20, null, now(), null, null),
('OBJECT_TYPE__DRIVERS_NUMBER_OF_INSPECTED_ITEMS', 'OBJECT_TYPE', 'DRIVERS_NUMBER_OF_INSPECTED_ITEMS', false, 'Kontrollitud juhtide või tööpäevade arv', 'CURRENT', 21, null, now(), null, null);
\ No newline at end of file
--liquibase formatted sql
--changeset siiri:2021-08-25.TEIS-2408.add-and-update-accident-classifiers
INSERT INTO classifier_definition (id, default_value, name, editable, hierarchical, ordered, object_status, created_at) VALUES
('ACCIDENT_TYPE', 'UNSPECIFIED', 'Tööõnnetuse liik', false, false, true, 'CURRENT', now()),
('CRIMINAL_CASE', 'NOT_STARTED', 'Tööõnnetusega seotud kriminaalasi', false, false, true, 'CURRENT', now());
UPDATE classifier_definition SET default_value = 'IN_PROGRESS' WHERE id = 'ACCIDENT_STATUS';
UPDATE classifier_item SET seq_no = 1 WHERE id = 'ACCIDENT_STATUS__IN_PROGRESS';
UPDATE classifier_item SET seq_no = 2 WHERE id = 'ACCIDENT_STATUS__PENDING';
UPDATE classifier_item SET name = 'Esitamise ootel' WHERE id = 'ACCIDENT_STATUS__PENDING';
DELETE from classifier_item where id = 'ACCIDENT_STATUS__CONFIRMED';
INSERT INTO classifier_item (id, classifier_definition_id, code, editable, name, object_status, seq_no, upper_classifier_item_id, valid_from, valid_until, level, created_at) VALUES
('OBJECT_TYPE__ACCIDENT_CASE', 'OBJECT_TYPE', 'ACCIDENT_CASE', false, 'Tööõnnetuse juhtum', 'CURRENT', null, null, now(), null, null, now()),
('OBJECT_TYPE__ACCIDENT_CASE_FILE', 'OBJECT_TYPE', 'ACCIDENT_CASE_FILE', false, 'Tööõnnetuse juurde kuuluv fail', 'CURRENT', null, null, now(), null, null, now()),
('ACCIDENT_STATUS__CLOSED', 'ACCIDENT_STATUS', 'CLOSED', false, 'Lõpetatud', 'CURRENT', 4, null, now(), null, null, now()),
('ACCIDENT_TYPE__UNSPECIFIED', 'ACCIDENT_TYPE', 'UNSPECIFIED', false, 'Määramata', 'CURRENT', 1, null, now(), null, null, now()),
('ACCIDENT_TYPE__ACCIDENT', 'ACCIDENT_TYPE', 'ACCIDENT', false, 'Tööõnnetus', 'CURRENT', 2, null, now(), null, null, now()),
('ACCIDENT_TYPE__ACCIDENT_NO_UNWORKABLE_DAYS', 'ACCIDENT_TYPE', 'ACCIDENT_NO_UNWORKABLE_DAYS', false, 'Tööõnnetus, töövõimetuspäevi pole', 'CURRENT', 3, null, now(), null, null, now()),
('ACCIDENT_TYPE__NOT_ACCIDENT', 'ACCIDENT_TYPE', 'NOT_ACCIDENT', false, 'Ei ole tööõnnetus', 'CURRENT', 4, null, now(), null, null, now()),
('CRIMINAL_CASE__NOT_STARTED', 'CRIMINAL_CASE', 'NOT_STARTED', false, 'Ei ole alustatud', 'CURRENT', 1, null, now(), null, null, now()),
('CRIMINAL_CASE__STARTED', 'CRIMINAL_CASE', 'STARTED', false, 'Alustatud', 'CURRENT', 2, null, now(), null, null, now()),
('CRIMINAL_CASE__CLOSED', 'CRIMINAL_CASE', 'CLOSED', false, 'Lõpetatud', 'CURRENT', 3, null, now(), null, null, now());
DELETE FROM classifier_item where classifier_definition_id = 'ACCIDENT_INVESTIGATION_STATUS';
DELETE FROM classifier_definition where id = 'ACCIDENT_INVESTIGATION_STATUS';
UPDATE execution_trigger SET execute = true WHERE id = 'cache-reinitialize';
--liquibase formatted sql
--changeset siiri:2021-08-26.TEIS-2212.add-and-update-accident-classifiers
INSERT INTO classifier_item (id, classifier_definition_id, code, editable, name, object_status, seq_no, upper_classifier_item_id, valid_from, created_at) VALUES
('FILE_CONTEXT_TYPE__ACCIDENT_CASE_REGISTRATION_NOTICE', 'FILE_CONTEXT_TYPE', 'ACCIDENT_CASE_REGISTRATION_NOTICE', false, 'Tööõnnetuse registreerimise teade', 'CURRENT', 6, null, now(), now()),
('FILE_CONTEXT_TYPE__ACCIDENT_CASE_OTHER_NOTICE', 'FILE_CONTEXT_TYPE', 'ACCIDENT_CASE_OTHER_NOTICE', false, 'Tööõnnetuse muu teade', 'CURRENT', 7, null, now(), now()),
('FILE_CONTEXT_TYPE__ACCIDENT_CASE_REPORT', 'FILE_CONTEXT_TYPE', 'ACCIDENT_CASE_REPORT', false, 'Tööõnnetuse raport', 'CURRENT', 8, null, now(), now()),
('FILE_CONTEXT_TYPE__ACCIDENT_CASE_ACT', 'FILE_CONTEXT_TYPE', 'ACCIDENT_CASE_ACT', false, 'Tööõnnetuse akt', 'CURRENT', 9, null, now(), now()),
('FILE_CONTEXT_TYPE__ACCIDENT_CASE_OTHER', 'FILE_CONTEXT_TYPE', 'ACCIDENT_CASE_OTHER', false, 'Tööõnnetuse muu fail', 'CURRENT', 10, null, now(), now());
UPDATE execution_trigger SET execute = true WHERE id = 'cache-reinitialize';
--liquibase formatted sql
--changeset kristel:2021-09-10.TEIS-2403.add-ehak-classifier-links
INSERT INTO classifier_item (id, classifier_definition_id, code, editable, name, object_status, seq_no, upper_classifier_item_id, valid_from, valid_until, level, created_at, created_by) VALUES
('CITY_OR_PARISH__0917', 'CITY_OR_PARISH', '0917', false, 'Võru vald', 'CURRENT', 252, null, now(), null, null, now(), 'SYSTEM');
INSERT INTO classifier_item_link (id, source_classifier_item_id, target_classifier_item_id, object_status, created_at, created_by) VALUES
('834d3dcb-a3d6-4b87-a3af-aaf4d2da3a51', 'CITY_OR_PARISH__0130', 'COUNTY__0045', 'CURRENT', now(), 'SYSTEM'),
('72ca4595-0e24-435c-85ca-591852867130', 'CITY_OR_PARISH__0141', 'COUNTY__0037', 'CURRENT', now(), 'SYSTEM'),
('8623bf9c-8f9c-4b7c-b34d-9441d2791181', 'CITY_OR_PARISH__0142', 'COUNTY__0087', 'CURRENT', now(), 'SYSTEM'),
('8820e490-473b-4121-9b6b-9429134aad5c', 'CITY_OR_PARISH__0171', 'COUNTY__0079', 'CURRENT', now(), 'SYSTEM'),
('6d910148-55fa-484a-8474-f54c426f46d4', 'CITY_OR_PARISH__0184', 'COUNTY__0056', 'CURRENT', now(), 'SYSTEM'),
('ad3a42bb-6470-42c3-8813-2181a4700694', 'CITY_OR_PARISH__0191', 'COUNTY__0060', 'CURRENT', now(), 'SYSTEM'),
('0a8d1fed-3aba-4a28-8c0f-e9c4452adf6a', 'CITY_OR_PARISH__0198', 'COUNTY__0037', 'CURRENT', now(), 'SYSTEM'),
('c94f3346-b99d-44b3-9064-8ce1b6c2f341', 'CITY_OR_PARISH__0205', 'COUNTY__0039', 'CURRENT', now(), 'SYSTEM'),
('aab1216c-cfe7-430e-a4ef-f7be02a705b9', 'CITY_OR_PARISH__0214', 'COUNTY__0068', 'CURRENT', now(), 'SYSTEM'),
('18b1a65f-23df-4ba9-a26f-38efb189fde3', 'CITY_OR_PARISH__0245', 'COUNTY__0037', 'CURRENT', now(), 'SYSTEM'),
('dadeba64-6439-455f-bc6f-4523d157ef2e', 'CITY_OR_PARISH__0247', 'COUNTY__0050', 'CURRENT', now(), 'SYSTEM'),
('3e5822b4-8d32-4433-959c-dd6c68d1e233', 'CITY_OR_PARISH__0251', 'COUNTY__0045', 'CURRENT', now(), 'SYSTEM'),
('52ae279d-f03f-4ab2-a090-3aabc7085cb5', 'CITY_OR_PARISH__0255', 'COUNTY__0052', 'CURRENT', now(), 'SYSTEM'),
('d9ddade6-f5d9-404a-8f1e-b291dffef964', 'CITY_OR_PARISH__0272', 'COUNTY__0060', 'CURRENT', now(), 'SYSTEM'),
('3b941248-7477-4c60-951c-ac51cad8e943', 'CITY_OR_PARISH__0283', 'COUNTY__0079', 'CURRENT', now(), 'SYSTEM'),
('e1d99030-cc5c-4af6-b678-3287b2cb40fd', 'CITY_OR_PARISH__0284', 'COUNTY__0064', 'CURRENT', now(), 'SYSTEM'),
('029ea284-64d3-4693-80fe-44b064b497f8', 'CITY_OR_PARISH__0291', 'COUNTY__0079', 'CURRENT', now(), 'SYSTEM'),
('2a9b0f25-985f-43b8-800a-103eda77c121', 'CITY_OR_PARISH__0293', 'COUNTY__0071', 'CURRENT', now(), 'SYSTEM'),
('75c2ab27-4f6a-4e49-9de1-051476ae0c6e', 'CITY_OR_PARISH__0296', 'COUNTY__0037', 'CURRENT', now(), 'SYSTEM'),
('7dce1c48-1e2a-4fbe-8058-f05d96018980', 'CITY_OR_PARISH__0303', 'COUNTY__0068', 'CURRENT', now(), 'SYSTEM'),
('b19cb18c-5915-4c1f-be84-44e0d8b0f07a', 'CITY_OR_PARISH__0305', 'COUNTY__0037', 'CURRENT', now(), 'SYSTEM'),
('80fcf721-7eed-47c3-b747-afd3b411f15e', 'CITY_OR_PARISH__0317', 'COUNTY__0071', 'CURRENT', now(), 'SYSTEM'),
('b418e03a-66b0-4908-b0ea-080e9d9c8300', 'CITY_OR_PARISH__0321', 'COUNTY__0045', 'CURRENT', now(), 'SYSTEM'),
('182f2fa1-e677-4b3c-bd0a-d5cfd4ef6f35', 'CITY_OR_PARISH__0338', 'COUNTY__0037', 'CURRENT', now(), 'SYSTEM'),
('5c9112ab-7b28-4ee0-8a89-fe37ea89fc24', 'CITY_OR_PARISH__0353', 'COUNTY__0037', 'CURRENT', now(), 'SYSTEM'),
('b88abd6a-3003-4752-9759-77b8b7eeff35', 'CITY_OR_PARISH__0424', 'COUNTY__0037', 'CURRENT', now(), 'SYSTEM'),
('98c0c32f-ce1b-4e3e-9dc1-f9a889f35a8f', 'CITY_OR_PARISH__0430', 'COUNTY__0068', 'CURRENT', now(), 'SYSTEM'),
('f7b492f7-ffae-4390-bd81-8666aa1316ae', 'CITY_OR_PARISH__0431', 'COUNTY__0037', 'CURRENT', now(), 'SYSTEM'),
('5315c9c0-a95a-4525-a10a-4684a4f091f9', 'CITY_OR_PARISH__0432', 'COUNTY__0079', 'CURRENT', now(), 'SYSTEM'),
('61482ad7-a807-4144-9bab-e7cf85d8fd10', 'CITY_OR_PARISH__0441', 'COUNTY__0056', 'CURRENT', now(), 'SYSTEM'),
('5626ab11-183d-4e58-b3c8-2bbb431ad23d', 'CITY_OR_PARISH__0442', 'COUNTY__0045', 'CURRENT', now(), 'SYSTEM'),
('5f8dec2a-4d80-4ad7-94aa-f1f03927decd', 'CITY_OR_PARISH__0446', 'COUNTY__0037', 'CURRENT', now(), 'SYSTEM'),
('95193003-4ef2-43a1-ae01-df8682e0b105', 'CITY_OR_PARISH__0478', 'COUNTY__0074', 'CURRENT', now(), 'SYSTEM'),
('9309da25-88fc-460c-877c-882b08a9eab5', 'CITY_OR_PARISH__0480', 'COUNTY__0084', 'CURRENT', now(), 'SYSTEM'),
('6d222d4a-5ff3-420c-8525-515cbf6ecfdd', 'CITY_OR_PARISH__0486', 'COUNTY__0050', 'CURRENT', now(), 'SYSTEM'),
('b5d8d311-da80-4b38-bcb3-612af40d97a2', 'CITY_OR_PARISH__0502', 'COUNTY__0071', 'CURRENT', now(), 'SYSTEM'),
('4ffbd3d3-bee0-4e0d-be19-ba7348efc261', 'CITY_OR_PARISH__0511', 'COUNTY__0045', 'CURRENT', now(), 'SYSTEM'),
('a9fb7494-0634-4610-b719-e327c693d41c', 'CITY_OR_PARISH__0514', 'COUNTY__0045', 'CURRENT', now(), 'SYSTEM'),
('31ce6715-0d2b-42b8-aacd-b5abcf12bae5', 'CITY_OR_PARISH__0528', 'COUNTY__0079', 'CURRENT', now(), 'SYSTEM'),
('6c40fb6e-47fc-4dc5-ad50-a7c5393e64ad', 'CITY_OR_PARISH__0557', 'COUNTY__0081', 'CURRENT', now(), 'SYSTEM'),
('52677644-f8d4-40a5-ae04-06d0e7c47760', 'CITY_OR_PARISH__0567', 'COUNTY__0052', 'CURRENT', now(), 'SYSTEM'),
('f50d03bd-2157-487c-846d-ac8810b4c963', 'CITY_OR_PARISH__0586', 'COUNTY__0079', 'CURRENT', now(), 'SYSTEM'),
('994fd739-eb1b-45e2-a9ef-962447a16ba1', 'CITY_OR_PARISH__0615', 'COUNTY__0084', 'CURRENT', now(), 'SYSTEM'),
('7a44c71e-786a-483e-8656-4375a26c40bf', 'CITY_OR_PARISH__0618', 'COUNTY__0050', 'CURRENT', now(), 'SYSTEM'),
('574ba473-1064-4af5-a98b-b7c1089c2e94', 'CITY_OR_PARISH__0622', 'COUNTY__0064', 'CURRENT', now(), 'SYSTEM'),
('603b403e-af0b-4fcf-a417-76f001ec9cb0', 'CITY_OR_PARISH__0624', 'COUNTY__0068', 'CURRENT', now(), 'SYSTEM'),
('860dbfa4-a599-47f9-8f56-a278736d35b6', 'CITY_OR_PARISH__0638', 'COUNTY__0068', 'CURRENT', now(), 'SYSTEM'),
('6d3a3ac9-89ca-4674-9dec-e6399a1c8748', 'CITY_OR_PARISH__0651', 'COUNTY__0037', 'CURRENT', now(), 'SYSTEM'),
('251f0de2-1a40-48ad-81b1-21332f3bdf9d', 'CITY_OR_PARISH__0653', 'COUNTY__0037', 'CURRENT', now(), 'SYSTEM'),
('087b4690-7c2e-43e6-b1c0-171c6a7bd51f', 'CITY_OR_PARISH__0661', 'COUNTY__0060', 'CURRENT', now(), 'SYSTEM'),
('db0d1a6a-13fc-4211-aa0c-6e2610cb13b3', 'CITY_OR_PARISH__0663', 'COUNTY__0060', 'CURRENT', now(), 'SYSTEM'),
('57c1c769-52c5-424e-a85c-b5c539fc7cfa', 'CITY_OR_PARISH__0668', 'COUNTY__0071', 'CURRENT', now(), 'SYSTEM'),
('bba11074-95e6-442b-932c-7664529b0046', 'CITY_OR_PARISH__0689', 'COUNTY__0074', 'CURRENT', now(), 'SYSTEM'),
('d0ed9556-cb2a-4b69-9fe5-c7acf0b88c88', 'CITY_OR_PARISH__0698', 'COUNTY__0087', 'CURRENT', now(), 'SYSTEM'),
('1575f0b3-9283-44bc-8537-e7fdc4c18455', 'CITY_OR_PARISH__0708', 'COUNTY__0064', 'CURRENT', now(), 'SYSTEM'),
('ba817423-504c-4fca-a8b5-934b8b572369', 'CITY_OR_PARISH__0712', 'COUNTY__0068', 'CURRENT', now(), 'SYSTEM'),
('85f1a122-4609-4cdf-9bef-8736a7614ca3', 'CITY_OR_PARISH__0714', 'COUNTY__0074', 'CURRENT', now(), 'SYSTEM'),
('387b4f90-2d20-4254-9ef1-00dff73d3c9b', 'CITY_OR_PARISH__0719', 'COUNTY__0037', 'CURRENT', now(), 'SYSTEM'),
('96eb51b7-28e7-4dac-ab4d-843d5b33d1b1', 'CITY_OR_PARISH__0725', 'COUNTY__0037', 'CURRENT', now(), 'SYSTEM'),
('0e7c6f84-7ecb-49e1-94b0-ef776232b627', 'CITY_OR_PARISH__0732', 'COUNTY__0087', 'CURRENT', now(), 'SYSTEM'),
('c2ad457b-77d1-430d-8774-afde3159c6bc', 'CITY_OR_PARISH__0735', 'COUNTY__0045', 'CURRENT', now(), 'SYSTEM'),
('b1d79855-7b35-4c3c-8159-4ba660c99baf', 'CITY_OR_PARISH__0784', 'COUNTY__0037', 'CURRENT', now(), 'SYSTEM'),
('0b1357b4-52f5-4c75-958d-21f0e034d5df', 'CITY_OR_PARISH__0792', 'COUNTY__0060', 'CURRENT', now(), 'SYSTEM'),
('96aae119-fb7f-4c57-a78c-918c61a46fe7', 'CITY_OR_PARISH__0793', 'COUNTY__0079', 'CURRENT', now(), 'SYSTEM'),
('8b803dd5-0aa4-4ebd-996f-ef3636736f7b', 'CITY_OR_PARISH__0796', 'COUNTY__0079', 'CURRENT', now(), 'SYSTEM'),
('79b88ef6-78e5-4c70-ba36-21cb27278c01', 'CITY_OR_PARISH__0803', 'COUNTY__0045', 'CURRENT', now(), 'SYSTEM'),
('dc4aba91-4694-444a-b94a-5014c415a612', 'CITY_OR_PARISH__0809', 'COUNTY__0068', 'CURRENT', now(), 'SYSTEM'),
('dec9bbef-134d-4f0d-85fa-436f44951460', 'CITY_OR_PARISH__0824', 'COUNTY__0081', 'CURRENT', now(), 'SYSTEM'),
('1e3ecf07-b3c4-4633-a428-4281abcc7943', 'CITY_OR_PARISH__0834', 'COUNTY__0052', 'CURRENT', now(), 'SYSTEM'),
('447419af-bfe4-4568-98db-ae49f26fe2e1', 'CITY_OR_PARISH__0855', 'COUNTY__0081', 'CURRENT', now(), 'SYSTEM'),
('dd8b5370-f8b0-4d2c-86ea-f7bc4bd123eb', 'CITY_OR_PARISH__0890', 'COUNTY__0037', 'CURRENT', now(), 'SYSTEM'),
('3a3072af-0c6c-4115-944f-6cea9b9f8f71', 'CITY_OR_PARISH__0897', 'COUNTY__0084', 'CURRENT', now(), 'SYSTEM'),
('e64a1da2-12b4-4582-a03a-7cb183c0c902', 'CITY_OR_PARISH__0899', 'COUNTY__0084', 'CURRENT', now(), 'SYSTEM'),
('b2d4fde4-4a7a-4f70-a89f-ffa22cb5383a', 'CITY_OR_PARISH__0901', 'COUNTY__0060', 'CURRENT', now(), 'SYSTEM'),
('5b3171e9-ab3c-46f3-bb41-1f16d6a4c83f', 'CITY_OR_PARISH__0903', 'COUNTY__0060', 'CURRENT', now(), 'SYSTEM'),
('ea9f7731-bc89-4825-9e9f-44b5d9a816b0', 'CITY_OR_PARISH__0907', 'COUNTY__0056', 'CURRENT', now(), 'SYSTEM'),
('24c08f90-f48b-447d-8991-a17dc7dd50da', 'CITY_OR_PARISH__0917', 'COUNTY__0087', 'CURRENT', now(), 'SYSTEM'),
('bb7d7b0e-7ceb-4237-9bf9-16bce2ce5047', 'CITY_OR_PARISH__0919', 'COUNTY__0087', 'CURRENT', now(), 'SYSTEM'),
('812a57f1-b686-4c03-a09c-7f6b792fbaab', 'CITY_OR_PARISH__0928', 'COUNTY__0060', 'CURRENT', now(), 'SYSTEM');
--liquibase formatted sql
--changeset kristel:2021-09-17.TEIS-2293.update-drivers-inspections-classifier-data
DELETE FROM classifier_item WHERE classifier_definition_id = 'DRIVERS_VIOLATION_STATUS';
DELETE FROM classifier_definition WHERE id = 'DRIVERS_VIOLATION_STATUS';
UPDATE classifier_item SET name = 'Sobimatu' WHERE id = 'DRIVERS_INFRINGEMENT_STATUS__DECLINED';
UPDATE execution_trigger SET execute = true WHERE id = 'cache-reinitialize';
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment