fix: Model types mismatch

closes: unlight#21
resident-advisor · Apr 25, 2021 · ffe70b6 · ffe70b6
1 parent 7197d6c
commit ffe70b6
Show file tree

Hide file tree

Showing 45 changed files with 402 additions and 246 deletions.
diff --git a/package.json b/package.json
@@ -112,6 +112,7 @@
     "precise-commits": "^1.0.2",
     "prettier": "^2.2.1",
     "prisma": "2.21.2",
+    "prisma-graphql-type-decimal": "^1.0.0",
     "reflect-metadata": "^0.1.13",
     "rxjs": "^6.6.7",
     "semantic-release": "^17.4.2",

diff --git a/prisma/schema.prisma b/prisma/schema.prisma
@@ -77,6 +77,7 @@ enum Role {
 
 model Dummy {
   id      String   @id
+  created DateTime @default(now())
   floaty  Float
   int     Int?
   float   Float?

diff --git a/src/@generated/article/article.model.ts b/src/@generated/article/article.model.ts
@@ -23,13 +23,13 @@ export class Article {
     body!: string;
 
     @Field(() => [Tag], { nullable: true })
-    tags?: Array<Tag>;
+    tags!: Array<Tag>;
 
     @Field(() => Date, { nullable: false })
-    createdAt!: Date | string;
+    createdAt!: Date;
 
     @Field(() => Date, { nullable: false })
-    updatedAt!: Date | string;
+    updatedAt!: Date;
 
     @Field(() => Int, { nullable: false, defaultValue: 0 })
     favoritesCount!: number;
@@ -41,14 +41,14 @@ export class Article {
     authorId!: string;
 
     @Field(() => [User], { nullable: true })
-    favoritedBy?: Array<User>;
+    favoritedBy!: Array<User>;
 
     @Field(() => [Comment], { nullable: true })
-    comments?: Array<Comment>;
+    comments!: Array<Comment>;
 
     @Field(() => Boolean, { nullable: true, defaultValue: true })
-    active?: boolean;
+    active!: boolean | null;
 
     @Field(() => ArticleCount, { nullable: true })
-    _count?: ArticleCount;
+    _count!: ArticleCount;
 }
diff --git a/src/@generated/comment/comment.model.ts b/src/@generated/comment/comment.model.ts
@@ -9,10 +9,10 @@ export class Comment {
     id!: string;
 
     @Field(() => Date, { nullable: false })
-    createdAt!: Date | string;
+    createdAt!: Date;
 
     @Field(() => Date, { nullable: false })
-    updatedAt!: Date | string;
+    updatedAt!: Date;
 
     @Field(() => String, { nullable: false })
     body!: string;
@@ -24,8 +24,8 @@ export class Comment {
     authorId!: string;
 
     @Field(() => Article, { nullable: true })
-    article?: Article;
+    article!: Article;
 
     @Field(() => String, { nullable: true })
-    articleId?: string;
+    articleId!: string | null;
 }
diff --git a/src/@generated/dummy/dummy-avg-aggregate.output.ts b/src/@generated/dummy/dummy-avg-aggregate.output.ts
@@ -1,4 +1,5 @@
 import { Field, Float, ObjectType } from '@nestjs/graphql';
+import { GraphQLDecimal } from 'prisma-graphql-type-decimal';
 
 @ObjectType()
 export class DummyAvgAggregate {
@@ -11,8 +12,8 @@ export class DummyAvgAggregate {
     @Field(() => Float, { nullable: true })
     float?: number;
 
-    @Field(() => String, { nullable: true })
-    decimal?: number | string;
+    @Field(() => GraphQLDecimal, { nullable: true })
+    decimal?: any;
 
     @Field(() => Float, { nullable: true })
     bigInt?: number;

diff --git a/src/@generated/dummy/dummy-count-aggregate.input.ts b/src/@generated/dummy/dummy-count-aggregate.input.ts
@@ -5,6 +5,9 @@ export class DummyCountAggregateInput {
     @Field(() => Boolean, { nullable: true })
     id?: true;
 
+    @Field(() => Boolean, { nullable: true })
+    created?: true;
+
     @Field(() => Boolean, { nullable: true })
     floaty?: true;
 

diff --git a/src/@generated/dummy/dummy-count-aggregate.output.ts b/src/@generated/dummy/dummy-count-aggregate.output.ts
@@ -5,6 +5,9 @@ export class DummyCountAggregate {
     @Field(() => Int, { nullable: false })
     id!: number;
 
+    @Field(() => Int, { nullable: false })
+    created!: number;
+
     @Field(() => Int, { nullable: false })
     floaty!: number;
 

diff --git a/src/@generated/dummy/dummy-create-many.input.ts b/src/@generated/dummy/dummy-create-many.input.ts
@@ -1,11 +1,15 @@
 import { Field, Float, InputType, Int } from '@nestjs/graphql';
 import { GraphQLJSON } from 'graphql-type-json';
+import { GraphQLDecimal } from 'prisma-graphql-type-decimal';
 
 @InputType()
 export class DummyCreateManyInput {
     @Field(() => String, { nullable: false })
     id!: string;
 
+    @Field(() => Date, { nullable: true })
+    created?: Date | string;
+
     @Field(() => Float, { nullable: false })
     floaty!: number;
 
@@ -18,8 +22,8 @@ export class DummyCreateManyInput {
     @Field(() => String, { nullable: true })
     bytes?: Buffer;
 
-    @Field(() => String, { nullable: true })
-    decimal?: number | string;
+    @Field(() => GraphQLDecimal, { nullable: true })
+    decimal?: any;
 
     @Field(() => String, { nullable: true })
     bigInt?: bigint | number;

diff --git a/src/@generated/dummy/dummy-create.input.ts b/src/@generated/dummy/dummy-create.input.ts
@@ -1,11 +1,15 @@
 import { Field, Float, InputType, Int } from '@nestjs/graphql';
 import { GraphQLJSON } from 'graphql-type-json';
+import { GraphQLDecimal } from 'prisma-graphql-type-decimal';
 
 @InputType()
 export class DummyCreateInput {
     @Field(() => String, { nullable: false })
     id!: string;
 
+    @Field(() => Date, { nullable: true })
+    created?: Date | string;
+
     @Field(() => Float, { nullable: false })
     floaty!: number;
 
@@ -18,8 +22,8 @@ export class DummyCreateInput {
     @Field(() => String, { nullable: true })
     bytes?: Buffer;
 
-    @Field(() => String, { nullable: true })
-    decimal?: number | string;
+    @Field(() => GraphQLDecimal, { nullable: true })
+    decimal?: any;
 
     @Field(() => String, { nullable: true })
     bigInt?: bigint | number;

diff --git a/src/@generated/dummy/dummy-group-by.output.ts b/src/@generated/dummy/dummy-group-by.output.ts
@@ -1,5 +1,6 @@
 import { Field, Float, Int, ObjectType } from '@nestjs/graphql';
 import { GraphQLJSON } from 'graphql-type-json';
+import { GraphQLDecimal } from 'prisma-graphql-type-decimal';
 
 import { DummyAvgAggregate } from './dummy-avg-aggregate.output';
 import { DummyCountAggregate } from './dummy-count-aggregate.output';
@@ -12,6 +13,9 @@ export class DummyGroupBy {
     @Field(() => String, { nullable: false })
     id!: string;
 
+    @Field(() => Date, { nullable: false })
+    created!: Date | string;
+
     @Field(() => Float, { nullable: false })
     floaty!: number;
 
@@ -24,8 +28,8 @@ export class DummyGroupBy {
     @Field(() => String, { nullable: true })
     bytes?: Buffer;
 
-    @Field(() => String, { nullable: true })
-    decimal?: number | string;
+    @Field(() => GraphQLDecimal, { nullable: true })
+    decimal?: any;
 
     @Field(() => String, { nullable: true })
     bigInt?: bigint | number;

diff --git a/src/@generated/dummy/dummy-max-aggregate.input.ts b/src/@generated/dummy/dummy-max-aggregate.input.ts
@@ -5,6 +5,9 @@ export class DummyMaxAggregateInput {
     @Field(() => Boolean, { nullable: true })
     id?: true;
 
+    @Field(() => Boolean, { nullable: true })
+    created?: true;
+
     @Field(() => Boolean, { nullable: true })
     floaty?: true;
 

diff --git a/src/@generated/dummy/dummy-max-aggregate.output.ts b/src/@generated/dummy/dummy-max-aggregate.output.ts
@@ -1,10 +1,14 @@
 import { Field, Float, Int, ObjectType } from '@nestjs/graphql';
+import { GraphQLDecimal } from 'prisma-graphql-type-decimal';
 
 @ObjectType()
 export class DummyMaxAggregate {
     @Field(() => String, { nullable: true })
     id?: string;
 
+    @Field(() => Date, { nullable: true })
+    created?: Date | string;
+
     @Field(() => Float, { nullable: true })
     floaty?: number;
 
@@ -17,8 +21,8 @@ export class DummyMaxAggregate {
     @Field(() => String, { nullable: true })
     bytes?: Buffer;
 
-    @Field(() => String, { nullable: true })
-    decimal?: number | string;
+    @Field(() => GraphQLDecimal, { nullable: true })
+    decimal?: any;
 
     @Field(() => String, { nullable: true })
     bigInt?: bigint | number;

diff --git a/src/@generated/dummy/dummy-min-aggregate.input.ts b/src/@generated/dummy/dummy-min-aggregate.input.ts
@@ -5,6 +5,9 @@ export class DummyMinAggregateInput {
     @Field(() => Boolean, { nullable: true })
     id?: true;
 
+    @Field(() => Boolean, { nullable: true })
+    created?: true;
+
     @Field(() => Boolean, { nullable: true })
     floaty?: true;
 

diff --git a/src/@generated/dummy/dummy-min-aggregate.output.ts b/src/@generated/dummy/dummy-min-aggregate.output.ts
@@ -1,10 +1,14 @@
 import { Field, Float, Int, ObjectType } from '@nestjs/graphql';
+import { GraphQLDecimal } from 'prisma-graphql-type-decimal';
 
 @ObjectType()
 export class DummyMinAggregate {
     @Field(() => String, { nullable: true })
     id?: string;
 
+    @Field(() => Date, { nullable: true })
+    created?: Date | string;
+
     @Field(() => Float, { nullable: true })
     floaty?: number;
 
@@ -17,8 +21,8 @@ export class DummyMinAggregate {
     @Field(() => String, { nullable: true })
     bytes?: Buffer;
 
-    @Field(() => String, { nullable: true })
-    decimal?: number | string;
+    @Field(() => GraphQLDecimal, { nullable: true })
+    decimal?: any;
 
     @Field(() => String, { nullable: true })
     bigInt?: bigint | number;

diff --git a/src/@generated/dummy/dummy-order-by-with-relation.input.ts b/src/@generated/dummy/dummy-order-by-with-relation.input.ts
@@ -7,6 +7,9 @@ export class DummyOrderByWithRelationInput {
     @Field(() => SortOrder, { nullable: true })
     id?: SortOrder;
 
+    @Field(() => SortOrder, { nullable: true })
+    created?: SortOrder;
+
     @Field(() => SortOrder, { nullable: true })
     floaty?: SortOrder;
 

diff --git a/src/@generated/dummy/dummy-order-by.input.ts b/src/@generated/dummy/dummy-order-by.input.ts
@@ -7,6 +7,9 @@ export class DummyOrderByInput {
     @Field(() => SortOrder, { nullable: true })
     id?: SortOrder;
 
+    @Field(() => SortOrder, { nullable: true })
+    created?: SortOrder;
+
     @Field(() => SortOrder, { nullable: true })
     floaty?: SortOrder;
 

diff --git a/src/@generated/dummy/dummy-scalar-field.enum.ts b/src/@generated/dummy/dummy-scalar-field.enum.ts
@@ -2,6 +2,7 @@ import { registerEnumType } from '@nestjs/graphql';
 
 export enum DummyScalarFieldEnum {
     id = 'id',
+    created = 'created',
     floaty = 'floaty',
     int = 'int',
     float = 'float',

diff --git a/src/@generated/dummy/dummy-scalar-where-with-aggregates.input.ts b/src/@generated/dummy/dummy-scalar-where-with-aggregates.input.ts
@@ -2,6 +2,7 @@ import { Field, InputType } from '@nestjs/graphql';
 
 import { BigIntNullableWithAggregatesFilter } from '../prisma/big-int-nullable-with-aggregates-filter.input';
 import { BytesNullableWithAggregatesFilter } from '../prisma/bytes-nullable-with-aggregates-filter.input';
+import { DateTimeWithAggregatesFilter } from '../prisma/date-time-with-aggregates-filter.input';
 import { DecimalNullableWithAggregatesFilter } from '../prisma/decimal-nullable-with-aggregates-filter.input';
 import { FloatNullableWithAggregatesFilter } from '../prisma/float-nullable-with-aggregates-filter.input';
 import { FloatWithAggregatesFilter } from '../prisma/float-with-aggregates-filter.input';
@@ -23,6 +24,9 @@ export class DummyScalarWhereWithAggregatesInput {
     @Field(() => StringWithAggregatesFilter, { nullable: true })
     id?: StringWithAggregatesFilter;
 
+    @Field(() => DateTimeWithAggregatesFilter, { nullable: true })
+    created?: DateTimeWithAggregatesFilter;
+
     @Field(() => FloatWithAggregatesFilter, { nullable: true })
     floaty?: FloatWithAggregatesFilter;
 

diff --git a/src/@generated/dummy/dummy-sum-aggregate.output.ts b/src/@generated/dummy/dummy-sum-aggregate.output.ts
@@ -1,4 +1,5 @@
 import { Field, Float, Int, ObjectType } from '@nestjs/graphql';
+import { GraphQLDecimal } from 'prisma-graphql-type-decimal';
 
 @ObjectType()
 export class DummySumAggregate {
@@ -11,8 +12,8 @@ export class DummySumAggregate {
     @Field(() => Float, { nullable: true })
     float?: number;
 
-    @Field(() => String, { nullable: true })
-    decimal?: number | string;
+    @Field(() => GraphQLDecimal, { nullable: true })
+    decimal?: any;
 
     @Field(() => String, { nullable: true })
     bigInt?: bigint | number;

diff --git a/src/@generated/dummy/dummy-unchecked-create.input.ts b/src/@generated/dummy/dummy-unchecked-create.input.ts
@@ -1,11 +1,15 @@
 import { Field, Float, InputType, Int } from '@nestjs/graphql';
 import { GraphQLJSON } from 'graphql-type-json';
+import { GraphQLDecimal } from 'prisma-graphql-type-decimal';
 
 @InputType()
 export class DummyUncheckedCreateInput {
     @Field(() => String, { nullable: false })
     id!: string;
 
+    @Field(() => Date, { nullable: true })
+    created?: Date | string;
+
     @Field(() => Float, { nullable: false })
     floaty!: number;
 
@@ -18,8 +22,8 @@ export class DummyUncheckedCreateInput {
     @Field(() => String, { nullable: true })
     bytes?: Buffer;
 
-    @Field(() => String, { nullable: true })
-    decimal?: number | string;
+    @Field(() => GraphQLDecimal, { nullable: true })
+    decimal?: any;
 
     @Field(() => String, { nullable: true })
     bigInt?: bigint | number;

diff --git a/src/@generated/dummy/dummy-unchecked-update-many.input.ts b/src/@generated/dummy/dummy-unchecked-update-many.input.ts
@@ -1,6 +1,7 @@
 import { Field, InputType } from '@nestjs/graphql';
 import { GraphQLJSON } from 'graphql-type-json';
 
+import { DateTimeFieldUpdateOperationsInput } from '../prisma/date-time-field-update-operations.input';
 import { FloatFieldUpdateOperationsInput } from '../prisma/float-field-update-operations.input';
 import { NullableBigIntFieldUpdateOperationsInput } from '../prisma/nullable-big-int-field-update-operations.input';
 import { NullableBytesFieldUpdateOperationsInput } from '../prisma/nullable-bytes-field-update-operations.input';
@@ -14,6 +15,9 @@ export class DummyUncheckedUpdateManyInput {
     @Field(() => StringFieldUpdateOperationsInput, { nullable: true })
     id?: StringFieldUpdateOperationsInput;
 
+    @Field(() => DateTimeFieldUpdateOperationsInput, { nullable: true })
+    created?: DateTimeFieldUpdateOperationsInput;
+
     @Field(() => FloatFieldUpdateOperationsInput, { nullable: true })
     floaty?: FloatFieldUpdateOperationsInput;
 

diff --git a/src/@generated/dummy/dummy-unchecked-update.input.ts b/src/@generated/dummy/dummy-unchecked-update.input.ts
@@ -1,6 +1,7 @@
 import { Field, InputType } from '@nestjs/graphql';
 import { GraphQLJSON } from 'graphql-type-json';
 
+import { DateTimeFieldUpdateOperationsInput } from '../prisma/date-time-field-update-operations.input';
 import { FloatFieldUpdateOperationsInput } from '../prisma/float-field-update-operations.input';
 import { NullableBigIntFieldUpdateOperationsInput } from '../prisma/nullable-big-int-field-update-operations.input';
 import { NullableBytesFieldUpdateOperationsInput } from '../prisma/nullable-bytes-field-update-operations.input';
@@ -14,6 +15,9 @@ export class DummyUncheckedUpdateInput {
     @Field(() => StringFieldUpdateOperationsInput, { nullable: true })
     id?: StringFieldUpdateOperationsInput;
 
+    @Field(() => DateTimeFieldUpdateOperationsInput, { nullable: true })
+    created?: DateTimeFieldUpdateOperationsInput;
+
     @Field(() => FloatFieldUpdateOperationsInput, { nullable: true })
     floaty?: FloatFieldUpdateOperationsInput;