-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: introduce approval for partners
- Loading branch information
Showing
7 changed files
with
170 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
42 changes: 42 additions & 0 deletions
42
contile/migrations/0002_partner_is_active_partner_last_approved_by_and_more.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,42 @@ | ||
# Generated by Django 4.0.4 on 2022-04-27 06:46 | ||
|
||
from django.conf import settings | ||
from django.db import migrations, models | ||
|
||
|
||
class Migration(migrations.Migration): | ||
|
||
dependencies = [ | ||
migrations.swappable_dependency(settings.AUTH_USER_MODEL), | ||
("contile", "0001_initial"), | ||
] | ||
|
||
operations = [ | ||
migrations.AddField( | ||
model_name="partner", | ||
name="is_active", | ||
field=models.BooleanField(default=False), | ||
), | ||
migrations.AddField( | ||
model_name="partner", | ||
name="last_approved_by", | ||
field=models.ForeignKey( | ||
blank=True, | ||
null=True, | ||
on_delete=models.deletion.CASCADE, | ||
related_name="approved_by", | ||
to=settings.AUTH_USER_MODEL, | ||
), | ||
), | ||
migrations.AddField( | ||
model_name="partner", | ||
name="last_updated_by", | ||
field=models.ForeignKey( | ||
blank=True, | ||
null=True, | ||
on_delete=models.deletion.CASCADE, | ||
related_name="updated_by", | ||
to=settings.AUTH_USER_MODEL, | ||
), | ||
), | ||
] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,55 @@ | ||
import mock | ||
from django.contrib.admin.sites import AdminSite | ||
from django.test import RequestFactory, TestCase | ||
|
||
from consvc_shepherd.tests.factories import UserFactory | ||
from contile.admin import PartnerListAdmin, approve_partner_settings | ||
from contile.models import Partner | ||
|
||
|
||
class PartnerAdminTest(TestCase): | ||
def setUp(self): | ||
request_factory = RequestFactory() | ||
self.request = request_factory.get("/admin") | ||
self.request.user = UserFactory() | ||
|
||
site = AdminSite() | ||
self.admin = PartnerListAdmin(Partner, site) | ||
self.partner = Partner.objects.create( | ||
name="Partner1", last_updated_by=self.request.user | ||
) | ||
|
||
def test_approve_partner_settings(self): | ||
request = mock.Mock() | ||
request.user = UserFactory() | ||
self.assertFalse(self.partner.is_active) | ||
self.assertIsNone(self.partner.last_approved_by) | ||
approve_partner_settings(None, request, [self.partner]) | ||
self.assertTrue(self.partner.is_active) | ||
self.assertIsNotNone(self.partner.last_approved_by) | ||
|
||
def test_partner_admin_save_model(self): | ||
request = mock.Mock() | ||
request.user = UserFactory() | ||
|
||
self.partner.is_active = True | ||
self.partner.is_updated_by = UserFactory() | ||
self.partner.is_approved_by = UserFactory() | ||
self.partner.save() | ||
self.admin.save_model(request, self.partner, None, {}) | ||
self.assertFalse(self.partner.is_active) | ||
self.assertIsNone(self.partner.last_approved_by) | ||
self.assertEqual(self.partner.last_updated_by, request.user) | ||
|
||
def test_approval_fails_when_updater_and_approver_are_the_same(self): | ||
request = mock.Mock() | ||
request.user = UserFactory() | ||
|
||
self.partner.is_active = False | ||
self.partner.last_updated_by = request.user | ||
self.partner.last_approved_by = None | ||
self.partner.save() | ||
approve_partner_settings(None, request, [self.partner]) | ||
self.assertFalse(self.partner.is_active) | ||
self.assertIsNone(self.partner.last_approved_by) | ||
self.assertEqual(self.partner.last_updated_by, request.user) |