add: add chat for income and expence
This commit is contained in:
@@ -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 *
|
||||
13
core/apps/finance/admin/expence_chat.py
Normal file
13
core/apps/finance/admin/expence_chat.py
Normal file
@@ -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']
|
||||
13
core/apps/finance/admin/income_chat.py
Normal file
13
core/apps/finance/admin/income_chat.py
Normal file
@@ -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']
|
||||
@@ -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
|
||||
@@ -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',
|
||||
},
|
||||
),
|
||||
]
|
||||
@@ -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',
|
||||
},
|
||||
),
|
||||
]
|
||||
@@ -6,3 +6,5 @@ from .expence_type import *
|
||||
from .expence import *
|
||||
from .income_contract import *
|
||||
from .expence_contract import *
|
||||
from .expence_chat import *
|
||||
from .income_chat import *
|
||||
30
core/apps/finance/models/expence_chat.py
Normal file
30
core/apps/finance/models/expence_chat.py
Normal file
@@ -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'
|
||||
30
core/apps/finance/models/income_chat.py
Normal file
30
core/apps/finance/models/income_chat.py
Normal file
@@ -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'
|
||||
@@ -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):
|
||||
|
||||
40
core/apps/finance/serializers/expence_chat.py
Normal file
40
core/apps/finance/serializers/expence_chat.py
Normal file
@@ -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'),
|
||||
)
|
||||
|
||||
@@ -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):
|
||||
|
||||
40
core/apps/finance/serializers/income_chat.py
Normal file
40
core/apps/finance/serializers/income_chat.py
Normal file
@@ -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'),
|
||||
)
|
||||
|
||||
2
core/apps/finance/signals/__init__.py
Normal file
2
core/apps/finance/signals/__init__.py
Normal file
@@ -0,0 +1,2 @@
|
||||
from .expence import *
|
||||
from .income import *
|
||||
13
core/apps/finance/signals/expence.py
Normal file
13
core/apps/finance/signals/expence.py
Normal file
@@ -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
|
||||
)
|
||||
|
||||
13
core/apps/finance/signals/income.py
Normal file
13
core/apps/finance/signals/income.py
Normal file
@@ -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
|
||||
)
|
||||
|
||||
@@ -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('<uuid:id>/calculate_price/', ec_views.ExpenceContractCalculatePriceApiView.as_view()),
|
||||
]
|
||||
))
|
||||
)),
|
||||
path('expence_chat/', include(
|
||||
[
|
||||
path('<uuid:chat_id>/messages/', ex_chat_views.ExpenceMessageListApiView.as_view()),
|
||||
path('message/', include(
|
||||
[
|
||||
path('create/', ex_chat_views.ExpenceMessageCreateApiView.as_view()),
|
||||
]
|
||||
)),
|
||||
]
|
||||
)),
|
||||
path('income_chat/', include(
|
||||
[
|
||||
path('<uuid:chat_id>/messages/', in_chat_views.IncomeMessageListApiView.as_view()),
|
||||
path('message/', include(
|
||||
[
|
||||
path('create/', in_chat_views.IncomeMessageCreateApiView.as_view()),
|
||||
]
|
||||
)),
|
||||
]
|
||||
)),
|
||||
]
|
||||
51
core/apps/finance/views/expence_chat.py
Normal file
51
core/apps/finance/views/expence_chat.py
Normal file
@@ -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
|
||||
)
|
||||
51
core/apps/finance/views/income_chat.py
Normal file
51
core/apps/finance/views/income_chat.py
Normal file
@@ -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
|
||||
)
|
||||
Reference in New Issue
Block a user