wherehouse: fix bug
This commit is contained in:
@@ -10,7 +10,7 @@ from core.apps.accounts.serializers.user import UserListSerializer
|
||||
|
||||
class InvalidProductCreateSerializer(serializers.Serializer):
|
||||
inventory_id = serializers.UUIDField()
|
||||
project_folder_id = serializers.UUIDField()
|
||||
project_folder_id = serializers.UUIDField(required=False)
|
||||
witnesses_ids = serializers.ListField(child=serializers.UUIDField())
|
||||
work_id = serializers.UUIDField(required=False)
|
||||
amount = serializers.IntegerField()
|
||||
@@ -24,16 +24,17 @@ class InvalidProductCreateSerializer(serializers.Serializer):
|
||||
inventory = Inventory.objects.filter(id=attrs['inventory_id']).first()
|
||||
if not inventory:
|
||||
raise serializers.ValidationError("Inventory not found")
|
||||
project_folder = ProjectFolder.objects.filter(id=attrs['project_folder_id']).first()
|
||||
if not project_folder:
|
||||
raise serializers.ValidationError("Project Folder not found")
|
||||
if attrs.get('project_folder_id'):
|
||||
project_folder = ProjectFolder.objects.filter(id=attrs['project_folder_id']).first()
|
||||
if not project_folder:
|
||||
raise serializers.ValidationError("Project Folder not found")
|
||||
attrs['project_folder'] = project_folder
|
||||
if attrs.get('work_id'):
|
||||
work = EstimateWork.objects.filter(id=attrs['work_id']).first()
|
||||
if not work:
|
||||
raise serializers.ValidationError("Work not found")
|
||||
attrs['work'] = work
|
||||
attrs['inventory'] = inventory
|
||||
attrs['project_folder'] = project_folder
|
||||
return super().validate(attrs)
|
||||
|
||||
def create(self, validated_data):
|
||||
@@ -75,7 +76,7 @@ class InvliadProductListSerializer(serializers.ModelSerializer):
|
||||
return {
|
||||
'id': obj.project_folder.id,
|
||||
'name': obj.project_folder.name,
|
||||
}
|
||||
} if obj.project_folder else None
|
||||
|
||||
def get_wherehouse(self, obj):
|
||||
return {
|
||||
|
||||
Reference in New Issue
Block a user