Commit da16ba36 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!84
parents a47f3c10 4da27607
# Changelog
## [1.20.0] - 2021-04-12
* TEIS-2099: added new data to classifier_item table for risk assessments: vocabulary, risk factor category and business
type category items
* TEIS-1762 mapping fix in ClassifierItemMapper
## [1.19.0] - 2021-03-22
* TEIS-2041: fixed Gradle dependency management (moved dependencies from root Gradle configuration to service level)
......
theGroup=ee.sm.ti.teis
theVersion=1.19.0
commonsVersion=1.22.0
officeApiGatewayVersion=1.22.0
theVersion=1.20.0
commonsVersion=1.23.0
officeApiGatewayVersion=1.23.0
schedulerVersion=1.15.0
pluginVersion=1.3.0
......@@ -61,6 +61,7 @@ public abstract class ClassifierItemMapper {
public abstract ClassifierItemDto toDtoWithParent(ClassifierItemEntity classifierItemEntity);
@Mapping(source = "classifierDefinition.id", target = "classifierDefinitionId")
@Mapping(source = "upperClassifierItem.id", target = "upperClassifierItemId")
public abstract ClassifierItem toDomainDto(ClassifierItemEntity classifierItemEntity);
public ClassifierItemOfficeDto toOfficeDto(ClassifierItemEntity classifierItemEntity) {
......
......@@ -94,7 +94,7 @@ VALUES
('TEST_RISK_BUSINESS_TYPE_CATEGORY__MEDICINE', 'TEST_RISK_BUSINESS_TYPE_CATEGORY', 'MEDICINE', FALSE, 'TEST fixing humanoids', 'CURRENT', 100000003, null,now(),null, 1),
('TEST_RISK_FACTOR_CATEGORY__RADIATION', 'TEST_RISK_FACTOR_CATEGORY', 'RADIATION', FALSE, 'TEST Radiatsiooni tase', 'CURRENT', 100000001, null,now(),null, null),
('TEST_RISK_FACTOR_CATEGORY__FORESTRY', 'TEST_RISK_FACTOR_CATEGORY', 'FORESTRY', FALSE, 'TEST Puidutööstus', 'CURRENT', 100000001, null,now(),null, null),
('TEST_RISK_FACTOR_CATEGORY__OFFICE', 'TEST_RISK_FACTOR_CATEGORY', 'OFFICE', FALSE, 'TEST Kontoritöö', 'CURRENT', 100000001, null,now(),null, null),
('TEST_RISK_FACTOR_CATEGORY__OFFICE', 'TEST_RISK_FACTOR_CATEGORY', 'OFFICE', FALSE, 'TEST Kontoritöö', 'CURRENT', 100000000, null,now(),null, null),
('TEST_RISK_FACTOR_CATEGORY__GENERAL', 'TEST_RISK_FACTOR_CATEGORY', 'GENERAL', FALSE, 'TEST Kõik', 'CURRENT', 100000001, null,now(),null, null),
('TEST_RISK_FACTOR_CATEGORY__ABSORB', 'TEST_RISK_FACTOR_CATEGORY', 'ABSORB', FALSE, 'TEST Imavuse tähtis mõõdik', 'CURRENT', 100000002, null,now(),null, null),
('RISK_BUSINESS_TYPE_CATEGORY__PLACEHOLDER_FOR_TESTING', 'RISK_BUSINESS_TYPE_CATEGORY', 'PLACEHOLDER_FOR_TESTING', TRUE, 'TEST Ajutine klassifikaator testimiseks', 'CURRENT', 100000004, null, now(), null, null),
......
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