From 03111d12dad4230f035730dd6d7340a5bc55e4d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mar=C3=ADa=20Fernanda=20Magallanes?=
 <35668326+MaferMazu@users.noreply.github.com>
Date: Fri, 24 May 2024 10:07:46 -0500
Subject: [PATCH] fix: use tutor config on codejail service and add patches to
 edit it DS-894 (#55)

* fix: use tutor config on codejail service and add patches to edit it

* fix: use the right settings for each environment

* fix: add code_jail to be able to edit it trough patches

* fix: add indent to the patches
---
 .../patches/local-docker-compose-dev-services  |  4 ++--
 .../patches/local-docker-compose-services      |  2 +-
 .../templates/codejail/apps/config/tutor.py    | 18 +++++++++++++-----
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/tutorcodejail/patches/local-docker-compose-dev-services b/tutorcodejail/patches/local-docker-compose-dev-services
index d0d45e9..b092da1 100644
--- a/tutorcodejail/patches/local-docker-compose-dev-services
+++ b/tutorcodejail/patches/local-docker-compose-dev-services
@@ -2,7 +2,7 @@ codejailservice:
   command: flask run --host 0.0.0.0 --port 8550
   environment:
     FLASK_ENV: development
-    FLASK_APP_SETTINGS: codejailservice.config.DevelopmentConfig
+    FLASK_APP_SETTINGS: codejailservice.tutor.DevelopmentConfig
   ports:
     - "8550:8550"
-  restart: unless-stopped
\ No newline at end of file
+  restart: unless-stopped
diff --git a/tutorcodejail/patches/local-docker-compose-services b/tutorcodejail/patches/local-docker-compose-services
index fe10611..28211ad 100644
--- a/tutorcodejail/patches/local-docker-compose-services
+++ b/tutorcodejail/patches/local-docker-compose-services
@@ -2,7 +2,7 @@
 codejailservice:
   image: {{ CODEJAIL_DOCKER_IMAGE }}
   environment:
-    FLASK_APP_SETTINGS: codejailservice.config.ProductionConfig
+    FLASK_APP_SETTINGS: codejailservice.tutor.ProductionConfig
   {% if CODEJAIL_ENFORCE_APPARMOR %}
   security_opt:
     - apparmor:docker-edx-sandbox-{{ CODEJAIL_SANDBOX_PYTHON_VERSION }}
diff --git a/tutorcodejail/templates/codejail/apps/config/tutor.py b/tutorcodejail/templates/codejail/apps/config/tutor.py
index d9b2609..df72ab4 100644
--- a/tutorcodejail/templates/codejail/apps/config/tutor.py
+++ b/tutorcodejail/templates/codejail/apps/config/tutor.py
@@ -1,10 +1,18 @@
 """Module with the configuration of config classes."""
-from base import BaseConfig
+from codejailservice.config import DevelopmentConfig, ProductionConfig
 
 
-class DevConfig(BaseConfig):
-    """Class to use for development context that inherits from BaseConfig."""
+class DevelopmentConfig(DevelopmentConfig):
+    """Class to use for development context that inherits from DevelopmentConfig."""
 
+    CODE_JAIL = DevelopmentConfig.CODE_JAIL
+    {{patch("codejail-common-settings") | indent(4)}}
+    {{patch("codejail-development-settings") | indent(4)}}
 
-class ProductionConfig(BaseConfig):
-    """Class to use for production context that inherits from BaseConfig."""
+
+class ProductionConfig(ProductionConfig):
+    """Class to use for production context that inherits from ProductionConfig."""
+
+    CODE_JAIL = ProductionConfig.CODE_JAIL
+    {{patch("codejail-common-settings") | indent(4)}}
+    {{patch("codejail-production-settings") | indent(4)}}