@earbug/db-models 0.0.23 → 0.0.25

package/dist/AppUser.d.ts

@@ -23,7 +23,7 @@ export interface AppUserAttributes {
     createDate: Date;
     updateDate: Date;
     syncContacts?: boolean;
-    stateId?: number;
+    stateId: number;
     lastName?: string;
     autoApproveFollowers: boolean;
     lastHarvested?: Date;
@@ -41,7 +41,7 @@ export declare class AppUser extends Model<AppUserAttributes, AppUserCreationAtt
     createDate: Date;
     updateDate: Date;
     syncContacts?: boolean;
-    stateId?: number;
+    stateId: number;
     lastName?: string;
     autoApproveFollowers: boolean;
     lastHarvested?: Date;

package/dist/AppUser.js

@@ -65,7 +65,7 @@ class AppUser extends sequelize_1.Model {
             },
             stateId: {
                 type: sequelize_1.DataTypes.SMALLINT,
-                allowNull: true,
+                allowNull: false,
                 defaultValue: 0,
                 references: {
                     model: 'state',

package/dist/initDb.d.ts

@@ -0,0 +1,7 @@
+import { Sequelize, Options } from "sequelize";
+export interface InitDbOptions {
+    pool?: Options["pool"];
+    retry?: Options["retry"];
+    logging?: Options["logging"];
+}
+export declare function initDb(options?: InitDbOptions): Sequelize;

package/dist/initDb.js

@@ -0,0 +1,42 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.initDb = initDb;
+const sequelize_1 = require("sequelize");
+const init_models_1 = require("./init-models");
+const REQUIRED_ENV_VARS = ["PG_DATABASE", "PG_USER", "PG_HOST"];
+function initDb(options = {}) {
+    var _a, _b, _c;
+    const missing = REQUIRED_ENV_VARS.filter((v) => !process.env[v]);
+    if (missing.length > 0) {
+        throw new Error(`Missing required environment variables: ${missing.join(", ")}`);
+    }
+    console.log(`Initializing DB connection to ${process.env.PG_HOST}:${process.env.PG_PORT || "5432"}/${process.env.PG_DATABASE}...`);
+    const sequelize = new sequelize_1.Sequelize(process.env.PG_DATABASE, process.env.PG_USER, process.env.PG_PASSWORD, {
+        host: process.env.PG_HOST,
+        port: parseInt(process.env.PG_PORT || "5432"),
+        dialect: "postgres",
+        schema: "eb",
+        minifyAliases: true,
+        logging: (_a = options.logging) !== null && _a !== void 0 ? _a : false,
+        pool: (_b = options.pool) !== null && _b !== void 0 ? _b : {
+            max: 10,
+            min: 1,
+            acquire: 30000,
+            idle: 10000,
+            evict: 1000,
+        },
+        retry: (_c = options.retry) !== null && _c !== void 0 ? _c : {
+            max: 2,
+            match: [
+                /ConnectionError/,
+                /ConnectionRefused/,
+                /ConnectionAcquireTimeout/,
+                /ECONNRESET/,
+                /ETIMEDOUT/,
+            ],
+        },
+    });
+    (0, init_models_1.initModels)(sequelize);
+    console.log("DB connection initialized.");
+    return sequelize;
+}

package/models/AppUser.ts

@@ -24,7 +24,7 @@ export interface AppUserAttributes {
   createDate: Date;
   updateDate: Date;
   syncContacts?: boolean;
-  stateId?: number;
+  stateId: number;
   lastName?: string;
   autoApproveFollowers: boolean;
   lastHarvested?: Date;
@@ -44,7 +44,7 @@ export class AppUser extends Model<AppUserAttributes, AppUserCreationAttributes>
   createDate!: Date;
   updateDate!: Date;
   syncContacts?: boolean;
-  stateId?: number;
+  stateId!: number;
   lastName?: string;
   autoApproveFollowers!: boolean;
   lastHarvested?: Date;
@@ -304,7 +304,7 @@ export class AppUser extends Model<AppUserAttributes, AppUserCreationAttributes>
     },
     stateId: {
       type: DataTypes.SMALLINT,
-      allowNull: true,
+      allowNull: false,
       defaultValue: 0,
       references: {
         model: 'state',

package/models/initDb.ts

@@ -0,0 +1,60 @@
+import { Sequelize, Options } from "sequelize";
+import { initModels } from "./init-models";
+
+const REQUIRED_ENV_VARS = ["PG_DATABASE", "PG_USER", "PG_HOST"] as const;
+
+export interface InitDbOptions {
+  pool?: Options["pool"];
+  retry?: Options["retry"];
+  logging?: Options["logging"];
+}
+
+export function initDb(options: InitDbOptions = {}): Sequelize {
+  const missing = REQUIRED_ENV_VARS.filter((v) => !process.env[v]);
+  if (missing.length > 0) {
+    throw new Error(
+      `Missing required environment variables: ${missing.join(", ")}`,
+    );
+  }
+
+  console.log(
+    `Initializing DB connection to ${process.env.PG_HOST}:${process.env.PG_PORT || "5432"}/${process.env.PG_DATABASE}...`,
+  );
+
+  const sequelize = new Sequelize(
+    process.env.PG_DATABASE!,
+    process.env.PG_USER!,
+    process.env.PG_PASSWORD,
+    {
+      host: process.env.PG_HOST,
+      port: parseInt(process.env.PG_PORT || "5432"),
+      dialect: "postgres",
+      schema: "eb",
+      minifyAliases: true,
+      logging: options.logging ?? false,
+      pool: options.pool ?? {
+        max: 10,
+        min: 1,
+        acquire: 30000,
+        idle: 10000,
+        evict: 1000,
+      },
+      retry: options.retry ?? {
+        max: 2,
+        match: [
+          /ConnectionError/,
+          /ConnectionRefused/,
+          /ConnectionAcquireTimeout/,
+          /ECONNRESET/,
+          /ETIMEDOUT/,
+        ],
+      },
+    },
+  );
+
+  initModels(sequelize);
+
+  console.log("DB connection initialized.");
+
+  return sequelize;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@earbug/db-models",
-  "version": "0.0.23",
+  "version": "0.0.25",
   "main": "dist/init-models.js",
   "types": "dist/init-models.d.ts",
   "scripts": {