added the required fields for the models, but the borrower stuff may need to move to another table

Author: sylee212

server/inventory/migrations/0002_inventoryitem_availability_and_more.py

@@ -0,0 +1,43 @@
+# Generated by Django 5.2.8 on 2026-01-08 14:38
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('inventory', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='inventoryitem',
+            name='availability',
+            field=models.BooleanField(default=True),
+        ),
+        migrations.AddField(
+            model_name='inventoryitem',
+            name='borrowerName',
+            field=models.CharField(blank=True, max_length=100, null=True),
+        ),
+        migrations.AddField(
+            model_name='inventoryitem',
+            name='collectionPoint',
+            field=models.CharField(default='Demo Collection Point', max_length=100),
+        ),
+        migrations.AddField(
+            model_name='inventoryitem',
+            name='organization',
+            field=models.CharField(default='Demo Organization', max_length=100),
+        ),
+        migrations.AddField(
+            model_name='inventoryitem',
+            name='returnedOn',
+            field=models.DateTimeField(blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name='inventoryitem',
+            name='id',
+            field=models.BigAutoField(primary_key=True, serialize=False),
+        ),
+    ]

server/inventory/models.py

@@ -1,19 +1,30 @@
 # Create your models here.
 # this is the db models 
+# you can have multiple tables here
 # whenever you make changes here do this
 # python manage.py makemigrations   
 # python manage.py migrate
 
 from django.db import models
 
 class InventoryItem(models.Model):
+    # BigAutoField is for primary keys
+    id = models.BigAutoField(primary_key=True)
+
     # CharField is for short text (like titles)
     name = models.CharField(max_length=255)
 
     # TextField is for long-form content (like descriptions)
     details = models.TextField(blank=True, null=True)
     categories = models.CharField(max_length=100, default="General")
+
+    availability = models.BooleanField(default=True)
+    organization = models.CharField(max_length=100, default="Demo Organization")
 
+    collectionPoint = models.CharField(max_length=100, default="Demo Collection Point")
+    borrowerName = models.CharField(max_length=100, blank=True, null=True)
+    returnedOn = models.DateTimeField(blank=True, null=True)
+
     # Dates
     borrowed_on = models.DateTimeField(blank=True, null=True)
     due_on = models.DateTimeField(blank=True, null=True)

server/inventory/urls.py

@@ -3,7 +3,8 @@
 from .views import InventoryItemViewSet
 
 router = DefaultRouter()
-router.register(r'items', InventoryItemViewSet) # This creates /items/
+# router.register(r'items', InventoryItemViewSet) # This creates /items/
+router.register(r'items', InventoryItemViewSet, basename='inventoryitem') # to fix error with missing basename
 
 urlpatterns = [
     path('', include(router.urls)),

server/inventory/views.py

@@ -8,6 +8,31 @@
 from .serializers import InventoryItemSerializer
 
 class InventoryItemViewSet(viewsets.ModelViewSet):
-    # This tells the view where to get the data and how to translate it
-    queryset = InventoryItem.objects.all()
-    serializer_class = InventoryItemSerializer
+    serializer_class = InventoryItemSerializer
+
+    def get_queryset(self):
+        # 1. Start with all items
+        # does not talk to the database yet, its just a query plan
+        queryset = InventoryItem.objects.all()
+
+        # 2. Grab 'categories' from the URL (e.g., ?categories=Tools)
+        category = self.request.query_params.get('categories')
+        
+        # 3. Grab 'ordering' from the URL (e.g., ?ordering=name)
+        sort_by = self.request.query_params.get('ordering')
+
+        # 4. Apply filters manually if the user provided them
+        if category is not None:
+            queryset = queryset.filter(categories=category)
+
+        # 5. Apply sorting manually
+        if sort_by is not None:
+            queryset = queryset.order_by(sort_by)
+
+        return queryset
+
+# the original that works
+# class InventoryItemViewSet(viewsets.ModelViewSet):
+#     # This tells the view where to get the data and how to translate it
+#     queryset = InventoryItem.objects.all()
+#     serializer_class = InventoryItemSerializer