Skip to content

Commit

Permalink
Change differentiation endpoint strategy from Brand Label to Model Code
Browse files Browse the repository at this point in the history
  • Loading branch information
f3dora19 committed Jan 5, 2022
1 parent 15caeeb commit 3c11575
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 12 deletions.
5 changes: 3 additions & 2 deletions src/renault_api/cli/charge/control.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

import aiohttp
import click

from renault_api.cli import helpers
from renault_api.cli import renault_vehicle

Expand Down Expand Up @@ -49,7 +50,7 @@ async def start(
await vehicle.get_details()
if (
vehicle._vehicle_details
and vehicle._vehicle_details.get_brand_label() == "DACIA"
and vehicle._vehicle_details.get_model_code() == "XBG1VE"
):
response = await vehicle.set_charge_pause_resume("resume")
else:
Expand All @@ -72,7 +73,7 @@ async def stop(
await vehicle.get_details()
if (
vehicle._vehicle_details
and vehicle._vehicle_details.get_brand_label() == "DACIA"
and vehicle._vehicle_details.get_model_code() == "XBG1VE"
):
response = await vehicle.set_charge_pause_resume("pause")
click.echo(response.raw_data)
Expand Down
2 changes: 1 addition & 1 deletion src/renault_api/kamereon/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
from typing import Optional

from marshmallow.schema import Schema
from renault_api.models import BaseModel

from . import enums
from . import exceptions
from . import helpers
from renault_api.models import BaseModel

COMMON_ERRRORS: List[Dict[str, Any]] = [
{
Expand Down
2 changes: 1 addition & 1 deletion src/renault_api/renault_session.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
from typing import Optional

import aiohttp
from renault_api.helpers import get_api_keys

from . import gigya
from . import kamereon
Expand All @@ -23,6 +22,7 @@
from .exceptions import RenaultException
from .gigya.exceptions import GigyaResponseException
from .kamereon import models
from renault_api.helpers import get_api_keys


_LOGGER = logging.getLogger(__name__)
Expand Down
2 changes: 1 addition & 1 deletion tests/cli/test_vehicle_charge.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
from aioresponses import aioresponses
from aioresponses.core import RequestCall
from click.testing import CliRunner
from renault_api.cli import __main__
from tests import fixtures
from yarl import URL

from . import initialise_credential_store
from renault_api.cli import __main__


def test_charge_history_day(
Expand Down
3 changes: 2 additions & 1 deletion tests/kamereon/test_kamereon.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import pytest
from aioresponses import aioresponses
from aioresponses.core import RequestCall
from renault_api import kamereon
from tests import fixtures
from tests.const import TEST_ACCOUNT_ID
from tests.const import TEST_COUNTRY
Expand All @@ -13,6 +12,8 @@
from tests.const import TEST_VIN
from yarl import URL

from renault_api import kamereon


@pytest.mark.asyncio
async def test_get_person(
Expand Down
3 changes: 2 additions & 1 deletion tests/kamereon/test_kamereon_vehicle_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@
from typing import cast

import pytest
from tests import fixtures

from renault_api.kamereon import enums
from renault_api.kamereon import models
from renault_api.kamereon import schemas
from renault_api.kamereon.helpers import DAYS_OF_WEEK
from tests import fixtures


@pytest.mark.parametrize(
Expand Down
3 changes: 2 additions & 1 deletion tests/kamereon/test_kamereon_vehicles.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@
import os

import pytest
from tests import fixtures

from renault_api.kamereon import models
from renault_api.kamereon import schemas
from tests import fixtures

EXPECTED_SPECS = {
"captur_ii.1.json": {
Expand Down
9 changes: 5 additions & 4 deletions tests/test_renault_vehicle.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@
import pytest
from aioresponses import aioresponses
from aioresponses.core import RequestCall
from renault_api.kamereon.helpers import DAYS_OF_WEEK
from renault_api.kamereon.models import ChargeSchedule
from renault_api.kamereon.models import HvacSchedule
from renault_api.renault_vehicle import RenaultVehicle
from tests import fixtures
from tests.const import TEST_ACCOUNT_ID
from tests.const import TEST_COUNTRY
Expand All @@ -20,6 +16,11 @@
from tests.test_renault_session import get_logged_in_session
from yarl import URL

from renault_api.kamereon.helpers import DAYS_OF_WEEK
from renault_api.kamereon.models import ChargeSchedule
from renault_api.kamereon.models import HvacSchedule
from renault_api.renault_vehicle import RenaultVehicle


@pytest.fixture
def vehicle(websession: aiohttp.ClientSession) -> RenaultVehicle:
Expand Down

0 comments on commit 3c11575

Please sign in to comment.