From d8c7f78f1c68252425ecab54cac54eb601c3c726 Mon Sep 17 00:00:00 2001 From: Marcel Savegnago Date: Sun, 19 Dec 2021 11:42:08 -0300 Subject: [PATCH 01/13] [ADD] fleet_rest_api --- fleet_rest_api/README.rst | 93 ++++ fleet_rest_api/__init__.py | 3 + fleet_rest_api/__manifest__.py | 20 + fleet_rest_api/controllers/__init__.py | 1 + fleet_rest_api/controllers/main.py | 32 ++ fleet_rest_api/pydantic_models/__init__.py | 4 + .../pydantic_models/fleet_vehicle_info.py | 24 + .../fleet_vehicle_search_filter.py | 13 + .../fleet_vehicle_state_info.py | 17 + .../fleet_vehicle_state_search_filter.py | 10 + fleet_rest_api/readme/CONTRIBUTORS.rst | 1 + fleet_rest_api/readme/CREDITS.rst | 3 + fleet_rest_api/readme/DESCRIPTION.rst | 1 + fleet_rest_api/readme/USAGE.rst | 1 + fleet_rest_api/services/__init__.py | 3 + fleet_rest_api/services/fleet_vehicle.py | 58 +++ .../services/fleet_vehicle_state.py | 56 +++ fleet_rest_api/services/service.py | 24 + fleet_rest_api/static/description/icon.png | Bin 0 -> 9455 bytes fleet_rest_api/static/description/index.html | 434 ++++++++++++++++++ requirements.txt | 2 + .../fleet_rest_api/odoo/addons/fleet_rest_api | 1 + setup/fleet_rest_api/setup.py | 6 + 23 files changed, 807 insertions(+) create mode 100644 fleet_rest_api/README.rst create mode 100644 fleet_rest_api/__init__.py create mode 100644 fleet_rest_api/__manifest__.py create mode 100644 fleet_rest_api/controllers/__init__.py create mode 100644 fleet_rest_api/controllers/main.py create mode 100644 fleet_rest_api/pydantic_models/__init__.py create mode 100644 fleet_rest_api/pydantic_models/fleet_vehicle_info.py create mode 100644 fleet_rest_api/pydantic_models/fleet_vehicle_search_filter.py create mode 100644 fleet_rest_api/pydantic_models/fleet_vehicle_state_info.py create mode 100644 fleet_rest_api/pydantic_models/fleet_vehicle_state_search_filter.py create mode 100644 fleet_rest_api/readme/CONTRIBUTORS.rst create mode 100644 fleet_rest_api/readme/CREDITS.rst create mode 100644 fleet_rest_api/readme/DESCRIPTION.rst create mode 100644 fleet_rest_api/readme/USAGE.rst create mode 100644 fleet_rest_api/services/__init__.py create mode 100644 fleet_rest_api/services/fleet_vehicle.py create mode 100644 fleet_rest_api/services/fleet_vehicle_state.py create mode 100644 fleet_rest_api/services/service.py create mode 100644 fleet_rest_api/static/description/icon.png create mode 100644 fleet_rest_api/static/description/index.html create mode 100644 requirements.txt create mode 120000 setup/fleet_rest_api/odoo/addons/fleet_rest_api create mode 100644 setup/fleet_rest_api/setup.py diff --git a/fleet_rest_api/README.rst b/fleet_rest_api/README.rst new file mode 100644 index 00000000..28928b73 --- /dev/null +++ b/fleet_rest_api/README.rst @@ -0,0 +1,93 @@ +============== +Fleet Rest Api +============== + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png + :target: https://odoo-community.org/page/development-status + :alt: Beta +.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 +.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Ffleet-lightgray.png?logo=github + :target: https://github.com/OCA/fleet/tree/14.0/fleet_rest_api + :alt: OCA/fleet +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/fleet-14-0/fleet-14-0-fleet_rest_api + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/291/14.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + +TODO + +**Table of contents** + +.. contents:: + :local: + +Usage +===== + +TODO + +Bug Tracker +=========== + +Bugs are tracked on `GitHub Issues `_. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us smashing it by providing a detailed and welcomed +`feedback `_. + +Do not contact contributors directly about support or help with technical issues. + +Credits +======= + +Authors +~~~~~~~ + +* Escodoo + +Contributors +~~~~~~~~~~~~ + +* Marcel Savegnago + +Other credits +~~~~~~~~~~~~~ + +The development of this module has been financially supported by: + +* Escodoo - `https://www.escodoo.com.br `_ + +Maintainers +~~~~~~~~~~~ + +This module is maintained by the OCA. + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use. + +.. |maintainer-marcelsavegnago| image:: https://github.com/marcelsavegnago.png?size=40px + :target: https://github.com/marcelsavegnago + :alt: marcelsavegnago + +Current `maintainer `__: + +|maintainer-marcelsavegnago| + +This module is part of the `OCA/fleet `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/fleet_rest_api/__init__.py b/fleet_rest_api/__init__.py new file mode 100644 index 00000000..99c82ab1 --- /dev/null +++ b/fleet_rest_api/__init__.py @@ -0,0 +1,3 @@ +from . import controllers +from . import pydantic_models +from . import services diff --git a/fleet_rest_api/__manifest__.py b/fleet_rest_api/__manifest__.py new file mode 100644 index 00000000..642d15a7 --- /dev/null +++ b/fleet_rest_api/__manifest__.py @@ -0,0 +1,20 @@ +# Copyright 2021 - TODAY, Escodoo +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +{ + "name": "Fleet Rest Api", + "summary": """Add a REST API to manage events""", + "version": "14.0.1.0.0", + "license": "AGPL-3", + "author": "Escodoo,Odoo Community Association (OCA)", + "maintainers": ["marcelsavegnago"], + "website": "https://github.com/OCA/fleet", + "depends": ["base_rest", "base_rest_pydantic", "fleet"], + "data": [], + "demo": [], + "external_dependencies": { + "python": [ + "pydantic", + ] + }, +} diff --git a/fleet_rest_api/controllers/__init__.py b/fleet_rest_api/controllers/__init__.py new file mode 100644 index 00000000..12a7e529 --- /dev/null +++ b/fleet_rest_api/controllers/__init__.py @@ -0,0 +1 @@ +from . import main diff --git a/fleet_rest_api/controllers/main.py b/fleet_rest_api/controllers/main.py new file mode 100644 index 00000000..c3eb9482 --- /dev/null +++ b/fleet_rest_api/controllers/main.py @@ -0,0 +1,32 @@ +# Copyright 2021 - TODAY, Marcel Savegnago +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo.addons.base_rest.controllers import main + + +class BaseFleetPublicApiController(main.RestController): + _root_path = "/fleet_rest_api/" + _collection_name = "fleet.rest.services" + _default_auth = "public" + + +# class BaseRestDemoPrivateApiController(main.RestController): +# _root_path = "/base_rest_demo_api/private/" +# _collection_name = "base.rest.demo.private.services" +# _default_auth = "user" +# +# +# class BaseRestDemoNewApiController(main.RestController): +# _root_path = "/base_rest_demo_api/new_api/" +# _collection_name = "base.rest.demo.new_api.services" +# _default_auth = "public" + + +# class BaseRestDemoJwtApiController(main.RestController): +# # JWT Demo Controller, to be used with auth_jwt_demo +# # https://github.com/OCA/server-auth/tree/14.0/auth_jwt_demo +# _root_path = "/base_rest_demo_api/jwt/" +# _collection_name = "base.rest.demo.jwt.services" +# _default_auth = "jwt_demo_keycloak" +# _component_context_provider = "auth_jwt_component_context_provider" +# _default_cors = "*" diff --git a/fleet_rest_api/pydantic_models/__init__.py b/fleet_rest_api/pydantic_models/__init__.py new file mode 100644 index 00000000..bd2696c8 --- /dev/null +++ b/fleet_rest_api/pydantic_models/__init__.py @@ -0,0 +1,4 @@ +from . import fleet_vehicle_info +from . import fleet_vehicle_state_info +from . import fleet_vehicle_search_filter +from . import fleet_vehicle_state_search_filter diff --git a/fleet_rest_api/pydantic_models/fleet_vehicle_info.py b/fleet_rest_api/pydantic_models/fleet_vehicle_info.py new file mode 100644 index 00000000..d2ef0eec --- /dev/null +++ b/fleet_rest_api/pydantic_models/fleet_vehicle_info.py @@ -0,0 +1,24 @@ +# Copyright 2021 - TODAY, Marcel Savegnago +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from datetime import datetime + +import pydantic + +from odoo.addons.pydantic import models, utils + +from .fleet_vehicle_state_info import FleetVehicleStateInfo + + +class FleetVehicleInfo(models.BaseModel): + id: int + name: str + odometer: float + odometer_unit: str + vehicle_type: str + state: FleetVehicleStateInfo = pydantic.Field(None, alias="state_id") + write_date: datetime + + class Config: + orm_mode = True + getter_dict = utils.GenericOdooGetter diff --git a/fleet_rest_api/pydantic_models/fleet_vehicle_search_filter.py b/fleet_rest_api/pydantic_models/fleet_vehicle_search_filter.py new file mode 100644 index 00000000..7a10d247 --- /dev/null +++ b/fleet_rest_api/pydantic_models/fleet_vehicle_search_filter.py @@ -0,0 +1,13 @@ +# Copyright 2021 - TODAY, Marcel Savegnago +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from typing import List + +from odoo.addons.pydantic import models + + +class FleetVehicleSearchFilter(models.BaseModel): + + id: int = None + name: str = None + stage_ids: List[int] = None diff --git a/fleet_rest_api/pydantic_models/fleet_vehicle_state_info.py b/fleet_rest_api/pydantic_models/fleet_vehicle_state_info.py new file mode 100644 index 00000000..c1a4aa72 --- /dev/null +++ b/fleet_rest_api/pydantic_models/fleet_vehicle_state_info.py @@ -0,0 +1,17 @@ +# Copyright 2021 - TODAY, Marcel Savegnago +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from datetime import datetime + +from odoo.addons.pydantic import models, utils + + +class FleetVehicleStateInfo(models.BaseModel): + id: int + name: str + sequence: int = None + write_date: datetime + + class Config: + orm_mode = True + getter_dict = utils.GenericOdooGetter diff --git a/fleet_rest_api/pydantic_models/fleet_vehicle_state_search_filter.py b/fleet_rest_api/pydantic_models/fleet_vehicle_state_search_filter.py new file mode 100644 index 00000000..9b071070 --- /dev/null +++ b/fleet_rest_api/pydantic_models/fleet_vehicle_state_search_filter.py @@ -0,0 +1,10 @@ +# Copyright 2021 - TODAY, Marcel Savegnago +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo.addons.pydantic import models + + +class FleetVehicleStateSearchFilter(models.BaseModel): + + id: int = None + name: str = None diff --git a/fleet_rest_api/readme/CONTRIBUTORS.rst b/fleet_rest_api/readme/CONTRIBUTORS.rst new file mode 100644 index 00000000..61f9287b --- /dev/null +++ b/fleet_rest_api/readme/CONTRIBUTORS.rst @@ -0,0 +1 @@ +* Marcel Savegnago diff --git a/fleet_rest_api/readme/CREDITS.rst b/fleet_rest_api/readme/CREDITS.rst new file mode 100644 index 00000000..7762abc8 --- /dev/null +++ b/fleet_rest_api/readme/CREDITS.rst @@ -0,0 +1,3 @@ +The development of this module has been financially supported by: + +* Escodoo - `https://www.escodoo.com.br `_ diff --git a/fleet_rest_api/readme/DESCRIPTION.rst b/fleet_rest_api/readme/DESCRIPTION.rst new file mode 100644 index 00000000..1333ed77 --- /dev/null +++ b/fleet_rest_api/readme/DESCRIPTION.rst @@ -0,0 +1 @@ +TODO diff --git a/fleet_rest_api/readme/USAGE.rst b/fleet_rest_api/readme/USAGE.rst new file mode 100644 index 00000000..1333ed77 --- /dev/null +++ b/fleet_rest_api/readme/USAGE.rst @@ -0,0 +1 @@ +TODO diff --git a/fleet_rest_api/services/__init__.py b/fleet_rest_api/services/__init__.py new file mode 100644 index 00000000..cb457600 --- /dev/null +++ b/fleet_rest_api/services/__init__.py @@ -0,0 +1,3 @@ +from . import service +from . import fleet_vehicle +from . import fleet_vehicle_state diff --git a/fleet_rest_api/services/fleet_vehicle.py b/fleet_rest_api/services/fleet_vehicle.py new file mode 100644 index 00000000..a2272071 --- /dev/null +++ b/fleet_rest_api/services/fleet_vehicle.py @@ -0,0 +1,58 @@ +# Copyright 2021 - TODAY, Marcel Savegnago +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from typing import List + +from odoo.addons.base_rest import restapi +from odoo.addons.base_rest_pydantic.restapi import PydanticModel, PydanticModelList +from odoo.addons.component.core import Component + +from ..pydantic_models.fleet_vehicle_info import FleetVehicleInfo + +# from ..pydantic_models.fleet_vehicle_registration_info import FleetVehicleRegistrationInfo +# from ..pydantic_models.fleet_vehicle_registration_request import ( +# FleetVehicleRegistrationRequest, +# FleetVehicleRegistrationRequestList, +# ) +from ..pydantic_models.fleet_vehicle_search_filter import FleetVehicleSearchFilter + + +class FleetVehicleService(Component): + _inherit = "base.fleet.rest.service" + _name = "fleet.vehicle.rest.service" + _usage = "vehicle" + _expose_model = "fleet.vehicle" + _collection = "fleet.rest.services" + _description = __doc__ + + @restapi.method( + routes=[(["/"], "GET")], + output_param=PydanticModel(FleetVehicleInfo), + auth="public", + ) + def get(self, _id: int) -> FleetVehicleInfo: + fleet_vehicle = self._get(_id) + return FleetVehicleInfo.from_orm(fleet_vehicle) + + def _get_search_domain(self, filters): + domain = [] + if filters.name: + domain.append(("name", "like", filters.name)) + if filters.id: + domain.append(("id", "=", filters.id)) + return domain + + @restapi.method( + routes=[(["/", "/search"], "GET")], + input_param=PydanticModel(FleetVehicleSearchFilter), + output_param=PydanticModelList(FleetVehicleInfo), + auth="public", + ) + def search( + self, fleet_vehicle_search_filter: FleetVehicleSearchFilter + ) -> List[FleetVehicleInfo]: + domain = self._get_search_domain(fleet_vehicle_search_filter) + res: List[FleetVehicleInfo] = [] + for e in self.env["fleet.vehicle"].sudo().search(domain): + res.append(FleetVehicleInfo.from_orm(e)) + return res diff --git a/fleet_rest_api/services/fleet_vehicle_state.py b/fleet_rest_api/services/fleet_vehicle_state.py new file mode 100644 index 00000000..16d44829 --- /dev/null +++ b/fleet_rest_api/services/fleet_vehicle_state.py @@ -0,0 +1,56 @@ +# Copyright 2021 - TODAY, Marcel Savegnago +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from typing import List + +from odoo.addons.base_rest import restapi +from odoo.addons.base_rest_pydantic.restapi import PydanticModel, PydanticModelList +from odoo.addons.component.core import Component + +from ..pydantic_models.fleet_vehicle_state_info import FleetVehicleStateInfo +from ..pydantic_models.fleet_vehicle_state_search_filter import ( + FleetVehicleStateSearchFilter, +) + + +class FleetVehicleStateService(Component): + _inherit = "base.fleet.rest.service" + _name = "fleet.vehicle.state.rest.service" + _usage = "vehicle_state" + _expose_model = "fleet.vehicle.state" + _collection = "fleet.rest.services" + _description = __doc__ + + @restapi.method( + routes=[(["/"], "GET")], + output_param=PydanticModel(FleetVehicleStateInfo), + auth="public", + ) + def get(self, _id: int) -> FleetVehicleStateInfo: + fleet_vehicle_state = self._get(_id) + return FleetVehicleStateInfo.from_orm(fleet_vehicle_state) + + def _get_search_domain(self, filters): + domain = [] + if filters.name: + domain.append(("name", "like", filters.name)) + if filters.id: + domain.append(("id", "=", filters.id)) + if filters.pipe_end is not None: + domain.append(("pipe_end", "=", filters.pipe_end)) + return domain + + @restapi.method( + routes=[(["/", "/search"], "GET")], + input_param=PydanticModel(FleetVehicleStateSearchFilter), + output_param=PydanticModelList(FleetVehicleStateInfo), + auth="public", + ) + def search( + self, fleet_vehicle_state_search_filter: FleetVehicleStateSearchFilter + ) -> List[FleetVehicleStateInfo]: + domain = self._get_search_domain(fleet_vehicle_state_search_filter) + res: List[FleetVehicleStateInfo] = [] + for e in self.env["fleet.vehicle.state"].sudo().search(domain): + res.append(FleetVehicleStateInfo.from_orm(e)) + return res diff --git a/fleet_rest_api/services/service.py b/fleet_rest_api/services/service.py new file mode 100644 index 00000000..dcb61b4f --- /dev/null +++ b/fleet_rest_api/services/service.py @@ -0,0 +1,24 @@ +# Copyright 2021 - TODAY, Marcel Savegnago +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo import _ +from odoo.exceptions import MissingError + +from odoo.addons.component.core import AbstractComponent + + +class BaseFleetService(AbstractComponent): + _inherit = "base.rest.service" + _name = "base.fleet.rest.service" + _collection = "fleet.rest.services" + _expose_model = None + + def _get(self, _id): + domain = [("id", "=", _id)] + record = self.env[self._expose_model].search(domain) + if not record: + raise MissingError( + _("The record %s %s does not exist") % (self._expose_model, _id) + ) + else: + return record diff --git a/fleet_rest_api/static/description/icon.png b/fleet_rest_api/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 diff --git a/fleet_rest_api/static/description/index.html b/fleet_rest_api/static/description/index.html new file mode 100644 index 00000000..0ef96f3b --- /dev/null +++ b/fleet_rest_api/static/description/index.html @@ -0,0 +1,434 @@ + + + + + + +Fleet Rest Api + + + +
+

Fleet Rest Api

+ + +

Beta License: AGPL-3 OCA/fleet Translate me on Weblate Try me on Runbot

+

TODO

+

Table of contents

+ +
+

Usage

+

TODO

+
+
+

Bug Tracker

+

Bugs are tracked on GitHub Issues. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us smashing it by providing a detailed and welcomed +feedback.

+

Do not contact contributors directly about support or help with technical issues.

+
+
+

Credits

+
+

Authors

+
    +
  • Escodoo
    • +
+
+
+

Contributors

+ +
+
+

Other credits

+

The development of this module has been financially supported by:

+ +
+
+

Maintainers

+

This module is maintained by the OCA.

+Odoo Community Association +

OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use.

+

Current maintainer:

+

marcelsavegnago

+

This module is part of the OCA/fleet project on GitHub.

+

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

+
+
+
+ + diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 00000000..e582a798 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,2 @@ +# generated from manifests external_dependencies +pydantic diff --git a/setup/fleet_rest_api/odoo/addons/fleet_rest_api b/setup/fleet_rest_api/odoo/addons/fleet_rest_api new file mode 120000 index 00000000..74b1d14d --- /dev/null +++ b/setup/fleet_rest_api/odoo/addons/fleet_rest_api @@ -0,0 +1 @@ +../../../../fleet_rest_api \ No newline at end of file diff --git a/setup/fleet_rest_api/setup.py b/setup/fleet_rest_api/setup.py new file mode 100644 index 00000000..28c57bb6 --- /dev/null +++ b/setup/fleet_rest_api/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +) From 4cb5fc4011e354bed63153c51a742c587cd1f768 Mon Sep 17 00:00:00 2001 From: Marcel Savegnago Date: Sun, 19 Dec 2021 12:06:10 -0300 Subject: [PATCH 02/13] [ADD] fleet_rest_api: odometer service --- fleet_rest_api/pydantic_models/__init__.py | 4 +- .../fleet_vehicle_odometer_info.py | 21 +++++++ .../fleet_vehicle_odometer_search_filter.py | 12 ++++ fleet_rest_api/services/__init__.py | 1 + fleet_rest_api/services/fleet_vehicle.py | 4 +- .../services/fleet_vehicle_odometer.py | 58 +++++++++++++++++++ .../services/fleet_vehicle_state.py | 6 +- 7 files changed, 99 insertions(+), 7 deletions(-) create mode 100644 fleet_rest_api/pydantic_models/fleet_vehicle_odometer_info.py create mode 100644 fleet_rest_api/pydantic_models/fleet_vehicle_odometer_search_filter.py create mode 100644 fleet_rest_api/services/fleet_vehicle_odometer.py diff --git a/fleet_rest_api/pydantic_models/__init__.py b/fleet_rest_api/pydantic_models/__init__.py index bd2696c8..89600ec6 100644 --- a/fleet_rest_api/pydantic_models/__init__.py +++ b/fleet_rest_api/pydantic_models/__init__.py @@ -1,4 +1,6 @@ from . import fleet_vehicle_info -from . import fleet_vehicle_state_info from . import fleet_vehicle_search_filter +from . import fleet_vehicle_state_info from . import fleet_vehicle_state_search_filter +from . import fleet_vehicle_odometer_info +from . import fleet_vehicle_odometer_search_filter diff --git a/fleet_rest_api/pydantic_models/fleet_vehicle_odometer_info.py b/fleet_rest_api/pydantic_models/fleet_vehicle_odometer_info.py new file mode 100644 index 00000000..6b46f453 --- /dev/null +++ b/fleet_rest_api/pydantic_models/fleet_vehicle_odometer_info.py @@ -0,0 +1,21 @@ +# Copyright 2021 - TODAY, Marcel Savegnago +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from datetime import datetime + +from odoo.addons.pydantic import models, utils + + +class FleetVehicleOdometerInfo(models.BaseModel): + id: int + name: str + value: float + vehicle_id: int + unit: str + driver_id: int + sequence: int = None + write_date: datetime + + class Config: + orm_mode = True + getter_dict = utils.GenericOdooGetter diff --git a/fleet_rest_api/pydantic_models/fleet_vehicle_odometer_search_filter.py b/fleet_rest_api/pydantic_models/fleet_vehicle_odometer_search_filter.py new file mode 100644 index 00000000..92e06726 --- /dev/null +++ b/fleet_rest_api/pydantic_models/fleet_vehicle_odometer_search_filter.py @@ -0,0 +1,12 @@ +# Copyright 2021 - TODAY, Marcel Savegnago +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo.addons.pydantic import models + + +class FleetVehicleOdometerSearchFilter(models.BaseModel): + + id: int = None + name: str = None + vehicle_id: int = None + driver_id: int = None diff --git a/fleet_rest_api/services/__init__.py b/fleet_rest_api/services/__init__.py index cb457600..7c67cd1e 100644 --- a/fleet_rest_api/services/__init__.py +++ b/fleet_rest_api/services/__init__.py @@ -1,3 +1,4 @@ from . import service from . import fleet_vehicle from . import fleet_vehicle_state +from . import fleet_vehicle_odometer diff --git a/fleet_rest_api/services/fleet_vehicle.py b/fleet_rest_api/services/fleet_vehicle.py index a2272071..2e075e2b 100644 --- a/fleet_rest_api/services/fleet_vehicle.py +++ b/fleet_rest_api/services/fleet_vehicle.py @@ -36,10 +36,10 @@ def get(self, _id: int) -> FleetVehicleInfo: def _get_search_domain(self, filters): domain = [] - if filters.name: - domain.append(("name", "like", filters.name)) if filters.id: domain.append(("id", "=", filters.id)) + if filters.name: + domain.append(("name", "like", filters.name)) return domain @restapi.method( diff --git a/fleet_rest_api/services/fleet_vehicle_odometer.py b/fleet_rest_api/services/fleet_vehicle_odometer.py new file mode 100644 index 00000000..7aa328cd --- /dev/null +++ b/fleet_rest_api/services/fleet_vehicle_odometer.py @@ -0,0 +1,58 @@ +# Copyright 2021 - TODAY, Marcel Savegnago +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from typing import List + +from odoo.addons.base_rest import restapi +from odoo.addons.base_rest_pydantic.restapi import PydanticModel, PydanticModelList +from odoo.addons.component.core import Component + +from ..pydantic_models.fleet_vehicle_odometer_info import FleetVehicleOdometerInfo +from ..pydantic_models.fleet_vehicle_odometer_search_filter import ( + FleetVehicleOdometerSearchFilter, +) + + +class FleetVehicleOdometerService(Component): + _inherit = "base.fleet.rest.service" + _name = "fleet.vehicle.odometer.rest.service" + _usage = "vehicle_odometer" + _expose_model = "fleet.vehicle.odometer" + _collection = "fleet.rest.services" + _description = __doc__ + + @restapi.method( + routes=[(["/"], "GET")], + output_param=PydanticModel(FleetVehicleOdometerInfo), + auth="public", + ) + def get(self, _id: int) -> FleetVehicleOdometerInfo: + fleet_vehicle_odometer = self._get(_id) + return FleetVehicleOdometerInfo.from_orm(fleet_vehicle_odometer) + + def _get_search_domain(self, filters): + domain = [] + if filters.id: + domain.append(("id", "=", filters.id)) + if filters.name: + domain.append(("name", "like", filters.name)) + if filters.vehicle_id: + domain.append(("vehicle_id", "=", filters.vehicle_id)) + if filters.driver_id: + domain.append(("driver_id", "=", filters.driver_id)) + return domain + + @restapi.method( + routes=[(["/", "/search"], "GET")], + input_param=PydanticModel(FleetVehicleOdometerSearchFilter), + output_param=PydanticModelList(FleetVehicleOdometerInfo), + auth="public", + ) + def search( + self, fleet_vehicle_odometer_search_filter: FleetVehicleOdometerSearchFilter + ) -> List[FleetVehicleOdometerInfo]: + domain = self._get_search_domain(fleet_vehicle_odometer_search_filter) + res: List[FleetVehicleOdometerInfo] = [] + for e in self.env["fleet.vehicle.odometer"].sudo().search(domain): + res.append(FleetVehicleOdometerInfo.from_orm(e)) + return res diff --git a/fleet_rest_api/services/fleet_vehicle_state.py b/fleet_rest_api/services/fleet_vehicle_state.py index 16d44829..17dcec40 100644 --- a/fleet_rest_api/services/fleet_vehicle_state.py +++ b/fleet_rest_api/services/fleet_vehicle_state.py @@ -32,12 +32,10 @@ def get(self, _id: int) -> FleetVehicleStateInfo: def _get_search_domain(self, filters): domain = [] - if filters.name: - domain.append(("name", "like", filters.name)) if filters.id: domain.append(("id", "=", filters.id)) - if filters.pipe_end is not None: - domain.append(("pipe_end", "=", filters.pipe_end)) + if filters.name: + domain.append(("name", "like", filters.name)) return domain @restapi.method( From 32803753a500b551b17d259ceb918755076fc36e Mon Sep 17 00:00:00 2001 From: Marcel Savegnago Date: Sun, 19 Dec 2021 14:20:10 -0300 Subject: [PATCH 03/13] [ADD] fleet_rest_api: log contract service --- fleet_rest_api/pydantic_models/__init__.py | 2 + .../fleet_vehicle_log_contract_info.py | 36 ++++++++++++ ...leet_vehicle_log_contract_search_filter.py | 12 ++++ fleet_rest_api/services/__init__.py | 1 + .../services/fleet_vehicle_log_contract.py | 58 +++++++++++++++++++ 5 files changed, 109 insertions(+) create mode 100644 fleet_rest_api/pydantic_models/fleet_vehicle_log_contract_info.py create mode 100644 fleet_rest_api/pydantic_models/fleet_vehicle_log_contract_search_filter.py create mode 100644 fleet_rest_api/services/fleet_vehicle_log_contract.py diff --git a/fleet_rest_api/pydantic_models/__init__.py b/fleet_rest_api/pydantic_models/__init__.py index 89600ec6..83591c19 100644 --- a/fleet_rest_api/pydantic_models/__init__.py +++ b/fleet_rest_api/pydantic_models/__init__.py @@ -4,3 +4,5 @@ from . import fleet_vehicle_state_search_filter from . import fleet_vehicle_odometer_info from . import fleet_vehicle_odometer_search_filter +from . import fleet_vehicle_log_contract_info +from . import fleet_vehicle_log_contract_search_filter diff --git a/fleet_rest_api/pydantic_models/fleet_vehicle_log_contract_info.py b/fleet_rest_api/pydantic_models/fleet_vehicle_log_contract_info.py new file mode 100644 index 00000000..05a055ea --- /dev/null +++ b/fleet_rest_api/pydantic_models/fleet_vehicle_log_contract_info.py @@ -0,0 +1,36 @@ +# Copyright 2021 - TODAY, Marcel Savegnago +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from datetime import date, datetime +from typing import List + +from odoo.addons.pydantic import models, utils + + +class FleetVehicleLogContractInfo(models.BaseModel): + id: int + name: str + active: bool + vehicle_id: int + cost_subtype_id: int + amount: float + date: date + company_id: int + currency_id: int + user_id: int + start_date: date + expiration_date: date + days_left: int + insurer_id: int + purchaser_id: int + ins_ref: str + state: str + notes: str + cost_generated: float + cost_frequency: str + # services_ids: List[int] + write_date: datetime + + class Config: + orm_mode = True + getter_dict = utils.GenericOdooGetter diff --git a/fleet_rest_api/pydantic_models/fleet_vehicle_log_contract_search_filter.py b/fleet_rest_api/pydantic_models/fleet_vehicle_log_contract_search_filter.py new file mode 100644 index 00000000..61d2869f --- /dev/null +++ b/fleet_rest_api/pydantic_models/fleet_vehicle_log_contract_search_filter.py @@ -0,0 +1,12 @@ +# Copyright 2021 - TODAY, Marcel Savegnago +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo.addons.pydantic import models + + +class FleetVehicleLogContractSearchFilter(models.BaseModel): + + id: int = None + name: str = None + vehicle_id: int = None + user_id: int = None diff --git a/fleet_rest_api/services/__init__.py b/fleet_rest_api/services/__init__.py index 7c67cd1e..6425fd00 100644 --- a/fleet_rest_api/services/__init__.py +++ b/fleet_rest_api/services/__init__.py @@ -2,3 +2,4 @@ from . import fleet_vehicle from . import fleet_vehicle_state from . import fleet_vehicle_odometer +from . import fleet_vehicle_log_contract diff --git a/fleet_rest_api/services/fleet_vehicle_log_contract.py b/fleet_rest_api/services/fleet_vehicle_log_contract.py new file mode 100644 index 00000000..ded762d7 --- /dev/null +++ b/fleet_rest_api/services/fleet_vehicle_log_contract.py @@ -0,0 +1,58 @@ +# Copyright 2021 - TODAY, Marcel Savegnago +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from typing import List + +from odoo.addons.base_rest import restapi +from odoo.addons.base_rest_pydantic.restapi import PydanticModel, PydanticModelList +from odoo.addons.component.core import Component + +from ..pydantic_models.fleet_vehicle_log_contract_info import FleetVehicleLogContractInfo +from ..pydantic_models.fleet_vehicle_log_contract_search_filter import ( + FleetVehicleLogContractSearchFilter, +) + + +class FleetVehicleLogContractService(Component): + _inherit = "base.fleet.rest.service" + _name = "fleet.vehicle.log.contract.rest.service" + _usage = "vehicle_log_contract" + _expose_model = "fleet.vehicle.log.contract" + _collection = "fleet.rest.services" + _description = __doc__ + + @restapi.method( + routes=[(["/"], "GET")], + output_param=PydanticModel(FleetVehicleLogContractInfo), + auth="public", + ) + def get(self, _id: int) -> FleetVehicleLogContractInfo: + fleet_vehicle_log_contract = self._get(_id) + return FleetVehicleLogContractInfo.from_orm(fleet_vehicle_log_contract) + + def _get_search_domain(self, filters): + domain = [] + if filters.id: + domain.append(("id", "=", filters.id)) + if filters.name: + domain.append(("name", "like", filters.name)) + if filters.vehicle_id: + domain.append(("vehicle_id", "=", filters.vehicle_id)) + if filters.user_id: + domain.append(("user_id", "=", filters.user_id)) + return domain + + @restapi.method( + routes=[(["/", "/search"], "GET")], + input_param=PydanticModel(FleetVehicleLogContractSearchFilter), + output_param=PydanticModelList(FleetVehicleLogContractInfo), + auth="public", + ) + def search( + self, fleet_vehicle_log_contract_search_filter: FleetVehicleLogContractSearchFilter + ) -> List[FleetVehicleLogContractInfo]: + domain = self._get_search_domain(fleet_vehicle_log_contract_search_filter) + res: List[FleetVehicleLogContractInfo] = [] + for e in self.env["fleet.vehicle.log.contract"].sudo().search(domain): + res.append(FleetVehicleLogContractInfo.from_orm(e)) + return res From 21486f1596a3625567f741c005f108cd7901807a Mon Sep 17 00:00:00 2001 From: Marcel Savegnago Date: Sun, 19 Dec 2021 14:37:20 -0300 Subject: [PATCH 04/13] [ADD] fleet_rest_api: imp fleet_log_services rest service --- fleet_rest_api/pydantic_models/__init__.py | 2 + .../fleet_vehicle_log_services_info.py | 32 ++++++++++ ...leet_vehicle_log_services_search_filter.py | 14 +++++ fleet_rest_api/services/__init__.py | 1 + .../services/fleet_vehicle_log_services.py | 62 +++++++++++++++++++ 5 files changed, 111 insertions(+) create mode 100644 fleet_rest_api/pydantic_models/fleet_vehicle_log_services_info.py create mode 100644 fleet_rest_api/pydantic_models/fleet_vehicle_log_services_search_filter.py create mode 100644 fleet_rest_api/services/fleet_vehicle_log_services.py diff --git a/fleet_rest_api/pydantic_models/__init__.py b/fleet_rest_api/pydantic_models/__init__.py index 83591c19..56c6302a 100644 --- a/fleet_rest_api/pydantic_models/__init__.py +++ b/fleet_rest_api/pydantic_models/__init__.py @@ -6,3 +6,5 @@ from . import fleet_vehicle_odometer_search_filter from . import fleet_vehicle_log_contract_info from . import fleet_vehicle_log_contract_search_filter +from . import fleet_vehicle_log_services_info +from . import fleet_vehicle_log_services_search_filter diff --git a/fleet_rest_api/pydantic_models/fleet_vehicle_log_services_info.py b/fleet_rest_api/pydantic_models/fleet_vehicle_log_services_info.py new file mode 100644 index 00000000..6047c2a6 --- /dev/null +++ b/fleet_rest_api/pydantic_models/fleet_vehicle_log_services_info.py @@ -0,0 +1,32 @@ +# Copyright 2021 - TODAY, Marcel Savegnago +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from datetime import date, datetime +from typing import List + +from odoo.addons.pydantic import models, utils + + +class FleetVehicleLogServicesInfo(models.BaseModel): + id: int + active: bool + vehicle_id: int + amount: float + description: str + odometer_id: int + odometer: float + odometer_unit: str + date: date + company_id: int + currency_id: int + purchaser_id: int + inv_ref: str + vendor_id: int + notes: str + service_type_id: int + state: str + write_date: datetime + + class Config: + orm_mode = True + getter_dict = utils.GenericOdooGetter diff --git a/fleet_rest_api/pydantic_models/fleet_vehicle_log_services_search_filter.py b/fleet_rest_api/pydantic_models/fleet_vehicle_log_services_search_filter.py new file mode 100644 index 00000000..b5c971d4 --- /dev/null +++ b/fleet_rest_api/pydantic_models/fleet_vehicle_log_services_search_filter.py @@ -0,0 +1,14 @@ +# Copyright 2021 - TODAY, Marcel Savegnago +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo.addons.pydantic import models + + +class FleetVehicleLogServicesSearchFilter(models.BaseModel): + + id: int = None + service_type_id: int = None + vehicle_id: int = None + purchaser_id: int = None + vendor_id: int = None + state: str = None diff --git a/fleet_rest_api/services/__init__.py b/fleet_rest_api/services/__init__.py index 6425fd00..853a76db 100644 --- a/fleet_rest_api/services/__init__.py +++ b/fleet_rest_api/services/__init__.py @@ -3,3 +3,4 @@ from . import fleet_vehicle_state from . import fleet_vehicle_odometer from . import fleet_vehicle_log_contract +from . import fleet_vehicle_log_services diff --git a/fleet_rest_api/services/fleet_vehicle_log_services.py b/fleet_rest_api/services/fleet_vehicle_log_services.py new file mode 100644 index 00000000..8eb83a10 --- /dev/null +++ b/fleet_rest_api/services/fleet_vehicle_log_services.py @@ -0,0 +1,62 @@ +# Copyright 2021 - TODAY, Marcel Savegnago +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from typing import List + +from odoo.addons.base_rest import restapi +from odoo.addons.base_rest_pydantic.restapi import PydanticModel, PydanticModelList +from odoo.addons.component.core import Component + +from ..pydantic_models.fleet_vehicle_log_services_info import FleetVehicleLogServicesInfo +from ..pydantic_models.fleet_vehicle_log_services_search_filter import ( + FleetVehicleLogServicesSearchFilter, +) + + +class FleetVehicleLogServicesService(Component): + _inherit = "base.fleet.rest.service" + _name = "fleet.vehicle.log.services.rest.service" + _usage = "vehicle_log_services" + _expose_model = "fleet.vehicle.log.services" + _collection = "fleet.rest.services" + _description = __doc__ + + @restapi.method( + routes=[(["/"], "GET")], + output_param=PydanticModel(FleetVehicleLogServicesInfo), + auth="public", + ) + def get(self, _id: int) -> FleetVehicleLogServicesInfo: + fleet_vehicle_log_services = self._get(_id) + return FleetVehicleLogServicesInfo.from_orm(fleet_vehicle_log_services) + + def _get_search_domain(self, filters): + domain = [] + if filters.id: + domain.append(("id", "=", filters.id)) + if filters.service_type_id: + domain.append(("service_type_id", "=", filters.service_type_id)) + if filters.vehicle_id: + domain.append(("vehicle_id", "=", filters.vehicle_id)) + if filters.purchaser_id: + domain.append(("purchaser_id", "=", filters.purchaser_id)) + if filters.vendor_id: + domain.append(("vendor_id", "=", filters.vendor_id)) + if filters.state: + domain.append(("state", "=", filters.state)) + return domain + + @restapi.method( + routes=[(["/", "/search"], "GET")], + input_param=PydanticModel(FleetVehicleLogServicesSearchFilter), + output_param=PydanticModelList(FleetVehicleLogServicesInfo), + auth="public", + ) + def search( + self, fleet_vehicle_log_services_search_filter: FleetVehicleLogServicesSearchFilter + ) -> List[FleetVehicleLogServicesInfo]: + domain = self._get_search_domain(fleet_vehicle_log_services_search_filter) + res: List[FleetVehicleLogServicesInfo] = [] + for e in self.env["fleet.vehicle.log.services"].sudo().search(domain): + res.append(FleetVehicleLogServicesInfo.from_orm(e)) + return res From af2fc8e4195e7c41062d9be62809a399865ffb17 Mon Sep 17 00:00:00 2001 From: Marcel Savegnago Date: Sun, 19 Dec 2021 16:32:25 -0300 Subject: [PATCH 05/13] [ADD] fleet_rest_api: imp fleet_service_type rest service --- fleet_rest_api/pydantic_models/__init__.py | 2 + .../fleet_service_type_info.py | 17 ++++++ .../fleet_service_type_search_filter.py | 11 ++++ fleet_rest_api/services/__init__.py | 1 + fleet_rest_api/services/fleet_service_type.py | 54 +++++++++++++++++++ 5 files changed, 85 insertions(+) create mode 100644 fleet_rest_api/pydantic_models/fleet_service_type_info.py create mode 100644 fleet_rest_api/pydantic_models/fleet_service_type_search_filter.py create mode 100644 fleet_rest_api/services/fleet_service_type.py diff --git a/fleet_rest_api/pydantic_models/__init__.py b/fleet_rest_api/pydantic_models/__init__.py index 56c6302a..ee9ee2ed 100644 --- a/fleet_rest_api/pydantic_models/__init__.py +++ b/fleet_rest_api/pydantic_models/__init__.py @@ -1,3 +1,5 @@ +from . import fleet_service_type_info +from . import fleet_service_type_search_filter from . import fleet_vehicle_info from . import fleet_vehicle_search_filter from . import fleet_vehicle_state_info diff --git a/fleet_rest_api/pydantic_models/fleet_service_type_info.py b/fleet_rest_api/pydantic_models/fleet_service_type_info.py new file mode 100644 index 00000000..a2604947 --- /dev/null +++ b/fleet_rest_api/pydantic_models/fleet_service_type_info.py @@ -0,0 +1,17 @@ +# Copyright 2021 - TODAY, Marcel Savegnago +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from datetime import datetime + +from odoo.addons.pydantic import models, utils + + +class FleetServiceTypeInfo(models.BaseModel): + id: int + name: str + category: str + write_date: datetime + + class Config: + orm_mode = True + getter_dict = utils.GenericOdooGetter diff --git a/fleet_rest_api/pydantic_models/fleet_service_type_search_filter.py b/fleet_rest_api/pydantic_models/fleet_service_type_search_filter.py new file mode 100644 index 00000000..ea89dc84 --- /dev/null +++ b/fleet_rest_api/pydantic_models/fleet_service_type_search_filter.py @@ -0,0 +1,11 @@ +# Copyright 2021 - TODAY, Marcel Savegnago +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo.addons.pydantic import models + + +class FleetServiceTypeSearchFilter(models.BaseModel): + + id: int = None + name: str = None + category: str = None diff --git a/fleet_rest_api/services/__init__.py b/fleet_rest_api/services/__init__.py index 853a76db..c16494a8 100644 --- a/fleet_rest_api/services/__init__.py +++ b/fleet_rest_api/services/__init__.py @@ -1,4 +1,5 @@ from . import service +from . import fleet_service_type from . import fleet_vehicle from . import fleet_vehicle_state from . import fleet_vehicle_odometer diff --git a/fleet_rest_api/services/fleet_service_type.py b/fleet_rest_api/services/fleet_service_type.py new file mode 100644 index 00000000..751c9a63 --- /dev/null +++ b/fleet_rest_api/services/fleet_service_type.py @@ -0,0 +1,54 @@ +# Copyright 2021 - TODAY, Marcel Savegnago +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from typing import List + +from odoo.addons.base_rest import restapi +from odoo.addons.base_rest_pydantic.restapi import PydanticModel, PydanticModelList +from odoo.addons.component.core import Component + +from ..pydantic_models.fleet_service_type_info import FleetServiceTypeInfo +from ..pydantic_models.fleet_service_type_search_filter import ( + FleetServiceTypeSearchFilter, +) + + +class FleetServiceTypeService(Component): + _inherit = "base.fleet.rest.service" + _name = "fleet.service.ype.rest.service" + _usage = "service_type" + _expose_model = "fleet.service.type" + _collection = "fleet.rest.services" + _description = __doc__ + + @restapi.method( + routes=[(["/"], "GET")], + output_param=PydanticModel(FleetServiceTypeInfo), + auth="public", + ) + def get(self, _id: int) -> FleetServiceTypeInfo: + fleet_tag = self._get(_id) + return FleetServiceTypeInfo.from_orm(fleet_tag) + + def _get_search_domain(self, filters): + domain = [] + if filters.id: + domain.append(("id", "=", filters.id)) + if filters.name: + domain.append(("name", "like", filters.name)) + return domain + + @restapi.method( + routes=[(["/", "/search"], "GET")], + input_param=PydanticModel(FleetServiceTypeSearchFilter), + output_param=PydanticModelList(FleetServiceTypeInfo), + auth="public", + ) + def search( + self, fleet_service_type_search_filter: FleetServiceTypeSearchFilter + ) -> List[FleetServiceTypeInfo]: + domain = self._get_search_domain(fleet_service_type_search_filter) + res: List[FleetServiceTypeInfo] = [] + for e in self.env["fleet.service.type"].sudo().search(domain): + res.append(FleetServiceTypeInfo.from_orm(e)) + return res From c67b71a2a1c44f5628b0db7fb537d4b08d583497 Mon Sep 17 00:00:00 2001 From: Marcel Savegnago Date: Sun, 19 Dec 2021 16:32:58 -0300 Subject: [PATCH 06/13] [ADD] fleet_rest_api: imp fleet_vehicle_tag rest service --- fleet_rest_api/pydantic_models/__init__.py | 2 + .../pydantic_models/fleet_vehicle_tag_info.py | 17 ++++++ .../fleet_vehicle_tag_search_filter.py | 10 ++++ fleet_rest_api/services/__init__.py | 1 + fleet_rest_api/services/fleet_vehicle_tag.py | 54 +++++++++++++++++++ 5 files changed, 84 insertions(+) create mode 100644 fleet_rest_api/pydantic_models/fleet_vehicle_tag_info.py create mode 100644 fleet_rest_api/pydantic_models/fleet_vehicle_tag_search_filter.py create mode 100644 fleet_rest_api/services/fleet_vehicle_tag.py diff --git a/fleet_rest_api/pydantic_models/__init__.py b/fleet_rest_api/pydantic_models/__init__.py index ee9ee2ed..a017e3d6 100644 --- a/fleet_rest_api/pydantic_models/__init__.py +++ b/fleet_rest_api/pydantic_models/__init__.py @@ -4,6 +4,8 @@ from . import fleet_vehicle_search_filter from . import fleet_vehicle_state_info from . import fleet_vehicle_state_search_filter +from . import fleet_vehicle_tag_info +from . import fleet_vehicle_tag_search_filter from . import fleet_vehicle_odometer_info from . import fleet_vehicle_odometer_search_filter from . import fleet_vehicle_log_contract_info diff --git a/fleet_rest_api/pydantic_models/fleet_vehicle_tag_info.py b/fleet_rest_api/pydantic_models/fleet_vehicle_tag_info.py new file mode 100644 index 00000000..df867195 --- /dev/null +++ b/fleet_rest_api/pydantic_models/fleet_vehicle_tag_info.py @@ -0,0 +1,17 @@ +# Copyright 2021 - TODAY, Marcel Savegnago +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from datetime import datetime + +from odoo.addons.pydantic import models, utils + + +class FleetVehicleTagInfo(models.BaseModel): + id: int + name: str + color: int + write_date: datetime + + class Config: + orm_mode = True + getter_dict = utils.GenericOdooGetter diff --git a/fleet_rest_api/pydantic_models/fleet_vehicle_tag_search_filter.py b/fleet_rest_api/pydantic_models/fleet_vehicle_tag_search_filter.py new file mode 100644 index 00000000..73fb8b96 --- /dev/null +++ b/fleet_rest_api/pydantic_models/fleet_vehicle_tag_search_filter.py @@ -0,0 +1,10 @@ +# Copyright 2021 - TODAY, Marcel Savegnago +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo.addons.pydantic import models + + +class FleetVehicleTagSearchFilter(models.BaseModel): + + id: int = None + name: str = None diff --git a/fleet_rest_api/services/__init__.py b/fleet_rest_api/services/__init__.py index c16494a8..80a60bc5 100644 --- a/fleet_rest_api/services/__init__.py +++ b/fleet_rest_api/services/__init__.py @@ -2,6 +2,7 @@ from . import fleet_service_type from . import fleet_vehicle from . import fleet_vehicle_state +from . import fleet_vehicle_tag from . import fleet_vehicle_odometer from . import fleet_vehicle_log_contract from . import fleet_vehicle_log_services diff --git a/fleet_rest_api/services/fleet_vehicle_tag.py b/fleet_rest_api/services/fleet_vehicle_tag.py new file mode 100644 index 00000000..95d5ecbb --- /dev/null +++ b/fleet_rest_api/services/fleet_vehicle_tag.py @@ -0,0 +1,54 @@ +# Copyright 2021 - TODAY, Marcel Savegnago +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from typing import List + +from odoo.addons.base_rest import restapi +from odoo.addons.base_rest_pydantic.restapi import PydanticModel, PydanticModelList +from odoo.addons.component.core import Component + +from ..pydantic_models.fleet_vehicle_tag_info import FleetVehicleTagInfo +from ..pydantic_models.fleet_vehicle_tag_search_filter import ( + FleetVehicleTagSearchFilter, +) + + +class FleetVehicleTagService(Component): + _inherit = "base.fleet.rest.service" + _name = "fleet.vehicle.tag.rest.service" + _usage = "vehicle_tag" + _expose_model = "fleet.vehicle.tag" + _collection = "fleet.rest.services" + _description = __doc__ + + @restapi.method( + routes=[(["/"], "GET")], + output_param=PydanticModel(FleetVehicleTagInfo), + auth="public", + ) + def get(self, _id: int) -> FleetVehicleTagInfo: + fleet_vehicle_tag = self._get(_id) + return FleetVehicleTagInfo.from_orm(fleet_vehicle_tag) + + def _get_search_domain(self, filters): + domain = [] + if filters.id: + domain.append(("id", "=", filters.id)) + if filters.name: + domain.append(("name", "like", filters.name)) + return domain + + @restapi.method( + routes=[(["/", "/search"], "GET")], + input_param=PydanticModel(FleetVehicleTagSearchFilter), + output_param=PydanticModelList(FleetVehicleTagInfo), + auth="public", + ) + def search( + self, fleet_vehicle_tag_search_filter: FleetVehicleTagSearchFilter + ) -> List[FleetVehicleTagInfo]: + domain = self._get_search_domain(fleet_vehicle_tag_search_filter) + res: List[FleetVehicleTagInfo] = [] + for e in self.env["fleet.vehicle.tag"].sudo().search(domain): + res.append(FleetVehicleTagInfo.from_orm(e)) + return res From 9c771b1862751a63cb41032070cd1b593f43e07e Mon Sep 17 00:00:00 2001 From: Marcel Savegnago Date: Sun, 19 Dec 2021 16:33:26 -0300 Subject: [PATCH 07/13] [ADD] fleet_rest_api: imp fleet_vehicle_assignation_log rest service --- fleet_rest_api/pydantic_models/__init__.py | 2 + .../fleet_vehicle_assignation_log_info.py | 19 +++++++ ...t_vehicle_assignation_log_search_filter.py | 13 +++++ fleet_rest_api/services/__init__.py | 1 + .../services/fleet_vehicle_assignation_log.py | 56 +++++++++++++++++++ 5 files changed, 91 insertions(+) create mode 100644 fleet_rest_api/pydantic_models/fleet_vehicle_assignation_log_info.py create mode 100644 fleet_rest_api/pydantic_models/fleet_vehicle_assignation_log_search_filter.py create mode 100644 fleet_rest_api/services/fleet_vehicle_assignation_log.py diff --git a/fleet_rest_api/pydantic_models/__init__.py b/fleet_rest_api/pydantic_models/__init__.py index a017e3d6..d67d1e37 100644 --- a/fleet_rest_api/pydantic_models/__init__.py +++ b/fleet_rest_api/pydantic_models/__init__.py @@ -12,3 +12,5 @@ from . import fleet_vehicle_log_contract_search_filter from . import fleet_vehicle_log_services_info from . import fleet_vehicle_log_services_search_filter +from . import fleet_vehicle_assignation_log_info +from . import fleet_vehicle_assignation_log_search_filter diff --git a/fleet_rest_api/pydantic_models/fleet_vehicle_assignation_log_info.py b/fleet_rest_api/pydantic_models/fleet_vehicle_assignation_log_info.py new file mode 100644 index 00000000..c0b7f562 --- /dev/null +++ b/fleet_rest_api/pydantic_models/fleet_vehicle_assignation_log_info.py @@ -0,0 +1,19 @@ +# Copyright 2021 - TODAY, Marcel Savegnago +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from datetime import date, datetime + +from odoo.addons.pydantic import models, utils + + +class FleetVehicleAssignationLogInfo(models.BaseModel): + id: int + vehicle_id: int + driver_id: int + date_start: date + date_end: date + write_date: datetime + + class Config: + orm_mode = True + getter_dict = utils.GenericOdooGetter diff --git a/fleet_rest_api/pydantic_models/fleet_vehicle_assignation_log_search_filter.py b/fleet_rest_api/pydantic_models/fleet_vehicle_assignation_log_search_filter.py new file mode 100644 index 00000000..6063cfd8 --- /dev/null +++ b/fleet_rest_api/pydantic_models/fleet_vehicle_assignation_log_search_filter.py @@ -0,0 +1,13 @@ +# Copyright 2021 - TODAY, Marcel Savegnago +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from datetime import date + +from odoo.addons.pydantic import models + + +class FleetVehicleAssignationLogSearchFilter(models.BaseModel): + + id: int = None + vehicle_id: int = None + driver_id: int = None diff --git a/fleet_rest_api/services/__init__.py b/fleet_rest_api/services/__init__.py index 80a60bc5..9e6eb2d4 100644 --- a/fleet_rest_api/services/__init__.py +++ b/fleet_rest_api/services/__init__.py @@ -6,3 +6,4 @@ from . import fleet_vehicle_odometer from . import fleet_vehicle_log_contract from . import fleet_vehicle_log_services +from . import fleet_vehicle_assignation_log diff --git a/fleet_rest_api/services/fleet_vehicle_assignation_log.py b/fleet_rest_api/services/fleet_vehicle_assignation_log.py new file mode 100644 index 00000000..15ecbbf3 --- /dev/null +++ b/fleet_rest_api/services/fleet_vehicle_assignation_log.py @@ -0,0 +1,56 @@ +# Copyright 2021 - TODAY, Marcel Savegnago +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from typing import List + +from odoo.addons.base_rest import restapi +from odoo.addons.base_rest_pydantic.restapi import PydanticModel, PydanticModelList +from odoo.addons.component.core import Component + +from ..pydantic_models.fleet_vehicle_assignation_log_info import FleetVehicleAssignationLogInfo +from ..pydantic_models.fleet_vehicle_assignation_log_search_filter import ( + FleetVehicleAssignationLogSearchFilter, +) + + +class FleetVehicleAssignationLogService(Component): + _inherit = "base.fleet.rest.service" + _name = "fleet.vehicle.assignation.log.rest.service" + _usage = "vehicle_assignation_log" + _expose_model = "fleet.vehicle.assignation.log" + _collection = "fleet.rest.services" + _description = __doc__ + + @restapi.method( + routes=[(["/"], "GET")], + output_param=PydanticModel(FleetVehicleAssignationLogInfo), + auth="public", + ) + def get(self, _id: int) -> FleetVehicleAssignationLogInfo: + fleet_vehicle_assignation_log = self._get(_id) + return FleetVehicleAssignationLogInfo.from_orm(fleet_vehicle_assignation_log) + + def _get_search_domain(self, filters): + domain = [] + if filters.id: + domain.append(("id", "=", filters.id)) + if filters.vehicle_id: + domain.append(("vehicle_id", "=", filters.vehicle_id)) + if filters.driver_id: + domain.append(("driver_id", "=", filters.driver_id)) + return domain + + @restapi.method( + routes=[(["/", "/search"], "GET")], + input_param=PydanticModel(FleetVehicleAssignationLogSearchFilter), + output_param=PydanticModelList(FleetVehicleAssignationLogInfo), + auth="public", + ) + def search( + self, fleet_vehicle_assignation_log_search_filter: FleetVehicleAssignationLogSearchFilter + ) -> List[FleetVehicleAssignationLogInfo]: + domain = self._get_search_domain(fleet_vehicle_assignation_log_search_filter) + res: List[FleetVehicleAssignationLogInfo] = [] + for e in self.env["fleet.vehicle.assignation.log"].sudo().search(domain): + res.append(FleetVehicleAssignationLogInfo.from_orm(e)) + return res From 8df2e91086f147eb714451064cd8d5d00b42ca3d Mon Sep 17 00:00:00 2001 From: Marcel Savegnago Date: Sun, 19 Dec 2021 17:03:33 -0300 Subject: [PATCH 08/13] [FIX] fleet_rest_api: fleet_vehicle_log_contract_info.py --- .../pydantic_models/fleet_vehicle_log_contract_info.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fleet_rest_api/pydantic_models/fleet_vehicle_log_contract_info.py b/fleet_rest_api/pydantic_models/fleet_vehicle_log_contract_info.py index 05a055ea..e4fb65c4 100644 --- a/fleet_rest_api/pydantic_models/fleet_vehicle_log_contract_info.py +++ b/fleet_rest_api/pydantic_models/fleet_vehicle_log_contract_info.py @@ -1,10 +1,13 @@ # Copyright 2021 - TODAY, Marcel Savegnago # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). +import pydantic + from datetime import date, datetime from typing import List from odoo.addons.pydantic import models, utils +from .fleet_service_type_info import FleetServiceTypeInfo class FleetVehicleLogContractInfo(models.BaseModel): @@ -28,7 +31,7 @@ class FleetVehicleLogContractInfo(models.BaseModel): notes: str cost_generated: float cost_frequency: str - # services_ids: List[int] + services_ids: List[FleetServiceTypeInfo] = pydantic.Field(alias="service_ids") write_date: datetime class Config: From 153f498f5d6161e8cd31a64e06078c2012f641ca Mon Sep 17 00:00:00 2001 From: Marcel Savegnago Date: Sun, 19 Dec 2021 17:27:00 -0300 Subject: [PATCH 09/13] [IMP] fleet_rest_api: fleet_vehicle_info add fields --- .../pydantic_models/fleet_vehicle_info.py | 44 ++++++++++++++++++- 1 file changed, 42 insertions(+), 2 deletions(-) diff --git a/fleet_rest_api/pydantic_models/fleet_vehicle_info.py b/fleet_rest_api/pydantic_models/fleet_vehicle_info.py index d2ef0eec..d8fab1d5 100644 --- a/fleet_rest_api/pydantic_models/fleet_vehicle_info.py +++ b/fleet_rest_api/pydantic_models/fleet_vehicle_info.py @@ -1,7 +1,7 @@ # Copyright 2021 - TODAY, Marcel Savegnago # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -from datetime import datetime +from datetime import date, datetime import pydantic @@ -13,10 +13,50 @@ class FleetVehicleInfo(models.BaseModel): id: int name: str + description: str + active: bool + company_id: int + currency_id: int + license_plate: str + vin_sn: str + driver_id: int + future_driver_id: int + model_id: int + manager_id: int + brand_id: int + # log_drivers + # log_services + # log_contracts + contract_count: int + service_count: int + odometer_count: int + history_count: int + next_assignation_date: date + acquisition_date: date + first_contract_date: date + color: str + state: FleetVehicleStateInfo = pydantic.Field(None, alias="state_id") + location: str + seats: int + model_year: str + # tag_ids odometer: float odometer_unit: str + transmission: str + fuel_type: str + horsepower: int + horsepower_tax: float + power: int + co2: float + contract_renewal_due_soon: bool + contract_renewal_overdue: bool + contract_renewal_name: str + contract_renewal_total: str + car_value: float + net_car_value: float + residual_value: float + plan_to_change_car: bool vehicle_type: str - state: FleetVehicleStateInfo = pydantic.Field(None, alias="state_id") write_date: datetime class Config: From d168ab13eaf00051c62e176636e363e5ee4a97ab Mon Sep 17 00:00:00 2001 From: Marcel Savegnago Date: Sun, 19 Dec 2021 18:07:28 -0300 Subject: [PATCH 10/13] [IMP] fleet_rest_api: fleet_vehicle_info testes --- .../pydantic_models/fleet_vehicle_info.py | 13 +++++++++---- .../fleet_vehicle_log_contract_info.py | 2 +- fleet_rest_api/services/fleet_vehicle.py | 6 ------ 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/fleet_rest_api/pydantic_models/fleet_vehicle_info.py b/fleet_rest_api/pydantic_models/fleet_vehicle_info.py index d8fab1d5..10d6f561 100644 --- a/fleet_rest_api/pydantic_models/fleet_vehicle_info.py +++ b/fleet_rest_api/pydantic_models/fleet_vehicle_info.py @@ -5,9 +5,14 @@ import pydantic +from typing import List from odoo.addons.pydantic import models, utils from .fleet_vehicle_state_info import FleetVehicleStateInfo +from .fleet_vehicle_log_contract_info import FleetVehicleLogContractInfo +from .fleet_vehicle_log_services_info import FleetVehicleLogServicesInfo +from .fleet_vehicle_assignation_log_info import FleetVehicleAssignationLogInfo +from .fleet_vehicle_tag_info import FleetVehicleTagInfo class FleetVehicleInfo(models.BaseModel): @@ -24,9 +29,9 @@ class FleetVehicleInfo(models.BaseModel): model_id: int manager_id: int brand_id: int - # log_drivers - # log_services - # log_contracts + log_drivers: List[FleetVehicleAssignationLogInfo] = pydantic.Field([], alias="log_drivers") + log_services: List[FleetVehicleLogServicesInfo] = pydantic.Field([], alias="log_services") + log_contracts: List[FleetVehicleLogContractInfo] = pydantic.Field([], alias="log_contracts") contract_count: int service_count: int odometer_count: int @@ -39,7 +44,7 @@ class FleetVehicleInfo(models.BaseModel): location: str seats: int model_year: str - # tag_ids + tag_ids: List[FleetVehicleTagInfo] = pydantic.Field([], alias="tag_ids") odometer: float odometer_unit: str transmission: str diff --git a/fleet_rest_api/pydantic_models/fleet_vehicle_log_contract_info.py b/fleet_rest_api/pydantic_models/fleet_vehicle_log_contract_info.py index e4fb65c4..0e2d6a95 100644 --- a/fleet_rest_api/pydantic_models/fleet_vehicle_log_contract_info.py +++ b/fleet_rest_api/pydantic_models/fleet_vehicle_log_contract_info.py @@ -31,7 +31,7 @@ class FleetVehicleLogContractInfo(models.BaseModel): notes: str cost_generated: float cost_frequency: str - services_ids: List[FleetServiceTypeInfo] = pydantic.Field(alias="service_ids") + services_ids: List[FleetServiceTypeInfo] = pydantic.Field([], alias="service_ids") write_date: datetime class Config: diff --git a/fleet_rest_api/services/fleet_vehicle.py b/fleet_rest_api/services/fleet_vehicle.py index 2e075e2b..f6708406 100644 --- a/fleet_rest_api/services/fleet_vehicle.py +++ b/fleet_rest_api/services/fleet_vehicle.py @@ -8,12 +8,6 @@ from odoo.addons.component.core import Component from ..pydantic_models.fleet_vehicle_info import FleetVehicleInfo - -# from ..pydantic_models.fleet_vehicle_registration_info import FleetVehicleRegistrationInfo -# from ..pydantic_models.fleet_vehicle_registration_request import ( -# FleetVehicleRegistrationRequest, -# FleetVehicleRegistrationRequestList, -# ) from ..pydantic_models.fleet_vehicle_search_filter import FleetVehicleSearchFilter From a069f863b2896c3100540d2edfa156cfa94ac0b0 Mon Sep 17 00:00:00 2001 From: Marcel Savegnago Date: Sun, 19 Dec 2021 18:35:06 -0300 Subject: [PATCH 11/13] [FIX] fleet_rest_api: fleet_service_type.py --- fleet_rest_api/services/fleet_service_type.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fleet_rest_api/services/fleet_service_type.py b/fleet_rest_api/services/fleet_service_type.py index 751c9a63..fb277dd7 100644 --- a/fleet_rest_api/services/fleet_service_type.py +++ b/fleet_rest_api/services/fleet_service_type.py @@ -15,7 +15,7 @@ class FleetServiceTypeService(Component): _inherit = "base.fleet.rest.service" - _name = "fleet.service.ype.rest.service" + _name = "fleet.service.type.rest.service" _usage = "service_type" _expose_model = "fleet.service.type" _collection = "fleet.rest.services" From 9a91c8a3ee406408ffecee94eb6d37e2cda60c4f Mon Sep 17 00:00:00 2001 From: Marcel Savegnago Date: Sun, 19 Dec 2021 18:40:31 -0300 Subject: [PATCH 12/13] [FIX] fleet_rest_api: pre-commit --- ...et_vehicle_assignation_log_search_filter.py | 1 - .../pydantic_models/fleet_vehicle_info.py | 18 ++++++++++++------ .../fleet_vehicle_log_contract_info.py | 5 +++-- .../fleet_vehicle_log_services_info.py | 1 - .../services/fleet_vehicle_assignation_log.py | 7 +++++-- .../services/fleet_vehicle_log_contract.py | 7 +++++-- .../services/fleet_vehicle_log_services.py | 7 +++++-- 7 files changed, 30 insertions(+), 16 deletions(-) diff --git a/fleet_rest_api/pydantic_models/fleet_vehicle_assignation_log_search_filter.py b/fleet_rest_api/pydantic_models/fleet_vehicle_assignation_log_search_filter.py index 6063cfd8..b34145a3 100644 --- a/fleet_rest_api/pydantic_models/fleet_vehicle_assignation_log_search_filter.py +++ b/fleet_rest_api/pydantic_models/fleet_vehicle_assignation_log_search_filter.py @@ -1,7 +1,6 @@ # Copyright 2021 - TODAY, Marcel Savegnago # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -from datetime import date from odoo.addons.pydantic import models diff --git a/fleet_rest_api/pydantic_models/fleet_vehicle_info.py b/fleet_rest_api/pydantic_models/fleet_vehicle_info.py index 10d6f561..b35e1959 100644 --- a/fleet_rest_api/pydantic_models/fleet_vehicle_info.py +++ b/fleet_rest_api/pydantic_models/fleet_vehicle_info.py @@ -2,16 +2,16 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). from datetime import date, datetime +from typing import List import pydantic -from typing import List from odoo.addons.pydantic import models, utils -from .fleet_vehicle_state_info import FleetVehicleStateInfo +from .fleet_vehicle_assignation_log_info import FleetVehicleAssignationLogInfo from .fleet_vehicle_log_contract_info import FleetVehicleLogContractInfo from .fleet_vehicle_log_services_info import FleetVehicleLogServicesInfo -from .fleet_vehicle_assignation_log_info import FleetVehicleAssignationLogInfo +from .fleet_vehicle_state_info import FleetVehicleStateInfo from .fleet_vehicle_tag_info import FleetVehicleTagInfo @@ -29,9 +29,15 @@ class FleetVehicleInfo(models.BaseModel): model_id: int manager_id: int brand_id: int - log_drivers: List[FleetVehicleAssignationLogInfo] = pydantic.Field([], alias="log_drivers") - log_services: List[FleetVehicleLogServicesInfo] = pydantic.Field([], alias="log_services") - log_contracts: List[FleetVehicleLogContractInfo] = pydantic.Field([], alias="log_contracts") + log_drivers: List[FleetVehicleAssignationLogInfo] = pydantic.Field( + [], alias="log_drivers" + ) + log_services: List[FleetVehicleLogServicesInfo] = pydantic.Field( + [], alias="log_services" + ) + log_contracts: List[FleetVehicleLogContractInfo] = pydantic.Field( + [], alias="log_contracts" + ) contract_count: int service_count: int odometer_count: int diff --git a/fleet_rest_api/pydantic_models/fleet_vehicle_log_contract_info.py b/fleet_rest_api/pydantic_models/fleet_vehicle_log_contract_info.py index 0e2d6a95..05dfb7e8 100644 --- a/fleet_rest_api/pydantic_models/fleet_vehicle_log_contract_info.py +++ b/fleet_rest_api/pydantic_models/fleet_vehicle_log_contract_info.py @@ -1,12 +1,13 @@ # Copyright 2021 - TODAY, Marcel Savegnago # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -import pydantic - from datetime import date, datetime from typing import List +import pydantic + from odoo.addons.pydantic import models, utils + from .fleet_service_type_info import FleetServiceTypeInfo diff --git a/fleet_rest_api/pydantic_models/fleet_vehicle_log_services_info.py b/fleet_rest_api/pydantic_models/fleet_vehicle_log_services_info.py index 6047c2a6..fcc94a60 100644 --- a/fleet_rest_api/pydantic_models/fleet_vehicle_log_services_info.py +++ b/fleet_rest_api/pydantic_models/fleet_vehicle_log_services_info.py @@ -2,7 +2,6 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). from datetime import date, datetime -from typing import List from odoo.addons.pydantic import models, utils diff --git a/fleet_rest_api/services/fleet_vehicle_assignation_log.py b/fleet_rest_api/services/fleet_vehicle_assignation_log.py index 15ecbbf3..74264e9d 100644 --- a/fleet_rest_api/services/fleet_vehicle_assignation_log.py +++ b/fleet_rest_api/services/fleet_vehicle_assignation_log.py @@ -7,7 +7,9 @@ from odoo.addons.base_rest_pydantic.restapi import PydanticModel, PydanticModelList from odoo.addons.component.core import Component -from ..pydantic_models.fleet_vehicle_assignation_log_info import FleetVehicleAssignationLogInfo +from ..pydantic_models.fleet_vehicle_assignation_log_info import ( + FleetVehicleAssignationLogInfo, +) from ..pydantic_models.fleet_vehicle_assignation_log_search_filter import ( FleetVehicleAssignationLogSearchFilter, ) @@ -47,7 +49,8 @@ def _get_search_domain(self, filters): auth="public", ) def search( - self, fleet_vehicle_assignation_log_search_filter: FleetVehicleAssignationLogSearchFilter + self, + fleet_vehicle_assignation_log_search_filter: FleetVehicleAssignationLogSearchFilter, ) -> List[FleetVehicleAssignationLogInfo]: domain = self._get_search_domain(fleet_vehicle_assignation_log_search_filter) res: List[FleetVehicleAssignationLogInfo] = [] diff --git a/fleet_rest_api/services/fleet_vehicle_log_contract.py b/fleet_rest_api/services/fleet_vehicle_log_contract.py index ded762d7..641ebb8e 100644 --- a/fleet_rest_api/services/fleet_vehicle_log_contract.py +++ b/fleet_rest_api/services/fleet_vehicle_log_contract.py @@ -7,7 +7,9 @@ from odoo.addons.base_rest_pydantic.restapi import PydanticModel, PydanticModelList from odoo.addons.component.core import Component -from ..pydantic_models.fleet_vehicle_log_contract_info import FleetVehicleLogContractInfo +from ..pydantic_models.fleet_vehicle_log_contract_info import ( + FleetVehicleLogContractInfo, +) from ..pydantic_models.fleet_vehicle_log_contract_search_filter import ( FleetVehicleLogContractSearchFilter, ) @@ -49,7 +51,8 @@ def _get_search_domain(self, filters): auth="public", ) def search( - self, fleet_vehicle_log_contract_search_filter: FleetVehicleLogContractSearchFilter + self, + fleet_vehicle_log_contract_search_filter: FleetVehicleLogContractSearchFilter, ) -> List[FleetVehicleLogContractInfo]: domain = self._get_search_domain(fleet_vehicle_log_contract_search_filter) res: List[FleetVehicleLogContractInfo] = [] diff --git a/fleet_rest_api/services/fleet_vehicle_log_services.py b/fleet_rest_api/services/fleet_vehicle_log_services.py index 8eb83a10..cc133758 100644 --- a/fleet_rest_api/services/fleet_vehicle_log_services.py +++ b/fleet_rest_api/services/fleet_vehicle_log_services.py @@ -7,7 +7,9 @@ from odoo.addons.base_rest_pydantic.restapi import PydanticModel, PydanticModelList from odoo.addons.component.core import Component -from ..pydantic_models.fleet_vehicle_log_services_info import FleetVehicleLogServicesInfo +from ..pydantic_models.fleet_vehicle_log_services_info import ( + FleetVehicleLogServicesInfo, +) from ..pydantic_models.fleet_vehicle_log_services_search_filter import ( FleetVehicleLogServicesSearchFilter, ) @@ -53,7 +55,8 @@ def _get_search_domain(self, filters): auth="public", ) def search( - self, fleet_vehicle_log_services_search_filter: FleetVehicleLogServicesSearchFilter + self, + fleet_vehicle_log_services_search_filter: FleetVehicleLogServicesSearchFilter, ) -> List[FleetVehicleLogServicesInfo]: domain = self._get_search_domain(fleet_vehicle_log_services_search_filter) res: List[FleetVehicleLogServicesInfo] = [] From b8773042535649db79ac40da959ee4d6ea826b15 Mon Sep 17 00:00:00 2001 From: Marcel Savegnago Date: Sun, 19 Dec 2021 18:56:26 -0300 Subject: [PATCH 13/13] [IMP] add rest-framework on oca_dependencies.txt --- oca_dependencies.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/oca_dependencies.txt b/oca_dependencies.txt index ca3c726b..b2e375a1 100644 --- a/oca_dependencies.txt +++ b/oca_dependencies.txt @@ -1 +1,2 @@ # See https://github.com/OCA/odoo-community.org/blob/master/website/Contribution/CONTRIBUTING.rst#oca_dependencies-txt +rest-framework https://github.com/acsone/rest-framework 14.0-base-rest-pydantic-lmi