Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactoring. Remove duplicated create_dr_file_to_media function #124

Merged
merged 1 commit into from
Oct 13, 2023
Merged

Refactoring. Remove duplicated create_dr_file_to_media function #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions connect_ext_ppr/tasks_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
validate_pricelist_batch,
)
from connect_ext_ppr.utils import (
create_dr_file_to_media,
create_ppr_to_media,
execute_with_retry,
get_base_workbook,
get_configuration_from_media,
Expand Down Expand Up @@ -175,7 +175,7 @@ def prepare_ppr_file_for_task(
ppr_id=deployment_request.ppr.id,
timestamp=datetime.utcnow().strftime("%s"),
)
create_dr_file_to_media(
create_ppr_to_media(
connect_client,
deployment.account_id,
deployment_request.id,
Expand Down
23 changes: 11 additions & 12 deletions connect_ext_ppr/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,21 +134,20 @@ def create_media_file(
).create(headers=headers, data=content)


def create_ppr_to_media(client, account_id, deployment_id, filename, content, file_size=None):
file_collection = FileCollection.PPR
file_type = MimeTypeChoices.application_vnd_ms_xslx
media_file = create_media_file(
client, account_id, deployment_id, file_collection,
filename, content, file_type, file_size,
)
return json.loads(media_file)


def create_dr_file_to_media(client, account_id, dr_id, filename, content, file_size=None):
def create_ppr_to_media(client, account_id, instance_id, filename, content, file_size=None):
"""Create PPR file in Media service for Deployment or DeploymentRequest
:param client: Connect client
:param account_id: id of account
:param instance_id: id of Deployment or DeploymentRequest
:param filename: name of file
:param content: body of file
:param file_size: size of file
:return: dict with file info
"""
file_collection = FileCollection.PPR
file_type = MimeTypeChoices.application_vnd_ms_xslx
media_file = create_media_file(
client, account_id, dr_id, file_collection,
client, account_id, instance_id, file_collection,
filename, content, file_type, file_size,
)
return json.loads(media_file)
Expand Down
48 changes: 24 additions & 24 deletions tests/test_tasks_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ def send_ppr_side_effect(*args):
return_value=ppr_file_data,
)

create_dr_file_to_media_mock = mocker.patch(
'connect_ext_ppr.tasks_manager.create_dr_file_to_media',
create_ppr_to_media_mock = mocker.patch(
'connect_ext_ppr.tasks_manager.create_ppr_to_media',
)
check_cbc_task_status_mock = mocker.patch(
'connect_ext_ppr.tasks_manager._check_cbc_task_status',
Expand Down Expand Up @@ -126,7 +126,7 @@ def send_ppr_side_effect(*args):

assert get_config_from_media_mock.call_count == 1
assert get_ppr_from_media_mock.call_count == 1
assert create_dr_file_to_media_mock.call_count == 1
assert create_ppr_to_media_mock.call_count == 1
assert send_ppr_mock.call_count == 1
assert check_cbc_task_status_mock.call_count == 1

Expand Down Expand Up @@ -162,8 +162,8 @@ def test_apply_ppr_and_delegate_to_marketplaces_manually(
):

get_from_media_mock = mocker.patch('connect_ext_ppr.tasks_manager.get_ppr_from_media')
create_dr_file_to_media_mock = mocker.patch(
'connect_ext_ppr.tasks_manager.create_dr_file_to_media',
create_ppr_to_media_mock = mocker.patch(
'connect_ext_ppr.tasks_manager.create_ppr_to_media',
)
check_cbc_task_status_mock = mocker.patch(
'connect_ext_ppr.tasks_manager._check_cbc_task_status',
Expand Down Expand Up @@ -202,7 +202,7 @@ def test_apply_ppr_and_delegate_to_marketplaces_manually(
assert dep_m3.ppr_id == ppr.id

assert get_from_media_mock.call_count == 0
assert create_dr_file_to_media_mock.call_count == 0
assert create_ppr_to_media_mock.call_count == 0
assert check_cbc_task_status_mock.call_count == 0


Expand Down Expand Up @@ -248,8 +248,8 @@ def send_ppr_side_effect(*args):
return_value=ppr_file_data,
)

create_dr_file_to_media_mock = mocker.patch(
'connect_ext_ppr.tasks_manager.create_dr_file_to_media',
create_ppr_to_media_mock = mocker.patch(
'connect_ext_ppr.tasks_manager.create_ppr_to_media',
)
check_cbc_task_status_mock = mocker.patch(
'connect_ext_ppr.tasks_manager._check_cbc_task_status',
Expand Down Expand Up @@ -300,7 +300,7 @@ def send_ppr_side_effect(*args):

assert get_config_from_media_mock.call_count == 1
assert get_ppr_from_media_mock.call_count == 1
assert create_dr_file_to_media_mock.call_count == 1
assert create_ppr_to_media_mock.call_count == 1
assert send_ppr_mock.call_count == 1
assert check_cbc_task_status_mock.call_count == 1

Expand Down Expand Up @@ -473,8 +473,8 @@ def test_apply_ppr_and_delegate_to_marketplaces_error_saving_ppr(
)
response = Response()
response.status_code = 404
create_dr_file_to_media_mock = mocker.patch(
'connect_ext_ppr.tasks_manager.create_dr_file_to_media',
create_ppr_to_media_mock = mocker.patch(
'connect_ext_ppr.tasks_manager.create_ppr_to_media',
side_effect=ClientError(response=response, message='Error on create DR file'),
)

Expand Down Expand Up @@ -508,7 +508,7 @@ def test_apply_ppr_and_delegate_to_marketplaces_error_saving_ppr(

assert get_config_from_media_mock.call_count == 1
assert get_ppr_from_media_mock.call_count == 1
assert create_dr_file_to_media_mock.call_count == 1
assert create_ppr_to_media_mock.call_count == 1


@patch.object(CBCService, '__init__', return_value=None)
Expand Down Expand Up @@ -541,8 +541,8 @@ def test_apply_ppr_and_delegate_to_marketplaces_error_sending_ppr(
return_value=ppr_file_data,
)

create_dr_file_to_media_mock = mocker.patch(
'connect_ext_ppr.tasks_manager.create_dr_file_to_media',
create_ppr_to_media_mock = mocker.patch(
'connect_ext_ppr.tasks_manager.create_ppr_to_media',
)
send_ppr_mock = mocker.patch(
'connect_ext_ppr.tasks_manager._send_ppr',
Expand Down Expand Up @@ -578,7 +578,7 @@ def test_apply_ppr_and_delegate_to_marketplaces_error_sending_ppr(

assert get_config_from_media_mock.call_count == 1
assert get_ppr_from_media_mock.call_count == 1
assert create_dr_file_to_media_mock.call_count == 1
assert create_ppr_to_media_mock.call_count == 1
assert send_ppr_mock.call_count == 1


Expand Down Expand Up @@ -768,8 +768,8 @@ def send_ppr_side_effect(*args):
'connect_ext_ppr.tasks_manager.get_ppr_from_media',
return_value=ppr_file_data,
)
create_dr_file_to_media_mock = mocker.patch(
'connect_ext_ppr.tasks_manager.create_dr_file_to_media',
create_ppr_to_media_mock = mocker.patch(
'connect_ext_ppr.tasks_manager.create_ppr_to_media',
)
check_cbc_task_status_mock = mocker.patch(
'connect_ext_ppr.tasks_manager._check_cbc_task_status',
Expand All @@ -783,7 +783,7 @@ def send_ppr_side_effect(*args):
)

assert get_from_media_mock.call_count == 1
assert create_dr_file_to_media_mock.call_count == 1
assert create_ppr_to_media_mock.call_count == 1
assert send_ppr_mock.call_count == 1
assert check_cbc_task_status_mock.call_count == 1

Expand Down Expand Up @@ -811,8 +811,8 @@ def test_delegate_to_l2_manually(
get_from_media_mock = mocker.patch(
'connect_ext_ppr.tasks_manager.get_ppr_from_media',
)
create_dr_file_to_media_mock = mocker.patch(
'connect_ext_ppr.tasks_manager.create_dr_file_to_media',
create_ppr_to_media_mock = mocker.patch(
'connect_ext_ppr.tasks_manager.create_ppr_to_media',
)
check_cbc_task_status_mock = mocker.patch(
'connect_ext_ppr.tasks_manager._check_cbc_task_status',
Expand All @@ -826,7 +826,7 @@ def test_delegate_to_l2_manually(
)

assert get_from_media_mock.call_count == 0
assert create_dr_file_to_media_mock.call_count == 0
assert create_ppr_to_media_mock.call_count == 0
assert send_ppr_mock.call_count == 0
assert check_cbc_task_status_mock.call_count == 0

Expand Down Expand Up @@ -855,8 +855,8 @@ def test_delegate_to_l2_processing_error(
'connect_ext_ppr.tasks_manager.process_ppr_file_for_delelegate_l2',
side_effect=ValueError('Wrong value "Cthulhu"'),
)
create_dr_file_to_media_mock = mocker.patch(
'connect_ext_ppr.tasks_manager.create_dr_file_to_media',
create_ppr_to_media_mock = mocker.patch(
'connect_ext_ppr.tasks_manager.create_ppr_to_media',
)
check_cbc_task_status_mock = mocker.patch(
'connect_ext_ppr.tasks_manager._check_cbc_task_status',
Expand All @@ -873,7 +873,7 @@ def test_delegate_to_l2_processing_error(

assert get_from_media_mock.call_count == 1
assert process_ppr_file_for_delelegate_l2_mock.call_count == 1
assert create_dr_file_to_media_mock.call_count == 0
assert create_ppr_to_media_mock.call_count == 0
assert send_ppr_mock.call_count == 0
assert check_cbc_task_status_mock.call_count == 0

Expand Down