@winible/winible-typed 2.20.11 → 2.20.13
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/typed-model/notification.js.map +1 -1
- package/dist/typed-model/pb-sequelize.js +19 -6
- package/dist/typed-model/pb-sequelize.js.map +1 -1
- package/dist/typed-model/subscriber-telegram-integration.js +12 -6
- package/dist/typed-model/subscriber-telegram-integration.js.map +1 -1
- package/package.json +1 -1
- package/typed-model/notification.ts +2 -1
- package/typed-model/pb-sequelize.ts +22 -6
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"notification.js","sourceRoot":"","sources":["../../typed-model/notification.ts"],"names":[],"mappings":";;;;;AAAA,yCAOmB;AAEnB,kEAAuC;AACvC,kEAAyC;AACzC,kDAA0B;
|
|
1
|
+
{"version":3,"file":"notification.js","sourceRoot":"","sources":["../../typed-model/notification.ts"],"names":[],"mappings":";;;;;AAAA,yCAOmB;AAEnB,kEAAuC;AACvC,kEAAyC;AACzC,kDAA0B;AAgB1B,mEAAmE;AACnE,MAAM,YAAa,SAAQ,iBAG1B;CAgBA;AAED,YAAY,CAAC,IAAI,CACf;IACE,EAAE,EAAE;QACF,IAAI,EAAE,qBAAS,CAAC,MAAM;QACtB,YAAY,EAAE,IAAA,cAAE,EAAC,SAAS,CAAC;QAC3B,SAAS,EAAE,KAAK;QAChB,UAAU,EAAE,IAAI;KACjB;IACD,WAAW,EAAE;QACX,IAAI,EAAE,qBAAS,CAAC,MAAM;QACtB,KAAK,EAAE,cAAc;QACrB,SAAS,EAAE,KAAK;KACjB;IACD,QAAQ,EAAE;QACR,IAAI,EAAE,qBAAS,CAAC,MAAM;QACtB,KAAK,EAAE,WAAW;QAClB,SAAS,EAAE,KAAK;KACjB;IACD,MAAM,EAAE;QACN,KAAK,EAAE,SAAS;QAChB,IAAI,EAAE,qBAAS,CAAC,OAAO;QACvB,YAAY,EAAE,KAAK;KACpB;IACD,IAAI,EAAE;QACJ,KAAK,EAAE,MAAM;QACb,IAAI,EAAE,qBAAS,CAAC,MAAM;KACvB;IACD,aAAa,EAAE;QACb,KAAK,EAAE,gBAAgB;QACvB,IAAI,EAAE,qBAAS,CAAC,MAAM;KACvB;IACD,eAAe,EAAE;QACf,KAAK,EAAE,mBAAmB;QAC1B,IAAI,EAAE,qBAAS,CAAC,MAAM;KACvB;IACD,UAAU,EAAE;QACV,KAAK,EAAE,cAAc;QACrB,IAAI,EAAE,qBAAS,CAAC,MAAM;KACvB;IACD,kBAAkB,EAAE;QAClB,KAAK,EAAE,sBAAsB;QAC7B,IAAI,EAAE,qBAAS,CAAC,MAAM;KACvB;IACD,2BAA2B,EAAE;QAC3B,KAAK,EAAE,gCAAgC;QACvC,IAAI,EAAE,qBAAS,CAAC,MAAM;KACvB;IACD,SAAS,EAAE,qBAAS,CAAC,IAAI;IACzB,SAAS,EAAE,qBAAS,CAAC,IAAI;IACzB,MAAM,EAAE;QACN,KAAK,EAAE,SAAS;QAChB,IAAI,EAAE,qBAAS,CAAC,MAAM;KACvB;CACF,EACD;IACE,SAAS,EAAE,eAAe;IAC1B,SAAS,EAAT,sBAAS;CACV,CACF,CAAC;AAEF;;;;EAIE;AAEF,YAAY,CAAC,MAAM,CAAC,cAAI,EAAE;IACxB,UAAU,EAAE,IAAI;IAChB,SAAS,EAAE,aAAa;IACxB,WAAW,EAAE,KAAK;CACnB,CAAC,CAAC;AAEH,YAAY,CAAC,MAAM,CAAC,sBAAW,EAAE;IAC/B,UAAU,EAAE,IAAI;IAChB,SAAS,EAAE,YAAY;IACvB,WAAW,EAAE,KAAK;CACnB,CAAC,CAAC;AAEH,kBAAe,YAAY,CAAC"}
|
|
@@ -6,6 +6,24 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
const dotenv_1 = __importDefault(require("dotenv"));
|
|
7
7
|
dotenv_1.default.config();
|
|
8
8
|
const sequelize_1 = require("sequelize");
|
|
9
|
+
const jsonParse = (value) => {
|
|
10
|
+
if (!value) {
|
|
11
|
+
return undefined;
|
|
12
|
+
}
|
|
13
|
+
try {
|
|
14
|
+
return JSON.parse(value);
|
|
15
|
+
}
|
|
16
|
+
catch (error) {
|
|
17
|
+
return undefined;
|
|
18
|
+
}
|
|
19
|
+
};
|
|
20
|
+
const SEQUELIZE_POOL_CONFIG = jsonParse(process.env.SEQUELIZE_POOL_CONFIG);
|
|
21
|
+
const poolConfig = SEQUELIZE_POOL_CONFIG || {
|
|
22
|
+
max: 500,
|
|
23
|
+
min: 0,
|
|
24
|
+
acquire: 60000,
|
|
25
|
+
idle: 10000,
|
|
26
|
+
};
|
|
9
27
|
const sequelize = new sequelize_1.Sequelize({
|
|
10
28
|
username: process.env.DATABASE_USERNAME,
|
|
11
29
|
password: process.env.DATABASE_PASSWORD,
|
|
@@ -14,12 +32,7 @@ const sequelize = new sequelize_1.Sequelize({
|
|
|
14
32
|
dialect: "postgres",
|
|
15
33
|
ssl: false,
|
|
16
34
|
logging: false,
|
|
17
|
-
pool:
|
|
18
|
-
max: 500,
|
|
19
|
-
min: 0,
|
|
20
|
-
acquire: 60000,
|
|
21
|
-
idle: 10000,
|
|
22
|
-
},
|
|
35
|
+
pool: poolConfig,
|
|
23
36
|
dialectOptions: {
|
|
24
37
|
ssl: {
|
|
25
38
|
require: true,
|
|
@@ -1 +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
|
|
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,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"}
|
|
@@ -11,6 +11,12 @@ const telegram_integration_1 = __importDefault(require("./telegram-integration")
|
|
|
11
11
|
class SubscriberTelegramIntegration extends sequelize_1.Model {
|
|
12
12
|
}
|
|
13
13
|
SubscriberTelegramIntegration.init({
|
|
14
|
+
id: {
|
|
15
|
+
type: sequelize_1.DataTypes.BIGINT,
|
|
16
|
+
primaryKey: true,
|
|
17
|
+
allowNull: false,
|
|
18
|
+
defaultValue: pb_sequelize_1.default.fn("next_id"),
|
|
19
|
+
},
|
|
14
20
|
userId: {
|
|
15
21
|
type: sequelize_1.DataTypes.BIGINT,
|
|
16
22
|
allowNull: false,
|
|
@@ -44,9 +50,9 @@ telegram_integration_1.default.hasMany(SubscriberTelegramIntegration, {
|
|
|
44
50
|
onDelete: "NO ACTION",
|
|
45
51
|
constraints: false,
|
|
46
52
|
});
|
|
47
|
-
SubscriberTelegramIntegration.
|
|
48
|
-
foreignKey: "
|
|
49
|
-
|
|
53
|
+
SubscriberTelegramIntegration.hasOne(telegram_integration_1.default, {
|
|
54
|
+
foreignKey: "id",
|
|
55
|
+
sourceKey: "telegramIntegrationId",
|
|
50
56
|
});
|
|
51
57
|
user_1.default.hasMany(SubscriberTelegramIntegration, {
|
|
52
58
|
foreignKey: "userId",
|
|
@@ -54,9 +60,9 @@ user_1.default.hasMany(SubscriberTelegramIntegration, {
|
|
|
54
60
|
onDelete: "NO ACTION",
|
|
55
61
|
constraints: false,
|
|
56
62
|
});
|
|
57
|
-
SubscriberTelegramIntegration.
|
|
58
|
-
foreignKey: "
|
|
59
|
-
|
|
63
|
+
SubscriberTelegramIntegration.hasOne(user_1.default, {
|
|
64
|
+
foreignKey: "id",
|
|
65
|
+
sourceKey: "userId",
|
|
60
66
|
});
|
|
61
67
|
exports.default = SubscriberTelegramIntegration;
|
|
62
68
|
//# sourceMappingURL=subscriber-telegram-integration.js.map
|
|
@@ -1 +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;
|
|
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;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
CHANGED
|
@@ -22,7 +22,8 @@ export type NotificationType =
|
|
|
22
22
|
| "PAID_SUBSCRIPTION_SIGNUP"
|
|
23
23
|
| "PAID_SUBSCRIPTION_RENEWAL"
|
|
24
24
|
| "DISCOVERY_RECOMENDATIONS"
|
|
25
|
-
| "SUBSCRIBER_WELCOME"
|
|
25
|
+
| "SUBSCRIBER_WELCOME"
|
|
26
|
+
| "MARKETING";
|
|
26
27
|
|
|
27
28
|
// order of InferAttributes & InferCreationAttributes is important.
|
|
28
29
|
class Notification extends Model<
|
|
@@ -3,6 +3,27 @@ dotenv.config();
|
|
|
3
3
|
|
|
4
4
|
import { Sequelize } from "sequelize";
|
|
5
5
|
|
|
6
|
+
const jsonParse = (value?: string) => {
|
|
7
|
+
if (!value) {
|
|
8
|
+
return undefined;
|
|
9
|
+
}
|
|
10
|
+
|
|
11
|
+
try {
|
|
12
|
+
return JSON.parse(value);
|
|
13
|
+
} catch (error) {
|
|
14
|
+
return undefined;
|
|
15
|
+
}
|
|
16
|
+
};
|
|
17
|
+
|
|
18
|
+
const SEQUELIZE_POOL_CONFIG = jsonParse(process.env.SEQUELIZE_POOL_CONFIG);
|
|
19
|
+
|
|
20
|
+
const poolConfig = SEQUELIZE_POOL_CONFIG || {
|
|
21
|
+
max: 500,
|
|
22
|
+
min: 0,
|
|
23
|
+
acquire: 60000,
|
|
24
|
+
idle: 10000,
|
|
25
|
+
};
|
|
26
|
+
|
|
6
27
|
const sequelize = new Sequelize({
|
|
7
28
|
username: process.env.DATABASE_USERNAME,
|
|
8
29
|
password: process.env.DATABASE_PASSWORD,
|
|
@@ -11,12 +32,7 @@ const sequelize = new Sequelize({
|
|
|
11
32
|
dialect: "postgres",
|
|
12
33
|
ssl: false,
|
|
13
34
|
logging: false,
|
|
14
|
-
pool:
|
|
15
|
-
max: 500,
|
|
16
|
-
min: 0,
|
|
17
|
-
acquire: 60000,
|
|
18
|
-
idle: 10000,
|
|
19
|
-
},
|
|
35
|
+
pool: poolConfig,
|
|
20
36
|
dialectOptions: {
|
|
21
37
|
ssl: {
|
|
22
38
|
require: true,
|