From b69cbd60af73c402f8a293695364cf1128436492 Mon Sep 17 00:00:00 2001 From: behruz-dev Date: Thu, 25 Sep 2025 18:59:27 +0500 Subject: [PATCH] add: add chat for income and expence --- core/apps/finance/admin/__init__.py | 2 + core/apps/finance/admin/expence_chat.py | 13 +++++ core/apps/finance/admin/income_chat.py | 13 +++++ core/apps/finance/apps.py | 3 ++ .../0029_expencechat_expencemessage.py | 46 +++++++++++++++++ .../0030_incomechat_incomemessage.py | 46 +++++++++++++++++ core/apps/finance/models/__init__.py | 4 +- core/apps/finance/models/expence_chat.py | 30 +++++++++++ core/apps/finance/models/income_chat.py | 30 +++++++++++ core/apps/finance/serializers/expence.py | 2 +- core/apps/finance/serializers/expence_chat.py | 40 +++++++++++++++ core/apps/finance/serializers/income.py | 2 +- core/apps/finance/serializers/income_chat.py | 40 +++++++++++++++ core/apps/finance/signals/__init__.py | 2 + core/apps/finance/signals/expence.py | 13 +++++ core/apps/finance/signals/income.py | 13 +++++ core/apps/finance/urls.py | 24 ++++++++- core/apps/finance/views/expence_chat.py | 51 +++++++++++++++++++ core/apps/finance/views/income_chat.py | 51 +++++++++++++++++++ 19 files changed, 421 insertions(+), 4 deletions(-) create mode 100644 core/apps/finance/admin/expence_chat.py create mode 100644 core/apps/finance/admin/income_chat.py create mode 100644 core/apps/finance/migrations/0029_expencechat_expencemessage.py create mode 100644 core/apps/finance/migrations/0030_incomechat_incomemessage.py create mode 100644 core/apps/finance/models/expence_chat.py create mode 100644 core/apps/finance/models/income_chat.py create mode 100644 core/apps/finance/serializers/expence_chat.py create mode 100644 core/apps/finance/serializers/income_chat.py create mode 100644 core/apps/finance/signals/__init__.py create mode 100644 core/apps/finance/signals/expence.py create mode 100644 core/apps/finance/signals/income.py create mode 100644 core/apps/finance/views/expence_chat.py create mode 100644 core/apps/finance/views/income_chat.py diff --git a/core/apps/finance/admin/__init__.py b/core/apps/finance/admin/__init__.py index 43e55ae..352048e 100644 --- a/core/apps/finance/admin/__init__.py +++ b/core/apps/finance/admin/__init__.py @@ -6,3 +6,5 @@ from .expence_type import * from .expence import * from .expence_contract import * from .income_contract import * +from .expence_chat import * +from .income_chat import * \ No newline at end of file diff --git a/core/apps/finance/admin/expence_chat.py b/core/apps/finance/admin/expence_chat.py new file mode 100644 index 0000000..6875057 --- /dev/null +++ b/core/apps/finance/admin/expence_chat.py @@ -0,0 +1,13 @@ +from django.contrib import admin + +from core.apps.finance.models.expence_chat import ExpenceChat, ExpenceMessage + + +@admin.register(ExpenceChat) +class ExpenceChatAmin(admin.ModelAdmin): + list_display = ['id', 'expence'] + + +@admin.register(ExpenceMessage) +class ExpenceChatAmin(admin.ModelAdmin): + list_display = ['id', 'user', 'chat'] \ No newline at end of file diff --git a/core/apps/finance/admin/income_chat.py b/core/apps/finance/admin/income_chat.py new file mode 100644 index 0000000..139bec1 --- /dev/null +++ b/core/apps/finance/admin/income_chat.py @@ -0,0 +1,13 @@ +from django.contrib import admin + +from core.apps.finance.models.income_chat import IncomeChat, IncomeMessage + + +@admin.register(IncomeChat) +class IncomeChatAmin(admin.ModelAdmin): + list_display = ['id', 'income'] + + +@admin.register(IncomeMessage) +class IncomeMessageAmin(admin.ModelAdmin): + list_display = ['id', 'user', 'chat'] \ No newline at end of file diff --git a/core/apps/finance/apps.py b/core/apps/finance/apps.py index a18cd50..194d9ce 100644 --- a/core/apps/finance/apps.py +++ b/core/apps/finance/apps.py @@ -4,3 +4,6 @@ from django.apps import AppConfig class FinanceConfig(AppConfig): default_auto_field = 'django.db.models.BigAutoField' name = 'core.apps.finance' + + def ready(self): + from . import signals \ No newline at end of file diff --git a/core/apps/finance/migrations/0029_expencechat_expencemessage.py b/core/apps/finance/migrations/0029_expencechat_expencemessage.py new file mode 100644 index 0000000..39f947c --- /dev/null +++ b/core/apps/finance/migrations/0029_expencechat_expencemessage.py @@ -0,0 +1,46 @@ +# Generated by Django 5.2.4 on 2025-09-25 18:16 + +import django.db.models.deletion +import uuid +from django.conf import settings +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('finance', '0028_income_is_deleted'), + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ] + + operations = [ + migrations.CreateModel( + name='ExpenceChat', + fields=[ + ('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False, unique=True)), + ('created_at', models.DateTimeField(auto_now_add=True)), + ('updated_at', models.DateTimeField(auto_now=True)), + ('expence', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='expence_chats', to='finance.expence')), + ], + options={ + 'verbose_name': 'Chiqim chat', + 'verbose_name_plural': 'Chiqim chatlari', + }, + ), + migrations.CreateModel( + name='ExpenceMessage', + fields=[ + ('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False, unique=True)), + ('created_at', models.DateTimeField(auto_now_add=True)), + ('updated_at', models.DateTimeField(auto_now=True)), + ('file', models.FileField(blank=True, null=True, upload_to='finanice/expence/message/')), + ('message', models.CharField(blank=True, max_length=250, null=True)), + ('chat', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='expence_messages', to='finance.expencechat')), + ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='expence_messages', to=settings.AUTH_USER_MODEL)), + ], + options={ + 'verbose_name': 'Chiqim xabari', + 'verbose_name_plural': 'Chiqim xabarlari', + }, + ), + ] diff --git a/core/apps/finance/migrations/0030_incomechat_incomemessage.py b/core/apps/finance/migrations/0030_incomechat_incomemessage.py new file mode 100644 index 0000000..d207a26 --- /dev/null +++ b/core/apps/finance/migrations/0030_incomechat_incomemessage.py @@ -0,0 +1,46 @@ +# Generated by Django 5.2.4 on 2025-09-25 18:57 + +import django.db.models.deletion +import uuid +from django.conf import settings +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('finance', '0029_expencechat_expencemessage'), + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ] + + operations = [ + migrations.CreateModel( + name='IncomeChat', + fields=[ + ('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False, unique=True)), + ('created_at', models.DateTimeField(auto_now_add=True)), + ('updated_at', models.DateTimeField(auto_now=True)), + ('income', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='income_chat', to='finance.income')), + ], + options={ + 'verbose_name': 'Kirim chat', + 'verbose_name_plural': 'Kirim chatlari', + }, + ), + migrations.CreateModel( + name='IncomeMessage', + fields=[ + ('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False, unique=True)), + ('created_at', models.DateTimeField(auto_now_add=True)), + ('updated_at', models.DateTimeField(auto_now=True)), + ('file', models.FileField(blank=True, null=True, upload_to='finanice/income/message/')), + ('message', models.CharField(blank=True, max_length=250, null=True)), + ('chat', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='income_messages', to='finance.incomechat')), + ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='income_messages', to=settings.AUTH_USER_MODEL)), + ], + options={ + 'verbose_name': 'Chiqim xabari', + 'verbose_name_plural': 'Chiqim xabarlari', + }, + ), + ] diff --git a/core/apps/finance/models/__init__.py b/core/apps/finance/models/__init__.py index 5b9fe08..dedff30 100644 --- a/core/apps/finance/models/__init__.py +++ b/core/apps/finance/models/__init__.py @@ -5,4 +5,6 @@ from .income import * from .expence_type import * from .expence import * from .income_contract import * -from .expence_contract import * \ No newline at end of file +from .expence_contract import * +from .expence_chat import * +from .income_chat import * \ No newline at end of file diff --git a/core/apps/finance/models/expence_chat.py b/core/apps/finance/models/expence_chat.py new file mode 100644 index 0000000..052dbbb --- /dev/null +++ b/core/apps/finance/models/expence_chat.py @@ -0,0 +1,30 @@ +from django.db import models + +from core.apps.shared.models import BaseModel +from core.apps.finance.models import Expence +from core.apps.accounts.models import User + + +class ExpenceChat(BaseModel): + expence = models.OneToOneField(Expence, on_delete=models.CASCADE, related_name='expence_chats') + + def __str__(self): + return f'{self.expence} chat' + + class Meta: + verbose_name = 'Chiqim chat' + verbose_name_plural = 'Chiqim chatlari' + + +class ExpenceMessage(BaseModel): + user = models.ForeignKey(User, on_delete=models.CASCADE, related_name='expence_messages') + chat = models.ForeignKey(ExpenceChat, on_delete=models.CASCADE, related_name='expence_messages') + file = models.FileField(upload_to='finanice/expence/message/', null=True, blank=True) + message = models.CharField(max_length=250, null=True, blank=True) + + def __str__(self): + return f'message from {self.user} for {self.chat}' + + class Meta: + verbose_name = 'Chiqim xabari' + verbose_name_plural = 'Chiqim xabarlari' \ No newline at end of file diff --git a/core/apps/finance/models/income_chat.py b/core/apps/finance/models/income_chat.py new file mode 100644 index 0000000..4b7b87b --- /dev/null +++ b/core/apps/finance/models/income_chat.py @@ -0,0 +1,30 @@ +from django.db import models + +from core.apps.shared.models import BaseModel +from core.apps.finance.models import Income +from core.apps.accounts.models import User + + +class IncomeChat(BaseModel): + income = models.OneToOneField(Income, on_delete=models.CASCADE, related_name='income_chat') + + def __str__(self): + return f'{self.income} chat' + + class Meta: + verbose_name = 'Kirim chat' + verbose_name_plural = 'Kirim chatlari' + + +class IncomeMessage(BaseModel): + user = models.ForeignKey(User, on_delete=models.CASCADE, related_name='income_messages') + chat = models.ForeignKey(IncomeChat, on_delete=models.CASCADE, related_name='income_messages') + file = models.FileField(upload_to='finanice/income/message/', null=True, blank=True) + message = models.CharField(max_length=250, null=True, blank=True) + + def __str__(self): + return f'message from {self.user} for {self.chat}' + + class Meta: + verbose_name = 'Chiqim xabari' + verbose_name_plural = 'Chiqim xabarlari' \ No newline at end of file diff --git a/core/apps/finance/serializers/expence.py b/core/apps/finance/serializers/expence.py index 12cb9d3..8aa4bd4 100644 --- a/core/apps/finance/serializers/expence.py +++ b/core/apps/finance/serializers/expence.py @@ -89,7 +89,7 @@ class ExpenceListSerializer(serializers.ModelSerializer): fields = [ 'id', 'cash_transaction', 'payment_type', 'project_folder', 'project', 'expence_type', 'counterparty', 'price', 'exchange_rate', 'currency', 'date', 'comment', 'audit', 'file', - 'user' + 'user', 'expence_chats', ] def get_user(self, obj): diff --git a/core/apps/finance/serializers/expence_chat.py b/core/apps/finance/serializers/expence_chat.py new file mode 100644 index 0000000..6287170 --- /dev/null +++ b/core/apps/finance/serializers/expence_chat.py @@ -0,0 +1,40 @@ +from django.db import transaction + +from rest_framework import serializers + +from core.apps.finance.models import Expence, ExpenceChat, ExpenceMessage + + +class ExpenceMessageListSerializer(serializers.ModelSerializer): + user = serializers.SerializerMethodField(method_name='get_user') + + class Meta: + model = ExpenceMessage + fields = [ + 'id', 'user', 'message', 'file' + ] + + def get_user(self, obj): + return { + 'id': obj.user.id, + 'full_name': obj.user.full_name, + 'profile_image': obj.user.profile_image.url if obj.user.profile_image else None, + } + + +class ExpenceMessageCreateSerializer(serializers.ModelSerializer): + class Meta: + model = ExpenceMessage + fields = [ + 'message', 'file', 'chat' + ] + + def create(self, validated_data): + with transaction.atomic(): + return ExpenceMessage.objects.create( + message=validated_data.get('message'), + file=validated_data.get('file'), + user=self.context.get('user'), + chat=validated_data.get('chat'), + ) + \ No newline at end of file diff --git a/core/apps/finance/serializers/income.py b/core/apps/finance/serializers/income.py index b6b75ac..7ea3861 100644 --- a/core/apps/finance/serializers/income.py +++ b/core/apps/finance/serializers/income.py @@ -19,7 +19,7 @@ class IncomeListSerializer(serializers.ModelSerializer): fields = [ 'id', 'cash_transaction', 'payment_type', 'project_folder', 'project', 'counterparty', 'type_income', 'currency', 'price', 'exchange_rate', 'date', - 'comment', 'file', 'audit', 'user' + 'comment', 'file', 'audit', 'user', 'income_chat' ] def get_cash_transaction(self, obj): diff --git a/core/apps/finance/serializers/income_chat.py b/core/apps/finance/serializers/income_chat.py new file mode 100644 index 0000000..1e4c193 --- /dev/null +++ b/core/apps/finance/serializers/income_chat.py @@ -0,0 +1,40 @@ +from django.db import transaction + +from rest_framework import serializers + +from core.apps.finance.models import IncomeMessage + + +class IncomeMessageListSerializer(serializers.ModelSerializer): + user = serializers.SerializerMethodField(method_name='get_user') + + class Meta: + model = IncomeMessage + fields = [ + 'id', 'user', 'message', 'file' + ] + + def get_user(self, obj): + return { + 'id': obj.user.id, + 'full_name': obj.user.full_name, + 'profile_image': obj.user.profile_image.url if obj.user.profile_image else None, + } + + +class IncomeMessageCreateSerializer(serializers.ModelSerializer): + class Meta: + model = IncomeMessage + fields = [ + 'message', 'file', 'chat' + ] + + def create(self, validated_data): + with transaction.atomic(): + return IncomeMessage.objects.create( + message=validated_data.get('message'), + file=validated_data.get('file'), + user=self.context.get('user'), + chat=validated_data.get('chat'), + ) + \ No newline at end of file diff --git a/core/apps/finance/signals/__init__.py b/core/apps/finance/signals/__init__.py new file mode 100644 index 0000000..4aa9ace --- /dev/null +++ b/core/apps/finance/signals/__init__.py @@ -0,0 +1,2 @@ +from .expence import * +from .income import * \ No newline at end of file diff --git a/core/apps/finance/signals/expence.py b/core/apps/finance/signals/expence.py new file mode 100644 index 0000000..390877b --- /dev/null +++ b/core/apps/finance/signals/expence.py @@ -0,0 +1,13 @@ +from django.dispatch import receiver +from django.db.models.signals import post_save + +from core.apps.finance.models import Expence, ExpenceChat + + +@receiver(signal=post_save, sender=Expence) +def create_expence_chat(sender, instance, created, **kwargs): + if created: + ExpenceChat.objects.create( + expence=instance + ) + diff --git a/core/apps/finance/signals/income.py b/core/apps/finance/signals/income.py new file mode 100644 index 0000000..4359e3c --- /dev/null +++ b/core/apps/finance/signals/income.py @@ -0,0 +1,13 @@ +from django.dispatch import receiver +from django.db.models.signals import post_save + +from core.apps.finance.models import Income, IncomeChat + + +@receiver(signal=post_save, sender=Income) +def create_income_chat(sender, instance, created, **kwargs): + if created: + IncomeChat.objects.create( + income=instance + ) + diff --git a/core/apps/finance/urls.py b/core/apps/finance/urls.py index b9e026b..ef656c9 100644 --- a/core/apps/finance/urls.py +++ b/core/apps/finance/urls.py @@ -9,6 +9,8 @@ from core.apps.finance.views import expence_type as ex_views from core.apps.finance.views import expence as expence_views from core.apps.finance.views import income_contract as ic_views from core.apps.finance.views import expence_contract as ec_views +from core.apps.finance.views import expence_chat as ex_chat_views +from core.apps.finance.views import income_chat as in_chat_views urlpatterns = [ @@ -87,5 +89,25 @@ urlpatterns = [ path('statistics/', ec_views.ExpenceContractStatisticsApiView.as_view()), path('/calculate_price/', ec_views.ExpenceContractCalculatePriceApiView.as_view()), ] - )) + )), + path('expence_chat/', include( + [ + path('/messages/', ex_chat_views.ExpenceMessageListApiView.as_view()), + path('message/', include( + [ + path('create/', ex_chat_views.ExpenceMessageCreateApiView.as_view()), + ] + )), + ] + )), + path('income_chat/', include( + [ + path('/messages/', in_chat_views.IncomeMessageListApiView.as_view()), + path('message/', include( + [ + path('create/', in_chat_views.IncomeMessageCreateApiView.as_view()), + ] + )), + ] + )), ] \ No newline at end of file diff --git a/core/apps/finance/views/expence_chat.py b/core/apps/finance/views/expence_chat.py new file mode 100644 index 0000000..59a6dc3 --- /dev/null +++ b/core/apps/finance/views/expence_chat.py @@ -0,0 +1,51 @@ +from django.shortcuts import get_object_or_404 + +from rest_framework import generics, views +from rest_framework.response import Response + +from core.apps.finance.models import ExpenceChat, ExpenceMessage +from core.apps.finance.serializers import expence_chat as serializers +from core.apps.accounts.permissions.permissions import HasRolePermission + + +class ExpenceMessageCreateApiView(generics.GenericAPIView): + serializer_class = serializers.ExpenceMessageCreateSerializer + queryset = ExpenceMessage.objects.all() + permission_classes = [HasRolePermission] + + def post(self, request): + serializer = self.serializer_class(data=request.data, context={'user': request.user}) + if serializer.is_valid(raise_exception=True): + serializer.save() + return Response( + { + 'success': True, + 'message': 'created' + }, status=201 + ) + return Response( + { + 'success': False, + 'message': serializer.errors, + }, status=400 + ) + + +class ExpenceMessageListApiView(generics.GenericAPIView): + serializer_class = serializers.ExpenceMessageListSerializer + queryset = ExpenceMessage.objects.select_related('user') + permission_classes = [HasRolePermission] + + def get(self, request, chat_id): + chat = get_object_or_404(ExpenceChat, id=chat_id) + messages = self.queryset.filter(chat=chat) + serializer = self.serializer_class(messages, many=True) + return Response( + { + 'chat': { + 'id': chat.id, + 'expence': chat.expence.id + }, + 'messages': serializer.data + }, status=200 + ) \ No newline at end of file diff --git a/core/apps/finance/views/income_chat.py b/core/apps/finance/views/income_chat.py new file mode 100644 index 0000000..ba0a098 --- /dev/null +++ b/core/apps/finance/views/income_chat.py @@ -0,0 +1,51 @@ +from django.shortcuts import get_object_or_404 + +from rest_framework import generics +from rest_framework.response import Response + +from core.apps.finance.models import IncomeMessage, IncomeChat +from core.apps.finance.serializers import income_chat as serializers +from core.apps.accounts.permissions.permissions import HasRolePermission + + +class IncomeMessageCreateApiView(generics.GenericAPIView): + serializer_class = serializers.IncomeMessageCreateSerializer + queryset = IncomeMessage.objects.all() + permission_classes = [HasRolePermission] + + def post(self, request): + serializer = self.serializer_class(data=request.data, context={'user': request.user}) + if serializer.is_valid(raise_exception=True): + serializer.save() + return Response( + { + 'success': True, + 'message': 'created' + }, status=201 + ) + return Response( + { + 'success': False, + 'message': serializer.errors, + }, status=400 + ) + + +class IncomeMessageListApiView(generics.GenericAPIView): + serializer_class = serializers.IncomeMessageListSerializer + queryset = IncomeMessage.objects.select_related('user') + permission_classes = [HasRolePermission] + + def get(self, request, chat_id): + chat = get_object_or_404(IncomeChat, id=chat_id) + messages = self.queryset.filter(chat=chat) + serializer = self.serializer_class(messages, many=True) + return Response( + { + 'chat': { + 'id': chat.id, + 'income': chat.income.id + }, + 'messages': serializer.data + }, status=200 + ) \ No newline at end of file