Update docker setup to include migrations

.dockerignore

@@ -1 +1,5 @@
-.gitignore
+node_modules
+prisma/generated
+.github
+.vscode
+docs

.gitignore

@@ -112,8 +112,9 @@ dist
 .tern-port
 
 # Prisma
-prisma/
-!prisma/schema.prisma
+prisma/generated
+prisma/db/*.db*
 
 # Generated "NFD" images
-src/assets/NFD/images
+assets/NFD/images/*
+!assets/NFD/images/.gitkeep

Dockerfile

@@ -1,11 +1,32 @@
-FROM node:16.13.1-alpine3.15
+# syntax=docker/dockerfile:1
+FROM node:lts-alpine3.17 as builder
 
-WORKDIR /usr/src/app
+WORKDIR /app
 
 COPY package*.json ./
+COPY prisma ./prisma
+
 RUN npm install
 
 COPY . .
-RUN npx prisma generate && npx prisma migrate dev --name init && npm run build
 
-CMD ["npm", "run", "serve"]
+RUN npm run build && npx prisma generate
+
+FROM node:lts-alpine3.17
+
+WORKDIR /app
+
+RUN addgroup -S twiggy && adduser -S twiggy -G twiggy
+
+COPY --from=builder /app/node_modules ./node_modules
+COPY --from=builder /app/assets ./assets
+COPY --from=builder /app/package*.json ./
+COPY --from=builder /app/build ./build
+COPY --from=builder /app/prisma ./prisma
+COPY --from=builder /app/prisma/database.empty ./prisma/db/main.db
+
+RUN chown -R twiggy:twiggy /app/prisma/db /app/assets/NFD/images
+
+USER twiggy
+
+CMD ["npm", "run", "migrate:serve"]

package.json

@@ -10,7 +10,7 @@
     "serve": "node build/main.js",
     "lint": "eslint -c .eslintrc.cjs src .eslintrc.cjs",
     "lint:fix": "eslint -c .eslintrc.cjs src .eslintrc.cjs --fix",
-    "eloDecay": " node ./build/standalones/eloDecay.js"
+    "migrate:serve": "prisma migrate deploy && npm run serve"
   },
   "repository": {
     "type": "git",

prisma/migrations/20230330024630_init/migration.sql

@@ -0,0 +1,111 @@
+-- CreateTable
+CREATE TABLE "GuildOptions" (
+    "guildId" TEXT NOT NULL PRIMARY KEY,
+    "gambleChance" DECIMAL NOT NULL DEFAULT 33.33,
+    "globalDuelCD" INTEGER NOT NULL DEFAULT 60000,
+    "lastDuel" DATETIME NOT NULL DEFAULT 0,
+    "lastRPG" DATETIME NOT NULL DEFAULT 0
+);
+
+-- CreateTable
+CREATE TABLE "User" (
+    "id" TEXT NOT NULL PRIMARY KEY,
+    "favColor" TEXT,
+    "lastRandom" DATETIME NOT NULL DEFAULT 0,
+    "lastLoss" DATETIME NOT NULL DEFAULT 0
+);
+
+-- CreateTable
+CREATE TABLE "Duels" (
+    "id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+    "userId" TEXT NOT NULL,
+    "losses" INTEGER NOT NULL DEFAULT 0,
+    "wins" INTEGER NOT NULL DEFAULT 0,
+    "draws" INTEGER NOT NULL DEFAULT 0,
+    "winStreak" INTEGER NOT NULL DEFAULT 0,
+    "lossStreak" INTEGER NOT NULL DEFAULT 0,
+    "winStreakMax" INTEGER NOT NULL DEFAULT 0,
+    "lossStreakMax" INTEGER NOT NULL DEFAULT 0,
+    CONSTRAINT "Duels_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User" ("id") ON DELETE RESTRICT ON UPDATE CASCADE
+);
+
+-- CreateTable
+CREATE TABLE "BestMixu" (
+    "id" TEXT NOT NULL DEFAULT '1',
+    "owner" TEXT NOT NULL DEFAULT '',
+    "tiles" TEXT NOT NULL DEFAULT '',
+    "score" INTEGER NOT NULL DEFAULT 0
+);
+
+-- CreateTable
+CREATE TABLE "RPGCharacter" (
+    "id" TEXT NOT NULL PRIMARY KEY,
+    "wins" INTEGER NOT NULL DEFAULT 0,
+    "losses" INTEGER NOT NULL DEFAULT 0,
+    "draws" INTEGER NOT NULL DEFAULT 0,
+    "lastLoss" DATETIME NOT NULL DEFAULT 0,
+    "eloRank" INTEGER NOT NULL DEFAULT 1000,
+    "peakElo" INTEGER NOT NULL DEFAULT 1000,
+    "floorElo" INTEGER NOT NULL DEFAULT 1000
+);
+
+-- CreateTable
+CREATE TABLE "NFDItem" (
+    "id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+    "name" TEXT NOT NULL,
+    "code" TEXT NOT NULL,
+    "filename" TEXT NOT NULL,
+    "owner" TEXT NOT NULL,
+    "discordUrl" TEXT NOT NULL DEFAULT '',
+    "mintDate" DATETIME NOT NULL DEFAULT 0,
+    "previousOwners" TEXT NOT NULL DEFAULT '',
+    "coveters" TEXT NOT NULL DEFAULT '',
+    "shunners" TEXT NOT NULL DEFAULT '',
+    "hotness" INTEGER NOT NULL DEFAULT 0
+);
+
+-- CreateTable
+CREATE TABLE "NFDEnjoyer" (
+    "id" TEXT NOT NULL PRIMARY KEY,
+    "mintCount" INTEGER NOT NULL DEFAULT 0,
+    "lastMint" DATETIME NOT NULL DEFAULT 0,
+    "lastGiftGiven" DATETIME NOT NULL DEFAULT 0,
+    "lastSlurp" DATETIME NOT NULL DEFAULT 0,
+    "consecutiveFails" INTEGER NOT NULL DEFAULT 4,
+    "successfulMints" INTEGER NOT NULL DEFAULT 0,
+    "failedMints" INTEGER NOT NULL DEFAULT 0
+);
+
+-- CreateTable
+CREATE TABLE "NFDEnthusiasts" (
+    "dinoId" INTEGER NOT NULL,
+    "enjoyerId" TEXT NOT NULL,
+
+    PRIMARY KEY ("dinoId", "enjoyerId"),
+    CONSTRAINT "NFDEnthusiasts_dinoId_fkey" FOREIGN KEY ("dinoId") REFERENCES "NFDItem" ("id") ON DELETE CASCADE ON UPDATE CASCADE,
+    CONSTRAINT "NFDEnthusiasts_enjoyerId_fkey" FOREIGN KEY ("enjoyerId") REFERENCES "NFDEnjoyer" ("id") ON DELETE CASCADE ON UPDATE CASCADE
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "GuildOptions_guildId_key" ON "GuildOptions"("guildId");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "User_id_key" ON "User"("id");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "BestMixu_id_key" ON "BestMixu"("id");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "RPGCharacter_id_key" ON "RPGCharacter"("id");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "NFDItem_name_key" ON "NFDItem"("name");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "NFDItem_code_key" ON "NFDItem"("code");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "NFDItem_filename_key" ON "NFDItem"("filename");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "NFDEnjoyer_id_key" ON "NFDEnjoyer"("id");

prisma/migrations/migration_lock.toml

@@ -0,0 +1,3 @@
+# Please do not edit this file manually
+# It should be added in your version-control system (i.e. Git)
+provider = "sqlite"

prisma/schema.prisma

@@ -9,7 +9,7 @@ generator client {
 
 datasource db {
   provider = "sqlite"
-  url      = "file:./dev.db"
+  url      = "file:./db/main.db"
 }
 
 model GuildOptions {

src/commands/NFD.ts

@@ -70,8 +70,8 @@ class NFD {
 
   private MAX_NFD_PRICE_EXPONENT = 30
 
-  private FRAGMENT_PATH = path.join(__dirname, '../../src/assets/NFD/fragments')
-  private OUTPUT_PATH = path.join(__dirname, '../../src/assets/NFD/images')
+  private FRAGMENT_PATH = path.join(__dirname, '../../assets/NFD/fragments')
+  private OUTPUT_PATH = path.join(__dirname, '../../assets/NFD/images')
 
   private MAX_NFD_LISTED = 25
   private MAX_COLLAGE_ITEMS = 25

src/events/CallResponse.ts

@@ -14,7 +14,7 @@ type CallResponse = {
 
 @Discord()
 abstract class CallAndResponder {
-  private BasePath = '../../src/assets'
+  private BasePath = '../../assets'
 
   // todo: Move these into a json obj and serialize and cache the obj at runtime
   //  Would allow us to add triggers via a mod command should we choose to