diff --git a/app.js b/app.js index 81665d9..911e5ee 100644 --- a/app.js +++ b/app.js @@ -2,9 +2,9 @@ import express from 'express' import mongoose from 'mongoose' import cors from 'cors' -import { MONGODB_URI } from './utils/config.js' -import { fetchAllData } from './utils/update_checker.js' -import { checkRequestKeyHeader } from './utils/middleware.js' +import { MONGODB_URI } from './config/config.js' +import { fetchAllData } from './utils/update.js' +import { checkRequestKeyHeader } from './middleware/middleware.js' import { indexRouter } from './controllers/index.js' import { updateRouter } from './controllers/update.js' import { searchRouter } from './controllers/search.js' @@ -14,7 +14,7 @@ import { searchRouter } from './controllers/search.js' mongoose .connect(MONGODB_URI) .then(async () => { - console.log('Ⓜ️ Connected to MongoDB!') + console.log('Ⓜ️ Connected to MongoDB!') await fetchAllData() }) .catch(err => console.log('πŸŸ₯ MONGODB ERROR:', err.message)) diff --git a/utils/config.js b/config/config.js similarity index 100% rename from utils/config.js rename to config/config.js diff --git a/controllers/search.js b/controllers/search.js index 01512a8..b6f1ca7 100644 --- a/controllers/search.js +++ b/controllers/search.js @@ -1,10 +1,10 @@ import { Router } from "express" import { Redis } from "ioredis" -import { REDIS_URI } from "../utils/config.js" -import { getCardInfo } from "../utils/cardinfo_creator.js" -import { fetchFromYugipedia } from "../utils/card_creator.js" -import { saveToDatabase } from "../utils/database_updater.js" +import { REDIS_URI } from "../config/config.js" +import { getCardInfo } from "../utils/cardinfo.js" +import { fetchFromYugipedia } from "../utils/yugipedia.js" +import { saveToDatabase } from "../utils/database.js" @@ -49,6 +49,6 @@ searchRouter.post('/', async (req, res) => { }) } - console.log("RESULT:", `[ ${card.length} ] card found`) + console.log("πŸ”Ž RESULT:", `[ ${card.length} ] card found`) res.json({ match: card.length === 1, card: cardToSend }) }) \ No newline at end of file diff --git a/controllers/update.js b/controllers/update.js index fa3c84e..f46da38 100644 --- a/controllers/update.js +++ b/controllers/update.js @@ -1,9 +1,9 @@ import { Router } from "express" -import { fetchFromYugipedia } from "../utils/card_creator.js" -import { saveToDatabase } from "../utils/database_updater.js" -import { checkYgoprodeck, checkYugipedia } from "../utils/update_checker.js" -import { YUGIPEDIA_PAGE, BOT_RD_URL, botRefreshDataRequestOption } from "../utils/config.js" +import { fetchFromYugipedia } from "../utils/yugipedia.js" +import { saveToDatabase } from "../utils/database.js" +import { checkYgoprodeck, checkYugipedia } from "../utils/update.js" +import { YUGIPEDIA_PAGE, BOT_RD_URL, botRefreshDataRequestOption } from "../config/config.js" @@ -24,13 +24,13 @@ updateRouter.get('/:src', (req, res) => { let newCards = [] if (source === 'ygoprodeck') newCards = await fetchFromYugipedia(null, cards, null) else newCards = await fetchFromYugipedia(cards, null, null) - console.log(` πŸ“’ [${newCards.length}] NEW CARD(S) FOUND!\n${updateMark.repeat(updateMarkLength)}\n`) + console.log(`πŸ“’ [${newCards.length}] NEW CARD(S) FOUND!\n${updateMark.repeat(updateMarkLength)}\n`) await saveToDatabase(newCards) fetch(BOT_RD_URL, botRefreshDataRequestOption) .then(res => res.json()) .then(json => console.log("πŸ€– BOT RESPONSE:", json)) - .catch(err => console.log("❌ BOT DATA REFRESH ERROR:", err)) + .catch(err => console.log("πŸŸ₯ BOT DATA REFRESH ERROR:", err)) res.json({ source, @@ -42,7 +42,7 @@ updateRouter.get('/:src', (req, res) => { timestamp: new Date().toLocaleString('en-ph') }) } else { - console.log(` πŸ’― CARD DB IS UP TO DATE!\n${updateMark.repeat(updateMarkLength)}\n`) + console.log(`πŸ’― CARD DB IS UP TO DATE!\n${updateMark.repeat(updateMarkLength)}\n`) res.json({ source, message: "check finished, no new card(s) found", diff --git a/utils/middleware.js b/middleware/middleware.js similarity index 78% rename from utils/middleware.js rename to middleware/middleware.js index 4a50de6..5c6707e 100644 --- a/utils/middleware.js +++ b/middleware/middleware.js @@ -1,4 +1,4 @@ -import { SECRET_KEY } from "./config.js" +import { SECRET_KEY } from "../config/config.js" export const checkRequestKeyHeader = (req, res, next) => { diff --git a/server.js b/server.js index cd34059..39034c1 100644 --- a/server.js +++ b/server.js @@ -1,7 +1,7 @@ import http from "http" import { app } from "./app.js" -import { HOST, PORT } from "./utils/config.js" +import { HOST, PORT } from "./config/config.js" diff --git a/utils/cardinfo_creator.js b/utils/cardinfo.js similarity index 100% rename from utils/cardinfo_creator.js rename to utils/cardinfo.js diff --git a/utils/database_updater.js b/utils/database.js similarity index 89% rename from utils/database_updater.js rename to utils/database.js index f7e7e08..2408a8b 100644 --- a/utils/database_updater.js +++ b/utils/database.js @@ -23,8 +23,8 @@ export const saveToDatabase = async (cards) => { await models[category].findOneAndReplace({ name: card.name }, card) console.log("♻️ CARD REPLACED IN DATABASE!") } else { - console.log("πŸ”΄ MONGODB SAVE ERROR:", error.message) - console.log("πŸ”·", error.stack) + console.log("πŸŸ₯ MONGODB SAVE ERROR:", error.message) + console.log("πŸ”· STACK:", error.stack) throw new Error(error.message) } } diff --git a/utils/update_checker.js b/utils/update.js similarity index 71% rename from utils/update_checker.js rename to utils/update.js index b65116d..1dd3d3e 100644 --- a/utils/update_checker.js +++ b/utils/update.js @@ -1,4 +1,4 @@ -import { requestOptions, YGOPD_API, YUGIPEDIA_RC } from './config.js' +import { requestOptions, YGOPD_API, YUGIPEDIA_RC } from '../config/config.js' import { OcgCard, RushCard, StrayCard, YgopdCard } from '../models/card.js' import BotVariable from '../models/variable.js' @@ -15,20 +15,20 @@ export const fetchAllData = async () => { MAIN_CARDS = await OcgCard.find({}, 'name -_id').lean().exec() RUSH_CARDS = await RushCard.find({}, 'name -_id').lean().exec() STRAY_CARDS = await StrayCard.find({}, 'name -_id').lean().exec() - console.log("πŸ—ƒοΈ OCG/TCG CARDS:", MAIN_CARDS.length.toLocaleString('en-ph')) - console.log("πŸ—ƒοΈ RUSH CARDS:", RUSH_CARDS.length.toLocaleString('en-ph')) - console.log("πŸ—ƒοΈ STRAY CARDS:", STRAY_CARDS.length.toLocaleString('en-ph')) + console.log("πŸ—ƒοΈ OCG/TCG CARDS:", MAIN_CARDS.length.toLocaleString('en-ph')) + console.log("πŸ—ƒοΈ RUSH CARDS:", RUSH_CARDS.length.toLocaleString('en-ph')) + console.log("πŸ—ƒοΈ STRAY CARDS:", STRAY_CARDS.length.toLocaleString('en-ph')) const ygoprodeck = await BotVariable.findOne({ name: 'YGOPRODeck' }) YGOPDCOUNT = ygoprodeck.card_count - console.log(`🟩 YGOPRODECK CARD COUNT (${ygoprodeck.last_update}): πŸ’  ${YGOPDCOUNT.toLocaleString('en-ph')}`) + console.log(`⏺️ YGOPRODECK CARD COUNT (${ygoprodeck.last_update}): πŸ’  ${YGOPDCOUNT.toLocaleString('en-ph')}`) const yugipedia = await BotVariable.findOne({ name: 'Yugipedia' }) YUGIPEDIA_LAST_UPDATE = yugipedia.lastUpdate - console.log(`🟩 YUGIPEDIA LAST UPDATE: πŸ’  ${new Date(YUGIPEDIA_LAST_UPDATE).toLocaleString('en-ph')}`) + console.log(`⏺️ YUGIPEDIA LAST UPDATE: πŸ’  ${new Date(YUGIPEDIA_LAST_UPDATE).toLocaleString('en-ph')}`) } catch (err) { - console.log("πŸ”΄ CARDS FETCH ERROR:", err.message) - console.log("πŸ”·", err.stack) + console.log("πŸŸ₯ CARDS FETCH ERROR:", err.message) + console.log("πŸ”· STACK:", err.stack) } } @@ -39,8 +39,8 @@ export const checkYgoprodeck = async () => { ygopdCards = await ygopdCards.json() ygopdCards = ygopdCards.data - console.log(" MAIN CARDS COUNT: πŸ”Έ", MAIN_CARDS.length.toLocaleString('en-ph')) - console.log(" YGOPRODECK COUNT: πŸ”Έ", ygopdCards.length.toLocaleString('en-ph')) + console.log("MAIN CARDS COUNT: πŸ”Έ", MAIN_CARDS.length.toLocaleString('en-ph')) + console.log("YGOPRODECK COUNT: πŸ”Έ", ygopdCards.length.toLocaleString('en-ph')) if (YGOPDCOUNT === ygopdCards.length) return newCards else YGOPDCOUNT = ygopdCards.length @@ -70,8 +70,8 @@ export const checkYugipedia = async () => { let rc = await recentChanges.json() rc = rc.query.recentchanges - console.log(' LAST YUGIPEDIA CARD CREATED: πŸ•’', new Date(YUGIPEDIA_LAST_UPDATE).toLocaleString('en-ph')) - console.log(' MOST RECENT CHANGE (NEW): πŸ•’', new Date(rc[0].timestamp).toLocaleString('en-ph')) + console.log('LAST YUGIPEDIA CARD CREATED: πŸ•’', new Date(YUGIPEDIA_LAST_UPDATE).toLocaleString('en-ph')) + console.log('MOST RECENT CHANGE (NEW): πŸ•’', new Date(rc[0].timestamp).toLocaleString('en-ph')) let newCardPages = rc.filter(item => { const comment = item.comment.toLowerCase() diff --git a/utils/card_creator.js b/utils/yugipedia.js similarity index 97% rename from utils/card_creator.js rename to utils/yugipedia.js index d64f6cf..76f4d3a 100644 --- a/utils/card_creator.js +++ b/utils/yugipedia.js @@ -3,7 +3,7 @@ import { requestOptions, YUGIPEDIA_PAGETITLE, YUGIPEDIA_IMG, YUGIPEDIA_SEARCH -} from "./config.js" +} from "../config/config.js" @@ -13,7 +13,7 @@ export const fetchFromYugipedia = async (cardPageIds, cardPageTitles, cardName) const CARDS = [] try { - console.log(` πŸ“– SEARCHING YUGIPEDIA... 【${cardPageIds || cardPageTitles || cardName}】`) + console.log(`πŸ“– SEARCHING YUGIPEDIA... 【${cardPageIds || cardPageTitles || cardName}】`) let wikiContent if (cardPageIds) { @@ -55,7 +55,7 @@ export const fetchFromYugipedia = async (cardPageIds, cardPageTitles, cardName) return CARDS } catch (err) { - console.log(`πŸ”΄ YUGIPEDIA LOOKUP ERROR:`, err.message) + console.log(`πŸŸ₯ YUGIPEDIA LOOKUP ERROR:`, err.message) console.log("πŸ”· STACK:", err.stack) return CARDS }