From 26ed9b92f9842c992c181b48ce9553cb3b600542 Mon Sep 17 00:00:00 2001
From: Pavel Gnedov <pavel@gnedov.info>
Date: Mon, 18 Jul 2022 14:42:34 +0700
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D1=8B=20getDatasource=20=D0=B4=D0=BB=D1=8F=20=D0=B8?=
 =?UTF-8?q?=D1=81=D1=82=D0=BE=D1=87=D0=BD=D0=B8=D0=BA=D0=BE=D0=B2=20=D0=B4?=
 =?UTF-8?q?=D0=B0=D0=BD=D0=BD=D1=8B=D1=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 libs/event-emitter/src/couchdb-datasources/issues.ts | 11 +++++++----
 libs/event-emitter/src/couchdb-datasources/users.ts  |  9 +++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/libs/event-emitter/src/couchdb-datasources/issues.ts b/libs/event-emitter/src/couchdb-datasources/issues.ts
index c9d4ada..745131c 100644
--- a/libs/event-emitter/src/couchdb-datasources/issues.ts
+++ b/libs/event-emitter/src/couchdb-datasources/issues.ts
@@ -12,15 +12,14 @@ export class Issues {
   private static issuesDb = null;
   private static initialized = false;
 
-  static async getDatasource(): Promise<nano.DocumentScope<RedmineTypes.Issue> | null> {
+  static async getDatasource(): Promise<
+    nano.DocumentScope<RedmineTypes.Issue>
+  > {
     if (Issues.initialized) {
       return Issues.issuesDb;
     }
     Issues.initialized = true;
     const n = CouchDb.getCouchDb();
-    if (!n) {
-      return null;
-    }
     const issueDbName = config.couchDb?.dbs.issues || 'issues';
     const dbs = await n.db.list();
     if (!dbs.includes(issueDbName)) {
@@ -30,4 +29,8 @@ export class Issues {
     Issues.logger.log(`Connected to issues db - ${issueDbName}`);
     return Issues.issuesDb;
   }
+
+  async getDatasource(): Promise<nano.DocumentScope<RedmineTypes.Issue>> {
+    return await Issues.getDatasource();
+  }
 }
diff --git a/libs/event-emitter/src/couchdb-datasources/users.ts b/libs/event-emitter/src/couchdb-datasources/users.ts
index 8f06d2a..1fad236 100644
--- a/libs/event-emitter/src/couchdb-datasources/users.ts
+++ b/libs/event-emitter/src/couchdb-datasources/users.ts
@@ -12,15 +12,12 @@ export class Users {
   private static usersDb = null;
   private static initialized = false;
 
-  static async getDatasource(): Promise<nano.DocumentScope<RedmineTypes.User> | null> {
+  static async getDatasource(): Promise<nano.DocumentScope<RedmineTypes.User>> {
     if (Users.initialized) {
       return Users.usersDb;
     }
     Users.initialized = true;
     const n = CouchDb.getCouchDb();
-    if (!n) {
-      return null;
-    }
     const usersDbName = config.couchDb?.dbs.users;
     const dbs = await n.db.list();
     if (!dbs.includes(usersDbName)) {
@@ -30,4 +27,8 @@ export class Users {
     Users.logger.log(`Connected to users db - ${usersDbName}`);
     return Users.usersDb;
   }
+
+  async getDatasource(): Promise<nano.DocumentScope<RedmineTypes.User>> {
+    return await Users.getDatasource();
+  }
 }