DOP-4414 nits

mongodb · Mar 20, 2024 · c0fe254 · c0fe254
1 parent d953ccd
commit c0fe254
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 17 deletions.
diff --git a/api/controllers/v2/github.ts b/api/controllers/v2/github.ts
@@ -41,7 +41,7 @@ async function prepGithubPushPayload(
     priority: 1,
     error: {},
     result: null,
-    payload: payload,
+    payload,
     logs: [],
   };
 }
@@ -89,9 +89,9 @@ async function createPayload({
     action = 'push';
     jobType = 'githubPush';
     branchName = githubEvent.ref.split('/')[2];
-    url = githubEvent?.repository.clone_url;
-    newHead = githubEvent?.after;
-    repoOwner = githubEvent.repository.owner.login;
+    url = githubEvent.repository?.clone_url;
+    newHead = githubEvent.after;
+    repoOwner = githubEvent.repository?.owner?.login;
   }
 
   const branchInfo = await repoBranchesRepository.getRepoBranchAliases(repoName, branchName, repoInfo.project);
@@ -154,15 +154,14 @@ export const triggerSmokeTestAutomatedBuild = async (event: APIGatewayEvent): Pr
     };
   }
 
-  if (body.workflow_run.conclusion != 'success')
-    return {
-      statusCode: 202,
-      headers: { 'Content-Type': 'text/plain' },
-      body:
-        'Build on branch ' +
-        body.workflow_run.head_branch +
-        ' is not complete and will not trigger smoke test site deployments ',
-    };
+  return {
+    statusCode: 202,
+    headers: { 'Content-Type': 'text/plain' },
+    body:
+      'Build on branch ' +
+      body.workflow_run.head_branch +
+      ' is not complete and will not trigger smoke test site deployments ',
+  };
 
   if (body.workflow_run.name != 'Deploy Staging ECS')
     return {

diff --git a/src/repositories/baseRepository.ts b/src/repositories/baseRepository.ts
@@ -71,7 +71,11 @@ export abstract class BaseRepository {
     );
   }
 
-  protected async findOne(query: any, errorMsg: string, options: mongodb.FindOptions = {}): Promise<any> {
+  protected async findOne(
+    query: any,
+    errorMsg: string,
+    options: mongodb.FindOptions = {}
+  ): Promise<mongodb.WithId<mongodb.BSON.Document> | null> {
     try {
       return await this.promiseTimeoutS(
         this._config.get('MONGO_TIMEOUT_S'),

diff --git a/src/repositories/projectsRepository.ts b/src/repositories/projectsRepository.ts
@@ -1,4 +1,4 @@
-import { Db } from 'mongodb';
+import mongodb, { Db } from 'mongodb';
 import { IConfig } from 'config';
 import { BaseRepository } from './baseRepository';
 import { ILogger } from '../services/logger';
@@ -11,7 +11,7 @@ export class ProjectsRepository extends BaseRepository {
     super(config, logger, 'ProjectsRepository', db.collection('projects'));
   }
 
-  async getProjectEntry(name: string): Promise<any> {
+  async getProjectEntry(name: string): Promise<mongodb.WithId<mongodb.BSON.Document> | null> {
     const query = { name: name };
     const projectEntry = await this.findOne(
       query,

diff --git a/src/repositories/repoEntitlementsRepository.ts b/src/repositories/repoEntitlementsRepository.ts
@@ -73,7 +73,7 @@ export class RepoEntitlementsRepository extends BaseRepository {
       `Mongo Timeout Error: Timedout while retrieving entitlements for ${slackUserId}`
     );
     // if user has specific entitlements
-    if ((entitlementsObject?.repos?.length ?? 0) > 0) {
+    if (entitlementsObject?.repos && entitlementsObject.repos.length > 0) {
       return {
         repos: entitlementsObject.repos,
         github_username: entitlementsObject.github_username,