Merge branch 'develop' into 'master'

Release: merge 'develop' into 'master' created by Kristel Meikas

See merge request teis/classifiers-service!89

CHANGELOG.md

 # Changelog
 
-## [1.20.0] - 2021-04-21
+## [1.22.0] - 2021-05-03
 
-* TEIS-2133: added new data to classifier_item table for risk assessments: vocabulary, risk factor category and business type category items
+* TEIS-409: added new classifier definition INSPECTION_OUTCOME and new classifier items.
+
+## [1.21.0] - 2021-04-21
+
+* TEIS-2133: added new data to classifier_item table for risk assessments: vocabulary, risk factor category and business
+  type category items
 
 ## [1.20.0] - 2021-04-12
 

gradle.properties

 theGroup=ee.sm.ti.teis
-theVersion=1.21.0
+theVersion=1.22.0
 commonsVersion=1.23.0
 officeApiGatewayVersion=1.23.0
 schedulerVersion=1.15.0

service/src/main/resources/db/changelog/data/2021-04-20.TEIS-409.add-inspection-outcome-classifier-items.sql

+--liquibase formatted sql
+
+--changeset siiri:2021-04-20.TEIS-409.add-inspection-outcome-classifier-items.sql
+
+DELETE FROM classifier_definition WHERE id = 'INSPECTION_OUTCOME';
+DELETE FROM classifier_item WHERE classifier_definition_id = 'INSPECTION_OUTCOME';
+
+INSERT INTO classifier_definition (id, default_value, name, editable, hierarchical, object_status, created_at) VALUES
+('INSPECTION_OUTCOME', 'NOT_INSPECTED', 'Kontrolli kontrolliteema kontrollimise tulemus', false, false, '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
+('INSPECTION_OUTCOME__INSPECTED', 'INSPECTED', 'INSPECTION_OUTCOME', null,  'Kontrollitud', 1, false, now(), null, 'CURRENT', now()),
+('INSPECTION_OUTCOME__NOT_INSPECTED', 'NOT_INSPECTED', 'INSPECTION_OUTCOME', null,  'Ei ole kontrollitud', 2, false, now(), null, 'CURRENT', now()),
+('INSPECTION_OUTCOME__IRRELEVANT', 'IRRELEVANT', 'INSPECTION_OUTCOME', null,  'Ebaoluline antud kontrolli raames', 3, false, now(), null, 'CURRENT', now());
+
+UPDATE execution_trigger SET execute = true WHERE id = 'cache-reinitialize';

service/src/main/resources/db/changelog/data/2021-04-27.TEIS-409.update-inspection-outcome-classifier-definition.sql

+--liquibase formatted sql
+
+--changeset siiri:2021-04-27.TEIS-409.update-inspection-outcome-classifier-definition.sql
+
+UPDATE classifier_definition SET ordered = true WHERE id = 'INSPECTION_OUTCOME';
+
+UPDATE execution_trigger SET execute = true WHERE id = 'cache-reinitialize';