Skip to content

Commit 9fcf531

Browse files
committed
IO-843 Made new deleted-column not required: it can be null if item has not been deleted
1 parent 8f68eea commit 9fcf531

3 files changed

Lines changed: 16 additions & 13 deletions

File tree

infraohjelmointi_api/migrations/0098_budgetoverrunreason_deleted_and_more.py

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,60 +9,63 @@ class Migration(migrations.Migration):
99
('infraohjelmointi_api', '0097_auto_20260326_1011'),
1010
]
1111

12+
# These AddField operations are reversible by Django, so the migration
13+
# can be rolled back if needed.
1214
operations = [
1315
migrations.AddField(
1416
model_name='budgetoverrunreason',
1517
name='deleted',
16-
field=models.BooleanField(default=False),
18+
field=models.BooleanField(blank=True, default=False, null=True),
1719
),
1820
migrations.AddField(
1921
model_name='constructionphase',
2022
name='deleted',
21-
field=models.BooleanField(default=False),
23+
field=models.BooleanField(blank=True, default=False, null=True),
2224
),
2325
migrations.AddField(
2426
model_name='constructionphasedetail',
2527
name='deleted',
26-
field=models.BooleanField(default=False),
28+
field=models.BooleanField(blank=True, default=False, null=True),
2729
),
2830
migrations.AddField(
2931
model_name='constructionprocurementmethod',
3032
name='deleted',
31-
field=models.BooleanField(default=False),
33+
field=models.BooleanField(blank=True, default=False, null=True),
3234
),
3335
migrations.AddField(
3436
model_name='planningphase',
3537
name='deleted',
36-
field=models.BooleanField(default=False),
38+
field=models.BooleanField(blank=True, default=False, null=True),
3739
),
3840
migrations.AddField(
3941
model_name='projectcategory',
4042
name='deleted',
41-
field=models.BooleanField(default=False),
43+
field=models.BooleanField(blank=True, default=False, null=True),
4244
),
4345
migrations.AddField(
4446
model_name='projectphase',
4547
name='deleted',
46-
field=models.BooleanField(default=False),
48+
field=models.BooleanField(blank=True, default=False, null=True),
4749
),
4850
migrations.AddField(
4951
model_name='projectprogrammer',
5052
name='deleted',
51-
field=models.BooleanField(default=False),
53+
field=models.BooleanField(blank=True, default=False, null=True),
5254
),
5355
migrations.AddField(
5456
model_name='projectqualitylevel',
5557
name='deleted',
56-
field=models.BooleanField(default=False),
58+
field=models.BooleanField(blank=True, default=False, null=True),
5759
),
5860
migrations.AddField(
5961
model_name='projecttype',
6062
name='deleted',
61-
field=models.BooleanField(default=False),
63+
field=models.BooleanField(blank=True, default=False, null=True),
6264
),
6365
migrations.AddField(
6466
model_name='responsiblezone',
6567
name='deleted',
66-
field=models.BooleanField(default=False),
68+
field=models.BooleanField(blank=True, default=False, null=True),
6769
),
6870
]
71+

infraohjelmointi_api/models/OrderedLookupModel.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
class OrderedLookupModel(models.Model):
66
order = models.IntegerField(null=True, blank=True)
7-
deleted = models.BooleanField(default=False)
7+
deleted = models.BooleanField(default=False, null=True, blank=True)
88

99
class Meta:
1010
abstract = True

infraohjelmointi_api/views/CachedLookupViewSet.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ def get_queryset(self):
2323
queryset = super().get_queryset()
2424
model = self.get_serializer_class().Meta.model
2525
if hasattr(model, "deleted"):
26-
queryset = queryset.filter(deleted=False)
26+
queryset = queryset.exclude(deleted=True)
2727
return queryset
2828

2929
def list(self, request, *args, **kwargs):

0 commit comments

Comments
 (0)