From 047f68c2419bc0cfc5059cb76d027e4756d93e8f Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Mon, 16 Jan 2023 15:25:37 +0100 Subject: [PATCH 01/14] feat: graph subscription model created --- dist/src/models/index.js | 5 +- dist/src/models/index.js.map | 2 +- dist/src/models/sql/graphSubscription.js | 56 ++++++++++++++++++++ dist/src/models/sql/graphSubscription.js.map | 1 + dist/src/utils/migrate.js | 18 +++++++ dist/src/utils/migrate.js.map | 2 +- src/models/index.ts | 6 +++ src/models/sql/graphSubscription.ts | 39 ++++++++++++++ src/utils/migrate.ts | 18 +++++++ 9 files changed, 144 insertions(+), 3 deletions(-) create mode 100644 dist/src/models/sql/graphSubscription.js create mode 100644 dist/src/models/sql/graphSubscription.js.map create mode 100644 src/models/sql/graphSubscription.ts diff --git a/dist/src/models/index.js b/dist/src/models/index.js index f9d26f255..312e43ecd 100644 --- a/dist/src/models/index.js +++ b/dist/src/models/index.js @@ -1,6 +1,6 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.CallRecording = exports.ActionHistory = exports.RequestsTransportTokens = exports.BotMember = exports.Lsat = exports.MediaKey = exports.Accounting = exports.Bot = exports.Timer = exports.ChatBot = exports.Subscription = exports.Invite = exports.ChatMember = exports.Message = exports.Chat = exports.Contact = exports.models = exports.sequelize = void 0; +exports.GraphSubscription = exports.CallRecording = exports.ActionHistory = exports.RequestsTransportTokens = exports.BotMember = exports.Lsat = exports.MediaKey = exports.Accounting = exports.Bot = exports.Timer = exports.ChatBot = exports.Subscription = exports.Invite = exports.ChatMember = exports.Message = exports.Chat = exports.Contact = exports.models = exports.sequelize = void 0; // parse BIGINTs to number const pg = require("pg"); pg.defaults.parseInt8 = true; @@ -42,6 +42,8 @@ const actionHistory_1 = require("./sql/actionHistory"); exports.ActionHistory = actionHistory_1.default; const callRecording_1 = require("./sql/callRecording"); exports.CallRecording = callRecording_1.default; +const graphSubscription_1 = require("./sql/graphSubscription"); +exports.GraphSubscription = graphSubscription_1.default; const argv = minimist(process.argv.slice(2)); const configFile = argv.db ? path.resolve(process.cwd(), argv.db) @@ -77,6 +79,7 @@ const opts = Object.assign(Object.assign({}, config), { logging: appConfig.sql_l requestsTransportTokens_1.default, actionHistory_1.default, callRecording_1.default, + graphSubscription_1.default, ] }); if ((0, proxy_1.isProxy)()) { opts.pool = { diff --git a/dist/src/models/index.js.map b/dist/src/models/index.js.map index b2eff424b..612662910 100644 --- a/dist/src/models/index.js.map +++ b/dist/src/models/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/models/index.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/models/index.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/src/models/sql/graphSubscription.js b/dist/src/models/sql/graphSubscription.js new file mode 100644 index 000000000..93ee725be --- /dev/null +++ b/dist/src/models/sql/graphSubscription.js @@ -0,0 +1,56 @@ +"use strict"; +var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { + var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d; + if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc); + else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r; + return c > 3 && r && Object.defineProperty(target, key, r), r; +}; +var __metadata = (this && this.__metadata) || function (k, v) { + if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v); +}; +Object.defineProperty(exports, "__esModule", { value: true }); +const sequelize_typescript_1 = require("sequelize-typescript"); +let GraphSubscription = class GraphSubscription extends sequelize_typescript_1.Model { +}; +__decorate([ + (0, sequelize_typescript_1.Column)({ + type: sequelize_typescript_1.DataType.BIGINT, + primaryKey: true, + unique: true, + autoIncrement: true, + }), + __metadata("design:type", Number) +], GraphSubscription.prototype, "id", void 0); +__decorate([ + (0, sequelize_typescript_1.Column)(sequelize_typescript_1.DataType.TEXT), + __metadata("design:type", String) +], GraphSubscription.prototype, "name", void 0); +__decorate([ + sequelize_typescript_1.Column, + __metadata("design:type", String) +], GraphSubscription.prototype, "address", void 0); +__decorate([ + (0, sequelize_typescript_1.Column)(sequelize_typescript_1.DataType.TEXT), + __metadata("design:type", String) +], GraphSubscription.prototype, "weight", void 0); +__decorate([ + sequelize_typescript_1.Column, + __metadata("design:type", Number) +], GraphSubscription.prototype, "status", void 0); +__decorate([ + sequelize_typescript_1.Column, + __metadata("design:type", String) +], GraphSubscription.prototype, "chatIds", void 0); +__decorate([ + sequelize_typescript_1.Column, + __metadata("design:type", Date) +], GraphSubscription.prototype, "createdAt", void 0); +__decorate([ + sequelize_typescript_1.Column, + __metadata("design:type", Date) +], GraphSubscription.prototype, "updatedAt", void 0); +GraphSubscription = __decorate([ + (0, sequelize_typescript_1.Table)({ tableName: 'sphinx_graph_subscription', underscored: true }) +], GraphSubscription); +exports.default = GraphSubscription; +//# sourceMappingURL=graphSubscription.js.map \ No newline at end of file diff --git a/dist/src/models/sql/graphSubscription.js.map b/dist/src/models/sql/graphSubscription.js.map new file mode 100644 index 000000000..3796e6708 --- /dev/null +++ b/dist/src/models/sql/graphSubscription.js.map @@ -0,0 +1 @@ +{"version":3,"file":"graphSubscription.js","sourceRoot":"","sources":["../../../../src/models/sql/graphSubscription.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAAqE;AAGrE,IAAqB,iBAAiB,GAAtC,MAAqB,iBAAkB,SAAQ,4BAAwB;CA+BtE,CAAA;AAxBC;IANC,IAAA,6BAAM,EAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,MAAM;QACrB,UAAU,EAAE,IAAI;QAChB,MAAM,EAAE,IAAI;QACZ,aAAa,EAAE,IAAI;KACpB,CAAC;;6CACQ;AAGV;IADC,IAAA,6BAAM,EAAC,+BAAQ,CAAC,IAAI,CAAC;;+CACV;AAGZ;IADC,6BAAM;;kDACQ;AAGf;IADC,IAAA,6BAAM,EAAC,+BAAQ,CAAC,IAAI,CAAC;;iDACR;AAId;IADC,6BAAM;;iDACO;AAId;IADC,6BAAM;;kDACQ;AAGf;IADC,6BAAM;8BACI,IAAI;oDAAA;AAGf;IADC,6BAAM;8BACI,IAAI;oDAAA;AA9BI,iBAAiB;IADrC,IAAA,4BAAK,EAAC,EAAE,SAAS,EAAE,2BAA2B,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC;GAChD,iBAAiB,CA+BrC;kBA/BoB,iBAAiB"} \ No newline at end of file diff --git a/dist/src/utils/migrate.js b/dist/src/utils/migrate.js index d73dee39e..92724d04d 100644 --- a/dist/src/utils/migrate.js +++ b/dist/src/utils/migrate.js @@ -280,6 +280,24 @@ function migrate() { catch (e) { // sphinxLogger.error(['problem adding call recording table:', e.message], logging.DB) } + // add graph subscription table + try { + logger_1.sphinxLogger.info('adding graph subscription table', logger_1.logging.DB); + yield models_1.sequelize.query(` + CREATE TABLE sphinx_graph_subscription ( + id BIGINT NOT NULL PRIMARY KEY, + name TEXT, + created_at DATETIME, + updated_at DATETIME, + address TEXT, + weight TEXT, + status INTEGER, + chat_ids TEXT + )`); + } + catch (e) { + // sphinxLogger.error(['problem adding graph subscription table:', e.message], logging.DB) + } }); } exports.default = migrate; diff --git a/dist/src/utils/migrate.js.map b/dist/src/utils/migrate.js.map index 7068c183d..cd26dc84d 100644 --- a/dist/src/utils/migrate.js.map +++ b/dist/src/utils/migrate.js.map @@ -1 +1 @@ -{"version":3,"file":"migrate.js","sourceRoot":"","sources":["../../../src/utils/migrate.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"migrate.js","sourceRoot":"","sources":["../../../src/utils/migrate.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/models/index.ts b/src/models/index.ts index d17ad86d5..9d7b0d2eb 100644 --- a/src/models/index.ts +++ b/src/models/index.ts @@ -23,6 +23,9 @@ import { isProxy } from '../utils/proxy' import { readFileSync } from 'fs' import ActionHistory, { ActionHistoryRecord } from './sql/actionHistory' import CallRecording, { CallRecordingRecord } from './sql/callRecording' +import GraphSubscription, { + GraphSubscriptionRecord, +} from './sql/graphSubscription' const argv = minimist(process.argv.slice(2)) @@ -66,6 +69,7 @@ const opts = { RequestsTransportTokens, ActionHistory, CallRecording, + GraphSubscription, ], } if (isProxy()) { @@ -111,4 +115,6 @@ export { ActionHistoryRecord, CallRecording, CallRecordingRecord, + GraphSubscription, + GraphSubscriptionRecord, } diff --git a/src/models/sql/graphSubscription.ts b/src/models/sql/graphSubscription.ts new file mode 100644 index 000000000..20005d3a1 --- /dev/null +++ b/src/models/sql/graphSubscription.ts @@ -0,0 +1,39 @@ +import { Table, Column, Model, DataType } from 'sequelize-typescript' + +@Table({ tableName: 'sphinx_graph_subscription', underscored: true }) +export default class GraphSubscription extends Model { + @Column({ + type: DataType.BIGINT, + primaryKey: true, + unique: true, + autoIncrement: true, + }) + id: number + + @Column(DataType.TEXT) + name: string + + @Column + address: string + + @Column(DataType.TEXT) + weight: string + + // This would either be 1 or 0 + @Column + status: number + + // The value of this could be ALL or an Array of tribes IDs + @Column + chatIds: string + + @Column + createdAt: Date + + @Column + updatedAt: Date +} + +export interface GraphSubscriptionRecord extends GraphSubscription { + dataValues: GraphSubscription +} diff --git a/src/utils/migrate.ts b/src/utils/migrate.ts index bf39e0cd7..8e3938527 100644 --- a/src/utils/migrate.ts +++ b/src/utils/migrate.ts @@ -304,6 +304,24 @@ export default async function migrate(): Promise { } catch (e) { // sphinxLogger.error(['problem adding call recording table:', e.message], logging.DB) } + + // add graph subscription table + try { + sphinxLogger.info('adding graph subscription table', logging.DB) + await sequelize.query(` + CREATE TABLE sphinx_graph_subscription ( + id BIGINT NOT NULL PRIMARY KEY, + name TEXT, + created_at DATETIME, + updated_at DATETIME, + address TEXT, + weight TEXT, + status INTEGER, + chat_ids TEXT + )`) + } catch (e) { + // sphinxLogger.error(['problem adding graph subscription table:', e.message], logging.DB) + } } async function addTenant(tableName) { From 0f090065a65f79b93151bcd720a2475466d0384a Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Mon, 16 Jan 2023 19:19:35 +0100 Subject: [PATCH 02/14] feat: add companies graph endpoint --- dist/src/controllers/graphSubscription.js | 54 +++++++++++++++++++ dist/src/controllers/graphSubscription.js.map | 1 + dist/src/controllers/index.js | 3 ++ dist/src/controllers/index.js.map | 2 +- dist/src/models/sql/graphSubscription.js | 4 ++ dist/src/models/sql/graphSubscription.js.map | 2 +- dist/src/utils/migrate.js | 1 + dist/src/utils/migrate.js.map | 2 +- src/controllers/graphSubscription.ts | 45 ++++++++++++++++ src/controllers/index.ts | 4 ++ src/models/sql/graphSubscription.ts | 3 ++ src/utils/migrate.ts | 1 + 12 files changed, 119 insertions(+), 3 deletions(-) create mode 100644 dist/src/controllers/graphSubscription.js create mode 100644 dist/src/controllers/graphSubscription.js.map create mode 100644 src/controllers/graphSubscription.ts diff --git a/dist/src/controllers/graphSubscription.js b/dist/src/controllers/graphSubscription.js new file mode 100644 index 000000000..8a0ec86c2 --- /dev/null +++ b/dist/src/controllers/graphSubscription.js @@ -0,0 +1,54 @@ +"use strict"; +var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { + function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } + return new (P || (P = Promise))(function (resolve, reject) { + function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } + function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } + function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } + step((generator = generator.apply(thisArg, _arguments || [])).next()); + }); +}; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.addGraphSubscription = void 0; +const models_1 = require("../models"); +const res_1 = require("../utils/res"); +const logger_1 = require("../utils/logger"); +function addGraphSubscription(req, res) { + return __awaiter(this, void 0, void 0, function* () { + if (!req.owner) + return (0, res_1.failure)(res, 'no owner'); + const tenant = req.owner.id; + logger_1.sphinxLogger.info(`=> saveLsat`, logger_1.logging.Express); + const { name, address, weight, status } = req.body; + let { chatIds } = req.body; + if (!name || !address || !weight) { + return (0, res_1.failure)(res, 'Missing required Graph Subscription data'); + } + if (typeof status !== 'number' || status > 1) { + return (0, res_1.failure)(res, 'Provide valid graph status'); + } + if (chatIds !== 'all' && !Array.isArray(chatIds)) { + return (0, res_1.failure)(res, 'Provide valid tribe Id'); + } + if (Array.isArray(chatIds)) { + chatIds = JSON.stringify(chatIds); + } + try { + yield models_1.models.GraphSubscription.create({ + name, + address, + weight, + status, + chatIds, + tenant, + }); + return (0, res_1.success)(res, 'Graph Subscription added successfully'); + } + catch (error) { + console.log(error); + return (0, res_1.failure)(res, 'An internal error occured'); + } + }); +} +exports.addGraphSubscription = addGraphSubscription; +//# sourceMappingURL=graphSubscription.js.map \ No newline at end of file diff --git a/dist/src/controllers/graphSubscription.js.map b/dist/src/controllers/graphSubscription.js.map new file mode 100644 index 000000000..aebfb815f --- /dev/null +++ b/dist/src/controllers/graphSubscription.js.map @@ -0,0 +1 @@ +{"version":3,"file":"graphSubscription.js","sourceRoot":"","sources":["../../../src/controllers/graphSubscription.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,sCAAkC;AAGlC,sCAA+C;AAC/C,4CAAuD;AAEvD,SAAsB,oBAAoB,CAAC,GAAQ,EAAE,GAAa;;QAChE,IAAI,CAAC,GAAG,CAAC,KAAK;YAAE,OAAO,IAAA,aAAO,EAAC,GAAG,EAAE,UAAU,CAAC,CAAA;QAC/C,MAAM,MAAM,GAAW,GAAG,CAAC,KAAK,CAAC,EAAE,CAAA;QAEnC,qBAAY,CAAC,IAAI,CAAC,aAAa,EAAE,gBAAO,CAAC,OAAO,CAAC,CAAA;QAEjD,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,GAAG,CAAC,IAAI,CAAA;QAClD,IAAI,EAAE,OAAO,EAAE,GAAG,GAAG,CAAC,IAAI,CAAA;QAC1B,IAAI,CAAC,IAAI,IAAI,CAAC,OAAO,IAAI,CAAC,MAAM,EAAE;YAChC,OAAO,IAAA,aAAO,EAAC,GAAG,EAAE,0CAA0C,CAAC,CAAA;SAChE;QAED,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,GAAG,CAAC,EAAE;YAC5C,OAAO,IAAA,aAAO,EAAC,GAAG,EAAE,4BAA4B,CAAC,CAAA;SAClD;QAED,IAAI,OAAO,KAAK,KAAK,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;YAChD,OAAO,IAAA,aAAO,EAAC,GAAG,EAAE,wBAAwB,CAAC,CAAA;SAC9C;QAED,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;YAC1B,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAA;SAClC;QAED,IAAI;YACF,MAAM,eAAM,CAAC,iBAAiB,CAAC,MAAM,CAAC;gBACpC,IAAI;gBACJ,OAAO;gBACP,MAAM;gBACN,MAAM;gBACN,OAAO;gBACP,MAAM;aACP,CAAC,CAAA;YACF,OAAO,IAAA,aAAO,EAAC,GAAG,EAAE,uCAAuC,CAAC,CAAA;SAC7D;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;YAClB,OAAO,IAAA,aAAO,EAAC,GAAG,EAAE,2BAA2B,CAAC,CAAA;SACjD;IACH,CAAC;CAAA;AAtCD,oDAsCC"} \ No newline at end of file diff --git a/dist/src/controllers/index.js b/dist/src/controllers/index.js index be213429a..fbc0119c0 100644 --- a/dist/src/controllers/index.js +++ b/dist/src/controllers/index.js @@ -38,6 +38,7 @@ const personal = require("./api/personal"); const lsats = require("./lsats"); const action = require("./actionHistory"); const feeds = require("./getFeeds"); +const graphSubscription = require("./graphSubscription"); function set(app) { return __awaiter(this, void 0, void 0, function* () { builtInBots.init(); @@ -173,6 +174,8 @@ function set(app) { app.get('/active_lsat', lsats.getActiveLsat); // Get feeds app.get('/feeds', feeds.getFeeds); + // Graph Subscription + app.post('/addGraph', graphSubscription.addGraphSubscription); }); } exports.set = set; diff --git a/dist/src/controllers/index.js.map b/dist/src/controllers/index.js.map index 47ed29306..38a062110 100644 --- a/dist/src/controllers/index.js.map +++ b/dist/src/controllers/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/controllers/index.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/controllers/index.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/src/models/sql/graphSubscription.js b/dist/src/models/sql/graphSubscription.js index 93ee725be..6331b60a1 100644 --- a/dist/src/models/sql/graphSubscription.js +++ b/dist/src/models/sql/graphSubscription.js @@ -41,6 +41,10 @@ __decorate([ sequelize_typescript_1.Column, __metadata("design:type", String) ], GraphSubscription.prototype, "chatIds", void 0); +__decorate([ + sequelize_typescript_1.Column, + __metadata("design:type", Number) +], GraphSubscription.prototype, "tenant", void 0); __decorate([ sequelize_typescript_1.Column, __metadata("design:type", Date) diff --git a/dist/src/models/sql/graphSubscription.js.map b/dist/src/models/sql/graphSubscription.js.map index 3796e6708..5d2206597 100644 --- a/dist/src/models/sql/graphSubscription.js.map +++ b/dist/src/models/sql/graphSubscription.js.map @@ -1 +1 @@ -{"version":3,"file":"graphSubscription.js","sourceRoot":"","sources":["../../../../src/models/sql/graphSubscription.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAAqE;AAGrE,IAAqB,iBAAiB,GAAtC,MAAqB,iBAAkB,SAAQ,4BAAwB;CA+BtE,CAAA;AAxBC;IANC,IAAA,6BAAM,EAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,MAAM;QACrB,UAAU,EAAE,IAAI;QAChB,MAAM,EAAE,IAAI;QACZ,aAAa,EAAE,IAAI;KACpB,CAAC;;6CACQ;AAGV;IADC,IAAA,6BAAM,EAAC,+BAAQ,CAAC,IAAI,CAAC;;+CACV;AAGZ;IADC,6BAAM;;kDACQ;AAGf;IADC,IAAA,6BAAM,EAAC,+BAAQ,CAAC,IAAI,CAAC;;iDACR;AAId;IADC,6BAAM;;iDACO;AAId;IADC,6BAAM;;kDACQ;AAGf;IADC,6BAAM;8BACI,IAAI;oDAAA;AAGf;IADC,6BAAM;8BACI,IAAI;oDAAA;AA9BI,iBAAiB;IADrC,IAAA,4BAAK,EAAC,EAAE,SAAS,EAAE,2BAA2B,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC;GAChD,iBAAiB,CA+BrC;kBA/BoB,iBAAiB"} \ No newline at end of file +{"version":3,"file":"graphSubscription.js","sourceRoot":"","sources":["../../../../src/models/sql/graphSubscription.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAAqE;AAGrE,IAAqB,iBAAiB,GAAtC,MAAqB,iBAAkB,SAAQ,4BAAwB;CAkCtE,CAAA;AA3BC;IANC,IAAA,6BAAM,EAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,MAAM;QACrB,UAAU,EAAE,IAAI;QAChB,MAAM,EAAE,IAAI;QACZ,aAAa,EAAE,IAAI;KACpB,CAAC;;6CACQ;AAGV;IADC,IAAA,6BAAM,EAAC,+BAAQ,CAAC,IAAI,CAAC;;+CACV;AAGZ;IADC,6BAAM;;kDACQ;AAGf;IADC,IAAA,6BAAM,EAAC,+BAAQ,CAAC,IAAI,CAAC;;iDACR;AAId;IADC,6BAAM;;iDACO;AAId;IADC,6BAAM;;kDACQ;AAGf;IADC,6BAAM;;iDACO;AAGd;IADC,6BAAM;8BACI,IAAI;oDAAA;AAGf;IADC,6BAAM;8BACI,IAAI;oDAAA;AAjCI,iBAAiB;IADrC,IAAA,4BAAK,EAAC,EAAE,SAAS,EAAE,2BAA2B,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC;GAChD,iBAAiB,CAkCrC;kBAlCoB,iBAAiB"} \ No newline at end of file diff --git a/dist/src/utils/migrate.js b/dist/src/utils/migrate.js index 92724d04d..835b03157 100644 --- a/dist/src/utils/migrate.js +++ b/dist/src/utils/migrate.js @@ -292,6 +292,7 @@ function migrate() { address TEXT, weight TEXT, status INTEGER, + tenant INTEGER, chat_ids TEXT )`); } diff --git a/dist/src/utils/migrate.js.map b/dist/src/utils/migrate.js.map index cd26dc84d..27bf09ad0 100644 --- a/dist/src/utils/migrate.js.map +++ b/dist/src/utils/migrate.js.map @@ -1 +1 @@ -{"version":3,"file":"migrate.js","sourceRoot":"","sources":["../../../src/utils/migrate.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,wCAAyC;AACzC,sCAAmD;AACnD,qCAAgD;AAChD,4CAAoC;AAEpC,SAAe,YAAY;;QACzB,IAAI;YACF,MAAM,KAAK,GAAG,CAAC,MAAM,eAAM,CAAC,IAAI,CAAC,OAAO,EAAE,CAAW,CAAA;YACrD,IAAI,GAAG,GAAG,KAAK,CAAA;YACf,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;gBAClB,IAAI,CAAC,CAAC,MAAM,KAAK,IAAI,EAAE;oBACrB,GAAG,GAAG,IAAI,CAAA;iBACX;YACH,CAAC,CAAC,CAAA;YACF,IAAI,CAAC,GAAG;gBAAE,OAAM;YAChB,OAAO,CAAC,GAAG,CAAC,0CAA0C,CAAC,CAAA;YACvD,MAAM,IAAA,sBAAY,EAAC,KAAK,EAAE,CAAO,CAAC,EAAE,EAAE;gBACpC,IAAI,CAAC,CAAC,MAAM,KAAK,IAAI,EAAE;oBACrB,MAAM,CAAC,CAAC,MAAM,CAAC;wBACb,MAAM,EAAE,CAAC,CAAC,OAAO;4BACf,CAAC,CAAC,mBAAS,CAAC,aAAa,CAAC,IAAI;4BAC9B,CAAC,CAAC,mBAAS,CAAC,aAAa,CAAC,GAAG;qBAChC,CAAC,CAAA;iBACH;YACH,CAAC,CAAA,CAAC,CAAA;YACF,OAAO,CAAC,GAAG,CAAC,qDAAqD,CAAC,CAAA;SACnE;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,CAAC,GAAG,CAAC,wBAAwB,EAAE,CAAC,CAAC,CAAA;SACzC;IACH,CAAC;CAAA;AAED,SAAe,oBAAoB;;QACjC,MAAM,eAAM,CAAC,uBAAuB,CAAC,OAAO,CAAC;YAC3C,QAAQ,EAAE,IAAI;SACf,CAAC,CAAA;IACJ,CAAC;CAAA;AAED,SAA8B,OAAO;;QACnC,cAAc,CAAC,iBAAiB,EAAE,gBAAgB,EAAE,QAAQ,CAAC,CAAA;QAC7D,MAAM,oBAAoB,EAAE,CAAA;QAC5B,cAAc,CAAC,iBAAiB,EAAE,UAAU,EAAE,SAAS,CAAC,CAAA;QAExD,cAAc,CAAC,cAAc,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAA;QAElD,MAAM,YAAY,EAAE,CAAA;QAEpB,cAAc,CAAC,iBAAiB,EAAE,MAAM,EAAE,SAAS,CAAC,CAAA;QAEpD,cAAc,CAAC,iBAAiB,EAAE,gBAAgB,EAAE,SAAS,CAAC,CAAA;QAC9D,cAAc,CAAC,iBAAiB,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAA;QAEnD,cAAc,CAAC,iBAAiB,EAAE,iBAAiB,CAAC,CAAA;QACpD,cAAc,CAAC,iBAAiB,EAAE,eAAe,CAAC,CAAA;QAElD,cAAc,CAAC,iBAAiB,EAAE,UAAU,CAAC,CAAA;QAE7C,cAAc,CAAC,cAAc,EAAE,WAAW,EAAE,KAAK,CAAC,CAAA;QAElD,cAAc,CAAC,iBAAiB,EAAE,SAAS,EAAE,SAAS,CAAC,CAAA;QAEvD,cAAc,CAAC,iBAAiB,EAAE,eAAe,EAAE,QAAQ,CAAC,CAAA;QAC5D,cAAc,CAAC,iBAAiB,EAAE,OAAO,EAAE,SAAS,CAAC,CAAA;QACrD,cAAc,CAAC,iBAAiB,EAAE,aAAa,EAAE,MAAM,CAAC,CAAA;QAExD,cAAc,CAAC,cAAc,EAAE,sBAAsB,EAAE,SAAS,CAAC,CAAA;QAEjE,cAAc,CAAC,cAAc,EAAE,KAAK,CAAC,CAAA;QACrC,cAAc,CAAC,cAAc,EAAE,iBAAiB,EAAE,MAAM,CAAC,CAAA;QACzD,cAAc,CAAC,qBAAqB,EAAE,cAAc,EAAE,QAAQ,CAAC,CAAA;QAC/D,cAAc,CAAC,qBAAqB,EAAE,YAAY,EAAE,QAAQ,CAAC,CAAA;QAE7D,SAAS,CAAC,qBAAqB,CAAC,CAAA;QAChC,SAAS,CAAC,cAAc,CAAC,CAAA;QACzB,SAAS,CAAC,aAAa,CAAC,CAAA;QACxB,SAAS,CAAC,iBAAiB,CAAC,CAAA;QAC5B,SAAS,CAAC,iBAAiB,CAAC,CAAA;QAC5B,SAAS,CAAC,oBAAoB,CAAC,CAAA;QAC/B,SAAS,CAAC,kBAAkB,CAAC,CAAA;QAC7B,SAAS,CAAC,gBAAgB,CAAC,CAAA;QAC3B,SAAS,CAAC,mBAAmB,CAAC,CAAA;QAC9B,SAAS,CAAC,sBAAsB,CAAC,CAAA;QACjC,SAAS,CAAC,eAAe,CAAC,CAAA;QAE1B,cAAc,CAAC,iBAAiB,EAAE,YAAY,CAAC,CAAA;QAC/C,cAAc,CAAC,kBAAkB,EAAE,sBAAsB,CAAC,CAAA;QAC1D,cAAc,CAAC,oBAAoB,EAAE,YAAY,CAAC,CAAA;QAElD,IAAI;YACF,MAAM,kBAAS,CAAC,KAAK,CAAC;;;;;;;;;;;;;;MAcpB,CAAC,CAAA;SACJ;QAAC,OAAO,CAAC,EAAE;YACV,iBAAiB;SAClB;QAED,cAAc,CAAC,oBAAoB,EAAE,cAAc,CAAC,CAAA;QAEpD,cAAc,CAAC,oBAAoB,EAAE,cAAc,CAAC,CAAA;QACpD,cAAc,CAAC,oBAAoB,EAAE,YAAY,EAAE,QAAQ,CAAC,CAAA;QAC5D,cAAc,CAAC,oBAAoB,EAAE,eAAe,EAAE,QAAQ,CAAC,CAAA;QAC/D,cAAc,CAAC,oBAAoB,EAAE,gBAAgB,EAAE,QAAQ,CAAC,CAAA;QAChE,cAAc,CAAC,oBAAoB,EAAE,cAAc,EAAE,QAAQ,CAAC,CAAA;QAE9D,cAAc,CAAC,qBAAqB,EAAE,YAAY,CAAC,CAAA;QAEnD,cAAc,CAAC,cAAc,EAAE,cAAc,CAAC,CAAA;QAC9C,cAAc,CAAC,cAAc,EAAE,UAAU,CAAC,CAAA;QAE1C,cAAc,CAAC,iBAAiB,EAAE,YAAY,CAAC,CAAA;QAE/C,cAAc,CAAC,iBAAiB,EAAE,cAAc,EAAE,SAAS,CAAC,CAAA;QAE5D,cAAc,CAAC,iBAAiB,EAAE,WAAW,EAAE,SAAS,CAAC,CAAA;QAEzD,cAAc,CAAC,cAAc,EAAE,MAAM,CAAC,CAAA;QAEtC,cAAc,CAAC,iBAAiB,EAAE,YAAY,EAAE,QAAQ,CAAC,CAAA;QAEzD,cAAc,CAAC,iBAAiB,EAAE,aAAa,EAAE,UAAU,CAAC,CAAA;QAE5D,IAAI;YACF,MAAM,kBAAS,CAAC,KAAK,CAAC;;;;;;;;;;;;;MAapB,CAAC,CAAA;SACJ;QAAC,OAAO,CAAC,EAAE;YACV,iBAAiB;SAClB;QAED,IAAI;YACF,MAAM,kBAAS,CAAC,KAAK,CACnB,4EAA4E,CAC7E,CAAA;SACF;QAAC,OAAO,CAAC,EAAE;YACV,iBAAiB;SAClB;QAED,cAAc,CAAC,aAAa,EAAE,SAAS,CAAC,CAAA;QACxC,cAAc,CAAC,aAAa,EAAE,MAAM,CAAC,CAAA;QACrC,cAAc,CAAC,aAAa,EAAE,eAAe,EAAE,KAAK,CAAC,CAAA;QAErD,IAAI;YACF,MAAM,kBAAS,CAAC,KAAK,CAAC;;;;;;;;MAQpB,CAAC,CAAA;SACJ;QAAC,OAAO,CAAC,EAAE;YACV,iBAAiB;SAClB;QAED,cAAc,CAAC,oBAAoB,EAAE,QAAQ,CAAC,CAAA;QAE9C,UAAU;QAEV,IAAI;YACF,MAAM,kBAAS,CAAC,KAAK,CAAC;;;;;;;MAOpB,CAAC,CAAA;SACJ;QAAC,OAAO,CAAC,EAAE;YACV,iBAAiB;SAClB;QAED,cAAc,CAAC,cAAc,EAAE,SAAS,CAAC,CAAA;QACzC,cAAc,CAAC,cAAc,EAAE,UAAU,CAAC,CAAA;QAE1C,IAAI;YACF,MAAM,kBAAS,CAAC,KAAK,CACnB,oFAAoF,CACrF,CAAA;SACF;QAAC,OAAO,CAAC,EAAE;YACV,iBAAiB;SAClB;QAED,cAAc,CAAC,cAAc,EAAE,SAAS,EAAE,SAAS,CAAC,CAAA;QACpD,cAAc,CAAC,cAAc,EAAE,UAAU,EAAE,SAAS,CAAC,CAAA;QACrD,cAAc,CAAC,qBAAqB,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAA;QAEzD,cAAc,CAAC,cAAc,EAAE,MAAM,EAAE,SAAS,CAAC,CAAA;QAEjD,IAAI;YACF,MAAM,kBAAS,CAAC,KAAK,CACnB,+DAA+D,CAChE,CAAA;SACF;QAAC,OAAO,CAAC,EAAE;YACV,iBAAiB;SAClB;QAED,cAAc,CAAC,iBAAiB,EAAE,oBAAoB,CAAC,CAAA;QACvD,cAAc,CAAC,iBAAiB,EAAE,YAAY,EAAE,SAAS,CAAC,CAAA;QAC1D,cAAc,CAAC,iBAAiB,EAAE,eAAe,EAAE,SAAS,CAAC,CAAA;QAE7D,cAAc,CAAC,cAAc,EAAE,eAAe,EAAE,QAAQ,CAAC,CAAA;QACzD,cAAc,CAAC,cAAc,EAAE,eAAe,EAAE,QAAQ,CAAC,CAAA;QAEzD,iBAAiB;QACjB,IAAI;YACF,qBAAY,CAAC,IAAI,CAAC,mBAAmB,EAAE,gBAAO,CAAC,EAAE,CAAC,CAAA;YAClD,MAAM,kBAAS,CAAC,KAAK,CAAC;;;;;;;;;;;;;MAapB,CAAC,CAAA;SACJ;QAAC,OAAO,CAAC,EAAE;YACV,4EAA4E;SAC7E;QAED,oCAAoC;QACpC,cAAc,CAAC,cAAc,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAA;QAE/C,kCAAkC;QAClC,IAAI;YACF,qBAAY,CAAC,IAAI,CAAC,sCAAsC,EAAE,gBAAO,CAAC,EAAE,CAAC,CAAA;YACrE,MAAM,kBAAS,CAAC,KAAK,CAAC;;;;;;MAMpB,CAAC,CAAA;SACJ;QAAC,OAAO,CAAC,EAAE;YACV,iBAAiB;SAClB;QAED,0BAA0B;QAC1B,IAAI;YACF,MAAM,kBAAS,CAAC,KAAK,CAAC;;;;;;;;MAQpB,CAAC,CAAA;SACJ;QAAC,OAAO,CAAC,EAAE;YACV,iBAAiB;SAClB;QACD,cAAc,CAAC,uBAAuB,EAAE,aAAa,EAAE,KAAK,CAAC,CAAA;QAC7D,cAAc,CAAC,cAAc,EAAE,gBAAgB,EAAE,KAAK,CAAC,CAAA;QACvD,cAAc,CAAC,cAAc,EAAE,sBAAsB,EAAE,MAAM,CAAC,CAAA;QAC9D,cAAc,CAAC,cAAc,EAAE,cAAc,EAAE,MAAM,CAAC,CAAA;QACtD,cAAc,CAAC,cAAc,EAAE,kBAAkB,EAAE,MAAM,CAAC,CAAA;QAC1D,cAAc,CAAC,cAAc,EAAE,kBAAkB,EAAE,MAAM,CAAC,CAAA;QAE1D,2BAA2B;QAE3B,IAAI;YACF,qBAAY,CAAC,IAAI,CAAC,6BAA6B,EAAE,gBAAO,CAAC,EAAE,CAAC,CAAA;YAC5D,MAAM,kBAAS,CAAC,KAAK,CAAC;;;;;;;;;;;;;MAapB,CAAC,CAAA;SACJ;QAAC,OAAO,CAAC,EAAE;YACV,sFAAsF;SACvF;QAED,+BAA+B;QAC/B,IAAI;YACF,qBAAY,CAAC,IAAI,CAAC,iCAAiC,EAAE,gBAAO,CAAC,EAAE,CAAC,CAAA;YAChE,MAAM,kBAAS,CAAC,KAAK,CAAC;;;;;;;;;;MAUpB,CAAC,CAAA;SACJ;QAAC,OAAO,CAAC,EAAE;YACV,0FAA0F;SAC3F;IACH,CAAC;CAAA;AA/RD,0BA+RC;AAED,SAAe,SAAS,CAAC,SAAS;;QAChC,MAAM,cAAc,CAAC,SAAS,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAA;QACnD,IAAI;YACF,MAAM,kBAAS,CAAC,KAAK,CACnB,UAAU,SAAS,oCAAoC,CACxD,CAAA;SACF;QAAC,OAAO,CAAC,EAAE;YACV,oCAAoC;SACrC;IACH,CAAC;CAAA;AAED,SAAe,cAAc,CAAC,KAAa,EAAE,MAAc,EAAE,IAAI,GAAG,MAAM;;QACxE,IAAI;YACF,MAAM,kBAAS,CAAC,KAAK,CAAC,eAAe,KAAK,QAAQ,MAAM,IAAI,IAAI,EAAE,CAAC,CAAA;SACpE;QAAC,OAAO,CAAC,EAAE;YACV,2DAA2D;SAC5D;IACH,CAAC;CAAA"} \ No newline at end of file +{"version":3,"file":"migrate.js","sourceRoot":"","sources":["../../../src/utils/migrate.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/controllers/graphSubscription.ts b/src/controllers/graphSubscription.ts new file mode 100644 index 000000000..8683084bb --- /dev/null +++ b/src/controllers/graphSubscription.ts @@ -0,0 +1,45 @@ +import { models } from '../models' +import { Req } from '../types' +import { Response } from 'express' +import { failure, success } from '../utils/res' +import { logging, sphinxLogger } from '../utils/logger' + +export async function addGraphSubscription(req: Req, res: Response) { + if (!req.owner) return failure(res, 'no owner') + const tenant: number = req.owner.id + + sphinxLogger.info(`=> saveLsat`, logging.Express) + + const { name, address, weight, status } = req.body + let { chatIds } = req.body + if (!name || !address || !weight) { + return failure(res, 'Missing required Graph Subscription data') + } + + if (typeof status !== 'number' || status > 1) { + return failure(res, 'Provide valid graph status') + } + + if (chatIds !== 'all' && !Array.isArray(chatIds)) { + return failure(res, 'Provide valid tribe Id') + } + + if (Array.isArray(chatIds)) { + chatIds = JSON.stringify(chatIds) + } + + try { + await models.GraphSubscription.create({ + name, + address, + weight, + status, + chatIds, + tenant, + }) + return success(res, 'Graph Subscription added successfully') + } catch (error) { + console.log(error) + return failure(res, 'An internal error occured') + } +} diff --git a/src/controllers/index.ts b/src/controllers/index.ts index f21c1a2d8..f33a0abbd 100644 --- a/src/controllers/index.ts +++ b/src/controllers/index.ts @@ -27,6 +27,7 @@ import * as lsats from './lsats' import { Req } from '../types' import * as action from './actionHistory' import * as feeds from './getFeeds' +import * as graphSubscription from './graphSubscription' export async function set(app) { builtInBots.init() @@ -189,6 +190,9 @@ export async function set(app) { // Get feeds app.get('/feeds', feeds.getFeeds) + + // Graph Subscription + app.post('/addGraph', graphSubscription.addGraphSubscription) } const msgtypes = constants.message_types diff --git a/src/models/sql/graphSubscription.ts b/src/models/sql/graphSubscription.ts index 20005d3a1..8e945ce3e 100644 --- a/src/models/sql/graphSubscription.ts +++ b/src/models/sql/graphSubscription.ts @@ -27,6 +27,9 @@ export default class GraphSubscription extends Model { @Column chatIds: string + @Column + tenant: number + @Column createdAt: Date diff --git a/src/utils/migrate.ts b/src/utils/migrate.ts index 8e3938527..4534b5d76 100644 --- a/src/utils/migrate.ts +++ b/src/utils/migrate.ts @@ -317,6 +317,7 @@ export default async function migrate(): Promise { address TEXT, weight TEXT, status INTEGER, + tenant INTEGER, chat_ids TEXT )`) } catch (e) { From 88cbd4961dcdb7dfd750ffe0068f69892b382b77 Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Mon, 16 Jan 2023 23:39:42 +0100 Subject: [PATCH 03/14] feat: get companies graph subscription --- dist/src/controllers/graphSubscription.js | 30 +++++++++++++- dist/src/controllers/graphSubscription.js.map | 2 +- dist/src/controllers/index.js | 1 + dist/src/controllers/index.js.map | 2 +- src/controllers/graphSubscription.ts | 40 ++++++++++++++++++- src/controllers/index.ts | 1 + 6 files changed, 71 insertions(+), 5 deletions(-) diff --git a/dist/src/controllers/graphSubscription.js b/dist/src/controllers/graphSubscription.js index 8a0ec86c2..1370f8635 100644 --- a/dist/src/controllers/graphSubscription.js +++ b/dist/src/controllers/graphSubscription.js @@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }); }; Object.defineProperty(exports, "__esModule", { value: true }); -exports.addGraphSubscription = void 0; +exports.getGraphSubscription = exports.addGraphSubscription = void 0; const models_1 = require("../models"); const res_1 = require("../utils/res"); const logger_1 = require("../utils/logger"); @@ -51,4 +51,32 @@ function addGraphSubscription(req, res) { }); } exports.addGraphSubscription = addGraphSubscription; +function getGraphSubscription(req, res) { + return __awaiter(this, void 0, void 0, function* () { + if (!req.owner) + return (0, res_1.failure)(res, 'no owner'); + try { + const graphs = (yield models_1.models.GraphSubscription.findAll()); + const newGraphs = []; + for (let i = 0; i < graphs.length; i++) { + const graph = graphs[i]; + const lsat = (yield models_1.models.Lsat.findOne({ + where: { paths: graph.address, status: 1 }, + })); + const obj = { + client_name: graph.name, + prediction_endpoint: graph.address, + lsat: lsat ? `${lsat.macaroon}:${lsat.preimage}` : '', + }; + newGraphs.push(obj); + } + return (0, res_1.success)(res, newGraphs); + } + catch (error) { + console.log(error); + return (0, res_1.failure)(res, 'An internal error occured'); + } + }); +} +exports.getGraphSubscription = getGraphSubscription; //# sourceMappingURL=graphSubscription.js.map \ No newline at end of file diff --git a/dist/src/controllers/graphSubscription.js.map b/dist/src/controllers/graphSubscription.js.map index aebfb815f..88b6e1b3d 100644 --- a/dist/src/controllers/graphSubscription.js.map +++ b/dist/src/controllers/graphSubscription.js.map @@ -1 +1 @@ -{"version":3,"file":"graphSubscription.js","sourceRoot":"","sources":["../../../src/controllers/graphSubscription.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,sCAAkC;AAGlC,sCAA+C;AAC/C,4CAAuD;AAEvD,SAAsB,oBAAoB,CAAC,GAAQ,EAAE,GAAa;;QAChE,IAAI,CAAC,GAAG,CAAC,KAAK;YAAE,OAAO,IAAA,aAAO,EAAC,GAAG,EAAE,UAAU,CAAC,CAAA;QAC/C,MAAM,MAAM,GAAW,GAAG,CAAC,KAAK,CAAC,EAAE,CAAA;QAEnC,qBAAY,CAAC,IAAI,CAAC,aAAa,EAAE,gBAAO,CAAC,OAAO,CAAC,CAAA;QAEjD,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,GAAG,CAAC,IAAI,CAAA;QAClD,IAAI,EAAE,OAAO,EAAE,GAAG,GAAG,CAAC,IAAI,CAAA;QAC1B,IAAI,CAAC,IAAI,IAAI,CAAC,OAAO,IAAI,CAAC,MAAM,EAAE;YAChC,OAAO,IAAA,aAAO,EAAC,GAAG,EAAE,0CAA0C,CAAC,CAAA;SAChE;QAED,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,GAAG,CAAC,EAAE;YAC5C,OAAO,IAAA,aAAO,EAAC,GAAG,EAAE,4BAA4B,CAAC,CAAA;SAClD;QAED,IAAI,OAAO,KAAK,KAAK,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;YAChD,OAAO,IAAA,aAAO,EAAC,GAAG,EAAE,wBAAwB,CAAC,CAAA;SAC9C;QAED,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;YAC1B,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAA;SAClC;QAED,IAAI;YACF,MAAM,eAAM,CAAC,iBAAiB,CAAC,MAAM,CAAC;gBACpC,IAAI;gBACJ,OAAO;gBACP,MAAM;gBACN,MAAM;gBACN,OAAO;gBACP,MAAM;aACP,CAAC,CAAA;YACF,OAAO,IAAA,aAAO,EAAC,GAAG,EAAE,uCAAuC,CAAC,CAAA;SAC7D;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;YAClB,OAAO,IAAA,aAAO,EAAC,GAAG,EAAE,2BAA2B,CAAC,CAAA;SACjD;IACH,CAAC;CAAA;AAtCD,oDAsCC"} \ No newline at end of file +{"version":3,"file":"graphSubscription.js","sourceRoot":"","sources":["../../../src/controllers/graphSubscription.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/src/controllers/index.js b/dist/src/controllers/index.js index fbc0119c0..61744bc10 100644 --- a/dist/src/controllers/index.js +++ b/dist/src/controllers/index.js @@ -176,6 +176,7 @@ function set(app) { app.get('/feeds', feeds.getFeeds); // Graph Subscription app.post('/addGraph', graphSubscription.addGraphSubscription); + app.get('/getGraph', graphSubscription.getGraphSubscription); }); } exports.set = set; diff --git a/dist/src/controllers/index.js.map b/dist/src/controllers/index.js.map index 38a062110..6711d3874 100644 --- a/dist/src/controllers/index.js.map +++ b/dist/src/controllers/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/controllers/index.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/controllers/index.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/controllers/graphSubscription.ts b/src/controllers/graphSubscription.ts index 8683084bb..f35754ec3 100644 --- a/src/controllers/graphSubscription.ts +++ b/src/controllers/graphSubscription.ts @@ -1,10 +1,13 @@ -import { models } from '../models' +import { GraphSubscriptionRecord, models, Lsat } from '../models' import { Req } from '../types' import { Response } from 'express' import { failure, success } from '../utils/res' import { logging, sphinxLogger } from '../utils/logger' -export async function addGraphSubscription(req: Req, res: Response) { +export async function addGraphSubscription( + req: Req, + res: Response +): Promise { if (!req.owner) return failure(res, 'no owner') const tenant: number = req.owner.id @@ -43,3 +46,36 @@ export async function addGraphSubscription(req: Req, res: Response) { return failure(res, 'An internal error occured') } } + +export async function getGraphSubscription( + req: Req, + res: Response +): Promise { + if (!req.owner) return failure(res, 'no owner') + try { + const graphs = + (await models.GraphSubscription.findAll()) as GraphSubscriptionRecord[] + + const newGraphs: { + client_name: string + prediction_endpoint: string + lsat: string + }[] = [] + for (let i = 0; i < graphs.length; i++) { + const graph = graphs[i] + const lsat = (await models.Lsat.findOne({ + where: { paths: graph.address, status: 1 }, + })) as Lsat + const obj = { + client_name: graph.name, + prediction_endpoint: graph.address, + lsat: lsat ? `${lsat.macaroon}:${lsat.preimage}` : '', + } + newGraphs.push(obj) + } + return success(res, newGraphs) + } catch (error) { + console.log(error) + return failure(res, 'An internal error occured') + } +} diff --git a/src/controllers/index.ts b/src/controllers/index.ts index f33a0abbd..2feca40c5 100644 --- a/src/controllers/index.ts +++ b/src/controllers/index.ts @@ -193,6 +193,7 @@ export async function set(app) { // Graph Subscription app.post('/addGraph', graphSubscription.addGraphSubscription) + app.get('/getGraph', graphSubscription.getGraphSubscription) } const msgtypes = constants.message_types From d27536a5a19b55a51c47d5093d14254acc8dae60 Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Wed, 18 Jan 2023 13:36:54 +0100 Subject: [PATCH 04/14] feat: added search bot to mother bot --- dist/src/builtin/mother.js | 10 +++++++++- dist/src/builtin/mother.js.map | 2 +- src/builtin/mother.ts | 10 +++++++++- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/dist/src/builtin/mother.js b/dist/src/builtin/mother.js index e9493eb0c..3cfe6fb08 100644 --- a/dist/src/builtin/mother.js +++ b/dist/src/builtin/mother.js @@ -24,7 +24,14 @@ const logger_1 = require("../utils/logger"); const git_1 = require("./git"); const msg_types = Sphinx.MSG_TYPE; const config = (0, config_1.loadConfig)(); -const builtinBots = ['welcome', 'loopout', 'git', 'badge', 'callRecording']; +const builtinBots = [ + 'welcome', + 'loopout', + 'git', + 'badge', + 'callRecording', + 'search', +]; // else just message type const builtInBotMsgTypes = { welcome: [ @@ -43,6 +50,7 @@ const builtInBotNames = { git: 'GitBot', badge: 'BadgeBot', callRecording: 'CallRecordingBot', + search: 'SearchBot', }; function init() { const client = new Sphinx.Client(); diff --git a/dist/src/builtin/mother.js.map b/dist/src/builtin/mother.js.map index 816e283aa..72fd7b849 100644 --- a/dist/src/builtin/mother.js.map +++ b/dist/src/builtin/mother.js.map @@ -1 +1 @@ -{"version":3,"file":"mother.js","sourceRoot":"","sources":["../../../src/builtin/mother.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"mother.js","sourceRoot":"","sources":["../../../src/builtin/mother.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/builtin/mother.ts b/src/builtin/mother.ts index 35a8796cd..286ba0329 100644 --- a/src/builtin/mother.ts +++ b/src/builtin/mother.ts @@ -16,7 +16,14 @@ const msg_types = Sphinx.MSG_TYPE const config = loadConfig() -const builtinBots = ['welcome', 'loopout', 'git', 'badge', 'callRecording'] +const builtinBots = [ + 'welcome', + 'loopout', + 'git', + 'badge', + 'callRecording', + 'search', +] // else just message type const builtInBotMsgTypes = { @@ -37,6 +44,7 @@ const builtInBotNames = { git: 'GitBot', badge: 'BadgeBot', callRecording: 'CallRecordingBot', + search: 'SearchBot', } export function init() { From a2790274a291b0d5ecf95603acc78187c971963d Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Wed, 18 Jan 2023 21:56:07 +0100 Subject: [PATCH 05/14] feat: search feature for the search bot --- dist/src/builtin/index.js | 2 + dist/src/builtin/index.js.map | 2 +- dist/src/builtin/search.js | 120 +++++++++++++++++++++++++++++++++ dist/src/builtin/search.js.map | 1 + src/builtin/index.ts | 2 + src/builtin/search.ts | 119 ++++++++++++++++++++++++++++++++ 6 files changed, 245 insertions(+), 1 deletion(-) create mode 100644 dist/src/builtin/search.js create mode 100644 dist/src/builtin/search.js.map create mode 100644 src/builtin/search.ts diff --git a/dist/src/builtin/index.js b/dist/src/builtin/index.js index 84f54833c..6ed648428 100644 --- a/dist/src/builtin/index.js +++ b/dist/src/builtin/index.js @@ -20,6 +20,7 @@ const CallRecordingBot = require("./callRecording"); const GitBot = require("./git"); const bots_1 = require("../controllers/bots"); Object.defineProperty(exports, "buildBotPayload", { enumerable: true, get: function () { return bots_1.buildBotPayload; } }); +const SearchBot = require("./search"); function init() { return __awaiter(this, void 0, void 0, function* () { MotherBot.init(); @@ -28,6 +29,7 @@ function init() { GitBot.init(); BadgeBot.init(); CallRecordingBot.init(); + SearchBot.init(); }); } exports.init = init; diff --git a/dist/src/builtin/index.js.map b/dist/src/builtin/index.js.map index 6683a95cb..b1baf76a3 100644 --- a/dist/src/builtin/index.js.map +++ b/dist/src/builtin/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/builtin/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mDAAmD;AACnD,wCAAuC;AACvC,sCAAqC;AACrC,wCAAuC;AACvC,kCAAiC;AACjC,oCAAmC;AACnC,oDAAmD;AAEnD,gCAA+B;AAC/B,8CAAqD;AAiBtB,gGAjBtB,sBAAe,OAiBsB;AAf9C,SAAe,IAAI;;QACjB,SAAS,CAAC,IAAI,EAAE,CAAA;QAChB,UAAU,CAAC,IAAI,EAAE,CAAA;QACjB,OAAO,CAAC,IAAI,EAAE,CAAA;QACd,MAAM,CAAC,IAAI,EAAE,CAAA;QACb,QAAQ,CAAC,IAAI,EAAE,CAAA;QACf,gBAAgB,CAAC,IAAI,EAAE,CAAA;IACzB,CAAC;CAAA;AAQQ,oBAAI;AANb,SAAS,cAAc,CAAC,GAAW;IACjC,UAAU,CAAC,GAAG,EAAE;QACd,SAAS,CAAC,KAAK,CAAC,SAAS,EAAE,IAAA,sBAAe,EAAC,GAAG,CAAC,CAAC,CAAA;IAClD,CAAC,EAAE,IAAI,CAAC,CAAA;AACV,CAAC;AAEc,wCAAc"} \ No newline at end of file +{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/builtin/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mDAAmD;AACnD,wCAAuC;AACvC,sCAAqC;AACrC,wCAAuC;AACvC,kCAAiC;AACjC,oCAAmC;AACnC,oDAAmD;AAEnD,gCAA+B;AAC/B,8CAAqD;AAmBtB,gGAnBtB,sBAAe,OAmBsB;AAlB9C,sCAAqC;AAErC,SAAe,IAAI;;QACjB,SAAS,CAAC,IAAI,EAAE,CAAA;QAChB,UAAU,CAAC,IAAI,EAAE,CAAA;QACjB,OAAO,CAAC,IAAI,EAAE,CAAA;QACd,MAAM,CAAC,IAAI,EAAE,CAAA;QACb,QAAQ,CAAC,IAAI,EAAE,CAAA;QACf,gBAAgB,CAAC,IAAI,EAAE,CAAA;QACvB,SAAS,CAAC,IAAI,EAAE,CAAA;IAClB,CAAC;CAAA;AAQQ,oBAAI;AANb,SAAS,cAAc,CAAC,GAAW;IACjC,UAAU,CAAC,GAAG,EAAE;QACd,SAAS,CAAC,KAAK,CAAC,SAAS,EAAE,IAAA,sBAAe,EAAC,GAAG,CAAC,CAAC,CAAA;IAClD,CAAC,EAAE,IAAI,CAAC,CAAA;AACV,CAAC;AAEc,wCAAc"} \ No newline at end of file diff --git a/dist/src/builtin/search.js b/dist/src/builtin/search.js new file mode 100644 index 000000000..3839fb48d --- /dev/null +++ b/dist/src/builtin/search.js @@ -0,0 +1,120 @@ +"use strict"; +var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { + function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } + return new (P || (P = Promise))(function (resolve, reject) { + function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } + function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } + function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } + step((generator = generator.apply(thisArg, _arguments || [])).next()); + }); +}; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.settleLsat = exports.init = void 0; +const Sphinx = require("sphinx-bot"); +const logger_1 = require("../utils/logger"); +const botapi_1 = require("../controllers/botapi"); +const models_1 = require("../models"); +const node_fetch_1 = require("node-fetch"); +const msg_types = Sphinx.MSG_TYPE; +let initted = false; +function init() { + if (initted) + return; + initted = true; + const client = new Sphinx.Client(); + client.login('_', botapi_1.finalAction); + client.on(msg_types.MESSAGE, (message) => __awaiter(this, void 0, void 0, function* () { + var _a, _b, _c; + if (!message.content) + return; + const arr = message.content.split(' '); + if (arr.length < 3) + return; + if (arr[0] !== '/search') + return; + const cmd = arr[1]; + try { + const tribe = (yield models_1.models.Chat.findOne({ + where: { uuid: message.channel.id }, + })); + switch (cmd) { + case 'search': + const graphs = (yield models_1.models.GraphSubscription.findAll()); + const subscriptions = yield settleLsat(graphs); + const request = { + company_name: 'Sphinx', + tribe_name: tribe.name, + search_word: `${arr.slice(1, arr.length).join(' ')}`, + subscriptions, + }; + const response = yield (0, node_fetch_1.default)('http://3.95.131.14:5000/prediction/query', { + method: 'POST', + body: JSON.stringify(request), + headers: { + 'Content-Type': 'application/json', + }, + }); + if (response.ok) { + const parsedRes = yield response.json(); + let internalRes = []; + if ((_a = parsedRes.internal) === null || _a === void 0 ? void 0 : _a.exact) { + internalRes = (_b = parsedRes.internal) === null || _b === void 0 ? void 0 : _b.exact.slice(0, 5); + } + let externalRes = []; + if (parsedRes.external.exact) { + externalRes = (_c = parsedRes.external) === null || _c === void 0 ? void 0 : _c.exact.slice(0, 5); + } + let returnMsg = ''; + for (let i = 0; i < internalRes.length; i++) { + const result = internalRes[i]; + returnMsg = `${returnMsg} ${result === null || result === void 0 ? void 0 : result.description} from ${result === null || result === void 0 ? void 0 : result.show_title} \n`; + } + for (let i = 0; i < externalRes.length; i++) { + const result = externalRes[i]; + returnMsg = `${returnMsg} ${result.description} from ${result.show_title} \n`; + } + if (!returnMsg) { + returnMsg = 'No result found for your search'; + } + const resEmbed = new Sphinx.MessageEmbed() + .setAuthor('SearchBot') + .setDescription(returnMsg); + message.channel.send({ embed: resEmbed }); + return; + } + else { + const resEmbed = new Sphinx.MessageEmbed() + .setAuthor('SearchBot') + .setDescription(`Sorry seems there is an issue with your internal private graph ${response.status}`); + message.channel.send({ embed: resEmbed }); + return; + } + case 'graph': + } + } + catch (error) { + logger_1.sphinxLogger.error(`SEARCH BOT ERROR ${error}`, logger_1.logging.Bots); + } + })); +} +exports.init = init; +function settleLsat(graphs) { + return __awaiter(this, void 0, void 0, function* () { + const newGraphs = []; + for (let i = 0; i < graphs.length; i++) { + const graph = graphs[i]; + const lsat = (yield models_1.models.Lsat.findOne({ + where: { paths: graph.address, status: 1 }, + })); + const obj = { + client_name: graph.name, + prediction_endpoint: graph.address, + lsat: lsat ? `LSAT ${lsat.macaroon}:${lsat.preimage}` : '', + }; + newGraphs.push(obj); + } + return newGraphs; + }); +} +exports.settleLsat = settleLsat; +//# sourceMappingURL=search.js.map \ No newline at end of file diff --git a/dist/src/builtin/search.js.map b/dist/src/builtin/search.js.map new file mode 100644 index 000000000..00cf525db --- /dev/null +++ b/dist/src/builtin/search.js.map @@ -0,0 +1 @@ +{"version":3,"file":"search.js","sourceRoot":"","sources":["../../../src/builtin/search.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/builtin/index.ts b/src/builtin/index.ts index 4f5e55082..748939ed1 100644 --- a/src/builtin/index.ts +++ b/src/builtin/index.ts @@ -8,6 +8,7 @@ import * as CallRecordingBot from './callRecording' import { BotMsg } from '../network/interfaces' import * as GitBot from './git' import { buildBotPayload } from '../controllers/bots' +import * as SearchBot from './search' async function init() { MotherBot.init() @@ -16,6 +17,7 @@ async function init() { GitBot.init() BadgeBot.init() CallRecordingBot.init() + SearchBot.init() } function builtinBotEmit(msg: BotMsg) { diff --git a/src/builtin/search.ts b/src/builtin/search.ts new file mode 100644 index 000000000..c9a4f794a --- /dev/null +++ b/src/builtin/search.ts @@ -0,0 +1,119 @@ +import * as Sphinx from 'sphinx-bot' +import { sphinxLogger, logging } from '../utils/logger' +import { finalAction } from '../controllers/botapi' +import { models, ChatRecord, GraphSubscriptionRecord, Lsat } from '../models' +import fetch from 'node-fetch' + +const msg_types = Sphinx.MSG_TYPE + +let initted = false + +interface SearchResult { + description: string + show_title: string +} + +export function init() { + if (initted) return + initted = true + + const client = new Sphinx.Client() + client.login('_', finalAction) + + client.on(msg_types.MESSAGE, async (message: Sphinx.Message) => { + if (!message.content) return + const arr = message.content.split(' ') + if (arr.length < 3) return + if (arr[0] !== '/search') return + const cmd = arr[1] + + try { + const tribe = (await models.Chat.findOne({ + where: { uuid: message.channel.id }, + })) as ChatRecord + switch (cmd) { + case 'search': + const graphs = + (await models.GraphSubscription.findAll()) as GraphSubscriptionRecord[] + const subscriptions = await settleLsat(graphs) + const request = { + company_name: 'Sphinx', + tribe_name: tribe.name, + search_word: `${arr.slice(1, arr.length).join(' ')}`, + subscriptions, + } + const response = await fetch( + 'http://3.95.131.14:5000/prediction/query', + { + method: 'POST', + body: JSON.stringify(request), + headers: { + 'Content-Type': 'application/json', + }, + } + ) + if (response.ok) { + const parsedRes = await response.json() + let internalRes: SearchResult[] = [] + if (parsedRes.internal?.exact) { + internalRes = parsedRes.internal?.exact.slice(0, 5) + } + + let externalRes: SearchResult[] = [] + if (parsedRes.external.exact) { + externalRes = parsedRes.external?.exact.slice(0, 5) + } + let returnMsg = '' + for (let i = 0; i < internalRes.length; i++) { + const result = internalRes[i] + returnMsg = `${returnMsg} ${result?.description} from ${result?.show_title} \n` + } + for (let i = 0; i < externalRes.length; i++) { + const result = externalRes[i] + returnMsg = `${returnMsg} ${result.description} from ${result.show_title} \n` + } + if (!returnMsg) { + returnMsg = 'No result found for your search' + } + const resEmbed = new Sphinx.MessageEmbed() + .setAuthor('SearchBot') + .setDescription(returnMsg) + message.channel.send({ embed: resEmbed }) + return + } else { + const resEmbed = new Sphinx.MessageEmbed() + .setAuthor('SearchBot') + .setDescription( + `Sorry seems there is an issue with your internal private graph ${response.status}` + ) + message.channel.send({ embed: resEmbed }) + return + } + case 'graph': + } + } catch (error) { + sphinxLogger.error(`SEARCH BOT ERROR ${error}`, logging.Bots) + } + }) +} + +export async function settleLsat(graphs: GraphSubscriptionRecord[]) { + const newGraphs: { + client_name: string + prediction_endpoint: string + lsat: string + }[] = [] + for (let i = 0; i < graphs.length; i++) { + const graph = graphs[i] + const lsat = (await models.Lsat.findOne({ + where: { paths: graph.address, status: 1 }, + })) as Lsat + const obj = { + client_name: graph.name, + prediction_endpoint: graph.address, + lsat: lsat ? `LSAT ${lsat.macaroon}:${lsat.preimage}` : '', + } + newGraphs.push(obj) + } + return newGraphs +} From 974c2dde662b40134e7136dfa232905a857c9122 Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Wed, 18 Jan 2023 22:39:22 +0100 Subject: [PATCH 06/14] feat: use search bot to add graph subscription --- dist/src/builtin/search.js | 35 ++++++++++++++++++++++------- dist/src/builtin/search.js.map | 2 +- src/builtin/search.ts | 40 ++++++++++++++++++++++++++-------- 3 files changed, 59 insertions(+), 18 deletions(-) diff --git a/dist/src/builtin/search.js b/dist/src/builtin/search.js index 3839fb48d..fbcb2e3d2 100644 --- a/dist/src/builtin/search.js +++ b/dist/src/builtin/search.js @@ -40,11 +40,12 @@ function init() { switch (cmd) { case 'search': const graphs = (yield models_1.models.GraphSubscription.findAll()); - const subscriptions = yield settleLsat(graphs); + const searchWord = `${arr.slice(1, arr.length).join(' ')}`; + const subscriptions = yield settleLsat(graphs, searchWord); const request = { company_name: 'Sphinx', tribe_name: tribe.name, - search_word: `${arr.slice(1, arr.length).join(' ')}`, + search_word: searchWord, subscriptions, }; const response = yield (0, node_fetch_1.default)('http://3.95.131.14:5000/prediction/query', { @@ -90,6 +91,22 @@ function init() { return; } case 'graph': + if (arr.length !== 4) + return; + const name = arr[2]; + const address = arr[3]; + yield models_1.models.GraphSubscription.create({ + name, + address, + status: 1, + tenant: message.member.id, + chatIds: JSON.stringify([tribe.id]), + }); + const resEmbed = new Sphinx.MessageEmbed() + .setAuthor('SearchBot') + .setDescription(`Graph Subscription was added successfully`); + message.channel.send({ embed: resEmbed }); + return; } } catch (error) { @@ -98,18 +115,20 @@ function init() { })); } exports.init = init; -function settleLsat(graphs) { +function settleLsat(graphs, word) { return __awaiter(this, void 0, void 0, function* () { const newGraphs = []; for (let i = 0; i < graphs.length; i++) { const graph = graphs[i]; - const lsat = (yield models_1.models.Lsat.findOne({ - where: { paths: graph.address, status: 1 }, - })); + // const lsat = (await models.Lsat.findOne({ + // where: { paths: graph.address, status: 1 }, + // })) as Lsat const obj = { client_name: graph.name, - prediction_endpoint: graph.address, - lsat: lsat ? `LSAT ${lsat.macaroon}:${lsat.preimage}` : '', + prediction_endpoint: `${graph.address}?word=${word}`, + //Correct Implementation + // lsat: lsat ? `LSAT ${lsat.macaroon}:${lsat.preimage}` : '', + lsat: `LSAT AgEba25vd2xlZGdlLWdyYXBoLnNwaGlueC5jaGF0AoQBMDAwMGMzN2QzNjI0NTM3YmVkY2UxZThmYTdmM2Y5ZmVkNDYyMTU2MWJiMmJmODY2YWMzYjMzZmM1NDVjNmY3NjE3NzFhZWU5YmZlYzljOTRhMDI2MDU5ZWZlMzk2MTllNDVkY2Q1YWQ5OWI1Y2JjZDA4MzdlNDUzMjM5OGNiMmQyNjFiAAAGIIB-8uA1VZ5gb1rNaRjjFPfBqlF16JnnQd1fK-VuwebL:cb8779ec0e386c62acc88c409f0730707e643e306678b15018676177c7d336f9`, }; newGraphs.push(obj); } diff --git a/dist/src/builtin/search.js.map b/dist/src/builtin/search.js.map index 00cf525db..ba78ae809 100644 --- a/dist/src/builtin/search.js.map +++ b/dist/src/builtin/search.js.map @@ -1 +1 @@ -{"version":3,"file":"search.js","sourceRoot":"","sources":["../../../src/builtin/search.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"search.js","sourceRoot":"","sources":["../../../src/builtin/search.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/builtin/search.ts b/src/builtin/search.ts index c9a4f794a..a9e3318c2 100644 --- a/src/builtin/search.ts +++ b/src/builtin/search.ts @@ -1,7 +1,7 @@ import * as Sphinx from 'sphinx-bot' import { sphinxLogger, logging } from '../utils/logger' import { finalAction } from '../controllers/botapi' -import { models, ChatRecord, GraphSubscriptionRecord, Lsat } from '../models' +import { models, ChatRecord, GraphSubscriptionRecord } from '../models' import fetch from 'node-fetch' const msg_types = Sphinx.MSG_TYPE @@ -35,11 +35,12 @@ export function init() { case 'search': const graphs = (await models.GraphSubscription.findAll()) as GraphSubscriptionRecord[] - const subscriptions = await settleLsat(graphs) + const searchWord = `${arr.slice(1, arr.length).join(' ')}` + const subscriptions = await settleLsat(graphs, searchWord) const request = { company_name: 'Sphinx', tribe_name: tribe.name, - search_word: `${arr.slice(1, arr.length).join(' ')}`, + search_word: searchWord, subscriptions, } const response = await fetch( @@ -90,6 +91,22 @@ export function init() { return } case 'graph': + if (arr.length !== 4) return + const name = arr[2] + const address = arr[3] + + await models.GraphSubscription.create({ + name, + address, + status: 1, + tenant: message.member.id, + chatIds: JSON.stringify([tribe.id]), + }) + const resEmbed = new Sphinx.MessageEmbed() + .setAuthor('SearchBot') + .setDescription(`Graph Subscription was added successfully`) + message.channel.send({ embed: resEmbed }) + return } } catch (error) { sphinxLogger.error(`SEARCH BOT ERROR ${error}`, logging.Bots) @@ -97,7 +114,10 @@ export function init() { }) } -export async function settleLsat(graphs: GraphSubscriptionRecord[]) { +export async function settleLsat( + graphs: GraphSubscriptionRecord[], + word: string +) { const newGraphs: { client_name: string prediction_endpoint: string @@ -105,13 +125,15 @@ export async function settleLsat(graphs: GraphSubscriptionRecord[]) { }[] = [] for (let i = 0; i < graphs.length; i++) { const graph = graphs[i] - const lsat = (await models.Lsat.findOne({ - where: { paths: graph.address, status: 1 }, - })) as Lsat + // const lsat = (await models.Lsat.findOne({ + // where: { paths: graph.address, status: 1 }, + // })) as Lsat const obj = { client_name: graph.name, - prediction_endpoint: graph.address, - lsat: lsat ? `LSAT ${lsat.macaroon}:${lsat.preimage}` : '', + prediction_endpoint: `${graph.address}?word=${word}`, + //Correct Implementation + // lsat: lsat ? `LSAT ${lsat.macaroon}:${lsat.preimage}` : '', + lsat: `LSAT AgEba25vd2xlZGdlLWdyYXBoLnNwaGlueC5jaGF0AoQBMDAwMGMzN2QzNjI0NTM3YmVkY2UxZThmYTdmM2Y5ZmVkNDYyMTU2MWJiMmJmODY2YWMzYjMzZmM1NDVjNmY3NjE3NzFhZWU5YmZlYzljOTRhMDI2MDU5ZWZlMzk2MTllNDVkY2Q1YWQ5OWI1Y2JjZDA4MzdlNDUzMjM5OGNiMmQyNjFiAAAGIIB-8uA1VZ5gb1rNaRjjFPfBqlF16JnnQd1fK-VuwebL:cb8779ec0e386c62acc88c409f0730707e643e306678b15018676177c7d336f9`, } newGraphs.push(obj) } From ca6b76702ee08841cc87dfc5c6318534c8f34b6d Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Wed, 18 Jan 2023 23:29:35 +0100 Subject: [PATCH 07/14] fix: logging to get bot response --- dist/src/builtin/search.js | 7 ++++--- dist/src/builtin/search.js.map | 2 +- src/builtin/search.ts | 3 ++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dist/src/builtin/search.js b/dist/src/builtin/search.js index fbcb2e3d2..e8c3a5e3e 100644 --- a/dist/src/builtin/search.js +++ b/dist/src/builtin/search.js @@ -24,7 +24,7 @@ function init() { const client = new Sphinx.Client(); client.login('_', botapi_1.finalAction); client.on(msg_types.MESSAGE, (message) => __awaiter(this, void 0, void 0, function* () { - var _a, _b, _c; + var _a, _b, _c, _d; if (!message.content) return; const arr = message.content.split(' '); @@ -57,13 +57,14 @@ function init() { }); if (response.ok) { const parsedRes = yield response.json(); + console.log(parsedRes); let internalRes = []; if ((_a = parsedRes.internal) === null || _a === void 0 ? void 0 : _a.exact) { internalRes = (_b = parsedRes.internal) === null || _b === void 0 ? void 0 : _b.exact.slice(0, 5); } let externalRes = []; - if (parsedRes.external.exact) { - externalRes = (_c = parsedRes.external) === null || _c === void 0 ? void 0 : _c.exact.slice(0, 5); + if ((_c = parsedRes.external) === null || _c === void 0 ? void 0 : _c.exact) { + externalRes = (_d = parsedRes.external) === null || _d === void 0 ? void 0 : _d.exact.slice(0, 5); } let returnMsg = ''; for (let i = 0; i < internalRes.length; i++) { diff --git a/dist/src/builtin/search.js.map b/dist/src/builtin/search.js.map index ba78ae809..e01e5daca 100644 --- a/dist/src/builtin/search.js.map +++ b/dist/src/builtin/search.js.map @@ -1 +1 @@ -{"version":3,"file":"search.js","sourceRoot":"","sources":["../../../src/builtin/search.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"search.js","sourceRoot":"","sources":["../../../src/builtin/search.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/builtin/search.ts b/src/builtin/search.ts index a9e3318c2..f349eace3 100644 --- a/src/builtin/search.ts +++ b/src/builtin/search.ts @@ -55,13 +55,14 @@ export function init() { ) if (response.ok) { const parsedRes = await response.json() + console.log(parsedRes) let internalRes: SearchResult[] = [] if (parsedRes.internal?.exact) { internalRes = parsedRes.internal?.exact.slice(0, 5) } let externalRes: SearchResult[] = [] - if (parsedRes.external.exact) { + if (parsedRes.external?.exact) { externalRes = parsedRes.external?.exact.slice(0, 5) } let returnMsg = '' From c94249a286f31b7aa6a28ad0d41a034f85b56c29 Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Wed, 18 Jan 2023 23:44:25 +0100 Subject: [PATCH 08/14] removed console log --- dist/src/builtin/search.js | 1 - dist/src/builtin/search.js.map | 2 +- src/builtin/search.ts | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dist/src/builtin/search.js b/dist/src/builtin/search.js index e8c3a5e3e..3a4902cb3 100644 --- a/dist/src/builtin/search.js +++ b/dist/src/builtin/search.js @@ -57,7 +57,6 @@ function init() { }); if (response.ok) { const parsedRes = yield response.json(); - console.log(parsedRes); let internalRes = []; if ((_a = parsedRes.internal) === null || _a === void 0 ? void 0 : _a.exact) { internalRes = (_b = parsedRes.internal) === null || _b === void 0 ? void 0 : _b.exact.slice(0, 5); diff --git a/dist/src/builtin/search.js.map b/dist/src/builtin/search.js.map index e01e5daca..3fa86fb0d 100644 --- a/dist/src/builtin/search.js.map +++ b/dist/src/builtin/search.js.map @@ -1 +1 @@ -{"version":3,"file":"search.js","sourceRoot":"","sources":["../../../src/builtin/search.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"search.js","sourceRoot":"","sources":["../../../src/builtin/search.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/builtin/search.ts b/src/builtin/search.ts index f349eace3..46f6294a7 100644 --- a/src/builtin/search.ts +++ b/src/builtin/search.ts @@ -55,7 +55,6 @@ export function init() { ) if (response.ok) { const parsedRes = await response.json() - console.log(parsedRes) let internalRes: SearchResult[] = [] if (parsedRes.internal?.exact) { internalRes = parsedRes.internal?.exact.slice(0, 5) From 5796f7213b0d008041b75abc96f1c3680d5bda11 Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Thu, 19 Jan 2023 01:05:59 +0100 Subject: [PATCH 09/14] fix: added private graph url to config --- dist/src/builtin/search.js | 4 +++- dist/src/builtin/search.js.map | 2 +- dist/src/utils/config.js | 2 ++ dist/src/utils/config.js.map | 2 +- src/builtin/search.ts | 5 ++++- src/utils/config.ts | 2 ++ 6 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dist/src/builtin/search.js b/dist/src/builtin/search.js index 3a4902cb3..c37d348cd 100644 --- a/dist/src/builtin/search.js +++ b/dist/src/builtin/search.js @@ -15,8 +15,10 @@ const logger_1 = require("../utils/logger"); const botapi_1 = require("../controllers/botapi"); const models_1 = require("../models"); const node_fetch_1 = require("node-fetch"); +const config_1 = require("../utils/config"); const msg_types = Sphinx.MSG_TYPE; let initted = false; +const config = (0, config_1.loadConfig)(); function init() { if (initted) return; @@ -48,7 +50,7 @@ function init() { search_word: searchWord, subscriptions, }; - const response = yield (0, node_fetch_1.default)('http://3.95.131.14:5000/prediction/query', { + const response = yield (0, node_fetch_1.default)(`${config.private_graph}/prediction/query`, { method: 'POST', body: JSON.stringify(request), headers: { diff --git a/dist/src/builtin/search.js.map b/dist/src/builtin/search.js.map index 3fa86fb0d..400e844dc 100644 --- a/dist/src/builtin/search.js.map +++ b/dist/src/builtin/search.js.map @@ -1 +1 @@ -{"version":3,"file":"search.js","sourceRoot":"","sources":["../../../src/builtin/search.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"search.js","sourceRoot":"","sources":["../../../src/builtin/search.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/src/utils/config.js b/dist/src/utils/config.js index 45e475d33..6cdfd5059 100644 --- a/dist/src/utils/config.js +++ b/dist/src/utils/config.js @@ -26,6 +26,7 @@ const DEFAULT_TRANSPORT_PUBLIC_KEY_LOCATION = './creds/transportTokenPublicKey.p const DEFAULT_TRANSPORT_PRIVATE_KEY_LOCATION = './creds/transportTokenPrivateKey.pem'; const DEFAULT_LENGTH_DELAY_FOR_TRANSPORT_TOKEN_DB_CLEARING = 1; const DEFAULT_BOLTWALL_SERVER = 'http://host.docker.internal:8444'; +const DEFAULT_PRIVATE_GRAPH = 'http://3.95.131.14:5000'; function loadConfig() { const logg = ENV.LOGGING || config.logging; const provider = ENV.LIGHTNING_PROVIDER || config.lightning_provider || 'LND'; @@ -108,6 +109,7 @@ function loadConfig() { config.length_of_time_for_transport_token_clear || DEFAULT_LENGTH_DELAY_FOR_TRANSPORT_TOKEN_DB_CLEARING, boltwall_server: config.boltwall_server || DEFAULT_BOLTWALL_SERVER, + private_graph: DEFAULT_PRIVATE_GRAPH, }; } exports.loadConfig = loadConfig; diff --git a/dist/src/utils/config.js.map b/dist/src/utils/config.js.map index 39be81867..acd1f79bc 100644 --- a/dist/src/utils/config.js.map +++ b/dist/src/utils/config.js.map @@ -1 +1 @@ -{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/utils/config.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/utils/config.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/builtin/search.ts b/src/builtin/search.ts index 46f6294a7..a9f41aaac 100644 --- a/src/builtin/search.ts +++ b/src/builtin/search.ts @@ -3,6 +3,7 @@ import { sphinxLogger, logging } from '../utils/logger' import { finalAction } from '../controllers/botapi' import { models, ChatRecord, GraphSubscriptionRecord } from '../models' import fetch from 'node-fetch' +import { loadConfig } from '../utils/config' const msg_types = Sphinx.MSG_TYPE @@ -13,6 +14,8 @@ interface SearchResult { show_title: string } +const config = loadConfig() + export function init() { if (initted) return initted = true @@ -44,7 +47,7 @@ export function init() { subscriptions, } const response = await fetch( - 'http://3.95.131.14:5000/prediction/query', + `${config.private_graph}/prediction/query`, { method: 'POST', body: JSON.stringify(request), diff --git a/src/utils/config.ts b/src/utils/config.ts index 0b2701a7d..8c5f3bc2a 100644 --- a/src/utils/config.ts +++ b/src/utils/config.ts @@ -32,6 +32,7 @@ const DEFAULT_TRANSPORT_PRIVATE_KEY_LOCATION = './creds/transportTokenPrivateKey.pem' const DEFAULT_LENGTH_DELAY_FOR_TRANSPORT_TOKEN_DB_CLEARING = 1 const DEFAULT_BOLTWALL_SERVER = 'http://host.docker.internal:8444' +const DEFAULT_PRIVATE_GRAPH = 'http://3.95.131.14:5000' export function loadConfig() { const logg = ENV.LOGGING || config.logging @@ -134,5 +135,6 @@ export function loadConfig() { config.length_of_time_for_transport_token_clear || DEFAULT_LENGTH_DELAY_FOR_TRANSPORT_TOKEN_DB_CLEARING, boltwall_server: config.boltwall_server || DEFAULT_BOLTWALL_SERVER, + private_graph: DEFAULT_PRIVATE_GRAPH, } } From 94b9f091f7245873fccea55500fc7a156796044e Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Thu, 19 Jan 2023 20:58:08 +0100 Subject: [PATCH 10/14] feat: graph subscription chat model created --- dist/src/models/sql/graphSubscription.js | 4 -- dist/src/models/sql/graphSubscription.js.map | 2 +- dist/src/models/sql/graphSubscriptionChat.js | 44 +++++++++++++++++++ .../models/sql/graphSubscriptionChat.js.map | 1 + dist/src/utils/migrate.js | 18 +++++++- dist/src/utils/migrate.js.map | 2 +- src/models/sql/graphSubscription.ts | 4 -- src/models/sql/graphSubscriptionChat.ts | 28 ++++++++++++ src/utils/migrate.ts | 18 +++++++- 9 files changed, 107 insertions(+), 14 deletions(-) create mode 100644 dist/src/models/sql/graphSubscriptionChat.js create mode 100644 dist/src/models/sql/graphSubscriptionChat.js.map create mode 100644 src/models/sql/graphSubscriptionChat.ts diff --git a/dist/src/models/sql/graphSubscription.js b/dist/src/models/sql/graphSubscription.js index 6331b60a1..6d1b961ce 100644 --- a/dist/src/models/sql/graphSubscription.js +++ b/dist/src/models/sql/graphSubscription.js @@ -37,10 +37,6 @@ __decorate([ sequelize_typescript_1.Column, __metadata("design:type", Number) ], GraphSubscription.prototype, "status", void 0); -__decorate([ - sequelize_typescript_1.Column, - __metadata("design:type", String) -], GraphSubscription.prototype, "chatIds", void 0); __decorate([ sequelize_typescript_1.Column, __metadata("design:type", Number) diff --git a/dist/src/models/sql/graphSubscription.js.map b/dist/src/models/sql/graphSubscription.js.map index 5d2206597..93ae55837 100644 --- a/dist/src/models/sql/graphSubscription.js.map +++ b/dist/src/models/sql/graphSubscription.js.map @@ -1 +1 @@ -{"version":3,"file":"graphSubscription.js","sourceRoot":"","sources":["../../../../src/models/sql/graphSubscription.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAAqE;AAGrE,IAAqB,iBAAiB,GAAtC,MAAqB,iBAAkB,SAAQ,4BAAwB;CAkCtE,CAAA;AA3BC;IANC,IAAA,6BAAM,EAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,MAAM;QACrB,UAAU,EAAE,IAAI;QAChB,MAAM,EAAE,IAAI;QACZ,aAAa,EAAE,IAAI;KACpB,CAAC;;6CACQ;AAGV;IADC,IAAA,6BAAM,EAAC,+BAAQ,CAAC,IAAI,CAAC;;+CACV;AAGZ;IADC,6BAAM;;kDACQ;AAGf;IADC,IAAA,6BAAM,EAAC,+BAAQ,CAAC,IAAI,CAAC;;iDACR;AAId;IADC,6BAAM;;iDACO;AAId;IADC,6BAAM;;kDACQ;AAGf;IADC,6BAAM;;iDACO;AAGd;IADC,6BAAM;8BACI,IAAI;oDAAA;AAGf;IADC,6BAAM;8BACI,IAAI;oDAAA;AAjCI,iBAAiB;IADrC,IAAA,4BAAK,EAAC,EAAE,SAAS,EAAE,2BAA2B,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC;GAChD,iBAAiB,CAkCrC;kBAlCoB,iBAAiB"} \ No newline at end of file +{"version":3,"file":"graphSubscription.js","sourceRoot":"","sources":["../../../../src/models/sql/graphSubscription.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAAqE;AAGrE,IAAqB,iBAAiB,GAAtC,MAAqB,iBAAkB,SAAQ,4BAAwB;CA8BtE,CAAA;AAvBC;IANC,IAAA,6BAAM,EAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,MAAM;QACrB,UAAU,EAAE,IAAI;QAChB,MAAM,EAAE,IAAI;QACZ,aAAa,EAAE,IAAI;KACpB,CAAC;;6CACQ;AAGV;IADC,IAAA,6BAAM,EAAC,+BAAQ,CAAC,IAAI,CAAC;;+CACV;AAGZ;IADC,6BAAM;;kDACQ;AAGf;IADC,IAAA,6BAAM,EAAC,+BAAQ,CAAC,IAAI,CAAC;;iDACR;AAId;IADC,6BAAM;;iDACO;AAGd;IADC,6BAAM;;iDACO;AAGd;IADC,6BAAM;8BACI,IAAI;oDAAA;AAGf;IADC,6BAAM;8BACI,IAAI;oDAAA;AA7BI,iBAAiB;IADrC,IAAA,4BAAK,EAAC,EAAE,SAAS,EAAE,2BAA2B,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC;GAChD,iBAAiB,CA8BrC;kBA9BoB,iBAAiB"} \ No newline at end of file diff --git a/dist/src/models/sql/graphSubscriptionChat.js b/dist/src/models/sql/graphSubscriptionChat.js new file mode 100644 index 000000000..09721b6bb --- /dev/null +++ b/dist/src/models/sql/graphSubscriptionChat.js @@ -0,0 +1,44 @@ +"use strict"; +var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { + var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d; + if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc); + else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r; + return c > 3 && r && Object.defineProperty(target, key, r), r; +}; +var __metadata = (this && this.__metadata) || function (k, v) { + if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v); +}; +Object.defineProperty(exports, "__esModule", { value: true }); +const sequelize_typescript_1 = require("sequelize-typescript"); +let GraphSubscriptionChat = class GraphSubscriptionChat extends sequelize_typescript_1.Model { +}; +__decorate([ + (0, sequelize_typescript_1.Column)({ + type: sequelize_typescript_1.DataType.BIGINT, + primaryKey: true, + unique: true, + autoIncrement: true, + }), + __metadata("design:type", Number) +], GraphSubscriptionChat.prototype, "id", void 0); +__decorate([ + (0, sequelize_typescript_1.Column)(sequelize_typescript_1.DataType.BIGINT), + __metadata("design:type", Number) +], GraphSubscriptionChat.prototype, "graphSubscriptionId", void 0); +__decorate([ + (0, sequelize_typescript_1.Column)(sequelize_typescript_1.DataType.BIGINT), + __metadata("design:type", Number) +], GraphSubscriptionChat.prototype, "chatId", void 0); +__decorate([ + sequelize_typescript_1.Column, + __metadata("design:type", Date) +], GraphSubscriptionChat.prototype, "createdAt", void 0); +__decorate([ + sequelize_typescript_1.Column, + __metadata("design:type", Date) +], GraphSubscriptionChat.prototype, "updatedAt", void 0); +GraphSubscriptionChat = __decorate([ + (0, sequelize_typescript_1.Table)({ tableName: 'sphinx_graph_subscription_chat', underscored: true }) +], GraphSubscriptionChat); +exports.default = GraphSubscriptionChat; +//# sourceMappingURL=graphSubscriptionChat.js.map \ No newline at end of file diff --git a/dist/src/models/sql/graphSubscriptionChat.js.map b/dist/src/models/sql/graphSubscriptionChat.js.map new file mode 100644 index 000000000..6d2a08ae8 --- /dev/null +++ b/dist/src/models/sql/graphSubscriptionChat.js.map @@ -0,0 +1 @@ +{"version":3,"file":"graphSubscriptionChat.js","sourceRoot":"","sources":["../../../../src/models/sql/graphSubscriptionChat.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAAqE;AAGrE,IAAqB,qBAAqB,GAA1C,MAAqB,qBAAsB,SAAQ,4BAA4B;CAoB9E,CAAA;AAbC;IANC,IAAA,6BAAM,EAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,MAAM;QACrB,UAAU,EAAE,IAAI;QAChB,MAAM,EAAE,IAAI;QACZ,aAAa,EAAE,IAAI;KACpB,CAAC;;iDACQ;AAGV;IADC,IAAA,6BAAM,EAAC,+BAAQ,CAAC,MAAM,CAAC;;kEACG;AAG3B;IADC,IAAA,6BAAM,EAAC,+BAAQ,CAAC,MAAM,CAAC;;qDACV;AAGd;IADC,6BAAM;8BACI,IAAI;wDAAA;AAGf;IADC,6BAAM;8BACI,IAAI;wDAAA;AAnBI,qBAAqB;IADzC,IAAA,4BAAK,EAAC,EAAE,SAAS,EAAE,gCAAgC,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC;GACrD,qBAAqB,CAoBzC;kBApBoB,qBAAqB"} \ No newline at end of file diff --git a/dist/src/utils/migrate.js b/dist/src/utils/migrate.js index 835b03157..c5f355769 100644 --- a/dist/src/utils/migrate.js +++ b/dist/src/utils/migrate.js @@ -292,13 +292,27 @@ function migrate() { address TEXT, weight TEXT, status INTEGER, - tenant INTEGER, - chat_ids TEXT + tenant INTEGER )`); } catch (e) { // sphinxLogger.error(['problem adding graph subscription table:', e.message], logging.DB) } + // add graph subscription chat table + try { + logger_1.sphinxLogger.info('adding graph subscription chat table', logger_1.logging.DB); + yield models_1.sequelize.query(` + CREATE TABLE sphinx_graph_subscription_chat ( + id BIGINT NOT NULL PRIMARY KEY, + chat_id BIGINT, + graph_subscription_id BIGINT, + created_at DATETIME, + updated_at DATETIME + )`); + } + catch (e) { + // sphinxLogger.error(['problem adding graph subscription chat table:', e.message], logging.DB) + } }); } exports.default = migrate; diff --git a/dist/src/utils/migrate.js.map b/dist/src/utils/migrate.js.map index 27bf09ad0..50e28fa64 100644 --- a/dist/src/utils/migrate.js.map +++ b/dist/src/utils/migrate.js.map @@ -1 +1 @@ -{"version":3,"file":"migrate.js","sourceRoot":"","sources":["../../../src/utils/migrate.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"migrate.js","sourceRoot":"","sources":["../../../src/utils/migrate.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/models/sql/graphSubscription.ts b/src/models/sql/graphSubscription.ts index 8e945ce3e..e5eac1353 100644 --- a/src/models/sql/graphSubscription.ts +++ b/src/models/sql/graphSubscription.ts @@ -23,10 +23,6 @@ export default class GraphSubscription extends Model { @Column status: number - // The value of this could be ALL or an Array of tribes IDs - @Column - chatIds: string - @Column tenant: number diff --git a/src/models/sql/graphSubscriptionChat.ts b/src/models/sql/graphSubscriptionChat.ts new file mode 100644 index 000000000..c8fa7c85d --- /dev/null +++ b/src/models/sql/graphSubscriptionChat.ts @@ -0,0 +1,28 @@ +import { Table, Column, Model, DataType } from 'sequelize-typescript' + +@Table({ tableName: 'sphinx_graph_subscription_chat', underscored: true }) +export default class GraphSubscriptionChat extends Model { + @Column({ + type: DataType.BIGINT, + primaryKey: true, + unique: true, + autoIncrement: true, + }) + id: number + + @Column(DataType.BIGINT) + graphSubscriptionId: number + + @Column(DataType.BIGINT) + chatId: number + + @Column + createdAt: Date + + @Column + updatedAt: Date +} + +export interface GraphSubscriptionChatRecord extends GraphSubscriptionChat { + dataValues: GraphSubscriptionChat +} diff --git a/src/utils/migrate.ts b/src/utils/migrate.ts index 4534b5d76..faf79a4c5 100644 --- a/src/utils/migrate.ts +++ b/src/utils/migrate.ts @@ -317,12 +317,26 @@ export default async function migrate(): Promise { address TEXT, weight TEXT, status INTEGER, - tenant INTEGER, - chat_ids TEXT + tenant INTEGER )`) } catch (e) { // sphinxLogger.error(['problem adding graph subscription table:', e.message], logging.DB) } + + // add graph subscription chat table + try { + sphinxLogger.info('adding graph subscription chat table', logging.DB) + await sequelize.query(` + CREATE TABLE sphinx_graph_subscription_chat ( + id BIGINT NOT NULL PRIMARY KEY, + chat_id BIGINT, + graph_subscription_id BIGINT, + created_at DATETIME, + updated_at DATETIME + )`) + } catch (e) { + // sphinxLogger.error(['problem adding graph subscription chat table:', e.message], logging.DB) + } } async function addTenant(tableName) { From 152938fae3da959eb89416d7ef1784c3ff5d10ef Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Thu, 19 Jan 2023 23:10:00 +0100 Subject: [PATCH 11/14] update: added login for subscription table --- dist/src/controllers/graphSubscription.js | 39 +++++++++++++---- dist/src/controllers/graphSubscription.js.map | 2 +- dist/src/models/index.js | 5 ++- dist/src/models/index.js.map | 2 +- dist/src/models/sql/graphSubscriptionChat.js | 2 +- .../models/sql/graphSubscriptionChat.js.map | 2 +- dist/src/utils/migrate.js | 4 +- src/controllers/graphSubscription.ts | 42 +++++++++++++++---- src/models/index.ts | 6 +++ src/models/sql/graphSubscriptionChat.ts | 2 +- src/utils/migrate.ts | 4 +- 11 files changed, 84 insertions(+), 26 deletions(-) diff --git a/dist/src/controllers/graphSubscription.js b/dist/src/controllers/graphSubscription.js index 1370f8635..3d687f7e3 100644 --- a/dist/src/controllers/graphSubscription.js +++ b/dist/src/controllers/graphSubscription.js @@ -18,7 +18,8 @@ function addGraphSubscription(req, res) { if (!req.owner) return (0, res_1.failure)(res, 'no owner'); const tenant = req.owner.id; - logger_1.sphinxLogger.info(`=> saveLsat`, logger_1.logging.Express); + const owner = req.owner; + logger_1.sphinxLogger.info(`=> saveGraphSubscription`, logger_1.logging.Express); const { name, address, weight, status } = req.body; let { chatIds } = req.body; if (!name || !address || !weight) { @@ -30,18 +31,42 @@ function addGraphSubscription(req, res) { if (chatIds !== 'all' && !Array.isArray(chatIds)) { return (0, res_1.failure)(res, 'Provide valid tribe Id'); } - if (Array.isArray(chatIds)) { - chatIds = JSON.stringify(chatIds); - } try { - yield models_1.models.GraphSubscription.create({ + const graph = (yield models_1.models.GraphSubscription.create({ name, address, weight, status, - chatIds, tenant, - }); + })); + if (Array.isArray(chatIds)) { + for (let i = 0; i < chatIds.length; i++) { + const chatId = Number(chatIds[i]); + if (!isNaN(chatId)) { + const chat = (yield models_1.models.Chat.findOne({ + where: { id: chatId }, + })); + if (chat && chat.ownerPubkey === owner.publicKey) { + yield models_1.models.GraphSubscriptionChat.create({ + chatId: chat.id, + subscriptionId: graph.id, + }); + } + } + } + } + else if (chatIds === 'all') { + const chats = (yield models_1.models.Chat.findAll({ + where: { ownerPubkey: owner.publicKey }, + })); + for (let i = 0; i < chats.length; i++) { + const chat = chats[i]; + yield models_1.models.GraphSubscriptionChat.create({ + chatId: chat.id, + subscriptionId: graph.id, + }); + } + } return (0, res_1.success)(res, 'Graph Subscription added successfully'); } catch (error) { diff --git a/dist/src/controllers/graphSubscription.js.map b/dist/src/controllers/graphSubscription.js.map index 88b6e1b3d..e5f935208 100644 --- a/dist/src/controllers/graphSubscription.js.map +++ b/dist/src/controllers/graphSubscription.js.map @@ -1 +1 @@ -{"version":3,"file":"graphSubscription.js","sourceRoot":"","sources":["../../../src/controllers/graphSubscription.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"graphSubscription.js","sourceRoot":"","sources":["../../../src/controllers/graphSubscription.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,sCAA6E;AAG7E,sCAA+C;AAC/C,4CAAuD;AAEvD,SAAsB,oBAAoB,CACxC,GAAQ,EACR,GAAa;;QAEb,IAAI,CAAC,GAAG,CAAC,KAAK;YAAE,OAAO,IAAA,aAAO,EAAC,GAAG,EAAE,UAAU,CAAC,CAAA;QAC/C,MAAM,MAAM,GAAW,GAAG,CAAC,KAAK,CAAC,EAAE,CAAA;QACnC,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAA;QAEvB,qBAAY,CAAC,IAAI,CAAC,0BAA0B,EAAE,gBAAO,CAAC,OAAO,CAAC,CAAA;QAE9D,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,GAAG,CAAC,IAAI,CAAA;QAClD,IAAI,EAAE,OAAO,EAAE,GAAG,GAAG,CAAC,IAAI,CAAA;QAC1B,IAAI,CAAC,IAAI,IAAI,CAAC,OAAO,IAAI,CAAC,MAAM,EAAE;YAChC,OAAO,IAAA,aAAO,EAAC,GAAG,EAAE,0CAA0C,CAAC,CAAA;SAChE;QAED,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,GAAG,CAAC,EAAE;YAC5C,OAAO,IAAA,aAAO,EAAC,GAAG,EAAE,4BAA4B,CAAC,CAAA;SAClD;QAED,IAAI,OAAO,KAAK,KAAK,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;YAChD,OAAO,IAAA,aAAO,EAAC,GAAG,EAAE,wBAAwB,CAAC,CAAA;SAC9C;QAED,IAAI;YACF,MAAM,KAAK,GAAG,CAAC,MAAM,eAAM,CAAC,iBAAiB,CAAC,MAAM,CAAC;gBACnD,IAAI;gBACJ,OAAO;gBACP,MAAM;gBACN,MAAM;gBACN,MAAM;aACP,CAAC,CAA4B,CAAA;YAE9B,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;gBAC1B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;oBACvC,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAA;oBACjC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE;wBAClB,MAAM,IAAI,GAAG,CAAC,MAAM,eAAM,CAAC,IAAI,CAAC,OAAO,CAAC;4BACtC,KAAK,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE;yBACtB,CAAC,CAAe,CAAA;wBACjB,IAAI,IAAI,IAAI,IAAI,CAAC,WAAW,KAAK,KAAK,CAAC,SAAS,EAAE;4BAChD,MAAM,eAAM,CAAC,qBAAqB,CAAC,MAAM,CAAC;gCACxC,MAAM,EAAE,IAAI,CAAC,EAAE;gCACf,cAAc,EAAE,KAAK,CAAC,EAAE;6BACzB,CAAC,CAAA;yBACH;qBACF;iBACF;aACF;iBAAM,IAAI,OAAO,KAAK,KAAK,EAAE;gBAC5B,MAAM,KAAK,GAAG,CAAC,MAAM,eAAM,CAAC,IAAI,CAAC,OAAO,CAAC;oBACvC,KAAK,EAAE,EAAE,WAAW,EAAE,KAAK,CAAC,SAAS,EAAE;iBACxC,CAAC,CAAiB,CAAA;gBACnB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;oBACrC,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAA;oBACrB,MAAM,eAAM,CAAC,qBAAqB,CAAC,MAAM,CAAC;wBACxC,MAAM,EAAE,IAAI,CAAC,EAAE;wBACf,cAAc,EAAE,KAAK,CAAC,EAAE;qBACzB,CAAC,CAAA;iBACH;aACF;YACD,OAAO,IAAA,aAAO,EAAC,GAAG,EAAE,uCAAuC,CAAC,CAAA;SAC7D;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;YAClB,OAAO,IAAA,aAAO,EAAC,GAAG,EAAE,2BAA2B,CAAC,CAAA;SACjD;IACH,CAAC;CAAA;AAjED,oDAiEC;AAED,SAAsB,oBAAoB,CACxC,GAAQ,EACR,GAAa;;QAEb,IAAI,CAAC,GAAG,CAAC,KAAK;YAAE,OAAO,IAAA,aAAO,EAAC,GAAG,EAAE,UAAU,CAAC,CAAA;QAC/C,IAAI;YACF,MAAM,MAAM,GACV,CAAC,MAAM,eAAM,CAAC,iBAAiB,CAAC,OAAO,EAAE,CAA8B,CAAA;YAEzE,MAAM,SAAS,GAIT,EAAE,CAAA;YACR,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBACtC,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAA;gBACvB,MAAM,IAAI,GAAG,CAAC,MAAM,eAAM,CAAC,IAAI,CAAC,OAAO,CAAC;oBACtC,KAAK,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC,EAAE;iBAC3C,CAAC,CAAS,CAAA;gBACX,MAAM,GAAG,GAAG;oBACV,WAAW,EAAE,KAAK,CAAC,IAAI;oBACvB,mBAAmB,EAAE,KAAK,CAAC,OAAO;oBAClC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE;iBACtD,CAAA;gBACD,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;aACpB;YACD,OAAO,IAAA,aAAO,EAAC,GAAG,EAAE,SAAS,CAAC,CAAA;SAC/B;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;YAClB,OAAO,IAAA,aAAO,EAAC,GAAG,EAAE,2BAA2B,CAAC,CAAA;SACjD;IACH,CAAC;CAAA;AA/BD,oDA+BC"} \ No newline at end of file diff --git a/dist/src/models/index.js b/dist/src/models/index.js index 312e43ecd..f95bc6483 100644 --- a/dist/src/models/index.js +++ b/dist/src/models/index.js @@ -1,6 +1,6 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.GraphSubscription = exports.CallRecording = exports.ActionHistory = exports.RequestsTransportTokens = exports.BotMember = exports.Lsat = exports.MediaKey = exports.Accounting = exports.Bot = exports.Timer = exports.ChatBot = exports.Subscription = exports.Invite = exports.ChatMember = exports.Message = exports.Chat = exports.Contact = exports.models = exports.sequelize = void 0; +exports.GraphSubscriptionChat = exports.GraphSubscription = exports.CallRecording = exports.ActionHistory = exports.RequestsTransportTokens = exports.BotMember = exports.Lsat = exports.MediaKey = exports.Accounting = exports.Bot = exports.Timer = exports.ChatBot = exports.Subscription = exports.Invite = exports.ChatMember = exports.Message = exports.Chat = exports.Contact = exports.models = exports.sequelize = void 0; // parse BIGINTs to number const pg = require("pg"); pg.defaults.parseInt8 = true; @@ -44,6 +44,8 @@ const callRecording_1 = require("./sql/callRecording"); exports.CallRecording = callRecording_1.default; const graphSubscription_1 = require("./sql/graphSubscription"); exports.GraphSubscription = graphSubscription_1.default; +const graphSubscriptionChat_1 = require("./sql/graphSubscriptionChat"); +exports.GraphSubscriptionChat = graphSubscriptionChat_1.default; const argv = minimist(process.argv.slice(2)); const configFile = argv.db ? path.resolve(process.cwd(), argv.db) @@ -80,6 +82,7 @@ const opts = Object.assign(Object.assign({}, config), { logging: appConfig.sql_l actionHistory_1.default, callRecording_1.default, graphSubscription_1.default, + graphSubscriptionChat_1.default, ] }); if ((0, proxy_1.isProxy)()) { opts.pool = { diff --git a/dist/src/models/index.js.map b/dist/src/models/index.js.map index 612662910..e99fb7d98 100644 --- a/dist/src/models/index.js.map +++ b/dist/src/models/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/models/index.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/models/index.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/src/models/sql/graphSubscriptionChat.js b/dist/src/models/sql/graphSubscriptionChat.js index 09721b6bb..33f0d5758 100644 --- a/dist/src/models/sql/graphSubscriptionChat.js +++ b/dist/src/models/sql/graphSubscriptionChat.js @@ -24,7 +24,7 @@ __decorate([ __decorate([ (0, sequelize_typescript_1.Column)(sequelize_typescript_1.DataType.BIGINT), __metadata("design:type", Number) -], GraphSubscriptionChat.prototype, "graphSubscriptionId", void 0); +], GraphSubscriptionChat.prototype, "subscriptionId", void 0); __decorate([ (0, sequelize_typescript_1.Column)(sequelize_typescript_1.DataType.BIGINT), __metadata("design:type", Number) diff --git a/dist/src/models/sql/graphSubscriptionChat.js.map b/dist/src/models/sql/graphSubscriptionChat.js.map index 6d2a08ae8..f687f8dd7 100644 --- a/dist/src/models/sql/graphSubscriptionChat.js.map +++ b/dist/src/models/sql/graphSubscriptionChat.js.map @@ -1 +1 @@ -{"version":3,"file":"graphSubscriptionChat.js","sourceRoot":"","sources":["../../../../src/models/sql/graphSubscriptionChat.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAAqE;AAGrE,IAAqB,qBAAqB,GAA1C,MAAqB,qBAAsB,SAAQ,4BAA4B;CAoB9E,CAAA;AAbC;IANC,IAAA,6BAAM,EAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,MAAM;QACrB,UAAU,EAAE,IAAI;QAChB,MAAM,EAAE,IAAI;QACZ,aAAa,EAAE,IAAI;KACpB,CAAC;;iDACQ;AAGV;IADC,IAAA,6BAAM,EAAC,+BAAQ,CAAC,MAAM,CAAC;;kEACG;AAG3B;IADC,IAAA,6BAAM,EAAC,+BAAQ,CAAC,MAAM,CAAC;;qDACV;AAGd;IADC,6BAAM;8BACI,IAAI;wDAAA;AAGf;IADC,6BAAM;8BACI,IAAI;wDAAA;AAnBI,qBAAqB;IADzC,IAAA,4BAAK,EAAC,EAAE,SAAS,EAAE,gCAAgC,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC;GACrD,qBAAqB,CAoBzC;kBApBoB,qBAAqB"} \ No newline at end of file +{"version":3,"file":"graphSubscriptionChat.js","sourceRoot":"","sources":["../../../../src/models/sql/graphSubscriptionChat.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAAqE;AAGrE,IAAqB,qBAAqB,GAA1C,MAAqB,qBAAsB,SAAQ,4BAA4B;CAoB9E,CAAA;AAbC;IANC,IAAA,6BAAM,EAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,MAAM;QACrB,UAAU,EAAE,IAAI;QAChB,MAAM,EAAE,IAAI;QACZ,aAAa,EAAE,IAAI;KACpB,CAAC;;iDACQ;AAGV;IADC,IAAA,6BAAM,EAAC,+BAAQ,CAAC,MAAM,CAAC;;6DACF;AAGtB;IADC,IAAA,6BAAM,EAAC,+BAAQ,CAAC,MAAM,CAAC;;qDACV;AAGd;IADC,6BAAM;8BACI,IAAI;wDAAA;AAGf;IADC,6BAAM;8BACI,IAAI;wDAAA;AAnBI,qBAAqB;IADzC,IAAA,4BAAK,EAAC,EAAE,SAAS,EAAE,gCAAgC,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC;GACrD,qBAAqB,CAoBzC;kBApBoB,qBAAqB"} \ No newline at end of file diff --git a/dist/src/utils/migrate.js b/dist/src/utils/migrate.js index c5f355769..dc7aa4de9 100644 --- a/dist/src/utils/migrate.js +++ b/dist/src/utils/migrate.js @@ -303,9 +303,9 @@ function migrate() { logger_1.sphinxLogger.info('adding graph subscription chat table', logger_1.logging.DB); yield models_1.sequelize.query(` CREATE TABLE sphinx_graph_subscription_chat ( - id BIGINT NOT NULL PRIMARY KEY, + id BIGINT NOT NULL PRIMARY KEY AUTOINCREMENT, chat_id BIGINT, - graph_subscription_id BIGINT, + subscription_id BIGINT, created_at DATETIME, updated_at DATETIME )`); diff --git a/src/controllers/graphSubscription.ts b/src/controllers/graphSubscription.ts index f35754ec3..a299a43ae 100644 --- a/src/controllers/graphSubscription.ts +++ b/src/controllers/graphSubscription.ts @@ -1,4 +1,4 @@ -import { GraphSubscriptionRecord, models, Lsat } from '../models' +import { GraphSubscriptionRecord, models, Lsat, ChatRecord } from '../models' import { Req } from '../types' import { Response } from 'express' import { failure, success } from '../utils/res' @@ -10,8 +10,9 @@ export async function addGraphSubscription( ): Promise { if (!req.owner) return failure(res, 'no owner') const tenant: number = req.owner.id + const owner = req.owner - sphinxLogger.info(`=> saveLsat`, logging.Express) + sphinxLogger.info(`=> saveGraphSubscription`, logging.Express) const { name, address, weight, status } = req.body let { chatIds } = req.body @@ -27,19 +28,42 @@ export async function addGraphSubscription( return failure(res, 'Provide valid tribe Id') } - if (Array.isArray(chatIds)) { - chatIds = JSON.stringify(chatIds) - } - try { - await models.GraphSubscription.create({ + const graph = (await models.GraphSubscription.create({ name, address, weight, status, - chatIds, tenant, - }) + })) as GraphSubscriptionRecord + + if (Array.isArray(chatIds)) { + for (let i = 0; i < chatIds.length; i++) { + const chatId = Number(chatIds[i]) + if (!isNaN(chatId)) { + const chat = (await models.Chat.findOne({ + where: { id: chatId }, + })) as ChatRecord + if (chat && chat.ownerPubkey === owner.publicKey) { + await models.GraphSubscriptionChat.create({ + chatId: chat.id, + subscriptionId: graph.id, + }) + } + } + } + } else if (chatIds === 'all') { + const chats = (await models.Chat.findAll({ + where: { ownerPubkey: owner.publicKey }, + })) as ChatRecord[] + for (let i = 0; i < chats.length; i++) { + const chat = chats[i] + await models.GraphSubscriptionChat.create({ + chatId: chat.id, + subscriptionId: graph.id, + }) + } + } return success(res, 'Graph Subscription added successfully') } catch (error) { console.log(error) diff --git a/src/models/index.ts b/src/models/index.ts index 9d7b0d2eb..09444a543 100644 --- a/src/models/index.ts +++ b/src/models/index.ts @@ -26,6 +26,9 @@ import CallRecording, { CallRecordingRecord } from './sql/callRecording' import GraphSubscription, { GraphSubscriptionRecord, } from './sql/graphSubscription' +import GraphSubscriptionChat, { + GraphSubscriptionChatRecord, +} from './sql/graphSubscriptionChat' const argv = minimist(process.argv.slice(2)) @@ -70,6 +73,7 @@ const opts = { ActionHistory, CallRecording, GraphSubscription, + GraphSubscriptionChat, ], } if (isProxy()) { @@ -117,4 +121,6 @@ export { CallRecordingRecord, GraphSubscription, GraphSubscriptionRecord, + GraphSubscriptionChat, + GraphSubscriptionChatRecord, } diff --git a/src/models/sql/graphSubscriptionChat.ts b/src/models/sql/graphSubscriptionChat.ts index c8fa7c85d..521b267a3 100644 --- a/src/models/sql/graphSubscriptionChat.ts +++ b/src/models/sql/graphSubscriptionChat.ts @@ -11,7 +11,7 @@ export default class GraphSubscriptionChat extends Model id: number @Column(DataType.BIGINT) - graphSubscriptionId: number + subscriptionId: number @Column(DataType.BIGINT) chatId: number diff --git a/src/utils/migrate.ts b/src/utils/migrate.ts index faf79a4c5..b0c6385dd 100644 --- a/src/utils/migrate.ts +++ b/src/utils/migrate.ts @@ -328,9 +328,9 @@ export default async function migrate(): Promise { sphinxLogger.info('adding graph subscription chat table', logging.DB) await sequelize.query(` CREATE TABLE sphinx_graph_subscription_chat ( - id BIGINT NOT NULL PRIMARY KEY, + id BIGINT NOT NULL PRIMARY KEY AUTOINCREMENT, chat_id BIGINT, - graph_subscription_id BIGINT, + subscription_id BIGINT, created_at DATETIME, updated_at DATETIME )`) From 944ac5e8cd016f3143dced9acf38defe5d217aab Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Fri, 20 Jan 2023 00:33:03 +0100 Subject: [PATCH 12/14] feat: get graph subscriptions by tribe --- dist/src/controllers/graphSubscription.js | 47 +++++++++++++- dist/src/controllers/graphSubscription.js.map | 2 +- dist/src/controllers/index.js | 1 + dist/src/controllers/index.js.map | 2 +- src/controllers/graphSubscription.ts | 62 ++++++++++++++++++- src/controllers/index.ts | 1 + 6 files changed, 107 insertions(+), 8 deletions(-) diff --git a/dist/src/controllers/graphSubscription.js b/dist/src/controllers/graphSubscription.js index 3d687f7e3..20588fbce 100644 --- a/dist/src/controllers/graphSubscription.js +++ b/dist/src/controllers/graphSubscription.js @@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }); }; Object.defineProperty(exports, "__esModule", { value: true }); -exports.getGraphSubscription = exports.addGraphSubscription = void 0; +exports.getGraphSubscriptionForTribe = exports.getGraphSubscription = exports.addGraphSubscription = void 0; const models_1 = require("../models"); const res_1 = require("../utils/res"); const logger_1 = require("../utils/logger"); @@ -70,7 +70,7 @@ function addGraphSubscription(req, res) { return (0, res_1.success)(res, 'Graph Subscription added successfully'); } catch (error) { - console.log(error); + logger_1.sphinxLogger.error(`=> saveGraphSubscription error: ${error}`, logger_1.logging.Express); return (0, res_1.failure)(res, 'An internal error occured'); } }); @@ -98,10 +98,51 @@ function getGraphSubscription(req, res) { return (0, res_1.success)(res, newGraphs); } catch (error) { - console.log(error); + logger_1.sphinxLogger.error(`=> getGraphSubscription error: ${error}`, logger_1.logging.Express); return (0, res_1.failure)(res, 'An internal error occured'); } }); } exports.getGraphSubscription = getGraphSubscription; +function getGraphSubscriptionForTribe(req, res) { + return __awaiter(this, void 0, void 0, function* () { + if (!req.owner) + return (0, res_1.failure)(res, 'no owner'); + const { id } = req.params; + if (!id) + return (0, res_1.failure)(res, 'Provide valid tribe id'); + try { + // const tribe = await models.Chat.findOne({ where: { id: tribeId } }) + const tribe = (yield models_1.models.Chat.findOne({ + where: { id }, + })); + if (!tribe) + return (0, res_1.failure)(res, 'Tribe does not exist'); + const results = (yield models_1.sequelize.query(` + SELECT * FROM sphinx_graph_subscription_chat + INNER JOIN sphinx_graph_subscription + ON sphinx_graph_subscription_chat.subscription_id = sphinx_graph_subscription.id + WHERE sphinx_graph_subscription_chat.chat_id = ${id}`, { + model: models_1.models.GraphSubscription, + mapToModel: true, // pass true here if you have any mapped fields + })); + const finalRes = []; + for (let i = 0; i < results.length; i++) { + const result = results[i]; + const obj = { + name: result.name, + address: result.address, + weight: result.weight, + }; + finalRes.push(obj); + } + return (0, res_1.success)(res, finalRes); + } + catch (error) { + logger_1.sphinxLogger.error(`=> getGraphSubscriptionForTribe error: ${error}`, logger_1.logging.Express); + return (0, res_1.failure)(res, 'An internal error occured'); + } + }); +} +exports.getGraphSubscriptionForTribe = getGraphSubscriptionForTribe; //# sourceMappingURL=graphSubscription.js.map \ No newline at end of file diff --git a/dist/src/controllers/graphSubscription.js.map b/dist/src/controllers/graphSubscription.js.map index e5f935208..647dcde12 100644 --- a/dist/src/controllers/graphSubscription.js.map +++ b/dist/src/controllers/graphSubscription.js.map @@ -1 +1 @@ -{"version":3,"file":"graphSubscription.js","sourceRoot":"","sources":["../../../src/controllers/graphSubscription.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"graphSubscription.js","sourceRoot":"","sources":["../../../src/controllers/graphSubscription.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/src/controllers/index.js b/dist/src/controllers/index.js index 61744bc10..cd9fc1626 100644 --- a/dist/src/controllers/index.js +++ b/dist/src/controllers/index.js @@ -177,6 +177,7 @@ function set(app) { // Graph Subscription app.post('/addGraph', graphSubscription.addGraphSubscription); app.get('/getGraph', graphSubscription.getGraphSubscription); + app.get('/getGraphTribe/:id', graphSubscription.getGraphSubscriptionForTribe); }); } exports.set = set; diff --git a/dist/src/controllers/index.js.map b/dist/src/controllers/index.js.map index 6711d3874..a1b793c82 100644 --- a/dist/src/controllers/index.js.map +++ b/dist/src/controllers/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/controllers/index.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/controllers/index.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/controllers/graphSubscription.ts b/src/controllers/graphSubscription.ts index a299a43ae..ea71db9ba 100644 --- a/src/controllers/graphSubscription.ts +++ b/src/controllers/graphSubscription.ts @@ -1,4 +1,10 @@ -import { GraphSubscriptionRecord, models, Lsat, ChatRecord } from '../models' +import { + GraphSubscriptionRecord, + models, + Lsat, + ChatRecord, + sequelize, +} from '../models' import { Req } from '../types' import { Response } from 'express' import { failure, success } from '../utils/res' @@ -66,7 +72,10 @@ export async function addGraphSubscription( } return success(res, 'Graph Subscription added successfully') } catch (error) { - console.log(error) + sphinxLogger.error( + `=> saveGraphSubscription error: ${error}`, + logging.Express + ) return failure(res, 'An internal error occured') } } @@ -99,7 +108,54 @@ export async function getGraphSubscription( } return success(res, newGraphs) } catch (error) { - console.log(error) + sphinxLogger.error( + `=> getGraphSubscription error: ${error}`, + logging.Express + ) + return failure(res, 'An internal error occured') + } +} + +export async function getGraphSubscriptionForTribe( + req: Req, + res: Response +): Promise { + if (!req.owner) return failure(res, 'no owner') + const { id } = req.params + if (!id) return failure(res, 'Provide valid tribe id') + try { + // const tribe = await models.Chat.findOne({ where: { id: tribeId } }) + const tribe = (await models.Chat.findOne({ + where: { id }, + })) as ChatRecord + if (!tribe) return failure(res, 'Tribe does not exist') + const results = (await sequelize.query( + ` + SELECT * FROM sphinx_graph_subscription_chat + INNER JOIN sphinx_graph_subscription + ON sphinx_graph_subscription_chat.subscription_id = sphinx_graph_subscription.id + WHERE sphinx_graph_subscription_chat.chat_id = ${id}`, + { + model: models.GraphSubscription, + mapToModel: true, // pass true here if you have any mapped fields + } + )) as GraphSubscriptionRecord[] + const finalRes: { name: string; address: string; weight: string }[] = [] + for (let i = 0; i < results.length; i++) { + const result = results[i] + const obj = { + name: result.name, + address: result.address, + weight: result.weight, + } + finalRes.push(obj) + } + return success(res, finalRes) + } catch (error) { + sphinxLogger.error( + `=> getGraphSubscriptionForTribe error: ${error}`, + logging.Express + ) return failure(res, 'An internal error occured') } } diff --git a/src/controllers/index.ts b/src/controllers/index.ts index 2feca40c5..a39367f2e 100644 --- a/src/controllers/index.ts +++ b/src/controllers/index.ts @@ -194,6 +194,7 @@ export async function set(app) { // Graph Subscription app.post('/addGraph', graphSubscription.addGraphSubscription) app.get('/getGraph', graphSubscription.getGraphSubscription) + app.get('/getGraphTribe/:id', graphSubscription.getGraphSubscriptionForTribe) } const msgtypes = constants.message_types From d4ceb021b6a12dbff23ea0b0ab266d3d4b9f6202 Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Fri, 20 Jan 2023 00:39:45 +0100 Subject: [PATCH 13/14] refactor: refactored the code a little --- dist/src/controllers/graphSubscription.js | 10 ++----- dist/src/controllers/graphSubscription.js.map | 2 +- dist/src/utils/graphSubscription.js | 28 +++++++++++++++++++ dist/src/utils/graphSubscription.js.map | 1 + src/controllers/graphSubscription.ts | 21 ++------------ src/utils/graphSubscription.ts | 16 +++++++++++ 6 files changed, 51 insertions(+), 27 deletions(-) create mode 100644 dist/src/utils/graphSubscription.js create mode 100644 dist/src/utils/graphSubscription.js.map create mode 100644 src/utils/graphSubscription.ts diff --git a/dist/src/controllers/graphSubscription.js b/dist/src/controllers/graphSubscription.js index 20588fbce..85c3e1768 100644 --- a/dist/src/controllers/graphSubscription.js +++ b/dist/src/controllers/graphSubscription.js @@ -13,6 +13,7 @@ exports.getGraphSubscriptionForTribe = exports.getGraphSubscription = exports.ad const models_1 = require("../models"); const res_1 = require("../utils/res"); const logger_1 = require("../utils/logger"); +const graphSubscription_1 = require("../utils/graphSubscription"); function addGraphSubscription(req, res) { return __awaiter(this, void 0, void 0, function* () { if (!req.owner) @@ -118,14 +119,7 @@ function getGraphSubscriptionForTribe(req, res) { })); if (!tribe) return (0, res_1.failure)(res, 'Tribe does not exist'); - const results = (yield models_1.sequelize.query(` - SELECT * FROM sphinx_graph_subscription_chat - INNER JOIN sphinx_graph_subscription - ON sphinx_graph_subscription_chat.subscription_id = sphinx_graph_subscription.id - WHERE sphinx_graph_subscription_chat.chat_id = ${id}`, { - model: models_1.models.GraphSubscription, - mapToModel: true, // pass true here if you have any mapped fields - })); + const results = yield (0, graphSubscription_1.graphQuery)(id); const finalRes = []; for (let i = 0; i < results.length; i++) { const result = results[i]; diff --git a/dist/src/controllers/graphSubscription.js.map b/dist/src/controllers/graphSubscription.js.map index 647dcde12..3fb505a82 100644 --- a/dist/src/controllers/graphSubscription.js.map +++ b/dist/src/controllers/graphSubscription.js.map @@ -1 +1 @@ -{"version":3,"file":"graphSubscription.js","sourceRoot":"","sources":["../../../src/controllers/graphSubscription.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,sCAMkB;AAGlB,sCAA+C;AAC/C,4CAAuD;AAEvD,SAAsB,oBAAoB,CACxC,GAAQ,EACR,GAAa;;QAEb,IAAI,CAAC,GAAG,CAAC,KAAK;YAAE,OAAO,IAAA,aAAO,EAAC,GAAG,EAAE,UAAU,CAAC,CAAA;QAC/C,MAAM,MAAM,GAAW,GAAG,CAAC,KAAK,CAAC,EAAE,CAAA;QACnC,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAA;QAEvB,qBAAY,CAAC,IAAI,CAAC,0BAA0B,EAAE,gBAAO,CAAC,OAAO,CAAC,CAAA;QAE9D,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,GAAG,CAAC,IAAI,CAAA;QAClD,IAAI,EAAE,OAAO,EAAE,GAAG,GAAG,CAAC,IAAI,CAAA;QAC1B,IAAI,CAAC,IAAI,IAAI,CAAC,OAAO,IAAI,CAAC,MAAM,EAAE;YAChC,OAAO,IAAA,aAAO,EAAC,GAAG,EAAE,0CAA0C,CAAC,CAAA;SAChE;QAED,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,GAAG,CAAC,EAAE;YAC5C,OAAO,IAAA,aAAO,EAAC,GAAG,EAAE,4BAA4B,CAAC,CAAA;SAClD;QAED,IAAI,OAAO,KAAK,KAAK,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;YAChD,OAAO,IAAA,aAAO,EAAC,GAAG,EAAE,wBAAwB,CAAC,CAAA;SAC9C;QAED,IAAI;YACF,MAAM,KAAK,GAAG,CAAC,MAAM,eAAM,CAAC,iBAAiB,CAAC,MAAM,CAAC;gBACnD,IAAI;gBACJ,OAAO;gBACP,MAAM;gBACN,MAAM;gBACN,MAAM;aACP,CAAC,CAA4B,CAAA;YAE9B,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;gBAC1B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;oBACvC,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAA;oBACjC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE;wBAClB,MAAM,IAAI,GAAG,CAAC,MAAM,eAAM,CAAC,IAAI,CAAC,OAAO,CAAC;4BACtC,KAAK,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE;yBACtB,CAAC,CAAe,CAAA;wBACjB,IAAI,IAAI,IAAI,IAAI,CAAC,WAAW,KAAK,KAAK,CAAC,SAAS,EAAE;4BAChD,MAAM,eAAM,CAAC,qBAAqB,CAAC,MAAM,CAAC;gCACxC,MAAM,EAAE,IAAI,CAAC,EAAE;gCACf,cAAc,EAAE,KAAK,CAAC,EAAE;6BACzB,CAAC,CAAA;yBACH;qBACF;iBACF;aACF;iBAAM,IAAI,OAAO,KAAK,KAAK,EAAE;gBAC5B,MAAM,KAAK,GAAG,CAAC,MAAM,eAAM,CAAC,IAAI,CAAC,OAAO,CAAC;oBACvC,KAAK,EAAE,EAAE,WAAW,EAAE,KAAK,CAAC,SAAS,EAAE;iBACxC,CAAC,CAAiB,CAAA;gBACnB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;oBACrC,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAA;oBACrB,MAAM,eAAM,CAAC,qBAAqB,CAAC,MAAM,CAAC;wBACxC,MAAM,EAAE,IAAI,CAAC,EAAE;wBACf,cAAc,EAAE,KAAK,CAAC,EAAE;qBACzB,CAAC,CAAA;iBACH;aACF;YACD,OAAO,IAAA,aAAO,EAAC,GAAG,EAAE,uCAAuC,CAAC,CAAA;SAC7D;QAAC,OAAO,KAAK,EAAE;YACd,qBAAY,CAAC,KAAK,CAChB,mCAAmC,KAAK,EAAE,EAC1C,gBAAO,CAAC,OAAO,CAChB,CAAA;YACD,OAAO,IAAA,aAAO,EAAC,GAAG,EAAE,2BAA2B,CAAC,CAAA;SACjD;IACH,CAAC;CAAA;AApED,oDAoEC;AAED,SAAsB,oBAAoB,CACxC,GAAQ,EACR,GAAa;;QAEb,IAAI,CAAC,GAAG,CAAC,KAAK;YAAE,OAAO,IAAA,aAAO,EAAC,GAAG,EAAE,UAAU,CAAC,CAAA;QAC/C,IAAI;YACF,MAAM,MAAM,GACV,CAAC,MAAM,eAAM,CAAC,iBAAiB,CAAC,OAAO,EAAE,CAA8B,CAAA;YAEzE,MAAM,SAAS,GAIT,EAAE,CAAA;YACR,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBACtC,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAA;gBACvB,MAAM,IAAI,GAAG,CAAC,MAAM,eAAM,CAAC,IAAI,CAAC,OAAO,CAAC;oBACtC,KAAK,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC,EAAE;iBAC3C,CAAC,CAAS,CAAA;gBACX,MAAM,GAAG,GAAG;oBACV,WAAW,EAAE,KAAK,CAAC,IAAI;oBACvB,mBAAmB,EAAE,KAAK,CAAC,OAAO;oBAClC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE;iBACtD,CAAA;gBACD,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;aACpB;YACD,OAAO,IAAA,aAAO,EAAC,GAAG,EAAE,SAAS,CAAC,CAAA;SAC/B;QAAC,OAAO,KAAK,EAAE;YACd,qBAAY,CAAC,KAAK,CAChB,kCAAkC,KAAK,EAAE,EACzC,gBAAO,CAAC,OAAO,CAChB,CAAA;YACD,OAAO,IAAA,aAAO,EAAC,GAAG,EAAE,2BAA2B,CAAC,CAAA;SACjD;IACH,CAAC;CAAA;AAlCD,oDAkCC;AAED,SAAsB,4BAA4B,CAChD,GAAQ,EACR,GAAa;;QAEb,IAAI,CAAC,GAAG,CAAC,KAAK;YAAE,OAAO,IAAA,aAAO,EAAC,GAAG,EAAE,UAAU,CAAC,CAAA;QAC/C,MAAM,EAAE,EAAE,EAAE,GAAG,GAAG,CAAC,MAAM,CAAA;QACzB,IAAI,CAAC,EAAE;YAAE,OAAO,IAAA,aAAO,EAAC,GAAG,EAAE,wBAAwB,CAAC,CAAA;QACtD,IAAI;YACF,sEAAsE;YACtE,MAAM,KAAK,GAAG,CAAC,MAAM,eAAM,CAAC,IAAI,CAAC,OAAO,CAAC;gBACvC,KAAK,EAAE,EAAE,EAAE,EAAE;aACd,CAAC,CAAe,CAAA;YACjB,IAAI,CAAC,KAAK;gBAAE,OAAO,IAAA,aAAO,EAAC,GAAG,EAAE,sBAAsB,CAAC,CAAA;YACvD,MAAM,OAAO,GAAG,CAAC,MAAM,kBAAS,CAAC,KAAK,CACpC;;;;uDAIiD,EAAE,EAAE,EACrD;gBACE,KAAK,EAAE,eAAM,CAAC,iBAAiB;gBAC/B,UAAU,EAAE,IAAI,EAAE,+CAA+C;aAClE,CACF,CAA8B,CAAA;YAC/B,MAAM,QAAQ,GAAwD,EAAE,CAAA;YACxE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBACvC,MAAM,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAAA;gBACzB,MAAM,GAAG,GAAG;oBACV,IAAI,EAAE,MAAM,CAAC,IAAI;oBACjB,OAAO,EAAE,MAAM,CAAC,OAAO;oBACvB,MAAM,EAAE,MAAM,CAAC,MAAM;iBACtB,CAAA;gBACD,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;aACnB;YACD,OAAO,IAAA,aAAO,EAAC,GAAG,EAAE,QAAQ,CAAC,CAAA;SAC9B;QAAC,OAAO,KAAK,EAAE;YACd,qBAAY,CAAC,KAAK,CAChB,0CAA0C,KAAK,EAAE,EACjD,gBAAO,CAAC,OAAO,CAChB,CAAA;YACD,OAAO,IAAA,aAAO,EAAC,GAAG,EAAE,2BAA2B,CAAC,CAAA;SACjD;IACH,CAAC;CAAA;AA1CD,oEA0CC"} \ No newline at end of file +{"version":3,"file":"graphSubscription.js","sourceRoot":"","sources":["../../../src/controllers/graphSubscription.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/src/utils/graphSubscription.js b/dist/src/utils/graphSubscription.js new file mode 100644 index 000000000..7993dafa9 --- /dev/null +++ b/dist/src/utils/graphSubscription.js @@ -0,0 +1,28 @@ +"use strict"; +var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { + function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } + return new (P || (P = Promise))(function (resolve, reject) { + function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } + function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } + function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } + step((generator = generator.apply(thisArg, _arguments || [])).next()); + }); +}; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.graphQuery = void 0; +const models_1 = require("../models"); +function graphQuery(id) { + return __awaiter(this, void 0, void 0, function* () { + const results = (yield models_1.sequelize.query(` + SELECT * FROM sphinx_graph_subscription_chat + INNER JOIN sphinx_graph_subscription + ON sphinx_graph_subscription_chat.subscription_id = sphinx_graph_subscription.id + WHERE sphinx_graph_subscription_chat.chat_id = ${id}`, { + model: models_1.models.GraphSubscription, + mapToModel: true, // pass true here if you have any mapped fields + })); + return results; + }); +} +exports.graphQuery = graphQuery; +//# sourceMappingURL=graphSubscription.js.map \ No newline at end of file diff --git a/dist/src/utils/graphSubscription.js.map b/dist/src/utils/graphSubscription.js.map new file mode 100644 index 000000000..9c6de6f67 --- /dev/null +++ b/dist/src/utils/graphSubscription.js.map @@ -0,0 +1 @@ +{"version":3,"file":"graphSubscription.js","sourceRoot":"","sources":["../../../src/utils/graphSubscription.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,sCAAsE;AACtE,SAAsB,UAAU,CAAC,EAAE;;QACjC,MAAM,OAAO,GAAG,CAAC,MAAM,kBAAS,CAAC,KAAK,CACpC;;;;uDAImD,EAAE,EAAE,EACvD;YACE,KAAK,EAAE,eAAM,CAAC,iBAAiB;YAC/B,UAAU,EAAE,IAAI,EAAE,+CAA+C;SAClE,CACF,CAA8B,CAAA;QAE/B,OAAO,OAAO,CAAA;IAChB,CAAC;CAAA;AAdD,gCAcC"} \ No newline at end of file diff --git a/src/controllers/graphSubscription.ts b/src/controllers/graphSubscription.ts index ea71db9ba..98c0a56bf 100644 --- a/src/controllers/graphSubscription.ts +++ b/src/controllers/graphSubscription.ts @@ -1,14 +1,9 @@ -import { - GraphSubscriptionRecord, - models, - Lsat, - ChatRecord, - sequelize, -} from '../models' +import { GraphSubscriptionRecord, models, Lsat, ChatRecord } from '../models' import { Req } from '../types' import { Response } from 'express' import { failure, success } from '../utils/res' import { logging, sphinxLogger } from '../utils/logger' +import { graphQuery } from '../utils/graphSubscription' export async function addGraphSubscription( req: Req, @@ -129,17 +124,7 @@ export async function getGraphSubscriptionForTribe( where: { id }, })) as ChatRecord if (!tribe) return failure(res, 'Tribe does not exist') - const results = (await sequelize.query( - ` - SELECT * FROM sphinx_graph_subscription_chat - INNER JOIN sphinx_graph_subscription - ON sphinx_graph_subscription_chat.subscription_id = sphinx_graph_subscription.id - WHERE sphinx_graph_subscription_chat.chat_id = ${id}`, - { - model: models.GraphSubscription, - mapToModel: true, // pass true here if you have any mapped fields - } - )) as GraphSubscriptionRecord[] + const results = await graphQuery(id) const finalRes: { name: string; address: string; weight: string }[] = [] for (let i = 0; i < results.length; i++) { const result = results[i] diff --git a/src/utils/graphSubscription.ts b/src/utils/graphSubscription.ts new file mode 100644 index 000000000..f04b2921d --- /dev/null +++ b/src/utils/graphSubscription.ts @@ -0,0 +1,16 @@ +import { GraphSubscriptionRecord, models, sequelize } from '../models' +export async function graphQuery(id) { + const results = (await sequelize.query( + ` + SELECT * FROM sphinx_graph_subscription_chat + INNER JOIN sphinx_graph_subscription + ON sphinx_graph_subscription_chat.subscription_id = sphinx_graph_subscription.id + WHERE sphinx_graph_subscription_chat.chat_id = ${id}`, + { + model: models.GraphSubscription, + mapToModel: true, // pass true here if you have any mapped fields + } + )) as GraphSubscriptionRecord[] + + return results +} From a24eee93f2bfd16a355c620d28005224fb2299b6 Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Fri, 20 Jan 2023 00:56:23 +0100 Subject: [PATCH 14/14] update: updated the search bot how it accepts and store graph sunscriptions --- dist/src/builtin/search.js | 10 +++++++--- dist/src/builtin/search.js.map | 2 +- src/builtin/search.ts | 11 +++++++---- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/dist/src/builtin/search.js b/dist/src/builtin/search.js index c37d348cd..b9b671eb1 100644 --- a/dist/src/builtin/search.js +++ b/dist/src/builtin/search.js @@ -16,6 +16,7 @@ const botapi_1 = require("../controllers/botapi"); const models_1 = require("../models"); const node_fetch_1 = require("node-fetch"); const config_1 = require("../utils/config"); +const graphSubscription_1 = require("../utils/graphSubscription"); const msg_types = Sphinx.MSG_TYPE; let initted = false; const config = (0, config_1.loadConfig)(); @@ -41,7 +42,7 @@ function init() { })); switch (cmd) { case 'search': - const graphs = (yield models_1.models.GraphSubscription.findAll()); + const graphs = yield (0, graphSubscription_1.graphQuery)(tribe.id); const searchWord = `${arr.slice(1, arr.length).join(' ')}`; const subscriptions = yield settleLsat(graphs, searchWord); const request = { @@ -97,12 +98,15 @@ function init() { return; const name = arr[2]; const address = arr[3]; - yield models_1.models.GraphSubscription.create({ + const graph = (yield models_1.models.GraphSubscription.create({ name, address, status: 1, tenant: message.member.id, - chatIds: JSON.stringify([tribe.id]), + })); + yield models_1.models.GraphSubscriptionChat.create({ + chatId: tribe.id, + subscriptionId: graph.id, }); const resEmbed = new Sphinx.MessageEmbed() .setAuthor('SearchBot') diff --git a/dist/src/builtin/search.js.map b/dist/src/builtin/search.js.map index 400e844dc..ee52fe0d5 100644 --- a/dist/src/builtin/search.js.map +++ b/dist/src/builtin/search.js.map @@ -1 +1 @@ -{"version":3,"file":"search.js","sourceRoot":"","sources":["../../../src/builtin/search.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"search.js","sourceRoot":"","sources":["../../../src/builtin/search.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/builtin/search.ts b/src/builtin/search.ts index a9f41aaac..020dde637 100644 --- a/src/builtin/search.ts +++ b/src/builtin/search.ts @@ -4,6 +4,7 @@ import { finalAction } from '../controllers/botapi' import { models, ChatRecord, GraphSubscriptionRecord } from '../models' import fetch from 'node-fetch' import { loadConfig } from '../utils/config' +import { graphQuery } from '../utils/graphSubscription' const msg_types = Sphinx.MSG_TYPE @@ -36,8 +37,7 @@ export function init() { })) as ChatRecord switch (cmd) { case 'search': - const graphs = - (await models.GraphSubscription.findAll()) as GraphSubscriptionRecord[] + const graphs = await graphQuery(tribe.id) const searchWord = `${arr.slice(1, arr.length).join(' ')}` const subscriptions = await settleLsat(graphs, searchWord) const request = { @@ -98,12 +98,15 @@ export function init() { const name = arr[2] const address = arr[3] - await models.GraphSubscription.create({ + const graph = (await models.GraphSubscription.create({ name, address, status: 1, tenant: message.member.id, - chatIds: JSON.stringify([tribe.id]), + })) as GraphSubscriptionRecord + await models.GraphSubscriptionChat.create({ + chatId: tribe.id, + subscriptionId: graph.id, }) const resEmbed = new Sphinx.MessageEmbed() .setAuthor('SearchBot')