File tree 4 files changed +6
-81
lines changed
4 files changed +6
-81
lines changed Original file line number Diff line number Diff line change 3
3
from collections import defaultdict
4
4
from flasgger import Swagger
5
5
import re ,os ,traceback
6
- from query import PostgresQuery , PostgresORM
6
+ from query import PostgresORM
7
7
from utils import *
8
8
from flask_cors import CORS ,cross_origin
9
9
from v2_app import v2
Original file line number Diff line number Diff line change 6
6
7
7
8
8
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
-
85
9
86
10
87
11
class PostgresORM :
Original file line number Diff line number Diff line change 1
1
import unittest
2
2
from v2_utils import remove_unmatched_tags
3
3
from app import app
4
- import json , random
4
+ import json , random ,os
5
+ from dotenv import load_dotenv
5
6
7
+ load_dotenv ()
6
8
7
9
class CustomTestResult (unittest .TextTestResult ):
8
10
def addSuccess (self , test ):
@@ -76,7 +78,7 @@ def setUp(self):
76
78
self .app .testing = True
77
79
self .issues_data = None # To store issues data for use in subsequent tests
78
80
self .headers = {
79
- 'x-secret-key' : 'QrfmzUjsKzPzUXEleSztEv8g'
81
+ 'x-secret-key' :os . getenv ( 'SECRET_KEY' )
80
82
}
81
83
82
84
# Fetch issues data during setup
Original file line number Diff line number Diff line change 2
2
from flask import Blueprint , jsonify , request
3
3
import markdown
4
4
from utils import require_secret_key
5
- from db import SupabaseInterface
6
5
from utils import determine_week
7
6
from v2_utils import calculate_overall_progress , define_link_data , week_data_formatter
8
- from query import PostgresQuery , PostgresORM
7
+ from query import PostgresORM
9
8
10
9
11
10
v2 = Blueprint ('v2' , __name__ )
You can’t perform that action at this time.
0 commit comments