From b4f7d8b463a31402058c9a60e0f77a135b51eb0e Mon Sep 17 00:00:00 2001 From: Joel Davies Date: Thu, 5 Sep 2024 10:43:51 +0000 Subject: [PATCH] Address comment #346 --- test/unit/services/test_item.py | 34 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/test/unit/services/test_item.py b/test/unit/services/test_item.py index 7292d422..b7a4ba7e 100644 --- a/test/unit/services/test_item.py +++ b/test/unit/services/test_item.py @@ -11,14 +11,11 @@ BASE_CATALOGUE_ITEM_DATA_WITH_PROPERTIES, CATALOGUE_CATEGORY_IN_DATA_LEAF_NO_PARENT_NO_PROPERTIES, CATALOGUE_ITEM_DATA_REQUIRED_VALUES_ONLY, - ITEM_DATA_ALL_VALUES_NO_PROPERTIES, - ITEM_DATA_REQUIRED_VALUES_ONLY, - ITEM_DATA_WITH_ALL_PROPERTIES, - ITEM_DATA_WITH_MANDATORY_PROPERTIES_ONLY, - SYSTEM_IN_DATA_NO_PARENT_A, - USAGE_STATUS_IN_DATA_IN_USE, -) -from test.unit.services.conftest import BaseCatalogueServiceDSL, ServiceTestHelpers + ITEM_DATA_ALL_VALUES_NO_PROPERTIES, ITEM_DATA_REQUIRED_VALUES_ONLY, + ITEM_DATA_WITH_ALL_PROPERTIES, ITEM_DATA_WITH_MANDATORY_PROPERTIES_ONLY, + SYSTEM_IN_DATA_NO_PARENT_A, USAGE_STATUS_IN_DATA_IN_USE) +from test.unit.services.conftest import (BaseCatalogueServiceDSL, + ServiceTestHelpers) from typing import List, Optional from unittest.mock import MagicMock, Mock, patch @@ -26,17 +23,19 @@ from bson import ObjectId from inventory_management_system_api.core.exceptions import ( - DatabaseIntegrityError, - InvalidActionError, - MissingRecordError, -) -from inventory_management_system_api.models.catalogue_category import CatalogueCategoryIn, CatalogueCategoryOut -from inventory_management_system_api.models.catalogue_item import CatalogueItemIn, CatalogueItemOut + DatabaseIntegrityError, InvalidActionError, MissingRecordError) +from inventory_management_system_api.models.catalogue_category import ( + CatalogueCategoryIn, CatalogueCategoryOut) +from inventory_management_system_api.models.catalogue_item import ( + CatalogueItemIn, CatalogueItemOut) from inventory_management_system_api.models.item import ItemIn, ItemOut from inventory_management_system_api.models.system import SystemIn, SystemOut -from inventory_management_system_api.models.usage_status import UsageStatusIn, UsageStatusOut -from inventory_management_system_api.schemas.catalogue_item import PropertyPostSchema -from inventory_management_system_api.schemas.item import ItemPatchSchema, ItemPostSchema +from inventory_management_system_api.models.usage_status import ( + UsageStatusIn, UsageStatusOut) +from inventory_management_system_api.schemas.catalogue_item import \ + PropertyPostSchema +from inventory_management_system_api.schemas.item import (ItemPatchSchema, + ItemPostSchema) from inventory_management_system_api.services import utils from inventory_management_system_api.services.item import ItemService @@ -151,7 +150,6 @@ def mock_create( # Catalogue item # When properties are given need to add any property `id`s and ensure the expected data inserts them as well - catalogue_item_property_post_schemas = [] catalogue_item_expected_properties_in = [] if catalogue_item_data and "properties" in catalogue_item_data and catalogue_item_data["properties"]: catalogue_item_expected_properties_in, catalogue_item_property_post_schemas = (