Feat: Add and update regional date setting on Org settings update (#891)

* Feat: Add and update regional date setting on Org settings update

* comment resolved

* covered all lines

* comment resolved

---------

Co-authored-by: Ashutosh619-sudo <ashutosh.s@fyle.com>

Author: Ashutosh619-sudo

apps/fyle/queue.py

@@ -86,6 +86,20 @@ def handle_webhook_callback(body: dict, workspace_id: int) -> None:
         }
         publish_to_rabbitmq(payload=payload, routing_key=RoutingKeyEnum.UTILITY.value)
 
+    elif (
+        action == WebhookCallbackActionEnum.UPDATED.value
+        and resource == 'ORG_SETTING'
+    ):
+        payload = {
+            'workspace_id': workspace_id,
+            'action': WorkerActionEnum.ORG_SETTING_UPDATED.value,
+            'data': {
+                'workspace_id': workspace_id,
+                'org_settings': data
+            }
+        }
+        publish_to_rabbitmq(payload=payload, routing_key=RoutingKeyEnum.UTILITY.value)
+
     elif action in (WebhookCallbackActionEnum.CREATED, WebhookCallbackActionEnum.UPDATED, WebhookCallbackActionEnum.DELETED):
         try:
             fyle_webhook_sync_enabled = FeatureConfig.get_feature_config(workspace_id=workspace_id, key='fyle_webhook_sync_enabled')

apps/fyle/tasks.py

@@ -1015,3 +1015,21 @@ def _handle_expense_ejected_from_report(expense: Expense, expense_data: dict, wo
             delete_expense_group_and_related_data(expense_group, workspace.id)
         else:
             worker_logger.info("Expense group %s still has expenses after removing %s", expense_group.id, expense.expense_id)
+
+
+def handle_org_setting_updated(workspace_id: int, org_settings: dict) -> None:
+    """
+    Update regional date setting on org setting updated
+    :param workspace_id: Workspace id
+    :param org_settings: Org settings
+    :return: None
+    """
+    worker_logger = get_logger()
+    worker_logger.info("Handling org settings update for workspace %s", workspace_id)
+
+    workspace = Workspace.objects.get(id=workspace_id)
+    workspace.org_settings = {
+        'regional_settings': org_settings.get('regional_settings', {})
+    }
+    workspace.save(update_fields=['org_settings', 'updated_at'])
+    worker_logger.info("Updated org settings for workspace %s", workspace.id)

apps/workspaces/migrations/0060_workspace_org_settings.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.27 on 2026-01-12 11:50
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('workspaces', '0059_featureconfig_import_billable_field_for_projects'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='workspace',
+            name='org_settings',
+            field=models.JSONField(default=dict, help_text='Org Settings'),
+        ),
+    ]

apps/workspaces/models.py

@@ -98,6 +98,7 @@ class Workspace(models.Model):
         max_length=50, choices=ONBOARDING_STATE_CHOICES, default=get_default_onboarding_state,
         help_text='Onboarding status of the workspace', null=True
     )
+    org_settings = JSONField(help_text='Org Settings', default=dict)
     created_at = models.DateTimeField(auto_now_add=True, help_text='Created at datetime')
     updated_at = models.DateTimeField(auto_now=True, help_text='Updated at datetime')
 

tests/sql_fixtures/reset_db_fixtures/reset_db.sql

@@ -4,7 +4,7 @@
 
 
 -- Dumped from database version 15.15 (Debian 15.15-1.pgdg13+1)
--- Dumped by pg_dump version 17.6 (Debian 17.6-0+deb13u1)
+-- Dumped by pg_dump version 17.7 (Debian 17.7-0+deb13u1)
 
 SET statement_timeout = 0;
 SET lock_timeout = 0;
@@ -3069,7 +3069,8 @@ CREATE TABLE public.workspaces (
     cluster_domain character varying(255),
     ccc_last_synced_at timestamp with time zone,
     onboarding_state character varying(50),
-    app_version character varying(2) NOT NULL
+    app_version character varying(2) NOT NULL,
+    org_settings jsonb NOT NULL
 );
 
 
@@ -6437,6 +6438,7 @@ COPY public.django_migrations (id, app, name, applied) FROM stdin;
 277	workspaces	0058_remove_sageintacctcredential_refresh_token_and_more	2025-12-16 11:22:38.025898+00
 278	internal	0028_auto_generated_sql	2026-01-08 06:56:29.613764+00
 279	workspaces	0059_featureconfig_import_billable_field_for_projects	2026-01-08 06:56:29.634426+00
+280	workspaces	0060_workspace_org_settings	2026-01-12 12:21:09.648554+00
 \.
 
 
@@ -10410,8 +10412,8 @@ COPY public.workspace_schedules (id, enabled, start_datetime, interval_hours, sc
 -- Data for Name: workspaces; Type: TABLE DATA; Schema: public; Owner: postgres
 --
 
-COPY public.workspaces (id, name, fyle_org_id, last_synced_at, created_at, updated_at, destination_synced_at, source_synced_at, cluster_domain, ccc_last_synced_at, onboarding_state, app_version) FROM stdin;
-1	Fyle For Arkham Asylum	or79Cob97KSh	2022-09-20 08:56:50.098426+00	2022-09-20 08:38:03.352044+00	2022-09-20 08:56:50.098865+00	2022-09-28 11:56:39.11276+00	2022-09-28 11:55:42.90121+00	https://staging.fyle.tech	\N	IMPORT_SETTINGS	v1
+COPY public.workspaces (id, name, fyle_org_id, last_synced_at, created_at, updated_at, destination_synced_at, source_synced_at, cluster_domain, ccc_last_synced_at, onboarding_state, app_version, org_settings) FROM stdin;
+1	Fyle For Arkham Asylum	or79Cob97KSh	2022-09-20 08:56:50.098426+00	2022-09-20 08:38:03.352044+00	2022-09-20 08:56:50.098865+00	2022-09-28 11:56:39.11276+00	2022-09-28 11:55:42.90121+00	https://staging.fyle.tech	\N	IMPORT_SETTINGS	v1	{}
 \.
 
 
@@ -10512,7 +10514,7 @@ SELECT pg_catalog.setval('public.django_content_type_id_seq', 57, true);
 -- Name: django_migrations_id_seq; Type: SEQUENCE SET; Schema: public; Owner: postgres
 --
 
-SELECT pg_catalog.setval('public.django_migrations_id_seq', 279, true);
+SELECT pg_catalog.setval('public.django_migrations_id_seq', 280, true);
 
 
 --

tests/test_fyle/fixtures.py

@@ -7497,5 +7497,46 @@
             'sub_category': '',
             'is_enabled': True
         }
+    },
+    'org_settings': {
+        'org_settings_payload': {
+            'regional_settings': {
+                'locale': {
+                    'date_format': 'DD/MM/YYYY',
+                    'timezone': 'Asia/Kolkata'
+                }
+            },
+            'other_setting': 'should_be_ignored'
+        },
+        'org_settings_payload_without_regional': {
+            'some_other_setting': 'value'
+        },
+        'org_settings_payload_updated': {
+            'regional_settings': {
+                'locale': {
+                    'date_format': 'YYYY-MM-DD',
+                    'timezone': 'Europe/London'
+                }
+            }
+        },
+        'expected_org_settings': {
+            'regional_settings': {
+                'locale': {
+                    'date_format': 'DD/MM/YYYY',
+                    'timezone': 'Asia/Kolkata'
+                }
+            }
+        },
+        'expected_org_settings_empty': {
+            'regional_settings': {}
+        },
+        'expected_org_settings_updated': {
+            'regional_settings': {
+                'locale': {
+                    'date_format': 'YYYY-MM-DD',
+                    'timezone': 'Europe/London'
+                }
+            }
+        }
     }
 }

tests/test_fyle/test_queue.py

@@ -200,3 +200,36 @@ def test_handle_webhook_callback_attribute_exception(db, add_webhook_attribute_d
     handle_webhook_callback(webhook_body, workspace.id)
     mock_processor.assert_called_once()
     mock_logger.error.assert_called_once_with(f'Error processing attribute webhook for workspace {workspace.id}: Test exception')
+
+
+def test_handle_webhook_callback_org_setting_updated(db, mocker):
+    """
+    Test handle_webhook_callback for ORG_SETTING UPDATED action
+    """
+    workspace = Workspace.objects.get(id=1)
+
+    mock_publish = mocker.patch('apps.fyle.queue.publish_to_rabbitmq')
+
+    webhook_body = {
+        'action': 'UPDATED',
+        'resource': 'ORG_SETTING',
+        'data': {
+            'regional_settings': {
+                'locale': {
+                    'date_format': 'DD/MM/YYYY',
+                    'timezone': 'Asia/Kolkata'
+                }
+            }
+        }
+    }
+
+    handle_webhook_callback(webhook_body, workspace.id)
+
+    mock_publish.assert_called_once()
+    call_args = mock_publish.call_args
+    payload = call_args[1]['payload']
+
+    assert payload['workspace_id'] == workspace.id
+    assert payload['action'] == 'UTILITY.ORG_SETTING_UPDATED'
+    assert payload['data']['workspace_id'] == workspace.id
+    assert payload['data']['org_settings'] == webhook_body['data']

tests/test_fyle/test_task.py

@@ -24,6 +24,7 @@
     handle_expense_fund_source_change,
     handle_expense_report_change,
     handle_fund_source_changes_for_expense_ids,
+    handle_org_setting_updated,
     import_and_export_expenses,
     process_expense_group_for_fund_source_update,
     recreate_expense_groups,
@@ -1728,3 +1729,59 @@ def test_update_non_exported_expenses_category_change(mocker, db):
     assert mock_handle_category_changes.call_count == 3
     _, kwargs = mock_handle_category_changes.call_args
     assert kwargs['new_category'] == 'New Cat'
+
+
+def test_handle_org_setting_updated(db):
+    """
+    Test handle_org_setting_updated stores regional_settings in org_settings field
+    """
+    workspace_id = 1
+    workspace = Workspace.objects.get(id=workspace_id)
+
+    workspace.org_settings = {}
+    workspace.save()
+
+    handle_org_setting_updated(
+        workspace_id=workspace_id,
+        org_settings=data['org_settings']['org_settings_payload']
+    )
+
+    workspace.refresh_from_db()
+
+    assert workspace.org_settings == data['org_settings']['expected_org_settings']
+    assert 'other_setting' not in workspace.org_settings
+
+
+def test_handle_org_setting_updated_empty_regional_settings(db):
+    """
+    Test handle_org_setting_updated when regional_settings is empty or missing
+    """
+    workspace_id = 1
+    workspace = Workspace.objects.get(id=workspace_id)
+
+    handle_org_setting_updated(
+        workspace_id=workspace_id,
+        org_settings=data['org_settings']['org_settings_payload_without_regional']
+    )
+
+    workspace.refresh_from_db()
+    assert workspace.org_settings == data['org_settings']['expected_org_settings_empty']
+
+
+def test_handle_org_setting_updated_overwrites_existing(db):
+    """
+    Test handle_org_setting_updated overwrites existing org_settings
+    """
+    workspace_id = 1
+    workspace = Workspace.objects.get(id=workspace_id)
+
+    workspace.org_settings = data['org_settings']['expected_org_settings']
+    workspace.save()
+
+    handle_org_setting_updated(
+        workspace_id=workspace_id,
+        org_settings=data['org_settings']['org_settings_payload_updated']
+    )
+
+    workspace.refresh_from_db()
+    assert workspace.org_settings == data['org_settings']['expected_org_settings_updated']

tests/test_workspaces/fixtures.py

@@ -51,6 +51,7 @@
         "user": [1],
         "onboarding_state": "COMPLETE",
         "app_version": "v1",
+        "org_settings": {},
     },
     "expenses": [
         {

workers/helpers.py

@@ -42,6 +42,7 @@ class WorkerActionEnum(str, Enum):
     CHECK_INTERVAL_AND_SYNC_SAGE_INTACCT_DIMENSION = 'IMPORT.CHECK_INTERVAL_AND_SYNC_SAGE_INTACCT_DIMENSION'
     CHECK_SAGE_INTACCT_OBJECT_STATUS_AND_PROCESS_FYLE_REIMBURSEMENTS = 'EXPORT.P1.CHECK_SAGE_INTACCT_OBJECT_STATUS_AND_PROCESS_FYLE_REIMBURSEMENTS'
     EXPENSE_ADDED_EJECTED_FROM_REPORT = 'UTILITY.EXPENSE_ADDED_EJECTED_FROM_REPORT'
+    ORG_SETTING_UPDATED = 'UTILITY.ORG_SETTING_UPDATED'
 
 
 QUEUE_BINDKEY_MAP = {
@@ -76,6 +77,7 @@ class WorkerActionEnum(str, Enum):
     WorkerActionEnum.CHECK_INTERVAL_AND_SYNC_SAGE_INTACCT_DIMENSION: 'apps.sage_intacct.helpers.check_interval_and_sync_dimension',
     WorkerActionEnum.CHECK_SAGE_INTACCT_OBJECT_STATUS_AND_PROCESS_FYLE_REIMBURSEMENTS: 'apps.sage_intacct.tasks.check_sage_intacct_object_status_and_process_fyle_reimbursements',
     WorkerActionEnum.EXPENSE_ADDED_EJECTED_FROM_REPORT: 'apps.fyle.tasks.handle_expense_report_change',
+    WorkerActionEnum.ORG_SETTING_UPDATED: 'apps.fyle.tasks.handle_org_setting_updated',
 }