refactor: linting and pr feedback

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

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'
 

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(`
  ███▄    █  ▒█████    ██████ ▄▄▄█████▓ ██▀███  ▓█████ ▄▄▄       ███▄ ▄███▓
  ██ ▀█   █ ▒██▒  ██▒▒██    ▒ ▓  ██▒ ▓▒▓██ ▒ ██▒▓█   ▀▒████▄    ▓██▒▀█▀ ██▒

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()

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<Setting | undefined> {
-    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<DBSetting>('configs')
       .where('key', key)
       .where('category', category)
@@ -32,7 +32,7 @@ export class SettingRepository implements ISettingRepository {
   public async getSettings(
     client: DatabaseClient = this.dbClient
   ): Promise<Setting[] | undefined> {
-    debug('get all configs');
+    debug('get all configs')
     const settings = await client<Setting>('configs')
       .select()
 

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)
+    if (SettingsStatic._instance) {
-      throw new Error("Use Singleton.instance instead of new.")
+      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
-    });
+    })
   }
 
 

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)
 

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(