From cd55de448826bff45db2a83003df3e59a974dadb Mon Sep 17 00:00:00 2001
From: zhcsyncer <zhcsyncer@gmail.com>
Date: Tue, 6 Feb 2018 19:01:45 +0800
Subject: [PATCH] =?UTF-8?q?fix=20bug:=20#72,=20=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=20sql=20=E6=9F=A5=E8=AF=A2=E4=B8=AD=E4=BD=BF=E7=94=A8`Model.ge?=
 =?UTF-8?q?tTableName`=E8=8E=B7=E5=8F=96=E8=A1=A8=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/routes/analytics.ts | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/routes/analytics.ts b/src/routes/analytics.ts
index c978c4d..a378692 100644
--- a/src/routes/analytics.ts
+++ b/src/routes/analytics.ts
@@ -1,4 +1,7 @@
 import router from './router'
+import Repository from "../models/bo/repository";
+import Logger from "../models/bo/logger";
+import User from "../models/bo/user";
 const moment = require('moment')
 const Sequelize = require('sequelize')
 const SELECT = { type: Sequelize.QueryTypes.SELECT }
@@ -14,7 +17,7 @@ router.get('/app/analytics/repositories/created', async (ctx) => {
         DATE(createdAt) AS label,
         COUNT(*) as value
     FROM
-        RAP2_DELOS_APP.repositories
+        ${Repository.getTableName()}
     WHERE
         createdAt >= '${start}' AND createdAt <= '${end}'
     GROUP BY label
@@ -39,7 +42,7 @@ router.get('/app/analytics/repositories/updated', async (ctx) => {
         DATE(updatedAt) AS label,
         COUNT(*) as value
     FROM
-        RAP2_DELOS_APP.repositories
+        ${Repository.getTableName()}
     WHERE
         updatedAt >= '${start}' AND updatedAt <= '${end}'
     GROUP BY label
@@ -65,9 +68,9 @@ router.get('/app/analytics/users/activation', async (ctx) => {
         users.fullname AS fullname,
         COUNT(*) AS value
     FROM
-        loggers
+        ${Logger.getTableName()} loggers
             LEFT JOIN
-        (users) ON (loggers.userId = users.id)
+        ${User.getTableName()} users ON (loggers.userId = users.id)
     WHERE
         loggers.updatedAt >= '${start}' AND loggers.updatedat <= '${end}'
     GROUP BY loggers.userId
@@ -90,9 +93,10 @@ router.get('/app/analytics/repositories/activation', async (ctx) => {
         repositories.name,
         COUNT(*) AS value
     FROM
-        loggers
-            LEFT JOIN
-        (repositories) ON (loggers.repositoryId = repositories.id)
+        ${Logger.getTableName()} loggers
+    LEFT JOIN
+        ${Repository.getTableName()} repositories
+        ON (loggers.repositoryId = repositories.id)
     WHERE
         loggers.repositoryId IS NOT NULL
             AND loggers.updatedAt >= '${start}'
@@ -107,4 +111,4 @@ router.get('/app/analytics/repositories/activation', async (ctx) => {
   }
 })
 
-// TODO 2.3 支持 start、end
\ No newline at end of file
+// TODO 2.3 支持 start、end