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: replace map_employees with export settings #708

Merged
merged 6 commits into from
Dec 20, 2024
Merged

fix: replace map_employees with export settings #708

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b03b3e1
fix: replace map_employees with export settings
anishfyle Dec 19, 2024
0db881a
map_employees to export settings
anishfyle Dec 20, 2024
0a44f5b
migrations and sql
anishfyle Dec 20, 2024
ad58e73
flake* lint
anishfyle Dec 20, 2024
6926b42
pr comment
anishfyle Dec 20, 2024
9843585
EXPORT_SETTINGS
anishfyle Dec 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
14 changes: 5 additions & 9 deletions apps/workspaces/apis/map_employees/serializers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,20 +28,16 @@ def update(self, instance, validated_data):

workspace_general_settings_instance = WorkspaceGeneralSettings.objects.filter(workspace_id=instance.id).first()

if workspace_general_settings_instance and (workspace_general_settings_instance.employee_field_mapping != workspace_general_settings['employee_field_mapping']):
workspace_general_settings_instance.reimbursable_expenses_object = None
workspace_general_settings_instance.save()

workspace_general_settings_instance, _ = WorkspaceGeneralSettings.objects.update_or_create(
workspace_id=workspace_id, defaults={'employee_field_mapping': workspace_general_settings['employee_field_mapping'], 'auto_map_employees': workspace_general_settings['auto_map_employees']}
workspace_id=workspace_id,
defaults={
'employee_field_mapping': workspace_general_settings['employee_field_mapping'],
'auto_map_employees': workspace_general_settings['auto_map_employees']
}
)

MapEmployeesTriggers.run_workspace_general_settings_triggers(workspace_general_settings_instance)

if instance.onboarding_state == 'MAP_EMPLOYEES':
instance.onboarding_state = 'EXPORT_SETTINGS'
instance.save()

return instance

def validate(self, data):
Expand Down
2 changes: 1 addition & 1 deletion fyle_integrations_imports
Open in desktop
Submodule fyle_integrations_imports updated 7 files
+1 −1 .github/workflows/pr_size.yml
+3 −1 modules/base.py
+5 −3 modules/categories.py
+3 −2 modules/expense_custom_fields.py
+3 −2 modules/projects.py
+4 −2 queues.py
+8 −2 tasks.py
2 changes: 1 addition & 1 deletion sql/functions/e2e-test-setup-workspace-local.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ BEGIN
-- RAISE NOTICE 'Deleted % workspaces', rcount;

UPDATE workspaces
SET onboarding_state = 'MAP_EMPLOYEES', last_synced_at = null
SET onboarding_state = 'EXPORT_SETTINGS', last_synced_at = null
WHERE id = _workspace_id;

UPDATE last_export_details
Expand Down
2 changes: 1 addition & 1 deletion tests/test_workspaces/test_apis/test_map_employee/test_views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
def test_map_employees(api_client, test_connection):

workspace = Workspace.objects.get(id=3)
workspace.onboarding_state = 'MAP_EMPLOYEES'
workspace.onboarding_state = 'EXPORT_SETTINGS'
anishfyle marked this conversation as resolved.
Show resolved Hide resolved
workspace.save()

workspace_general_settings_instance = WorkspaceGeneralSettings.objects.filter(workspace_id=3).first()
Expand Down
Loading