Remove unnecessary conditions found by no-unnecessary-condition lint

CarsonF · CarsonF · commit 6201bfc76475 · 2025-07-01T15:19:52.000-05:00
diff --git a/src/common/retry.ts b/src/common/retry.ts
@@ -30,13 +30,13 @@ export type RetryOptions = Merge<
 
 const parseOptions = (options: RetryOptions = {}): Options => ({
   ...options,
-  maxRetryTime: options?.maxRetryTime
+  maxRetryTime: options.maxRetryTime
     ? Duration.from(options.maxRetryTime).toMillis()
     : undefined,
-  minTimeout: options?.minTimeout
+  minTimeout: options.minTimeout
     ? Duration.from(options.minTimeout).toMillis()
     : undefined,
-  maxTimeout: options?.maxTimeout
+  maxTimeout: options.maxTimeout
     ? Duration.from(options.maxTimeout).toMillis()
     : undefined,
 });
diff --git a/src/components/authorization/policy/executor/policy-dumper.ts b/src/components/authorization/policy/executor/policy-dumper.ts
@@ -275,7 +275,7 @@ const searchResources = (
       if (isWildcard(r)) {
         return resNames.map((n) => [n, propsIn] as const);
       }
-      r = r?.replace(/[{}]/g, '');
+      r = r.replace(/[{}]/g, '');
       return csv(r).map((n) => [n, propsIn] as const);
     })
     .flatMap(([r, propsIn]) => {
diff --git a/src/components/ceremony/handlers/delete-engagement-default-ceremony.handler.ts b/src/components/ceremony/handlers/delete-engagement-default-ceremony.handler.ts
@@ -16,7 +16,7 @@ export class DetachEngagementRootDirectoryHandler
       return;
     }
 
-    const ceremonyId = engagement?.ceremony?.value?.id;
+    const ceremonyId = engagement.ceremony.value?.id;
     if (!ceremonyId) {
       return;
     }
diff --git a/src/components/engagement/engagement.repository.ts b/src/components/engagement/engagement.repository.ts
@@ -512,7 +512,7 @@ export class EngagementRepository extends CommonRepository {
                   .union()
                   .match([
                     node('project', 'Project', {
-                      id: input.filter.project?.id,
+                      id: input.filter.project.id,
                     }),
                     relation('out', '', 'engagement', INACTIVE),
                     node('node', 'Engagement'),
@@ -635,7 +635,7 @@ export class EngagementRepository extends CommonRepository {
     }
 
     const label = isInternship ? 'person' : 'language';
-    if (!result?.other) {
+    if (!result.other) {
       throw new NotFoundException(
         `Could not find ${label}`,
         `engagement.${property}Id`,
diff --git a/src/components/file/file.repository.ts b/src/components/file/file.repository.ts
@@ -119,15 +119,15 @@ export class FileRepository extends CommonRepository {
       ])
       .apply((q) => {
         const conditions: AnyConditions = {};
-        if (input?.filter?.name) {
+        if (input.filter?.name) {
           q.match([
             node('node'),
             relation('out', '', 'name', ACTIVE),
             node('name', 'Property'),
           ]);
           conditions['name.value'] = contains(input.filter.name);
         }
-        if (input?.filter?.type) {
+        if (input.filter?.type) {
           conditions.node = hasLabel(input.filter.type);
         }
         return entries(conditions).length === 0 ? q : q.where(conditions);
diff --git a/src/components/file/local-bucket.controller.ts b/src/components/file/local-bucket.controller.ts
@@ -40,7 +40,7 @@ export class LocalBucketController {
     @Request() req: IRequest,
     @Body() contents: Buffer,
   ) {
-    if (!contents || !Buffer.isBuffer(contents)) {
+    if (!Buffer.isBuffer(contents)) {
       throw new InputException();
     }
 
diff --git a/src/components/language/language.repository.ts b/src/components/language/language.repository.ts
@@ -87,7 +87,7 @@ export class LanguageRepository extends DtoRepository<
     };
 
     const ethnologueId = await this.ethnologueLanguageService.create(
-      input?.ethnologue,
+      input.ethnologue,
     );
 
     const createLanguage = this.db
diff --git a/src/components/partnership/partnership.service.ts b/src/components/partnership/partnership.service.ts
@@ -254,7 +254,7 @@ export class PartnershipService {
       return;
     }
     if (
-      !partner.financialReportingTypes.value?.includes(financialReportingType)
+      !partner.financialReportingTypes.value.includes(financialReportingType)
     ) {
       throw new InputException(
         `Partner does not have this financial reporting type available`,
diff --git a/src/components/periodic-report/handlers/abstract-periodic-report-sync.ts b/src/components/periodic-report/handlers/abstract-periodic-report-sync.ts
@@ -20,9 +20,6 @@ export abstract class AbstractPeriodicReportSync {
     },
     finalAt?: CalendarDate,
   ) {
-    if (!diff) {
-      return;
-    }
     await this.periodicReports.delete(parent, type, diff.removals);
 
     await this.periodicReports.merge({
diff --git a/src/components/pnp/extract-scripture.ts b/src/components/pnp/extract-scripture.ts
@@ -43,7 +43,7 @@ export const extractScripture = (
     // TODO I think this is a redundant check.
     // I don't think we will ever get here because the row is filtered out with
     // the isGoalRow function.
-    result?.addProblem(MismatchScriptureAndVerseCount, bookCell, {
+    result.addProblem(MismatchScriptureAndVerseCount, bookCell, {
       bookVal: bookCell.asString!,
       actualVerseCount: totalVersesInBookCol,
       declVerseCount: totalVersesCell.asNumber!,
diff --git a/src/components/progress-summary/handlers/extract-pnp-file-on-upload.handler.ts b/src/components/progress-summary/handlers/extract-pnp-file-on-upload.handler.ts
@@ -46,21 +46,21 @@ export class ExtractPnpFileOnUploadHandler {
       fileId: event.file.id,
     });
 
-    if (extracted?.cumulative) {
+    if (extracted.cumulative) {
       await this.repo.save(
         event.report,
         SummaryPeriod.Cumulative,
         extracted.cumulative,
       );
     }
-    if (extracted?.reportPeriod) {
+    if (extracted.reportPeriod) {
       await this.repo.save(
         event.report,
         SummaryPeriod.ReportPeriod,
         extracted.reportPeriod,
       );
     }
-    if (extracted?.fiscalYear) {
+    if (extracted.fiscalYear) {
       await this.repo.save(
         event.report,
         SummaryPeriod.FiscalYearSoFar,
diff --git a/src/components/project/project-member/project-member.repository.ts b/src/components/project/project-member/project-member.repository.ts
@@ -79,13 +79,13 @@ export class ProjectMemberRepository extends DtoRepository(ProjectMember) {
         'Failed to gather info for relationship verification',
       );
     }
-    if (!result?.project) {
+    if (!result.project) {
       throw new NotFoundException(
         'Could not find project',
         'projectMember.projectId',
       );
     }
-    if (!result?.user) {
+    if (!result.user) {
       throw new NotFoundException(
         'Could not find person',
         'projectMember.userId',
diff --git a/src/components/project/project.service.ts b/src/components/project/project.service.ts
@@ -225,7 +225,7 @@ export class ProjectService {
     ids: readonly ID[],
     view: ObjectView,
   ): Promise<readonly Project[]> {
-    const projects = await this.repo.readMany(ids, view?.changeset);
+    const projects = await this.repo.readMany(ids, view.changeset);
     return await Promise.all(projects.map((dto) => this.secure(dto)));
   }
 
diff --git a/src/components/scripture/book-difficulty-factor.ts b/src/components/scripture/book-difficulty-factor.ts
@@ -2,7 +2,7 @@ import { type Book, type BookName } from '@seedcompany/scripture';
 import { type BookDifficulty } from './dto';
 
 export const difficultyFactorOfBook = (book: Book): number =>
-  factorMap[difficultyOfBook(book)] ?? 0;
+  factorMap[difficultyOfBook(book)];
 
 export const difficultyOfBook = (book: Book): BookDifficulty =>
   difficultyMap[book.name];
diff --git a/src/components/search/search.repository.ts b/src/components/search/search.repository.ts
@@ -44,15 +44,10 @@ export class SearchRepository extends CommonRepository {
           // number, so we don't choke things without a limit.
           .raw('LIMIT 100'),
       )
-      .apply((q) =>
-        input.type
-          ? q
-              .with(['node', 'matchedProps'])
-              .raw('WHERE any(l in labels(node) where l in $types)', {
-                types: input.type,
-              })
-          : q,
-      )
+      .with(['node', 'matchedProps'])
+      .raw('WHERE any(l in labels(node) where l in $types)', {
+        types: input.type,
+      })
       .return<{
         node: BaseNode;
         matchedProps: readonly string[];
diff --git a/src/core/authentication/session/session.initiator.ts b/src/core/authentication/session/session.initiator.ts
@@ -66,7 +66,7 @@ export class SessionInitiator {
   }
 
   private getTokenFromAuthHeader(req: IRequest): string | null {
-    const header = req.headers?.authorization;
+    const header = req.headers.authorization;
 
     if (!header) {
       return null;
@@ -79,18 +79,18 @@ export class SessionInitiator {
   }
 
   private getTokenFromCookie(req: IRequest): string | null {
-    return req.cookies?.[this.config.sessionCookie(req).name] || null;
+    return req.cookies[this.config.sessionCookie(req).name] || null;
   }
 
   private getImpersonatee(request: IRequest): Session['impersonatee'] {
-    const user = request.headers?.['x-cord-impersonate-user'] as ID | undefined;
+    const user = request.headers['x-cord-impersonate-user'] as ID | undefined;
     if (user && !isIdLike(user)) {
       throw new InputException(
         `Invalid user ID given in "X-CORD-Impersonate-User" header`,
       );
     }
 
-    const rawRoles = csvHeader(request?.headers?.['x-cord-impersonate-role']);
+    const rawRoles = csvHeader(request.headers['x-cord-impersonate-role']);
 
     if (!rawRoles && !user) {
       return undefined;
diff --git a/src/core/authentication/session/session.manager.ts b/src/core/authentication/session/session.manager.ts
@@ -77,9 +77,9 @@ export class SessionManager {
     impersonatee =
       impersonatee && result.userId
         ? {
-            id: impersonatee?.id ?? ghost?.id,
+            id: impersonatee.id ?? ghost?.id,
             roles: setOf([
-              ...(impersonatee.roles ?? []),
+              ...impersonatee.roles,
               ...(result.impersonateeRoles ?? []),
             ]),
           }
@@ -95,7 +95,7 @@ export class SessionManager {
 
     const session = impersonatee
       ? requesterSession.with({
-          userId: impersonatee?.id ?? requesterSession.userId,
+          userId: impersonatee.id ?? requesterSession.userId,
           roles: impersonatee.roles,
           impersonator: requesterSession,
           impersonatee,
diff --git a/src/core/config/config.service.ts b/src/core/config/config.service.ts
@@ -203,7 +203,7 @@ export const makeConfig = (env: EnvironmentService) =>
       const sources = env
         .string('FILES_SOURCE')
         .optional(legacyBucket ? `s3://${legacyBucket}` : '.files')
-        ?.split(',')
+        .split(',')
         .flatMap((src) => parseUri(src.trim()));
       return {
         sources: this.jest ? [] : sources,
diff --git a/src/core/config/environment.service.ts b/src/core/config/environment.service.ts
@@ -141,7 +141,7 @@ export class EnvironmentService implements Iterable<[string, string]> {
       const parseValue = options.parseValue ?? identity;
 
       return new Map(
-        (raw ?? '').split(pairSeparator).map((item) => {
+        raw.split(pairSeparator).map((item) => {
           const [key, value] = item.trim().split(keySeparator);
           return [parseKey(key!), parseValue(value!)] as const;
         }),
diff --git a/src/core/database/query/lists.ts b/src/core/database/query/lists.ts
@@ -28,7 +28,7 @@ export const paginate =
       limit: count,
     };
     if (page !== 1) {
-      params.offset = ((page ?? 1) - 1) * count;
+      params.offset = (page - 1) * count;
       list = `list[$offset..]`;
     }
 
diff --git a/src/core/database/transaction.ts b/src/core/database/transaction.ts
@@ -111,7 +111,7 @@ Connection.prototype.runInTransaction = async function withTransaction<R>(
     return await runTransaction(
       async (tx) => {
         if (options?.queryLogger) {
-          (tx as Neo4jTransaction).queryLogger = options?.queryLogger;
+          (tx as Neo4jTransaction).queryLogger = options.queryLogger;
         }
         try {
           return await this.transactionStorage.run(tx, inner);
diff --git a/src/core/email/templates/project-step-changed.template.tsx b/src/core/email/templates/project-step-changed.template.tsx
@@ -38,7 +38,7 @@ export function ProjectStepChanged({
   const projectUrl = useFrontendUrl(`/projects/${project.id}`);
   const projectName = project.name.value;
   const projectType = Type.entry(project.type);
-  const oldStep = oldStepVal ? Step.entry(oldStepVal).label : undefined;
+  const oldStep = Step.entry(oldStepVal).label;
   const newStep = project.step.value
     ? Step.entry(project.step.value).label
     : undefined;
diff --git a/src/core/gel/generator/find-hydration-shapes.ts b/src/core/gel/generator/find-hydration-shapes.ts
@@ -108,37 +108,32 @@ async function findInInlineQueries(root: Directory) {
   const shortList = grepForShortList.stdout
     ? root.addSourceFilesAtPaths(grepForShortList.stdout.split('\n'))
     : [];
-  return (
-    shortList.flatMap((file) =>
-      file.getDescendantsOfKind(SyntaxKind.CallExpression).flatMap((call) => {
-        if (call.getExpression().getText() !== 'edgeql') {
-          return [];
-        }
-        const args = call.getArguments();
-
-        if (
-          args.length > 1 ||
-          (!Node.isStringLiteral(args[0]) &&
-            !Node.isNoSubstitutionTemplateLiteral(args[0]))
-        ) {
-          return [];
-        }
-        // Too hard to find parent types that have name
-        if (!(call as any).getParent()?.getName()?.includes('hydrate')) {
-          return [];
-        }
-
-        const path = relative(
-          root.getPath(),
-          call.getSourceFile().getFilePath(),
-        );
-        const lineNumber = call.getStartLineNumber();
-        const source = `./${path}:${lineNumber}`;
-
-        const query = args[0].getText().slice(1, -1);
-        return { query, source };
-      }),
-    ) ?? []
+  return shortList.flatMap((file) =>
+    file.getDescendantsOfKind(SyntaxKind.CallExpression).flatMap((call) => {
+      if (call.getExpression().getText() !== 'edgeql') {
+        return [];
+      }
+      const args = call.getArguments();
+
+      if (
+        args.length > 1 ||
+        (!Node.isStringLiteral(args[0]) &&
+          !Node.isNoSubstitutionTemplateLiteral(args[0]))
+      ) {
+        return [];
+      }
+      // Too hard to find parent types that have name
+      if (!(call as any).getParent()?.getName()?.includes('hydrate')) {
+        return [];
+      }
+
+      const path = relative(root.getPath(), call.getSourceFile().getFilePath());
+      const lineNumber = call.getStartLineNumber();
+      const source = `./${path}:${lineNumber}`;
+
+      const query = args[0].getText().slice(1, -1);
+      return { query, source };
+    }),
   );
 }
 
diff --git a/src/core/gel/generator/inline-queries.ts b/src/core/gel/generator/inline-queries.ts
diff --git a/src/core/tracing/tracing.module.ts b/src/core/tracing/tracing.module.ts
diff --git a/src/core/validation/validation.exception.ts b/src/core/validation/validation.exception.ts
diff --git a/test/engagement.e2e-spec.ts b/test/engagement.e2e-spec.ts
diff --git a/test/product.e2e-spec.ts b/test/product.e2e-spec.ts
diff --git a/test/utility/create-engagement.ts b/test/utility/create-engagement.ts
diff --git a/test/utility/create-project-member.ts b/test/utility/create-project-member.ts
diff --git a/test/utility/expect-gql-error.ts b/test/utility/expect-gql-error.ts

Original file line number	Diff line number	Diff line change
`@@ -275,7 +275,7 @@ const searchResources = (`
`275`	`275`	`if (isWildcard(r)) {`
`276`	`276`	`return resNames.map((n) => [n, propsIn] as const);`
`277`	`277`	`}`
`278`		`- r = r?.replace(/[{}]/g, '');`
	`278`	`+ r = r.replace(/[{}]/g, '');`
`279`	`279`	`return csv(r).map((n) => [n, propsIn] as const);`
`280`	`280`	`})`
`281`	`281`	`.flatMap(([r, propsIn]) => {`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ export class DetachEngagementRootDirectoryHandler`
`16`	`16`	`return;`
`17`	`17`	`}`
`18`	`18`
`19`		`- const ceremonyId = engagement?.ceremony?.value?.id;`
	`19`	`+ const ceremonyId = engagement.ceremony.value?.id;`
`20`	`20`	`if (!ceremonyId) {`
`21`	`21`	`return;`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ export class LocalBucketController {`
`40`	`40`	`@Request() req: IRequest,`
`41`	`41`	`@Body() contents: Buffer,`
`42`	`42`	`) {`
`43`		`- if (!contents \|\| !Buffer.isBuffer(contents)) {`
	`43`	`+ if (!Buffer.isBuffer(contents)) {`
`44`	`44`	`throw new InputException();`
`45`	`45`	`}`
`46`	`46`
Original file line number	Diff line number	Diff line change
`@@ -254,7 +254,7 @@ export class PartnershipService {`
`254`	`254`	`return;`
`255`	`255`	`}`
`256`	`256`	`if (`
`257`		`- !partner.financialReportingTypes.value?.includes(financialReportingType)`
	`257`	`+ !partner.financialReportingTypes.value.includes(financialReportingType)`
`258`	`258`	`) {`
`259`	`259`	`throw new InputException(`
`260`	`260`	`Partner does not have this financial reporting type available`,