Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions tests/api/examples/cargo_movements.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@
{
"cargo_movement_id": "00886b05a0747522b67322f50123ee60e61e219fc9a9c6011be1a1dade65f63e",
"quantity": 4401,
"discharge_quantity": 4380,
"quantity_barrels": 4401,
"quantity_tonnes": 612,
"quantity_cubic_metres": 700,
"quantity_discharge_barrels": 4380,
"quantity_discharge_tonnes": 609,
"quantity_discharge_cubic_metres": 697,
"status": "unloaded_state",
"vessels": [
{
Expand Down
14 changes: 14 additions & 0 deletions tests/api/test_cargo_movement.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,13 @@ class TestCargoMovement(TestCase):
dictionary = {
"cargo_movement_id": "00886b05a0747522b67322f50123ee60e61e219fc9a9c6011be1a1dade65f63e",
"quantity": 4401,
"discharge_quantity": 4380,
"quantity_barrels": 4401,
"quantity_tonnes": 612,
"quantity_cubic_metres": 700,
"quantity_discharge_barrels": 4380,
"quantity_discharge_tonnes": 609,
"quantity_discharge_cubic_metres": 697,
"status": "unloaded_state",
"vessels": [
{
Expand Down Expand Up @@ -174,6 +181,13 @@ def test_convert_to_flat_dict(self) -> None:
"product.grade.external_sources.0.sorting_order": 1,
"product.grade.external_sources.0.type": "bol",
"quantity": 4401,
"discharge_quantity": 4380,
"quantity_barrels": 4401,
"quantity_tonnes": 612,
"quantity_cubic_metres": 700,
"quantity_discharge_barrels": 4380,
"quantity_discharge_tonnes": 609,
"quantity_discharge_cubic_metres": 697,
"status": "unloaded_state",
"vessels.0.corporate_entities.effective_controller.id": "f9bd45e65e292909a7b751b0026dcf7795c6194b3c0712910a241caee32c99b8",
"vessels.0.corporate_entities.effective_controller.label": "Essberger J.T.",
Expand Down
12 changes: 12 additions & 0 deletions vortexasdk/api/cargo_movement.py
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,19 @@ class CargoMovement(BaseModel):
"""

cargo_movement_id: ID

# `quantity` and `discharge_quantity` are in the unit specified by the
# `cm_unit` parameter passed to `CargoMovements().search()`.
# The remaining quantity fields are always returned in their explicit units.
quantity: Optional[int] = None
discharge_quantity: Optional[int] = None

quantity_barrels: Optional[int] = None
quantity_tonnes: Optional[int] = None
quantity_cubic_metres: Optional[int] = None
quantity_discharge_barrels: Optional[int] = None
quantity_discharge_tonnes: Optional[int] = None
quantity_discharge_cubic_metres: Optional[int] = None
Comment thread
alexspeddingvortexa marked this conversation as resolved.
status: Optional[str] = None
vessels: Optional[List[VesselEntity]] = None
product: Optional[List[CargoMovementProductEntry]] = None
Expand Down
2 changes: 1 addition & 1 deletion vortexasdk/version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "1.0.23"
__version__ = "1.0.24"
Loading