Testing (#39)

* Updated create tables to kysley and added test endpoitns

* Fixed kysley bugs

* Bug fixes

Author: jzongker

config/demo.json

@@ -0,0 +1,10 @@
+{
+  "appEnv": "demo",
+  "appName": "LessonsApi",
+  "contentRoot": "http://localhost:3501/content",
+  "fileStore": "disk",
+  "mailSystem": "",
+  "s3Bucket": "",
+  "transcodePipeline": "",
+  "transcodePreset": ""
+}

package.json

@@ -11,7 +11,9 @@
     "deploy-staging": "npm-run-all build exec-deploy-staging",
     "exec-deploy-prod": "serverless deploy --stage Prod",
     "deploy-prod": "npm-run-all build exec-deploy-prod",
-    "initdb": "ts-node tools/initdb",
+    "initdb": "tsx tools/initdb.ts",
+    "populateDemo": "tsx tools/initdb.ts --demo-only",
+    "reset-demo": "tsx tools/reset-demo.ts",
     "migrate": "tsx tools/migrate.ts",
     "migrate:up": "tsx tools/migrate.ts --action=up",
     "migrate:down": "tsx tools/migrate.ts --action=down",

src/App.ts

@@ -7,6 +7,11 @@ import express from "express";
 import { CustomAuthProvider } from "@churchapps/apihelper";
 import cors from "cors";
 
+// Kysely's mysql2 driver returns BigInt for ResultSetHeader fields
+// (affectedRows, insertId, etc). Without this, controllers that return repo
+// delete/update results fail with "Do not know how to serialize a BigInt".
+(BigInt.prototype as any).toJSON = function () { return this.toString(); };
+
 export const init = async () => {
   dotenv.config();
   const container = new Container();
@@ -32,6 +37,13 @@ export const init = async () => {
       res.sendStatus(200);
     });
 
+    // Standard JSON / urlencoded parsing for local dev. In Lambda the body
+    // arrives as a Buffer via serverless-express and the custom handler below
+    // takes over (bodyParser is a no-op in that case because the stream is
+    // already consumed).
+    expApp.use(express.json({ limit: "50mb" }));
+    expApp.use(express.urlencoded({ extended: true, limit: "50mb" }));
+
     // Handle body parsing from @codegenie/serverless-express
     expApp.use((req, res, next) => {
       const contentType = req.headers["content-type"] || "";

src/controllers/HealthController.ts

@@ -1,13 +1,10 @@
 import { controller, httpGet } from "inversify-express-utils";
 import express from "express";
+import { sql } from "kysely";
+import { getDb } from "../db";
 
 @controller("")
 export class HealthController {
-  @httpGet("/health")
-  public async health(req: express.Request, res: express.Response): Promise<void> {
-    res.status(200).json({ status: "ok", timestamp: new Date().toISOString() });
-  }
-
   @httpGet("/")
   public async root(req: express.Request, res: express.Response): Promise<void> {
     res.status(200).json({ name: "LessonsApi", version: "1.0.0", status: "running", timestamp: new Date().toISOString() });
@@ -18,3 +15,24 @@ export class HealthController {
     res.status(204).end();
   }
 }
+
+@controller("/health")
+export class HealthCheckController {
+  @httpGet("/")
+  public async health(req: express.Request, res: express.Response): Promise<void> {
+    const environment = process.env.APP_ENV || "unknown";
+    const loaded: string[] = [];
+    try {
+      await sql`SELECT 1`.execute(getDb());
+      loaded.push("lessons");
+    } catch {
+      // Leave loaded empty so callers know the lessons DB is not reachable.
+    }
+    res.status(200).json({
+      status: loaded.length === 1 ? "healthy" : "degraded",
+      environment,
+      modules: { loaded },
+      timestamp: new Date().toISOString(),
+    });
+  }
+}

src/controllers/LessonController.ts

@@ -211,7 +211,11 @@ export class LessonController extends LessonsBaseController {
       else {
         const resources = await this.repositories.resource.loadByContentTypeId(au.churchId, "lesson", id);
         if (resources.length > 0) return this.json({}, 401);
-        else return await this.repositories.lesson.delete(au.churchId, id);
+        else {
+          await this.repositories.lesson.delete(au.churchId, id);
+          await FileStorageHelper.remove("/lessons/" + id + ".png").catch(() => { });
+          return { id };
+        }
       }
     });
   }

src/controllers/ProgramController.ts

@@ -71,8 +71,18 @@ export class ProgramController extends LessonsBaseController {
           program.churchId = au.churchId;
           const p = program;
           const saveFunction = async () => {
-            if (p.image && p.image.startsWith("data:image/")) await this.saveImage(p);
-            return await this.repositories.program.save(p);
+            // Save the program first so it has an id, then upload the image
+            // keyed on that id. (Previously the image was uploaded before the
+            // id existed, so every upload landed at programs/undefined.png.)
+            const dataUrlPending = p.image && p.image.startsWith("data:image/") ? p.image : null;
+            if (dataUrlPending) p.image = "";
+            const saved = await this.repositories.program.save(p);
+            if (dataUrlPending) {
+              saved.image = dataUrlPending;
+              await this.saveImage(saved);
+              await this.repositories.program.save(saved);
+            }
+            return saved;
           };
           promises.push(saveFunction());
         });
@@ -91,7 +101,12 @@ export class ProgramController extends LessonsBaseController {
         const resources = await this.repositories.resource.loadByContentTypeId(au.churchId, "program", id);
         const studies = await this.repositories.study.loadByProgramId(au.churchId, id);
         if (resources.length > 0 || studies.length > 0) return this.json({}, 401);
-        else return await this.repositories.program.delete(au.churchId, id);
+        else {
+          await this.repositories.program.delete(au.churchId, id);
+          // Clean up the uploaded image file (if any) so disk doesn't leak.
+          await FileStorageHelper.remove("/programs/" + id + ".png").catch(() => { });
+          return { id };
+        }
       }
     });
   }

src/controllers/StudyController.ts

@@ -115,7 +115,11 @@ export class StudyController extends LessonsBaseController {
         const resources = await this.repositories.resource.loadByContentTypeId(au.churchId, "study", id);
         const lessons = await this.repositories.lesson.loadByStudyId(au.churchId, id);
         if (resources.length > 0 || lessons.length > 0) return this.json({}, 401);
-        else return await this.repositories.study.delete(au.churchId, id);
+        else {
+          await this.repositories.study.delete(au.churchId, id);
+          await FileStorageHelper.remove("/studies/" + id + ".png").catch(() => { });
+          return { id };
+        }
       }
     });
   }

src/controllers/index.ts

@@ -10,7 +10,7 @@ export { DownloadController } from "./DownloadController";
 export { ExternalProviderController } from "./ExternalProviderController";
 export { ExternalVideoController } from "./ExternalVideoController";
 export { FileController } from "./FileController";
-export { HealthController } from "./HealthController";
+export { HealthController, HealthCheckController } from "./HealthController";
 export { IpDetailController } from "./IpDetailController";
 export { LessonController } from "./LessonController";
 export { PingbackController } from "./PingbackController";

src/helpers/Environment.ts

@@ -14,6 +14,7 @@ export class Environment extends EnvironmentBase {
 
   static async init(environment: string) {
     let file = "dev.json";
+    if (environment === "demo") file = "demo.json";
     if (environment === "staging") file = "staging.json";
     if (environment === "prod") file = "prod.json";
 

src/helpers/FilesHelper.ts

@@ -23,12 +23,15 @@ export class FilesHelper {
     const resource = await Repositories.getCurrent().resource.load(churchId, resourceId);
     const bundle = await Repositories.getCurrent().bundle.load(churchId, resource.bundleId);
     const oldKey = "files/" + bundle.contentType + "/" + bundle.contentId + "/" + resource.id;
-    await FileStorageHelper.removeFolder(oldKey);
+    // FileStorageHelper.removeLocalFolder uses fs.rmdirSync which throws ENOENT
+    // if the folder doesn't exist yet (e.g. resource has no files). That's not
+    // an error worth surfacing — swallow it.
+    try { await FileStorageHelper.removeFolder(oldKey); } catch { /* folder absent */ }
   }
 
   static async deleteBundleFolder(churchId: string, bundleId: string) {
     const bundle = await Repositories.getCurrent().bundle.load(churchId, bundleId);
     const oldKey = "bundles/" + bundle.contentType + "/" + bundle.contentId + "/" + bundle.id;
-    await FileStorageHelper.removeFolder(oldKey);
+    try { await FileStorageHelper.removeFolder(oldKey); } catch { /* folder absent */ }
   }
 }