From 82bd9ad7bb2a1a5c178ae77b743386a4d20b9fb5 Mon Sep 17 00:00:00 2001 From: Tau Date: Sun, 27 Oct 2019 11:38:34 -0400 Subject: [PATCH] Additional assorted layering cleanups --- src/aimedb/handler.ts | 6 +----- src/aimedb/index.ts | 8 +++++--- src/aimedb/{db.ts => sql.ts} | 0 src/idz/handler/index.ts | 8 ++------ src/idz/index.ts | 7 ++++++- src/idz/{db => sql}/backgrounds.ts | 0 src/idz/{db => sql}/car.ts | 0 src/idz/{db => sql}/chara.ts | 0 src/idz/{db => sql}/coursePlays.ts | 0 src/idz/{db => sql}/index.ts | 0 src/idz/{db => sql}/missions.ts | 0 src/idz/{db => sql}/profile.ts | 0 src/idz/{db => sql}/settings.ts | 0 src/idz/{db => sql}/story.ts | 0 src/idz/{db => sql}/team.ts | 0 src/idz/{db => sql}/teamAuto.ts | 0 src/idz/{db => sql}/teamMember.ts | 0 src/idz/{db => sql}/teamReservation.ts | 0 src/idz/{db => sql}/tickets.ts | 0 src/idz/{db => sql}/timeAttack.ts | 0 src/idz/{db => sql}/titles.ts | 0 src/idz/{db => sql}/unlocks.ts | 0 22 files changed, 14 insertions(+), 15 deletions(-) rename src/aimedb/{db.ts => sql.ts} (100%) rename src/idz/{db => sql}/backgrounds.ts (100%) rename src/idz/{db => sql}/car.ts (100%) rename src/idz/{db => sql}/chara.ts (100%) rename src/idz/{db => sql}/coursePlays.ts (100%) rename src/idz/{db => sql}/index.ts (100%) rename src/idz/{db => sql}/missions.ts (100%) rename src/idz/{db => sql}/profile.ts (100%) rename src/idz/{db => sql}/settings.ts (100%) rename src/idz/{db => sql}/story.ts (100%) rename src/idz/{db => sql}/team.ts (100%) rename src/idz/{db => sql}/teamAuto.ts (100%) rename src/idz/{db => sql}/teamMember.ts (100%) rename src/idz/{db => sql}/teamReservation.ts (100%) rename src/idz/{db => sql}/tickets.ts (100%) rename src/idz/{db => sql}/timeAttack.ts (100%) rename src/idz/{db => sql}/titles.ts (100%) rename src/idz/{db => sql}/unlocks.ts (100%) diff --git a/src/aimedb/handler.ts b/src/aimedb/handler.ts index ed3e24e..85ed430 100644 --- a/src/aimedb/handler.ts +++ b/src/aimedb/handler.ts @@ -3,8 +3,6 @@ import logger from "debug"; import { Repositories } from "./repo"; import * as Req from "./request"; import * as Res from "./response"; -import { Transaction } from "../sql"; -import { SqlRepositories } from "./db"; const debug = logger("app:aimedb:ops"); @@ -103,12 +101,10 @@ function log( } export async function dispatch( - txn: Transaction, + rep: Repositories, req: Req.AimeRequest, now: Date ): Promise { - const rep = new SqlRepositories(txn); - switch (req.type) { case "hello": return hello(rep, req, now); diff --git a/src/aimedb/index.ts b/src/aimedb/index.ts index c1f26e5..ca62fb2 100644 --- a/src/aimedb/index.ts +++ b/src/aimedb/index.ts @@ -2,9 +2,9 @@ import logger from "debug"; import { Socket } from "net"; import { dispatch } from "./handler"; -import { AimeRequest } from "./request"; import { setup } from "./pipeline"; import { DataSource } from "../sql/api"; +import { SqlRepositories } from "./sql"; const debug = logger("app:aimedb:session"); @@ -17,8 +17,10 @@ export default function aimedb(db: DataSource) { for await (const obj of input) { try { const now = new Date(); - const req = obj as AimeRequest; - const res = await db.transaction(txn => dispatch(txn, req, now)); + const req = obj; + const res = await db.transaction(txn => + dispatch(new SqlRepositories(txn), req, now) + ); if (res === undefined) { debug("Closing connection"); diff --git a/src/aimedb/db.ts b/src/aimedb/sql.ts similarity index 100% rename from src/aimedb/db.ts rename to src/aimedb/sql.ts diff --git a/src/idz/handler/index.ts b/src/idz/handler/index.ts index 293770e..5c6adcb 100644 --- a/src/idz/handler/index.ts +++ b/src/idz/handler/index.ts @@ -40,18 +40,14 @@ import { updateTeamMember } from "./updateTeamMember"; import { updateTeamPoints } from "./updateTeamPoints"; import { updateUiReport } from "./updateUiReport"; import { updateUserLog } from "./updateUserLog"; +import { Repositories } from "../repo"; import { Request } from "../request"; import { Response } from "../response"; -import { Repositories } from "../repo"; -import { Transaction } from "../../sql"; -import { SqlRepositories } from "../db"; export async function dispatch( - txn: Transaction, + w: Repositories, req: Request ): Promise { - const w = new SqlRepositories(txn); - switch (req.type) { case "check_team_name_req": return checkTeamName(w, req); diff --git a/src/idz/index.ts b/src/idz/index.ts index 7d3d5fd..c3954ba 100644 --- a/src/idz/index.ts +++ b/src/idz/index.ts @@ -4,6 +4,7 @@ import { Socket } from "net"; import { dispatch } from "./handler"; import { setup } from "./setup"; import { DataSource } from "../sql"; +import { SqlRepositories } from "./sql"; const debug = logger("app:idz:session"); @@ -15,7 +16,11 @@ export default function idz(db: DataSource) { try { for await (const req of input) { - output.write(await db.transaction(txn => dispatch(txn, req))); + const res = await db.transaction(txn => + dispatch(new SqlRepositories(txn), req) + ); + + output.write(res); } } catch (e) { if (debug.enabled) { diff --git a/src/idz/db/backgrounds.ts b/src/idz/sql/backgrounds.ts similarity index 100% rename from src/idz/db/backgrounds.ts rename to src/idz/sql/backgrounds.ts diff --git a/src/idz/db/car.ts b/src/idz/sql/car.ts similarity index 100% rename from src/idz/db/car.ts rename to src/idz/sql/car.ts diff --git a/src/idz/db/chara.ts b/src/idz/sql/chara.ts similarity index 100% rename from src/idz/db/chara.ts rename to src/idz/sql/chara.ts diff --git a/src/idz/db/coursePlays.ts b/src/idz/sql/coursePlays.ts similarity index 100% rename from src/idz/db/coursePlays.ts rename to src/idz/sql/coursePlays.ts diff --git a/src/idz/db/index.ts b/src/idz/sql/index.ts similarity index 100% rename from src/idz/db/index.ts rename to src/idz/sql/index.ts diff --git a/src/idz/db/missions.ts b/src/idz/sql/missions.ts similarity index 100% rename from src/idz/db/missions.ts rename to src/idz/sql/missions.ts diff --git a/src/idz/db/profile.ts b/src/idz/sql/profile.ts similarity index 100% rename from src/idz/db/profile.ts rename to src/idz/sql/profile.ts diff --git a/src/idz/db/settings.ts b/src/idz/sql/settings.ts similarity index 100% rename from src/idz/db/settings.ts rename to src/idz/sql/settings.ts diff --git a/src/idz/db/story.ts b/src/idz/sql/story.ts similarity index 100% rename from src/idz/db/story.ts rename to src/idz/sql/story.ts diff --git a/src/idz/db/team.ts b/src/idz/sql/team.ts similarity index 100% rename from src/idz/db/team.ts rename to src/idz/sql/team.ts diff --git a/src/idz/db/teamAuto.ts b/src/idz/sql/teamAuto.ts similarity index 100% rename from src/idz/db/teamAuto.ts rename to src/idz/sql/teamAuto.ts diff --git a/src/idz/db/teamMember.ts b/src/idz/sql/teamMember.ts similarity index 100% rename from src/idz/db/teamMember.ts rename to src/idz/sql/teamMember.ts diff --git a/src/idz/db/teamReservation.ts b/src/idz/sql/teamReservation.ts similarity index 100% rename from src/idz/db/teamReservation.ts rename to src/idz/sql/teamReservation.ts diff --git a/src/idz/db/tickets.ts b/src/idz/sql/tickets.ts similarity index 100% rename from src/idz/db/tickets.ts rename to src/idz/sql/tickets.ts diff --git a/src/idz/db/timeAttack.ts b/src/idz/sql/timeAttack.ts similarity index 100% rename from src/idz/db/timeAttack.ts rename to src/idz/sql/timeAttack.ts diff --git a/src/idz/db/titles.ts b/src/idz/sql/titles.ts similarity index 100% rename from src/idz/db/titles.ts rename to src/idz/sql/titles.ts diff --git a/src/idz/db/unlocks.ts b/src/idz/sql/unlocks.ts similarity index 100% rename from src/idz/db/unlocks.ts rename to src/idz/sql/unlocks.ts