Merge pull request #2 from woodnext/user_id

Fix bug
woodnx · Aug 28, 2023 · 8e2bed2 · 8e2bed2
2 parents fd1a8a1 + 6977afa
commit 8e2bed2
Show file tree

Hide file tree

Showing 9 changed files with 69 additions and 72 deletions.
diff --git a/src/day.ts b/src/day.ts
@@ -16,8 +16,7 @@ function generateRange(basicDate: string, period: ManipulateType){
     const start: string = date.subtract(idx, period).startOf(period).format('YYYY-MM-DD HH:mm:ss')
     return [ start, end ]
   })
-
-  console.log(ranges)
+
   return ranges
 }
 

diff --git a/src/routes/analysis.ts b/src/routes/analysis.ts
@@ -8,7 +8,7 @@ const router = express.Router()
 router.get('/status/:date/:period', async (req, res) => {
   const userId = req.userId
   const date = req.params.date
-  const _period = req.query.period || 'day'
+  const _period = req.params.period
 
   const period: Period = (_period == 'week' || _period == 'month') ? _period : 'day'
 
@@ -23,32 +23,32 @@ router.get('/status/:date/:period', async (req, res) => {
         .count('quiz_id', {as: 'count'})
         .where('user_id', userId)
         .where('judgement', 1)
-        .whereBetween('practiced', [range[0], range[1]])),
+        .whereBetween('practiced', [range[0], range[1]]))[0].count,
 
         wrong: (await knex('histories')
         .count('quiz_id', {as: 'count'})
         .where('user_id', userId)
         .where('judgement', 0)
-        .whereBetween('practiced', [range[0], range[1]])),
+        .whereBetween('practiced', [range[0], range[1]]))[0].count,
 
         through: (await knex('histories')
         .count('quiz_id', {as: 'count'})
         .where('user_id', userId)
         .where('judgement', 2)
-        .whereBetween('practiced', [range[0], range[1]])),
+        .whereBetween('practiced', [range[0], range[1]]))[0].count,
       }))
     )
-    res.send(results)
+    res.status(200).send(results)
   } catch(e) {
     console.error(e)
     res.send('An Error Occured')
   }
 })
 
-router.get('/ranking/all', async (req, res) => {
-  const _period = req.query.period　|| 'day'
-  const limit = (!!req.query.limit || Number(req.query.limit) > 6) ? Number(req.query.limit) : 6
-  const now = dayjs().format('YYYY-MM-DD HH:mm:ss')
+router.get('/ranking/all/:period', async (req, res) => {
+  const _period = req.params.period;
+  const limit = (!!req.query.limit || Number(req.query.limit) > 5) ? Number(req.query.limit) : 5
+  const now = dayjs().format()
 
   const period: Period = (_period == 'week' || _period == 'month') ? _period : 'day'
 
@@ -63,7 +63,7 @@ router.get('/ranking/all', async (req, res) => {
       count: knex.raw('COUNT(quiz_id)')
     })
     .innerJoin('users', 'user_id', 'users.id')
-    .whereBetween('practiced', [ ranges[6][0], ranges[6][1] ])
+    .whereBetween('practiced', [ ranges[0][0], ranges[0][1] ])
     .groupBy('user_id')
     .orderBy('rank')
     .limit(limit)
@@ -91,16 +91,16 @@ router.get('/ranking/all', async (req, res) => {
       }
     })
 
-    res.send(ranking)
+    res.status(200).send(ranking)
   }catch(e) {
     console.error(e)
     res.send('An Error Occured')
   }
 
 })
 
-router.get('/ranking/account/', async (req, res) => {
-  const _period = req.query.period
+router.get('/ranking/personal/:period', async (req, res) => {
+  const _period = req.params.period
   const userId = req.userId
   const now = dayjs().format('YYYY-MM-DD HH:mm:ss')
 
@@ -147,10 +147,11 @@ router.get('/ranking/account/', async (req, res) => {
       rank: nowRank.length,
       name: isNodata ? '' : nowRank[0].name,
       count: isNodata ? 0 : nowRank[0].count,
-      compare: nowRank.length - prevRank.length
+      compare: nowRank.length - prevRank.length,
+      userId,
     }
 
-    res.send(ranking)
+    res.status(200).send(ranking)
   }catch(e){
     console.error(e)
     res.send('An Error Occured')

diff --git a/src/routes/answers.ts b/src/routes/answers.ts
@@ -21,7 +21,7 @@ router.get('/', async (req, res) => {
     .where('quiz_id', quizId)
     .where('user_id', userId)
 
-    res.send({
+    res.status(200).send({
       fast,
       avg,
       myFast,
@@ -34,7 +34,7 @@ router.get('/', async (req, res) => {
 
 router.post('/', async (req, res) => {
   const quizId = req.body.quizId
-  const userId = req.body.userId
+  const userId = req.userId
   const length = req.body.length
 
   try {

diff --git a/src/routes/favorites.ts b/src/routes/favorites.ts
@@ -28,7 +28,7 @@ router.post('/', async (req, res) => {
 })
 
 router.delete('/', async (req, res) => {
-  const userId = req.body.userId
+  const userId = req.userId
   const quizId = req.body.quizId
 
   try {

diff --git a/src/routes/histories.ts b/src/routes/histories.ts
@@ -10,31 +10,28 @@ interface SendData {
 
 const router: Router = express.Router()
 
-router.get('/:user_id/:start/:end', async (req, res) => {
-  const start   = `${req.params.start} 00:00:00`
-  const end     = `${req.params.end} 23:59:59`
-  const user_id = Number(req.params.user_id)
+router.get('/:since/:until', async (req, res) => {
+  const since = dayjs(Number(req.params.since)).format('YYYY-MM-DD HH:mm:ss');
+  const until = dayjs(Number(req.params.until)).format('YYYY-MM-DD HH:mm:ss');
+  const user_id = req.userId;
 
   try {
     const results = await Promise.all(
-      [0, 1, 2].map(async i => {
-        const r = await knex('histories')
+      [0, 1, 2].map(async i => (await knex('histories')
         .count('quiz_id', {as: 'count'})
         .where('user_id', user_id)
         .andWhere('judgement', i)
-        .andWhereBetween('practiced', [ start, end ])
-        .first()
-
-        return !!r ? r.count : 0 
-      }))
+        .andWhereBetween('practiced', [ since, until ])
+        .first())?.count
+    ));
 
     const data: SendData = {
-      right: results[1],
-      wrong: results[0],
-      through: results[2],
-    }
+      right: results[1] || 0,
+      wrong: results[0] || 0,
+      through: results[2] || 0,
+    };
 
-    res.send(data)
+    res.status(200).send(data);
   } catch(e) {
     console.error(e)
   }
@@ -45,20 +42,16 @@ router.post('/', async (req, res) => {
   const judgement: number = req.body.judgement
   const practiced: string = dayjs().format('YYYY-MM-DD HH:mm:ss')
 
-  if (!quiz_id || !judgement) {
+  if (!quiz_id || judgement >= 3 || judgement < 0) {
     res.status(400).send('Undefined list name or judgement')
     return
   }
 
   try {
-    const uid = req.user.uid
+    const user_id = req.userId
 
     await knex.transaction(async trx => {
-      const user_id: number = await trx('users')
-      .select('id')
-      .where("uid", uid)
-      .first()
-
+
       const data = {
         quiz_id,
         user_id,

diff --git a/src/routes/levels.ts b/src/routes/levels.ts
@@ -6,7 +6,7 @@ const router: Router = express.Router()
 router.get('/', async (req, res) => {
   try {
     const result = await knex('levels').select('*')
-    res.send(result)
+    res.status(200).send(result)
   } catch(err) {
     console.error(err)
   }

diff --git a/src/routes/mylists.ts b/src/routes/mylists.ts
@@ -4,20 +4,22 @@ import dayjs from '../day'
 
 const router: Router = express.Router()
 
-router.get('/:userId', async (req, res) => {
+router.get('/', async (req, res) => {
+  const userId = req.userId;
   try {
     const all = await knex('mylist_informations')
     .select('name', 'id')
-    .where('user_id', req.query.userId)
+    .where('user_id', userId);
 
-    res.status(200).send(all)
+    res.status(200).send(all);
   } catch(e) {
     console.error(e)
   }
 })
 
 router.post('/', async (req, res) => {
   const listName = req.body.listName
+  const userId = req.userId
   const now = dayjs().format('YYYY-MM-DD HH:mm:ss')
 
   if (!listName) {
@@ -26,25 +28,20 @@ router.post('/', async (req, res) => {
   }
 
   try {
-    const uid = req.user.uid
 
     await knex.transaction(async trx => {
-      const user_id: number = await trx('users')
-      .select('id')
-      .where("uid", uid)
-      .first()
-
       const data = {
-        user_id,
+        user_id: userId,
         name: listName,
         created: now,
         attr: 100
-      }
+      };
 
-      const inserts = await trx('mylist_informations').insert(data)
-      const message = `${inserts.length} new mylists saved (user: ${user_id})`
+      const inserts = await trx('mylist_informations').insert(data);
+      const newList = await trx('mylist_informations').select().where('name', listName).first();
+      const message = `${inserts.length} new mylists saved (user: ${userId})`;
 
-      res.status(201).send(message)
+      res.status(201).send(newList);
       console.log(message)
     })
   } catch(e) {
@@ -84,7 +81,7 @@ router.put('/quiz', async (req, res) => {
 
 router.put('/rename', async (req, res) => {
   const mylistId = req.body.mylistId
-  const userId = req.body.userId
+  const userId = req.userId
   const newName = req.body.newName
 
   if (!userId || !mylistId || !newName) {
@@ -131,8 +128,7 @@ router.delete('/quiz', async (req, res) => {
 
 router.delete('/list', async (req, res) => {
   const mylistId = req.body.mylistId
-  const userId = req.body.userId
-
+  const userId = req.userId
 
   try {
     await knex.transaction(async trx => {
@@ -142,7 +138,7 @@ router.delete('/list', async (req, res) => {
 
       await trx('mylist_informations')
       .del()
-      .where('mylist_id', mylistId)
+      .where('id', mylistId)
 
       const allList = await trx('mylist_informations')
       .select('name', 'id')

diff --git a/src/routes/quizzes.ts b/src/routes/quizzes.ts
@@ -1,5 +1,6 @@
 import express, { Router, Request } from 'express'
 import knex from '../knex'
+import dayjs from 'dayjs'
 
 const router: Router = express.Router()
 
@@ -15,9 +16,10 @@ interface QuizRequest extends Request {
     keyword: string,
     keywordOption: KeywordOption,
     crctAnsRatio?: [string, string],
-    sinceDate?: string,
-    endDate?: string,
+    since?: string,
+    until?: string,
     judgement?: string[],
+    mylistId?: string,
   }
 }
 
@@ -39,9 +41,10 @@ router.get('/:listName?', async (req: QuizRequest, res) => {
   const keyword  = req.query.keyword
   const keywordOption = Number(req.query.keywordOption) || undefined
   const crctAnsRatio = req.query.crctAnsRatio
-  const since = req.query.sinceDate
-  const until = req.query.endDate
+  const since = req.query.since
+  const until = req.query.until
   const judgement = req.query.judgement
+  const mylistId = req.query.mylistId
 
   const userId = req.userId
   const listName = req.params.listName
@@ -115,19 +118,24 @@ router.get('/:listName?', async (req: QuizRequest, res) => {
         .where('favorites.user_id', userId)
         .orderBy('favorites.registered', 'desc')
       }else if (listName === 'history' && !!since && !!until) {
+        const s = dayjs(Number(since)).format('YYYY-MM-DD HH:mm:ss');
+        const u = dayjs(Number(until)).format('YYYY-MM-DD HH:mm:ss');
         builder.column(
           { judgement: 'histories.judgement' },
           { practiced: 'histories.practiced' },
         )
         .innerJoin('histories', 'histories.quiz_id', 'quizzes.id')
         .where('histories.user_id', userId)
-        .whereBetween('histories.practiced', [since, until])
+        .whereBetween('histories.practiced', [s, u])
+        .orderBy('histories.practiced', 'desc')
 
         if (!!judgement) builder.whereIn('histories.judgement', judgement)
-      }else {
+      }else if (listName === 'mylist') {
         builder
         .innerJoin('mylists_quizzes', 'mylists_quizzes.quiz_id', 'quizzes.id')
-        //.innerJoin('mylist_informations', 'mylist_informations.')
+        .innerJoin('mylist_informations', 'mylist_informations.id', 'mylists_quizzes.mylist_id')
+        .where('mylist_informations.id', mylistId)
+        .orderBy('mylists_quizzes.registered', 'desc');
       }
 
       //console.log(builder.toSQL())
@@ -171,7 +179,7 @@ router.get('/:listName?', async (req: QuizRequest, res) => {
 
     //console.log(data)
 
-    res.send(data)
+    res.status(200).send(data)
   } catch(e) {
     console.log('An Error Occurred')
     console.error(e)

diff --git a/src/routes/workbooks.ts b/src/routes/workbooks.ts
@@ -6,7 +6,7 @@ const router: Router = express.Router()
 router.get('/', async (req, res) => {
   try {
     const results = await knex('workbooks').select('*')
-    res.send(results)
+    res.status(200).send(results)
   } catch(err) {
     console.error(err)
   } 
@@ -22,7 +22,7 @@ router.get('/color', async (req, res) => {
     )
     .innerJoin('levels', 'workbooks.level_id', 'levels.id')
 
-    res.send(results)
+    res.status(200).send(results)
   } catch(err) {
     console.error(err)
   }