diff --git a/resa_padel/booking.py b/resa_padel/booking.py index 66a94cc..144358d 100644 --- a/resa_padel/booking.py +++ b/resa_padel/booking.py @@ -2,13 +2,12 @@ import asyncio import logging import time +import config import pendulum from aiohttp import ClientSession -from pendulum import DateTime - -import config from gestion_sports.gestion_sports_connector import GestionSportsConnector from models import BookingFilter, Club, User +from pendulum import DateTime LOGGER = logging.getLogger(__name__) diff --git a/resa_padel/config.py b/resa_padel/config.py index 17381a8..ad15c18 100644 --- a/resa_padel/config.py +++ b/resa_padel/config.py @@ -6,7 +6,6 @@ from pathlib import Path import pendulum import yaml from dotenv import load_dotenv - from models import BookingFilter, Club, User load_dotenv() diff --git a/resa_padel/gestion_sports/gestion_sports_connector.py b/resa_padel/gestion_sports/gestion_sports_connector.py index c4ddf47..85d6eb2 100644 --- a/resa_padel/gestion_sports/gestion_sports_connector.py +++ b/resa_padel/gestion_sports/gestion_sports_connector.py @@ -3,12 +3,11 @@ import json import logging from urllib.parse import urljoin -from aiohttp import ClientResponse, ClientSession - import config +from aiohttp import ClientResponse, ClientSession from gestion_sports.payload_builders import ( - GestionSportsLoginPayloadBuilder, GestionSportsBookingPayloadBuilder, + GestionSportsLoginPayloadBuilder, ) from models import BookingFilter, Club, User diff --git a/resa_padel/gestion_sports/payload_builders.py b/resa_padel/gestion_sports/payload_builders.py index 4673a00..287febb 100644 --- a/resa_padel/gestion_sports/payload_builders.py +++ b/resa_padel/gestion_sports/payload_builders.py @@ -1,8 +1,7 @@ -from jinja2 import Environment, FileSystemLoader - from exceptions import ArgumentMissing -from gestion_sports.gestion_sports_config import LOGIN_TEMPLATE, BOOKING_TEMPLATE -from models import User, Club, BookingFilter +from gestion_sports.gestion_sports_config import BOOKING_TEMPLATE, LOGIN_TEMPLATE +from jinja2 import Environment, FileSystemLoader +from models import BookingFilter, Club, User class GestionSportsLoginPayloadBuilder: diff --git a/resa_padel/models.py b/resa_padel/models.py index 8971b8e..1857750 100644 --- a/resa_padel/models.py +++ b/resa_padel/models.py @@ -1,5 +1,5 @@ from pendulum import Time -from pydantic import BaseModel, Field, ConfigDict +from pydantic import BaseModel, ConfigDict, Field from pydantic_extra_types.pendulum_dt import DateTime diff --git a/tests/fixtures.py b/tests/fixtures.py index 3c747ec..220ee92 100644 --- a/tests/fixtures.py +++ b/tests/fixtures.py @@ -2,8 +2,8 @@ import json import pendulum import pytest - from gestion_sports.payload_builders import GestionSportsBookingPayloadBuilder + from resa_padel.models import BookingFilter, Club, User user = User(login="padel.testing@jouf.fr", password="ridicule", club_id="123") diff --git a/tests/gestion_sports/test_gestion_sports_connector.py b/tests/gestion_sports/test_gestion_sports_connector.py index a32de8b..c7731dd 100644 --- a/tests/gestion_sports/test_gestion_sports_connector.py +++ b/tests/gestion_sports/test_gestion_sports_connector.py @@ -1,8 +1,8 @@ import pytest from aiohttp import ClientSession +from models import BookingFilter, Club, User from yarl import URL -from models import BookingFilter, Club, User from resa_padel.gestion_sports.gestion_sports_connector import GestionSportsConnector from tests.fixtures import ( a_booking_failure_response, diff --git a/tests/gestion_sports/test_gestion_sports_payload_builder.py b/tests/gestion_sports/test_gestion_sports_payload_builder.py index 3e56949..0b917c3 100644 --- a/tests/gestion_sports/test_gestion_sports_payload_builder.py +++ b/tests/gestion_sports/test_gestion_sports_payload_builder.py @@ -1,8 +1,8 @@ from resa_padel.gestion_sports.payload_builders import ( - GestionSportsLoginPayloadBuilder, GestionSportsBookingPayloadBuilder, + GestionSportsLoginPayloadBuilder, ) -from tests.fixtures import a_user, a_club, a_booking_filter +from tests.fixtures import a_booking_filter, a_club, a_user def test_login_payload_should_be_built(a_user, a_club): diff --git a/tests/test_booking.py b/tests/test_booking.py index a518462..e2667fe 100644 --- a/tests/test_booking.py +++ b/tests/test_booking.py @@ -5,9 +5,9 @@ from urllib.parse import urljoin import pendulum from aioresponses import aioresponses +from models import BookingFilter, Club, User from pendulum import DateTime, Time -from models import BookingFilter, Club, User from resa_padel import booking from tests import fixtures from tests.fixtures import (