-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' of https://github.com/pennlabs/platform into sh…
…ared-actions-migration
- Loading branch information
Showing
13 changed files
with
1,569 additions
and
762 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
Large diffs are not rendered by default.
Oops, something went wrong.
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
61 changes: 61 additions & 0 deletions
61
backend/accounts/migrations/0005_privacyresource_privacysetting.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,61 @@ | ||
# Generated by Django 3.2.9 on 2023-03-04 21:59 | ||
|
||
from django.conf import settings | ||
from django.db import migrations, models | ||
import django.db.models.deletion | ||
|
||
|
||
class Migration(migrations.Migration): | ||
|
||
dependencies = [ | ||
("accounts", "0004_user_profile_pic"), | ||
] | ||
|
||
operations = [ | ||
migrations.CreateModel( | ||
name="PrivacyResource", | ||
fields=[ | ||
( | ||
"id", | ||
models.AutoField( | ||
auto_created=True, | ||
primary_key=True, | ||
serialize=False, | ||
verbose_name="ID", | ||
), | ||
), | ||
("name", models.CharField(max_length=255)), | ||
], | ||
), | ||
migrations.CreateModel( | ||
name="PrivacySetting", | ||
fields=[ | ||
( | ||
"id", | ||
models.AutoField( | ||
auto_created=True, | ||
primary_key=True, | ||
serialize=False, | ||
verbose_name="ID", | ||
), | ||
), | ||
("enabled", models.BooleanField(default=True)), | ||
( | ||
"resource", | ||
models.ForeignKey( | ||
on_delete=django.db.models.deletion.CASCADE, | ||
related_name="resource", | ||
to="accounts.privacyresource", | ||
), | ||
), | ||
( | ||
"user", | ||
models.ForeignKey( | ||
on_delete=django.db.models.deletion.CASCADE, | ||
related_name="privacy_setting", | ||
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,11 +6,21 @@ | |
from django.utils import timezone | ||
from rest_framework import serializers | ||
|
||
from accounts.models import Email, Major, PhoneNumber, School, User | ||
from accounts.models import ( | ||
Email, | ||
Major, | ||
PhoneNumber, | ||
PrivacyResource, | ||
PrivacySetting, | ||
School, | ||
User, | ||
) | ||
from accounts.serializers import ( | ||
EmailSerializer, | ||
MajorSerializer, | ||
PhoneNumberSerializer, | ||
PrivacyResourceSerializer, | ||
PrivacySettingSerializer, | ||
SchoolSerializer, | ||
StudentSerializer, | ||
UserSearchSerializer, | ||
|
@@ -546,3 +556,38 @@ def test_verification_timeout(self): | |
with self.assertRaises(serializers.ValidationError): | ||
serializer.save() | ||
self.assertFalse(email.verified) | ||
|
||
|
||
class PrivacyResourceSerializerTestCase(TestCase): | ||
def setUp(self): | ||
self.resource = PrivacyResource.objects.create(name="ACADEMIC_IDENTITY") | ||
self.serializer = PrivacyResourceSerializer(self.resource) | ||
|
||
def test_privacy_resource(self): | ||
sample_response = {"name": self.resource.name} | ||
self.assertEqual(self.serializer.data, sample_response) | ||
|
||
|
||
class PrivacySettingSerializerTestCase(TestCase): | ||
def setUp(self): | ||
self.user = get_user_model().objects.create_user( | ||
pennid=1, | ||
username="student", | ||
password="secret", | ||
first_name="First", | ||
last_name="Last", | ||
email="[email protected]", | ||
) | ||
self.resource = PrivacyResource.objects.create(name="ACADEMIC_IDENTITY") | ||
self.setting = PrivacySetting.objects.create( | ||
user=self.user, resource=self.resource, enabled=True | ||
) | ||
self.serializer = PrivacySettingSerializer(self.setting) | ||
|
||
def test_privacy_resource(self): | ||
sample_response = { | ||
"id": self.setting.id, | ||
"resource": PrivacyResourceSerializer(self.resource).data, | ||
"enabled": self.setting.enabled, | ||
} | ||
self.assertEqual(self.serializer.data, sample_response) |
Oops, something went wrong.