diff --git a/Api/__init__.py b/Api/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/Api/formats.py b/Api/formats.py index 7d139b6..0f7284e 100644 --- a/Api/formats.py +++ b/Api/formats.py @@ -1,9 +1,19 @@ #!/usr/bin/env python3 import sys import tempfile +import pytz + from datetime import datetime -from .qr_generator import QRCodeGenerator -from .printer_factory import PrinterFactory +from qr_generator import QRCodeGenerator +from printer_factory import PrinterFactory + + +def get_current_time_america_bogota(): + format_ = "%Y-%m-%d %H:%M:%S" + america_bogota_tz = pytz.timezone('America/Bogota') + format_date_time = datetime.now(america_bogota_tz) + + return format_date_time.strftime(format_) def print_bill_format(printer, d, waiter): @@ -79,8 +89,7 @@ def print_bill_format(printer, d, waiter): printer.text("Recuerde que la propina es voluntaria.\n") printer.text("Gracias por visitarnos, vuelva pronto.\n") printer.text("SOFTWARE POTENCIADO POR ONECLUSTER.ORG.\n") - format_date_time = datetime.now().strftime('%Y-%m-%d %H:%M:%S') - printer.text(str(format_date_time)+'\n') + printer.text(str(get_current_time_america_bogota())+'\n') if waiter: printer.text("Atendido Por: \n") printer.text(str(waiter)+'\n') @@ -88,8 +97,7 @@ def print_bill_format(printer, d, waiter): def print_customer_order_format(printer, d, waiter): printer.set(align='center', bold=False, height=1, width=1) - format_date_time = datetime.now().strftime('%Y-%m-%d %H:%M:%S') - printer.text(str(format_date_time)+'\n') + printer.text(str(get_current_time_america_bogota())+'\n') if waiter: printer.text("Pedido Por: \n") diff --git a/Api/main.py b/Api/main.py index e2b6e28..be8f0fb 100644 --- a/Api/main.py +++ b/Api/main.py @@ -1,7 +1,7 @@ import json from fastapi import FastAPI, Response from pydantic import BaseModel -from .formats import print_bill, print_customer_order +from formats import print_bill, print_customer_order app = FastAPI( title="Print Server FastAPI", diff --git a/Api/test/test_generate_qr.py b/Api/test/test_generate_qr.py index 559be13..8218995 100644 --- a/Api/test/test_generate_qr.py +++ b/Api/test/test_generate_qr.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -from ..qr_generator import QRCodeGenerator +from qr_generator import QRCodeGenerator def test_generate_qr(): diff --git a/Api/test/test_main.py b/Api/test/test_main.py index 6eb7cc5..145949f 100644 --- a/Api/test/test_main.py +++ b/Api/test/test_main.py @@ -1,17 +1,13 @@ #!/usr/bin/env python3 from fastapi.testclient import TestClient -from ..main import app +from main import app +from tools import load_json import json client = TestClient(app) -def load_json(file_path): - with open(file_path, 'r') as filejson: - return json.load(filejson) - - def test_print_bill(): test_info = { "content": str( diff --git a/Api/test/test_printerfactory.py b/Api/test/test_printerfactory.py index 6811801..b827a42 100644 --- a/Api/test/test_printerfactory.py +++ b/Api/test/test_printerfactory.py @@ -1,7 +1,7 @@ import unittest from unittest.mock import patch, MagicMock from escpos.printer import Dummy -from ..printer_factory import PrinterFactory +from printer_factory import PrinterFactory class TestPrinterFactory(unittest.TestCase): @@ -17,7 +17,7 @@ class TestPrinterFactory(unittest.TestCase): printer = self.factory_dummy._get_printer() self.assertIsInstance(printer, Dummy) - @patch('Api.printer_factory.Network') + @patch('printer_factory.Network') def test_create_network_printer(self, mock_network): """Test creación de impresora de red con mock""" diff --git a/requirements.txt b/requirements.txt index 8cf567d..c28a222 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,3 +5,4 @@ pytest escpos qrcode flake8 +pytz