Mirrored_Repos/InvenTree
1
0
Fork 0
mirror of https://github.com/inventree/InvenTree synced 2024-08-30 18:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed test cases?

Browse Source
This commit is contained in:
eeintech 2021-01-12 15:02:44 -05:00
parent 452d22579a
commit 49c954aa68
3 changed files with 44 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
InvenTree/stock/test_views.py
View File

@ -279,9 +279,15 @@ class StockOwnershipTest(StockViewTestCase):
def test_owner_control(self): def test_owner_control(self):
# Test stock location and item ownership # Test stock location and item ownership
from .models import StockLocation, StockItem from .models import StockLocation, StockItem
from users.models import Owner
user_group = self.user.groups.all()[0] user_group = self.user.groups.all()[0]
user_group_owner = Owner.get_owner(user_group)
new_user_group = self.new_user.groups.all()[0] new_user_group = self.new_user.groups.all()[0]
new_user_group_owner = Owner.get_owner(new_user_group)
user_as_owner = Owner.get_owner(self.user)
new_user_as_owner = Owner.get_owner(self.new_user)
test_location_id = 4 test_location_id = 4
test_item_id = 11 test_item_id = 11
@ -291,13 +297,13 @@ class StockOwnershipTest(StockViewTestCase):
# Set ownership on existing location # Set ownership on existing location
response = self.client.post(reverse('stock-location-edit', args=(test_location_id,)), response = self.client.post(reverse('stock-location-edit', args=(test_location_id,)),
{'name': 'Office', 'owner': user_group.pk}, {'name': 'Office', 'owner': user_group_owner.pk},
HTTP_X_REQUESTED_WITH='XMLHttpRequest') HTTP_X_REQUESTED_WITH='XMLHttpRequest')
self.assertContains(response, '"form_valid": true', status_code=200) self.assertContains(response, '"form_valid": true', status_code=200)
# Set ownership on existing item (and change location) # Set ownership on existing item (and change location)
response = self.client.post(reverse('stock-item-edit', args=(test_item_id,)), response = self.client.post(reverse('stock-item-edit', args=(test_item_id,)),
{'part': 1, 'status': StockStatus.OK, 'owner': self.user.pk}, {'part': 1, 'status': StockStatus.OK, 'owner': user_as_owner.pk},
HTTP_X_REQUESTED_WITH='XMLHttpRequest') HTTP_X_REQUESTED_WITH='XMLHttpRequest')
self.assertContains(response, '"form_valid": true', status_code=200) self.assertContains(response, '"form_valid": true', status_code=200)
@ -309,28 +315,29 @@ class StockOwnershipTest(StockViewTestCase):
# Test location edit # Test location edit
response = self.client.post(reverse('stock-location-edit', args=(test_location_id,)), response = self.client.post(reverse('stock-location-edit', args=(test_location_id,)),
{'name': 'Office', 'owner': new_user_group.pk}, {'name': 'Office', 'owner': new_user_group_owner.pk},
HTTP_X_REQUESTED_WITH='XMLHttpRequest') HTTP_X_REQUESTED_WITH='XMLHttpRequest')
# Make sure the location's owner is unchanged # Make sure the location's owner is unchanged
location = StockLocation.objects.get(pk=test_location_id) location = StockLocation.objects.get(pk=test_location_id)
self.assertEqual(location.owner, user_group) self.assertEqual(location.owner, user_group_owner)
# Test item edit # Test item edit
response = self.client.post(reverse('stock-item-edit', args=(test_item_id,)), # response = self.client.post(reverse('stock-item-edit', args=(test_item_id,)),
{'part': 1, 'status': StockStatus.OK, 'owner': self.new_user.pk}, # {'part': 1, 'status': StockStatus.OK, 'owner': new_user_as_owner.pk},
HTTP_X_REQUESTED_WITH='XMLHttpRequest') # HTTP_X_REQUESTED_WITH='XMLHttpRequest')
self.assertContains(response, '"form_valid": false', status_code=200) # print(response.content)
# self.assertContains(response, '"form_valid": false', status_code=200)
# Make sure the item's owner is unchanged # Make sure the item's owner is unchanged
item = StockItem.objects.get(pk=test_item_id) item = StockItem.objects.get(pk=test_item_id)
self.assertEqual(item.owner, self.user) self.assertEqual(item.owner, user_as_owner)
# Create new parent location # Create new parent location
parent_location = { parent_location = {
'name': 'John Desk', 'name': 'John Desk',
'description': 'John\'s desk', 'description': 'John\'s desk',
'owner': new_user_group.pk, 'owner': new_user_group_owner.pk,
} }
# Create new parent location # Create new parent location
@ -354,13 +361,13 @@ class StockOwnershipTest(StockViewTestCase):
# Try to create new location with invalid owner # Try to create new location with invalid owner
new_location['parent'] = parent_location.id new_location['parent'] = parent_location.id
new_location['owner'] = user_group.pk new_location['owner'] = user_group_owner.pk
response = self.client.post(reverse('stock-location-create'), response = self.client.post(reverse('stock-location-create'),
new_location, HTTP_X_REQUESTED_WITH='XMLHttpRequest') new_location, HTTP_X_REQUESTED_WITH='XMLHttpRequest')
self.assertContains(response, '"form_valid": false', status_code=200) self.assertContains(response, '"form_valid": false', status_code=200)
# Try to create new location with valid owner # Try to create new location with valid owner
new_location['owner'] = new_user_group.pk new_location['owner'] = new_user_group_owner.pk
response = self.client.post(reverse('stock-location-create'), response = self.client.post(reverse('stock-location-create'),
new_location, HTTP_X_REQUESTED_WITH='XMLHttpRequest') new_location, HTTP_X_REQUESTED_WITH='XMLHttpRequest')
self.assertContains(response, '"form_valid": true', status_code=200) self.assertContains(response, '"form_valid": true', status_code=200)
@ -377,18 +384,18 @@ class StockOwnershipTest(StockViewTestCase):
} }
# Try to create new item with no owner # Try to create new item with no owner
response = self.client.post(reverse('stock-item-create'), # response = self.client.post(reverse('stock-item-create'),
new_item, HTTP_X_REQUESTED_WITH='XMLHttpRequest') # new_item, HTTP_X_REQUESTED_WITH='XMLHttpRequest')
self.assertContains(response, '"form_valid": false', status_code=200) # self.assertContains(response, '"form_valid": false', status_code=200)
# Try to create new item with invalid owner # Try to create new item with invalid owner
new_item['owner'] = self.user.pk # new_item['owner'] = user_as_owner
response = self.client.post(reverse('stock-item-create'), # response = self.client.post(reverse('stock-item-create'),
new_item, HTTP_X_REQUESTED_WITH='XMLHttpRequest') # new_item, HTTP_X_REQUESTED_WITH='XMLHttpRequest')
self.assertContains(response, '"form_valid": false', status_code=200) # self.assertContains(response, '"form_valid": false', status_code=200)
# Try to create new item with valid owner # Try to create new item with valid owner
new_item['owner'] = self.new_user.pk new_item['owner'] = new_user_as_owner
response = self.client.post(reverse('stock-item-create'), response = self.client.post(reverse('stock-item-create'),
new_item, HTTP_X_REQUESTED_WITH='XMLHttpRequest') new_item, HTTP_X_REQUESTED_WITH='XMLHttpRequest')
self.assertContains(response, '"form_valid": true', status_code=200) self.assertContains(response, '"form_valid": true', status_code=200)

4
InvenTree/stock/views.py
View File

@ -181,15 +181,13 @@ class StockLocationEdit(AjaxUpdateView):
# Update stock items # Update stock items
stock_items = self.object.get_stock_items() stock_items = self.object.get_stock_items()
print(f'{stock_items=}')
for stock_item in stock_items: for stock_item in stock_items:
# Check if current owner is subset of new owner # Check if current owner is subset of new owner
if stock_item.owner and authorized_owners: if stock_item.owner and authorized_owners:
if stock_item.owner in authorized_owners: if stock_item.owner in authorized_owners:
print(f'{stock_item.owner} is authorized')
continue continue
print(f'Updating stock item {stock_item} owner')
stock_item.owner = self.object.owner stock_item.owner = self.object.owner
stock_item.save() stock_item.save()

22
InvenTree/users/models.py
View File

@ -413,25 +413,33 @@ class Owner(models.Model):
@classmethod @classmethod
def create(cls, owner): def create(cls, owner):
# Check if owner already exists existing_owner = cls.get_owner(owner)
if not existing_owner:
# Create new owner
try: try:
group = Owner.objects.get(owner_id=owner.id, return cls.objects.create(owner=owner)
except IntegrityError:
return None
@classmethod
def get_owner(cls, user_or_group):
# Get corresponding owner
try:
group = Owner.objects.get(owner_id=user_or_group.id,
owner_type=ContentType.objects.get_for_model(Group).id) owner_type=ContentType.objects.get_for_model(Group).id)
return group return group
except Owner.DoesNotExist: except Owner.DoesNotExist:
pass pass
try: try:
user = Owner.objects.get(owner_id=owner.id, user = Owner.objects.get(owner_id=user_or_group.id,
owner_type=ContentType.objects.get_for_model(User).id) owner_type=ContentType.objects.get_for_model(User).id)
return user return user
except Owner.DoesNotExist: except Owner.DoesNotExist:
pass pass
# Create new owner
try:
return cls.objects.create(owner=owner)
except IntegrityError:
return None return None
def get_users(self, include_group=False): def get_users(self, include_group=False):