Release v3.7.1

slovensko-digital · Oct 25, 2023 · d7e56ef · d7e56ef
1 parent 93fc9e3
commit d7e56ef
Show file tree

Hide file tree

Showing 8 changed files with 578 additions and 6 deletions.
diff --git a/INSTALL.md b/INSTALL.md
@@ -1,4 +1,4 @@
-**Inštalačná príručka popisuje komponent verzie [3.7.0](https://github.com/slovensko-digital/slovensko-sk-api/releases/tag/v3.7.0), uistite sa, že čítate príručku [verzie komponentu](https://github.com/slovensko-digital/slovensko-sk-api/releases), ktorý používate.**
+**Inštalačná príručka popisuje komponent verzie [3.7.1](https://github.com/slovensko-digital/slovensko-sk-api/releases/tag/v3.7.1), uistite sa, že čítate príručku [verzie komponentu](https://github.com/slovensko-digital/slovensko-sk-api/releases), ktorý používate.**
 
 # slovensko.sk API - Inštalačná príručka
 

diff --git a/app/controllers/health_controller.rb b/app/controllers/health_controller.rb
@@ -10,7 +10,7 @@ def index
     status = :ok
     health = {
       description: 'slovensko.sk API',
-      version: '3.7.0',
+      version: '3.7.1',
       status: 'pass',
       checks: {
         'environment:variables' => environment_variables,

diff --git a/app/services/edesk_message_parser.rb b/app/services/edesk_message_parser.rb
@@ -99,13 +99,13 @@ def build_message_from_message_info(d, m)
   end
 
   def build_message_from_body(d, m)
-    raise ParseError if d.children.count > 1
+    raise ParseError if d.children.count { |node| node.name == 'MessageContainer' } > 1
 
     d.children.each do |e|
       case e.name
       when 'MessageContainer'
         build_message_from_message_container(e, m)
-      when 'InformationMessage'
+      when 'InformationMessage', 'MetadataContainer'
         # skip
       else
         raise ParseError

diff --git a/public/openapi.yaml b/public/openapi.yaml
@@ -2,7 +2,7 @@ openapi: 3.0.0
 
 info:
   title: slovensko.sk API
-  version: 3.7.0 (Komunitná verzia) 8.8.0 (Prémium verzia)
+  version: 3.7.1 (Komunitná verzia) 8.8.1 (Prémium verzia)
 
   description: |
     slovensko.sk API je proxy REST API komponent k službám www.slovensko.sk (Ústredný portál verejnej správy – ÚPVS), pomocou ktorých je možné:

diff --git a/spec/fixtures/eks/get_message/class/egov_document_response_with_metadata_container.xml b/spec/fixtures/eks/get_message/class/egov_document_response_with_metadata_container.xml
diff --git a/spec/fixtures/eks/get_message/error/egov_document_response_with_two_message_containers.xml b/spec/fixtures/eks/get_message/error/egov_document_response_with_two_message_containers.xml
diff --git a/spec/requests/health_spec.rb b/spec/requests/health_spec.rb
@@ -71,7 +71,7 @@ def expect_fail(checks)
       expect(response.status).to eq(200)
       expect(response.object.with_indifferent_access).to match(
         description: 'slovensko.sk API',
-        version: '3.7.0',
+        version: '3.7.1',
         status: 'pass',
         checks: hash_including(*checks),
         links: {

diff --git a/spec/services/edesk_message_parser_spec.rb b/spec/services/edesk_message_parser_spec.rb
@@ -41,6 +41,44 @@
       )
     end
 
+    it 'parses SkTalk structure even if body contains MetadataContainer' do
+      edesk_message = ekr_response('eks/get_message/class/egov_document_response_with_metadata_container.xml').get_message_result.value
+
+      message = subject.parse(edesk_message)
+
+      expect(message).to have_attributes(
+        id: 4906251507,
+        klass: 'EGOV_APPLICATION',
+        message_id: '95ccec13-7298-4e6b-8a08-5bb52a4e973b',
+        correlation_id: '95ccec13-7298-4e6b-8a08-5bb52a4e973b',
+        subject: 'Všeobecná agenda - rozhodnutie do vlastných rúk',
+        original_html: start_with('<!DOCTYPE html'),
+        original_xml: start_with('<SKTalkMessage'),
+        delivered_at: '2023-10-12T17:53:42.747+02:00'.to_time,
+        posp_id: 'Doc.GeneralAgendaReport',
+        posp_version: '1.4',
+        reference_id: '00000000-0000-0000-0000-000000000000',
+        sender_uri: 'ico://sk/83369225',
+        recipient_uri: 'rc://sk/8311577189_tisici_janko',
+        type: 'Doc.GeneralAgendaReport',
+        sender_business_reference: nil,
+        recipient_business_reference: nil,
+        objects: [
+         have_attributes(
+           id: '9c91d6c6-b271-483c-9823-1c665f24dad0',
+           name: 'Všeobecná agenda - Všeobecná agenda - rozhodnutie do vlastných rúk',
+           description: nil,
+           klass: 'FORM',
+           signed: true,
+           mime_type: 'application/vnd.etsi.asic-e+zip',
+           encoding: 'Base64'
+         )
+        ],
+        delivery_notification: nil,
+        parse_error: nil
+      )
+    end
+
     it 'parses delivery report notification message structure' do
       edesk_message = ekr_response('eks/get_message/class/ed_delivery_notification_response.xml').get_message_result.value
 
@@ -160,6 +198,34 @@
       )
     end
 
+    it 'parses message structure with extra MessageContainer by marking it with parse error' do
+      edesk_message = ekr_response('eks/get_message/error/egov_document_response_with_two_message_containers.xml').get_message_result.value
+
+      message = subject.parse(edesk_message)
+
+      expect(message).to have_attributes(
+        id: 4906251507,
+        klass: 'EGOV_APPLICATION',
+        message_id: '95ccec13-7298-4e6b-8a08-5bb52a4e973b',
+        correlation_id: '95ccec13-7298-4e6b-8a08-5bb52a4e973b',
+        subject: 'Všeobecná agenda - rozhodnutie do vlastných rúk',
+        original_html: start_with('<!DOCTYPE html'),
+        original_xml: start_with('<SKTalkMessage'),
+        delivered_at: '2023-10-12T17:53:42.747+02:00'.to_time,
+        posp_id: 'Doc.GeneralAgendaReport',
+        posp_version: '1.4',
+        reference_id: '00000000-0000-0000-0000-000000000000',
+        sender_uri: nil,
+        recipient_uri: nil,
+        type: nil,
+        sender_business_reference: nil,
+        recipient_business_reference: nil,
+        objects: [],
+        delivery_notification: nil,
+        parse_error: kind_of(EdeskMessageParser::ParseError)
+      )
+    end
+
     it 'parses unknown message structure by marking it with parse error' do
       edesk_message = ekr_response('eks/get_message/class/ed_delivery_notification_response.xml').get_message_result.value