feat(date) move logic from hook

entur · Sep 14, 2023 · bdaabb5 · bdaabb5
1 parent 3c0a3ab
commit bdaabb5
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 723 deletions.
diff --git a/next-tavla/firestore-debug.log b/next-tavla/firestore-debug.log
diff --git a/next-tavla/pages/api/ping/[id].ts b/next-tavla/pages/api/ping/[id].ts
@@ -1,4 +1,8 @@
-import { initializeAdminApp, setLastActive } from 'Admin/utils/firebase'
+import {
+    getBoard,
+    initializeAdminApp,
+    setLastActive,
+} from 'Admin/utils/firebase'
 import { NextApiRequest, NextApiResponse } from 'next'
 import { TBoardID } from 'types/settings'
 
@@ -9,10 +13,20 @@ export default async function handler(
     response: NextApiResponse,
 ) {
     const { id } = request.query
-    try {
-        await setLastActive(id as TBoardID)
-        return response.status(200).json({ message: 'Successfully updated!' })
-    } catch (error) {
-        return response.status(400).json({ error: 'Could not update!' })
+    const board = (await getBoard(id as TBoardID)) || undefined
+    if (!board) {
+        return response.status(404).json({ error: 'Board not found!' })
+    }
+    const active = board?.meta?.lastActive ?? 0
+    const lastActiveDate = new Date(active).getTime()
+    if (Date.now() - lastActiveDate > 1000 * 60 * 60 * 24) {
+        try {
+            await setLastActive(id as TBoardID)
+            return response
+                .status(200)
+                .json({ message: 'Successfully updated!' })
+        } catch (error) {
+            return response.status(400).json({ error: 'Could not update!' })
+        }
     }
 }
diff --git a/next-tavla/src/Admin/scenarios/BoardList/components/Row/index.tsx b/next-tavla/src/Admin/scenarios/BoardList/components/Row/index.tsx
@@ -8,6 +8,7 @@ import { useEffect, useState } from 'react'
 import { Cell } from 'Admin/scenarios/BoardList/components/Cell'
 import { Tooltip } from '@entur/tooltip'
 import { Info } from 'Admin/scenarios/Info'
+import { formatDate } from 'utils/time'
 
 function Row({ board }: { board: TBoard }) {
     const { addToast } = useToast()
@@ -22,18 +23,6 @@ function Row({ board }: { board: TBoard }) {
         await router.push('/edit/' + board.id)
     }
 
-    function toLocaleString(date: Date) {
-        return date
-            .toLocaleDateString('no-NB', {
-                day: '2-digit',
-                month: '2-digit',
-                year: 'numeric',
-                hour: '2-digit',
-                minute: '2-digit',
-            })
-            .replace(',', '')
-    }
-
     return (
         <div className={classes.tableRow}>
             <Cell>{board?.meta?.title ?? 'Tavla'}</Cell>
@@ -61,7 +50,7 @@ function Row({ board }: { board: TBoard }) {
             </Cell>
             <Cell>
                 {board?.meta?.dateModified &&
-                    toLocaleString(new Date(board.meta.dateModified))}
+                    formatDate(new Date(board.meta.dateModified))}
             </Cell>
         </div>
     )

diff --git a/next-tavla/src/Admin/utils/firebase.ts b/next-tavla/src/Admin/utils/firebase.ts
@@ -75,7 +75,10 @@ export async function setBoard(board: TBoard, uid: TUserID) {
     return await firestore()
         .collection('boards')
         .doc(boardId)
-        .set(sanitizedBoard)
+        .set({
+            ...sanitizedBoard,
+            meta: { ...sanitizedBoard.meta, dateModified: Date.now() },
+        })
 }
 
 export async function setLastActive(bid: TBoardID) {

diff --git a/next-tavla/src/Shared/hooks/useUpdateLastActive.ts b/next-tavla/src/Shared/hooks/useUpdateLastActive.ts
@@ -1,18 +1,11 @@
 import { useCallback, useEffect } from 'react'
 import { TBoardID } from 'types/settings'
-import { getBoard } from 'utils/firebase'
 
 function useUpdateLastActive(documentId: TBoardID) {
     const updateLastActive = useCallback(async () => {
-        const board = (await getBoard(documentId)) || undefined
-        if (!board) return
-        const lastActive = board?.meta?.lastActive ?? 0
-        const lastActiveDate = new Date(lastActive).getTime()
-        if (Date.now() - lastActiveDate > 1000 * 60 * 60 * 24) {
-            await fetch(`/api/ping/${documentId}`, {
-                method: 'POST',
-            })
-        }
+        await fetch(`/api/ping/${documentId}`, {
+            method: 'POST',
+        })
     }, [documentId])
 
     useEffect(() => {

diff --git a/next-tavla/src/Shared/utils/time.ts b/next-tavla/src/Shared/utils/time.ts
@@ -20,3 +20,15 @@ export function formatTimeStamp(timestamp: number) {
         minute: '2-digit',
     }).format(timestamp)
 }
+
+export function formatDate(date: Date) {
+    return date
+        .toLocaleDateString('no-NB', {
+            day: '2-digit',
+            month: '2-digit',
+            year: 'numeric',
+            hour: '2-digit',
+            minute: '2-digit',
+        })
+        .replace(',', '')
+}