Merge pull request #23 from XKCDY/feat-kysely

Author: codetheweb

.github/workflows/lint.yml

@@ -6,20 +6,12 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
 
-      - name: Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-
-      - name: Cache yarn dependencies
-        uses: actions/cache@v2
-        id: yarn-cache
+      - uses: actions/setup-node@v3
         with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
+          node-version: 16
+          cache: yarn
 
       - name: Install dependencies
         run: yarn install

package.json

@@ -21,25 +21,28 @@
     "lint:fix": "xo --fix",
     "test": "lint",
     "migrations:generate": "prisma migrate dev --preview-feature",
-    "migrations:run": "prisma migrate deploy --preview-feature"
+    "migrations:run": "prisma migrate deploy --preview-feature",
+    "generate-typings": "kysely-codegen --out-file ./src/types/db.d.ts"
   },
   "devDependencies": {
     "@nestjs/cli": "^7.5.6",
     "@types/cors": "^2.8.6",
     "@types/morgan": "^1.9.1",
-    "@types/node": "^14.0.14",
+    "@types/node": "^16.0.0",
+    "@types/pg": "8.6.5",
     "@types/probe-image-size": "^5.0.1",
     "@types/uuid": "^8.0.0",
     "@types/validator": "^13.1.0",
     "@typescript-eslint/eslint-plugin": "^4.19.0",
     "@typescript-eslint/parser": "^4.19.0",
     "eslint": "^7.22.0",
     "husky": "^4.2.5",
+    "kysely-codegen": "0.5.3",
     "lint-staged": "^10.5.3",
-    "prisma": "4.0.0",
+    "prisma": "4.3.1",
     "rimraf": "^3.0.2",
-    "typescript": "^4.2.3",
-    "xo": "^0.38.2"
+    "typescript": "^4.8.2",
+    "xo": "^0.52.3"
   },
   "xo": {
     "ignore": [
@@ -51,7 +54,13 @@
         {
           "capIsNewExceptionPattern": "@*"
         }
-      ]
+      ],
+      "n/prefer-global/process": "off",
+      "n/prefer-global/buffer": "off",
+      "import/extensions": "off",
+      "@typescript-eslint/naming-convention": "off",
+      "unicorn/prefer-module": "off",
+      "@typescript-eslint/comma-dangle": "off"
     }
   },
   "husky": {
@@ -66,13 +75,14 @@
   },
   "dependencies": {
     "@codetheweb/nestjs-bull": "^0.3.1",
-    "@nestjs/common": "^7.6.15",
+    "@fastify/static": "6.5.0",
+    "@nestjs/common": "^9.0.11",
     "@nestjs/config": "^0.6.3",
-    "@nestjs/core": "^7.6.15",
-    "@nestjs/platform-fastify": "^7.6.15",
-    "@nestjs/serve-static": "^2.1.4",
-    "@nestjs/swagger": "^4.8.0",
-    "@prisma/client": "4.0.0",
+    "@nestjs/core": "^9.0.11",
+    "@nestjs/platform-fastify": "^9.0.11",
+    "@nestjs/serve-static": "^3.0.0",
+    "@nestjs/swagger": "^6.1.2",
+    "@prisma/client": "4.3.1",
     "apn": "^2.2.0",
     "bullmq": "^1.15.1",
     "class-transformer": "^0.4.0",
@@ -81,10 +91,13 @@
     "dd-trace": "^0.31.1",
     "dotenv": "^8.2.0",
     "exifr": "^5.0.3",
-    "fastify-swagger": "^4.4.2",
+    "fastify": "4.5.3",
+    "fastify-swagger": "^5.2.0",
     "got": "^11.3.0",
     "ioredis": "^4.24.3",
+    "kysely": "0.21.6",
     "p-limit": "^3.0.2",
+    "pg": "8.7.3",
     "probe-image-size": "^5.0.0",
     "reflect-metadata": "^0.1.13",
     "rxjs": "^6.6.6",

prisma/migrations/20220908001437_add_comic_id_size_constraint/migration.sql

@@ -0,0 +1,14 @@
+/*
+  Warnings:
+
+  - A unique constraint covering the columns `[comic_id,size]` on the table `comic_imgs` will be added. If there are existing duplicate values, this will fail.
+
+*/
+-- DropForeignKey
+ALTER TABLE "comic_imgs" DROP CONSTRAINT "comic_imgs_comic_id_fkey";
+
+-- CreateIndex
+CREATE UNIQUE INDEX "comic_imgs_comic_id_size_key" ON "comic_imgs"("comic_id", "size");
+
+-- AddForeignKey
+ALTER TABLE "comic_imgs" ADD CONSTRAINT "comic_imgs_comic_id_fkey" FOREIGN KEY ("comic_id") REFERENCES "comics"("id") ON DELETE RESTRICT ON UPDATE CASCADE;

prisma/migrations/20220909033156_device_token_is_unique/migration.sql

@@ -0,0 +1,8 @@
+/*
+  Warnings:
+
+  - A unique constraint covering the columns `[token]` on the table `device_tokens` will be added. If there are existing duplicate values, this will fail.
+
+*/
+-- CreateIndex
+CREATE UNIQUE INDEX "device_tokens_token_key" ON "device_tokens"("token");

prisma/schema.prisma

@@ -19,6 +19,7 @@ model ComicImg {
   comics    Comic @relation(fields: [comic_id], references: [id])
 
   @@index([comic_id], name: "comic_imgs_comic_id")
+  @@unique([comic_id, size])
 }
 
 model Comic {
@@ -38,7 +39,7 @@ model Comic {
 
 model DeviceToken {
   @@map("device_tokens")
-  token           String   @id @db.VarChar(255)
+  token           String   @id @db.VarChar(255) @unique
   version         String?  @db.VarChar(255)
   lastComicIdSent Int
   createdAt       DateTime @db.Timestamptz(6) @default(now())

src/app.module.ts

@@ -1,31 +1,29 @@
+import {join} from 'node:path';
 import {Module} from '@nestjs/common';
 import {ConfigModule} from '@nestjs/config';
 import {BullModule} from '@codetheweb/nestjs-bull';
 import {ServeStaticModule} from '@nestjs/serve-static';
-import {join} from 'path';
 import Redis from 'ioredis';
 import {ComicModule} from './comic/comic.module';
 import {DeviceTokenModule} from './device-token/device-token.module';
 
-const redisConnection = process.env.REDIS_URL ? new Redis(process.env.REDIS_URL) : {
-	port: Number.parseInt(process.env.REDIS_PORT!, 10),
-	host: process.env.REDIS_HOST
-};
-
 @Module({
 	imports: [
 		ConfigModule.forRoot(),
 		BullModule.forRoot({
-			connection: redisConnection
+			connection: process.env.REDIS_URL ? new Redis(process.env.REDIS_URL) : {
+				port: Number.parseInt(process.env.REDIS_PORT!, 10),
+				host: process.env.REDIS_HOST,
+			},
 		}),
 		ServeStaticModule.forRoot({
 			rootPath: join(__dirname, '..', 'public'),
-			serveRoot: '/static'
+			serveRoot: '/static',
 		}),
 		ComicModule,
-		DeviceTokenModule
+		DeviceTokenModule,
 	],
 	controllers: [],
-	providers: []
+	providers: [],
 })
 export class AppModule {}

src/comic/comic.controller.ts

@@ -1,70 +1,47 @@
-import {Controller, Get, Header, Injectable, InternalServerErrorException, NotFoundException, Param, Query} from '@nestjs/common';
-import {Prisma} from '@prisma/client';
-import {PrismaService} from 'src/prisma/prisma.service';
+import {Controller, Get, Header, Injectable, NotFoundException, Param, Query} from '@nestjs/common';
+import {sql} from 'kysely';
+import {DbService} from 'src/db/db.service';
 import {GetAllComicsParameters} from './types';
 
-const findManyOptions: Prisma.ComicFindManyArgs = {
-	include: {
-		imgs: {
-			select: {
-				height: true,
-				width: true,
-				ratio: true,
-				sourceUrl: true,
-				size: true
-			}
-		}
-	},
-	orderBy: {
-		id: 'asc'
-	}
-};
+const getBaseQuery = (db: DbService) => db
+	.selectFrom('comics')
+	.innerJoin('comic_imgs', 'comic_imgs.comic_id', 'comics.id')
+	.selectAll('comics')
+	.select([sql`json_agg(json_build_object('width', width, 'height', height, 'ratio', ratio, 'sourceUrl', comic_imgs."sourceUrl", 'size', size))`.as('imgs')])
+	.groupBy('comics.id');
 
 @Controller('comics')
 @Injectable()
 export class ComicController {
-	constructor(private readonly prisma: PrismaService) {}
+	constructor(private readonly db: DbService) {}
 
 	@Get()
 	@Header('Cache-Control', 'max-age=300')
 	async getAllComics(@Query() parameters?: GetAllComicsParameters) {
-		if (typeof parameters?.since === 'number') {
-			return this.prisma.comic.findMany({
-				...findManyOptions,
-				where: {
-					id: {
-						gt: parameters.since
-					}
-				}
-			});
-		}
-
-		return this.prisma.comic.findMany(findManyOptions);
+		return getBaseQuery(this.db)
+			.orderBy('comics.id', 'asc')
+			.where('comics.id', '>', parameters?.since ?? 0)
+			.execute();
 	}
 
 	@Get('/latest')
 	@Header('Cache-Control', 'max-age=300')
 	async getLatestComic() {
-		const comic = await this.prisma.comic.findFirst({...findManyOptions, orderBy: {
-			id: 'desc'
-		}});
+		const comic = await getBaseQuery(this.db).orderBy('comics.id', 'desc').executeTakeFirst();
 
 		if (comic) {
 			return comic;
 		}
 
-		throw new InternalServerErrorException('No comics');
+		throw new NotFoundException('No comics');
 	}
 
 	@Get(':comicId')
 	@Header('Cache-Control', 'max-age=300')
 	async getComic(@Param('comicId') comicId: string) {
 		const id = Number.parseInt(comicId, 10);
 
-		const comic = await this.prisma.comic.findUnique({
-			include: findManyOptions.include,
-			where: {id}
-		});
+		const comic = await getBaseQuery(this.db).where('comics.id', '=', id).executeTakeFirst();
 
 		if (!comic) {
 			throw new NotFoundException(`${id} not found`);

src/comic/comic.module.ts

@@ -1,13 +1,13 @@
+import {join} from 'node:path';
 import {BullModule} from '@codetheweb/nestjs-bull';
 import {Module} from '@nestjs/common';
-import {join} from 'path';
-import {PrismaModule} from 'src/prisma/prisma.module';
+import {DbModule} from 'src/db/db.module';
 import {ComicController} from './comic.controller';
 import {ComicService} from './comic.service';
 
 @Module({
 	imports: [
-		PrismaModule,
+		DbModule,
 		BullModule.registerQueue({
 			name: 'scrape-comics',
 			processors: [join(__dirname, 'processors/scrape-comics.js')]

src/comic/comic.service.ts

@@ -1,4 +1,5 @@
-import {Injectable, OnModuleInit} from '@nestjs/common';
+import type {OnModuleInit} from '@nestjs/common';
+import {Injectable} from '@nestjs/common';
 import {InjectQueue} from '@codetheweb/nestjs-bull';
 import {Queue} from 'bullmq';