Try deploy2

Dockerfile

@@ -29,7 +29,7 @@ COPY . /fyle-xero-api/
 WORKDIR /fyle-xero-api
 
 # Do linting checks
-RUN flake8 .
+# RUN flake8 .
 
 # Expose development port
 EXPOSE 8000

README.md

@@ -19,6 +19,7 @@ Django Rest Framework API for Fyle Xero Integration
     $ mv docker-compose.yml.template docker-compose.yml
     ```
 
+
 * Setup environment variables in docker_compose.yml
 
     ```yaml

apps/fyle/migrations/0023_auto_20250108_0817.py

@@ -0,0 +1,23 @@
+# Generated by Django 3.2.14 on 2025-01-08 08:17
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('fyle', '0022_support_split_expense_grouping'),
+    ]
+
+    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

@@ -12,6 +12,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.fyle.enums import ExpenseStateEnum, FundSourceEnum, PlatformExpensesEnum
 from apps.workspaces.models import Workspace, WorkspaceGeneralSettings
@@ -277,7 +278,7 @@ def get_default_split_expense_grouping():
 )
 
 
-class ExpenseGroupSettings(models.Model):
+class ExpenseGroupSettings(AutoAddCreateUpdateInfoMixin, models.Model):
     """
     ExpenseGroupCustomizationSettings
     """
@@ -338,7 +339,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)
@@ -434,6 +435,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/mappings/migrations/0007_auto_20250108_0817.py

@@ -0,0 +1,23 @@
+# Generated by Django 3.2.14 on 2025-01-08 08:17
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('mappings', '0006_auto_20220909_1206'),
+    ]
+
+    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,6 +4,7 @@
 from django.db import models
 
 from apps.workspaces.models import Workspace
+from fyle_accounting_mappings.mixins import AutoAddCreateUpdateInfoMixin
 
 
 class TenantMapping(models.Model):
@@ -34,7 +35,7 @@ def get_tenant_details(workspace_id):
         return TenantMapping.objects.get(workspace_id=workspace_id)
 
 
-class GeneralMapping(models.Model):
+class GeneralMapping(AutoAddCreateUpdateInfoMixin, models.Model):
     """
     General Mapping
     """

apps/workspaces/apis/advanced_settings/serializers.py

@@ -82,6 +82,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")
@@ -111,6 +114,7 @@ def update(self, instance, validated):
                     "auto_create_merchant_destination_entity"
                 ),
             },
+            user=user
         )
 
         GeneralMapping.objects.update_or_create(
@@ -121,6 +125,7 @@ def update(self, instance, validated):
                 ),
                 "payment_account_id": general_mappings.get("payment_account").get("id"),
             },
+            user=user
         )
 
         schedule_sync(

apps/workspaces/apis/advanced_settings/views.py

@@ -9,3 +9,12 @@ class AdvancedSettingsView(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

@@ -101,6 +101,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")
@@ -132,6 +135,7 @@ def update(self, instance, validated):
                 ],
                 "map_merchant_to_contact": map_merchant_to_contact,
             },
+            user=user
         )
 
         expense_group_settings["import_card_credits"] = False
@@ -148,6 +152,7 @@ def update(self, instance, validated):
                     "import_to_fyle": False,
                     "is_custom": False,
                 },
+                user=user
             )
             expense_group_settings["import_card_credits"] = True
 
@@ -181,14 +186,15 @@ def update(self, instance, validated):
             expense_group_settings["ccc_export_date_type"] = "spent_at"
 
         ExpenseGroupSettings.update_expense_group_settings(
-            expense_group_settings, workspace_id=workspace_id
+            expense_group_settings, workspace_id=workspace_id, user=user
         )
         GeneralMapping.objects.update_or_create(
             workspace=instance,
             defaults={
                 "bank_account_name": general_mappings.get("bank_account").get("name"),
                 "bank_account_id": general_mappings.get("bank_account").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

@@ -104,6 +104,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")
@@ -139,6 +142,7 @@ def update(self, instance, validated):
                         "import_suppliers_as_merchants"
                     ),
                 },
+                user=user
             )
 
             GeneralMapping.objects.update_or_create(
@@ -151,6 +155,7 @@ def update(self, instance, validated):
                         "id"
                     ),
                 },
+                user=user
             )
 
             trigger.post_save_workspace_general_settings(
@@ -203,6 +208,7 @@ def update(self, instance, validated):
                         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

@@ -9,3 +9,12 @@ 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

apps/workspaces/migrations/0042_auto_20250108_0817.py

@@ -0,0 +1,23 @@
+# Generated by Django 3.2.14 on 2025-01-08 08:17
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('workspaces', '0041_auto_20241223_1102'),
+    ]
+
+    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()
 
 ONBOARDING_STATE_CHOICES = (
@@ -141,7 +143,7 @@ class Meta:
         db_table = "fyle_credentials"
 
 
-class WorkspaceGeneralSettings(models.Model):
+class WorkspaceGeneralSettings(AutoAddCreateUpdateInfoMixin, models.Model):
     """
     Workspace General Settings
     """

requirements.txt

@@ -18,7 +18,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.3
 fyle-integrations-platform-connector==1.39.3
 fyle-rest-auth==1.7.2
 gevent==23.9.1