Skip to content

Commit

Permalink
Changed full_id to short_urn on Reference.
Browse files Browse the repository at this point in the history
Signed-off-by: javier.hernandez <javier.hernandez@meaningfuldata.eu>
  • Loading branch information
javihern98 committed May 23, 2024
1 parent 4473b55 commit 4e1635d
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 22 deletions.
4 changes: 2 additions & 2 deletions src/pysdmx/io/xml/sdmx21/reader/submission_reader.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ def handle_registry_interface(dict_info: Dict[str, Any]) -> Dict[str, Any]:
structure = submission_result[SUBMITTED_STRUCTURE]
action = structure[ACTION]
urn = structure[MAINTAINABLE_OBJECT][URN]
full_id = parse_urn(urn).full_id
short_urn = str(parse_urn(urn))
status = submission_result[STATUS_MSG][STATUS]
result[full_id] = SubmissionResult(action, full_id, status)
result[short_urn] = SubmissionResult(action, short_urn, status)
return result
4 changes: 2 additions & 2 deletions src/pysdmx/model/message.py
Original file line number Diff line number Diff line change
Expand Up @@ -148,14 +148,14 @@ class SubmissionResult(Struct, frozen=True):
"""A class to represent a Submission Result."""

action: str
full_id: str
short_urn: str
status: str

def __str__(self) -> str:
"""Return a string representation of the SubmissionResult."""
return (
f"<Submission Result - "
f"Action: {self.action} - "
f"Full ID: {self.full_id} - "
f"Short URN: {self.short_urn} - "
f"Status: {self.status}>"
)
7 changes: 3 additions & 4 deletions src/pysdmx/util/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,9 @@ class Reference(Struct, frozen=True):
id: str
version: str

@property
def full_id(self) -> str:
"""Returns the full ID of the referenced artefact."""
return f"{self.agency}:{self.id}({self.version})"
def __str__(self) -> str:
"""Returns a string representation of the object."""
return f"{self.sdmx_type}={self.agency}:{self.id}({self.version})"


class ItemReference(Struct, frozen=True):
Expand Down
16 changes: 8 additions & 8 deletions tests/io/xml/sdmx21/reader/test_reader.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,21 +27,21 @@ def test_submission_result(submission_path):
assert filetype == "xml"
result = read_xml(input_str, validate=True)

full_id_1 = "BIS:BIS_DER(1.0)"
full_id_2 = "BIS:WEBSTATS_DER_DATAFLOW(1.0)"
short_urn_1 = "DataStructure=BIS:BIS_DER(1.0)"
short_urn_2 = "Dataflow=BIS:WEBSTATS_DER_DATAFLOW(1.0)"

assert full_id_1 in result
submission_1 = result[full_id_1]
assert short_urn_1 in result
submission_1 = result[short_urn_1]
assert isinstance(submission_1, SubmissionResult)
assert submission_1.action == "Append"
assert submission_1.full_id == full_id_1
assert submission_1.short_urn == short_urn_1
assert submission_1.status == "Success"

assert full_id_2 in result
submission_2 = result[full_id_2]
assert short_urn_2 in result
submission_2 = result[short_urn_2]
assert isinstance(submission_2, SubmissionResult)
assert submission_2.action == "Append"
assert submission_2.full_id == full_id_2
assert submission_2.short_urn == short_urn_2
assert submission_2.status == "Success"


Expand Down
12 changes: 6 additions & 6 deletions tests/model/test_submission.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,23 +9,23 @@ def action():


@pytest.fixture()
def full_id():
return "BIS:BIS_DER(1.0)"
def short_urn():
return "Codelist=BIS:BIS_DER(1.0)"


@pytest.fixture()
def status():
return "Success"


def test_full_instantiation(action, full_id, status):
submission_result = SubmissionResult(action, full_id, status)
def test_full_instantiation(action, short_urn, status):
submission_result = SubmissionResult(action, short_urn, status)

assert submission_result.action == action
assert submission_result.full_id == full_id
assert submission_result.short_urn == short_urn
assert submission_result.status == status
assert str(submission_result) == (
f"<Submission Result - Action: {action} "
f"- Full ID: {full_id} "
f"- Short URN: {short_urn} "
f"- Status: {status}>"
)

0 comments on commit 4e1635d

Please sign in to comment.