fix tests / pr clean up

api/src/database/db.test.ts

@@ -421,7 +421,7 @@ describe('db', () => {
       db.getServiceAccountDBConnection(SOURCE_SYSTEM['SIMS-SVC-4464']);
 
       expect(getDBConnectionStub).to.have.been.calledWith({
-        preferred_username: `service-account-${SOURCE_SYSTEM['SIMS-SVC-4464']}@${SYSTEM_IDENTITY_SOURCE.SYSTEM}`,
+        preferred_username: `service-account-${SOURCE_SYSTEM['SIMS-SVC-4464']}`,
         identity_provider: SYSTEM_IDENTITY_SOURCE.SYSTEM
       });
 

api/src/paths/dataset/intake.ts

@@ -63,7 +63,7 @@ POST.apiDoc = {
                 required: ['id', 'type', 'properties'],
                 properties: {
                   id: {
-                    title: 'Unique id of the observation',
+                    title: 'feature id',
                     type: 'string'
                   },
                   type: {
@@ -147,13 +147,6 @@ export function datasetIntake(): RequestHandler {
       // insert each submission feature record
       await submissionService.insertSubmissionFeatureRecords(response.submission_id, dataset.features);
 
-      // await submissionService.insertSubmissionStatusAndMessage(
-      //   response.submission_id,
-      //   SUBMISSION_STATUS_TYPE.PUBLISHED,
-      //   SUBMISSION_MESSAGE_TYPE.NOTICE,
-      //   additionalInformation
-      // );
-
       await connection.commit();
       res.status(200).json(response);
     } catch (error) {

api/src/repositories/submission-repository.test.ts

@@ -490,10 +490,7 @@ describe('SubmissionRepository', () => {
 
       const submissionRepository = new SubmissionRepository(mockDBConnection);
 
-      const response = await submissionRepository.insertSubmissionRecordWithPotentialConflict({
-        uuid: 'aaaa',
-        source_transform_id: 1
-      });
+      const response = await submissionRepository.insertSubmissionRecordWithPotentialConflict('aaaa');
 
       expect(response).to.eql({
         uuid: 'aaaa',
@@ -510,10 +507,7 @@ describe('SubmissionRepository', () => {
       const submissionRepository = new SubmissionRepository(mockDBConnection);
 
       try {
-        await submissionRepository.insertSubmissionRecordWithPotentialConflict({
-          uuid: 'bbbb',
-          source_transform_id: 3
-        });
+        await submissionRepository.insertSubmissionRecordWithPotentialConflict('aaaa');
         expect.fail();
       } catch (actualError) {
         expect((actualError as ApiExecuteSQLError).message).to.equal('Failed to get or insert submission record');

api/src/repositories/submission-repository.ts

@@ -986,7 +986,6 @@ export class SubmissionRepository extends BaseRepository {
    * @memberof SubmissionRepository
    */
   async getHandleBarsTemplateByDatasetId(datasetId: string): Promise<IHandlebarsTemplates> {
-    console.log('datasetId', datasetId);
     return {
       header: simsHandlebarsTemplate_HEADER,
       details: simsHandlebarsTemplate_DETAILS

api/src/services/artifact-service.test.ts

@@ -6,7 +6,6 @@ import sinonChai from 'sinon-chai';
 import { HTTPError } from '../errors/http-error';
 import { Artifact, ArtifactMetadata, ArtifactRepository } from '../repositories/artifact-repository';
 import { SecurityRepository } from '../repositories/security-repository';
-import { ISourceTransformModel } from '../repositories/submission-repository';
 import * as file_utils from '../utils/file-utils';
 import { getMockDBConnection } from '../__mocks__/db';
 import { ArtifactService } from './artifact-service';
@@ -95,9 +94,9 @@ describe('ArtifactService', () => {
       const mockDBConnection = getMockDBConnection({ systemUserId: () => 20 });
       const artifactService = new ArtifactService(mockDBConnection);
 
-      const transformRecordStub = sinon
-        .stub(SubmissionService.prototype, 'getSourceTransformRecordBySystemUserId')
-        .resolves({ source_transform_id: 60 } as unknown as ISourceTransformModel);
+      // const transformRecordStub = sinon
+      //   .stub(SubmissionService.prototype, 'getSourceTransformRecordBySystemUserId')
+      //   .resolves({ source_transform_id: 60 } as unknown as ISourceTransformModel);
 
       // const getOrInsertSubmissionRecordStub =
       sinon
@@ -115,7 +114,7 @@ describe('ArtifactService', () => {
         await artifactService.uploadAndPersistArtifact(mockDataPackageId, mockArtifactMetadata, mockFileUuid, mockFile);
         expect.fail();
       } catch (actualError) {
-        expect(transformRecordStub).to.be.calledWith(20);
+        // expect(transformRecordStub).to.be.calledWith(20);
         expect((actualError as HTTPError).message).to.equal('Test upload failed');
         expect(insertRecordStub).to.not.be.called;
       }
@@ -125,9 +124,9 @@ describe('ArtifactService', () => {
       const mockDBConnection = getMockDBConnection({ systemUserId: () => 20 });
       const artifactService = new ArtifactService(mockDBConnection);
 
-      const transformRecordStub = sinon
-        .stub(SubmissionService.prototype, 'getSourceTransformRecordBySystemUserId')
-        .resolves({ source_transform_id: 60 } as unknown as ISourceTransformModel);
+      // const transformRecordStub = sinon
+      //   .stub(SubmissionService.prototype, 'getSourceTransformRecordBySystemUserId')
+      //   .resolves({ source_transform_id: 60 } as unknown as ISourceTransformModel);
 
       const insertSubmissionRecordWithPotentialConflictStub = sinon
         .stub(SubmissionService.prototype, 'insertSubmissionRecordWithPotentialConflict')
@@ -145,12 +144,9 @@ describe('ArtifactService', () => {
         await artifactService.uploadAndPersistArtifact(mockDataPackageId, mockArtifactMetadata, mockFileUuid, mockFile);
         expect.fail();
       } catch (actualError) {
-        expect(transformRecordStub).to.be.calledWith(20);
+        // expect(transformRecordStub).to.be.calledWith(20);
 
-        expect(insertSubmissionRecordWithPotentialConflictStub).to.be.calledWith({
-          source_transform_id: 60,
-          uuid: mockDataPackageId
-        });
+        expect(insertSubmissionRecordWithPotentialConflictStub).to.be.calledWith(mockDataPackageId);
         expect(getNextArtifactIdsStub).to.be.calledWith();
         expect(uploadStub).to.be.calledWith(
           mockFile,

api/src/services/submission-service.test.ts

@@ -50,10 +50,7 @@ describe('SubmissionService', () => {
         .stub(SubmissionRepository.prototype, 'insertSubmissionRecordWithPotentialConflict')
         .resolves({ submission_id: 1 });
 
-      const response = await submissionService.insertSubmissionRecordWithPotentialConflict({
-        uuid: '',
-        source_transform_id: 1
-      });
+      const response = await submissionService.insertSubmissionRecordWithPotentialConflict('aaaa');
 
       expect(repo).to.be.calledOnce;
       expect(response).to.be.eql({ submission_id: 1 });

api/src/services/validation-service.ts

@@ -27,24 +27,22 @@ export class ValidationService extends DBService {
    * @memberof ValidationService
    */
   async validateDatasetSubmission(dataset: IDatasetSubmission): Promise<boolean> {
+    // Validate given data[property] is of type [type]
     const validateProperty = (data: any, property: string | number, type: string) => {
-      console.log('data', data);
-      console.log('property', property);
-      console.log('type', type);
-
       const jsonData = data[0][property];
+
+      // check if property is 'features' and jsonData is undefined
       if (property === 'features' && jsonData === undefined) {
         return;
       }
 
-      console.log(`---Validation of ${jsonData} as ${type}---`);
-
       // check if jsonData is an array
       if (type === 'array') {
         if (!Array.isArray(jsonData)) {
           throw new Error(`Invalid dataset submission: ${jsonData} must be a ${type}`);
         }
 
+        // recursively validate each feature in the array
         jsonData.forEach((element: any) => {
           this.validateDatasetSubmission(element);
         });
@@ -64,6 +62,7 @@ export class ValidationService extends DBService {
       }
     };
 
+    // callback function for json-schema-traverse
     const validationCallback = (
       schema: traverse.SchemaObject,
       json_pointer: string,
@@ -83,6 +82,7 @@ export class ValidationService extends DBService {
         parentJsonPtr = parentJsonPtr.replace('/properties', '');
       }
 
+      // if the parent is features, then we need to add a wildcard to the end of the json pointer
       if (parentJsonPtr === 'features') {
         parentJsonPtr += '.*';
       }