Commit 0dff033d authored by Gabriel Commeau's avatar Gabriel Commeau
Browse files

Refactoring outcome to use notification object.

parent 9c6f4aae

104144/examples/form1_fullOutcome_noEmergency_request.xml

+54 −50
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<HI1Message xmlns="http://uri.etsi.org/03120/common/2019/10/Core" xmlns:auth="http://uri.etsi.org/03120/common/2020/09/Authorisation" xmlns:doc="http://uri.etsi.org/03120/common/2020/09/Document" xmlns:task="http://uri.etsi.org/03120/common/2020/09/Task" xmlns:notify="http://uri.etsi.org/03120/common/2016/02/Notification" xmlns:ef1="http://uri.etsi.org/03120/common/2025/02/EpocForm1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ph="http://uri.etsi.org/03120/common/2025/02/EPOCPlaceholder" xmlns:epoc="http://data.europa.eu/edm/1/ns/epoc" xmlns:eio="http://data.europa.eu/edm/1/ns/eio" xmlns:epocform1="http://data.europa.eu/edm/1/ns/forms/EPOC-FORM-1#" xmlns:epocform2="http://data.europa.eu/edm/1/ns/forms/EPOC-PR-FORM-2#" xmlns:epocform3="http://data.europa.eu/edm/1/ns/forms/EPOC-FORM-3#" xmlns:eopcform5="http://data.europa.eu/edm/1/ns/forms/EPOC-PR-FORM-5#" xmlns:eopcform6="http://data.europa.eu/edm/1/ns/forms/EPOC-PR-FORM-6#" xmlns:common="http://uri.etsi.org/03120/common/2016/02/Common" xmlns:ecauth="http://uri.etsi.org/03120/common/2025/02/EioAuthority">

<HI1Message xmlns="http://uri.etsi.org/03120/common/2019/10/Core" xmlns:auth="http://uri.etsi.org/03120/common/2020/09/Authorisation" xmlns:doc="http://uri.etsi.org/03120/common/2020/09/Document" xmlns:task="http://uri.etsi.org/03120/common/2020/09/Task" xmlns:notify="http://uri.etsi.org/03120/common/2016/02/Notification" xmlns:ef1="http://uri.etsi.org/03120/common/2025/02/EpocForm1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ph="http://uri.etsi.org/03120/common/2025/02/EPOCPlaceholder" xmlns:epoc="http://data.europa.eu/edm/1/ns/epoc" xmlns:eio="http://data.europa.eu/edm/1/ns/eio" xmlns:epocform1="http://data.europa.eu/edm/1/ns/forms/EPOC-FORM-1#" xmlns:epocform2="http://data.europa.eu/edm/1/ns/forms/EPOC-PR-FORM-2#" xmlns:epocform3="http://data.europa.eu/edm/1/ns/forms/EPOC-FORM-3#" xmlns:eopcform5="http://data.europa.eu/edm/1/ns/forms/EPOC-PR-FORM-5#" xmlns:eopcform6="http://data.europa.eu/edm/1/ns/forms/EPOC-PR-FORM-6#" xmlns:delivery="http://uri.etsi.org/03120/common/2019/10/Delivery" xmlns:common="http://uri.etsi.org/03120/common/2016/02/Common" xmlns:ecauth="http://uri.etsi.org/03120/common/2025/02/EioAuthority">

    <Header>

        <SenderIdentifier>

            <CountryCode>DE</CountryCode>
@@ -22,58 +22,62 @@ 
            <ActionRequests>

                <ActionRequest>

                    <ActionIdentifier>0</ActionIdentifier>

                    <UPDATE>

                        <HI1Object xsi:type="auth:AuthorisationObject">

                            <ObjectIdentifier>7e84603b-be7b-4cba-af26-8468d177f36a</ObjectIdentifier>

                            <auth:AuthorisationDesiredStatus>

                    <CREATE>

                        <HI1Object xsi:type="auth:NotificationObject">

                            <ObjectIdentifier>6cb7a56e-f58b-4a50-a1d6-6574a5b7b28c</ObjectIdentifier>

                            <CountryCode>IE</CountryCode>

                            <OwnerIdentifier>service-provider-1</OwnerIdentifier>

                            <notify:NotificationDetails>Outcome ready</notify:NotificationDetails>

                            <notify:NotificationType>

                                    <common:Owner>ETSI</common:Owner>

                                <common:Name>AuthorisationDesiredSatus</common:Name>

                                    <common:Name>EPOCNotificationType</common:Name>

                                    <common:Value>Outcome</common:Value>

                            </notify:NotificationType>

                            <notify:NewNotification>true</notify:NewNotification>

                            <notify:NotificationTimestamp>2025-06-09T14:54:00+01:00</notify:NotificationTimestamp>

                            <notify:StatusOfAssociatedObjects>

                                    <!-- Authorization Object -->

                                    <notify:AssociatedObjectStatus>

                                            <notify:AssociatedObject>7e84603b-be7b-4cba-af26-8468d177f36a</notify:AssociatedObject>

                                            <notify:Status>

                                                    <common:Owner>ETSI</common:Owner>

                                                    <common:Name>AuthorisationStatus</common:Name>

                                                    <common:Value>Approved</common:Value>

                            </auth:AuthorisationDesiredStatus>

                        </HI1Object>

                    </UPDATE>

                </ActionRequest>

                <ActionRequest>

                    <ActionIdentifier>1</ActionIdentifier>

                    <UPDATE>

                        <HI1Object xsi:type="auth:LDTaskObject">

                            <ObjectIdentifier>f966e795-bc92-4bc4-9c6b-96c1b1b8cb1d</ObjectIdentifier>

                            <auth:AuthorisationDesiredStatus>

                                            </notify:Status>

                                    </notify:AssociatedObjectStatus>

                                    <!-- 1st LD Task -->

                                    <notify:AssociatedObjectStatus>

                                            <notify:AssociatedObject>f966e795-bc92-4bc4-9c6b-96c1b1b8cb1d</notify:AssociatedObject>

                                            <notify:Status>

                                                    <common:Owner>ETSI</common:Owner>

                                                    <common:Name>LDTaskStatus</common:Name>

                                                    <common:Value>Disclosed</common:Value>

                            </auth:AuthorisationDesiredStatus>

                        </HI1Object>

                    </UPDATE>

                </ActionRequest>

                <ActionRequest>

                    <ActionIdentifier>2</ActionIdentifier>

                    <UPDATE>

                        <HI1Object xsi:type="auth:LDTaskObject">

                            <ObjectIdentifier>0fc25b0b-8969-48ea-9a2d-dad176287001</ObjectIdentifier>

                            <auth:AuthorisationDesiredStatus>

                                            </notify:Status>

                                    </notify:AssociatedObjectStatus>

                                    <!-- 2nd LD Task -->

                                    <notify:AssociatedObjectStatus>

                                            <notify:AssociatedObject>0fc25b0b-8969-48ea-9a2d-dad176287001</notify:AssociatedObject>

                                            <notify:Status>

                                                    <common:Owner>ETSI</common:Owner>

                                                    <common:Name>LDTaskStatus</common:Name>

                                                    <common:Value>Disclosed</common:Value>

                            </auth:AuthorisationDesiredStatus>

                        </HI1Object>

                    </UPDATE>

                </ActionRequest>

                <ActionRequest>

                    <ActionIdentifier>3</ActionIdentifier>

                    <UPDATE>

                        <HI1Object xsi:type="auth:DocumentObject">

                            <ObjectIdentifier>46a57ee9-57df-4f8f-8bb0-48aa350f974f</ObjectIdentifier>

                            <auth:AuthorisationDesiredStatus>

                                            </notify:Status>

                                    </notify:AssociatedObjectStatus>

                                    <!-- Document -->

                                    <notify:AssociatedObjectStatus>

                                            <notify:AssociatedObject>46a57ee9-57df-4f8f-8bb0-48aa350f974f</notify:AssociatedObject>

                                            <notify:Status>

                                                    <common:Owner>ETSI</common:Owner>

                                                    <common:Name>DocumentStatus</common:Name>

                                                    <common:Value>Approved</common:Value>

                            </auth:AuthorisationDesiredStatus>

                                            </notify:Status>

                                    </notify:AssociatedObjectStatus>

                            </notify:StatusOfAssociatedObjects>

                        </HI1Object>

                    </UPDATE>

                    </CREATE>

                </ActionRequest>

                <ActionRequest>

                    <ActionIdentifier>4</ActionIdentifier>

                    <ActionIdentifier>1</ActionIdentifier>

                    <DELIVER>

                        <HI1Object xsi:type="delivery:DeliveryObject">

                            <ObjectIdentifier>e6f38de0-7e0c-40f1-a0ce-260ec58169b8</ObjectIdentifier>
@@ -92,7 +96,7 @@ 
                            <delivery:DeliveryID>e321456b-33f2-490c-9e4b-039ab92020e6</delivery:DeliveryID>

                            <delivery:SequenceNumber>1</delivery:SequenceNumber>

                            <delivery:LastSequence>true</delivery:LastSequence>

ß                            <delivery:Delivery>

                            <delivery:Delivery>

                                <delivery:BinaryData>

                                    <delivery:Data>VGhpcyBpc24ndCBhY3R1YWxseSBhbiBpbWFnZS4=</delivery:Data>

                                    <delivery:ContentType>image/jpeg</delivery:ContentType>

104144/examples/form1_fullOutcome_response.xml

+3 −21
Original line number Diff line number Diff line
@@ -22,30 +22,12 @@ 
            <ActionResponses>

                <ActionResponse>

                    <ActionIdentifier>0</ActionIdentifier>

                    <UPDATEResponse>

                        <Identifier>7e84603b-be7b-4cba-af26-8468d177f36a</Identifier>

                    </UPDATEResponse>

                    <CREATEResponse>

                        <Identifier>6cb7a56e-f58b-4a50-a1d6-6574a5b7b28c</Identifier>

                    </CREATEResponse>

                </ActionResponse>

                <ActionResponse>

                    <ActionIdentifier>1</ActionIdentifier>

                    <UPDATEResponse>

                        <Identifier>f966e795-bc92-4bc4-9c6b-96c1b1b8cb1d</Identifier>

                    </UPDATEResponse>

                </ActionResponse>

                <ActionResponse>

                    <ActionIdentifier>2</ActionIdentifier>

                    <UPDATEResponse>

                        <Identifier>0fc25b0b-8969-48ea-9a2d-dad176287001</Identifier>

                    </UPDATEResponse>

                </ActionResponse>

                <ActionResponse>

                    <ActionIdentifier>3</ActionIdentifier>

                    <UPDATEResponse>

                        <Identifier>46a57ee9-57df-4f8f-8bb0-48aa350f974f</Identifier>

                    </UPDATEResponse>

                </ActionResponse>

                <ActionResponse>

                    <ActionIdentifier>4</ActionIdentifier>

                    <DELIVERYResponse>

                        <Identifier>e6f38de0-7e0c-40f1-a0ce-260ec58169b8</Identifier>

                    </DELIVERYResponse>

104144/workflows/WF-001-EPOC.md

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ else Gather requested data 
end



SP ->> IA: /eevidence/outcome Request (Data)

Note left of SP: UPDATE AuthorisationObject (1)<br/>UPDATE LDTaskObject (1..n)<br/>UPDATE DocumentObject (1..n)<br/>DELIVER DeliveryObject (1..n)

Note left of SP: CREATE NotificationObject (1)<br/>DELIVER DeliveryObject (1..n)

IA ->> SP: /eevidence/outcome Response

```

104144/workflows/WF-002-EPOC.md

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ s Note over SP: Holds the data 
end



SP ->> IA: /eevidence/outcome Request (Data)

Note left of SP: UPDATE AuthorisationObject (1)<br/>UPDATE LDTaskObject (1..n)<br/>UPDATE DocumentObject (1..n)<br/>DELIVER DeliveryObject (1..n)

Note left of SP: CREATE NotificationObject (1)<br/>DELIVER DeliveryObject (1..n)

IA ->> SP: /eevidence/outcome Response

```

104144/workflows/WF-003-EPOC.md

+1 −1
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ else Partial grounds for refusal 
  SP ->> EA: /eevidence/groundsforrefusal Response



  SP ->> IA: /eevidence/outcome Request (Data)

  Note left of SP: UPDATE AuthorisationObject (1)<br/>UPDATE LDTaskObject (1..n)<br/>UPDATE DocumentObject (1..n)<br/>DELIVER DeliveryObject (1..n)

Note left of SP: CREATE NotificationObject (1)<br/>DELIVER DeliveryObject (1..n)

  IA ->> SP: /eevidence/outcome Response

end

```