Skip to content

Commit 20550f0

Browse files
committed
sql query removed
1 parent 2ddb975 commit 20550f0

File tree

4 files changed

+6
-81
lines changed

4 files changed

+6
-81
lines changed

app.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
from collections import defaultdict
44
from flasgger import Swagger
55
import re,os,traceback
6-
from query import PostgresQuery,PostgresORM
6+
from query import PostgresORM
77
from utils import *
88
from flask_cors import CORS,cross_origin
99
from v2_app import v2

query.py

-76
Original file line numberDiff line numberDiff line change
@@ -6,82 +6,6 @@
66

77

88
load_dotenv()
9-
class PostgresQuery:
10-
11-
def get_issue_query():
12-
query = """
13-
SELECT
14-
dmp_orgs.id AS org_id,
15-
dmp_orgs.name AS org_name,
16-
json_agg(
17-
json_build_object(
18-
'id', dmp_issues.id,
19-
'name', dmp_issues.title
20-
)
21-
) AS issues
22-
FROM
23-
dmp_orgs
24-
LEFT JOIN
25-
dmp_issues
26-
ON
27-
dmp_orgs.id = dmp_issues.org_id
28-
GROUP BY
29-
dmp_orgs.id
30-
ORDER BY
31-
dmp_orgs.id;
32-
"""
33-
34-
data = SupabaseInterface.postgres_query(query)
35-
return data
36-
37-
def get_issue_owner(name):
38-
query = """
39-
SELECT name, description
40-
FROM dmp_orgs
41-
WHERE name = %s;
42-
"""
43-
data = SupabaseInterface.postgres_query(query,(name,))
44-
return data
45-
46-
def get_actual_owner_query(owner):
47-
query = """
48-
SELECT id, name, repo_owner
49-
FROM dmp_orgs
50-
WHERE name LIKE %s;
51-
"""
52-
53-
data = SupabaseInterface.postgres_query(query,(f'%{owner}%',))
54-
return data
55-
56-
57-
def get_dmp_issues(issue_id):
58-
59-
query = """
60-
SELECT * FROM dmp_issues
61-
WHERE id = %s;
62-
"""
63-
data = SupabaseInterface.postgres_query(query,(issue_id,))
64-
return data
65-
66-
def get_dmp_issue_updates(dmp_issue_id):
67-
68-
query = """
69-
SELECT * FROM dmp_issue_updates
70-
WHERE dmp_id = %s;
71-
"""
72-
data = SupabaseInterface.postgres_query(query,(dmp_issue_id,))
73-
return data
74-
75-
76-
def get_pr_data(dmp_issue_id):
77-
78-
query = """
79-
SELECT * FROM dmp_pr_updates
80-
WHERE dmp_id = %s;
81-
"""
82-
data = SupabaseInterface.postgres_query(query,(dmp_issue_id,))
83-
return data
84-
859

8610

8711
class PostgresORM:

tests.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
import unittest
22
from v2_utils import remove_unmatched_tags
33
from app import app
4-
import json, random
4+
import json, random,os
5+
from dotenv import load_dotenv
56

7+
load_dotenv()
68

79
class CustomTestResult(unittest.TextTestResult):
810
def addSuccess(self, test):
@@ -76,7 +78,7 @@ def setUp(self):
7678
self.app.testing = True
7779
self.issues_data = None # To store issues data for use in subsequent tests
7880
self.headers = {
79-
'x-secret-key': 'QrfmzUjsKzPzUXEleSztEv8g'
81+
'x-secret-key':os.getenv('SECRET_KEY')
8082
}
8183

8284
# Fetch issues data during setup

v2_app.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@
22
from flask import Blueprint, jsonify, request
33
import markdown
44
from utils import require_secret_key
5-
from db import SupabaseInterface
65
from utils import determine_week
76
from v2_utils import calculate_overall_progress, define_link_data, week_data_formatter
8-
from query import PostgresQuery,PostgresORM
7+
from query import PostgresORM
98

109

1110
v2 = Blueprint('v2', __name__)

0 commit comments

Comments
 (0)