Skip to content

Commit f2241c1

Browse files
jaklingerjaklinger
committed
[feature/PI-528-reset_versions_to_v1] collapse versions and deactivate etl tests
1 parent efd21a2 commit f2241c1

File tree

182 files changed

+1923
-8033
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

182 files changed

+1923
-8033
lines changed

‎src/api/createCpmProduct/tests/test_index.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
from unittest import mock
44

55
import pytest
6-
from domain.core.root.v3 import Root
7-
from domain.repository.product_team_repository.v2 import ProductTeamRepository
6+
from domain.core.root import Root
7+
from domain.repository.product_team_repository import ProductTeamRepository
88
from event.json import json_loads
99

1010
from test_helpers.dynamodb import mock_table

‎src/api/createCpmProductForEpr/src/v1/steps.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
read_product_team,
88
)
99
from domain.core.cpm_product import CpmProduct
10-
from domain.core.cpm_system_id.v1 import PartyKeyId
11-
from domain.core.product_key.v1 import ProductKeyType
12-
from domain.core.product_team.v3 import ProductTeam
10+
from domain.core.cpm_system_id import PartyKeyId
11+
from domain.core.product_key import ProductKeyType
12+
from domain.core.product_team import ProductTeam
1313
from domain.repository.cpm_system_id_repository import CpmSystemIdRepository
1414

1515

‎src/api/createCpmProductForEpr/tests/test_index.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
from unittest import mock
55

66
import pytest
7-
from domain.core.cpm_system_id.v1 import PartyKeyId, ProductId
7+
from domain.core.cpm_system_id import PartyKeyId, ProductId
88
from domain.core.enum import Status
9-
from domain.core.root.v3 import Root
10-
from domain.repository.cpm_product_repository.v3 import CpmProductRepository
11-
from domain.repository.product_team_repository.v2 import ProductTeamRepository
9+
from domain.core.root import Root
10+
from domain.repository.cpm_product_repository import CpmProductRepository
11+
from domain.repository.product_team_repository import ProductTeamRepository
1212
from event.json import json_loads
1313

1414
from test_helpers.dynamodb import mock_table

‎src/api/createDevice/src/v1/steps.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
read_product,
77
read_product_team,
88
)
9-
from domain.core.cpm_product.v1 import CpmProduct
10-
from domain.core.device.v3 import Device
11-
from domain.repository.device_repository.v3 import DeviceRepository
12-
from domain.request_models.v1 import CreateDeviceIncomingParams
9+
from domain.core.cpm_product import CpmProduct
10+
from domain.core.device import Device
11+
from domain.repository.device_repository import DeviceRepository
12+
from domain.request_models import CreateDeviceIncomingParams
1313
from domain.response.validation_errors import mark_validation_errors_as_inbound
1414

1515

‎src/api/createDevice/tests/test_index.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
from unittest import mock
88

99
import pytest
10-
from domain.core.cpm_product.v1 import CpmProduct
11-
from domain.core.cpm_system_id.v1 import ProductId
12-
from domain.core.device.v3 import Device
13-
from domain.core.root.v3 import Root
14-
from domain.repository.cpm_product_repository.v3 import CpmProductRepository
15-
from domain.repository.device_repository.v3 import DeviceRepository
16-
from domain.repository.product_team_repository.v2 import ProductTeamRepository
10+
from domain.core.cpm_product import CpmProduct
11+
from domain.core.cpm_system_id import ProductId
12+
from domain.core.device import Device
13+
from domain.core.root import Root
14+
from domain.repository.cpm_product_repository import CpmProductRepository
15+
from domain.repository.device_repository import DeviceRepository
16+
from domain.repository.product_team_repository import ProductTeamRepository
1717
from event.json import json_loads
1818

1919
from test_helpers.dynamodb import mock_table

‎src/api/createDeviceMessageHandlingSystem/src/v1/steps.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@
77
read_product,
88
read_product_team,
99
)
10-
from domain.core.cpm_product.v1 import CpmProduct
11-
from domain.core.device.v3 import Device
10+
from domain.core.cpm_product import CpmProduct
11+
from domain.core.device import Device
1212
from domain.core.error import InvalidSpineMhsResponse
13-
from domain.core.questionnaire.v3 import Questionnaire, QuestionnaireResponse
14-
from domain.repository.device_repository.v3 import DeviceRepository
15-
from domain.repository.questionnaire_repository.v2 import QuestionnaireRepository
16-
from domain.repository.questionnaire_repository.v2.questionnaires import (
13+
from domain.core.questionnaire import Questionnaire, QuestionnaireResponse
14+
from domain.repository.device_repository import DeviceRepository
15+
from domain.repository.questionnaire_repository import (
1716
QuestionnaireInstance,
17+
QuestionnaireRepository,
1818
)
19-
from domain.request_models.v1 import CreateMhsDeviceIncomingParams
19+
from domain.request_models import CreateMhsDeviceIncomingParams
2020
from domain.response.validation_errors import mark_validation_errors_as_inbound
2121

2222

‎src/api/createDeviceMessageHandlingSystem/tests/test_index.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
from unittest import mock
88

99
import pytest
10-
from domain.core.cpm_product.v1 import CpmProduct
11-
from domain.core.cpm_system_id.v1 import ProductId
12-
from domain.core.device.v3 import Device
13-
from domain.core.product_key.v1 import ProductKeyType
14-
from domain.core.root.v3 import Root
15-
from domain.repository.cpm_product_repository.v3 import CpmProductRepository
16-
from domain.repository.device_repository.v3 import DeviceRepository
17-
from domain.repository.product_team_repository.v2 import ProductTeamRepository
10+
from domain.core.cpm_product import CpmProduct
11+
from domain.core.cpm_system_id import ProductId
12+
from domain.core.device import Device
13+
from domain.core.product_key import ProductKeyType
14+
from domain.core.root import Root
15+
from domain.repository.cpm_product_repository import CpmProductRepository
16+
from domain.repository.device_repository import DeviceRepository
17+
from domain.repository.product_team_repository import ProductTeamRepository
1818
from event.json import json_loads
1919

2020
from test_helpers.dynamodb import mock_table

‎src/api/createDeviceReferenceData/src/v1/steps.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
read_product,
77
read_product_team,
88
)
9-
from domain.core.cpm_product.v1 import CpmProduct
10-
from domain.core.device_reference_data.v1 import DeviceReferenceData
11-
from domain.repository.device_reference_data_repository.v1 import (
9+
from domain.core.cpm_product import CpmProduct
10+
from domain.core.device_reference_data import DeviceReferenceData
11+
from domain.repository.device_reference_data_repository import (
1212
DeviceReferenceDataRepository,
1313
)
14-
from domain.request_models.v1 import CreateDeviceReferenceDataIncomingParams
14+
from domain.request_models import CreateDeviceReferenceDataIncomingParams
1515
from domain.response.validation_errors import mark_validation_errors_as_inbound
1616

1717

‎src/api/createDeviceReferenceData/tests/test_index.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77
from unittest import mock
88

99
import pytest
10-
from domain.core.cpm_product.v1 import CpmProduct
11-
from domain.core.cpm_system_id.v1 import ProductId
12-
from domain.core.device_reference_data.v1 import DeviceReferenceData
13-
from domain.core.root.v3 import Root
14-
from domain.repository.cpm_product_repository.v3 import CpmProductRepository
15-
from domain.repository.device_reference_data_repository.v1 import (
10+
from domain.core.cpm_product import CpmProduct
11+
from domain.core.cpm_system_id import ProductId
12+
from domain.core.device_reference_data import DeviceReferenceData
13+
from domain.core.root import Root
14+
from domain.repository.cpm_product_repository import CpmProductRepository
15+
from domain.repository.device_reference_data_repository import (
1616
DeviceReferenceDataRepository,
1717
)
18-
from domain.repository.product_team_repository.v2 import ProductTeamRepository
18+
from domain.repository.product_team_repository import ProductTeamRepository
1919
from event.json import json_loads
2020

2121
from test_helpers.dynamodb import mock_table

‎src/api/createDeviceReferenceDataASActions/src/v1/steps.py

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,20 @@
66
read_product,
77
read_product_team,
88
)
9-
from domain.core.cpm_product.v1 import CpmProduct
10-
from domain.core.device_reference_data.v1 import DeviceReferenceData
9+
from domain.core.cpm_product import CpmProduct
10+
from domain.core.device_reference_data import DeviceReferenceData
1111
from domain.core.error import ConfigurationError
12-
from domain.core.product_key.v1 import ProductKeyType
13-
from domain.core.questionnaire.v3 import Questionnaire, QuestionnaireResponse
14-
from domain.repository.device_reference_data_repository.v1 import (
12+
from domain.core.product_key import ProductKeyType
13+
from domain.core.questionnaire import Questionnaire, QuestionnaireResponse
14+
from domain.repository.device_reference_data_repository import (
1515
DeviceReferenceDataRepository,
1616
)
1717
from domain.repository.errors import AlreadyExistsError
18-
from domain.repository.questionnaire_repository.v2 import QuestionnaireRepository
19-
from domain.repository.questionnaire_repository.v2.questionnaires import (
18+
from domain.repository.questionnaire_repository import (
2019
QuestionnaireInstance,
20+
QuestionnaireRepository,
2121
)
22-
from domain.request_models.v1 import (
23-
CreateDeviceReferenceAdditionalInteractionsDataParams,
24-
)
22+
from domain.request_models import CreateDeviceReferenceAdditionalInteractionsDataParams
2523
from domain.response.validation_errors import mark_validation_errors_as_inbound
2624

2725
DEVICE_NAME_MARKER = "AS Additional Interactions"

0 commit comments

Comments
 (0)