c3lf/c3lf-system-3
9
0
Fork 0
Code Issues 55 Pull requests Projects 2 Releases Wiki Activity Actions

drop v1 API and rename id columns

Browse source
This commit is contained in:
j3d1 2024-11-20 00:23:20 +01:00
parent 1399c0ebe6
commit 031a55394c
21 changed files with 179 additions and 686 deletions
Download patch file Download diff file Expand all files Collapse all files

20
core/inventory/serializers.py
View file

@ -17,8 +17,8 @@ class EventSerializer(serializers.ModelSerializer):
class Meta:
model = Event
fields = ['eid', 'slug', 'name', 'start', 'end', 'pre_start', 'post_end', 'addresses']
read_only_fields = ['eid']
fields = ['id', 'slug', 'name', 'start', 'end', 'pre_start', 'post_end', 'addresses']
read_only_fields = ['id']
class ContainerSerializer(serializers.ModelSerializer):
@ -26,11 +26,11 @@ class ContainerSerializer(serializers.ModelSerializer):
class Meta:
model = Container
fields = ['cid', 'name', 'itemCount']
read_only_fields = ['cid', 'itemCount']
fields = ['id', 'name', 'itemCount']
read_only_fields = ['id', 'itemCount']
def get_itemCount(self, instance):
return Item.objects.filter(container=instance.cid).count()
return Item.objects.filter(container=instance.id).count()
class ItemSerializer(serializers.ModelSerializer):
@ -44,11 +44,11 @@ class ItemSerializer(serializers.ModelSerializer):
class Meta:
model = Item
fields = ['cid', 'box', 'uid', 'description', 'file', 'dataImage', 'returned', 'event']
read_only_fields = ['uid']
fields = ['cid', 'box', 'id', 'description', 'file', 'dataImage', 'returned', 'event']
read_only_fields = ['id']
def get_cid(self, instance):
return instance.container.cid
return instance.container.id
def get_box(self, instance):
return instance.container.name
@ -65,7 +65,7 @@ class ItemSerializer(serializers.ModelSerializer):
container = None
returned = False
if 'cid' in data:
container = Container.objects.get(cid=data['cid'])
container = Container.objects.get(id=data['cid'])
if 'returned' in data:
returned = data['returned']
internal = super().to_internal_value(data)
@ -76,6 +76,8 @@ class ItemSerializer(serializers.ModelSerializer):
return internal
def validate(self, attrs):
if not 'container' in attrs and not self.partial:
raise serializers.ValidationError("This field cannot be empty.")
return super().validate(attrs)
def create(self, validated_data):