query convertion into sql

Author: sasi2312

app.py

@@ -3,6 +3,7 @@
 from collections import defaultdict
 from flasgger import Swagger
 import re,os,traceback
+from query import PostgresQuery
 from utils import *
 from flask_cors import CORS,cross_origin
 from v2_app import v2
@@ -127,21 +128,11 @@ def get_issues():
               type: string
     """
     try:
-       # Fetch all issues with their details       
-        response = SupabaseInterface().get_instance().client.table('dmp_orgs').select('*, dmp_issues(*)').execute()
-        res = []
-                
-        for org in response.data:
-          obj = {}
-          issues = org['dmp_issues']
-          obj['org_id'] = org['id']
-          obj['org_name'] = org['name']
-          renamed_issues = [{"id": issue["id"], "name": issue["title"]} for issue in issues]
-          obj['issues'] = renamed_issues
-          
-          res.append(obj)
-                    
-        return jsonify({"issues": res})
+      # Fetch all issues with their details       
+      
+      response = PostgresQuery.get_issue_query()
+                                  
+      return jsonify({"issues": response})
 
     except Exception as e:
         error_traceback = traceback.format_exc()
@@ -190,16 +181,14 @@ def get_issues_by_owner(owner):
               description: Error message
     """
     try:
-        # Construct the GitHub URL based on the owner parameter
-        org_link = f"https://github.com/{owner}"
-        
+               
         # Fetch organization details from dmp_orgs table
-        response = SupabaseInterface().get_instance().client.table('dmp_orgs').select('name', 'description').eq('name', owner).execute()
+        response = PostgresQuery.get_issue_owner(owner)
 
-        if not response.data:
+        if not response:
             return jsonify({'error': "Organization not found"}), 404
 
-        return jsonify(response.data)
+        return jsonify(response)
 
     except Exception as e:
         error_traceback = traceback.format_exc()

db.py

@@ -3,6 +3,9 @@
 from supabase import create_client, Client
 from supabase.lib.client_options import ClientOptions
 from abc import ABC, abstractmethod
+import psycopg2,json
+from psycopg2.extras import RealDictCursor
+
 
 client_options = ClientOptions(postgrest_client_timeout=None)
 
@@ -36,6 +39,39 @@ def get_instance():
             SupabaseInterface._instance = SupabaseInterface()
         return SupabaseInterface._instance
 
+    
+    def get_postgres_connection():
+        
+        # Database configuration
+        DB_HOST =os.getenv('POSTGRES_DB_HOST')
+        DB_NAME =os.getenv('POSTGRES_DB_NAME')
+        DB_USER =os.getenv('POSTGRES_DB_USER')
+        DB_PASS =os.getenv('POSTGRES_DB_PASS')
+        conn = psycopg2.connect(
+            host=DB_HOST,
+            database=DB_NAME,
+            user=DB_USER,
+            password=DB_PASS
+        )
+        return conn
+    
+    def postgres_query(query,params=None):        
+        conn = SupabaseInterface.get_postgres_connection()
+
+        cursor = conn.cursor(cursor_factory=RealDictCursor)
+
+        # cursor = conn.cursor()
+        if not params:
+            cursor.execute(query)
+        else:
+            cursor.execute(query,params)
+            
+        rows = cursor.fetchall()
+        results_as_dicts = [dict(row) for row in rows]
+
+        cursor.close()
+        conn.close()
+        return results_as_dicts
 
     def readAll(self, table):
         data = self.client.table(f"{table}").select("*").execute()

query.py

@@ -0,0 +1,78 @@
+from db import SupabaseInterface
+
+class PostgresQuery:
+
+    def get_issue_query():
+        query = """
+            SELECT 
+                dmp_orgs.id AS org_id, 
+                dmp_orgs.name AS org_name,
+                json_agg(
+                    json_build_object(
+                        'id', dmp_issues.id,
+                        'name', dmp_issues.title
+                )
+                ) AS issues
+            FROM 
+                dmp_orgs
+            LEFT JOIN 
+                dmp_issues 
+            ON 
+                dmp_orgs.id = dmp_issues.org_id
+            GROUP BY 
+                dmp_orgs.id
+            ORDER BY 
+               dmp_orgs.id;
+        """
+        
+        data = SupabaseInterface.postgres_query(query)
+        return data
+        
+    def get_issue_owner(name):
+        query = """
+            SELECT name, description
+            FROM dmp_orgs
+            WHERE name = %s;
+        """
+        data = SupabaseInterface.postgres_query(query,(name,))
+        return data
+    
+    def get_actual_owner_query(owner):
+        query = """
+            SELECT id, name, repo_owner
+            FROM dmp_orgs
+            WHERE name LIKE %s;
+        """
+        
+        data = SupabaseInterface.postgres_query(query,(f'%{owner}%',))
+        return data
+    
+     
+    def get_dmp_issues(issue_id):
+        
+        query = """
+                SELECT * FROM dmp_issues
+                WHERE id = %s;
+        """
+        data = SupabaseInterface.postgres_query(query,(issue_id,))
+        return data
+        
+    def get_dmp_issue_updates(dmp_issue_id):
+
+        query = """
+                SELECT * FROM dmp_issue_updates
+                WHERE dmp_id = %s;
+        """
+        data = SupabaseInterface.postgres_query(query,(dmp_issue_id,))
+        return data
+        
+    
+    def get_pr_data(dmp_issue_id):
+
+        query = """
+                SELECT * FROM dmp_pr_updates
+                WHERE dmp_id = %s;
+        """
+        data = SupabaseInterface.postgres_query(query,(dmp_issue_id,))
+        return data
+                

requirements.txt

@@ -6,4 +6,7 @@ gunicorn==22.0.0
 flasgger==0.9.7.1
 markdown2==2.4.13
 requests==2.32.2
-flask-cors==4.0.1
+flask-cors==4.0.1
+Flask-SQLAlchemy==3.1.1 
+postgrest==0.16.4
+psycopg2-binary==2.9.9

utils.py

@@ -250,7 +250,7 @@ def determine_week(input_date_str, start_date_str='2024-06-11'):
     try:
         # Convert the start date string to a datetime object
         start_date = datetime.strptime(start_date_str, '%Y-%m-%d')
-        input_date = parser.parse(input_date_str).replace(tzinfo=None)
+        input_date = parser.parse(input_date_str).replace(tzinfo=None) if type(input_date_str) == str else input_date_str.replace(tzinfo=None)
 
         # Calculate the difference in days
         difference_in_days = (input_date - start_date).days        

v2_app.py

@@ -5,39 +5,39 @@
 from db import SupabaseInterface
 from utils import determine_week
 from v2_utils import calculate_overall_progress, define_link_data, week_data_formatter
+from query import PostgresQuery
+
 
 v2 = Blueprint('v2', __name__)
 
 
 @v2.route('/issues/<owner>/<issue>', methods=['GET'])
 @require_secret_key
 def get_issues_by_owner_id_v2(owner, issue):
+    
     try:                 
-        SUPABASE_DB = SupabaseInterface().get_instance()
         # Fetch issue updates based on owner and issue number
 
         url = f"https://github.com/{owner}"        
 
-        # import pdb;pdb.set_trace()
-        actual_owner = SUPABASE_DB.client.table('dmp_orgs').select('id','name','repo_owner').like('name',owner).execute().data
+        actual_owner = PostgresQuery.get_actual_owner_query(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 = SUPABASE_DB.client.table('dmp_issues').select('*').eq('id', issue).execute()
-        if not dmp_issue_id.data:
+        dmp_issue_id = PostgresQuery.get_dmp_issues(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.data[0]        
-        response = SUPABASE_DB.client.table('dmp_issue_updates').select('*').eq('dmp_id', dmp_issue_id['id']).execute()
+        dmp_issue_id = dmp_issue_id[0]        
 
-        if not response.data:
+        response = PostgresQuery.get_dmp_issue_updates(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
 
-        data = response.data
+        data = response
 
         final_data = []
         w_learn_url,w_goal_url,avg,cont_details,plain_text_body,plain_text_wurl = None,None,None,None,None,None
@@ -84,10 +84,11 @@ def get_issues_by_owner_id_v2(owner, issue):
             "weekly_learnings":week_data_formatter(plain_text_wurl,"Learnings")
         }
 
-        pr_Data = SUPABASE_DB.client.table('dmp_pr_updates').select('*').eq('dmp_id', dmp_issue_id['id']).execute()
+        
+        pr_Data = PostgresQuery.get_pr_data(dmp_issue_id['id'])
         transformed = {"pr_details": []}
-        if pr_Data.data:
-            for pr in pr_Data.data:
+        if pr_Data:
+            for pr in pr_Data:
                 pr_status = pr.get("status", "")
                 if pr_status == "closed" and pr.get("merged_at"):
                     pr_status = "merged"