From 34f4c93d9d10f64c5f2cfcf635001069a25963c3 Mon Sep 17 00:00:00 2001 From: antonleviathan Date: Sun, 12 Mar 2023 16:12:38 -0400 Subject: [PATCH] refactor: linting and pr feedback --- seeds/initial-configs.js | 2 +- src/@types/repositories.ts | 2 +- src/app/app.ts | 2 -- src/index.ts | 4 ++-- src/repositories/settings-repository.ts | 6 +++--- src/utils/settings.ts | 19 ++++++++++--------- src/utils/transform.ts | 2 +- test/integration/features/shared.ts | 2 -- 8 files changed, 18 insertions(+), 21 deletions(-) diff --git a/seeds/initial-configs.js b/seeds/initial-configs.js index 36bcf79..b1ed96b 100644 --- a/seeds/initial-configs.js +++ b/seeds/initial-configs.js @@ -85,7 +85,7 @@ const parseOneLevelDeepConfigs = (configs, category) => { console.log(keys) const flattenedConfigs = Object.keys(configs).map(key => { return { - id: uuidv5('id', NAMESPACE), + id: uuidv5('key', NAMESPACE), key, value: configs[key], category diff --git a/src/@types/repositories.ts b/src/@types/repositories.ts index bd2fc93..efa5fc6 100644 --- a/src/@types/repositories.ts +++ b/src/@types/repositories.ts @@ -2,8 +2,8 @@ import { PassThrough } from 'stream' import { DatabaseClient, EventId, Pubkey } from './base' import { DBEvent, Event } from './event' -import { Setting } from './setting' import { Invoice } from './invoice' +import { Setting } from './setting' import { SubscriptionFilter } from './subscription' import { User } from './user' diff --git a/src/app/app.ts b/src/app/app.ts index fb83a42..65a7ea9 100644 --- a/src/app/app.ts +++ b/src/app/app.ts @@ -9,7 +9,6 @@ import { IRunnable } from '../@types/base' import packageJson from '../../package.json' import { Serializable } from 'child_process' import { Settings } from '../@types/settings' -import { SettingsStatic } from '../utils/settings' const debug = createLogger('app-primary') @@ -38,7 +37,6 @@ export class App implements IRunnable { public run(): void { const settings = this.settings() - // this.watchers = SettingsStatic.watchSettings() console.log(` ███▄ █ ▒█████ ██████ ▄▄▄█████▓ ██▀███ ▓█████ ▄▄▄ ███▄ ▄███▓ ██ ▀█ █ ▒██▒ ██▒▒██ ▒ ▓ ██▒ ▓▒▓██ ▒ ██▒▓█ ▀▒████▄ ▓██▒▀█▀ ██▒ diff --git a/src/index.ts b/src/index.ts index 4fd8753..33c71e9 100644 --- a/src/index.ts +++ b/src/index.ts @@ -3,11 +3,11 @@ import dotenv from 'dotenv' dotenv.config() import { appFactory } from './factories/app-factory' +import { getMasterDbClient } from './database/client' import { maintenanceWorkerFactory } from './factories/maintenance-worker-factory' +import { SettingsStatic } from './utils/settings' import { staticMirroringWorkerFactory } from './factories/static-mirroring.worker-factory' import { workerFactory } from './factories/worker-factory' -import { getMasterDbClient } from './database/client' -import { SettingsStatic } from './utils/settings' export const getRunner = (): any => { const dbClient = getMasterDbClient() diff --git a/src/repositories/settings-repository.ts b/src/repositories/settings-repository.ts index 5f0e18b..a398a45 100644 --- a/src/repositories/settings-repository.ts +++ b/src/repositories/settings-repository.ts @@ -1,6 +1,6 @@ import { always, applySpec, omit, prop } from 'ramda' -import { Setting, DBSetting } from '../@types/setting' +import { DBSetting, Setting } from '../@types/setting' import { createLogger } from '../factories/logger-factory' import { DatabaseClient } from '../@types/base' import { fromDBSetting } from '../utils/transform' @@ -16,7 +16,7 @@ export class SettingRepository implements ISettingRepository { key: string, client: DatabaseClient = this.dbClient ): Promise { - debug('find config by key: %s and category %s', category, key); + debug('find config by key: %s and category %s', category, key) const [dbsetting] = await client('configs') .where('key', key) .where('category', category) @@ -32,7 +32,7 @@ export class SettingRepository implements ISettingRepository { public async getSettings( client: DatabaseClient = this.dbClient ): Promise { - debug('get all configs'); + debug('get all configs') const settings = await client('configs') .select() diff --git a/src/utils/settings.ts b/src/utils/settings.ts index 5e70f28..b1344c0 100644 --- a/src/utils/settings.ts +++ b/src/utils/settings.ts @@ -1,8 +1,8 @@ import { createLogger } from '../factories/logger-factory' -import { Settings } from '../@types/settings' -import { SettingRepository } from '../repositories/settings-repository' -import { Setting } from '../@types/setting' import { DatabaseClient } from '../@types/base' +import { Setting } from '../@types/setting' +import { SettingRepository } from '../repositories/settings-repository' +import { Settings } from '../@types/settings' const debug = createLogger('settings') @@ -15,10 +15,11 @@ export class SettingsStatic { constructor(dbClient: DatabaseClient) { SettingsStatic.dbClient = dbClient SettingsStatic.settingsRepository = new SettingRepository(dbClient) - if (SettingsStatic._instance) - throw new Error("Use Singleton.instance instead of new.") + if (SettingsStatic._instance) { + throw new Error('Use Singleton.instance instead of new.') + } - SettingsStatic._instance = this; + SettingsStatic._instance = this } public init() { @@ -33,7 +34,7 @@ export class SettingsStatic { } static get instance() { - return SettingsStatic._instance ?? (SettingsStatic._instance = new SettingsStatic(this.dbClient)); + return SettingsStatic._instance ?? (SettingsStatic._instance = new SettingsStatic(this.dbClient)) } private static loadSettingsFromDb(callback) { @@ -41,9 +42,9 @@ export class SettingsStatic { const promise = SettingsStatic.settingsRepository.getSettings() return promise.then(rawSettingsFromDb => { - const settingsJsonBlob = callback(rawSettingsFromDb); + const settingsJsonBlob = callback(rawSettingsFromDb) this._settings = settingsJsonBlob - }); + }) } diff --git a/src/utils/transform.ts b/src/utils/transform.ts index 01ebd10..459940f 100644 --- a/src/utils/transform.ts +++ b/src/utils/transform.ts @@ -2,8 +2,8 @@ import { always, applySpec, ifElse, is, isNil, path, pipe, prop, propSatisfies } import { bech32 } from 'bech32' import { Invoice } from '../@types/invoice' -import { User } from '../@types/user' import { Setting } from '../@types/setting' +import { User } from '../@types/user' export const toJSON = (input: any) => JSON.stringify(input) diff --git a/test/integration/features/shared.ts b/test/integration/features/shared.ts index 9568feb..3965514 100644 --- a/test/integration/features/shared.ts +++ b/test/integration/features/shared.ts @@ -11,7 +11,6 @@ import { import { assocPath, pipe } from 'ramda' import { fromEvent, map, Observable, ReplaySubject, Subject, takeUntil } from 'rxjs' import WebSocket, { MessageEvent } from 'ws' -import Sinon from 'sinon' import { connect, createIdentity, createSubscription, sendEvent } from './helpers' import { getMasterDbClient, getReadReplicaDbClient } from '../../../src/database/client' @@ -39,7 +38,6 @@ BeforeAll({ timeout: 1000 }, async function () { dbClient = getMasterDbClient() rrDbClient = getReadReplicaDbClient() await dbClient.raw('SELECT 1=1') - // Sinon.stub(SettingsStatic, 'watchSettings') const settings = SettingsStatic.createSettings() SettingsStatic._settings = pipe(