Merge pull request #669 from US-EPA-CAMD/feat/#6513_MATS_Data_Submission_Processing_user_email

feat:the user_email column when the row is created by the MATS submis…

Author: maxdiebold-erg

src/dto/mats-data-submission-create-payload.dto.ts

@@ -1,5 +1,5 @@
 import { Type } from 'class-transformer';
-import { IsArray, IsOptional, IsString, ValidateNested } from 'class-validator';
+import { IsArray, IsEmail, IsNotEmpty, IsOptional, IsString, ValidateNested } from 'class-validator';
 
 import { MatsDataSubmissionBaseDTO } from '../dto/mats-data-submission.dto';
 
@@ -25,4 +25,9 @@ export class MatsDataSubmissionCreatePayloadDTO {
 
   // Do not validate this here, it will be validated in `MatsDataSubmissionChecksService`.
   metadata: MatsDataSubmissionBaseDTO;
+
+  @IsEmail()
+  @IsNotEmpty()
+  @IsString()
+  userEmail: string;
 }

src/entities/mats-data-submission.entity.ts

@@ -70,6 +70,9 @@ export class MatsDataSubmission extends BaseEntity {
   @Column({ name: 'user_id' })
   userId: string;
 
+  @Column({ name: 'user_email' })
+  userEmail: string;
+
   @Column({ name: 'add_time' })
   addTime: Date;
 

src/maps/mats-data-submission.map.ts

@@ -27,6 +27,7 @@ export class MatsDataSubmissionMap extends BaseMap<
       testNumber: entity.testNumber,
       year: entity.year,
       userId: entity.userId,
+      userEmail: entity.userEmail,
       addDate: entity.addTime?.toISOString() ?? null,
       updateDate: entity.updateTime?.toISOString() ?? null,
     };

src/mats-data-submission/mats-data-submission.controller.ts

@@ -92,6 +92,7 @@ export class MatsDataSubmissionController {
       fileNames,
       user.userId,
       locationId,
+      payload.userEmail
     );
     return {
       warnings,

src/mats-data-submission/mats-data-submission.service.spec.ts

@@ -160,6 +160,7 @@ describe('MatsDataSubmissionService', () => {
         files,
         'TESTID',
         'LOCATIONID',
+        '[email protected]'
       );
 
       expect((service as any).createMatsDataSubmission).toHaveBeenCalled();

src/mats-data-submission/mats-data-submission.service.ts

@@ -57,6 +57,7 @@ export class MatsDataSubmissionService {
   private async createMatsDataSubmission(
     payload: MatsDataSubmissionBaseDTO,
     userId: string,
+    userEmail: string,
     trx?: EntityManager,
   ): Promise<string> {
     const repository = withTransaction(this.repository, trx);
@@ -75,6 +76,7 @@ export class MatsDataSubmissionService {
       quarter: payload.quarter,
       year: payload.year,
       updateTime: currentDateTime(),
+      userEmail: userEmail,
       userId,
     });
     await repository.save(record);
@@ -388,6 +390,7 @@ export class MatsDataSubmissionService {
     fileNames: MatsDataSubmissionFileNamesDTO,
     userId: string,
     locationId: string,
+    userEmail:string
   ): Promise<string> {
     let submissionId: string | null = null;
 
@@ -397,6 +400,7 @@ export class MatsDataSubmissionService {
         submissionId = await this.createMatsDataSubmission(
           metadata,
           userId,
+          userEmail,
           trx,
         );