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 6968c38e68
commit aaa11c3b60
21 changed files with 179 additions and 686 deletions
Download patch file Download diff file Expand all files Collapse all files

29
core/inventory/models.py
View file

@ -6,10 +6,10 @@ from django_softdelete.models import SoftDeleteModel, SoftDeleteManager
class ItemManager(SoftDeleteManager):
def create(self, **kwargs):
if 'uid' in kwargs:
raise ValueError('uid must not be set manually')
uid = Item.all_objects.filter(event=kwargs['event']).count() + 1
kwargs['uid'] = uid
if 'uid_deprecated' in kwargs:
raise ValueError('uid_deprecated must not be set manually')
uid_deprecated = Item.all_objects.filter(event=kwargs['event']).count() + 1
kwargs['uid_deprecated'] = uid_deprecated
return super().create(**kwargs)
def get_queryset(self):
@ -17,11 +17,11 @@ class ItemManager(SoftDeleteManager):
class Item(SoftDeleteModel):
iid = models.AutoField(primary_key=True)
uid = models.IntegerField()
id = models.AutoField(primary_key=True)
uid_deprecated = models.IntegerField()
description = models.TextField()
event = models.ForeignKey('Event', models.CASCADE, db_column='eid')
container = models.ForeignKey('Container', models.CASCADE, db_column='cid')
event = models.ForeignKey('Event', models.CASCADE)
container = models.ForeignKey('Container', models.CASCADE)
returned_at = models.DateTimeField(blank=True, null=True)
created_at = models.DateTimeField(null=True, auto_now_add=True)
updated_at = models.DateTimeField(blank=True, null=True)
@ -30,27 +30,27 @@ class Item(SoftDeleteModel):
all_objects = models.Manager()
class Meta:
unique_together = (('uid', 'event'),)
unique_together = (('uid_deprecated', 'event'),)
permissions = [
('match_item', 'Can match item')
]
def __str__(self):
return '[' + str(self.uid) + ']' + self.description
return '[' + str(self.id) + ']' + self.description
class Container(SoftDeleteModel):
cid = models.AutoField(primary_key=True)
id = models.AutoField(primary_key=True)
name = models.CharField(max_length=255)
created_at = models.DateTimeField(blank=True, null=True)
updated_at = models.DateTimeField(blank=True, null=True)
def __str__(self):
return '[' + str(self.cid) + ']' + self.name
return '[' + str(self.id) + ']' + self.name
class Event(models.Model):
eid = models.AutoField(primary_key=True)
id = models.AutoField(primary_key=True)
name = models.CharField(max_length=255)
slug = models.CharField(max_length=255, unique=True)
start = models.DateTimeField(blank=True, null=True)
@ -62,3 +62,6 @@ class Event(models.Model):
def __str__(self):
return '[' + str(self.slug) + ']' + self.name
class Meta:
db_table = 'common_event'