Merge branch 'dev' of https://github.com/Code4GovTech/DMP-CMS-Backend-API into supabase_migration_orm

Author: sasi2312

app.py

@@ -265,7 +265,7 @@ def get_issues_by_owner_id(owner, issue):
       if val['body_text']:
         if "Weekly Goals" in val['body_text'] and not w_goal_url:
             w_goal_url = val['body_text']
-            plain_text_body = markdown2.markdown(val['body_text'])
+            plain_text_body = markdown.markdown(val['body_text'])
 
             tasks = re.findall(r'\[(x| )\]', plain_text_body)
             total_tasks = len(tasks)

requirements.txt

@@ -4,7 +4,7 @@ python-dotenv==1.0.1
 supabase==2.4.5
 gunicorn==22.0.0
 flasgger==0.9.7.1
-markdown2==2.4.13
+markdown==3.4.1
 requests==2.32.2
 flask-cors==4.0.1
 Flask-SQLAlchemy==3.1.1 

utils.py

@@ -1,4 +1,4 @@
-import requests,re,markdown2,os
+import requests,re,markdown,os
 from collections import defaultdict
 from datetime import datetime, timedelta
 from dateutil import parser
@@ -115,7 +115,7 @@ def find_week_data(issue_details):
 
         for week in weekly_updates:
 
-            plain_text_body = markdown2.markdown(week['val']['body'])
+            plain_text_body = markdown.markdown(week['val']['body'])
 
             tasks = re.findall(r'\[(x| )\]', plain_text_body)
             total_tasks = len(tasks)
@@ -154,7 +154,7 @@ def find_week_avg(url):
 
         if "Weekly Goals" in item['body']:
             w_goal_url = item['body']
-            plain_text_body = markdown2.markdown(issue_details[0]['body'])
+            plain_text_body = markdown.markdown(issue_details[0]['body'])
 
             tasks = re.findall(r'\[(x| )\]', plain_text_body)
             total_tasks = len(tasks)

v2_app.py

@@ -1,6 +1,6 @@
 import traceback,re
 from flask import Blueprint, jsonify, request
-import markdown2
+import markdown
 from utils import require_secret_key
 from db import SupabaseInterface
 from utils import determine_week
@@ -51,15 +51,15 @@ def get_issues_by_owner_id_v2(owner, issue):
             if val['body_text']:                                
                 if ("Weekly Goals" in val['body_text'] and not w_goal_url):
                     w_goal_url = val['body_text']
-                    plain_text_body = markdown2.markdown(val['body_text'])
+                    plain_text_body = markdown.markdown(val['body_text'])
                     tasks = re.findall(r'\[(x| )\]', plain_text_body)
                     total_tasks = len(tasks)
                     completed_tasks = tasks.count('x')
                     avg = round((completed_tasks/total_tasks)*100) if total_tasks!=0 else 0
 
                 if ("Weekly Learnings" in val['body_text'] and not w_learn_url):
                     w_learn_url = val['body_text']
-                    plain_text_wurl = markdown2.markdown(val['body_text'])
+                    plain_text_wurl = markdown.markdown(val['body_text'])
 
 
             # mentors = mentors_data['mentors']

v2_utils.py

@@ -1,4 +1,4 @@
-import logging,re,markdown2
+import logging,re,markdown
 
 # Func to create name and link for all mentors and contributors
 def define_link_data(usernames):