From 7a5485cef9dad8352fb66cc3f1cb679a93a36eca Mon Sep 17 00:00:00 2001
From: MueezKhan246 <93375917+MueezKhan246@users.noreply.github.com>
Date: Wed, 5 Jun 2024 11:55:45 +0500
Subject: [PATCH] Revert "Remove blackboard unencrypted columns from models
 (#2118)" (#2125)

This reverts commit 11a42f9100f548d51d89b468b4774eeaaddb6b0e.
---
 CHANGELOG.rst                                 |  4 ----
 enterprise/__init__.py                        |  2 +-
 .../migrations/0023_auto_20240604_1046.py     | 21 ------------------
 integrated_channels/blackboard/models.py      | 22 +++++++++++++++++++
 4 files changed, 23 insertions(+), 26 deletions(-)
 delete mode 100644 integrated_channels/blackboard/migrations/0023_auto_20240604_1046.py

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 9d92109b65..f7171d6e45 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -17,10 +17,6 @@ Unreleased
 ----------
 * nothing unreleased
 
-[4.19.8]
---------
-* feat: remove client_id and client_secret columns from ``BlackboardEnterpriseCustomerConfiguration``
-
 [4.19.7]
 --------
 * feat: schema level improvement in integrated-channels
diff --git a/enterprise/__init__.py b/enterprise/__init__.py
index 330beaf731..4e617e328b 100644
--- a/enterprise/__init__.py
+++ b/enterprise/__init__.py
@@ -2,4 +2,4 @@
 Your project description goes here.
 """
 
-__version__ = "4.19.8"
+__version__ = "4.19.7"
diff --git a/integrated_channels/blackboard/migrations/0023_auto_20240604_1046.py b/integrated_channels/blackboard/migrations/0023_auto_20240604_1046.py
deleted file mode 100644
index 5a9bbc55ab..0000000000
--- a/integrated_channels/blackboard/migrations/0023_auto_20240604_1046.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# Generated by Django 3.2.23 on 2024-06-04 10:46
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('blackboard', '0022_blackboardlearnerassessmentdatatransmissionaudit_is_transmitted_and_more'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='blackboardenterprisecustomerconfiguration',
-            name='client_id',
-        ),
-        migrations.RemoveField(
-            model_name='blackboardenterprisecustomerconfiguration',
-            name='client_secret',
-        ),
-    ]
diff --git a/integrated_channels/blackboard/models.py b/integrated_channels/blackboard/models.py
index 7c906909d3..982d8d29d6 100644
--- a/integrated_channels/blackboard/models.py
+++ b/integrated_channels/blackboard/models.py
@@ -99,6 +99,17 @@ class BlackboardEnterpriseCustomerConfiguration(EnterpriseCustomerPluginConfigur
     The Enterprise-specific configuration we need for integrating with Blackboard.
     """
 
+    client_id = models.CharField(
+        max_length=255,
+        blank=True,
+        default='',
+        verbose_name="API Client ID or Blackboard Application Key",
+        help_text=(
+            "The API Client ID provided to edX by the enterprise customer to be used to make API "
+            "calls on behalf of the customer. Called Application Key in Blackboard"
+        )
+    )
+
     decrypted_client_id = EncryptedCharField(
         max_length=255,
         blank=True,
@@ -132,6 +143,17 @@ def encrypted_client_id(self, value):
         """
         self.decrypted_client_id = value
 
+    client_secret = models.CharField(
+        max_length=255,
+        blank=True,
+        default='',
+        verbose_name="API Client Secret or Application Secret",
+        help_text=(
+            "The API Client Secret provided to edX by the enterprise customer to be used to make "
+            " API calls on behalf of the customer. Called Application Secret in Blackboard"
+        )
+    )
+
     decrypted_client_secret = EncryptedCharField(
         max_length=255,
         blank=True,