Feat: Add created_by, updated_by to conf tables

apps/fyle/migrations/0041_auto_20241226_1155.py

@@ -0,0 +1,23 @@
+# Generated by Django 3.2.14 on 2024-12-26 11:55
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('fyle', '0040_expense_masked_corporate_card_number'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='expensegroupsettings',
+            name='created_by',
+            field=models.CharField(blank=True, help_text='Email of the user who created this record', max_length=255, null=True),
+        ),
+        migrations.AddField(
+            model_name='expensegroupsettings',
+            name='updated_by',
+            field=models.CharField(blank=True, help_text='Email of the user who last updated this record', max_length=255, null=True),
+        ),
+    ]

apps/fyle/models.py

@@ -13,6 +13,7 @@
 from django.db import models
 from django.db.models import Count, JSONField
 from fyle_accounting_mappings.models import ExpenseAttribute
+from fyle_accounting_mappings.mixins import AutoAddCreateUpdateInfoMixin
 
 from apps.workspaces.models import Workspace, WorkspaceGeneralSettings
 from apps.workspaces.utils import round_amount
@@ -202,7 +203,7 @@ def get_default_expense_state():
     return 'PAYMENT_PROCESSING'
 
 
-class ExpenseGroupSettings(models.Model):
+class ExpenseGroupSettings(AutoAddCreateUpdateInfoMixin, models.Model):
     """
     ExpenseGroupCustomizationSettings
     """
@@ -226,7 +227,7 @@ class Meta:
         db_table = 'expense_group_settings'
 
     @staticmethod
-    def update_expense_group_settings(expense_group_settings: Dict, workspace_id: int):
+    def update_expense_group_settings(expense_group_settings: Dict, workspace_id: int, user):
         settings = ExpenseGroupSettings.objects.get(workspace_id=workspace_id)
         current_reimbursable_settings = list(settings.reimbursable_expense_group_fields)
         current_ccc_settings = list(settings.corporate_credit_card_expense_group_fields)
@@ -302,6 +303,7 @@ def update_expense_group_settings(expense_group_settings: Dict, workspace_id: in
                 'import_card_credits': import_card_credits,
                 'split_expense_grouping': expense_group_settings['split_expense_grouping']
             },
+            user=user
         )
 
 

apps/fyle/views.py

@@ -83,7 +83,7 @@ def get(self, request, *args, **kwargs):
         return Response(data=self.serializer_class(expense_group_settings).data, status=status.HTTP_200_OK)
 
     def post(self, request, *args, **kwargs):
-        expense_group_settings, _ = ExpenseGroupSettings.update_expense_group_settings(request.data, self.kwargs['workspace_id'])
+        expense_group_settings, _ = ExpenseGroupSettings.update_expense_group_settings(request.data, self.kwargs['workspace_id'], request.user)
         return Response(data=self.serializer_class(expense_group_settings).data, status=status.HTTP_200_OK)
 
 

apps/mappings/migrations/0011_auto_20241226_1155.py

@@ -0,0 +1,23 @@
+# Generated by Django 3.2.14 on 2024-12-26 11:55
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('mappings', '0010_auto_20220323_0914'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='generalmapping',
+            name='created_by',
+            field=models.CharField(blank=True, help_text='Email of the user who created this record', max_length=255, null=True),
+        ),
+        migrations.AddField(
+            model_name='generalmapping',
+            name='updated_by',
+            field=models.CharField(blank=True, help_text='Email of the user who last updated this record', max_length=255, null=True),
+        ),
+    ]

apps/mappings/models.py

@@ -4,9 +4,10 @@
 from django.db import models
 
 from apps.workspaces.models import Workspace
+from fyle_accounting_mappings.mixins import AutoAddCreateUpdateInfoMixin
 
 
-class GeneralMapping(models.Model):
+class GeneralMapping(AutoAddCreateUpdateInfoMixin, models.Model):
     """
     General Mappings
     """

apps/workspaces/apis/advanced_configurations/serializers.py

@@ -66,6 +66,9 @@ def get_workspace_id(self, instance):
         return instance.id
 
     def update(self, instance, validated):
+        request = self.context.get('request')
+        user = request.user if request and hasattr(request, 'user') else None
+
         workspace_general_settings = validated.pop('workspace_general_settings')
         general_mappings = validated.pop('general_mappings')
         workspace_schedules = validated.pop('workspace_schedules')
@@ -81,9 +84,10 @@ def update(self, instance, validated):
                 'change_accounting_period': workspace_general_settings.get('change_accounting_period'),
                 'memo_structure': workspace_general_settings.get('memo_structure'),
             },
+            user=user
         )
 
-        GeneralMapping.objects.update_or_create(workspace=instance, defaults={'bill_payment_account_name': general_mappings.get('bill_payment_account').get('name'), 'bill_payment_account_id': general_mappings.get('bill_payment_account').get('id')})
+        GeneralMapping.objects.update_or_create(workspace=instance, defaults={'bill_payment_account_name': general_mappings.get('bill_payment_account').get('name'), 'bill_payment_account_id': general_mappings.get('bill_payment_account').get('id')}, user=user)
 
         schedule_sync(
             workspace_id=instance.id,

apps/workspaces/apis/advanced_configurations/views.py

@@ -9,3 +9,12 @@ class AdvancedConfigurationsView(generics.RetrieveUpdateAPIView):
 
     def get_object(self):
         return Workspace.objects.filter(id=self.kwargs['workspace_id']).first()
+
+    def get_serializer_context(self):
+        """
+        Override to include the request in the serializer context.
+        This allows serializers to access the current user.
+        """
+        context = super().get_serializer_context()
+        context['request'] = self.request
+        return context

apps/workspaces/apis/export_settings/serializers.py

@@ -93,6 +93,9 @@ def get_workspace_id(self, instance):
         return instance.id
 
     def update(self, instance, validated):
+        request = self.context.get('request')
+        user = request.user if request and hasattr(request, 'user') else None
+
         workspace_general_settings = validated.pop('workspace_general_settings')
         expense_group_settings = validated.pop('expense_group_settings')
         general_mappings = validated.pop('general_mappings')
@@ -121,14 +124,15 @@ def update(self, instance, validated):
                 'map_fyle_cards_qbo_account': enable_cards_mapping,
                 'name_in_journal_entry': workspace_general_settings.get('name_in_journal_entry'),
             },
+            user=user
         )
 
         export_trigger = ExportSettingsTrigger(workspace_general_settings, instance.id)
 
         export_trigger.post_save_workspace_general_settings()
 
         if enable_cards_mapping:
-            MappingSetting.objects.update_or_create(destination_field='CREDIT_CARD_ACCOUNT', workspace_id=instance.id, defaults={'source_field': 'CORPORATE_CARD', 'import_to_fyle': False, 'is_custom': False})
+            MappingSetting.objects.update_or_create(destination_field='CREDIT_CARD_ACCOUNT', workspace_id=instance.id, defaults={'source_field': 'CORPORATE_CARD', 'import_to_fyle': False, 'is_custom': False}, user=user)
 
         if not expense_group_settings['reimbursable_expense_group_fields']:
             expense_group_settings['reimbursable_expense_group_fields'] = ['employee_email', 'report_id', 'fund_source']
@@ -151,7 +155,7 @@ def update(self, instance, validated):
         ):
             expense_group_settings['import_card_credits'] = True
 
-        ExpenseGroupSettings.update_expense_group_settings(expense_group_settings, instance.id)
+        ExpenseGroupSettings.update_expense_group_settings(expense_group_settings, instance.id, user)
 
         GeneralMapping.objects.update_or_create(
             workspace=instance,
@@ -169,6 +173,7 @@ def update(self, instance, validated):
                 'default_ccc_vendor_name': general_mappings.get('default_ccc_vendor').get('name'),
                 'default_ccc_vendor_id': general_mappings.get('default_ccc_vendor').get('id'),
             },
+            user=user
         )
 
         if instance.onboarding_state == 'EXPORT_SETTINGS':

apps/workspaces/apis/export_settings/views.py

@@ -9,3 +9,12 @@ class ExportSettingsView(generics.RetrieveUpdateAPIView):
 
     def get_object(self):
         return Workspace.objects.filter(id=self.kwargs['workspace_id']).first()
+
+    def get_serializer_context(self):
+        """
+        Override to include the request in the serializer context.
+        This allows serializers to access the current user.
+        """
+        context = super().get_serializer_context()
+        context['request'] = self.request
+        return context

apps/workspaces/apis/import_settings/serializers.py

@@ -78,6 +78,9 @@ def get_workspace_id(self, instance):
         return instance.id
 
     def update(self, instance, validated):
+        request = self.context.get('request')
+        user = request.user if request and hasattr(request, 'user') else None
+
         workspace_general_settings = validated.pop('workspace_general_settings')
         general_mappings = validated.pop('general_mappings')
         mapping_settings = validated.pop('mapping_settings')
@@ -104,9 +107,10 @@ def update(self, instance, validated):
                 'import_vendors_as_merchants': workspace_general_settings.get('import_vendors_as_merchants'),
                 'import_code_fields': workspace_general_settings.get('import_code_fields'),
             },
+            user=user
         )
 
-        GeneralMapping.objects.update_or_create(workspace=instance, defaults={'default_tax_code_name': general_mappings.get('default_tax_code').get('name'), 'default_tax_code_id': general_mappings.get('default_tax_code').get('id')})
+        GeneralMapping.objects.update_or_create(workspace=instance, defaults={'default_tax_code_name': general_mappings.get('default_tax_code').get('name'), 'default_tax_code_id': general_mappings.get('default_tax_code').get('id')}, user=user)
 
         trigger: ImportSettingsTrigger = ImportSettingsTrigger(workspace_general_settings=workspace_general_settings, mapping_settings=mapping_settings, workspace_id=instance.id)
 
@@ -129,6 +133,7 @@ def update(self, instance, validated):
                         'is_custom': setting['is_custom'] if 'is_custom' in setting else False,
                         'source_placeholder': setting['source_placeholder'] if 'source_placeholder' in setting else None,
                     },
+                    user=user
                 )
 
         trigger.post_save_mapping_settings(workspace_general_settings_instance)

apps/workspaces/apis/import_settings/views.py

@@ -11,6 +11,15 @@ class ImportSettingsView(generics.RetrieveUpdateAPIView):
     def get_object(self):
         return Workspace.objects.filter(id=self.kwargs['workspace_id']).first()
 
+    def get_serializer_context(self):
+        """
+        Override to include the request in the serializer context.
+        This allows serializers to access the current user.
+        """
+        context = super().get_serializer_context()
+        context['request'] = self.request
+        return context
+
 
 class ImportCodeFieldView(generics.GenericAPIView):
     """

apps/workspaces/apis/map_employees/serializers.py

@@ -23,6 +23,9 @@ def get_workspace_id(self, instance):
         return instance.id
 
     def update(self, instance, validated_data):
+        request = self.context.get('request')
+        user = request.user if request and hasattr(request, 'user') else None
+
         workspace_id = instance.id
         workspace_general_settings = validated_data.pop('workspace_general_settings')
 
@@ -33,7 +36,8 @@ def update(self, instance, validated_data):
             defaults={
                 'employee_field_mapping': workspace_general_settings['employee_field_mapping'],
                 'auto_map_employees': workspace_general_settings['auto_map_employees']
-            }
+            },
+            user=user
         )
 
         MapEmployeesTriggers.run_workspace_general_settings_triggers(workspace_general_settings_instance)

apps/workspaces/apis/map_employees/views.py

@@ -9,3 +9,12 @@ class MapEmployeesView(generics.RetrieveUpdateAPIView):
 
     def get_object(self):
         return Workspace.objects.filter(id=self.kwargs['workspace_id']).first()
+
+    def get_serializer_context(self):
+        """
+        Override to include the request in the serializer context.
+        This allows serializers to access the current user.
+        """
+        context = super().get_serializer_context()
+        context['request'] = self.request
+        return context

apps/workspaces/migrations/0050_auto_20241226_1155.py

@@ -0,0 +1,23 @@
+# Generated by Django 3.2.14 on 2024-12-26 11:55
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('workspaces', '0049_auto_20241223_1039'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='workspacegeneralsettings',
+            name='created_by',
+            field=models.CharField(blank=True, help_text='Email of the user who created this record', max_length=255, null=True),
+        ),
+        migrations.AddField(
+            model_name='workspacegeneralsettings',
+            name='updated_by',
+            field=models.CharField(blank=True, help_text='Email of the user who last updated this record', max_length=255, null=True),
+        ),
+    ]

apps/workspaces/models.py

@@ -7,6 +7,8 @@
 from django.db.models import JSONField
 from django_q.models import Schedule
 
+from fyle_accounting_mappings.mixins import AutoAddCreateUpdateInfoMixin
+
 User = get_user_model()
 
 
@@ -90,7 +92,7 @@ def get_default_memo_fields():
     return ['employee_email', 'category', 'spent_on', 'report_number', 'purpose', 'expense_link']
 
 
-class WorkspaceGeneralSettings(models.Model):
+class WorkspaceGeneralSettings(AutoAddCreateUpdateInfoMixin, models.Model):
     """
     Workspace General Settings
     """

requirements.txt

@@ -21,7 +21,7 @@ django-sendgrid-v5==1.2.0
 enum34==1.1.10
 future==0.18.2
 fyle==0.37.2
-fyle-accounting-mappings==1.35.0
+fyle-accounting-mappings==1.36.2
 fyle-integrations-platform-connector==1.39.3
 fyle-rest-auth==1.7.4
 flake8==4.0.1