Merge pull request #31 from e-gov/develop

Develop
e-gov · Mar 12, 2019 · 587f600 · 587f600
2 parents 109be11 + df6b917
commit 587f600
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/src/main/resources/liquibase/update/20190220_create_classifier_table_and_content.sql b/src/main/resources/liquibase/update/20190220_create_classifier_table_and_content.sql
@@ -84,7 +84,6 @@ INSERT INTO riha.classifier (id, type, code, json_value, discriminator) VALUES (
 
 INSERT INTO riha.classifier (id, type, code, value, discriminator) VALUES (nextval('riha.classifier_seq'), 'topics_that_do_not_require_feedback_on_creation', 'X_ROAD_SUBSYSTEM', 'x-tee alamsüsteem', 'TEXT');
 INSERT INTO riha.classifier (id, type, code, value, discriminator) VALUES (nextval('riha.classifier_seq'), 'topics_that_do_not_require_feedback_on_creation', 'INTERNAL_USAGE', 'asutusesiseseks kasutamiseks', 'TEXT');
-INSERT INTO riha.classifier (id, type, code, value, discriminator) VALUES (nextval('riha.classifier_seq'), 'topics_that_do_not_require_feedback_on_creation', 'DOCUMENT_MANAGEMENT_SYSTEM', 'dokumendihaldussüsteem', 'TEXT');
 
 INSERT INTO riha.classifier (id, type, code, value, discriminator) VALUES (nextval('riha.classifier_seq'), 'document_types', 'DOC_TYPE_USER_VIEW', 'Viide lõppkasutaja vaatele', 'TEXT');
 INSERT INTO riha.classifier (id, type, code, value, discriminator) VALUES (nextval('riha.classifier_seq'), 'document_types', 'DOC_TYPE_OPEN_DATA', 'Viide (ava)andmetele', 'TEXT');

diff --git a/src/main/resources/liquibase/update/20190308_main_resource_view_corrections.sql b/src/main/resources/liquibase/update/20190308_main_resource_view_corrections.sql
@@ -24,7 +24,7 @@ SELECT DISTINCT ON ((main_resource.json_content #>> '{uuid}')) main_resource.mai
                    ((main_resource.json_content #>> '{meta,creation_timestamp}'::text[]))::timestamp with time zone AS j_creation_timestamp,
                    ((main_resource.json_content #>> '{meta,update_timestamp}'::text[]))::timestamp with time zone AS j_update_timestamp,
                    case when
-                       COALESCE(jsonb_exists_any(main_resource.json_content -> 'topics', array[ 'dokumendihaldussüsteem', 'x-tee alamsüsteem', 'asutusesiseseks kasutamiseks']), false)
+                       COALESCE(jsonb_exists_any(main_resource.json_content -> 'topics', array['x-tee alamsüsteem','X-tee alamsüsteem', 'X-TEE ALAMSÜSTEEM', 'asutusesiseseks kasutamiseks']), false)
                          or COALESCE(has_used_system_types_relations.has_used_system_type_relations, false)
                              then 'AUTOMATICALLY_REGISTERED'::varchar (150)
                         else last_positive_approval_request.sub_type