fix saving of submission id

src/decorator/user.decorator.ts

@@ -2,6 +2,13 @@ import { createParamDecorator, ExecutionContext } from '@nestjs/common'
 import { GqlExecutionContext } from '@nestjs/graphql'
 
 export const User = createParamDecorator(
-  (data: unknown, ctx: ExecutionContext) =>
+  (data: unknown, ctx: ExecutionContext) => {
-    GqlExecutionContext.create(ctx).getContext().req.user,
+    const user = GqlExecutionContext.create(ctx).getContext().req.user
+
+    if (!user) {
+      return null
+    }
+
+    return user
+  },
 );

src/resolver/submission/submission.start.mutation.ts

@@ -28,6 +28,12 @@ export class SubmissionStartMutation {
   ): Promise<SubmissionProgressModel> {
     const form = await this.formService.findById(id)
 
+    if (!form.isLive && !this.formService.isAdmin(form, user)) {
+      throw new Error('invalid form')
+    }
+
+    console.log('user', user)
+
     const submission = await this.startService.start(form, input, user, ipAddr)
 
     cache.add(cache.getCacheKey(SubmissionEntity.name, submission.id), submission)

src/service/submission/submission.service.ts

@@ -43,15 +43,7 @@ export class SubmissionService {
   }
 
   async findById(id: string): Promise<SubmissionEntity> {
-    const submission = await this.submissionRepository.findOne(
+    const submission = await this.submissionRepository.findOne(id);
-      id,
-      {
-        relations: [
-          'form',
-          'form.admin',
-        ],
-      }
-    );
 
     if (!submission) {
       throw new Error('no form found')

src/service/submission/submission.set.field.service.ts

@@ -27,9 +27,12 @@ export class SubmissionSetFieldService {
   async saveField(submission: SubmissionEntity, input: SubmissionSetFieldInput): Promise<void> {
     let field = submission.fields.find(field => field.field.id.toString() === input.field)
 
+    submission.timeElapsed = dayjs().diff(dayjs(submission.created), 'second')
+
     if (field) {
       field.content = this.parseData(field, input.data)
 
+      await this.submissionRepository.save(submission)
       await this.submissionFieldRepository.save(field)
     } else {
       field = new SubmissionFieldEntity()
@@ -39,16 +42,13 @@ export class SubmissionSetFieldService {
       field.type = field.field.type
       field.content = this.parseData(field, input.data)
 
-      field = await this.submissionFieldRepository.save(field)
-
       submission.fields.push(field)
-
       submission.percentageComplete = (submission.fields.length) / submission.form.fields.length
-    }
-
-    submission.timeElapsed = dayjs().diff(dayjs(submission.created), 'second')
 
+      // figure out why this cannot be after field save...
       await this.submissionRepository.save(submission)
+      await this.submissionFieldRepository.save(field)
+    }
 
     if (submission.percentageComplete === 1) {
       this.webHook.process(submission).catch(e => {