Fix build errors

src/api/api.queries.ts

@@ -1,5 +1,5 @@
 /** Types generated for queries found in "src/api/api.sql" */
-import { PreparedQuery } from '@pgtyped/query'
+import { PreparedQuery } from '@pgtyped/runtime'
 
 /** 'LoginFromToken' parameters type */
 export interface ILoginFromTokenParams {

src/api/comments.controller.ts

@@ -67,7 +67,7 @@ export class CommentsController {
         ...comment,
         postedAt: moment().utc().toDate(),
       },
-      req.ip
+      req.ip ?? ''
     )
 
     if (req.headers['content-type'] !== 'application/json') {

src/shared/accounts/accounts.queries.ts

@@ -1,5 +1,5 @@
 /** Types generated for queries found in "src/shared/accounts/accounts.sql" */
-import { PreparedQuery } from '@pgtyped/query'
+import { PreparedQuery } from '@pgtyped/runtime'
 
 /** 'Signup' parameters type */
 export interface ISignupParams {

src/shared/auth/auth.queries.ts

@@ -1,5 +1,5 @@
 /** Types generated for queries found in "src/shared/auth/auth.sql" */
-import { PreparedQuery } from '@pgtyped/query'
+import { PreparedQuery } from '@pgtyped/runtime'
 
 /** 'ExpirePendingTokens' parameters type */
 export interface IExpirePendingTokensParams {

src/shared/comments/comments.queries.ts

@@ -1,5 +1,5 @@
 /** Types generated for queries found in "src/shared/comments/comments.sql" */
-import { PreparedQuery } from '@pgtyped/query'
+import { PreparedQuery } from '@pgtyped/runtime'
 
 /** 'PostCommentForUrl' parameters type */
 export interface IPostCommentForUrlParams {

src/shared/logging/logged-query.ts

@@ -1,5 +1,5 @@
 import _ from 'lodash'
-import { PreparedQuery } from '@pgtyped/query'
+import { PreparedQuery } from '@pgtyped/runtime'
 
 export function interpretedQuery(query: PreparedQuery<any, any>, params: Record<string, unknown>): string {
   const templatedSql = (_.get(query, 'query.statement.body') as string) ?? ''

src/web/accounts/account.closer.ts

@@ -20,9 +20,10 @@ export class AccountCloser {
       const payload = job.data  
       if (!isAccountCloserPayload(payload)) {
         this.logger.error(`Unsupported payload ${JSON.stringify(payload)}`)
-        return
+        return Promise.resolve()
       }  
       this.closeAccount(payload)
+      return Promise.resolve()
     })
   }
 

src/web/dashboard/dashboard.controller.ts

@@ -9,6 +9,8 @@ import moment from 'moment'
 import { Request, Response } from 'express'
 import { SessionExpiredFilter } from '../../shared/auth/auth.exception'
 
+type GenericResponse = Response<any, Record<string, any>>;
+
 @Controller('dashboard')
 @UseFilters(new SessionExpiredFilter())
 export class DashboardController {
@@ -83,7 +85,7 @@ export class DashboardController {
 
   @Post('comment/delete')
   @UseGuards(AuthenticatedGuard)
-  async deleteSingleComment(@Req() req: Request, @Res() res: Response, @Body() id: Identifiable): Promise<void> {
+  async deleteSingleComment(@Req() req: Request, @Res() res: Response, @Body() id: Identifiable): Promise<GenericResponse> {
     const account = _.get(req, 'user') as Account
     const comment = await this.commentService.findById(account, id.id)
     if (!comment) {
@@ -96,7 +98,7 @@ export class DashboardController {
 
   @Post('comments/deleteMany')
   @UseGuards(AuthenticatedGuard)
-  async deleteComments(@Req() req: Request, @Res() res: Response, @Body() body: { ids: string[] }): Promise<void> {
+  async deleteComments(@Req() req: Request, @Res() res: Response, @Body() body: { ids: string[] }): Promise<GenericResponse> {
     const account = _.get(req, 'user') as Account
     for (const id of body.ids) {
       const comment = await this.commentService.findById(account, id)
@@ -112,7 +114,7 @@ export class DashboardController {
 
   @Post('spam/delete')
   @UseGuards(AuthenticatedGuard)
-  async deleteSpamComment(@Req() req: Request, @Res() res: Response, @Body() id: Identifiable): Promise<void> {
+  async deleteSpamComment(@Req() req: Request, @Res() res: Response, @Body() id: Identifiable): Promise<GenericResponse> {
     const account = _.get(req, 'user') as Account
     const comment = await this.commentService.findSpamById(account, id.id)
     if (!comment) {
@@ -127,7 +129,7 @@ export class DashboardController {
 
   @Post('spam/deleteMany')
   @UseGuards(AuthenticatedGuard)
-  async deleteSpamComments(@Req() req: Request, @Res() res: Response, @Body() body: { ids: string[] }): Promise<void> {
+  async deleteSpamComments(@Req() req: Request, @Res() res: Response, @Body() body: { ids: string[] }): Promise<GenericResponse> {
     const account = _.get(req, 'user') as Account
     for (const id of body.ids) {
       const comment = await this.commentService.findSpamById(account, id)
@@ -143,7 +145,7 @@ export class DashboardController {
 
   @Post('spam/unmark')
   @UseGuards(AuthenticatedGuard)
-  async unmarkSingle(@Req() req: Request, @Res() res: Response, @Body() id: Identifiable): Promise<void> {
+  async unmarkSingle(@Req() req: Request, @Res() res: Response, @Body() id: Identifiable): Promise<GenericResponse> {
     const account = _.get(req, 'user') as Account
     const comment = await this.commentService.findSpamById(account, id.id)
     if (!comment) {
@@ -156,7 +158,7 @@ export class DashboardController {
 
   @Post('spam/unmarkMany')
   @UseGuards(AuthenticatedGuard)
-  async unmarkMany(@Req() req: Request, @Res() res: Response, @Body() body: { ids: string[] }): Promise<void> {
+  async unmarkMany(@Req() req: Request, @Res() res: Response, @Body() body: { ids: string[] }): Promise<GenericResponse> {
     const account = _.get(req, 'user') as Account
     for (const id of body.ids) {
       const comment = await this.commentService.findSpamById(account, id)
@@ -172,7 +174,7 @@ export class DashboardController {
 
   @Post('spam/purge')
   @UseGuards(AuthenticatedGuard)
-  async purgeSpam(@Req() req: Request, @Res() res: Response): Promise<void> {
+  async purgeSpam(@Req() req: Request, @Res() res: Response): Promise<GenericResponse> {
     const account = _.get(req, 'user') as Account
     await this.commentService.purgeSpam(account)