Skip to content
This repository was archived by the owner on Jun 6, 2019. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion programs/apps/api/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class ProgramSerializer(serializers.ModelSerializer):

class Meta(object): # pylint: disable=missing-docstring
model = models.Program
fields = ('id', 'name', 'description', 'category', 'certificate_type', 'status', 'created', 'modified')
fields = ('id', 'name', 'description', 'category', 'status', 'created', 'modified')
read_only_fields = ('id', 'created', 'modified')

def validate_status(self, status):
Expand Down
17 changes: 2 additions & 15 deletions programs/apps/api/v1/tests/test_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,13 @@

from programs.apps.api.v1.tests.mixins import JwtMixin
from programs.apps.core.tests.factories import UserFactory
from programs.apps.programs.constants import CertificateType, ProgramCategory, ProgramStatus
from programs.apps.programs.constants import ProgramCategory, ProgramStatus
from programs.apps.programs.tests.factories import ProgramFactory


USERNAME = 'preferred_username'
POST_FIELDS = ("name", "description", "category", "certificate_type", "status")
POST_FIELDS = ("name", "description", "category", "status")
CATEGORIES = (ProgramCategory.XSERIES, )
CERT_TYPES = (CertificateType.VERIFIED, )
STATUSES = (ProgramStatus.UNPUBLISHED, ProgramStatus.ACTIVE, ProgramStatus.RETIRED, ProgramStatus.DELETED)


Expand Down Expand Up @@ -86,7 +85,6 @@ def test_create(self):
"name": data["name"],
"description": data["description"],
"category": data["category"],
"certificate_type": data["certificate_type"],
"status": data["status"],
"id": ANY,
"created": ANY,
Expand All @@ -101,7 +99,6 @@ def test_missing_fields(self, field):
"""
defaults = {
"description": None,
"certificate_type": None,
"status": ProgramStatus.UNPUBLISHED,
}

Expand Down Expand Up @@ -131,16 +128,6 @@ def test_create_with_invalid_status(self, status):
content = json.loads(response.content)
self.assertIn("not a valid choice", content["status"][0])

def test_create_with_invalid_certificate_type(self):
"""
Ensure that it is not allowed to create a Program with an unrecognized certificate type
"""
data = self._build_post_data(certificate_type="unrecognized-type")
response = self._make_request(method='post', data=data, admin=True)
self.assertEqual(response.status_code, 400)
content = json.loads(response.content)
self.assertIn("not a valid choice", content["certificate_type"][0])

@ddt.data(None, "", "unrecognized")
def test_create_with_invalid_category(self, category):
"""
Expand Down
1 change: 0 additions & 1 deletion programs/apps/api/v1/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ class ProgramsViewSet(mixins.CreateModelMixin, mixins.ListModelMixin, viewsets.G
* name: The user-facing display name for this Program.
* description: A full-length description of the Program.
* category: The category / type of Program. Right now the only value allowed is 'xseries'.
* certificate_type: Optional certification criteria for course runs associated with this Program.
* status: The lifecycle status of this Program. Right now the only value allowed is 'unpublished'.
* created: The date/time this Program was created.
* modified: The date/time this Program was last modified.
Expand Down
6 changes: 0 additions & 6 deletions programs/apps/programs/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,6 @@ class ProgramCategory(object):
XSERIES = "xseries"


class CertificateType(object):
"""Allowed values for Program.certificate_type"""

VERIFIED = "verified"


class ProgramStatus(object):
"""Allowed values for Program.status"""

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals

from django.db import models, migrations


class Migration(migrations.Migration):

dependencies = [
('programs', '0003_auto_20150921_1944'),
]

operations = [
migrations.RemoveField(
model_name='program',
name='certificate_type',
),
]
8 changes: 0 additions & 8 deletions programs/apps/programs/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,6 @@ class Program(TimeStampedModel):
choices=_choices(constants.ProgramCategory.XSERIES),
)

certificate_type = models.CharField(
help_text=_('Optional certification criteria for course runs associated with this Program.'),
max_length=32,
choices=[(None, _("None"))] + _choices(constants.CertificateType.VERIFIED),
null=True,
blank=True,
)

status = models.CharField(
help_text=_('The lifecycle status of this Program.'),
max_length=16,
Expand Down
3 changes: 1 addition & 2 deletions programs/apps/programs/tests/factories.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import factory

from programs.apps.programs.models import Program
from programs.apps.programs.constants import CertificateType, ProgramCategory, ProgramStatus
from programs.apps.programs.constants import ProgramCategory, ProgramStatus


class ProgramFactory(factory.django.DjangoModelFactory): # pylint: disable=missing-docstring
Expand All @@ -14,5 +14,4 @@ class Meta(object): # pylint: disable=missing-docstring
name = factory.Sequence(lambda n: 'test-program-{}'.format(n)) # pylint: disable=unnecessary-lambda
description = "test-description"
category = ProgramCategory.XSERIES
certificate_type = CertificateType.VERIFIED
status = ProgramStatus.UNPUBLISHED