stash

backend/toolshed/migrations/0008_alter_inventoryitem_storage_location.py

@@ -0,0 +1,19 @@
+# Generated by Django 4.2.2 on 2026-07-23 02:02
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('toolshed', '0007_workflowinstance'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='inventoryitem',
+            name='storage_location',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='inventory_items', to='toolshed.storagelocation'),
+        ),
+    ]

backend/toolshed/models.py

@@ -90,7 +90,7 @@ class InventoryItem(SoftDeleteModel):
     tags = models.ManyToManyField(Tag, through='ItemTag', related_name='inventory_items')
     properties = models.ManyToManyField(Property, through='ItemProperty')
     files = models.ManyToManyField(File, related_name='connected_items')
-    storage_location = models.ForeignKey('StorageLocation', on_delete=models.CASCADE, null=True, blank=True,
+    storage_location = models.ForeignKey('StorageLocation', on_delete=models.SET_NULL, null=True, blank=True,
                                          related_name='inventory_items')
 
     def clean(self):

backend/toolshed/tests/test_locations.py

@@ -1,6 +1,6 @@
 from authentication.tests import SignatureAuthClient, UserTestMixin, ToolshedTestCase
 from files.tests import FilesTestMixin
-from toolshed.models import InventoryItem, Category
+from toolshed.models import InventoryItem, Category, StorageLocation
 from toolshed.tests import InventoryTestMixin, LocationTestMixin
 
 client = SignatureAuthClient()
@@ -69,3 +69,63 @@ class LocationApiTestCase(UserTestMixin, InventoryTestMixin, LocationTestMixin,
         self.assertEqual(reply.json()[3]['description'], None)
         self.assertEqual(reply.json()[3]['category'], 'cat1')
         self.assertEqual(reply.json()[3]['path'], 'loc1/loc4')
+
+    def test_post_new_location(self):
+        reply = client.post('/api/storage_locations/', self.f['local_user1'], {
+            'name': 'loc5',
+            'description': 'a new location',
+        })
+        self.assertEqual(reply.status_code, 201)
+        self.assertEqual(StorageLocation.objects.count(), 5)
+        location = StorageLocation.objects.get(name='loc5')
+        self.assertEqual(location.description, 'a new location')
+        self.assertEqual(location.owner, self.f['local_user1'])
+        self.assertEqual(location.parent, None)
+        self.assertEqual(reply.json()['path'], 'loc5')
+
+    def test_post_new_nested_location(self):
+        reply = client.post('/api/storage_locations/', self.f['local_user1'], {
+            'name': 'loc5',
+            'parent': self.f['loc3'].id,
+        })
+        self.assertEqual(reply.status_code, 201)
+        location = StorageLocation.objects.get(name='loc5')
+        self.assertEqual(location.parent, self.f['loc3'])
+        self.assertEqual(reply.json()['path'], 'loc1/loc3/loc5')
+
+    def test_patch_location(self):
+        reply = client.patch('/api/storage_locations/' + str(self.f['loc2'].id) + '/', self.f['local_user1'], {
+            'name': 'loc2-renamed',
+            'parent': self.f['loc1'].id,
+        })
+        self.assertEqual(reply.status_code, 200)
+        location = StorageLocation.objects.get(id=self.f['loc2'].id)
+        self.assertEqual(location.name, 'loc2-renamed')
+        self.assertEqual(location.parent, self.f['loc1'])
+        self.assertEqual(reply.json()['path'], 'loc1/loc2-renamed')
+
+    def test_delete_location(self):
+        reply = client.delete('/api/storage_locations/' + str(self.f['loc4'].id) + '/', self.f['local_user1'])
+        self.assertEqual(reply.status_code, 204)
+        self.assertEqual(StorageLocation.objects.count(), 3)
+        self.assertEqual(StorageLocation.objects.filter(id=self.f['loc4'].id).count(), 0)
+
+    def test_delete_location_with_items_sets_null(self):
+        item = InventoryItem.objects.create(
+            owner=self.f['local_user1'], name='located_item', storage_location=self.f['loc3'])
+        reply = client.delete('/api/storage_locations/' + str(self.f['loc3'].id) + '/', self.f['local_user1'])
+        self.assertEqual(reply.status_code, 204)
+        item.refresh_from_db()
+        self.assertIsNone(item.storage_location)
+        self.assertEqual(InventoryItem.objects.filter(id=item.id).count(), 1)
+
+    def test_locations_are_owner_scoped(self):
+        reply = client.get('/api/storage_locations/', self.f['local_user2'])
+        self.assertEqual(reply.status_code, 200)
+        self.assertEqual(len(reply.json()), 0)
+
+    def test_cannot_delete_other_users_location(self):
+        reply = client.delete('/api/storage_locations/' + str(self.f['loc1'].id) + '/', self.f['local_user2'])
+        self.assertEqual(reply.status_code, 404)
+        self.assertEqual(StorageLocation.objects.filter(id=self.f['loc1'].id).count(), 1)
+