From 7ffe4d28253581ac2c5b9b57b71cd8847a0ea4eb Mon Sep 17 00:00:00 2001
From: Mike Conrad <mike@enxo.co>
Date: Mon, 19 May 2025 13:48:47 -0400
Subject: [PATCH] Clean up type errors and get docker build into better state

---
 .env.example                          | 3 ++-
 .gitignore                            | 4 ++--
 Dockerfile                            | 6 +++---
 app/controllers/replays_controller.ts | 2 +-
 config/database.ts                    | 1 -
 start/env.ts                          | 7 ++++++-
 6 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/.env.example b/.env.example
index 13fed0c..931db85 100644
--- a/.env.example
+++ b/.env.example
@@ -5,10 +5,11 @@ LOG_LEVEL=info
 APP_KEY=
 NODE_ENV=development
 SESSION_DRIVER=cookie
+PG_PORT=5432
 PG_HOST=localhost
 PG_PASSWORD=password
 SENTRY_TOKEN=
 SENTRY_ORG=
 REDIS_HOST=sentry-redis-1
 REDIS_PORT=6379
-REDIS_PASSWORD=
\ No newline at end of file
+REDIS_PASSWORD=
diff --git a/.gitignore b/.gitignore
index 4e9b445..cf36d1b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,8 +6,8 @@ tmp
 # Secrets
 .env
 .env.local
-.env.production.local
-.env.development.local
+.env.production
+.env.develop
 
 # Frontend assets compiled code
 public/assets
diff --git a/Dockerfile b/Dockerfile
index b694a2b..cf529bb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,10 @@
 FROM node:20.12.2-alpine3.18 AS base
 
-
 # All deps stage
 FROM base AS deps
 WORKDIR /app
 ADD package.json package-lock.json ./
+RUN npm ci
 
 FROM node:22 AS dev-deps
 WORKDIR /app
@@ -24,7 +24,7 @@ FROM base AS build
 WORKDIR /app
 COPY --from=deps /app/node_modules /app/node_modules
 ADD . .
-RUN node ace build --ignore-ts-errors
+RUN node ace build
 
 # Production stage
 FROM base
@@ -33,4 +33,4 @@ WORKDIR /app
 COPY --from=production-deps /app/node_modules /app/node_modules
 COPY --from=build /app/build /app
 EXPOSE 8080
-CMD ["node", "./bin/server.js"]
+CMD ["node", "./bin/server.js"]
\ No newline at end of file
diff --git a/app/controllers/replays_controller.ts b/app/controllers/replays_controller.ts
index 4384a64..a9b002b 100644
--- a/app/controllers/replays_controller.ts
+++ b/app/controllers/replays_controller.ts
@@ -135,7 +135,7 @@ function parseSentryLinkHeader(header:string): SentryPagination {
     }, {} as Record<string, any>)
   }
 
-  function buildPaginationLinks(meta) {
+  function buildPaginationLinks(meta: { previousPageUrl: string, lastPage: number; currentPage: number; nextPageUrl: string}) {
   const links = []
 
   // Previous
diff --git a/config/database.ts b/config/database.ts
index 020bc6a..b30d827 100644
--- a/config/database.ts
+++ b/config/database.ts
@@ -1,4 +1,3 @@
-import app from '@adonisjs/core/services/app'
 import { defineConfig } from '@adonisjs/lucid'
 import env from '#start/env'
 
diff --git a/start/env.ts b/start/env.ts
index 88b74bf..8c2f1bd 100644
--- a/start/env.ts
+++ b/start/env.ts
@@ -27,5 +27,10 @@ export default await Env.create(new URL('../', import.meta.url), {
 
   REDIS_HOST: Env.schema.string({ format: 'host' }),
   REDIS_PORT: Env.schema.number(),
-  REDIS_PASSWORD: Env.schema.string.optional()
+  REDIS_PASSWORD: Env.schema.string.optional(),
+
+  PG_PORT: Env.schema.number(),
+  PG_HOST: Env.schema.string(),
+  PG_USER: Env.schema.string(),
+  PG_PASSWORD: Env.schema.string(),
 })