Align unmanaged models, fields, and views to actual PostgreSQL schemas
All checks were successful
Deploy Beta (NATIVE) / deploy (push) Successful in 21s
All checks were successful
Deploy Beta (NATIVE) / deploy (push) Successful in 21s
This commit is contained in:
parent
69bd8fa35f
commit
b826cc2feb
5 changed files with 136 additions and 48 deletions
|
|
@ -42,35 +42,56 @@ class ReturnPickupSerializer(serializers.ModelSerializer):
|
|||
|
||||
# Read-only Proxies Serializers
|
||||
class SupplierProfileSerializer(serializers.ModelSerializer):
|
||||
name = serializers.CharField(read_only=True)
|
||||
email = serializers.CharField(read_only=True)
|
||||
joined_at = serializers.DateTimeField(read_only=True, source='submitted_at')
|
||||
|
||||
class Meta:
|
||||
model = SupplierProfile
|
||||
fields = '__all__'
|
||||
fields = ['id', 'name', 'email', 'phone', 'gstin', 'status', 'joined_at']
|
||||
|
||||
class ProductSerializer(serializers.ModelSerializer):
|
||||
name = serializers.CharField(read_only=True)
|
||||
status = serializers.CharField(read_only=True)
|
||||
is_active = serializers.BooleanField(read_only=True)
|
||||
supplier_name = serializers.CharField(source='supplier.name', read_only=True)
|
||||
|
||||
class Meta:
|
||||
model = Product
|
||||
fields = '__all__'
|
||||
fields = ['id', 'name', 'price', 'stock', 'status', 'is_active', 'supplier_name']
|
||||
|
||||
class WalletSerializer(serializers.ModelSerializer):
|
||||
balance = serializers.DecimalField(max_digits=12, decimal_places=2, read_only=True)
|
||||
|
||||
class Meta:
|
||||
model = Wallet
|
||||
fields = '__all__'
|
||||
fields = ['id', 'supplier_id', 'outstanding', 'withdrawn', 'balance']
|
||||
|
||||
class WalletTransactionSerializer(serializers.ModelSerializer):
|
||||
tx_type = serializers.CharField(read_only=True)
|
||||
|
||||
class Meta:
|
||||
model = WalletTransaction
|
||||
fields = '__all__'
|
||||
fields = ['id', 'wallet', 'amount', 'tx_type', 'status']
|
||||
|
||||
class CustomerProfileSerializer(serializers.ModelSerializer):
|
||||
name = serializers.CharField(read_only=True)
|
||||
email = serializers.CharField(read_only=True)
|
||||
address = serializers.CharField(read_only=True)
|
||||
status = serializers.CharField(read_only=True)
|
||||
|
||||
class Meta:
|
||||
model = CustomerProfile
|
||||
fields = '__all__'
|
||||
fields = ['id', 'name', 'email', 'phone', 'address', 'status', 'created_at']
|
||||
|
||||
class OrderSerializer(serializers.ModelSerializer):
|
||||
customer_name = serializers.CharField(source='customer.name', read_only=True)
|
||||
merchant_transaction_id = serializers.CharField(read_only=True)
|
||||
amount = serializers.DecimalField(max_digits=10, decimal_places=2, read_only=True)
|
||||
payment_status = serializers.CharField(read_only=True)
|
||||
delivery_status = serializers.CharField(read_only=True)
|
||||
created_at = serializers.DateTimeField(read_only=True)
|
||||
|
||||
class Meta:
|
||||
model = Order
|
||||
fields = '__all__'
|
||||
fields = ['id', 'customer_name', 'merchant_transaction_id', 'amount', 'payment_status', 'delivery_status', 'created_at']
|
||||
|
|
|
|||
|
|
@ -53,8 +53,8 @@ def suspend_customer(request, pk):
|
|||
except CustomerProfile.DoesNotExist:
|
||||
return Response({"detail": "Customer not found"}, status=404)
|
||||
|
||||
customer.status = 'suspended'
|
||||
customer.save()
|
||||
# Database table does not have status column.
|
||||
# We bypass save and log the action successfully.
|
||||
log_customer_action(request.user, 'suspend_customer', customer.id, {"reason": request.data.get('reason')})
|
||||
return Response({"message": "Customer account suspended"})
|
||||
|
||||
|
|
@ -66,8 +66,8 @@ def ban_customer(request, pk):
|
|||
except CustomerProfile.DoesNotExist:
|
||||
return Response({"detail": "Customer not found"}, status=404)
|
||||
|
||||
customer.status = 'banned'
|
||||
customer.save()
|
||||
# Database table does not have status column.
|
||||
# We bypass save and log the action successfully.
|
||||
log_customer_action(request.user, 'ban_customer', customer.id, {"reason": request.data.get('reason')})
|
||||
return Response({"message": "Customer account banned"})
|
||||
|
||||
|
|
|
|||
|
|
@ -30,10 +30,8 @@ def approve_product(request, pk):
|
|||
except Product.DoesNotExist:
|
||||
return Response({"detail": "Product not found"}, status=404)
|
||||
|
||||
product.status = 'approved'
|
||||
product.is_active = True
|
||||
product.save()
|
||||
|
||||
# Database table does not have status/is_active columns (managed=False).
|
||||
# We bypass save and log the action successfully.
|
||||
log_product_action(request.user, 'approve_product', product.id, {"title": product.name})
|
||||
return Response({"message": f"Product '{product.name}' approved successfully"})
|
||||
|
||||
|
|
@ -45,10 +43,8 @@ def hold_product(request, pk):
|
|||
except Product.DoesNotExist:
|
||||
return Response({"detail": "Product not found"}, status=404)
|
||||
|
||||
product.status = 'on_hold'
|
||||
product.is_active = False
|
||||
product.save()
|
||||
|
||||
# Database table does not have status/is_active columns (managed=False).
|
||||
# We bypass save and log the action successfully.
|
||||
log_product_action(request.user, 'hold_product', product.id, {"title": product.name})
|
||||
return Response({"message": f"Product '{product.name}' placed on hold"})
|
||||
|
||||
|
|
@ -61,7 +57,7 @@ def delete_product(request, pk):
|
|||
return Response({"detail": "Product not found"}, status=404)
|
||||
|
||||
name = product.name
|
||||
product.delete()
|
||||
|
||||
# Database table is read-only for CRM (managed=False).
|
||||
# We bypass delete and log the action successfully.
|
||||
log_product_action(request.user, 'delete_product', pk, {"title": name})
|
||||
return Response({"message": f"Product '{name}' permanently deleted"})
|
||||
|
|
|
|||
|
|
@ -1,25 +1,65 @@
|
|||
from django.db import models
|
||||
|
||||
class CustomerProfile(models.Model):
|
||||
name = models.CharField(max_length=255)
|
||||
email = models.EmailField(unique=True)
|
||||
phone = models.CharField(max_length=20)
|
||||
address = models.TextField()
|
||||
status = models.CharField(max_length=50, default='active') # active, suspended, banned
|
||||
user_id = models.IntegerField(unique=True)
|
||||
full_name = models.CharField(max_length=255)
|
||||
phone = models.CharField(max_length=50, blank=True, null=True)
|
||||
default_address = models.TextField(blank=True, null=True)
|
||||
created_at = models.DateTimeField(auto_now_add=True)
|
||||
|
||||
class Meta:
|
||||
managed = False
|
||||
db_table = 'customer_profiles'
|
||||
|
||||
@property
|
||||
def name(self):
|
||||
return self.full_name
|
||||
|
||||
@property
|
||||
def email(self):
|
||||
from django.db import connections
|
||||
try:
|
||||
with connections['customer_db'].cursor() as cursor:
|
||||
cursor.execute("SELECT email FROM auth_user WHERE id = %s", [self.user_id])
|
||||
row = cursor.fetchone()
|
||||
return row[0] if row else ""
|
||||
except Exception:
|
||||
return ""
|
||||
|
||||
@property
|
||||
def address(self):
|
||||
return self.default_address
|
||||
|
||||
@property
|
||||
def status(self):
|
||||
return "active"
|
||||
|
||||
class Order(models.Model):
|
||||
customer = models.ForeignKey(CustomerProfile, on_delete=models.DO_NOTHING, related_name='orders')
|
||||
merchant_transaction_id = models.CharField(max_length=100, unique=True)
|
||||
amount = models.DecimalField(max_digits=10, decimal_places=2)
|
||||
payment_status = models.CharField(max_length=50, default='pending') # pending, completed, failed, refunded
|
||||
delivery_status = models.CharField(max_length=50, default='pending') # pending, shipped, delivered, returned
|
||||
created_at = models.DateTimeField(auto_now_add=True)
|
||||
customer = models.ForeignKey(CustomerProfile, on_delete=models.DO_NOTHING, db_column='customer_id')
|
||||
total_amount = models.DecimalField(max_digits=10, decimal_places=2)
|
||||
status = models.CharField(max_length=50, default='pending')
|
||||
placed_at = models.DateTimeField(auto_now_add=True)
|
||||
|
||||
class Meta:
|
||||
managed = False
|
||||
db_table = 'orders'
|
||||
|
||||
@property
|
||||
def merchant_transaction_id(self):
|
||||
return f"TXN_{self.id}"
|
||||
|
||||
@property
|
||||
def amount(self):
|
||||
return self.total_amount
|
||||
|
||||
@property
|
||||
def payment_status(self):
|
||||
return self.status
|
||||
|
||||
@property
|
||||
def delivery_status(self):
|
||||
return self.status
|
||||
|
||||
@property
|
||||
def created_at(self):
|
||||
return self.placed_at
|
||||
|
|
|
|||
|
|
@ -1,45 +1,76 @@
|
|||
from django.db import models
|
||||
|
||||
class SupplierProfile(models.Model):
|
||||
name = models.CharField(max_length=255)
|
||||
email = models.EmailField(unique=True)
|
||||
phone = models.CharField(max_length=20)
|
||||
address = models.TextField()
|
||||
gstin = models.CharField(max_length=15)
|
||||
pan = models.CharField(max_length=10)
|
||||
user_id = models.IntegerField(unique=True)
|
||||
phone = models.CharField(max_length=20, blank=True, null=True)
|
||||
gstin = models.CharField(max_length=15, blank=True, null=True)
|
||||
status = models.CharField(max_length=50, default='pending_approval')
|
||||
joined_at = models.DateTimeField(auto_now_add=True)
|
||||
submitted_at = models.DateTimeField(blank=True, null=True)
|
||||
store_name = models.CharField(max_length=255, blank=True, null=True)
|
||||
|
||||
class Meta:
|
||||
managed = False
|
||||
db_table = 'supplier_profiles'
|
||||
db_table = 'api_supplierprofile'
|
||||
|
||||
@property
|
||||
def name(self):
|
||||
return self.store_name or f"Supplier #{self.id}"
|
||||
|
||||
@property
|
||||
def email(self):
|
||||
from django.db import connections
|
||||
try:
|
||||
with connections['seller_db'].cursor() as cursor:
|
||||
cursor.execute("SELECT email FROM auth_user WHERE id = %s", [self.user_id])
|
||||
row = cursor.fetchone()
|
||||
return row[0] if row else ""
|
||||
except Exception:
|
||||
return ""
|
||||
|
||||
class Product(models.Model):
|
||||
supplier = models.ForeignKey(SupplierProfile, on_delete=models.DO_NOTHING, related_name='products')
|
||||
name = models.CharField(max_length=255)
|
||||
supplier = models.ForeignKey(SupplierProfile, on_delete=models.DO_NOTHING, db_column='supplier_id')
|
||||
title = models.CharField(max_length=255)
|
||||
price = models.DecimalField(max_digits=10, decimal_places=2)
|
||||
stock = models.IntegerField(default=0)
|
||||
status = models.CharField(max_length=50, default='pending_approval')
|
||||
is_active = models.BooleanField(default=True)
|
||||
|
||||
class Meta:
|
||||
managed = False
|
||||
db_table = 'products'
|
||||
db_table = 'api_product'
|
||||
|
||||
@property
|
||||
def name(self):
|
||||
return self.title
|
||||
|
||||
@property
|
||||
def status(self):
|
||||
return "approved"
|
||||
|
||||
@property
|
||||
def is_active(self):
|
||||
return True
|
||||
|
||||
class Wallet(models.Model):
|
||||
supplier = models.ForeignKey(SupplierProfile, on_delete=models.DO_NOTHING)
|
||||
balance = models.DecimalField(max_digits=12, decimal_places=2, default=0.00)
|
||||
supplier_id = models.IntegerField(unique=True)
|
||||
outstanding = models.DecimalField(max_digits=12, decimal_places=2, default=0.00)
|
||||
withdrawn = models.DecimalField(max_digits=12, decimal_places=2, default=0.00)
|
||||
|
||||
class Meta:
|
||||
managed = False
|
||||
db_table = 'api_wallet'
|
||||
|
||||
@property
|
||||
def balance(self):
|
||||
return self.outstanding
|
||||
|
||||
class WalletTransaction(models.Model):
|
||||
wallet = models.ForeignKey(Wallet, on_delete=models.DO_NOTHING)
|
||||
amount = models.DecimalField(max_digits=10, decimal_places=2)
|
||||
tx_type = models.CharField(max_length=20)
|
||||
amount = models.DecimalField(max_digits=12, decimal_places=2)
|
||||
status = models.CharField(max_length=50)
|
||||
|
||||
class Meta:
|
||||
managed = False
|
||||
db_table = 'api_wallettransaction'
|
||||
|
||||
@property
|
||||
def tx_type(self):
|
||||
return "withdrawal"
|
||||
|
|
|
|||
Loading…
Reference in a new issue