diff --git a/api/index.ts b/api/index.ts index 4d12a0c..0c70153 100644 --- a/api/index.ts +++ b/api/index.ts @@ -28,7 +28,7 @@ async function start() { events, } = createServices(log); - // events.emit(Events.StartupSync); + events.emit(Events.StartupSync); // events.emit(Events.ListingsUpdated); api.listen(); diff --git a/api/src/api.ts b/api/src/api.ts index a78e075..e9d0525 100644 --- a/api/src/api.ts +++ b/api/src/api.ts @@ -13,9 +13,11 @@ import Bluebird from 'bluebird'; import type Log from 'bunyan'; import type { Listing, User, Want, Prisma } from '@prisma/client'; -import { Pg } from './pg'; -import { Discogs } from './discogs'; -import { Offers } from './offers'; +import type { Pg } from './pg'; +import type { Discogs } from './discogs'; +import type { Offers } from './offers'; +import type { Rpc } from './rpc'; + import routerAuth from './routers/router.auth'; import { Events } from './events'; import createRpc, { RpcMessageType } from './rpc'; @@ -120,7 +122,7 @@ export default function createApi(log: Log, pg: Pg, discogs: Discogs, offers: Of // log.child... const ws = ctx.websocket; - const rpc = createRpc(log, pg, ws, discogs, offers, ctx.state.user); + const rpc = createRpc(log, pg, ws, discogs, offers, ctx.state.user as User | null); if (ctx.state.user) events.emit(Events.Connection, { ws, id: ctx.state.user.id }); ws.on('message', async function incoming(message) { diff --git a/api/src/offers.ts b/api/src/offers.ts index 0c50026..4acd346 100644 --- a/api/src/offers.ts +++ b/api/src/offers.ts @@ -51,7 +51,7 @@ export default function createOffers(log: Log, pg: Pg) { // TODO probably need to take one of each condition of record from a store // eg. they have a VG+ and a M we should make offers for each - log.info(sorted); + // log.info(sorted); const inserts = await pg.offersUpdate(sorted); diff --git a/api/src/pg.ts b/api/src/pg.ts index f2ae171..83c7b0e 100644 --- a/api/src/pg.ts +++ b/api/src/pg.ts @@ -169,6 +169,8 @@ export default function createPg(log: Log, prisma: PrismaClient) { } }); + log.info({ count }, 'second stage open offers removed'); + return count; }); } diff --git a/api/src/rpc.ts b/api/src/rpc.ts index 3bb4d5a..8780eac 100644 --- a/api/src/rpc.ts +++ b/api/src/rpc.ts @@ -141,6 +141,8 @@ export default function createRpc(log: Log, pg: Pg, ws, discogs: Discogs, offers } } +export type Rpc = ReturnType; + export enum RpcMessageType { Ping = 'Ping', Pong = 'Pong',