Merge pull request 'test(Tryton): add catalog sale test and validate build_tryton_comment' (#44) from fix/EnviarComentarioConDetalleDelPedido into main

Reviewed-on: #44

scripts/reupload_catalogue_images.py

@@ -0,0 +1,99 @@
+#!/usr/bin/env python3
+import argparse
+import getpass
+import sys
+
+import requests
+
+
+TOKEN_URL = "/api/token/"
+CATALOGUE_IMAGES_URL = "/don_confiao/api/catalogue_images/"
+
+
+def get_credentials():
+    username = input("Usuario: ")
+    password = getpass.getpass("Contraseña: ")
+    return username, password
+
+
+def get_token(domain, username, password):
+    url = domain.rstrip("/") + TOKEN_URL
+    response = requests.post(url, json={"username": username, "password": password})
+    if response.status_code != 200:
+        print(f"Error al obtener token: {response.status_code} {response.text}", file=sys.stderr)
+        sys.exit(1)
+    data = response.json()
+    return data["access"]
+
+
+def get_catalogue_images(domain, token):
+    url = domain.rstrip("/") + CATALOGUE_IMAGES_URL
+    headers = {"Authorization": f"Bearer {token}"}
+    response = requests.get(url, headers=headers)
+    if response.status_code != 200:
+        print(f"Error al obtener imágenes de catálogo: {response.status_code} {response.text}", file=sys.stderr)
+        sys.exit(1)
+    return response.json()
+
+
+def download_image(image_url):
+    response = requests.get(image_url)
+    if response.status_code != 200:
+        print(f"  [ERR]  No se pudo descargar imagen: {response.status_code}", file=sys.stderr)
+        return None
+    return response.content
+
+
+def main():
+    parser = argparse.ArgumentParser(
+        description="Vuelve a subir cada imagen de catálogo existente para forzar el redimensionado."
+    )
+    parser.add_argument("domain", help="Dominio del backend (ej: http://localhost:8000)")
+    args = parser.parse_args()
+
+    username, password = get_credentials()
+    token = get_token(args.domain, username, password)
+    print("Token obtenido correctamente.")
+
+    images = get_catalogue_images(args.domain, token)
+    if not images:
+        print("No hay imágenes de catálogo para procesar.")
+        return
+
+    headers = {"Authorization": f"Bearer {token}"}
+    updated = 0
+    errors = 0
+
+    for img in images:
+        ci_id = img["id"]
+        product_id = img["product"]
+        image_url = img["image"]
+
+        print(f"  [{ci_id}] Descargando {image_url} ...")
+        content = download_image(image_url)
+        if content is None:
+            errors += 1
+            continue
+
+        # Determine content type from URL extension
+        ext = image_url.rsplit(".", 1)[-1].lower() if "." in image_url else "jpg"
+        mime = {"jpg": "image/jpeg", "jpeg": "image/jpeg", "png": "image/png"}.get(ext, "application/octet-stream")
+        filename = f"image.{ext}"
+
+        update_url = args.domain.rstrip("/") + CATALOGUE_IMAGES_URL.rstrip("/") + f"/{ci_id}/"
+        files = {"image": (filename, content, mime)}
+        data = {"product": product_id}
+        response = requests.put(update_url, headers=headers, files=files, data=data)
+
+        if response.status_code == 200:
+            print(f"  [OK]   Imagen {ci_id} (producto {product_id}) actualizada.")
+            updated += 1
+        else:
+            print(f"  [ERR]  Imagen {ci_id}: {response.status_code} {response.text}")
+            errors += 1
+
+    print(f"\nResumen: {updated} actualizadas, {errors} errores")
+
+
+if __name__ == "__main__":
+    main()

tienda_ilusion/don_confiao/admin.py

@@ -23,12 +23,51 @@ class CustomerAdmin(admin.ModelAdmin):
     )
     search_fields = ("name", "email", "phone")
 
+@admin.register(Sale)
+class SaleAdmin(admin.ModelAdmin):
+    list_display = (
+        "id",
+        "date",
+        "customer",
+        "payment_method",
+        "external_id",
+    )
+    search_fields = ("date", "customer__name", "payment_method", "external_id")
+    list_filter = ("date", "customer__name", "payment_method")
+
+@admin.register(SaleLine)
+class SaleLineAdmin(admin.ModelAdmin):
+    list_display = ("sale", "product", "quantity", "unit_price")
+    search_fields = ("sale__id", "product__name")
+    list_filter = ("sale__date", "product__name")
+
+@admin.register(CatalogSale)
+class CatalogSaleAdmin(admin.ModelAdmin):
+    list_display = (
+        "id",
+        "date",
+        "customer_name",
+        "customer_phone",
+        "customer_address",
+        "pickup_method",
+        "external_id",
+    )
+    search_fields = ("date","customer_name", "customer_phone", "pickup_method","external_id")
+    list_filter = ("date", "customer_name", "pickup_method")
+
+
+@admin.register(CatalogSaleLine)
+class CatalogSaleLineAdmin(admin.ModelAdmin):
+    list_display = ("catalog_sale", "product", "quantity", "unit_price")
+    search_fields = ("catalog_sale__id", "product__name")
+    list_filter = ("catalog_sale__date", "product__name")
+
+@admin.register(Product)
+class ProductAdmin(admin.ModelAdmin):
+    list_display = ("name", "price", "measuring_unit", "external_id")
+    search_fields = ("id", "name",)
+    list_filter = ("name", "id")
 
-admin.site.register(Sale)
-admin.site.register(SaleLine)
-admin.site.register(CatalogSale)
-admin.site.register(CatalogSaleLine)
-admin.site.register(Product)
 admin.site.register(ProductCategory)
 admin.site.register(Payment)
 admin.site.register(ReconciliationJar)

tienda_ilusion/don_confiao/services/tryton/client.py

@@ -43,20 +43,28 @@ class TrytonSale:
             "shipment_address": self.sale.customer.address_external_id,
             "invoice_address": self.sale.customer.address_external_id,
             "currency": TRYTON_COP_CURRENCY,
-            "comment": self.sale.description or "",
-            "description": "Metodo pago: " + str(self.sale.payment_method or ""),
+            "comment": self.build_tryton_comment(),
+            "description": "Metodo pago: "
+            + str(self.sale.payment_method or ""),
             "party": self.sale.customer.external_id,
             "reference": "don_confiao " + str(self.sale.id),
             "sale_date": self._format_date(self.sale.date),
             "lines": [
                 [
                     "create",
-                    [TrytonLineSale(line).to_tryton() for line in self.lines],
+                    [
+                        TrytonLineSale(line).to_tryton()
+                        for line in self.lines
+                    ],
                 ]
             ],
             "self_pick_up": True,
         }
 
+    def build_tryton_comment(self):
+        """Construye el comentario para la venta en Tryton"""
+        return self.sale.description or ""
+
 
 class TrytonLineSale:
     """Representa una línea de venta para exportación a Tryton"""
@@ -98,20 +106,36 @@ class TrytonCatalogSale:
             "shipment_address": self.catalog_sale.customer.address_external_id,
             "invoice_address": self.catalog_sale.customer.address_external_id,
             "currency": TRYTON_COP_CURRENCY,
-            "comment": self.catalog_sale.description or "",
+            "comment": self.build_tryton_comment(),
             "description": "Venta de catálogo",
             "party": self.catalog_sale.customer.external_id,
-            "reference": "don_confiao_catalog " + str(self.catalog_sale.id),
+            "reference": "don_confiao_catalog "
+            + str(self.catalog_sale.id),
             "sale_date": self._format_date(self.catalog_sale.date),
             "lines": [
                 [
                     "create",
-                    [TrytonCatalogSaleLine(line).to_tryton() for line in self.lines],
+                    [
+                        TrytonCatalogSaleLine(line).to_tryton()
+                        for line in self.lines
+                    ],
                 ]
             ],
             "self_pick_up": True,
         }
 
+    def build_tryton_comment(self):
+        """Construye el comentario para la venta en Tryton"""
+
+        comment = f"Cliente: {self.catalog_sale.customer_name or ''}\n"
+        comment += f"Teléfono: {self.catalog_sale.customer_phone or ''}\n"
+        comment += (
+            f"Dirección: {self.catalog_sale.customer_address or ''}\n"
+        )
+        comment += f"Método de recogida: {self.catalog_sale.pickup_method or ''}\n"
+
+        return comment
+
 
 class TrytonCatalogSaleLine:
     """Representa una línea de catalog sale para exportación a Tryton"""
@@ -125,8 +149,12 @@ class TrytonCatalogSaleLine:
     def to_tryton(self):
         return {
             "product": self.catalog_sale_line.product.external_id,
-            "quantity": self._format_decimal(self.catalog_sale_line.quantity),
+            "quantity": self._format_decimal(
+                self.catalog_sale_line.quantity
+            ),
             "type": "line",
             "unit": self.catalog_sale_line.product.unit_external_id,
-            "unit_price": self._format_decimal(self.catalog_sale_line.unit_price),
+            "unit_price": self._format_decimal(
+                self.catalog_sale_line.unit_price
+            ),
         }

tienda_ilusion/don_confiao/tests/test_exportar_ventas_para_tryton.py

@@ -0,0 +1,249 @@
+import json
+from unittest.mock import patch, MagicMock
+
+from django.test import TestCase
+
+from ..models.sales import Sale, SaleLine, CatalogSale, CatalogSaleLine
+from ..models.customers import Customer
+from ..models.products import Product
+from ..services.tryton.client import TrytonSale, TrytonCatalogSale
+from .Mixins import LoginMixin
+
+
+class TestSendSalesToTryton(TestCase, LoginMixin):
+    def setUp(self):
+        self.login()
+
+        self.product = Product.objects.create(
+            name="Panela",
+            price=5000,
+            measuring_unit="UNIT",
+            unit_external_id="1",
+            external_id="1",
+        )
+        self.customer = Customer.objects.create(
+            name="Camilo",
+            external_id="1",
+            address_external_id="307",
+        )
+        self.sale = Sale.objects.create(
+            customer=self.customer,
+            date="2024-09-02",
+            payment_method="CASH",
+            description="un comentario",
+        )
+        SaleLine.objects.create(
+            product=self.product,
+            quantity=2,
+            unit_price=3000,
+            sale=self.sale,
+        )
+        SaleLine.objects.create(
+            product=self.product,
+            quantity=3,
+            unit_price=5000,
+            sale=self.sale,
+        )
+
+        self.catalog_sale = CatalogSale.objects.create(
+            customer=self.customer,
+            date="2024-09-02",
+            customer_name="Camilo",
+            customer_phone="3001234567",
+            customer_address="Calle 123",
+            pickup_method="Recogida en tienda",
+        )
+        CatalogSaleLine.objects.create(
+            catalog_sale=self.catalog_sale,
+            product=self.product,
+            quantity=2,
+            unit_price=3000,
+        )
+        CatalogSaleLine.objects.create(
+            catalog_sale=self.catalog_sale,
+            product=self.product,
+            quantity=3,
+            unit_price=5000,
+        )
+
+    @patch("don_confiao.api.sales.get_tryton_client")
+    def test_send_sales_to_tryton(self, mock_get_tryton_client):
+        external_id = "23423"
+        mock_client = MagicMock()
+        mock_client.call.return_value = [external_id]
+        mock_get_tryton_client.return_value = mock_client
+
+        url = "/don_confiao/api/enviar_ventas_a_tryton"
+        response = self.client.post(url)
+
+        self.assertEqual(response.status_code, 200)
+        content = json.loads(response.content.decode("utf-8"))
+        self.assertEqual(
+            content, {"successful": [self.sale.id], "failed": []}
+        )
+
+        updated_sale = Sale.objects.get(id=self.sale.id)
+        self.assertEqual(updated_sale.external_id, external_id)
+
+        mock_get_tryton_client.assert_called_once()
+
+        mock_client.call.assert_called_once()
+        call_args = mock_client.call.call_args
+        method, params = call_args[0]
+
+        self.assertEqual(method, "model.sale.sale.create")
+
+        tryton_context = params[1]
+        self.assertEqual(tryton_context, {"company": 1, "shops": [1]})
+
+        sale_params = params[0][0]
+        self.assertEqual(sale_params["company"], 1)
+        self.assertEqual(sale_params["shipment_address"], "307")
+        self.assertEqual(sale_params["invoice_address"], "307")
+        self.assertEqual(sale_params["currency"], 31)
+        self.assertEqual(sale_params["comment"], "un comentario")
+        self.assertEqual(sale_params["description"], "Metodo pago: CASH")
+        self.assertEqual(sale_params["party"], "1")
+        self.assertEqual(
+            sale_params["reference"], f"don_confiao {self.sale.id}"
+        )
+        self.assertEqual(
+            sale_params["sale_date"],
+            {"__class__": "date", "year": 2024, "month": 9, "day": 2},
+        )
+        self.assertTrue(sale_params["self_pick_up"])
+
+        sale_tryton = TrytonSale(
+            self.sale, SaleLine.objects.filter(sale=self.sale)
+        )
+        self.assertEqual(
+            sale_tryton.build_tryton_comment(), self.sale.description
+        )
+
+        lines_block = sale_params["lines"]
+        self.assertEqual(len(lines_block), 1)
+        self.assertEqual(lines_block[0][0], "create")
+
+        lines = lines_block[0][1]
+        self.assertEqual(len(lines), 2)
+
+        self.assertEqual(lines[0]["product"], "1")
+        self.assertEqual(
+            lines[0]["quantity"],
+            {"__class__": "Decimal", "decimal": "2.00"},
+        )
+        self.assertEqual(lines[0]["type"], "line")
+        self.assertEqual(lines[0]["unit"], "1")
+        self.assertEqual(
+            lines[0]["unit_price"],
+            {"__class__": "Decimal", "decimal": "3000.00"},
+        )
+
+        self.assertEqual(lines[1]["product"], "1")
+        self.assertEqual(
+            lines[1]["quantity"],
+            {"__class__": "Decimal", "decimal": "3.00"},
+        )
+        self.assertEqual(lines[1]["type"], "line")
+        self.assertEqual(lines[1]["unit"], "1")
+        self.assertEqual(
+            lines[1]["unit_price"],
+            {"__class__": "Decimal", "decimal": "5000.00"},
+        )
+
+    @patch("don_confiao.api.sales.get_tryton_client")
+    def test_send_catalog_sales_to_tryton(self, mock_get_tryton_client):
+        external_id = "23423"
+        mock_client = MagicMock()
+        mock_client.call.return_value = [external_id]
+        mock_get_tryton_client.return_value = mock_client
+
+        url = "/don_confiao/api/enviar_catalog_sales_a_tryton"
+        response = self.client.post(url)
+
+        self.assertEqual(response.status_code, 200)
+        content = json.loads(response.content.decode("utf-8"))
+        self.assertEqual(
+            content,
+            {"successful": [self.catalog_sale.id], "failed": []},
+        )
+
+        updated = CatalogSale.objects.get(id=self.catalog_sale.id)
+        self.assertEqual(updated.external_id, external_id)
+
+        mock_get_tryton_client.assert_called_once()
+
+        mock_client.call.assert_called_once()
+        call_args = mock_client.call.call_args
+        method, params = call_args[0]
+
+        self.assertEqual(method, "model.sale.sale.create")
+
+        tryton_context = params[1]
+        self.assertEqual(tryton_context, {"company": 1, "shops": [1]})
+
+        sale_params = params[0][0]
+        self.assertEqual(sale_params["company"], 1)
+        self.assertEqual(sale_params["shipment_address"], "307")
+        self.assertEqual(sale_params["invoice_address"], "307")
+        self.assertEqual(sale_params["currency"], 31)
+        self.assertEqual(sale_params["description"], "Venta de catálogo")
+        self.assertEqual(sale_params["party"], "1")
+        self.assertEqual(
+            sale_params["reference"],
+            f"don_confiao_catalog {self.catalog_sale.id}",
+        )
+        self.assertEqual(
+            sale_params["sale_date"],
+            {"__class__": "date", "year": 2024, "month": 9, "day": 2},
+        )
+        self.assertTrue(sale_params["self_pick_up"])
+
+        expected_comment = (
+            "Cliente: Camilo\n"
+            "Teléfono: 3001234567\n"
+            "Dirección: Calle 123\n"
+            "Método de recogida: Recogida en tienda\n"
+        )
+        self.assertEqual(sale_params["comment"], expected_comment)
+
+        catalog_tryton = TrytonCatalogSale(
+            self.catalog_sale,
+            CatalogSaleLine.objects.filter(
+                catalog_sale=self.catalog_sale
+            ),
+        )
+        self.assertEqual(
+            catalog_tryton.build_tryton_comment(), expected_comment
+        )
+
+        lines_block = sale_params["lines"]
+        self.assertEqual(len(lines_block), 1)
+        self.assertEqual(lines_block[0][0], "create")
+
+        lines = lines_block[0][1]
+        self.assertEqual(len(lines), 2)
+
+        self.assertEqual(lines[0]["product"], "1")
+        self.assertEqual(
+            lines[0]["quantity"],
+            {"__class__": "Decimal", "decimal": "2.00"},
+        )
+        self.assertEqual(lines[0]["type"], "line")
+        self.assertEqual(lines[0]["unit"], "1")
+        self.assertEqual(
+            lines[0]["unit_price"],
+            {"__class__": "Decimal", "decimal": "3000.00"},
+        )
+
+        self.assertEqual(lines[1]["product"], "1")
+        self.assertEqual(
+            lines[1]["quantity"],
+            {"__class__": "Decimal", "decimal": "3.00"},
+        )
+        self.assertEqual(lines[1]["type"], "line")
+        self.assertEqual(lines[1]["unit"], "1")
+        self.assertEqual(
+            lines[1]["unit_price"],
+            {"__class__": "Decimal", "decimal": "5000.00"},
+        )