This is an automated email from the ASF dual-hosted git repository. emotionbug pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/incubator-age-viewer.git
commit be57843590c593d2fb7c55daa245bb5a68748172 Author: Alex Kwak <[email protected]> AuthorDate: Tue Jan 4 14:14:49 2022 +0900 Modify code related to irrelevant trade names. --- backend/src/app.js | 4 ++-- .../{agcloudController.js => RemoteLoginController.js} | 4 ++-- .../agensGraphRepository.js => GraphRepository.js} | 12 ++++++------ .../src/routes/{agcloudRouter.js => remoteLoginRouter.js} | 6 +++--- backend/src/services/databaseService.js | 7 +++---- 5 files changed, 16 insertions(+), 17 deletions(-) diff --git a/backend/src/app.js b/backend/src/app.js index feddcdf..c236f82 100644 --- a/backend/src/app.js +++ b/backend/src/app.js @@ -29,7 +29,7 @@ const logger = require('morgan'); const {stream} = require('./config/winston'); const cypherRouter = require('./routes/cypherRouter'); const databaseRouter = require('./routes/databaseRouter'); -const agcloudRouter = require('./routes/agcloudRouter'); +const remoteLoginRouter = require('./routes/remoteLoginRouter'); const sessionRouter = require('./routes/sessionRouter'); const app = express(); @@ -59,7 +59,7 @@ app.use(express.json()); app.use(express.urlencoded({extended: false})); app.use(cookieParser()); -app.use('/agensviewer', sessionRouter, agcloudRouter); +app.use('/agensviewer', sessionRouter, remoteLoginRouter); app.use('/api/v1/*', sessionRouter); app.use('/api/v1/cypher', cypherRouter); app.use('/api/v1/db', databaseRouter); diff --git a/backend/src/controllers/agcloudController.js b/backend/src/controllers/RemoteLoginController.js similarity index 95% rename from backend/src/controllers/agcloudController.js rename to backend/src/controllers/RemoteLoginController.js index a1f7a3d..9969c0f 100644 --- a/backend/src/controllers/agcloudController.js +++ b/backend/src/controllers/RemoteLoginController.js @@ -22,7 +22,7 @@ const sessionService = require('../services/sessionService'); const winston = require('winston'); const logger = winston.createLogger(); -class AgcloudController { +class RemoteLoginController { async connectDatabase(req, res, next) { let databaseService = sessionService.get(req.sessionID); if (databaseService.isConnected() || !req.body) { @@ -38,4 +38,4 @@ class AgcloudController { } } -module.exports = AgcloudController; +module.exports = RemoteLoginController; diff --git a/backend/src/models/agensgraph/agensGraphRepository.js b/backend/src/models/GraphRepository.js similarity index 93% rename from backend/src/models/agensgraph/agensGraphRepository.js rename to backend/src/models/GraphRepository.js index c70a448..b53c60c 100644 --- a/backend/src/models/agensgraph/agensGraphRepository.js +++ b/backend/src/models/GraphRepository.js @@ -17,16 +17,16 @@ * under the License. */ -import Flavors from '../../config/Flavors'; -import PgConfig from '../../config/Pg' +import Flavors from '../config/Flavors'; +import PgConfig from '../config/Pg' require('@bitnine-oss/ag-driver'); import pg from 'pg'; import types from 'pg-types'; -import {setAGETypes} from '../../tools/AGEParser'; +import {setAGETypes} from '../tools/AGEParser'; -class AgensGraphRepository { +class GraphRepository { constructor({host, port, database, graph, user, password, flavor} = {}) { if (!flavor) { throw new Error('Flavor is required.'); @@ -97,7 +97,7 @@ class AgensGraphRepository { */ async getConnection() { if (!this._pool) { - this._pool = AgensGraphRepository.newConnectionPool(this.getPoolConnectionInfo()); + this._pool = GraphRepository.newConnectionPool(this.getPoolConnectionInfo()); } const client = await this._pool.connect(); if (this.flavor === 'AGE') { @@ -158,4 +158,4 @@ class AgensGraphRepository { } } -module.exports = AgensGraphRepository; +module.exports = GraphRepository; diff --git a/backend/src/routes/agcloudRouter.js b/backend/src/routes/remoteLoginRouter.js similarity index 82% rename from backend/src/routes/agcloudRouter.js rename to backend/src/routes/remoteLoginRouter.js index 60ca5f5..c99c09d 100644 --- a/backend/src/routes/agcloudRouter.js +++ b/backend/src/routes/remoteLoginRouter.js @@ -18,14 +18,14 @@ */ const express = require("express"); -const AgcloudController = require("../controllers/agcloudController"); +const RemoteLoginController = require("../controllers/RemoteLoginController"); const router = express.Router(); -const agcloudController = new AgcloudController(); +const remoteLoginController = new RemoteLoginController(); const {wrap} = require('../common/Routes'); // Execute Cypher Query -router.post("/", wrap(agcloudController.connectDatabase)); +router.post("/", wrap(remoteLoginController.connectDatabase)); module.exports = router; diff --git a/backend/src/services/databaseService.js b/backend/src/services/databaseService.js index 4cfa3d6..bb7146d 100644 --- a/backend/src/services/databaseService.js +++ b/backend/src/services/databaseService.js @@ -19,8 +19,7 @@ import {getQuery} from "../tools/SQLFlavorManager"; import * as util from "util"; - -const AgensGraphRepository = require('../models/agensgraph/agensGraphRepository'); +import GraphRepository from '../models/GraphRepository'; class DatabaseService { constructor() { @@ -97,7 +96,7 @@ class DatabaseService { async connectDatabase(connectionInfo) { let agensDatabaseHelper = this._agensDatabaseHelper; if (agensDatabaseHelper == null) { - this._agensDatabaseHelper = new AgensGraphRepository(connectionInfo); + this._agensDatabaseHelper = new GraphRepository(connectionInfo); agensDatabaseHelper = this._agensDatabaseHelper; } @@ -135,7 +134,7 @@ class DatabaseService { } try { - let client = await AgensGraphRepository.getConnection(agensDatabaseHelper.getConnectionInfo()); + let client = await GraphRepository.getConnection(agensDatabaseHelper.getConnectionInfo()); client.release(); } catch (err) { return false;
