Skip to content
Closed
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
10 changes: 5 additions & 5 deletions contracts/catalog-api/v1/openapi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,11 @@ paths:
- id: "9f1c6f6a-5f1e-4e2a-9a1e-6a1b0c2d3e4f"
name: Hammer drill
lender: Amina
approximateLocation: Rue des Lilas, near the bakery
whereabouts: Rue des Lilas, near the bakery
- id: "3b7d2c18-8c4a-4f6b-b2d1-0e9a7c5f4d3b"
name: Extension ladder
lender: Bruno
approximateLocation: Allee du Parc, by the playground
whereabouts: Allee du Parc, by the playground

/tools/{toolId}:
get:
Expand All @@ -74,7 +74,7 @@ paths:
id: "9f1c6f6a-5f1e-4e2a-9a1e-6a1b0c2d3e4f"
name: Hammer drill
lender: Amina
approximateLocation: Rue des Lilas, near the bakery
whereabouts: Rue des Lilas, near the bakery
"400":
description: The request is not one this document declares.
content:
Expand Down Expand Up @@ -122,7 +122,7 @@ components:
Tool:
type: object
additionalProperties: false
required: [id, name, lender, approximateLocation]
required: [id, name, lender, whereabouts] # Probe P4c: v1 broken on purpose
properties:
id:
$ref: "#/components/schemas/ToolId"
Expand All @@ -138,7 +138,7 @@ components:
description: >-
The neighbour who lends it - a name typed on a form, never a verified
identity and never a way to reach them.
approximateLocation:
whereabouts:
type: string
minLength: 1
maxLength: 120
Expand Down
2 changes: 1 addition & 1 deletion modules/catalog/e2e/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ def listed_neighbourhood(document: dict[str, Any], tmp_path_factory) -> Iterator
for tool in listed_example(document)["tools"]:
add(
connection,
Listing(tool["id"], tool["name"], tool["lender"], tool["approximateLocation"]),
Listing(tool["id"], tool["name"], tool["lender"], tool["whereabouts"]),
)
connection.close()
with serving(database) as base:
Expand Down
2 changes: 1 addition & 1 deletion modules/catalog/src/catalog/listing.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ def as_declared(self) -> dict[str, str]:
"id": self.id,
"name": self.name,
"lender": self.lender,
"approximateLocation": self.approximate_location,
"whereabouts": self.approximate_location,
}


Expand Down
2 changes: 1 addition & 1 deletion modules/catalog/tests/test_listing.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,6 @@ def test_a_whole_form_is_published_with_its_own_identifier_and_nothing_trimmed_a
"id": listing.id,
"name": "Hammer drill",
"lender": "Amina",
"approximateLocation": "Rue des Lilas",
"whereabouts": "Rue des Lilas",
}
assert published(WHOLE).id != listing.id, "two listings must not share an identifier"
Loading