Skip to content

Commit 87fc55b

Browse files
committed
♻️ refactor stuff
1 parent 7425099 commit 87fc55b

File tree

3 files changed

+22
-33
lines changed

3 files changed

+22
-33
lines changed

data/generate.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ def get_projects():
1414
if res.status_code == 200:
1515
return res.json()
1616
else:
17-
return None
17+
return []
1818

1919

2020
start_time = datetime(2021, 6, 1, 15, 0, 0)

data/insert.py

Lines changed: 21 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1+
from enum import auto
12
from sqlalchemy import create_engine
2-
from sqlalchemy import MetaData, Table, Column
3-
from sqlalchemy import String, BigInteger, ForeignKey, Integer, DateTime, Boolean
3+
from sqlalchemy import MetaData, Table
4+
import requests
5+
import json
46

57

68
db_name = input('db_name: ')
@@ -10,32 +12,20 @@
1012
db = create_engine(f'postgresql://{db_user}:{db_pass}@localhost/{db_name}')
1113
meta = MetaData(db)
1214

13-
projects = Table('project', meta,
14-
Column('id', BigInteger, primary_key=True, unique=True),
15-
Column('description', String),
16-
Column('fork_count', Integer),
17-
Column('gitlab_project_id', Integer),
18-
Column('last_commit', DateTime),
19-
Column('name', String),
20-
Column('name_space', String),
21-
Column('url', String)
22-
)
23-
24-
linting_results = Table('linting_result', meta,
25-
Column('id', BigInteger, primary_key=True, unique=True),
26-
Column('lint_time', DateTime),
27-
Column('project_id', BigInteger,
28-
ForeignKey('project.id')),
29-
)
30-
31-
check_results = Table('check_result', meta,
32-
Column('id', BigInteger, primary_key=True, unique=True),
33-
Column('check_name', String),
34-
Column('lint_id', BigInteger,
35-
ForeignKey('linting_result.id')),
36-
Column('result', Boolean)
37-
)
38-
39-
40-
with db.connect() as conn:
41-
pass
15+
projects = Table('project', meta, autoload=True)
16+
linting_results = Table('linting_result', meta, autoload=True)
17+
check_results = Table('check_result', meta, autoload=True)
18+
19+
20+
def get_projects():
21+
with open('../config.json', 'r') as f:
22+
config = json.load(f)
23+
gitlab_host = config['settings']['gitLabHost']
24+
25+
res = requests.get(f'{gitlab_host}/api/v4/projects?per_page=100')
26+
if res.status_code == 200:
27+
return res.json()
28+
else:
29+
return []
30+
31+

frontend/src/app/repository-details/repository-details.component.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,5 +280,4 @@ export class RepositoryDetailsComponent implements OnInit {
280280
return this.project.description.substring(0, 300) + '...';
281281
}
282282
}
283-
284283
}

0 commit comments

Comments
 (0)