Skip to content

Commit 7cdfcf9

Browse files
igorlgigorlg
authored
Merge pull request #33 from sliedig/sliedig-rename
chore: renaming file names for functions and tests
2 parents 547970b + 535b580 commit 7cdfcf9

24 files changed

+68
-68
lines changed

‎unicorn_contracts/poetry.lock‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎unicorn_contracts/pyproject.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ pytest = "^7.1.2"
1717
pytest-mock = "^3.7.0"
1818
pytest-cov = "^3.0.0"
1919
coverage = "^6.4.2"
20-
requests = "^2.28.1"
20+
requests = "^2.31.0"
2121
moto = "^3.1.17"
2222
importlib-metadata = "^4.12.0"
2323

unicorn_contracts/src/contracts_service/create_contract.py renamed to unicorn_contracts/src/contracts_service/create_contract_function.py

File renamed without changes.

unicorn_contracts/src/contracts_service/update_contract.py renamed to unicorn_contracts/src/contracts_service/update_contract_function.py

File renamed without changes.

‎unicorn_contracts/template.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ Resources:
8787
Type: AWS::Serverless::Function
8888
Properties:
8989
CodeUri: src/
90-
Handler: contracts_service.create_contract.lambda_handler
90+
Handler: contracts_service.create_contract_function.lambda_handler
9191
Policies:
9292
- DynamoDBWritePolicy:
9393
TableName: !Ref ContractsTable
@@ -107,7 +107,7 @@ Resources:
107107
Type: AWS::Serverless::Function
108108
Properties:
109109
CodeUri: src/
110-
Handler: contracts_service.update_contract.lambda_handler
110+
Handler: contracts_service.update_contract_function.lambda_handler
111111
Policies:
112112
- DynamoDBWritePolicy:
113113
TableName: !Ref ContractsTable

unicorn_contracts/tests/unit/test_create_contract.py renamed to unicorn_contracts/tests/unit/test_create_contract_function.py

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ def test_valid_event(dynamodb, eventbridge, mocker):
1818
apigw_event = load_event('events/create_valid_event.json')
1919

2020
# Loading function here so that mocking works correctly.
21-
from contracts_service import create_contract
21+
from contracts_service import create_contract_function
2222

2323
# Reload is required to prevent function setup reuse from another test
24-
reload(create_contract)
24+
reload(create_contract_function)
2525

2626
create_ddb_table_contracts(dynamodb)
2727

2828
context = LambdaContext()
29-
ret = create_contract.lambda_handler(apigw_event, context)
29+
ret = create_contract_function.lambda_handler(apigw_event, context)
3030
data = json.loads(ret["body"])
3131

3232
assert ret["statusCode"] == 200
@@ -37,12 +37,12 @@ def test_valid_event(dynamodb, eventbridge, mocker):
3737
@mock.patch.dict(os.environ, return_env_vars_dict(), clear=True)
3838
def test_missing_body_event(dynamodb, eventbridge, mocker):
3939
apigw_event = load_event('events/create_missing_body_event.json')
40-
from contracts_service import create_contract
41-
reload(create_contract)
40+
from contracts_service import create_contract_function
41+
reload(create_contract_function)
4242
create_ddb_table_contracts(dynamodb)
4343

4444
context = LambdaContext()
45-
ret = create_contract.lambda_handler(apigw_event, context)
45+
ret = create_contract_function.lambda_handler(apigw_event, context)
4646
data = json.loads(ret["body"])
4747

4848
assert ret["statusCode"] == 400
@@ -53,13 +53,13 @@ def test_missing_body_event(dynamodb, eventbridge, mocker):
5353
@mock.patch.dict(os.environ, return_env_vars_dict(), clear=True)
5454
def test_empty_dict_body_event(dynamodb, eventbridge, mocker):
5555
apigw_event = load_event('events/create_empty_dict_body_event.json')
56-
from contracts_service import create_contract
57-
reload(create_contract)
56+
from contracts_service import create_contract_function
57+
reload(create_contract_function)
5858
create_ddb_table_contracts(dynamodb)
5959

6060
context = LambdaContext()
6161

62-
ret = create_contract.lambda_handler(apigw_event, context)
62+
ret = create_contract_function.lambda_handler(apigw_event, context)
6363
data = json.loads(ret["body"])
6464

6565
assert ret["statusCode"] == 400
@@ -70,13 +70,13 @@ def test_empty_dict_body_event(dynamodb, eventbridge, mocker):
7070
@mock.patch.dict(os.environ, return_env_vars_dict(), clear=True)
7171
def test_wrong_event_data(dynamodb, eventbridge, mocker):
7272
apigw_event = load_event('events/create_wrong_event.json')
73-
from contracts_service import create_contract
74-
reload(create_contract)
73+
from contracts_service import create_contract_function
74+
reload(create_contract_function)
7575
create_ddb_table_contracts(dynamodb)
7676

7777
context = LambdaContext()
7878

79-
ret = create_contract.lambda_handler(apigw_event, context)
79+
ret = create_contract_function.lambda_handler(apigw_event, context)
8080
data = json.loads(ret["body"])
8181

8282
assert ret["statusCode"] == 400
@@ -89,9 +89,9 @@ def test_missing_ddb_env_var(dynamodb, eventbridge, mocker):
8989
del os.environ['DYNAMODB_TABLE']
9090
apigw_event = load_event('events/create_valid_event.json')
9191
# Loading function here so that mocking works correctly
92-
from contracts_service import create_contract
92+
from contracts_service import create_contract_function
9393
with pytest.raises(EnvironmentError):
94-
reload(create_contract)
94+
reload(create_contract_function)
9595

9696

9797
@mock.patch.dict(os.environ, return_env_vars_dict(), clear=True)
@@ -117,10 +117,10 @@ def test_missing_sm_env_var(dynamodb, eventbridge, mocker):
117117
@mock.patch.dict(os.environ, return_env_vars_dict({"DYNAMODB_TABLE": "table27"}), clear=True)
118118
def test_wrong_dynamodb_table(dynamodb, eventbridge, mocker):
119119
apigw_event = load_event('events/create_valid_event.json')
120-
from contracts_service import create_contract
121-
reload(create_contract)
120+
from contracts_service import create_contract_function
121+
reload(create_contract_function)
122122
create_ddb_table_contracts(dynamodb)
123123

124124
context = LambdaContext()
125125
with pytest.raises(ClientError):
126-
ret = create_contract.lambda_handler(apigw_event, context)
126+
ret = create_contract_function.lambda_handler(apigw_event, context)

‎unicorn_contracts/tests/unit/test_helper.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,11 @@ def test_get_event_body_bad_json(dynamodb, eventbridge, mocker):
5858
"body": "{\"add\": \"St.1 , Building 10\", \"sell\": \"John Smith\", \"prop\" \"4781231c-bc30-4f30-8b30-7145f4dd1adb\"}"
5959
}
6060

61-
from contracts_service import create_contract
62-
reload(create_contract)
61+
from contracts_service import create_contract_function
62+
reload(create_contract_function)
6363

6464
with pytest.raises(json.decoder.JSONDecodeError):
65-
ret = create_contract.get_event_body(event)
65+
ret = create_contract_function.get_event_body(event)
6666

6767

6868
@mock.patch.dict(os.environ, return_env_vars_dict(), clear=True)
@@ -72,8 +72,8 @@ def test_get_event_body_bad_type(dynamodb, eventbridge, mocker):
7272
"body": 1
7373
}
7474

75-
from contracts_service import create_contract
76-
reload(create_contract)
75+
from contracts_service import create_contract_function
76+
reload(create_contract_function)
7777

7878
with pytest.raises(TypeError):
79-
ret = create_contract.get_event_body(event)
79+
ret = create_contract_function.get_event_body(event)

unicorn_contracts/tests/unit/test_update_contract.py renamed to unicorn_contracts/tests/unit/test_update_contract_function.py

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818
def test_valid_event(dynamodb, eventbridge, mocker):
1919
apigw_event = load_event('events/update_valid_event.json')
2020
# Loading function here so that mocking works correctly
21-
from contracts_service import update_contract
22-
reload(update_contract)
21+
from contracts_service import update_contract_function
22+
reload(update_contract_function)
2323
create_ddb_table_contracts_with_entry(dynamodb)
2424

2525
context = LambdaContext()
26-
ret = update_contract.lambda_handler(apigw_event, context)
26+
ret = update_contract_function.lambda_handler(apigw_event, context)
2727
data = json.loads(ret["body"])
2828

2929
assert ret["statusCode"] == 200
@@ -34,12 +34,12 @@ def test_valid_event(dynamodb, eventbridge, mocker):
3434
@mock.patch.dict(os.environ, return_env_vars_dict(), clear=True)
3535
def test_missing_body_event(dynamodb, eventbridge, mocker):
3636
apigw_event = load_event('events/update_missing_body_event.json')
37-
from contracts_service import update_contract
38-
reload(update_contract)
37+
from contracts_service import update_contract_function
38+
reload(update_contract_function)
3939
create_ddb_table_contracts(dynamodb)
4040

4141
context = LambdaContext()
42-
ret = update_contract.lambda_handler(apigw_event, context)
42+
ret = update_contract_function.lambda_handler(apigw_event, context)
4343
data = json.loads(ret["body"])
4444

4545
assert ret["statusCode"] == 400
@@ -50,13 +50,13 @@ def test_missing_body_event(dynamodb, eventbridge, mocker):
5050
@mock.patch.dict(os.environ, return_env_vars_dict(), clear=True)
5151
def test_empty_dict_body_event(dynamodb, eventbridge, mocker):
5252
apigw_event = load_event('events/update_empty_dict_body_event.json')
53-
from contracts_service import update_contract
54-
reload(update_contract)
53+
from contracts_service import update_contract_function
54+
reload(update_contract_function)
5555
create_ddb_table_contracts(dynamodb)
5656

5757
context = LambdaContext()
5858

59-
ret = update_contract.lambda_handler(apigw_event, context)
59+
ret = update_contract_function.lambda_handler(apigw_event, context)
6060
data = json.loads(ret["body"])
6161

6262
assert ret["statusCode"] == 400
@@ -67,13 +67,13 @@ def test_empty_dict_body_event(dynamodb, eventbridge, mocker):
6767
@mock.patch.dict(os.environ, return_env_vars_dict(), clear=True)
6868
def test_wrong_event_data(dynamodb, eventbridge, mocker):
6969
apigw_event = load_event('events/update_wrong_event.json')
70-
from contracts_service import update_contract
71-
reload(update_contract)
70+
from contracts_service import update_contract_function
71+
reload(update_contract_function)
7272
create_ddb_table_contracts(dynamodb)
7373

7474
context = LambdaContext()
7575

76-
ret = update_contract.lambda_handler(apigw_event, context)
76+
ret = update_contract_function.lambda_handler(apigw_event, context)
7777
data = json.loads(ret["body"])
7878

7979
assert ret["statusCode"] == 400
@@ -86,9 +86,9 @@ def test_missing_ddb_env_var(dynamodb, eventbridge, mocker):
8686
del os.environ['DYNAMODB_TABLE']
8787
apigw_event = load_event('events/update_valid_event.json')
8888
# Loading function here so that mocking works correctly
89-
from contracts_service import update_contract
89+
from contracts_service import update_contract_function
9090
with pytest.raises(EnvironmentError):
91-
reload(update_contract)
91+
reload(update_contract_function)
9292

9393

9494
@mock.patch.dict(os.environ, return_env_vars_dict(), clear=True)
@@ -114,11 +114,11 @@ def test_missing_sm_env_var(dynamodb, eventbridge, mocker):
114114
@mock.patch.dict(os.environ, return_env_vars_dict({"DYNAMODB_TABLE": "table27"}), clear=True)
115115
def test_wrong_dynamodb_table(dynamodb, eventbridge, mocker):
116116
apigw_event = load_event('events/update_valid_event.json')
117-
from contracts_service import update_contract
118-
reload(update_contract)
117+
from contracts_service import update_contract_function
118+
reload(update_contract_function)
119119
create_ddb_table_contracts_with_entry(dynamodb)
120120

121121
context = LambdaContext()
122122
# with pytest.raises(ClientError):
123-
ret = update_contract.lambda_handler(apigw_event, context)
123+
ret = update_contract_function.lambda_handler(apigw_event, context)
124124
assert ret["statusCode"] == 400

‎unicorn_properties/poetry.lock‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎unicorn_properties/pyproject.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ pytest = "^7.1.2"
1919
pytest-mock = "^3.7.0"
2020
pytest-cov = "^3.0.0"
2121
coverage = "^6.4.2"
22-
requests = "^2.28.1"
22+
requests = "^2.31.0"
2323
moto = "^3.1.17"
2424

2525
[build-system]

0 commit comments

Comments
 (0)