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

fix: add default value for is_posted_at_null #674

Merged
merged 2 commits into from
Nov 20, 2024
Merged

fix: add default value for is_posted_at_null #674

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
177c392
fix: add default value for is_posted_at_null
anishfyle Nov 20, 2024
ee80f80
fixtures
anishfyle Nov 20, 2024
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
1 change: 1 addition & 0 deletions apps/fyle/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@ def create_expense_objects(expenses: List[Dict], workspace_id, skip_update: bool
'file_ids': expense['file_ids'],
'spent_at': expense['spent_at'],
'posted_at': expense['posted_at'],
'is_posted_at_null': expense['is_posted_at_null'],
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codebase verification

🛠️ Refactor suggestion

Dictionary access should use .get() method for safer handling

Looking at the codebase, direct dictionary access is used for all fields in the expense dictionary, while .get() is used in other parts of the code. Since is_posted_at_null is derived from posted_at, we should use the safer .get() method with a default value derived from the posted_at field.

  • apps/fyle/models.py: Replace direct dictionary access with .get() method
'is_posted_at_null': expense.get('is_posted_at_null', expense['posted_at'] is None),
🔗 Analysis chain

Consider adding validation for is_posted_at_null field

The code assumes that is_posted_at_null will always be present in the expense dictionary. Consider adding validation or a default value to handle cases where this field might be missing from the input data.

-                'is_posted_at_null': expense['is_posted_at_null'],
+                'is_posted_at_null': expense.get('is_posted_at_null', expense['posted_at'] is None),
🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Check if there are any existing error handlers for missing dictionary keys
rg -A 5 "KeyError.*is_posted_at_null"

Length of output: 39

Script:

#!/bin/bash
# Let's check the context around the usage of is_posted_at_null in models.py
rg -B 5 -A 5 "is_posted_at_null" apps/fyle/models.py

# Also check if there are any existing .get() usages for safe dictionary access
rg "expense\.get\(" apps/fyle/models.py

Length of output: 1683

Script:

#!/bin/bash
# Let's check how posted_at is handled in the codebase
rg -B 3 -A 3 "posted_at.*=.*expense\[" apps/fyle/models.py

# Check if there are any other places where dictionary access is done with .get()
rg "\.get\(" apps/fyle/models.py

# Check for any error handling patterns in the create_expense_objects method
ast-grep --pattern 'def create_expense_objects($$$) {
  $$$
  try {
    $$$
  } catch {
    $$$
  }
  $$$
}'

Length of output: 378

'fund_source': SOURCE_ACCOUNT_MAP[expense['source_account_type']],
'verified_at': expense['verified_at'],
'custom_properties': expense['custom_properties'],
Expand Down
1 change: 0 additions & 1 deletion tests/sql_fixtures/reset_db_fixtures/reset_db.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11903,7 +11903,6 @@ SELECT pg_catalog.setval('public.django_content_type_id_seq', 47, true);
-- Name: django_migrations_id_seq; Type: SEQUENCE SET; Schema: public; Owner: postgres
--

SELECT pg_catalog.setval('public.django_migrations_id_seq', 201, true);
SELECT pg_catalog.setval('public.django_migrations_id_seq', 203, true);


Expand Down
16 changes: 13 additions & 3 deletions tests/test_fyle/fixtures.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,7 @@
'Vehicle Type': '',
'Fyle Categories': '',
},
"is_posted_at_null": True
},
{
'id': '1235',
Expand Down Expand Up @@ -320,6 +321,7 @@
'Vehicle Type': '',
'Fyle Categories': '',
},
"is_posted_at_null": True
},
{
'id': '1236',
Expand Down Expand Up @@ -360,6 +362,7 @@
'Vehicle Type': '',
'Fyle Categories': '',
},
"is_posted_at_null": True
},
],
"skipped_expenses":{
Expand All @@ -379,14 +382,16 @@
'amount': 101.0,
'report_id': 'dummy_report_id',
'settlement_id': 'dummy_settlement_id',
'expense_id': 'dummy_expense_id'
'expense_id': 'dummy_expense_id',
"is_posted_at_null": True
},
{
'updated_at': '2021-12-03T11:26:58.702209Z',
'claim_number': ' C/2021/12/R/199',
'employee_email': '[email protected]',
'employee_name': None,
'fund_source': 'CCC'
'fund_source': 'CCC',
"is_posted_at_null": True
}
]
},
Expand Down Expand Up @@ -608,6 +613,7 @@
'Vehicle Type': '',
'Fyle Categories': '',
},
'is_posted_at_null': True
},
{
'id': 'tx6wOnBVaumklol',
Expand Down Expand Up @@ -649,6 +655,7 @@
'Vehicle Type': '',
'Fyle Categories': '',
},
'is_posted_at_null': True
},
],
"expenses": [
Expand Down Expand Up @@ -692,6 +699,7 @@
'Vehicle Type': '',
'Fyle Categories': '',
},
"is_posted_at_null": True
},
{
'id': 'tx6wOnBVaumk',
Expand Down Expand Up @@ -733,6 +741,7 @@
'Vehicle Type': '',
'Fyle Categories': '',
},
"is_posted_at_null": False
},
],
"expense_group_expenses": [
Expand Down Expand Up @@ -807,7 +816,8 @@
"amount": 6377.0,
"report_id": "rp0kaXoqkJle",
"settlement_id": "setPzkM7eyQFd",
"expense_id": "txyZ1zJDQfiK"
"expense_id": "txyZ1zJDQfiK",
"is_posted_at_null": True
}],
},
"expense_group_setting_response": {
Expand Down
Loading