@winible/winible-typed 2.20.9 → 2.20.12

package/dist/typed-model/pb-sequelize.js

@@ -6,6 +6,24 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const dotenv_1 = __importDefault(require("dotenv"));
 dotenv_1.default.config();
 const sequelize_1 = require("sequelize");
+const jsonParse = (value) => {
+    if (!value) {
+        return undefined;
+    }
+    try {
+        return JSON.parse(value);
+    }
+    catch (error) {
+        return undefined;
+    }
+};
+const SEQUELIZE_POOL_CONFIG = jsonParse(process.env.SEQUELIZE_POOL_CONFIG);
+const poolConfig = SEQUELIZE_POOL_CONFIG || {
+    max: 500,
+    min: 0,
+    acquire: 60000,
+    idle: 10000,
+};
 const sequelize = new sequelize_1.Sequelize({
     username: process.env.DATABASE_USERNAME,
     password: process.env.DATABASE_PASSWORD,
@@ -14,12 +32,7 @@ const sequelize = new sequelize_1.Sequelize({
     dialect: "postgres",
     ssl: false,
     logging: false,
-    pool: {
-        max: 500,
-        min: 0,
-        acquire: 60000,
-        idle: 10000,
-    },
+    pool: poolConfig,
     dialectOptions: {
         ssl: {
             require: true,

package/dist/typed-model/pb-sequelize.js.map

@@ -1 +1 @@
-{"version":3,"file":"pb-sequelize.js","sourceRoot":"","sources":["../../typed-model/pb-sequelize.ts"],"names":[],"mappings":";;;;;AAAA,oDAA4B;AAC5B,gBAAM,CAAC,MAAM,EAAE,CAAC;AAEhB,yCAAsC;AAEtC,MAAM,SAAS,GAAG,IAAI,qBAAS,CAAC;IAC9B,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB;IACvC,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB;IACvC,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,aAAa;IACnC,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,aAAa;IAC/B,OAAO,EAAE,UAAU;IACnB,GAAG,EAAE,KAAK;IACV,OAAO,EAAE,KAAK;IACd,IAAI,EAAE;QACJ,GAAG,EAAE,GAAG;QACR,GAAG,EAAE,CAAC;QACN,OAAO,EAAE,KAAK;QACd,IAAI,EAAE,KAAK;KACZ;IACD,cAAc,EAAE;QACd,GAAG,EAAE;YACH,OAAO,EAAE,IAAI;YACb,kBAAkB,EAAE,KAAK;SAC1B;KACF;CACF,CAAC,CAAC;AAEH,kBAAe,SAAS,CAAC"}
+{"version":3,"file":"pb-sequelize.js","sourceRoot":"","sources":["../../typed-model/pb-sequelize.ts"],"names":[],"mappings":";;;;;AAAA,oDAA4B;AAC5B,gBAAM,CAAC,MAAM,EAAE,CAAC;AAEhB,yCAAsC;AAEtC,MAAM,SAAS,GAAG,CAAC,KAAc,EAAE,EAAE;IACnC,IAAI,CAAC,KAAK,EAAE;QACV,OAAO,SAAS,CAAC;KAClB;IAED,IAAI;QACF,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;KAC1B;IAAC,OAAO,KAAK,EAAE;QACd,OAAO,SAAS,CAAC;KAClB;AACH,CAAC,CAAC;AAEF,MAAM,qBAAqB,GAAG,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;AAE3E,MAAM,UAAU,GAAG,qBAAqB,IAAI;IAC1C,GAAG,EAAE,GAAG;IACR,GAAG,EAAE,CAAC;IACN,OAAO,EAAE,KAAK;IACd,IAAI,EAAE,KAAK;CACZ,CAAC;AAEF,MAAM,SAAS,GAAG,IAAI,qBAAS,CAAC;IAC9B,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB;IACvC,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB;IACvC,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,aAAa;IACnC,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,aAAa;IAC/B,OAAO,EAAE,UAAU;IACnB,GAAG,EAAE,KAAK;IACV,OAAO,EAAE,KAAK;IACd,IAAI,EAAE,UAAU;IAChB,cAAc,EAAE;QACd,GAAG,EAAE;YACH,OAAO,EAAE,IAAI;YACb,kBAAkB,EAAE,KAAK;SAC1B;KACF;CACF,CAAC,CAAC;AAEH,kBAAe,SAAS,CAAC"}

package/dist/typed-model/subscriber-telegram-integration.js

@@ -11,6 +11,12 @@ const telegram_integration_1 = __importDefault(require("./telegram-integration")
 class SubscriberTelegramIntegration extends sequelize_1.Model {
 }
 SubscriberTelegramIntegration.init({
+    id: {
+        type: sequelize_1.DataTypes.BIGINT,
+        primaryKey: true,
+        allowNull: false,
+        defaultValue: pb_sequelize_1.default.fn("next_id"),
+    },
     userId: {
         type: sequelize_1.DataTypes.BIGINT,
         allowNull: false,

package/dist/typed-model/subscriber-telegram-integration.js.map

@@ -1 +1 @@
-{"version":3,"file":"subscriber-telegram-integration.js","sourceRoot":"","sources":["../../typed-model/subscriber-telegram-integration.ts"],"names":[],"mappings":";;;;;AAAA,yCAMmB;AAEnB,kEAAuC;AACvC,kDAA0B;AAC1B,kFAAyD;AAEzD,mEAAmE;AACnE,MAAM,6BAA8B,SAAQ,iBAG3C;CASA;AAED,6BAA6B,CAAC,IAAI,CAChC;IACE,MAAM,EAAE;QACN,IAAI,EAAE,qBAAS,CAAC,MAAM;QACtB,SAAS,EAAE,KAAK;QAChB,KAAK,EAAE,SAAS;QAChB,UAAU,EAAE;YACV,KAAK,EAAE,cAAI;SACZ;KACF;IACD,qBAAqB,EAAE;QACrB,IAAI,EAAE,qBAAS,CAAC,MAAM;QACtB,SAAS,EAAE,KAAK;QAChB,KAAK,EAAE,yBAAyB;QAChC,UAAU,EAAE;YACV,KAAK,EAAE,8BAAmB;SAC3B;KACF;IACD,cAAc,EAAE;QACd,IAAI,EAAE,qBAAS,CAAC,MAAM;QACtB,SAAS,EAAE,KAAK;QAChB,KAAK,EAAE,kBAAkB;KAC1B;IAED,SAAS,EAAE,qBAAS,CAAC,IAAI;IACzB,SAAS,EAAE,qBAAS,CAAC,IAAI;CAC1B,EACD;IACE,SAAS,EAAE,kCAAkC;IAC7C,SAAS,EAAT,sBAAS;CACV,CACF,CAAC;AAEF,8BAAmB,CAAC,OAAO,CAAC,6BAA6B,EAAE;IACzD,UAAU,EAAE,uBAAuB;IACnC,SAAS,EAAE,IAAI;IACf,QAAQ,EAAE,WAAW;IACrB,WAAW,EAAE,KAAK;CACnB,CAAC,CAAC;AAEH,6BAA6B,CAAC,MAAM,CAAC,8BAAmB,EAAE;IACxD,UAAU,EAAE,IAAI;IAChB,SAAS,EAAE,uBAAuB;CACnC,CAAC,CAAC;AAEH,cAAI,CAAC,OAAO,CAAC,6BAA6B,EAAE;IAC1C,UAAU,EAAE,QAAQ;IACpB,SAAS,EAAE,IAAI;IACf,QAAQ,EAAE,WAAW;IACrB,WAAW,EAAE,KAAK;CACnB,CAAC,CAAC;AAEH,6BAA6B,CAAC,MAAM,CAAC,cAAI,EAAE;IACzC,UAAU,EAAE,IAAI;IAChB,SAAS,EAAE,QAAQ;CACpB,CAAC,CAAC;AAEH,kBAAe,6BAA6B,CAAC"}
+{"version":3,"file":"subscriber-telegram-integration.js","sourceRoot":"","sources":["../../typed-model/subscriber-telegram-integration.ts"],"names":[],"mappings":";;;;;AAAA,yCAMmB;AAEnB,kEAAuC;AACvC,kDAA0B;AAC1B,kFAAyD;AAEzD,mEAAmE;AACnE,MAAM,6BAA8B,SAAQ,iBAG3C;CAUA;AAED,6BAA6B,CAAC,IAAI,CAChC;IACE,EAAE,EAAE;QACF,IAAI,EAAE,qBAAS,CAAC,MAAM;QACtB,UAAU,EAAE,IAAI;QAChB,SAAS,EAAE,KAAK;QAChB,YAAY,EAAE,sBAAS,CAAC,EAAE,CAAC,SAAS,CAAC;KACtC;IACD,MAAM,EAAE;QACN,IAAI,EAAE,qBAAS,CAAC,MAAM;QACtB,SAAS,EAAE,KAAK;QAChB,KAAK,EAAE,SAAS;QAChB,UAAU,EAAE;YACV,KAAK,EAAE,cAAI;SACZ;KACF;IACD,qBAAqB,EAAE;QACrB,IAAI,EAAE,qBAAS,CAAC,MAAM;QACtB,SAAS,EAAE,KAAK;QAChB,KAAK,EAAE,yBAAyB;QAChC,UAAU,EAAE;YACV,KAAK,EAAE,8BAAmB;SAC3B;KACF;IACD,cAAc,EAAE;QACd,IAAI,EAAE,qBAAS,CAAC,MAAM;QACtB,SAAS,EAAE,KAAK;QAChB,KAAK,EAAE,kBAAkB;KAC1B;IAED,SAAS,EAAE,qBAAS,CAAC,IAAI;IACzB,SAAS,EAAE,qBAAS,CAAC,IAAI;CAC1B,EACD;IACE,SAAS,EAAE,kCAAkC;IAC7C,SAAS,EAAT,sBAAS;CACV,CACF,CAAC;AAEF,8BAAmB,CAAC,OAAO,CAAC,6BAA6B,EAAE;IACzD,UAAU,EAAE,uBAAuB;IACnC,SAAS,EAAE,IAAI;IACf,QAAQ,EAAE,WAAW;IACrB,WAAW,EAAE,KAAK;CACnB,CAAC,CAAC;AAEH,6BAA6B,CAAC,MAAM,CAAC,8BAAmB,EAAE;IACxD,UAAU,EAAE,IAAI;IAChB,SAAS,EAAE,uBAAuB;CACnC,CAAC,CAAC;AAEH,cAAI,CAAC,OAAO,CAAC,6BAA6B,EAAE;IAC1C,UAAU,EAAE,QAAQ;IACpB,SAAS,EAAE,IAAI;IACf,QAAQ,EAAE,WAAW;IACrB,WAAW,EAAE,KAAK;CACnB,CAAC,CAAC;AAEH,6BAA6B,CAAC,MAAM,CAAC,cAAI,EAAE;IACzC,UAAU,EAAE,IAAI;IAChB,SAAS,EAAE,QAAQ;CACpB,CAAC,CAAC;AAEH,kBAAe,6BAA6B,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@winible/winible-typed",
-  "version": "2.20.9",
+  "version": "2.20.12",
   "description": "",
   "main": "dist/index.js",
   "types": "./dist/index.d.ts",

package/typed-model/pb-sequelize.ts

@@ -3,6 +3,27 @@ dotenv.config();
 
 import { Sequelize } from "sequelize";
 
+const jsonParse = (value?: string) => {
+  if (!value) {
+    return undefined;
+  }
+
+  try {
+    return JSON.parse(value);
+  } catch (error) {
+    return undefined;
+  }
+};
+
+const SEQUELIZE_POOL_CONFIG = jsonParse(process.env.SEQUELIZE_POOL_CONFIG);
+
+const poolConfig = SEQUELIZE_POOL_CONFIG || {
+  max: 500,
+  min: 0,
+  acquire: 60000,
+  idle: 10000,
+};
+
 const sequelize = new Sequelize({
   username: process.env.DATABASE_USERNAME,
   password: process.env.DATABASE_PASSWORD,
@@ -11,12 +32,7 @@ const sequelize = new Sequelize({
   dialect: "postgres",
   ssl: false,
   logging: false,
-  pool: {
-    max: 500,
-    min: 0,
-    acquire: 60000,
-    idle: 10000,
-  },
+  pool: poolConfig,
   dialectOptions: {
     ssl: {
       require: true,

package/typed-model/subscriber-telegram-integration.ts

@@ -17,6 +17,7 @@ class SubscriberTelegramIntegration extends Model<
 > {
   // 'CreationOptional' is a special type that marks the field as optional
   // when creating an instance of the model (such as using Model.create()).
+  declare id: CreationOptional<string>;
   declare userId: string;
   declare telegramIntegrationId: string;
   declare telegramUserId: string;
@@ -27,6 +28,12 @@ class SubscriberTelegramIntegration extends Model<
 
 SubscriberTelegramIntegration.init(
   {
+    id: {
+      type: DataTypes.BIGINT,
+      primaryKey: true,
+      allowNull: false,
+      defaultValue: sequelize.fn("next_id"),
+    },
     userId: {
       type: DataTypes.BIGINT,
       allowNull: false,
@@ -65,9 +72,9 @@ TelegramIntegration.hasMany(SubscriberTelegramIntegration, {
   constraints: false,
 });
 
-SubscriberTelegramIntegration.belongsTo(TelegramIntegration, {
-  foreignKey: "telegramIntegrationId",
-  targetKey: "id",
+SubscriberTelegramIntegration.hasOne(TelegramIntegration, {
+  foreignKey: "id",
+  sourceKey: "telegramIntegrationId",
 });
 
 User.hasMany(SubscriberTelegramIntegration, {
@@ -77,9 +84,9 @@ User.hasMany(SubscriberTelegramIntegration, {
   constraints: false,
 });
 
-SubscriberTelegramIntegration.belongsTo(User, {
-  foreignKey: "userId",
-  targetKey: "id",
+SubscriberTelegramIntegration.hasOne(User, {
+  foreignKey: "id",
+  sourceKey: "userId",
 });
 
 export default SubscriberTelegramIntegration;