Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

LMSM - Restricting location type for Checkout #3691

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

LMSM - Restricting location type for Checkout #3691

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc8e9cb
LMSM - Restricting location type for Checkout
emaciupe Jun 17, 2024
5677f99
Merge branch '37440/lmsm-make-location-mandatory-during-checkout' of …
emaciupe Jun 17, 2024
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
14 changes: 14 additions & 0 deletions src/etools/applications/last_mile/serializers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

from rest_framework import serializers
from rest_framework.exceptions import ValidationError
from rest_framework.generics import get_object_or_404
from unicef_attachments.fields import AttachmentSingleFileField
from unicef_attachments.serializers import AttachmentSerializerMixin

Expand Down Expand Up @@ -368,6 +369,19 @@ class Meta(TransferBaseSerializer.Meta):
'transfer_type', 'items', 'origin_check_out_at', 'destination_point'
)

def validate_destination_point(self, value):
transfer_type = self.initial_data['transfer_type']
destination_point = get_object_or_404(models.PointOfInterest, pk=value)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

let's leave it for next release

warehouse_type_id = get_object_or_404(models.PointOfInterestType, category='warehouse').pk

if destination_point.poi_type_id == warehouse_type_id:
if transfer_type == models.Transfer.DISTRIBUTION:
raise ValidationError(_('The distribution destination cannot be a warehouse.'))
elif transfer_type == models.Transfer.DELIVERY:
raise ValidationError(_('The delivery destination must be a warehouse.'))

return value

def validate_items(self, value):
# Make sure that all the items belong to this partner and are in the inventory of this location
total_items_count = len(value)
Expand Down
115 changes: 86 additions & 29 deletions src/etools/applications/last_mile/tests/test_views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ def test_api_poi_types_list(self):


class TestPointOfInterestView(BaseTenantTestCase):
fixtures = ('poi_type.json',)

@classmethod
def setUpTestData(cls):
call_command("update_notifications")
Expand All @@ -52,9 +54,10 @@ def setUpTestData(cls):
realms__data=['IP LM Editor'],
profile__organization=cls.partner.organization,
)
cls.poi_partner = PointOfInterestFactory(partner_organizations=[cls.partner], private=True)
# poi_type_id=4 -> school
cls.poi_partner = PointOfInterestFactory(partner_organizations=[cls.partner], private=True, poi_type_id=4)

def test_api_poi_list(self):
def test_poi_list(self):
url = reverse("last_mile:pois-list")
PointOfInterestFactory(private=True)

Expand All @@ -64,7 +67,25 @@ def test_api_poi_list(self):
self.assertEqual(len(response.data['results']), 1)
self.assertEqual(self.poi_partner.pk, response.data['results'][0]['id'])

def test_api_item_list(self):
def test_poi_list_type_filter(self):
url = reverse("last_mile:pois-list")

warehouse = PointOfInterestFactory(partner_organizations=[self.partner], private=True, poi_type_id=1) # warehouse
PointOfInterestFactory(partner_organizations=[self.partner], private=True, poi_type_id=2) # distribution_point
PointOfInterestFactory(partner_organizations=[self.partner], private=True, poi_type_id=3) # hospital

response = self.forced_auth_req('get', url, user=self.partner_staff)

self.assertEqual(response.status_code, status.HTTP_200_OK)
self.assertEqual(len(response.data['results']), 4)

response = self.forced_auth_req('get', url, user=self.partner_staff, data={"poi_type": 1})

self.assertEqual(response.status_code, status.HTTP_200_OK)
self.assertEqual(len(response.data['results']), 1)
self.assertEqual(warehouse.pk, response.data['results'][0]['id'])

def test_item_list(self):
url = reverse('last_mile:inventory-item-list', args=(self.poi_partner.pk,))
transfer = TransferFactory(
status=models.Transfer.COMPLETED, destination_point=self.poi_partner, partner_organization=self.partner)
Expand Down Expand Up @@ -123,64 +144,66 @@ def test_api_item_list(self):


class TestTransferView(BaseTenantTestCase):
fixtures = ('poi_type.json',)

@classmethod
def setUpTestData(cls):
cls.partner = PartnerFactory(organization=OrganizationFactory(name='Partner'))
cls.partner_staff = UserFactory(
realms__data=['IP LM Editor'],
profile__organization=cls.partner.organization,
)
cls.poi_partner_1 = PointOfInterestFactory(partner_organizations=[cls.partner], private=True)
cls.poi_partner_2 = PointOfInterestFactory(partner_organizations=[cls.partner], private=True)
cls.poi_partner_3 = PointOfInterestFactory(partner_organizations=[cls.partner], private=True)
cls.warehouse = PointOfInterestFactory(partner_organizations=[cls.partner], private=True, poi_type_id=1)
cls.distribution_point = PointOfInterestFactory(partner_organizations=[cls.partner], private=True, poi_type_id=2)
cls.hospital = PointOfInterestFactory(partner_organizations=[cls.partner], private=True, poi_type_id=3)
cls.incoming = TransferFactory(
partner_organization=cls.partner,
destination_point=cls.poi_partner_1
destination_point=cls.warehouse
)
cls.checked_in = TransferFactory(
partner_organization=cls.partner,
status=models.Transfer.COMPLETED,
destination_point=cls.poi_partner_1
destination_point=cls.warehouse
)
cls.outgoing = TransferFactory(
partner_organization=cls.partner,
origin_point=cls.poi_partner_1,
origin_point=cls.warehouse,
transfer_type=models.Transfer.DISTRIBUTION
)
cls.completed = TransferFactory(
partner_organization=cls.partner,
status=models.Transfer.COMPLETED,
origin_point=cls.poi_partner_1
origin_point=cls.warehouse
)
cls.attachment = AttachmentFactory(file=SimpleUploadedFile('proof_file.pdf', b'Proof File'))
cls.material = MaterialFactory(number='1234')

def test_incoming(self):
url = reverse("last_mile:transfers-incoming", args=(self.poi_partner_1.pk,))
url = reverse("last_mile:transfers-incoming", args=(self.warehouse.pk,))
response = self.forced_auth_req('get', url, user=self.partner_staff)

self.assertEqual(response.status_code, status.HTTP_200_OK)
self.assertEqual(len(response.data['results']), 1)
self.assertEqual(self.incoming.pk, response.data['results'][0]['id'])

def test_checked_in(self):
url = reverse('last_mile:transfers-checked-in', args=(self.poi_partner_1.pk,))
url = reverse('last_mile:transfers-checked-in', args=(self.warehouse.pk,))
response = self.forced_auth_req('get', url, user=self.partner_staff)

self.assertEqual(response.status_code, status.HTTP_200_OK)
self.assertEqual(len(response.data['results']), 1)
self.assertEqual(self.checked_in.pk, response.data['results'][0]['id'])

def test_outgoing(self):
url = reverse('last_mile:transfers-outgoing', args=(self.poi_partner_1.pk,))
url = reverse('last_mile:transfers-outgoing', args=(self.warehouse.pk,))
response = self.forced_auth_req('get', url, user=self.partner_staff)

self.assertEqual(response.status_code, status.HTTP_200_OK)
self.assertEqual(len(response.data['results']), 1)
self.assertEqual(self.outgoing.pk, response.data['results'][0]['id'])

def test_completed(self):
url = reverse('last_mile:transfers-completed', args=(self.poi_partner_1.pk,))
url = reverse('last_mile:transfers-completed', args=(self.warehouse.pk,))
response = self.forced_auth_req('get', url, user=self.partner_staff)

self.assertEqual(response.status_code, status.HTTP_200_OK)
Expand All @@ -204,7 +227,7 @@ def test_full_checkin(self):
],
"destination_check_in_at": timezone.now()
}
url = reverse('last_mile:transfers-new-check-in', args=(self.poi_partner_1.pk, self.incoming.pk))
url = reverse('last_mile:transfers-new-check-in', args=(self.warehouse.pk, self.incoming.pk))
response = self.forced_auth_req('patch', url, user=self.partner_staff, data=checkin_data)

self.assertEqual(response.status_code, status.HTTP_200_OK)
Expand Down Expand Up @@ -235,7 +258,7 @@ def test_partial_checkin_with_short(self):
],
"destination_check_in_at": timezone.now()
}
url = reverse('last_mile:transfers-new-check-in', args=(self.poi_partner_1.pk, self.incoming.pk))
url = reverse('last_mile:transfers-new-check-in', args=(self.warehouse.pk, self.incoming.pk))
response = self.forced_auth_req('patch', url, user=self.partner_staff, data=checkin_data)

self.assertEqual(response.status_code, status.HTTP_200_OK)
Expand Down Expand Up @@ -275,7 +298,7 @@ def test_partial_checkin_with_short_surplus(self):
],
"destination_check_in_at": timezone.now()
}
url = reverse('last_mile:transfers-new-check-in', args=(self.poi_partner_1.pk, self.incoming.pk))
url = reverse('last_mile:transfers-new-check-in', args=(self.warehouse.pk, self.incoming.pk))
response = self.forced_auth_req('patch', url, user=self.partner_staff, data=checkin_data)

self.assertEqual(response.status_code, status.HTTP_200_OK)
Expand Down Expand Up @@ -323,7 +346,7 @@ def test_partial_checkin_RUFT_material(self):
],
"destination_check_in_at": timezone.now()
}
url = reverse('last_mile:transfers-new-check-in', args=(self.poi_partner_1.pk, self.incoming.pk))
url = reverse('last_mile:transfers-new-check-in', args=(self.warehouse.pk, self.incoming.pk))
response = self.forced_auth_req('patch', url, user=self.partner_staff, data=checkin_data)

self.assertEqual(response.status_code, status.HTTP_200_OK)
Expand Down Expand Up @@ -365,13 +388,13 @@ def test_checkout_validation(self):
],
"origin_check_out_at": timezone.now()
}
url = reverse('last_mile:transfers-new-check-out', args=(self.poi_partner_1.pk,))
url = reverse('last_mile:transfers-new-check-out', args=(self.warehouse.pk,))
response = self.forced_auth_req('post', url, user=self.partner_staff, data=checkout_data)

self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
self.assertIn('Some of the items to be checked are no longer valid', response.data['items'])

def test_checkout_location_validation(self):
def test_checkout_distribution_location_validation(self):
item = ItemFactory(quantity=11, transfer=self.checked_in)

checkout_data = {
Expand All @@ -383,21 +406,55 @@ def test_checkout_location_validation(self):
],
"origin_check_out_at": timezone.now()
}
url = reverse('last_mile:transfers-new-check-out', args=(self.poi_partner_1.pk,))
url = reverse('last_mile:transfers-new-check-out', args=(self.warehouse.pk,))
response = self.forced_auth_req('post', url, user=self.partner_staff, data=checkout_data)

self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
self.assertIn('Destination location is mandatory at checkout.', response.data)

warehouse = PointOfInterestFactory(poi_type_id=1)
checkout_data['destination_point'] = warehouse.pk

url = reverse('last_mile:transfers-new-check-out', args=(self.warehouse.pk,))
response = self.forced_auth_req('post', url, user=self.partner_staff, data=checkout_data)

self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
self.assertIn('The distribution destination cannot be a warehouse.', response.data['destination_point'])

def test_checkout_delivery_location_validation(self):
item = ItemFactory(quantity=11, transfer=self.checked_in)

checkout_data = {
"transfer_type": models.Transfer.DELIVERY,
"comment": "",
"proof_file": self.attachment.pk,
"items": [
{"id": item.pk, "quantity": 10}
],
"origin_check_out_at": timezone.now()
}
url = reverse('last_mile:transfers-new-check-out', args=(self.warehouse.pk,))
response = self.forced_auth_req('post', url, user=self.partner_staff, data=checkout_data)

self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
self.assertIn('Destination location is mandatory at checkout.', response.data)

checkout_data['destination_point'] = self.distribution_point.pk

url = reverse('last_mile:transfers-new-check-out', args=(self.warehouse.pk,))
response = self.forced_auth_req('post', url, user=self.partner_staff, data=checkout_data)

self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
self.assertIn('The delivery destination must be a warehouse.', response.data['destination_point'])

def test_checkout_distribution(self):
item_1 = ItemFactory(quantity=11, transfer=self.checked_in)
item_2 = ItemFactory(quantity=22, transfer=self.checked_in)
item_3 = ItemFactory(quantity=33, transfer=self.checked_in)
destination = PointOfInterestFactory()

checkout_data = {
"transfer_type": models.Transfer.DISTRIBUTION,
"destination_point": destination.pk,
"destination_point": self.hospital.pk,
"comment": "",
"proof_file": self.attachment.pk,
"items": [
Expand All @@ -406,7 +463,7 @@ def test_checkout_distribution(self):
],
"origin_check_out_at": timezone.now()
}
url = reverse('last_mile:transfers-new-check-out', args=(self.poi_partner_1.pk,))
url = reverse('last_mile:transfers-new-check-out', args=(self.warehouse.pk,))
response = self.forced_auth_req('post', url, user=self.partner_staff, data=checkout_data)

self.assertEqual(response.status_code, status.HTTP_200_OK)
Expand All @@ -415,7 +472,7 @@ def test_checkout_distribution(self):
self.assertIn(response.data['proof_file'], self.attachment.file.path)

checkout_transfer = models.Transfer.objects.get(pk=response.data['id'])
self.assertEqual(checkout_transfer.destination_point, destination)
self.assertEqual(checkout_transfer.destination_point, self.hospital)
self.assertEqual(checkout_transfer.items.count(), len(checkout_data['items']))
self.assertEqual(checkout_transfer.items.get(pk=item_1.pk).quantity, 11)

Expand Down Expand Up @@ -443,7 +500,7 @@ def test_checkout_wastage(self):
],
"origin_check_out_at": timezone.now()
}
url = reverse('last_mile:transfers-new-check-out', args=(self.poi_partner_1.pk,))
url = reverse('last_mile:transfers-new-check-out', args=(self.warehouse.pk,))
response = self.forced_auth_req('post', url, user=self.partner_staff, data=checkout_data)

self.assertEqual(response.status_code, status.HTTP_200_OK)
Expand Down Expand Up @@ -473,7 +530,7 @@ def test_checkout_wastage_without_location(self):
],
"origin_check_out_at": timezone.now()
}
url = reverse('last_mile:transfers-new-check-out', args=(self.poi_partner_1.pk,))
url = reverse('last_mile:transfers-new-check-out', args=(self.warehouse.pk,))
response = self.forced_auth_req('post', url, user=self.partner_staff, data=checkout_data)

self.assertEqual(response.status_code, status.HTTP_200_OK)
Expand All @@ -490,7 +547,7 @@ def test_mark_completed(self):

self.assertEqual(self.outgoing.transfer_type, models.Transfer.DISTRIBUTION)

url = reverse('last_mile:transfers-mark-complete', args=(self.poi_partner_1.pk, self.outgoing.pk))
url = reverse('last_mile:transfers-mark-complete', args=(self.warehouse.pk, self.outgoing.pk))
response = self.forced_auth_req('patch', url, user=self.partner_staff)

self.assertEqual(response.status_code, status.HTTP_200_OK)
Expand All @@ -504,7 +561,7 @@ def test_item_expiry_ordering(self):
item_2 = ItemFactory(transfer=self.outgoing, expiry_date=timezone.now() + datetime.timedelta(days=20))
item_3 = ItemFactory(transfer=self.outgoing, expiry_date=timezone.now() + datetime.timedelta(days=10))

url = reverse('last_mile:transfers-details', args=(self.poi_partner_1.pk, self.outgoing.pk,))
url = reverse('last_mile:transfers-details', args=(self.warehouse.pk, self.outgoing.pk,))
response = self.forced_auth_req('get', url, user=self.partner_staff)

self.assertEqual(response.status_code, status.HTTP_200_OK)
Expand Down