Leahnaya/sendou.ink
1
0
Fork 0
mirror of https://github.com/Sendouc/sendou.ink.git synced 2026-08-23 11:36:19 -05:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Move DB models to folders

Browse Source
This commit is contained in:
Kalle
2022-08-14 12:05:44 +03:00
parent a4aa217271
commit 6adb44dbf6
16 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/db/index.ts
View File

@@ -1,8 +1,8 @@
import * as users from "./models/users.server";
import * as plusSuggestions from "./models/plusSuggestions.server";
import * as plusVotes from "./models/plusVotes.server";
import * as badges from "./models/badges.server";
import * as calendarEvents from "./models/calendar.server";
import * as users from "./models/users/users.server";
import * as plusSuggestions from "./models/plusSuggestions/plusSuggestions.server";
import * as plusVotes from "./models/plusVotes/plusVotes.server";
import * as badges from "./models/badges/queries.server";
import * as calendarEvents from "./models/calendar/queries.server";
export const db = {
users,

4
app/db/models/badges.server.ts → app/db/models/badges/queries.server.ts
View File

@@ -1,5 +1,5 @@
import { sql } from "../sql";
import type { Badge, User } from "../types";
import { sql } from "../../sql";
import type { Badge, User } from "../../types";
const deleteManyManagersStm = sql.prepare(`
DELETE FROM

4
app/db/models/calendar.server.ts → app/db/models/calendar/queries.server.ts
View File

@@ -1,5 +1,5 @@
import { dateToDatabaseTimestamp } from "~/utils/dates";
import { sql } from "../sql";
import { sql } from "../../sql";
import type {
CalendarEvent,
CalendarEventDate,
@@ -9,7 +9,7 @@ import type {
CalendarEventBadge,
CalendarEventResultTeam,
CalendarEventResultPlayer,
} from "../types";
} from "../../types";
const createStm = sql.prepare(`
insert into "CalendarEvent" (

4
app/db/models/plusSuggestions.server.ts → app/db/models/plusSuggestions/plusSuggestions.server.ts
View File

@@ -3,8 +3,8 @@ import type { MonthYear } from "~/modules/plus-server";
import { nextNonCompletedVoting } from "~/modules/plus-server";
import { atOrError } from "~/utils/arrays";
import { databaseTimestampToDate } from "~/utils/dates";
import { sql } from "../sql";
import type { PlusSuggestion, User, UserWithPlusTier } from "../types";
import { sql } from "../../sql";
import type { PlusSuggestion, User, UserWithPlusTier } from "../../types";
const createStm = sql.prepare(`
INSERT INTO

8
app/db/models/plusVotes.server.ts → app/db/models/plusVotes/plusVotes.server.ts
View File

@@ -5,15 +5,15 @@ import { nextNonCompletedVoting } from "~/modules/plus-server";
import { atOrError } from "~/utils/arrays";
import { dateToDatabaseTimestamp } from "~/utils/dates";
import type { Unpacked } from "~/utils/types";
import { db } from "..";
import { sql } from "../sql";
import { db } from "../..";
import { sql } from "../../sql";
import type {
PlusVote,
PlusVotingResult,
User,
UserWithPlusTier,
} from "../types";
import type { FindVisibleForUserSuggestedUserInfo } from "./plusSuggestions.server";
} from "../../types";
import type { FindVisibleForUserSuggestedUserInfo } from "../plusSuggestions/plusSuggestions.server";
const createStm = sql.prepare(`
INSERT INTO

4
app/db/models/users.server.ts → app/db/models/users/users.server.ts
View File

@@ -1,5 +1,5 @@
import { sql } from "../sql";
import type { User, UserWithPlusTier } from "../types";
import { sql } from "../../sql";
import type { User, UserWithPlusTier } from "../../types";
const upsertStm = sql.prepare(`
INSERT INTO

2
app/db/seed.ts
View File

@@ -6,7 +6,7 @@ import {
} from "~/modules/plus-server";
import { db } from "~/db";
import { sql } from "~/db/sql";
import type { UpsertManyPlusVotesArgs } from "./models/plusVotes.server";
import type { UpsertManyPlusVotesArgs } from "./models/plusVotes/plusVotes.server";
import { ADMIN_DISCORD_ID } from "~/constants";
import shuffle from "just-shuffle";
import { dateToDatabaseTimestamp } from "~/utils/dates";

2
app/modules/patreon/updater.ts
View File

@@ -1,6 +1,6 @@
import type { z } from "zod";
import { db } from "~/db";
import type { UpdatePatronDataArgs } from "~/db/models/users.server";
import type { UpdatePatronDataArgs } from "~/db/models/users/users.server";
import { dateToDatabaseTimestamp } from "~/utils/dates";
import { fetchWithTimeout } from "~/utils/fetch";
import type { Unpacked } from "~/utils/types";

2
app/modules/plus-server/usePlusVoting.ts
View File

@@ -1,7 +1,7 @@
import * as React from "react";
import invariant from "tiny-invariant";
import { PLUS_DOWNVOTE, PLUS_UPVOTE } from "~/constants";
import type { UsersForVoting } from "~/db/models/plusVotes.server";
import type { UsersForVoting } from "~/db/models/plusVotes/plusVotes.server";
import type { User } from "~/db/types";
import type { PlusVoteFromFE } from "./types";
import { nextNonCompletedVoting } from "./voting-time";

4
app/permissions.ts
View File

@@ -1,4 +1,4 @@
import type * as plusSuggestions from "~/db/models/plusSuggestions.server";
import type * as plusSuggestions from "~/db/models/plusSuggestions/plusSuggestions.server";
import { monthsVotingRange } from "./modules/plus-server";
import type {
CalendarEvent,
@@ -9,7 +9,7 @@ import type {
import { allTruthy } from "./utils/arrays";
import { ADMIN_DISCORD_ID, LOHI_TOKEN_HEADER_NAME } from "./constants";
import invariant from "tiny-invariant";
import type { ManagersByBadgeId } from "./db/models/badges.server";
import type { ManagersByBadgeId } from "./db/models/badges/queries.server";
import { databaseTimestampToDate } from "./utils/dates";
// TODO: 1) move "root checkers" to one file and utils to one file 2) make utils const for more terseness

2
app/root.tsx
View File

@@ -23,7 +23,7 @@ import resetStyles from "~/styles/reset.css";
import { Catcher } from "./components/Catcher";
import { Layout } from "./components/layout";
import { db } from "./db";
import type { FindAllPatrons } from "./db/models/users.server";
import type { FindAllPatrons } from "./db/models/users/users.server";
import type { UserWithPlusTier } from "./db/types";
import { getUser } from "./modules/auth";
import { DEFAULT_LANGUAGE, i18next } from "./modules/i18n";

2
app/routes/badges.tsx
View File

@@ -4,7 +4,7 @@ import { Link, NavLink, Outlet, useLoaderData } from "@remix-run/react";
import { Badge } from "~/components/Badge";
import { Main } from "~/components/Main";
import { db } from "~/db";
import type { All } from "~/db/models/badges.server";
import type { All } from "~/db/models/badges/queries.server";
import styles from "~/styles/badges.css";
import { BORZOIC_TWITTER, FAQ_PAGE } from "~/utils/urls";
import { Trans, useTranslation } from "react-i18next";

2
app/routes/badges/$id.tsx
View File

@@ -9,7 +9,7 @@ import { db } from "~/db";
import {
type ManagersByBadgeId,
type OwnersByBadgeId,
} from "~/db/models/badges.server";
} from "~/db/models/badges/queries.server";
import { type Badge as BadgeDBType } from "~/db/types";
import { useUser } from "~/modules/auth";
import { canEditBadgeOwners } from "~/permissions";

2
app/routes/plus/suggestions.tsx
View File

@@ -16,7 +16,7 @@ import { FormWithConfirm } from "~/components/FormWithConfirm";
import { TrashIcon } from "~/components/icons/Trash";
import { nextNonCompletedVoting } from "~/modules/plus-server";
import { db } from "~/db";
import type * as plusSuggestions from "~/db/models/plusSuggestions.server";
import type * as plusSuggestions from "~/db/models/plusSuggestions/plusSuggestions.server";
import type { PlusSuggestion, User } from "~/db/types";
import { getUser, requireUser, useUser } from "~/modules/auth";
import {

2
app/routes/plus/voting/index.tsx
View File

@@ -14,7 +14,7 @@ import { CheckmarkIcon } from "~/components/icons/Checkmark";
import { RelativeTime } from "~/components/RelativeTime";
import { PLUS_DOWNVOTE, PLUS_UPVOTE } from "~/constants";
import { db } from "~/db";
import type { UsersForVoting } from "~/db/models/plusVotes.server";
import type { UsersForVoting } from "~/db/models/plusVotes/plusVotes.server";
import { getUser, requireUser } from "~/modules/auth";
import type { PlusVoteFromFE } from "~/modules/plus-server";
import {

2
app/routes/plus/voting/results.tsx
View File

@@ -7,7 +7,7 @@ import { json } from "@remix-run/node";
import { Link, useLoaderData } from "@remix-run/react";
import { lastCompletedVoting } from "~/modules/plus-server";
import { db } from "~/db";
import type { PlusVotingResultByMonthYear } from "~/db/models/plusVotes.server";
import type { PlusVotingResultByMonthYear } from "~/db/models/plusVotes/plusVotes.server";
import type { PlusVotingResult } from "~/db/types";
import { roundToTwoDecimalPlaces } from "~/utils/number";
import { makeTitle } from "~/utils/strings";