Merge pull request #8795 from edx/zub/story/ecom-1815-update-creditprovider-model

add 'fulfillment_instructions' for 'CreditProvider' model

openedx/core/djangoapps/credit/api/provider.py

@@ -2,17 +2,13 @@
 API for initiating and tracking requests for credit from a provider.
 """
 
-import logging
-import uuid
 import datetime
-
+import logging
 import pytz
+import uuid
 
 from django.db import transaction
 
-from util.date_utils import to_timestamp
-
-from student.models import User
 from openedx.core.djangoapps.credit.exceptions import (
     UserIsNotEligible,
     CreditProviderNotConfigured,
@@ -27,6 +23,8 @@ from openedx.core.djangoapps.credit.models import (
     CreditEligibility,
 )
 from openedx.core.djangoapps.credit.signature import signature, get_shared_secret_key
+from student.models import User
+from util.date_utils import to_timestamp
 
 
 log = logging.getLogger(__name__)
@@ -51,6 +49,47 @@ def get_credit_providers():
     return CreditProvider.get_credit_providers()
 
 
+def get_credit_provider_info(provider_id):
+    """Retrieve the 'CreditProvider' model data against provided
+     credit provider.
+
+    Args:
+        provider_id (str): The identifier for the credit provider
+
+    Returns: 'CreditProvider' data dictionary
+
+    Example Usage:
+        >>> get_credit_provider_info("hogwarts")
+        {
+            "provider_id": "hogwarts",
+            "display_name": "Hogwarts School of Witchcraft and Wizardry",
+            "provider_url": "https://credit.example.com/",
+            "provider_status_url": "https://credit.example.com/status/",
+            "enable_integration": False,
+            "fulfillment_instructions": "
+                <p>In order to fulfill credit, Hogwarts School of Witchcraft and Wizardry requires learners to:</p>
+                <ul>
+                <li>Sample instruction abc</li>
+                <li>Sample instruction xyz</li>
+                </ul>",
+        }
+
+    """
+    credit_provider = CreditProvider.get_credit_provider(provider_id=provider_id)
+    credit_provider_data = {}
+    if credit_provider:
+        credit_provider_data = {
+            "provider_id": credit_provider.provider_id,
+            "display_name": credit_provider.display_name,
+            "provider_url": credit_provider.provider_url,
+            "provider_status_url": credit_provider.provider_status_url,
+            "enable_integration": credit_provider.enable_integration,
+            "fulfillment_instructions": credit_provider.fulfillment_instructions
+        }
+
+    return credit_provider_data
+
+
 @transaction.commit_on_success
 def create_credit_request(course_key, provider_id, username):
     """
@@ -84,7 +123,7 @@ def create_credit_request(course_key, provider_id, username):
     Arguments:
         course_key (CourseKey): The identifier for the course.
         provider_id (str): The identifier of the credit provider.
-        user (User): The user initiating the request.
+        username (str): The user initiating the request.
 
     Returns: dict
 

openedx/core/djangoapps/credit/models.py

@@ -94,6 +94,16 @@ class CreditProvider(TimeStampedModel):
         )
     )
 
+    fulfillment_instructions = models.TextField(
+        null=True,
+        blank=True,
+        help_text=ugettext_lazy(
+            "Plain text or html content for displaying further steps on "
+            "receipt page *after* paying for the credit to get credit for a "
+            "credit course against a credit provider."
+        )
+    )
+
     CREDIT_PROVIDERS_CACHE_KEY = "credit.providers.list"
 
     @classmethod
@@ -123,6 +133,16 @@ class CreditProvider(TimeStampedModel):
 
         return providers
 
+    @classmethod
+    def get_credit_provider(cls, provider_id):
+        """
+        Retrieve a credit provider with provided 'provider_id'.
+        """
+        try:
+            return CreditProvider.objects.get(active=True, provider_id=provider_id)
+        except cls.DoesNotExist:
+            return None
+
     def __unicode__(self):
         """Unicode representation of the credit provider. """
         return self.provider_id

openedx/core/djangoapps/credit/tests/test_api.py

@@ -48,6 +48,8 @@ class CreditApiTestBase(TestCase):
     PROVIDER_NAME = "Hogwarts School of Witchcraft and Wizardry"
     PROVIDER_URL = "https://credit.example.com/request"
     PROVIDER_STATUS_URL = "https://credit.example.com/status"
+    ENABLE_INTEGRATION = True
+    FULFILLMENT_INSTRUCTIONS = "Sample fulfillment instruction for credit completion."
 
     def setUp(self, **kwargs):
         super(CreditApiTestBase, self).setUp()
@@ -62,7 +64,8 @@ class CreditApiTestBase(TestCase):
             display_name=self.PROVIDER_NAME,
             provider_url=self.PROVIDER_URL,
             provider_status_url=self.PROVIDER_STATUS_URL,
-            enable_integration=True,
+            enable_integration=self.ENABLE_INTEGRATION,
+            fulfillment_instructions=self.FULFILLMENT_INSTRUCTIONS
         )
 
         return credit_course
@@ -447,6 +450,25 @@ class CreditProviderIntegrationApiTests(CreditApiTestBase):
         result = api.get_credit_providers()
         self.assertEqual(result, [])
 
+    def test_get_credit_provider_details(self):
+        """Test that credit api method 'test_get_credit_provider_details'
+        returns dictionary data related to provided credit provider.
+        """
+        expected_result = {
+            "provider_id": self.PROVIDER_ID,
+            "display_name": self.PROVIDER_NAME,
+            "provider_url": self.PROVIDER_URL,
+            "provider_status_url": self.PROVIDER_STATUS_URL,
+            "enable_integration": self.ENABLE_INTEGRATION,
+            "fulfillment_instructions": self.FULFILLMENT_INSTRUCTIONS
+        }
+        result = api.get_credit_provider_info(self.PROVIDER_ID)
+        self.assertEqual(result, expected_result)
+
+        # now test that user gets empty dict for non existent credit provider
+        result = api.get_credit_provider_info('fake_provider_id')
+        self.assertEqual(result, {})
+
     def test_credit_request(self):
         # Initiate a credit request
         request = api.create_credit_request(self.course_key, self.PROVIDER_ID, self.USER_INFO['username'])