diff --git a/server/package.json b/server/package.json index 678b4fcf4..df937f7b7 100644 --- a/server/package.json +++ b/server/package.json @@ -45,6 +45,7 @@ "@paljs/plugins": "^5.3.3", "@prisma/client": "^4.13.0", "@types/lodash.camelcase": "^4.3.7", + "@types/lodash.merge": "^4.6.7", "add": "^2.0.6", "apollo-server-express": "^3.12.0", "axios": "^1.4.0", @@ -60,6 +61,7 @@ "lodash.camelcase": "^4.3.0", "lodash.isobject": "^3.0.2", "lodash.kebabcase": "^4.1.1", + "lodash.merge": "^4.6.2", "ms": "^2.1.3", "passport": "^0.6.0", "passport-google-oauth20": "^2.0.0", diff --git a/server/src/core/@generated/comment-thread-target/create-many-comment-thread-target.args.ts b/server/src/core/@generated/comment-thread-target/create-many-comment-thread-target.args.ts index c2b72c0f2..409492ba5 100644 --- a/server/src/core/@generated/comment-thread-target/create-many-comment-thread-target.args.ts +++ b/server/src/core/@generated/comment-thread-target/create-many-comment-thread-target.args.ts @@ -9,8 +9,8 @@ export class CreateManyCommentThreadTargetArgs { @Field(() => [CommentThreadTargetCreateManyInput], {nullable:false}) @Type(() => CommentThreadTargetCreateManyInput) - @ValidateNested({each: true}) @Type(() => CommentThreadTargetCreateManyInput) + @ValidateNested({each: true}) data!: Array; @Field(() => Boolean, {nullable:true}) diff --git a/server/src/core/@generated/comment-thread-target/create-one-comment-thread-target.args.ts b/server/src/core/@generated/comment-thread-target/create-one-comment-thread-target.args.ts index 0e5ebee05..d029ed70b 100644 --- a/server/src/core/@generated/comment-thread-target/create-one-comment-thread-target.args.ts +++ b/server/src/core/@generated/comment-thread-target/create-one-comment-thread-target.args.ts @@ -9,7 +9,7 @@ export class CreateOneCommentThreadTargetArgs { @Field(() => CommentThreadTargetCreateInput, {nullable:false}) @Type(() => CommentThreadTargetCreateInput) - @ValidateNested({each: true}) @Type(() => CommentThreadTargetCreateInput) + @ValidateNested({each: true}) data!: CommentThreadTargetCreateInput; } diff --git a/server/src/core/@generated/comment-thread-target/update-many-comment-thread-target.args.ts b/server/src/core/@generated/comment-thread-target/update-many-comment-thread-target.args.ts index f2ac96498..1865abdba 100644 --- a/server/src/core/@generated/comment-thread-target/update-many-comment-thread-target.args.ts +++ b/server/src/core/@generated/comment-thread-target/update-many-comment-thread-target.args.ts @@ -10,8 +10,8 @@ export class UpdateManyCommentThreadTargetArgs { @Field(() => CommentThreadTargetUpdateManyMutationInput, {nullable:false}) @Type(() => CommentThreadTargetUpdateManyMutationInput) - @ValidateNested({each: true}) @Type(() => CommentThreadTargetUpdateManyMutationInput) + @ValidateNested({each: true}) data!: CommentThreadTargetUpdateManyMutationInput; @Field(() => CommentThreadTargetWhereInput, {nullable:true}) diff --git a/server/src/core/@generated/comment-thread-target/update-one-comment-thread-target.args.ts b/server/src/core/@generated/comment-thread-target/update-one-comment-thread-target.args.ts index 7f083a66a..3d08745b3 100644 --- a/server/src/core/@generated/comment-thread-target/update-one-comment-thread-target.args.ts +++ b/server/src/core/@generated/comment-thread-target/update-one-comment-thread-target.args.ts @@ -10,8 +10,8 @@ export class UpdateOneCommentThreadTargetArgs { @Field(() => CommentThreadTargetUpdateInput, {nullable:false}) @Type(() => CommentThreadTargetUpdateInput) - @ValidateNested({each: true}) @Type(() => CommentThreadTargetUpdateInput) + @ValidateNested({each: true}) data!: CommentThreadTargetUpdateInput; @Field(() => CommentThreadTargetWhereUniqueInput, {nullable:false}) diff --git a/server/src/core/@generated/comment-thread/create-many-comment-thread.args.ts b/server/src/core/@generated/comment-thread/create-many-comment-thread.args.ts index eb14acb1b..3400a43fb 100644 --- a/server/src/core/@generated/comment-thread/create-many-comment-thread.args.ts +++ b/server/src/core/@generated/comment-thread/create-many-comment-thread.args.ts @@ -9,8 +9,8 @@ export class CreateManyCommentThreadArgs { @Field(() => [CommentThreadCreateManyInput], {nullable:false}) @Type(() => CommentThreadCreateManyInput) - @ValidateNested({each: true}) @Type(() => CommentThreadCreateManyInput) + @ValidateNested({each: true}) data!: Array; @Field(() => Boolean, {nullable:true}) diff --git a/server/src/core/@generated/comment-thread/create-one-comment-thread.args.ts b/server/src/core/@generated/comment-thread/create-one-comment-thread.args.ts index 20ed8d3e5..08d3bb108 100644 --- a/server/src/core/@generated/comment-thread/create-one-comment-thread.args.ts +++ b/server/src/core/@generated/comment-thread/create-one-comment-thread.args.ts @@ -9,7 +9,7 @@ export class CreateOneCommentThreadArgs { @Field(() => CommentThreadCreateInput, {nullable:false}) @Type(() => CommentThreadCreateInput) - @ValidateNested({each: true}) @Type(() => CommentThreadCreateInput) + @ValidateNested({each: true}) data!: CommentThreadCreateInput; } diff --git a/server/src/core/@generated/comment-thread/update-many-comment-thread.args.ts b/server/src/core/@generated/comment-thread/update-many-comment-thread.args.ts index ccf3aeaf4..b8a35f9bc 100644 --- a/server/src/core/@generated/comment-thread/update-many-comment-thread.args.ts +++ b/server/src/core/@generated/comment-thread/update-many-comment-thread.args.ts @@ -10,8 +10,8 @@ export class UpdateManyCommentThreadArgs { @Field(() => CommentThreadUpdateManyMutationInput, {nullable:false}) @Type(() => CommentThreadUpdateManyMutationInput) - @ValidateNested({each: true}) @Type(() => CommentThreadUpdateManyMutationInput) + @ValidateNested({each: true}) data!: CommentThreadUpdateManyMutationInput; @Field(() => CommentThreadWhereInput, {nullable:true}) diff --git a/server/src/core/@generated/comment-thread/update-one-comment-thread.args.ts b/server/src/core/@generated/comment-thread/update-one-comment-thread.args.ts index 0c7ba7277..276840fa4 100644 --- a/server/src/core/@generated/comment-thread/update-one-comment-thread.args.ts +++ b/server/src/core/@generated/comment-thread/update-one-comment-thread.args.ts @@ -10,8 +10,8 @@ export class UpdateOneCommentThreadArgs { @Field(() => CommentThreadUpdateInput, {nullable:false}) @Type(() => CommentThreadUpdateInput) - @ValidateNested({each: true}) @Type(() => CommentThreadUpdateInput) + @ValidateNested({each: true}) data!: CommentThreadUpdateInput; @Field(() => CommentThreadWhereUniqueInput, {nullable:false}) diff --git a/server/src/core/@generated/comment/create-many-comment.args.ts b/server/src/core/@generated/comment/create-many-comment.args.ts index fc752ae2b..bf0446052 100644 --- a/server/src/core/@generated/comment/create-many-comment.args.ts +++ b/server/src/core/@generated/comment/create-many-comment.args.ts @@ -9,8 +9,8 @@ export class CreateManyCommentArgs { @Field(() => [CommentCreateManyInput], {nullable:false}) @Type(() => CommentCreateManyInput) - @ValidateNested({each: true}) @Type(() => CommentCreateManyInput) + @ValidateNested({each: true}) data!: Array; @Field(() => Boolean, {nullable:true}) diff --git a/server/src/core/@generated/comment/create-one-comment.args.ts b/server/src/core/@generated/comment/create-one-comment.args.ts index 573b1a2e6..7733d478d 100644 --- a/server/src/core/@generated/comment/create-one-comment.args.ts +++ b/server/src/core/@generated/comment/create-one-comment.args.ts @@ -9,7 +9,7 @@ export class CreateOneCommentArgs { @Field(() => CommentCreateInput, {nullable:false}) @Type(() => CommentCreateInput) - @ValidateNested({each: true}) @Type(() => CommentCreateInput) + @ValidateNested({each: true}) data!: CommentCreateInput; } diff --git a/server/src/core/@generated/comment/update-many-comment.args.ts b/server/src/core/@generated/comment/update-many-comment.args.ts index 2ed02c08d..18e51d135 100644 --- a/server/src/core/@generated/comment/update-many-comment.args.ts +++ b/server/src/core/@generated/comment/update-many-comment.args.ts @@ -10,8 +10,8 @@ export class UpdateManyCommentArgs { @Field(() => CommentUpdateManyMutationInput, {nullable:false}) @Type(() => CommentUpdateManyMutationInput) - @ValidateNested({each: true}) @Type(() => CommentUpdateManyMutationInput) + @ValidateNested({each: true}) data!: CommentUpdateManyMutationInput; @Field(() => CommentWhereInput, {nullable:true}) diff --git a/server/src/core/@generated/comment/update-one-comment.args.ts b/server/src/core/@generated/comment/update-one-comment.args.ts index efeb6180f..67e763831 100644 --- a/server/src/core/@generated/comment/update-one-comment.args.ts +++ b/server/src/core/@generated/comment/update-one-comment.args.ts @@ -10,8 +10,8 @@ export class UpdateOneCommentArgs { @Field(() => CommentUpdateInput, {nullable:false}) @Type(() => CommentUpdateInput) - @ValidateNested({each: true}) @Type(() => CommentUpdateInput) + @ValidateNested({each: true}) data!: CommentUpdateInput; @Field(() => CommentWhereUniqueInput, {nullable:false}) diff --git a/server/src/core/@generated/company/create-many-company.args.ts b/server/src/core/@generated/company/create-many-company.args.ts index 08e78f224..7cf83a514 100644 --- a/server/src/core/@generated/company/create-many-company.args.ts +++ b/server/src/core/@generated/company/create-many-company.args.ts @@ -9,8 +9,8 @@ export class CreateManyCompanyArgs { @Field(() => [CompanyCreateManyInput], {nullable:false}) @Type(() => CompanyCreateManyInput) - @ValidateNested({each: true}) @Type(() => CompanyCreateManyInput) + @ValidateNested({each: true}) data!: Array; @Field(() => Boolean, {nullable:true}) diff --git a/server/src/core/@generated/company/create-one-company.args.ts b/server/src/core/@generated/company/create-one-company.args.ts index c8dd6a033..dbef92eae 100644 --- a/server/src/core/@generated/company/create-one-company.args.ts +++ b/server/src/core/@generated/company/create-one-company.args.ts @@ -9,7 +9,7 @@ export class CreateOneCompanyArgs { @Field(() => CompanyCreateInput, {nullable:false}) @Type(() => CompanyCreateInput) - @ValidateNested({each: true}) @Type(() => CompanyCreateInput) + @ValidateNested({each: true}) data!: CompanyCreateInput; } diff --git a/server/src/core/@generated/company/update-many-company.args.ts b/server/src/core/@generated/company/update-many-company.args.ts index 6672abe31..f722b5c4e 100644 --- a/server/src/core/@generated/company/update-many-company.args.ts +++ b/server/src/core/@generated/company/update-many-company.args.ts @@ -10,8 +10,8 @@ export class UpdateManyCompanyArgs { @Field(() => CompanyUpdateManyMutationInput, {nullable:false}) @Type(() => CompanyUpdateManyMutationInput) - @ValidateNested({each: true}) @Type(() => CompanyUpdateManyMutationInput) + @ValidateNested({each: true}) data!: CompanyUpdateManyMutationInput; @Field(() => CompanyWhereInput, {nullable:true}) diff --git a/server/src/core/@generated/company/update-one-company.args.ts b/server/src/core/@generated/company/update-one-company.args.ts index ca5a67049..5b6fcb30c 100644 --- a/server/src/core/@generated/company/update-one-company.args.ts +++ b/server/src/core/@generated/company/update-one-company.args.ts @@ -10,8 +10,8 @@ export class UpdateOneCompanyArgs { @Field(() => CompanyUpdateInput, {nullable:false}) @Type(() => CompanyUpdateInput) - @ValidateNested({each: true}) @Type(() => CompanyUpdateInput) + @ValidateNested({each: true}) data!: CompanyUpdateInput; @Field(() => CompanyWhereUniqueInput, {nullable:false}) diff --git a/server/src/core/@generated/person/create-many-person.args.ts b/server/src/core/@generated/person/create-many-person.args.ts index d78b614a4..afa8386df 100644 --- a/server/src/core/@generated/person/create-many-person.args.ts +++ b/server/src/core/@generated/person/create-many-person.args.ts @@ -9,8 +9,8 @@ export class CreateManyPersonArgs { @Field(() => [PersonCreateManyInput], {nullable:false}) @Type(() => PersonCreateManyInput) - @ValidateNested({each: true}) @Type(() => PersonCreateManyInput) + @ValidateNested({each: true}) data!: Array; @Field(() => Boolean, {nullable:true}) diff --git a/server/src/core/@generated/person/create-one-person.args.ts b/server/src/core/@generated/person/create-one-person.args.ts index 8651efd2c..84db827ae 100644 --- a/server/src/core/@generated/person/create-one-person.args.ts +++ b/server/src/core/@generated/person/create-one-person.args.ts @@ -9,7 +9,7 @@ export class CreateOnePersonArgs { @Field(() => PersonCreateInput, {nullable:false}) @Type(() => PersonCreateInput) - @ValidateNested({each: true}) @Type(() => PersonCreateInput) + @ValidateNested({each: true}) data!: PersonCreateInput; } diff --git a/server/src/core/@generated/person/update-many-person.args.ts b/server/src/core/@generated/person/update-many-person.args.ts index ba742bafd..801368ed8 100644 --- a/server/src/core/@generated/person/update-many-person.args.ts +++ b/server/src/core/@generated/person/update-many-person.args.ts @@ -10,8 +10,8 @@ export class UpdateManyPersonArgs { @Field(() => PersonUpdateManyMutationInput, {nullable:false}) @Type(() => PersonUpdateManyMutationInput) - @ValidateNested({each: true}) @Type(() => PersonUpdateManyMutationInput) + @ValidateNested({each: true}) data!: PersonUpdateManyMutationInput; @Field(() => PersonWhereInput, {nullable:true}) diff --git a/server/src/core/@generated/person/update-one-person.args.ts b/server/src/core/@generated/person/update-one-person.args.ts index c70516db7..2501e66cc 100644 --- a/server/src/core/@generated/person/update-one-person.args.ts +++ b/server/src/core/@generated/person/update-one-person.args.ts @@ -10,8 +10,8 @@ export class UpdateOnePersonArgs { @Field(() => PersonUpdateInput, {nullable:false}) @Type(() => PersonUpdateInput) - @ValidateNested({each: true}) @Type(() => PersonUpdateInput) + @ValidateNested({each: true}) data!: PersonUpdateInput; @Field(() => PersonWhereUniqueInput, {nullable:false}) diff --git a/server/src/core/@generated/pipeline-progress/create-many-pipeline-progress.args.ts b/server/src/core/@generated/pipeline-progress/create-many-pipeline-progress.args.ts index 447f7bf6f..c0f92417a 100644 --- a/server/src/core/@generated/pipeline-progress/create-many-pipeline-progress.args.ts +++ b/server/src/core/@generated/pipeline-progress/create-many-pipeline-progress.args.ts @@ -9,8 +9,8 @@ export class CreateManyPipelineProgressArgs { @Field(() => [PipelineProgressCreateManyInput], {nullable:false}) @Type(() => PipelineProgressCreateManyInput) - @ValidateNested({each: true}) @Type(() => PipelineProgressCreateManyInput) + @ValidateNested({each: true}) data!: Array; @Field(() => Boolean, {nullable:true}) diff --git a/server/src/core/@generated/pipeline-progress/create-one-pipeline-progress.args.ts b/server/src/core/@generated/pipeline-progress/create-one-pipeline-progress.args.ts index 3455dda8d..252b38dab 100644 --- a/server/src/core/@generated/pipeline-progress/create-one-pipeline-progress.args.ts +++ b/server/src/core/@generated/pipeline-progress/create-one-pipeline-progress.args.ts @@ -9,7 +9,7 @@ export class CreateOnePipelineProgressArgs { @Field(() => PipelineProgressCreateInput, {nullable:false}) @Type(() => PipelineProgressCreateInput) - @ValidateNested({each: true}) @Type(() => PipelineProgressCreateInput) + @ValidateNested({each: true}) data!: PipelineProgressCreateInput; } diff --git a/server/src/core/@generated/pipeline-progress/update-many-pipeline-progress.args.ts b/server/src/core/@generated/pipeline-progress/update-many-pipeline-progress.args.ts index 6e2ecd02b..532d3f5c2 100644 --- a/server/src/core/@generated/pipeline-progress/update-many-pipeline-progress.args.ts +++ b/server/src/core/@generated/pipeline-progress/update-many-pipeline-progress.args.ts @@ -10,8 +10,8 @@ export class UpdateManyPipelineProgressArgs { @Field(() => PipelineProgressUpdateManyMutationInput, {nullable:false}) @Type(() => PipelineProgressUpdateManyMutationInput) - @ValidateNested({each: true}) @Type(() => PipelineProgressUpdateManyMutationInput) + @ValidateNested({each: true}) data!: PipelineProgressUpdateManyMutationInput; @Field(() => PipelineProgressWhereInput, {nullable:true}) diff --git a/server/src/core/@generated/pipeline-progress/update-one-pipeline-progress.args.ts b/server/src/core/@generated/pipeline-progress/update-one-pipeline-progress.args.ts index b7fbafe4b..9d18d04c5 100644 --- a/server/src/core/@generated/pipeline-progress/update-one-pipeline-progress.args.ts +++ b/server/src/core/@generated/pipeline-progress/update-one-pipeline-progress.args.ts @@ -10,8 +10,8 @@ export class UpdateOnePipelineProgressArgs { @Field(() => PipelineProgressUpdateInput, {nullable:false}) @Type(() => PipelineProgressUpdateInput) - @ValidateNested({each: true}) @Type(() => PipelineProgressUpdateInput) + @ValidateNested({each: true}) data!: PipelineProgressUpdateInput; @Field(() => PipelineProgressWhereUniqueInput, {nullable:false}) diff --git a/server/src/core/@generated/pipeline-stage/create-many-pipeline-stage.args.ts b/server/src/core/@generated/pipeline-stage/create-many-pipeline-stage.args.ts index 92168e92b..606acc20f 100644 --- a/server/src/core/@generated/pipeline-stage/create-many-pipeline-stage.args.ts +++ b/server/src/core/@generated/pipeline-stage/create-many-pipeline-stage.args.ts @@ -9,8 +9,8 @@ export class CreateManyPipelineStageArgs { @Field(() => [PipelineStageCreateManyInput], {nullable:false}) @Type(() => PipelineStageCreateManyInput) - @ValidateNested({each: true}) @Type(() => PipelineStageCreateManyInput) + @ValidateNested({each: true}) data!: Array; @Field(() => Boolean, {nullable:true}) diff --git a/server/src/core/@generated/pipeline-stage/create-one-pipeline-stage.args.ts b/server/src/core/@generated/pipeline-stage/create-one-pipeline-stage.args.ts index 5821b7a43..0418d91cf 100644 --- a/server/src/core/@generated/pipeline-stage/create-one-pipeline-stage.args.ts +++ b/server/src/core/@generated/pipeline-stage/create-one-pipeline-stage.args.ts @@ -9,7 +9,7 @@ export class CreateOnePipelineStageArgs { @Field(() => PipelineStageCreateInput, {nullable:false}) @Type(() => PipelineStageCreateInput) - @ValidateNested({each: true}) @Type(() => PipelineStageCreateInput) + @ValidateNested({each: true}) data!: PipelineStageCreateInput; } diff --git a/server/src/core/@generated/pipeline-stage/update-many-pipeline-stage.args.ts b/server/src/core/@generated/pipeline-stage/update-many-pipeline-stage.args.ts index ce2c3fc9a..a45ce9de4 100644 --- a/server/src/core/@generated/pipeline-stage/update-many-pipeline-stage.args.ts +++ b/server/src/core/@generated/pipeline-stage/update-many-pipeline-stage.args.ts @@ -10,8 +10,8 @@ export class UpdateManyPipelineStageArgs { @Field(() => PipelineStageUpdateManyMutationInput, {nullable:false}) @Type(() => PipelineStageUpdateManyMutationInput) - @ValidateNested({each: true}) @Type(() => PipelineStageUpdateManyMutationInput) + @ValidateNested({each: true}) data!: PipelineStageUpdateManyMutationInput; @Field(() => PipelineStageWhereInput, {nullable:true}) diff --git a/server/src/core/@generated/pipeline-stage/update-one-pipeline-stage.args.ts b/server/src/core/@generated/pipeline-stage/update-one-pipeline-stage.args.ts index 2a8995dc5..fe59b6317 100644 --- a/server/src/core/@generated/pipeline-stage/update-one-pipeline-stage.args.ts +++ b/server/src/core/@generated/pipeline-stage/update-one-pipeline-stage.args.ts @@ -10,8 +10,8 @@ export class UpdateOnePipelineStageArgs { @Field(() => PipelineStageUpdateInput, {nullable:false}) @Type(() => PipelineStageUpdateInput) - @ValidateNested({each: true}) @Type(() => PipelineStageUpdateInput) + @ValidateNested({each: true}) data!: PipelineStageUpdateInput; @Field(() => PipelineStageWhereUniqueInput, {nullable:false}) diff --git a/server/src/core/@generated/pipeline/create-many-pipeline.args.ts b/server/src/core/@generated/pipeline/create-many-pipeline.args.ts index 58d1a1ce7..9f0c2cba5 100644 --- a/server/src/core/@generated/pipeline/create-many-pipeline.args.ts +++ b/server/src/core/@generated/pipeline/create-many-pipeline.args.ts @@ -9,8 +9,8 @@ export class CreateManyPipelineArgs { @Field(() => [PipelineCreateManyInput], {nullable:false}) @Type(() => PipelineCreateManyInput) - @ValidateNested({each: true}) @Type(() => PipelineCreateManyInput) + @ValidateNested({each: true}) data!: Array; @Field(() => Boolean, {nullable:true}) diff --git a/server/src/core/@generated/pipeline/create-one-pipeline.args.ts b/server/src/core/@generated/pipeline/create-one-pipeline.args.ts index d27b30083..143dea427 100644 --- a/server/src/core/@generated/pipeline/create-one-pipeline.args.ts +++ b/server/src/core/@generated/pipeline/create-one-pipeline.args.ts @@ -9,7 +9,7 @@ export class CreateOnePipelineArgs { @Field(() => PipelineCreateInput, {nullable:false}) @Type(() => PipelineCreateInput) - @ValidateNested({each: true}) @Type(() => PipelineCreateInput) + @ValidateNested({each: true}) data!: PipelineCreateInput; } diff --git a/server/src/core/@generated/pipeline/update-many-pipeline.args.ts b/server/src/core/@generated/pipeline/update-many-pipeline.args.ts index 33a24fce2..338e0fedc 100644 --- a/server/src/core/@generated/pipeline/update-many-pipeline.args.ts +++ b/server/src/core/@generated/pipeline/update-many-pipeline.args.ts @@ -10,8 +10,8 @@ export class UpdateManyPipelineArgs { @Field(() => PipelineUpdateManyMutationInput, {nullable:false}) @Type(() => PipelineUpdateManyMutationInput) - @ValidateNested({each: true}) @Type(() => PipelineUpdateManyMutationInput) + @ValidateNested({each: true}) data!: PipelineUpdateManyMutationInput; @Field(() => PipelineWhereInput, {nullable:true}) diff --git a/server/src/core/@generated/pipeline/update-one-pipeline.args.ts b/server/src/core/@generated/pipeline/update-one-pipeline.args.ts index fea3d76f5..460599fba 100644 --- a/server/src/core/@generated/pipeline/update-one-pipeline.args.ts +++ b/server/src/core/@generated/pipeline/update-one-pipeline.args.ts @@ -10,8 +10,8 @@ export class UpdateOnePipelineArgs { @Field(() => PipelineUpdateInput, {nullable:false}) @Type(() => PipelineUpdateInput) - @ValidateNested({each: true}) @Type(() => PipelineUpdateInput) + @ValidateNested({each: true}) data!: PipelineUpdateInput; @Field(() => PipelineWhereUniqueInput, {nullable:false}) diff --git a/server/src/core/@generated/refresh-token/create-many-refresh-token.args.ts b/server/src/core/@generated/refresh-token/create-many-refresh-token.args.ts index abd1265fb..0a8510995 100644 --- a/server/src/core/@generated/refresh-token/create-many-refresh-token.args.ts +++ b/server/src/core/@generated/refresh-token/create-many-refresh-token.args.ts @@ -9,8 +9,8 @@ export class CreateManyRefreshTokenArgs { @Field(() => [RefreshTokenCreateManyInput], {nullable:false}) @Type(() => RefreshTokenCreateManyInput) - @ValidateNested({each: true}) @Type(() => RefreshTokenCreateManyInput) + @ValidateNested({each: true}) data!: Array; @Field(() => Boolean, {nullable:true}) diff --git a/server/src/core/@generated/refresh-token/create-one-refresh-token.args.ts b/server/src/core/@generated/refresh-token/create-one-refresh-token.args.ts index cd6d099e4..fd6f04cef 100644 --- a/server/src/core/@generated/refresh-token/create-one-refresh-token.args.ts +++ b/server/src/core/@generated/refresh-token/create-one-refresh-token.args.ts @@ -9,7 +9,7 @@ export class CreateOneRefreshTokenArgs { @Field(() => RefreshTokenCreateInput, {nullable:false}) @Type(() => RefreshTokenCreateInput) - @ValidateNested({each: true}) @Type(() => RefreshTokenCreateInput) + @ValidateNested({each: true}) data!: RefreshTokenCreateInput; } diff --git a/server/src/core/@generated/refresh-token/update-many-refresh-token.args.ts b/server/src/core/@generated/refresh-token/update-many-refresh-token.args.ts index 51c0f7807..4670c0f53 100644 --- a/server/src/core/@generated/refresh-token/update-many-refresh-token.args.ts +++ b/server/src/core/@generated/refresh-token/update-many-refresh-token.args.ts @@ -10,8 +10,8 @@ export class UpdateManyRefreshTokenArgs { @Field(() => RefreshTokenUpdateManyMutationInput, {nullable:false}) @Type(() => RefreshTokenUpdateManyMutationInput) - @ValidateNested({each: true}) @Type(() => RefreshTokenUpdateManyMutationInput) + @ValidateNested({each: true}) data!: RefreshTokenUpdateManyMutationInput; @Field(() => RefreshTokenWhereInput, {nullable:true}) diff --git a/server/src/core/@generated/refresh-token/update-one-refresh-token.args.ts b/server/src/core/@generated/refresh-token/update-one-refresh-token.args.ts index c878ef06b..53f7031d0 100644 --- a/server/src/core/@generated/refresh-token/update-one-refresh-token.args.ts +++ b/server/src/core/@generated/refresh-token/update-one-refresh-token.args.ts @@ -10,8 +10,8 @@ export class UpdateOneRefreshTokenArgs { @Field(() => RefreshTokenUpdateInput, {nullable:false}) @Type(() => RefreshTokenUpdateInput) - @ValidateNested({each: true}) @Type(() => RefreshTokenUpdateInput) + @ValidateNested({each: true}) data!: RefreshTokenUpdateInput; @Field(() => RefreshTokenWhereUniqueInput, {nullable:false}) diff --git a/server/src/core/@generated/user/create-many-user.args.ts b/server/src/core/@generated/user/create-many-user.args.ts index e57cc3d60..c4911579e 100644 --- a/server/src/core/@generated/user/create-many-user.args.ts +++ b/server/src/core/@generated/user/create-many-user.args.ts @@ -9,8 +9,8 @@ export class CreateManyUserArgs { @Field(() => [UserCreateManyInput], {nullable:false}) @Type(() => UserCreateManyInput) - @ValidateNested({each: true}) @Type(() => UserCreateManyInput) + @ValidateNested({each: true}) data!: Array; @Field(() => Boolean, {nullable:true}) diff --git a/server/src/core/@generated/user/create-one-user.args.ts b/server/src/core/@generated/user/create-one-user.args.ts index 017efd836..0ae7729b1 100644 --- a/server/src/core/@generated/user/create-one-user.args.ts +++ b/server/src/core/@generated/user/create-one-user.args.ts @@ -9,7 +9,7 @@ export class CreateOneUserArgs { @Field(() => UserCreateInput, {nullable:false}) @Type(() => UserCreateInput) - @ValidateNested({each: true}) @Type(() => UserCreateInput) + @ValidateNested({each: true}) data!: UserCreateInput; } diff --git a/server/src/core/@generated/user/update-many-user.args.ts b/server/src/core/@generated/user/update-many-user.args.ts index 7b964a700..0b492226d 100644 --- a/server/src/core/@generated/user/update-many-user.args.ts +++ b/server/src/core/@generated/user/update-many-user.args.ts @@ -10,8 +10,8 @@ export class UpdateManyUserArgs { @Field(() => UserUpdateManyMutationInput, {nullable:false}) @Type(() => UserUpdateManyMutationInput) - @ValidateNested({each: true}) @Type(() => UserUpdateManyMutationInput) + @ValidateNested({each: true}) data!: UserUpdateManyMutationInput; @Field(() => UserWhereInput, {nullable:true}) diff --git a/server/src/core/@generated/user/update-one-user.args.ts b/server/src/core/@generated/user/update-one-user.args.ts index 819930ca9..025f33e68 100644 --- a/server/src/core/@generated/user/update-one-user.args.ts +++ b/server/src/core/@generated/user/update-one-user.args.ts @@ -10,8 +10,8 @@ export class UpdateOneUserArgs { @Field(() => UserUpdateInput, {nullable:false}) @Type(() => UserUpdateInput) - @ValidateNested({each: true}) @Type(() => UserUpdateInput) + @ValidateNested({each: true}) data!: UserUpdateInput; @Field(() => UserWhereUniqueInput, {nullable:false}) diff --git a/server/src/core/@generated/user/user-count-aggregate.input.ts b/server/src/core/@generated/user/user-count-aggregate.input.ts index 80604d952..ed7595ac4 100644 --- a/server/src/core/@generated/user/user-count-aggregate.input.ts +++ b/server/src/core/@generated/user/user-count-aggregate.input.ts @@ -14,9 +14,6 @@ export class UserCountAggregateInput { @Field(() => Boolean, {nullable:true}) lastName?: true; - @Field(() => Boolean, {nullable:true}) - displayName?: true; - @Field(() => Boolean, {nullable:true}) email?: true; diff --git a/server/src/core/@generated/user/user-count-aggregate.output.ts b/server/src/core/@generated/user/user-count-aggregate.output.ts index a5a1a9253..9fb8cb0b4 100644 --- a/server/src/core/@generated/user/user-count-aggregate.output.ts +++ b/server/src/core/@generated/user/user-count-aggregate.output.ts @@ -15,9 +15,6 @@ export class UserCountAggregate { @Field(() => Int, {nullable:false}) lastName!: number; - @HideField() - displayName!: number; - @Field(() => Int, {nullable:false}) email!: number; diff --git a/server/src/core/@generated/user/user-count-order-by-aggregate.input.ts b/server/src/core/@generated/user/user-count-order-by-aggregate.input.ts index 71d5133cc..c95802e51 100644 --- a/server/src/core/@generated/user/user-count-order-by-aggregate.input.ts +++ b/server/src/core/@generated/user/user-count-order-by-aggregate.input.ts @@ -15,9 +15,6 @@ export class UserCountOrderByAggregateInput { @Field(() => SortOrder, {nullable:true}) lastName?: keyof typeof SortOrder; - @Field(() => SortOrder, {nullable:true}) - displayName?: keyof typeof SortOrder; - @Field(() => SortOrder, {nullable:true}) email?: keyof typeof SortOrder; diff --git a/server/src/core/@generated/user/user-create-many.input.ts b/server/src/core/@generated/user/user-create-many.input.ts index b47d3ee42..b66f5263c 100644 --- a/server/src/core/@generated/user/user-create-many.input.ts +++ b/server/src/core/@generated/user/user-create-many.input.ts @@ -20,11 +20,6 @@ export class UserCreateManyInput { @Validator.IsString() lastName!: string; - @Field(() => String, {nullable:true}) - @Validator.IsString() - @Validator.IsOptional() - displayName?: string; - @Field(() => String, {nullable:false}) @Validator.IsEmail() email!: string; diff --git a/server/src/core/@generated/user/user-create-without-comments.input.ts b/server/src/core/@generated/user/user-create-without-comments.input.ts index 900f46f43..2820973bc 100644 --- a/server/src/core/@generated/user/user-create-without-comments.input.ts +++ b/server/src/core/@generated/user/user-create-without-comments.input.ts @@ -23,11 +23,6 @@ export class UserCreateWithoutCommentsInput { @Validator.IsString() lastName!: string; - @Field(() => String, {nullable:true}) - @Validator.IsString() - @Validator.IsOptional() - displayName?: string; - @Field(() => String, {nullable:false}) @Validator.IsEmail() email!: string; diff --git a/server/src/core/@generated/user/user-create-without-companies.input.ts b/server/src/core/@generated/user/user-create-without-companies.input.ts index e3e2c8f8b..05725e78b 100644 --- a/server/src/core/@generated/user/user-create-without-companies.input.ts +++ b/server/src/core/@generated/user/user-create-without-companies.input.ts @@ -23,11 +23,6 @@ export class UserCreateWithoutCompaniesInput { @Validator.IsString() lastName!: string; - @Field(() => String, {nullable:true}) - @Validator.IsString() - @Validator.IsOptional() - displayName?: string; - @Field(() => String, {nullable:false}) @Validator.IsEmail() email!: string; diff --git a/server/src/core/@generated/user/user-create-without-refresh-tokens.input.ts b/server/src/core/@generated/user/user-create-without-refresh-tokens.input.ts index 4e5b7a00e..2de51bc82 100644 --- a/server/src/core/@generated/user/user-create-without-refresh-tokens.input.ts +++ b/server/src/core/@generated/user/user-create-without-refresh-tokens.input.ts @@ -23,11 +23,6 @@ export class UserCreateWithoutRefreshTokensInput { @Validator.IsString() lastName!: string; - @Field(() => String, {nullable:true}) - @Validator.IsString() - @Validator.IsOptional() - displayName?: string; - @Field(() => String, {nullable:false}) @Validator.IsEmail() email!: string; diff --git a/server/src/core/@generated/user/user-create-without-workspace-member.input.ts b/server/src/core/@generated/user/user-create-without-workspace-member.input.ts index fbb9d1e53..53bbbe4cb 100644 --- a/server/src/core/@generated/user/user-create-without-workspace-member.input.ts +++ b/server/src/core/@generated/user/user-create-without-workspace-member.input.ts @@ -23,11 +23,6 @@ export class UserCreateWithoutWorkspaceMemberInput { @Validator.IsString() lastName!: string; - @Field(() => String, {nullable:true}) - @Validator.IsString() - @Validator.IsOptional() - displayName?: string; - @Field(() => String, {nullable:false}) @Validator.IsEmail() email!: string; diff --git a/server/src/core/@generated/user/user-create.input.ts b/server/src/core/@generated/user/user-create.input.ts index 52d1d7ff8..ffd550aa2 100644 --- a/server/src/core/@generated/user/user-create.input.ts +++ b/server/src/core/@generated/user/user-create.input.ts @@ -24,11 +24,6 @@ export class UserCreateInput { @Validator.IsString() lastName!: string; - @Field(() => String, {nullable:true}) - @Validator.IsString() - @Validator.IsOptional() - displayName?: string; - @Field(() => String, {nullable:false}) @Validator.IsEmail() email!: string; diff --git a/server/src/core/@generated/user/user-group-by.output.ts b/server/src/core/@generated/user/user-group-by.output.ts index db5c950ed..e0d02f678 100644 --- a/server/src/core/@generated/user/user-group-by.output.ts +++ b/server/src/core/@generated/user/user-group-by.output.ts @@ -23,9 +23,6 @@ export class UserGroupBy { @Validator.IsString() lastName!: string; - @HideField() - displayName?: string; - @Field(() => String, {nullable:false}) @Validator.IsEmail() email!: string; diff --git a/server/src/core/@generated/user/user-max-aggregate.input.ts b/server/src/core/@generated/user/user-max-aggregate.input.ts index faa7f6736..12b5e08d4 100644 --- a/server/src/core/@generated/user/user-max-aggregate.input.ts +++ b/server/src/core/@generated/user/user-max-aggregate.input.ts @@ -14,9 +14,6 @@ export class UserMaxAggregateInput { @Field(() => Boolean, {nullable:true}) lastName?: true; - @Field(() => Boolean, {nullable:true}) - displayName?: true; - @Field(() => Boolean, {nullable:true}) email?: true; diff --git a/server/src/core/@generated/user/user-max-aggregate.output.ts b/server/src/core/@generated/user/user-max-aggregate.output.ts index db864194a..be1ba0367 100644 --- a/server/src/core/@generated/user/user-max-aggregate.output.ts +++ b/server/src/core/@generated/user/user-max-aggregate.output.ts @@ -19,9 +19,6 @@ export class UserMaxAggregate { @Validator.IsString() lastName?: string; - @HideField() - displayName?: string; - @Field(() => String, {nullable:true}) @Validator.IsEmail() email?: string; diff --git a/server/src/core/@generated/user/user-max-order-by-aggregate.input.ts b/server/src/core/@generated/user/user-max-order-by-aggregate.input.ts index 7498b2b3d..56bae017a 100644 --- a/server/src/core/@generated/user/user-max-order-by-aggregate.input.ts +++ b/server/src/core/@generated/user/user-max-order-by-aggregate.input.ts @@ -15,9 +15,6 @@ export class UserMaxOrderByAggregateInput { @Field(() => SortOrder, {nullable:true}) lastName?: keyof typeof SortOrder; - @Field(() => SortOrder, {nullable:true}) - displayName?: keyof typeof SortOrder; - @Field(() => SortOrder, {nullable:true}) email?: keyof typeof SortOrder; diff --git a/server/src/core/@generated/user/user-min-aggregate.input.ts b/server/src/core/@generated/user/user-min-aggregate.input.ts index 3b6804dc3..0a87721a4 100644 --- a/server/src/core/@generated/user/user-min-aggregate.input.ts +++ b/server/src/core/@generated/user/user-min-aggregate.input.ts @@ -14,9 +14,6 @@ export class UserMinAggregateInput { @Field(() => Boolean, {nullable:true}) lastName?: true; - @Field(() => Boolean, {nullable:true}) - displayName?: true; - @Field(() => Boolean, {nullable:true}) email?: true; diff --git a/server/src/core/@generated/user/user-min-aggregate.output.ts b/server/src/core/@generated/user/user-min-aggregate.output.ts index 12df7ae43..7b5e32b3d 100644 --- a/server/src/core/@generated/user/user-min-aggregate.output.ts +++ b/server/src/core/@generated/user/user-min-aggregate.output.ts @@ -19,9 +19,6 @@ export class UserMinAggregate { @Validator.IsString() lastName?: string; - @HideField() - displayName?: string; - @Field(() => String, {nullable:true}) @Validator.IsEmail() email?: string; diff --git a/server/src/core/@generated/user/user-min-order-by-aggregate.input.ts b/server/src/core/@generated/user/user-min-order-by-aggregate.input.ts index 504b2e3d1..3c6c3c7ca 100644 --- a/server/src/core/@generated/user/user-min-order-by-aggregate.input.ts +++ b/server/src/core/@generated/user/user-min-order-by-aggregate.input.ts @@ -15,9 +15,6 @@ export class UserMinOrderByAggregateInput { @Field(() => SortOrder, {nullable:true}) lastName?: keyof typeof SortOrder; - @Field(() => SortOrder, {nullable:true}) - displayName?: keyof typeof SortOrder; - @Field(() => SortOrder, {nullable:true}) email?: keyof typeof SortOrder; diff --git a/server/src/core/@generated/user/user-order-by-with-aggregation.input.ts b/server/src/core/@generated/user/user-order-by-with-aggregation.input.ts index 87e587555..3835258c5 100644 --- a/server/src/core/@generated/user/user-order-by-with-aggregation.input.ts +++ b/server/src/core/@generated/user/user-order-by-with-aggregation.input.ts @@ -18,9 +18,6 @@ export class UserOrderByWithAggregationInput { @Field(() => SortOrder, {nullable:true}) lastName?: keyof typeof SortOrder; - @Field(() => SortOrder, {nullable:true}) - displayName?: keyof typeof SortOrder; - @Field(() => SortOrder, {nullable:true}) email?: keyof typeof SortOrder; diff --git a/server/src/core/@generated/user/user-order-by-with-relation.input.ts b/server/src/core/@generated/user/user-order-by-with-relation.input.ts index 3ed65063b..1472696c3 100644 --- a/server/src/core/@generated/user/user-order-by-with-relation.input.ts +++ b/server/src/core/@generated/user/user-order-by-with-relation.input.ts @@ -19,9 +19,6 @@ export class UserOrderByWithRelationInput { @Field(() => SortOrder, {nullable:true}) lastName?: keyof typeof SortOrder; - @Field(() => SortOrder, {nullable:true}) - displayName?: keyof typeof SortOrder; - @Field(() => SortOrder, {nullable:true}) email?: keyof typeof SortOrder; diff --git a/server/src/core/@generated/user/user-scalar-field.enum.ts b/server/src/core/@generated/user/user-scalar-field.enum.ts index 2b4074829..1973c189c 100644 --- a/server/src/core/@generated/user/user-scalar-field.enum.ts +++ b/server/src/core/@generated/user/user-scalar-field.enum.ts @@ -4,7 +4,6 @@ export enum UserScalarFieldEnum { id = "id", firstName = "firstName", lastName = "lastName", - displayName = "displayName", email = "email", emailVerified = "emailVerified", avatarUrl = "avatarUrl", diff --git a/server/src/core/@generated/user/user-scalar-where-with-aggregates.input.ts b/server/src/core/@generated/user/user-scalar-where-with-aggregates.input.ts index ad2ed58db..829bfefbb 100644 --- a/server/src/core/@generated/user/user-scalar-where-with-aggregates.input.ts +++ b/server/src/core/@generated/user/user-scalar-where-with-aggregates.input.ts @@ -1,8 +1,8 @@ import { Field } from '@nestjs/graphql'; import { InputType } from '@nestjs/graphql'; import { StringWithAggregatesFilter } from '../prisma/string-with-aggregates-filter.input'; -import { StringNullableWithAggregatesFilter } from '../prisma/string-nullable-with-aggregates-filter.input'; import { BoolWithAggregatesFilter } from '../prisma/bool-with-aggregates-filter.input'; +import { StringNullableWithAggregatesFilter } from '../prisma/string-nullable-with-aggregates-filter.input'; import { DateTimeNullableWithAggregatesFilter } from '../prisma/date-time-nullable-with-aggregates-filter.input'; import { HideField } from '@nestjs/graphql'; import { JsonNullableWithAggregatesFilter } from '../prisma/json-nullable-with-aggregates-filter.input'; @@ -29,9 +29,6 @@ export class UserScalarWhereWithAggregatesInput { @Field(() => StringWithAggregatesFilter, {nullable:true}) lastName?: StringWithAggregatesFilter; - @Field(() => StringNullableWithAggregatesFilter, {nullable:true}) - displayName?: StringNullableWithAggregatesFilter; - @Field(() => StringWithAggregatesFilter, {nullable:true}) email?: StringWithAggregatesFilter; diff --git a/server/src/core/@generated/user/user-unchecked-create-without-comments.input.ts b/server/src/core/@generated/user/user-unchecked-create-without-comments.input.ts index c129fc2e3..6a3ff5d9f 100644 --- a/server/src/core/@generated/user/user-unchecked-create-without-comments.input.ts +++ b/server/src/core/@generated/user/user-unchecked-create-without-comments.input.ts @@ -23,11 +23,6 @@ export class UserUncheckedCreateWithoutCommentsInput { @Validator.IsString() lastName!: string; - @Field(() => String, {nullable:true}) - @Validator.IsString() - @Validator.IsOptional() - displayName?: string; - @Field(() => String, {nullable:false}) @Validator.IsEmail() email!: string; diff --git a/server/src/core/@generated/user/user-unchecked-create-without-companies.input.ts b/server/src/core/@generated/user/user-unchecked-create-without-companies.input.ts index e09935663..fb40c8775 100644 --- a/server/src/core/@generated/user/user-unchecked-create-without-companies.input.ts +++ b/server/src/core/@generated/user/user-unchecked-create-without-companies.input.ts @@ -23,11 +23,6 @@ export class UserUncheckedCreateWithoutCompaniesInput { @Validator.IsString() lastName!: string; - @Field(() => String, {nullable:true}) - @Validator.IsString() - @Validator.IsOptional() - displayName?: string; - @Field(() => String, {nullable:false}) @Validator.IsEmail() email!: string; diff --git a/server/src/core/@generated/user/user-unchecked-create-without-refresh-tokens.input.ts b/server/src/core/@generated/user/user-unchecked-create-without-refresh-tokens.input.ts index 8c48d2ef7..2a258119f 100644 --- a/server/src/core/@generated/user/user-unchecked-create-without-refresh-tokens.input.ts +++ b/server/src/core/@generated/user/user-unchecked-create-without-refresh-tokens.input.ts @@ -23,11 +23,6 @@ export class UserUncheckedCreateWithoutRefreshTokensInput { @Validator.IsString() lastName!: string; - @Field(() => String, {nullable:true}) - @Validator.IsString() - @Validator.IsOptional() - displayName?: string; - @Field(() => String, {nullable:false}) @Validator.IsEmail() email!: string; diff --git a/server/src/core/@generated/user/user-unchecked-create-without-workspace-member.input.ts b/server/src/core/@generated/user/user-unchecked-create-without-workspace-member.input.ts index 714ef5992..12c65db6b 100644 --- a/server/src/core/@generated/user/user-unchecked-create-without-workspace-member.input.ts +++ b/server/src/core/@generated/user/user-unchecked-create-without-workspace-member.input.ts @@ -23,11 +23,6 @@ export class UserUncheckedCreateWithoutWorkspaceMemberInput { @Validator.IsString() lastName!: string; - @Field(() => String, {nullable:true}) - @Validator.IsString() - @Validator.IsOptional() - displayName?: string; - @Field(() => String, {nullable:false}) @Validator.IsEmail() email!: string; diff --git a/server/src/core/@generated/user/user-unchecked-create.input.ts b/server/src/core/@generated/user/user-unchecked-create.input.ts index 24194e93a..e9b43a576 100644 --- a/server/src/core/@generated/user/user-unchecked-create.input.ts +++ b/server/src/core/@generated/user/user-unchecked-create.input.ts @@ -24,11 +24,6 @@ export class UserUncheckedCreateInput { @Validator.IsString() lastName!: string; - @Field(() => String, {nullable:true}) - @Validator.IsString() - @Validator.IsOptional() - displayName?: string; - @Field(() => String, {nullable:false}) @Validator.IsEmail() email!: string; diff --git a/server/src/core/@generated/user/user-unchecked-update-many.input.ts b/server/src/core/@generated/user/user-unchecked-update-many.input.ts index 6d71c0262..fc0db60e6 100644 --- a/server/src/core/@generated/user/user-unchecked-update-many.input.ts +++ b/server/src/core/@generated/user/user-unchecked-update-many.input.ts @@ -1,8 +1,8 @@ import { Field } from '@nestjs/graphql'; import { InputType } from '@nestjs/graphql'; import { StringFieldUpdateOperationsInput } from '../prisma/string-field-update-operations.input'; -import { NullableStringFieldUpdateOperationsInput } from '../prisma/nullable-string-field-update-operations.input'; import { BoolFieldUpdateOperationsInput } from '../prisma/bool-field-update-operations.input'; +import { NullableStringFieldUpdateOperationsInput } from '../prisma/nullable-string-field-update-operations.input'; import { NullableDateTimeFieldUpdateOperationsInput } from '../prisma/nullable-date-time-field-update-operations.input'; import { HideField } from '@nestjs/graphql'; import { GraphQLJSON } from 'graphql-type-json'; @@ -21,9 +21,6 @@ export class UserUncheckedUpdateManyInput { @Field(() => StringFieldUpdateOperationsInput, {nullable:true}) lastName?: StringFieldUpdateOperationsInput; - @Field(() => NullableStringFieldUpdateOperationsInput, {nullable:true}) - displayName?: NullableStringFieldUpdateOperationsInput; - @Field(() => StringFieldUpdateOperationsInput, {nullable:true}) email?: StringFieldUpdateOperationsInput; diff --git a/server/src/core/@generated/user/user-unchecked-update-without-comments.input.ts b/server/src/core/@generated/user/user-unchecked-update-without-comments.input.ts index ab83861df..57678cd5c 100644 --- a/server/src/core/@generated/user/user-unchecked-update-without-comments.input.ts +++ b/server/src/core/@generated/user/user-unchecked-update-without-comments.input.ts @@ -1,8 +1,8 @@ import { Field } from '@nestjs/graphql'; import { InputType } from '@nestjs/graphql'; import { StringFieldUpdateOperationsInput } from '../prisma/string-field-update-operations.input'; -import { NullableStringFieldUpdateOperationsInput } from '../prisma/nullable-string-field-update-operations.input'; import { BoolFieldUpdateOperationsInput } from '../prisma/bool-field-update-operations.input'; +import { NullableStringFieldUpdateOperationsInput } from '../prisma/nullable-string-field-update-operations.input'; import { NullableDateTimeFieldUpdateOperationsInput } from '../prisma/nullable-date-time-field-update-operations.input'; import { HideField } from '@nestjs/graphql'; import { GraphQLJSON } from 'graphql-type-json'; @@ -24,9 +24,6 @@ export class UserUncheckedUpdateWithoutCommentsInput { @Field(() => StringFieldUpdateOperationsInput, {nullable:true}) lastName?: StringFieldUpdateOperationsInput; - @Field(() => NullableStringFieldUpdateOperationsInput, {nullable:true}) - displayName?: NullableStringFieldUpdateOperationsInput; - @Field(() => StringFieldUpdateOperationsInput, {nullable:true}) email?: StringFieldUpdateOperationsInput; diff --git a/server/src/core/@generated/user/user-unchecked-update-without-companies.input.ts b/server/src/core/@generated/user/user-unchecked-update-without-companies.input.ts index 81e249d9f..984f85a67 100644 --- a/server/src/core/@generated/user/user-unchecked-update-without-companies.input.ts +++ b/server/src/core/@generated/user/user-unchecked-update-without-companies.input.ts @@ -1,8 +1,8 @@ import { Field } from '@nestjs/graphql'; import { InputType } from '@nestjs/graphql'; import { StringFieldUpdateOperationsInput } from '../prisma/string-field-update-operations.input'; -import { NullableStringFieldUpdateOperationsInput } from '../prisma/nullable-string-field-update-operations.input'; import { BoolFieldUpdateOperationsInput } from '../prisma/bool-field-update-operations.input'; +import { NullableStringFieldUpdateOperationsInput } from '../prisma/nullable-string-field-update-operations.input'; import { NullableDateTimeFieldUpdateOperationsInput } from '../prisma/nullable-date-time-field-update-operations.input'; import { HideField } from '@nestjs/graphql'; import { GraphQLJSON } from 'graphql-type-json'; @@ -24,9 +24,6 @@ export class UserUncheckedUpdateWithoutCompaniesInput { @Field(() => StringFieldUpdateOperationsInput, {nullable:true}) lastName?: StringFieldUpdateOperationsInput; - @Field(() => NullableStringFieldUpdateOperationsInput, {nullable:true}) - displayName?: NullableStringFieldUpdateOperationsInput; - @Field(() => StringFieldUpdateOperationsInput, {nullable:true}) email?: StringFieldUpdateOperationsInput; diff --git a/server/src/core/@generated/user/user-unchecked-update-without-refresh-tokens.input.ts b/server/src/core/@generated/user/user-unchecked-update-without-refresh-tokens.input.ts index 8256f23b7..1153e2c0a 100644 --- a/server/src/core/@generated/user/user-unchecked-update-without-refresh-tokens.input.ts +++ b/server/src/core/@generated/user/user-unchecked-update-without-refresh-tokens.input.ts @@ -1,8 +1,8 @@ import { Field } from '@nestjs/graphql'; import { InputType } from '@nestjs/graphql'; import { StringFieldUpdateOperationsInput } from '../prisma/string-field-update-operations.input'; -import { NullableStringFieldUpdateOperationsInput } from '../prisma/nullable-string-field-update-operations.input'; import { BoolFieldUpdateOperationsInput } from '../prisma/bool-field-update-operations.input'; +import { NullableStringFieldUpdateOperationsInput } from '../prisma/nullable-string-field-update-operations.input'; import { NullableDateTimeFieldUpdateOperationsInput } from '../prisma/nullable-date-time-field-update-operations.input'; import { HideField } from '@nestjs/graphql'; import { GraphQLJSON } from 'graphql-type-json'; @@ -24,9 +24,6 @@ export class UserUncheckedUpdateWithoutRefreshTokensInput { @Field(() => StringFieldUpdateOperationsInput, {nullable:true}) lastName?: StringFieldUpdateOperationsInput; - @Field(() => NullableStringFieldUpdateOperationsInput, {nullable:true}) - displayName?: NullableStringFieldUpdateOperationsInput; - @Field(() => StringFieldUpdateOperationsInput, {nullable:true}) email?: StringFieldUpdateOperationsInput; diff --git a/server/src/core/@generated/user/user-unchecked-update-without-workspace-member.input.ts b/server/src/core/@generated/user/user-unchecked-update-without-workspace-member.input.ts index 32d0191d4..9d30bd8b6 100644 --- a/server/src/core/@generated/user/user-unchecked-update-without-workspace-member.input.ts +++ b/server/src/core/@generated/user/user-unchecked-update-without-workspace-member.input.ts @@ -1,8 +1,8 @@ import { Field } from '@nestjs/graphql'; import { InputType } from '@nestjs/graphql'; import { StringFieldUpdateOperationsInput } from '../prisma/string-field-update-operations.input'; -import { NullableStringFieldUpdateOperationsInput } from '../prisma/nullable-string-field-update-operations.input'; import { BoolFieldUpdateOperationsInput } from '../prisma/bool-field-update-operations.input'; +import { NullableStringFieldUpdateOperationsInput } from '../prisma/nullable-string-field-update-operations.input'; import { NullableDateTimeFieldUpdateOperationsInput } from '../prisma/nullable-date-time-field-update-operations.input'; import { HideField } from '@nestjs/graphql'; import { GraphQLJSON } from 'graphql-type-json'; @@ -24,9 +24,6 @@ export class UserUncheckedUpdateWithoutWorkspaceMemberInput { @Field(() => StringFieldUpdateOperationsInput, {nullable:true}) lastName?: StringFieldUpdateOperationsInput; - @Field(() => NullableStringFieldUpdateOperationsInput, {nullable:true}) - displayName?: NullableStringFieldUpdateOperationsInput; - @Field(() => StringFieldUpdateOperationsInput, {nullable:true}) email?: StringFieldUpdateOperationsInput; diff --git a/server/src/core/@generated/user/user-unchecked-update.input.ts b/server/src/core/@generated/user/user-unchecked-update.input.ts index 085a00c1d..20818ebf8 100644 --- a/server/src/core/@generated/user/user-unchecked-update.input.ts +++ b/server/src/core/@generated/user/user-unchecked-update.input.ts @@ -1,8 +1,8 @@ import { Field } from '@nestjs/graphql'; import { InputType } from '@nestjs/graphql'; import { StringFieldUpdateOperationsInput } from '../prisma/string-field-update-operations.input'; -import { NullableStringFieldUpdateOperationsInput } from '../prisma/nullable-string-field-update-operations.input'; import { BoolFieldUpdateOperationsInput } from '../prisma/bool-field-update-operations.input'; +import { NullableStringFieldUpdateOperationsInput } from '../prisma/nullable-string-field-update-operations.input'; import { NullableDateTimeFieldUpdateOperationsInput } from '../prisma/nullable-date-time-field-update-operations.input'; import { HideField } from '@nestjs/graphql'; import { GraphQLJSON } from 'graphql-type-json'; @@ -25,9 +25,6 @@ export class UserUncheckedUpdateInput { @Field(() => StringFieldUpdateOperationsInput, {nullable:true}) lastName?: StringFieldUpdateOperationsInput; - @Field(() => NullableStringFieldUpdateOperationsInput, {nullable:true}) - displayName?: NullableStringFieldUpdateOperationsInput; - @Field(() => StringFieldUpdateOperationsInput, {nullable:true}) email?: StringFieldUpdateOperationsInput; diff --git a/server/src/core/@generated/user/user-update-many-mutation.input.ts b/server/src/core/@generated/user/user-update-many-mutation.input.ts index d72f5e89a..509f91de5 100644 --- a/server/src/core/@generated/user/user-update-many-mutation.input.ts +++ b/server/src/core/@generated/user/user-update-many-mutation.input.ts @@ -1,8 +1,8 @@ import { Field } from '@nestjs/graphql'; import { InputType } from '@nestjs/graphql'; import { StringFieldUpdateOperationsInput } from '../prisma/string-field-update-operations.input'; -import { NullableStringFieldUpdateOperationsInput } from '../prisma/nullable-string-field-update-operations.input'; import { BoolFieldUpdateOperationsInput } from '../prisma/bool-field-update-operations.input'; +import { NullableStringFieldUpdateOperationsInput } from '../prisma/nullable-string-field-update-operations.input'; import { NullableDateTimeFieldUpdateOperationsInput } from '../prisma/nullable-date-time-field-update-operations.input'; import { HideField } from '@nestjs/graphql'; import { GraphQLJSON } from 'graphql-type-json'; @@ -21,9 +21,6 @@ export class UserUpdateManyMutationInput { @Field(() => StringFieldUpdateOperationsInput, {nullable:true}) lastName?: StringFieldUpdateOperationsInput; - @Field(() => NullableStringFieldUpdateOperationsInput, {nullable:true}) - displayName?: NullableStringFieldUpdateOperationsInput; - @Field(() => StringFieldUpdateOperationsInput, {nullable:true}) email?: StringFieldUpdateOperationsInput; diff --git a/server/src/core/@generated/user/user-update-without-comments.input.ts b/server/src/core/@generated/user/user-update-without-comments.input.ts index 7c59a9aa2..57c4cc819 100644 --- a/server/src/core/@generated/user/user-update-without-comments.input.ts +++ b/server/src/core/@generated/user/user-update-without-comments.input.ts @@ -1,8 +1,8 @@ import { Field } from '@nestjs/graphql'; import { InputType } from '@nestjs/graphql'; import { StringFieldUpdateOperationsInput } from '../prisma/string-field-update-operations.input'; -import { NullableStringFieldUpdateOperationsInput } from '../prisma/nullable-string-field-update-operations.input'; import { BoolFieldUpdateOperationsInput } from '../prisma/bool-field-update-operations.input'; +import { NullableStringFieldUpdateOperationsInput } from '../prisma/nullable-string-field-update-operations.input'; import { NullableDateTimeFieldUpdateOperationsInput } from '../prisma/nullable-date-time-field-update-operations.input'; import { HideField } from '@nestjs/graphql'; import { GraphQLJSON } from 'graphql-type-json'; @@ -24,9 +24,6 @@ export class UserUpdateWithoutCommentsInput { @Field(() => StringFieldUpdateOperationsInput, {nullable:true}) lastName?: StringFieldUpdateOperationsInput; - @Field(() => NullableStringFieldUpdateOperationsInput, {nullable:true}) - displayName?: NullableStringFieldUpdateOperationsInput; - @Field(() => StringFieldUpdateOperationsInput, {nullable:true}) email?: StringFieldUpdateOperationsInput; diff --git a/server/src/core/@generated/user/user-update-without-companies.input.ts b/server/src/core/@generated/user/user-update-without-companies.input.ts index 1bc5460c7..d6746471e 100644 --- a/server/src/core/@generated/user/user-update-without-companies.input.ts +++ b/server/src/core/@generated/user/user-update-without-companies.input.ts @@ -1,8 +1,8 @@ import { Field } from '@nestjs/graphql'; import { InputType } from '@nestjs/graphql'; import { StringFieldUpdateOperationsInput } from '../prisma/string-field-update-operations.input'; -import { NullableStringFieldUpdateOperationsInput } from '../prisma/nullable-string-field-update-operations.input'; import { BoolFieldUpdateOperationsInput } from '../prisma/bool-field-update-operations.input'; +import { NullableStringFieldUpdateOperationsInput } from '../prisma/nullable-string-field-update-operations.input'; import { NullableDateTimeFieldUpdateOperationsInput } from '../prisma/nullable-date-time-field-update-operations.input'; import { HideField } from '@nestjs/graphql'; import { GraphQLJSON } from 'graphql-type-json'; @@ -24,9 +24,6 @@ export class UserUpdateWithoutCompaniesInput { @Field(() => StringFieldUpdateOperationsInput, {nullable:true}) lastName?: StringFieldUpdateOperationsInput; - @Field(() => NullableStringFieldUpdateOperationsInput, {nullable:true}) - displayName?: NullableStringFieldUpdateOperationsInput; - @Field(() => StringFieldUpdateOperationsInput, {nullable:true}) email?: StringFieldUpdateOperationsInput; diff --git a/server/src/core/@generated/user/user-update-without-refresh-tokens.input.ts b/server/src/core/@generated/user/user-update-without-refresh-tokens.input.ts index 7a3e64a8b..94d8938ce 100644 --- a/server/src/core/@generated/user/user-update-without-refresh-tokens.input.ts +++ b/server/src/core/@generated/user/user-update-without-refresh-tokens.input.ts @@ -1,8 +1,8 @@ import { Field } from '@nestjs/graphql'; import { InputType } from '@nestjs/graphql'; import { StringFieldUpdateOperationsInput } from '../prisma/string-field-update-operations.input'; -import { NullableStringFieldUpdateOperationsInput } from '../prisma/nullable-string-field-update-operations.input'; import { BoolFieldUpdateOperationsInput } from '../prisma/bool-field-update-operations.input'; +import { NullableStringFieldUpdateOperationsInput } from '../prisma/nullable-string-field-update-operations.input'; import { NullableDateTimeFieldUpdateOperationsInput } from '../prisma/nullable-date-time-field-update-operations.input'; import { HideField } from '@nestjs/graphql'; import { GraphQLJSON } from 'graphql-type-json'; @@ -24,9 +24,6 @@ export class UserUpdateWithoutRefreshTokensInput { @Field(() => StringFieldUpdateOperationsInput, {nullable:true}) lastName?: StringFieldUpdateOperationsInput; - @Field(() => NullableStringFieldUpdateOperationsInput, {nullable:true}) - displayName?: NullableStringFieldUpdateOperationsInput; - @Field(() => StringFieldUpdateOperationsInput, {nullable:true}) email?: StringFieldUpdateOperationsInput; diff --git a/server/src/core/@generated/user/user-update-without-workspace-member.input.ts b/server/src/core/@generated/user/user-update-without-workspace-member.input.ts index 084a9f8ac..6b24e0df7 100644 --- a/server/src/core/@generated/user/user-update-without-workspace-member.input.ts +++ b/server/src/core/@generated/user/user-update-without-workspace-member.input.ts @@ -1,8 +1,8 @@ import { Field } from '@nestjs/graphql'; import { InputType } from '@nestjs/graphql'; import { StringFieldUpdateOperationsInput } from '../prisma/string-field-update-operations.input'; -import { NullableStringFieldUpdateOperationsInput } from '../prisma/nullable-string-field-update-operations.input'; import { BoolFieldUpdateOperationsInput } from '../prisma/bool-field-update-operations.input'; +import { NullableStringFieldUpdateOperationsInput } from '../prisma/nullable-string-field-update-operations.input'; import { NullableDateTimeFieldUpdateOperationsInput } from '../prisma/nullable-date-time-field-update-operations.input'; import { HideField } from '@nestjs/graphql'; import { GraphQLJSON } from 'graphql-type-json'; @@ -24,9 +24,6 @@ export class UserUpdateWithoutWorkspaceMemberInput { @Field(() => StringFieldUpdateOperationsInput, {nullable:true}) lastName?: StringFieldUpdateOperationsInput; - @Field(() => NullableStringFieldUpdateOperationsInput, {nullable:true}) - displayName?: NullableStringFieldUpdateOperationsInput; - @Field(() => StringFieldUpdateOperationsInput, {nullable:true}) email?: StringFieldUpdateOperationsInput; diff --git a/server/src/core/@generated/user/user-update.input.ts b/server/src/core/@generated/user/user-update.input.ts index 6798854ce..8892a70e2 100644 --- a/server/src/core/@generated/user/user-update.input.ts +++ b/server/src/core/@generated/user/user-update.input.ts @@ -1,8 +1,8 @@ import { Field } from '@nestjs/graphql'; import { InputType } from '@nestjs/graphql'; import { StringFieldUpdateOperationsInput } from '../prisma/string-field-update-operations.input'; -import { NullableStringFieldUpdateOperationsInput } from '../prisma/nullable-string-field-update-operations.input'; import { BoolFieldUpdateOperationsInput } from '../prisma/bool-field-update-operations.input'; +import { NullableStringFieldUpdateOperationsInput } from '../prisma/nullable-string-field-update-operations.input'; import { NullableDateTimeFieldUpdateOperationsInput } from '../prisma/nullable-date-time-field-update-operations.input'; import { HideField } from '@nestjs/graphql'; import { GraphQLJSON } from 'graphql-type-json'; @@ -25,9 +25,6 @@ export class UserUpdateInput { @Field(() => StringFieldUpdateOperationsInput, {nullable:true}) lastName?: StringFieldUpdateOperationsInput; - @Field(() => NullableStringFieldUpdateOperationsInput, {nullable:true}) - displayName?: NullableStringFieldUpdateOperationsInput; - @Field(() => StringFieldUpdateOperationsInput, {nullable:true}) email?: StringFieldUpdateOperationsInput; diff --git a/server/src/core/@generated/user/user-where.input.ts b/server/src/core/@generated/user/user-where.input.ts index ae2bc9da4..2e1cd9434 100644 --- a/server/src/core/@generated/user/user-where.input.ts +++ b/server/src/core/@generated/user/user-where.input.ts @@ -1,8 +1,8 @@ import { Field } from '@nestjs/graphql'; import { InputType } from '@nestjs/graphql'; import { StringFilter } from '../prisma/string-filter.input'; -import { StringNullableFilter } from '../prisma/string-nullable-filter.input'; import { BoolFilter } from '../prisma/bool-filter.input'; +import { StringNullableFilter } from '../prisma/string-nullable-filter.input'; import { DateTimeNullableFilter } from '../prisma/date-time-nullable-filter.input'; import { HideField } from '@nestjs/graphql'; import { JsonNullableFilter } from '../prisma/json-nullable-filter.input'; @@ -33,9 +33,6 @@ export class UserWhereInput { @Field(() => StringFilter, {nullable:true}) lastName?: StringFilter; - @Field(() => StringNullableFilter, {nullable:true}) - displayName?: StringNullableFilter; - @Field(() => StringFilter, {nullable:true}) email?: StringFilter; diff --git a/server/src/core/@generated/user/user.model.ts b/server/src/core/@generated/user/user.model.ts index 504e6d71f..0a053ce3f 100644 --- a/server/src/core/@generated/user/user.model.ts +++ b/server/src/core/@generated/user/user.model.ts @@ -21,9 +21,6 @@ export class User { @Field(() => String, {nullable:false}) lastName!: string; - @HideField() - displayName!: string | null; - @Field(() => String, {nullable:false}) email!: string; diff --git a/server/src/core/@generated/workspace-member/create-many-workspace-member.args.ts b/server/src/core/@generated/workspace-member/create-many-workspace-member.args.ts index 6200d2a3c..62dd8da7c 100644 --- a/server/src/core/@generated/workspace-member/create-many-workspace-member.args.ts +++ b/server/src/core/@generated/workspace-member/create-many-workspace-member.args.ts @@ -9,8 +9,8 @@ export class CreateManyWorkspaceMemberArgs { @Field(() => [WorkspaceMemberCreateManyInput], {nullable:false}) @Type(() => WorkspaceMemberCreateManyInput) - @ValidateNested({each: true}) @Type(() => WorkspaceMemberCreateManyInput) + @ValidateNested({each: true}) data!: Array; @Field(() => Boolean, {nullable:true}) diff --git a/server/src/core/@generated/workspace-member/create-one-workspace-member.args.ts b/server/src/core/@generated/workspace-member/create-one-workspace-member.args.ts index 81c65ffab..17614ef69 100644 --- a/server/src/core/@generated/workspace-member/create-one-workspace-member.args.ts +++ b/server/src/core/@generated/workspace-member/create-one-workspace-member.args.ts @@ -9,7 +9,7 @@ export class CreateOneWorkspaceMemberArgs { @Field(() => WorkspaceMemberCreateInput, {nullable:false}) @Type(() => WorkspaceMemberCreateInput) - @ValidateNested({each: true}) @Type(() => WorkspaceMemberCreateInput) + @ValidateNested({each: true}) data!: WorkspaceMemberCreateInput; } diff --git a/server/src/core/@generated/workspace-member/update-many-workspace-member.args.ts b/server/src/core/@generated/workspace-member/update-many-workspace-member.args.ts index 3b90fb76a..d850a6eb0 100644 --- a/server/src/core/@generated/workspace-member/update-many-workspace-member.args.ts +++ b/server/src/core/@generated/workspace-member/update-many-workspace-member.args.ts @@ -10,8 +10,8 @@ export class UpdateManyWorkspaceMemberArgs { @Field(() => WorkspaceMemberUpdateManyMutationInput, {nullable:false}) @Type(() => WorkspaceMemberUpdateManyMutationInput) - @ValidateNested({each: true}) @Type(() => WorkspaceMemberUpdateManyMutationInput) + @ValidateNested({each: true}) data!: WorkspaceMemberUpdateManyMutationInput; @Field(() => WorkspaceMemberWhereInput, {nullable:true}) diff --git a/server/src/core/@generated/workspace-member/update-one-workspace-member.args.ts b/server/src/core/@generated/workspace-member/update-one-workspace-member.args.ts index 06e17b917..4f5f2b2d4 100644 --- a/server/src/core/@generated/workspace-member/update-one-workspace-member.args.ts +++ b/server/src/core/@generated/workspace-member/update-one-workspace-member.args.ts @@ -10,8 +10,8 @@ export class UpdateOneWorkspaceMemberArgs { @Field(() => WorkspaceMemberUpdateInput, {nullable:false}) @Type(() => WorkspaceMemberUpdateInput) - @ValidateNested({each: true}) @Type(() => WorkspaceMemberUpdateInput) + @ValidateNested({each: true}) data!: WorkspaceMemberUpdateInput; @Field(() => WorkspaceMemberWhereUniqueInput, {nullable:false}) diff --git a/server/src/core/@generated/workspace/create-many-workspace.args.ts b/server/src/core/@generated/workspace/create-many-workspace.args.ts index 9dc7e7e9e..11636c24d 100644 --- a/server/src/core/@generated/workspace/create-many-workspace.args.ts +++ b/server/src/core/@generated/workspace/create-many-workspace.args.ts @@ -9,8 +9,8 @@ export class CreateManyWorkspaceArgs { @Field(() => [WorkspaceCreateManyInput], {nullable:false}) @Type(() => WorkspaceCreateManyInput) - @ValidateNested({each: true}) @Type(() => WorkspaceCreateManyInput) + @ValidateNested({each: true}) data!: Array; @Field(() => Boolean, {nullable:true}) diff --git a/server/src/core/@generated/workspace/create-one-workspace.args.ts b/server/src/core/@generated/workspace/create-one-workspace.args.ts index ce2dec159..22b1f766f 100644 --- a/server/src/core/@generated/workspace/create-one-workspace.args.ts +++ b/server/src/core/@generated/workspace/create-one-workspace.args.ts @@ -9,7 +9,7 @@ export class CreateOneWorkspaceArgs { @Field(() => WorkspaceCreateInput, {nullable:false}) @Type(() => WorkspaceCreateInput) - @ValidateNested({each: true}) @Type(() => WorkspaceCreateInput) + @ValidateNested({each: true}) data!: WorkspaceCreateInput; } diff --git a/server/src/core/@generated/workspace/update-many-workspace.args.ts b/server/src/core/@generated/workspace/update-many-workspace.args.ts index 7772c4a69..ee0c3f95f 100644 --- a/server/src/core/@generated/workspace/update-many-workspace.args.ts +++ b/server/src/core/@generated/workspace/update-many-workspace.args.ts @@ -10,8 +10,8 @@ export class UpdateManyWorkspaceArgs { @Field(() => WorkspaceUpdateManyMutationInput, {nullable:false}) @Type(() => WorkspaceUpdateManyMutationInput) - @ValidateNested({each: true}) @Type(() => WorkspaceUpdateManyMutationInput) + @ValidateNested({each: true}) data!: WorkspaceUpdateManyMutationInput; @Field(() => WorkspaceWhereInput, {nullable:true}) diff --git a/server/src/core/@generated/workspace/update-one-workspace.args.ts b/server/src/core/@generated/workspace/update-one-workspace.args.ts index d28d7161b..151ae42a1 100644 --- a/server/src/core/@generated/workspace/update-one-workspace.args.ts +++ b/server/src/core/@generated/workspace/update-one-workspace.args.ts @@ -10,8 +10,8 @@ export class UpdateOneWorkspaceArgs { @Field(() => WorkspaceUpdateInput, {nullable:false}) @Type(() => WorkspaceUpdateInput) - @ValidateNested({each: true}) @Type(() => WorkspaceUpdateInput) + @ValidateNested({each: true}) data!: WorkspaceUpdateInput; @Field(() => WorkspaceWhereUniqueInput, {nullable:false}) diff --git a/server/src/core/auth/auth.resolver.ts b/server/src/core/auth/auth.resolver.ts index f2ff3e212..d4eea4f46 100644 --- a/server/src/core/auth/auth.resolver.ts +++ b/server/src/core/auth/auth.resolver.ts @@ -8,6 +8,11 @@ import { VerifyInput } from './dto/verify.input'; import { AuthService } from './services/auth.service'; import { LoginToken } from './dto/login-token.entity'; import { ChallengeInput } from './dto/challenge.input'; +import { + PrismaSelect, + PrismaSelector, +} from 'src/decorators/prisma-select.decorator'; +import { Prisma } from '@prisma/client'; @Resolver() export class AuthResolver { @@ -25,11 +30,21 @@ export class AuthResolver { } @Mutation(() => Verify) - async verify(@Args() verifyInput: VerifyInput): Promise { + async verify( + @Args() verifyInput: VerifyInput, + @PrismaSelector({ + modelName: 'User', + defaultFields: { User: { id: true } }, + }) + prismaSelect: PrismaSelect<'User'>, + ): Promise { const email = await this.tokenService.verifyLoginToken( verifyInput.loginToken, ); - const result = await this.authService.verify(email); + const select = prismaSelect.valueOf('user') as Prisma.UserSelect & { + id: true; + }; + const result = await this.authService.verify(email, select); return result; } diff --git a/server/src/core/auth/controllers/verify-auth.controller.ts b/server/src/core/auth/controllers/verify-auth.controller.ts index 92a0ead6b..0fd2fd98d 100644 --- a/server/src/core/auth/controllers/verify-auth.controller.ts +++ b/server/src/core/auth/controllers/verify-auth.controller.ts @@ -16,7 +16,13 @@ export class VerifyAuthController { const email = await this.tokenService.verifyLoginToken( verifyInput.loginToken, ); - const result = await this.authService.verify(email); + const result = await this.authService.verify(email, { + id: true, + firstName: true, + lastName: true, + email: true, + emailVerified: true, + }); return result; } diff --git a/server/src/core/auth/dto/verify.entity.ts b/server/src/core/auth/dto/verify.entity.ts index 087de7eb7..f8ed483f1 100644 --- a/server/src/core/auth/dto/verify.entity.ts +++ b/server/src/core/auth/dto/verify.entity.ts @@ -5,5 +5,5 @@ import { User } from 'src/core/@generated/user/user.model'; @ObjectType() export class Verify extends AuthTokens { @Field(() => User) - user: User; + user: Partial; } diff --git a/server/src/core/auth/services/auth.service.ts b/server/src/core/auth/services/auth.service.ts index d77a6c994..c5a2114b5 100644 --- a/server/src/core/auth/services/auth.service.ts +++ b/server/src/core/auth/services/auth.service.ts @@ -11,6 +11,7 @@ import { RegisterInput } from '../dto/register.input'; import { PASSWORD_REGEX, compareHash, hashPassword } from '../auth.util'; import { Verify } from '../dto/verify.entity'; import { TokenService } from './token.service'; +import { Prisma } from '@prisma/client'; export type UserPayload = { firstName: string; @@ -74,11 +75,17 @@ export class AuthService { return user; } - async verify(email: string): Promise { + async verify( + email: string, + select: Prisma.UserSelect & { + id: true; + }, + ): Promise { const user = await this.userService.findUnique({ where: { email, }, + select, }); assert(user, "This user doesn't exist", NotFoundException); diff --git a/server/src/core/user/user.resolver.ts b/server/src/core/user/user.resolver.ts index a7fd82156..097f749d1 100644 --- a/server/src/core/user/user.resolver.ts +++ b/server/src/core/user/user.resolver.ts @@ -1,8 +1,6 @@ import { Args, Resolver, Query, ResolveField, Parent } from '@nestjs/graphql'; import { UserService } from './user.service'; import { FindManyUserArgs } from 'src/core/@generated/user/find-many-user.args'; -import { Workspace } from '@prisma/client'; -import { AuthWorkspace } from 'src/decorators/auth-workspace.decorator'; import { User } from 'src/core/@generated/user/user.model'; import { ExceptionFilter } from 'src/filters/exception.filter'; import { UseFilters, UseGuards } from '@nestjs/common'; @@ -31,7 +29,6 @@ export class UserResolver { @CheckAbilities(ReadUserAbilityHandler) async findManyUser( @Args() args: FindManyUserArgs, - @AuthWorkspace() workspace: Workspace, @UserAbility() ability: AppAbility, @PrismaSelector({ modelName: 'User' }) prismaSelect: PrismaSelect<'User'>, @@ -51,11 +48,6 @@ export class UserResolver { nullable: false, }) displayName(@Parent() parent: User): string { - // TODO: Should be removed when displayName is removed from the database - if (!parent.firstName && !parent.lastName) { - return parent.displayName ?? ''; - } - - return `${parent.firstName} ${parent.lastName}`; + return `${parent.firstName ?? ''} ${parent.lastName ?? ''}`; } } diff --git a/server/src/database/migrations/20230704123330_alter_table_user_delete_display_name/migration.sql b/server/src/database/migrations/20230704123330_alter_table_user_delete_display_name/migration.sql new file mode 100644 index 000000000..0b87aa98d --- /dev/null +++ b/server/src/database/migrations/20230704123330_alter_table_user_delete_display_name/migration.sql @@ -0,0 +1,10 @@ +/* + Warnings: + + - You are about to drop the column `displayName` on the `users` table. All the data in the column will be lost. + +*/ +-- AlterTable +ALTER TABLE "users" DROP COLUMN "displayName", +ALTER COLUMN "firstName" DROP DEFAULT, +ALTER COLUMN "lastName" DROP DEFAULT; diff --git a/server/src/database/schema.prisma b/server/src/database/schema.prisma index 8aa186acc..32d5aab92 100644 --- a/server/src/database/schema.prisma +++ b/server/src/database/schema.prisma @@ -138,11 +138,6 @@ model User { firstName String /// @Validator.IsString() lastName String - // @deprecated: Use `firstName` and `lastName` instead - /// @Validator.IsString() - /// @Validator.IsOptional() - /// @TypeGraphQL.omit(input: false, output: true) - displayName String? /// @Validator.IsEmail() email String @unique /// @Validator.IsBoolean() diff --git a/server/src/decorators/prisma-select.decorator.ts b/server/src/decorators/prisma-select.decorator.ts index 4cbe1b659..69668ddcd 100644 --- a/server/src/decorators/prisma-select.decorator.ts +++ b/server/src/decorators/prisma-select.decorator.ts @@ -1,5 +1,6 @@ import { createParamDecorator, ExecutionContext } from '@nestjs/common'; import { GqlExecutionContext } from '@nestjs/graphql'; +import merge from 'lodash.merge'; import { PrismaSelect, ModelSelectMap, @@ -8,6 +9,14 @@ import { export { PrismaSelect }; +const globalDefaultFields: DefaultFieldsMap = { + User: { + // Needed for displayName resolve field + firstName: true, + lastName: true, + }, +}; + export const PrismaSelector = createParamDecorator( ( data: { @@ -20,7 +29,7 @@ export const PrismaSelector = createParamDecorator( const info = gqlCtx.getInfo(); return new PrismaSelect(data.modelName, info, { - defaultFields: data.defaultFields, + defaultFields: merge(globalDefaultFields, data.defaultFields), }); }, ); diff --git a/server/src/utils/prisma-select/index.ts b/server/src/utils/prisma-select/index.ts index 3d3af211b..abc89638c 100644 --- a/server/src/utils/prisma-select/index.ts +++ b/server/src/utils/prisma-select/index.ts @@ -44,9 +44,9 @@ export class PrismaSelect< mergeObject?: any, ) { if (typeof filterByOrMergeObject === 'string') { - return super.valueOf(field, filterByOrMergeObject, mergeObject); + return super.valueOf(field, filterByOrMergeObject, mergeObject).select; } else { - return super.valueOf(field, this.modelName, filterByOrMergeObject); + return super.valueOf(field, this.modelName, filterByOrMergeObject).select; } } diff --git a/server/yarn.lock b/server/yarn.lock index a96ebbebf..69a62222e 100644 --- a/server/yarn.lock +++ b/server/yarn.lock @@ -2872,6 +2872,13 @@ dependencies: "@types/lodash" "*" +"@types/lodash.merge@^4.6.7": + version "4.6.7" + resolved "https://registry.yarnpkg.com/@types/lodash.merge/-/lodash.merge-4.6.7.tgz#0af6555dd8bc6568ef73e5e0d820a027362946b1" + integrity sha512-OwxUJ9E50gw3LnAefSHJPHaBLGEKmQBQ7CZe/xflHkyy/wH2zVyEIAKReHvVrrn7zKdF58p16We9kMfh7v0RRQ== + dependencies: + "@types/lodash" "*" + "@types/lodash@*": version "4.14.195" resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.195.tgz#bafc975b252eb6cea78882ce8a7b6bf22a6de632" @@ -6238,7 +6245,7 @@ lodash.memoize@4.x: lodash.merge@^4.6.2: version "4.6.2" - resolved "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz" + resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== lodash.omit@4.5.0: