fix: repair Rentman equipment sync with real API field mapping
- Map real Rentman fields: price -> rental_price, folder -> category/subcategory (resolved via folder hierarchy to top-level categories), code -> number, shop_description_long (fallback short/external_remark) -> description (HTML stripped) - Sync only in_shop items; exclude archived/temporary from public catalog - Extract known brands from equipment names (d&b, Shure, Pioneer, ...) - Build specifications from physical fields (power, weight, dimensions) - Persist equipment images in docker volume (survive redeploys) - Router: filter available items, add price_asc/price_desc sorting - Frontend: show prices in catalog card, detail page and cart with per-day subtotal; price sorting options - Tests: use real Rentman field names in fixtures, mock folder_map
This commit is contained in:
Agent Zero
@@ -50,6 +50,53 @@ class RentmanService:
|
||||
offset += limit
|
||||
return all_items
|
||||
|
||||
|
||||
async def get_all_folders(self) -> list[dict[str, Any]]:
|
||||
"""Paginate through all folders until data is empty."""
|
||||
all_folders: list[dict[str, Any]] = []
|
||||
offset = 0
|
||||
while True:
|
||||
url = f"{self._base_url}/folders"
|
||||
params = {"limit": 100, "offset": offset}
|
||||
async with httpx.AsyncClient(timeout=30.0) as client:
|
||||
resp = await client.get(url, headers=self._headers(), params=params)
|
||||
resp.raise_for_status()
|
||||
page = resp.json()
|
||||
data = page.get("data", [])
|
||||
if not data:
|
||||
break
|
||||
all_folders.extend(data)
|
||||
offset += 100
|
||||
return all_folders
|
||||
|
||||
async def get_folder_map(self) -> dict[str, dict[str, str]]:
|
||||
"""Build a map: folder path -> {category: top-level name, subcategory: folder name}.
|
||||
|
||||
Walks the parent chain so every folder resolves to its top-level ancestor.
|
||||
"""
|
||||
folders = await self.get_all_folders()
|
||||
by_path = {f"/folders/{f.get('id')}": f for f in folders}
|
||||
|
||||
def top_ancestor(folder: dict) -> dict:
|
||||
current = folder
|
||||
seen = set()
|
||||
while current.get("parent") and current["parent"] not in seen:
|
||||
seen.add(current["parent"])
|
||||
parent = by_path.get(current["parent"])
|
||||
if not parent:
|
||||
break
|
||||
current = parent
|
||||
return current
|
||||
|
||||
folder_map: dict[str, dict[str, str]] = {}
|
||||
for path, folder in by_path.items():
|
||||
ancestor = top_ancestor(folder)
|
||||
folder_map[path] = {
|
||||
"category": ancestor.get("name", ""),
|
||||
"subcategory": folder.get("name", ""),
|
||||
}
|
||||
return folder_map
|
||||
|
||||
async def get_file_url(self, file_id: str | int) -> str | None:
|
||||
"""Fetch the S3 URL for a file from Rentman.
|
||||
|
||||
@@ -71,41 +118,122 @@ class RentmanService:
|
||||
logger.warning("Failed to fetch file URL for file_id=%s: %s", file_id, exc)
|
||||
return None
|
||||
|
||||
async def transform_equipment(self, raw: dict[str, Any]) -> dict[str, Any]:
|
||||
# Well-known rental brands for extraction from equipment names
|
||||
KNOWN_BRANDS = [
|
||||
"d&b audiotechnik", "d&b", "L-Acoustics", "Shure", "Sennheiser", "Pioneer",
|
||||
"RCF", "Soundcraft", "Cameo", "Eurolite", "Globaltruss", "Klotz",
|
||||
"Martin", "JBL", "QSC", "Yamaha", "Behringer", "ROBE", "Chauvet",
|
||||
"PL-Audio", "Showtec", "American DJ", "ADJ", "GLP", "Wireless Solution",
|
||||
"Sennheiser", "AKG", "Rode", "Audix", "Palmer", "Neutrik", "Layher",
|
||||
]
|
||||
|
||||
@staticmethod
|
||||
def _strip_html(text: str) -> str:
|
||||
"""Remove HTML tags and normalize whitespace in description fields."""
|
||||
if not text:
|
||||
return ""
|
||||
text = re.sub(r"<br\s*/?>", "\n", text, flags=re.IGNORECASE)
|
||||
text = re.sub(r"</p>", "\n", text, flags=re.IGNORECASE)
|
||||
text = re.sub(r"<[^>]+>", "", text)
|
||||
text = text.replace(" ", " ").replace("&", "&")
|
||||
text = text.replace("<", "<").replace(">", ">").replace(""", '"')
|
||||
text = re.sub(r"[ \t]+", " ", text)
|
||||
text = re.sub(r"\n\s*\n+", "\n\n", text)
|
||||
return text.strip()
|
||||
|
||||
def _extract_brand(self, name: str) -> str:
|
||||
"""Extract a known brand from the equipment name, if present."""
|
||||
lowered = (name or "").lower()
|
||||
for brand in self.KNOWN_BRANDS:
|
||||
if lowered.startswith(brand.lower() + " ") or lowered.startswith(brand.lower() + "-"):
|
||||
return brand
|
||||
return ""
|
||||
|
||||
def _resolve_category(self, folder_path: str | None, folder_map: dict[str, dict[str, str]] | None) -> tuple[str, str]:
|
||||
"""Resolve (category, subcategory) from the Rentman folder path.
|
||||
|
||||
category = top-level folder name (e.g. "Tontechnik")
|
||||
subcategory = direct folder name (e.g. "Mikrofone")
|
||||
"""
|
||||
if not folder_path or not folder_map:
|
||||
return "", ""
|
||||
info = folder_map.get(folder_path)
|
||||
if not info:
|
||||
return "", ""
|
||||
return info.get("category", ""), info.get("subcategory", "")
|
||||
|
||||
def _build_specifications(self, raw: dict[str, Any]) -> dict[str, Any]:
|
||||
"""Collect physical specs from flat Rentman fields when set."""
|
||||
specs: dict[str, Any] = {}
|
||||
field_map = [
|
||||
("Leistung (W)", "power"),
|
||||
("Gewicht (kg)", "empty_weight"),
|
||||
("Hoehe (mm)", "height"),
|
||||
("Breite (mm)", "width"),
|
||||
("Laenge (mm)", "length"),
|
||||
("Volumen (m3)", "volume"),
|
||||
]
|
||||
for label, key in field_map:
|
||||
value = raw.get(key)
|
||||
if isinstance(value, (int, float)) and value > 0:
|
||||
specs[label] = value
|
||||
return specs
|
||||
|
||||
async def transform_equipment(
|
||||
self,
|
||||
raw: dict[str, Any],
|
||||
folder_map: dict[str, dict[str, str]] | None = None,
|
||||
) -> dict[str, Any]:
|
||||
"""Map a raw Rentman equipment object to equipment_cache schema.
|
||||
|
||||
Uses 'image' (singular) field which contains a relative path like '/files/3173'.
|
||||
Fetches the actual S3 URL via GET /files/{file_id}.
|
||||
Uses the real Rentman field names:
|
||||
- price -> rental_price (per day, shop price)
|
||||
- folder ("/folders/N") -> category/subcategory via folder_map
|
||||
- shop_description_long (fallbacks: shop_description_short,
|
||||
external_remark) -> description (HTML stripped)
|
||||
- code -> number (article number)
|
||||
- in_shop/in_archive -> availability for the public catalog
|
||||
"""
|
||||
image_path = raw.get("image")
|
||||
image_urls: list[str] = []
|
||||
|
||||
if image_path and isinstance(image_path, str):
|
||||
# Extract file_id from path like /files/3173
|
||||
match = re.search(r"/files/(\d+)", image_path)
|
||||
if match:
|
||||
file_id = match.group(1)
|
||||
s3_url = await self.get_file_url(file_id)
|
||||
if s3_url:
|
||||
image_urls = [s3_url]
|
||||
else:
|
||||
logger.debug("Could not extract file_id from image path: %s", image_path)
|
||||
|
||||
group = raw.get("equipment_group") or {}
|
||||
category = group.get("name", "") if isinstance(group, dict) else str(group or "")
|
||||
category, subcategory = self._resolve_category(raw.get("folder"), folder_map)
|
||||
|
||||
description = self._strip_html(
|
||||
raw.get("shop_description_long")
|
||||
or raw.get("shop_description_short")
|
||||
or raw.get("external_remark")
|
||||
or ""
|
||||
)
|
||||
|
||||
price = raw.get("price")
|
||||
try:
|
||||
price = float(price) if price is not None else None
|
||||
except (TypeError, ValueError):
|
||||
price = None
|
||||
|
||||
available = bool(raw.get("in_shop")) and not bool(raw.get("in_archive")) and not bool(raw.get("temporary"))
|
||||
|
||||
return {
|
||||
"rentman_id": str(raw.get("id", "")),
|
||||
"name": raw.get("name", ""),
|
||||
"number": raw.get("number") or raw.get("code", ""),
|
||||
"name": raw.get("name", "") or raw.get("displayname", ""),
|
||||
"number": raw.get("code", "") or raw.get("number", ""),
|
||||
"category": category,
|
||||
"subcategory": raw.get("subcategory", ""),
|
||||
"description": raw.get("description", ""),
|
||||
"specifications": raw.get("specifications", {}),
|
||||
"subcategory": subcategory,
|
||||
"description": description,
|
||||
"specifications": self._build_specifications(raw) or None,
|
||||
"images": image_urls,
|
||||
"rental_price": raw.get("rental_price"),
|
||||
"brand": raw.get("brand", ""),
|
||||
"available": raw.get("available", True),
|
||||
"rental_price": price,
|
||||
"brand": self._extract_brand(raw.get("name", "")),
|
||||
"available": available,
|
||||
"update_hash": raw.get("updateHash", ""),
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user