refactor: some typing changes to appease the unit tests

Author: seansica

src/stix/providers/workbench/workbench.repository.ts

@@ -1,22 +1,21 @@
-import { ConsoleLogger, Inject, Injectable } from '@nestjs/common';
 import { HttpService } from '@nestjs/axios';
+import { ConsoleLogger, Inject, Injectable } from '@nestjs/common';
+import { plainToInstance } from 'class-transformer';
 import { lastValueFrom, map } from 'rxjs';
 import {
   TaxiiBadRequestException,
   TaxiiNotFoundException,
   TaxiiServiceUnavailableException,
 } from 'src/common/exceptions';
+import { StixIdentityPrefix, WORKBENCH_OPTIONS, WorkbenchRESTEndpoint } from 'src/stix/constants';
+import { AttackObjectDto } from 'src/stix/dto/attack-object.dto';
+import { StixBundleDto } from 'src/stix/dto/stix-bundle.dto';
+import { WorkbenchCollectionBundleDto } from 'src/stix/dto/workbench-collection-bundle.dto';
 import {
   WorkbenchCollectionDto,
   WorkbenchCollectionStixProperties,
 } from 'src/stix/dto/workbench-collection.dto';
-import { plainToInstance } from 'class-transformer';
-import { WorkbenchCollectionBundleDto } from 'src/stix/dto/workbench-collection-bundle.dto';
-import { AttackObjectDto } from 'src/stix/dto/attack-object.dto';
-import { StixIdentityPrefix, WorkbenchRESTEndpoint } from 'src/stix/constants';
 import { WorkbenchConnectOptionsInterface } from 'src/stix/interfaces/workbench-connect-options.interface';
-import { WORKBENCH_OPTIONS } from 'src/stix/constants';
-import { StixBundleDto } from 'src/stix/dto/stix-bundle.dto';
 
 interface WorkbenchCollectionResponseDto {
   _id: string;
@@ -45,8 +44,8 @@ export class WorkbenchRepository {
    * @param url Base URL of the target Workbench REST API instance
    * @private
    */
-
-  private async fetchHttp(url: string): Promise<unknown> {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  private async fetchHttp(url: string): Promise<any> {
     this.logger.debug(`Sending HTTP GET request to ${url}`, this.constructor.name);
 
     let data;

src/taxii/providers/manifest/dto/manifest-record.dto.ts

@@ -8,7 +8,7 @@ type StixCoreFields = {
   modified?: string | Date;
 };
 
-type ManifestRecordInput = StixCoreFields | { stix: StixCoreFields };
+export type ManifestRecordInput = StixCoreFields | { stix: StixCoreFields };
 
 /**
  * The manifest-record type captures metadata about a single version of an object, indicated by the id property. The

src/taxii/providers/manifest/manifest.service.ts

@@ -4,7 +4,7 @@ import { ObjectService } from '../object';
 import { ObjectFiltersDto } from '../filter/dto';
 import { MatchDto } from 'src/common/models/match/match.dto';
 import { PaginationService } from '../pagination';
-import { ManifestDto, ManifestRecordDto } from './dto';
+import { ManifestDto, ManifestRecordDto, ManifestRecordInput } from './dto';
 
 @Injectable()
 export class ManifestService {
@@ -40,7 +40,7 @@ export class ManifestService {
     const manifestRecords: ManifestRecordDto[] = [];
 
     for await (const object of stixObjects) {
-      manifestRecords.push(new ManifestRecordDto(object));
+      manifestRecords.push(new ManifestRecordDto(object as ManifestRecordInput));
     }
 
     // Paginate the manifest-records and return the appropriate page

src/taxii/providers/pagination/pagination.service.ts

@@ -1,8 +1,8 @@
 import { Injectable } from '@nestjs/common';
-import { TaxiiLoggerService as Logger } from 'src/common/logger';
+import { isNumber } from '@nestjs/common/utils/shared.utils';
 import { TaxiiNotFoundException } from 'src/common/exceptions';
+import { TaxiiLoggerService as Logger } from 'src/common/logger';
 import { EnvelopeDto } from '../envelope';
-import { isNumber } from '@nestjs/common/utils/shared.utils';
 import { ManifestDto, ManifestRecordDto } from '../manifest/dto';
 import { VersionsDto } from '../version/dto/versions.dto';
 // import { StixObjectDto } from "src/stix/dto/stix-object.dto";
@@ -84,11 +84,7 @@ export class PaginationService {
    */
   async getEnvelope(objects: object[], limit?: number, next?: number): Promise<EnvelopeDto> {
     const page = await this.getPage(objects, limit, next);
-    return new EnvelopeDto({
-      more: page.more,
-      next: page.next,
-      objects: page.items,
-    });
+    return new EnvelopeDto({ ...page });
   }
 
   /**