Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Generated by Django 5.2.8 on 2026-03-08 02:57

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
("movements", "0004_delete_itemhistory"),
]

operations = [
migrations.AddField(
model_name="itemmovementrequest",
name="review_status",
field=models.CharField(
choices=[("PENDING", "Pending"), ("APPROVED", "Approved")], default="PENDING", max_length=10
),
),
Comment on lines +13 to +19
]
10 changes: 10 additions & 0 deletions backend/movements/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@ class ItemMovementRequest(models.Model):
("CANCELLED", "Cancelled"),
]

REVIEW_STATUS_CHOICES = [
("PENDING", "Pending"),
("APPROVED", "Approved"),
]
Comment on lines +19 to +22

item = models.ForeignKey(CollectionItem, on_delete=models.CASCADE, related_name="movement_requests")
requested_by = models.ForeignKey(
settings.AUTH_USER_MODEL,
Expand All @@ -27,6 +32,11 @@ class ItemMovementRequest(models.Model):
to_location = models.ForeignKey(Location, on_delete=models.PROTECT, related_name="movement_requests_to")

status = models.CharField(max_length=20, choices=STATUS_CHOICES, default="WAITING_APPROVAL")
review_status = models.CharField(
max_length=10,
choices=REVIEW_STATUS_CHOICES,
default="PENDING",
)
Comment on lines 34 to +39

admin = models.ForeignKey(
settings.AUTH_USER_MODEL,
Expand Down
8 changes: 7 additions & 1 deletion backend/movements/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ class Meta:
"from_location",
"to_location",
"status",
"review_status",
"admin",
"admin_username",
"admin_comment",
Expand All @@ -51,12 +52,17 @@ class Meta:
"id",
"requested_by",
"status",
"review_status",
"admin",
"admin_comment",
"created_at",
"updated_at",
]

def create(self, validated_data):
# Volunteer is the logged-in user.
validated_data["review_status"] = "PENDING"
return super().create(validated_data)

def update(self, instance, validated_data):
validated_data["review_status"] = "PENDING"
return super().update(instance, validated_data)
Comment on lines 62 to +68
Comment on lines 62 to +68
Loading