Commit 587f600f authored by Kristjan Kruus's avatar Kristjan Kruus Committed by GitHub

Merge pull request #31 from e-gov/develop

Develop
parents 109be11a df6b9171
Pipeline #42 failed with stages
......@@ -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');
......
......@@ -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
......
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