diff --git a/backend/api/controllers/ape-key.ts b/backend/api/controllers/ape-key.ts index d620adbe7..adbff8f8b 100644 --- a/backend/api/controllers/ape-key.ts +++ b/backend/api/controllers/ape-key.ts @@ -1,7 +1,7 @@ import _ from "lodash"; import { randomBytes } from "crypto"; import { hash } from "bcrypt"; -import * as ApeKeysDAL from "../../dao/ape-keys"; +import * as ApeKeysDAL from "../../dal/ape-keys"; import MonkeyError from "../../utils/error"; import { MonkeyResponse } from "../../utils/monkey-response"; import { base64UrlEncode } from "../../utils/misc"; diff --git a/backend/api/controllers/config.ts b/backend/api/controllers/config.ts index 6de599b4d..bb93d7c9c 100644 --- a/backend/api/controllers/config.ts +++ b/backend/api/controllers/config.ts @@ -1,4 +1,4 @@ -import * as ConfigDAL from "../../dao/config"; +import * as ConfigDAL from "../../dal/config"; import { MonkeyResponse } from "../../utils/monkey-response"; export async function getConfig( diff --git a/backend/api/controllers/leaderboard.ts b/backend/api/controllers/leaderboard.ts index 85b65f229..91e916910 100644 --- a/backend/api/controllers/leaderboard.ts +++ b/backend/api/controllers/leaderboard.ts @@ -1,6 +1,6 @@ import _ from "lodash"; import { MonkeyResponse } from "../../utils/monkey-response"; -import * as LeaderboardsDAL from "../../dao/leaderboards"; +import * as LeaderboardsDAL from "../../dal/leaderboards"; import MonkeyError from "../../utils/error"; export async function getLeaderboard( diff --git a/backend/api/controllers/preset.ts b/backend/api/controllers/preset.ts index f41eb9ed4..fcee08f08 100644 --- a/backend/api/controllers/preset.ts +++ b/backend/api/controllers/preset.ts @@ -1,4 +1,4 @@ -import * as PresetDAL from "../../dao/preset"; +import * as PresetDAL from "../../dal/preset"; import { MonkeyResponse } from "../../utils/monkey-response"; export async function getPresets( diff --git a/backend/api/controllers/psa.ts b/backend/api/controllers/psa.ts index 4bb5fff11..f3f41e8f9 100644 --- a/backend/api/controllers/psa.ts +++ b/backend/api/controllers/psa.ts @@ -1,4 +1,4 @@ -import * as PsaDAL from "../../dao/psa"; +import * as PsaDAL from "../../dal/psa"; import { MonkeyResponse } from "../../utils/monkey-response"; export async function getPsas( diff --git a/backend/api/controllers/quote.ts b/backend/api/controllers/quote.ts index 15280881c..2b92c0b05 100644 --- a/backend/api/controllers/quote.ts +++ b/backend/api/controllers/quote.ts @@ -1,9 +1,9 @@ import _ from "lodash"; import { v4 as uuidv4 } from "uuid"; -import { getUser, updateQuoteRatings } from "../../dao/user"; -import * as ReportDAL from "../../dao/report"; -import * as NewQuotesDAL from "../../dao/new-quotes"; -import * as QuoteRatingsDAL from "../../dao/quote-ratings"; +import { getUser, updateQuoteRatings } from "../../dal/user"; +import * as ReportDAL from "../../dal/report"; +import * as NewQuotesDAL from "../../dal/new-quotes"; +import * as QuoteRatingsDAL from "../../dal/quote-ratings"; import MonkeyError from "../../utils/error"; import { verify } from "../../utils/captcha"; import Logger from "../../utils/logger"; diff --git a/backend/api/controllers/result.ts b/backend/api/controllers/result.ts index 8940d224b..9d07d06ad 100644 --- a/backend/api/controllers/result.ts +++ b/backend/api/controllers/result.ts @@ -1,13 +1,13 @@ -import * as ResultDAL from "../../dao/result"; +import * as ResultDAL from "../../dal/result"; import { getUser, checkIfPb, checkIfTagPb, incrementBananas, updateTypingStats, -} from "../../dao/user"; -import * as PublicStatsDAL from "../../dao/public-stats"; -import * as BotDAL from "../../dao/bot"; +} from "../../dal/user"; +import * as PublicStatsDAL from "../../dal/public-stats"; +import * as BotDAL from "../../dal/bot"; import { roundTo2, stdDev } from "../../utils/misc"; import objectHash from "object-hash"; import Logger from "../../utils/logger"; diff --git a/backend/api/controllers/user.ts b/backend/api/controllers/user.ts index 0c2773236..0dd517f01 100644 --- a/backend/api/controllers/user.ts +++ b/backend/api/controllers/user.ts @@ -1,5 +1,5 @@ -import * as UserDAL from "../../dao/user"; -import * as BotDAL from "../../dao/bot"; +import * as UserDAL from "../../dal/user"; +import * as BotDAL from "../../dal/bot"; import MonkeyError from "../../utils/error"; import Logger from "../../utils/logger"; import { MonkeyResponse } from "../../utils/monkey-response"; diff --git a/backend/dao/ape-keys.ts b/backend/dal/ape-keys.ts similarity index 100% rename from backend/dao/ape-keys.ts rename to backend/dal/ape-keys.ts diff --git a/backend/dao/bot.ts b/backend/dal/bot.ts similarity index 100% rename from backend/dao/bot.ts rename to backend/dal/bot.ts diff --git a/backend/dao/config.ts b/backend/dal/config.ts similarity index 100% rename from backend/dao/config.ts rename to backend/dal/config.ts diff --git a/backend/dao/leaderboards.ts b/backend/dal/leaderboards.ts similarity index 100% rename from backend/dao/leaderboards.ts rename to backend/dal/leaderboards.ts diff --git a/backend/dao/new-quotes.ts b/backend/dal/new-quotes.ts similarity index 100% rename from backend/dao/new-quotes.ts rename to backend/dal/new-quotes.ts diff --git a/backend/dao/preset.ts b/backend/dal/preset.ts similarity index 100% rename from backend/dao/preset.ts rename to backend/dal/preset.ts diff --git a/backend/dao/psa.ts b/backend/dal/psa.ts similarity index 100% rename from backend/dao/psa.ts rename to backend/dal/psa.ts diff --git a/backend/dao/public-stats.ts b/backend/dal/public-stats.ts similarity index 100% rename from backend/dao/public-stats.ts rename to backend/dal/public-stats.ts diff --git a/backend/dao/quote-ratings.ts b/backend/dal/quote-ratings.ts similarity index 100% rename from backend/dao/quote-ratings.ts rename to backend/dal/quote-ratings.ts diff --git a/backend/dao/report.ts b/backend/dal/report.ts similarity index 100% rename from backend/dao/report.ts rename to backend/dal/report.ts diff --git a/backend/dao/result.ts b/backend/dal/result.ts similarity index 100% rename from backend/dao/result.ts rename to backend/dal/result.ts diff --git a/backend/dao/user.ts b/backend/dal/user.ts similarity index 100% rename from backend/dao/user.ts rename to backend/dal/user.ts diff --git a/backend/jobs/update-leaderboards.ts b/backend/jobs/update-leaderboards.ts index b51c8d5e0..bf3f605e8 100644 --- a/backend/jobs/update-leaderboards.ts +++ b/backend/jobs/update-leaderboards.ts @@ -1,7 +1,7 @@ import { CronJob } from "cron"; -import { announceLbUpdate } from "../dao/bot"; +import { announceLbUpdate } from "../dal/bot"; import George from "../tasks/george"; -import * as LeaderboardsDAL from "../dao/leaderboards"; +import * as LeaderboardsDAL from "../dal/leaderboards"; import { getCachedConfiguration } from "../init/configuration"; const CRON_SCHEDULE = "30 14/15 * * * *"; diff --git a/backend/middlewares/api-utils.ts b/backend/middlewares/api-utils.ts index 97f970596..1d1e8de7d 100644 --- a/backend/middlewares/api-utils.ts +++ b/backend/middlewares/api-utils.ts @@ -3,7 +3,7 @@ import joi from "joi"; import MonkeyError from "../utils/error"; import { Response, NextFunction, RequestHandler } from "express"; import { handleMonkeyResponse, MonkeyResponse } from "../utils/monkey-response"; -import { getUser } from "../dao/user"; +import { getUser } from "../dal/user"; interface ValidationOptions { criteria: (data: T) => boolean; diff --git a/backend/middlewares/auth.ts b/backend/middlewares/auth.ts index 901ccce56..ac280d20b 100644 --- a/backend/middlewares/auth.ts +++ b/backend/middlewares/auth.ts @@ -1,5 +1,5 @@ import { compare } from "bcrypt"; -import { getApeKey, updateLastUsedOn } from "../dao/ape-keys"; +import { getApeKey, updateLastUsedOn } from "../dal/ape-keys"; import MonkeyError from "../utils/error"; import { verifyIdToken } from "../utils/auth"; import { base64UrlDecode } from "../utils/misc";