Commit 8d155ebd authored by Mark Canterbury's avatar Mark Canterbury
Browse files

Merge branch 'maintenance/json_ints' into 'meeting/LI66' 

Fixing JSON issues with ints in examples

See merge request li/schemas-definitions!140
parents eb9f99fe ca0feaae

103120/examples/json/response2.json

+4 −4
Original line number Original line Diff line number Diff line
@@ -33,7 +33,7 @@ 
                "ObjectIdentifier": "7dbbc880-8750-4d3c-abe7-ea4a17646045",

                "ObjectIdentifier": "7dbbc880-8750-4d3c-abe7-ea4a17646045",

                "CountryCode": "XX",

                "CountryCode": "XX",

                "OwnerIdentifier": "ACTOR01",

                "OwnerIdentifier": "ACTOR01",

                "Generation": "1",

                "Generation": 1,

                "LastChanged": "2015-09-01T12:00:00Z",

                "LastChanged": "2015-09-01T12:00:00Z",

                "auth:AuthorisationReference": "W000001",

                "auth:AuthorisationReference": "W000001",

                "auth:AuthorisationStatus": {

                "auth:AuthorisationStatus": {
@@ -46,7 +46,7 @@ 
                  "auth:EndTime": "2015-12-01T12:00:00Z"

                  "auth:EndTime": "2015-12-01T12:00:00Z"

                },

                },

                "auth:AuthorisationInvalidReason": {

                "auth:AuthorisationInvalidReason": {

                  "ErrorCode": "3000",

                  "ErrorCode": 3000,

                  "ErrorDescription": "The Authorisation is not associated with a valid Warrant Document Object"

                  "ErrorDescription": "The Authorisation is not associated with a valid Warrant Document Object"

                }

                }

              }

              }
@@ -60,7 +60,7 @@ 
                "ObjectIdentifier": "2b36a78b-b628-416d-bd22-404e68a0cd36",

                "ObjectIdentifier": "2b36a78b-b628-416d-bd22-404e68a0cd36",

                "CountryCode": "XX",

                "CountryCode": "XX",

                "OwnerIdentifier": "ACTOR01",

                "OwnerIdentifier": "ACTOR01",

                "Generation": "1",

                "Generation": 1,

                "AssociatedObjects": {

                "AssociatedObjects": {

                  "AssociatedObject": [

                  "AssociatedObject": [

                    "7dbbc880-8750-4d3c-abe7-ea4a17646045"

                    "7dbbc880-8750-4d3c-abe7-ea4a17646045"
@@ -105,7 +105,7 @@ 
                  "UniqueIdentifier": "ACTOR02"

                  "UniqueIdentifier": "ACTOR02"

                },

                },

                "task:InvalidReason": {

                "task:InvalidReason": {

                  "ErrorCode": "3000",

                  "ErrorCode": 3000,

                  "ErrorDescription": "The associated Authorisation is in an Invalid state"

                  "ErrorDescription": "The associated Authorisation is in an Invalid state"

                }

                }

              }

              }

103120/examples/json/response3.json

+1 −1
Original line number Original line Diff line number Diff line
@@ -41,7 +41,7 @@ 
                "ObjectIdentifier": "7dbbc880-8750-4d3c-abe7-ea4a17646045",

                "ObjectIdentifier": "7dbbc880-8750-4d3c-abe7-ea4a17646045",

                "CountryCode": "XX",

                "CountryCode": "XX",

                "OwnerIdentifier": "ACTOR01",

                "OwnerIdentifier": "ACTOR01",

                "Generation": "2",

                "Generation": 2,

                "AssociatedObjects": {

                "AssociatedObjects": {

                  "AssociatedObject": [

                  "AssociatedObject": [

                    "4193f541-5e19-468e-b4a3-1c636ce115e9"

                    "4193f541-5e19-468e-b4a3-1c636ce115e9"

utils/xml_to_json.py

+3 −1
Original line number Original line Diff line number Diff line
@@ -72,7 +72,9 @@ coerce_to_list = [ 
coerce_to_int = [

coerce_to_int = [

    'ActionIdentifier',

    'ActionIdentifier',

    'delivery:SequenceNumber',

    'delivery:SequenceNumber',

    'task:Order'

    'task:Order',

    'ErrorCode',

    'Generation',

]

]





coerce_to_bool = [

coerce_to_bool = [