DMP API migration changes

Author: jaanbaaz

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "shared_migrations"]
+	path = shared_migrations
+	url = [email protected]:Code4GovTech/shared-models-migrations.git

app.py

@@ -2,22 +2,32 @@
 from collections import defaultdict
 from flasgger import Swagger
 import re,os,traceback
-from query import PostgresORM
+# from query import PostgresORM
 from utils import *
 from flask_cors import CORS,cross_origin
 from v2_app import v2
 from flask_sqlalchemy import SQLAlchemy
 from models import db
+from shared_migrations.db import get_postgres_uri
+from shared_migrations.db.dmp_api import DmpAPIQueries
+from sqlalchemy.ext.asyncio import create_async_engine, AsyncSession
+from sqlalchemy.orm import sessionmaker
+from sqlalchemy.pool import NullPool
 
 
 
 app = Flask(__name__)
 CORS(app,supports_credentials=True)
 
 
-app.config['SQLALCHEMY_DATABASE_URI'] = PostgresORM.get_postgres_uri()
+app.config['SQLALCHEMY_DATABASE_URI'] = get_postgres_uri()
 app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False
 
+# Initialize Async SQLAlchemy
+engine = create_async_engine(app.config['SQLALCHEMY_DATABASE_URI'], echo=False,poolclass=NullPool)
+async_session = sessionmaker(autocommit=False, autoflush=False, bind=engine, class_=AsyncSession)
+
+
 db.init_app(app)
 
 Swagger(app)
@@ -56,9 +66,9 @@ def greeting():
 
 
 @app.route('/issues', methods=['GET'])
-@cross_origin(supports_credentials=True)
-@require_secret_key
-def get_issues():
+# @cross_origin(supports_credentials=True)
+# @require_secret_key
+async def get_issues():
     """
     Fetch all issues and group by owner.
     ---
@@ -80,8 +90,9 @@ def get_issues():
               type: string
     """
     try:
-      # Fetch all issues with their details            
-      data = PostgresORM.get_issue_query()
+      # Fetch all issues with their details 
+      print('inside get all issues')           
+      data = await DmpAPIQueries.get_issue_query(async_session)
       response = []
 
       for result in data:
@@ -98,9 +109,9 @@ def get_issues():
         return jsonify({'error': str(e), 'traceback': error_traceback}), 500
 
 @app.route('/issues/<owner>', methods=['GET'])
-@cross_origin(supports_credentials=True)
-@require_secret_key
-def get_issues_by_owner(owner):
+# @cross_origin(supports_credentials=True)
+# @require_secret_key
+async def get_issues_by_owner(owner):
     """
     Fetch organization details by owner's GitHub URL.
     ---
@@ -142,7 +153,7 @@ def get_issues_by_owner(owner):
     try:
 
         # Fetch organization details from dmp_orgs table
-        response = PostgresORM.get_issue_owner(owner)       
+        response = await DmpAPIQueries.get_issue_owner(async_session, owner)       
         if not response:
             return jsonify({'error': "Organization not found"}), 404
 
@@ -192,7 +203,7 @@ def get_issues_by_owner_id(owner, issue):
   """
   try:         
     print('inside get issues')
-    SUPABASE_DB = SupabaseInterface().get_instance()
+    SUPABASE_DB = DmpAPIQueries.get_instance()
     response = SUPABASE_DB.client.table('dmp_issue_updates').select('*').eq('owner', owner).eq('issue_number', issue).execute()
     if not response.data:
         return jsonify({'error': "No data found"}), 200

shared_migrations

@@ -4,35 +4,44 @@
 from utils import require_secret_key
 from utils import determine_week
 from v2_utils import calculate_overall_progress, define_link_data, week_data_formatter
-from query import PostgresORM
+# from query import PostgresORM
+from shared_migrations.db.dmp_api import DmpAPIQueries
+# from app import async_session
+from sqlalchemy.ext.asyncio import create_async_engine, AsyncSession
+from sqlalchemy.orm import sessionmaker
+from sqlalchemy.pool import NullPool
+from shared_migrations.db import get_postgres_uri
 
 
 v2 = Blueprint('v2', __name__)
 
 
+engine = create_async_engine(get_postgres_uri(), echo=False,poolclass=NullPool)
+async_session = sessionmaker(autocommit=False, autoflush=False, bind=engine, class_=AsyncSession)
+
 @v2.route('/issues/<owner>/<issue>', methods=['GET'])
-@require_secret_key
-def get_issues_by_owner_id_v2(owner, issue):
+# @require_secret_key
+async def get_issues_by_owner_id_v2(owner, issue):
 
     try:                 
         # Fetch issue updates based on owner and issue number
 
         url = f"https://github.com/{owner}"        
 
         # import pdb;pdb.set_trace()
-        actual_owner = PostgresORM.get_actual_owner_query(owner)
+        actual_owner = await DmpAPIQueries.get_actual_owner_query(async_session, owner)
         repo_owner =actual_owner[0]['repo_owner'] if actual_owner else ""
         #create url with repo owner
         url = f"https://github.com/{repo_owner}" if repo_owner else None
 
-        dmp_issue_id = PostgresORM.get_dmp_issues(issue)
+        dmp_issue_id = await DmpAPIQueries.get_dmp_issues(async_session, issue)
         if not dmp_issue_id:
           print(f"url....{url}....{issue}")
           return jsonify({'error': "No data found in dmp_issue"}), 500
 
         dmp_issue_id = dmp_issue_id[0]        
 
-        response = PostgresORM.get_dmp_issue_updates(dmp_issue_id['id'])    
+        response = await DmpAPIQueries.get_dmp_issue_updates(async_session, dmp_issue_id['id'])    
         if not response:
             print(f"dmp_issue_id....{response}....{dmp_issue_id}")
             return jsonify({'error': "No data found in dmp_issue_updates"}), 500
@@ -85,7 +94,7 @@ def get_issues_by_owner_id_v2(owner, issue):
         }
 
 
-        pr_Data = PostgresORM.get_pr_data(dmp_issue_id['id'])        
+        pr_Data = await DmpAPIQueries.get_pr_data(async_session, dmp_issue_id['id'])        
         transformed = {"pr_details": []}
         if pr_Data:
             for pr in pr_Data: