fix admin

dbcls · Aug 19, 2021 · e0ad493 · e0ad493
1 parent a56cfac
commit e0ad493
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/node/webpack.config.js b/node/webpack.config.js
@@ -14,7 +14,7 @@ module.exports = (env, args) => {
   let FIREBASE_CONFIG
   switch (args.mode) {
   case 'development':
-    API_ENDPOINT = 'http://127.0.0.1:5000/api/v1'
+    API_ENDPOINT = 'http://localhost/api/v1'
     FIREBASE_CONFIG = {
       apiKey: "AIzaSyB3GMmRd9JWGVvDlEtgpemtYZPo-WRkNpc",
       authDomain: "fabled-alchemy-246207.firebaseapp.com",
@@ -38,7 +38,7 @@ module.exports = (env, args) => {
     }
     break
   default:
-    API_ENDPOINT = 'http://127.0.0.1:5000/api/v1'
+    API_ENDPOINT = 'http://localhost/api/v1'
     FIREBASE_CONFIG = {
       apiKey: "",
       authDomain: "",

diff --git a/server/dbcls/api/resources/admin.py b/server/dbcls/api/resources/admin.py
@@ -5,7 +5,7 @@
 
 from dbcls import db
 from dbcls.utils import localize_as_jst
-from dbcls.models import DataSet
+from dbcls.models import DataSet, User
 
 
 parser = reqparse.RequestParser()
@@ -31,11 +31,9 @@ def _parse_args(self):
 
     def get(self):
         args = self._parse_args()
-
-        query = DataSet.query.order_by(DataSet.upload_at.desc())
+        query = DataSet.query.join(DataSet.user).with_entities(DataSet.id, DataSet.title, DataSet.path, DataSet.is_public, DataSet.upload_at, User.display_name, User.contact_uri).order_by(DataSet.upload_at.desc())
         count = query.count()
         query = query.offset(args['offset']).limit(SIZE_PER_PAGE)
-
         # 前ページ
         previousUrl = None
         if args['offset'] >= 1:
@@ -49,7 +47,6 @@ def get(self):
             params = {'page': args['page'] + 1}
             params_string = urllib.parse.urlencode(params)
             nextUrl = f'{request.path}?{params_string}'
-
         return {
             'count': count,
             'previous': previousUrl,
@@ -64,8 +61,8 @@ def get(self):
                         localize_as_jst(data_set.upload_at).isoformat()
                     ),
                     'user': {
-                        'display_name': data_set.user.display_name,
-                        'contact_uri': data_set.user.contact_uri,
+                        'display_name': data_set.display_name,
+                        'contact_uri': data_set.contact_uri,
                     }
                 }
                 for data_set in query