feat(base-model): update so that methods work if standard fields (cre…

…atedAt, deletedAt, etc...) don't exist (#407) * feat(base-model): update so that we don't require warthog decorators * feat(decorators): adds a bunch of new decorators
goldcaddy77 · Sep 6, 2020 · b7f2c5b · b7f2c5b
1 parent 51f75f6
commit b7f2c5b
Show file tree

Hide file tree

Showing 67 changed files with 5,406 additions and 651 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,6 @@
+<!-- https://keepachangelog.com/en/1.0.0/ -->
+
+## Unpublished
+
+- Removed `BaseResolver`
+- BaseService methods should no longer take a template type `<W extends WhereInput>`
diff --git a/examples/06-base-service/src/user.resolver.ts b/examples/06-base-service/src/user.resolver.ts
@@ -4,13 +4,7 @@ import { Repository } from 'typeorm';
 import { InjectRepository } from 'typeorm-typedi-extensions';
 
 import { BaseContext, BaseService, StandardDeleteResponse } from '../../../src';
-import {
-  UserCreateInput,
-  UserUpdateArgs,
-  UserWhereArgs,
-  UserWhereInput,
-  UserWhereUniqueInput
-} from '../generated';
+import { UserCreateInput, UserUpdateArgs, UserWhereArgs, UserWhereUniqueInput } from '../generated';
 
 import { User } from './user.model';
 import { UserService } from './user.service';
@@ -36,7 +30,7 @@ export class UserResolver {
 
   @Query(() => [User])
   async users(@Args() { where, orderBy, limit, offset }: UserWhereArgs): Promise<User[]> {
-    return this.injectedService.find<UserWhereInput>(where, orderBy, limit, offset);
+    return this.injectedService.find(where, orderBy, limit, offset);
   }
 
   @Query(() => User)

diff --git a/examples/07-feature-flags/src/environment/environment.resolver.ts b/examples/07-feature-flags/src/environment/environment.resolver.ts
@@ -6,7 +6,6 @@ import {
   EnvironmentCreateInput,
   EnvironmentUpdateArgs,
   EnvironmentWhereArgs,
-  EnvironmentWhereInput,
   EnvironmentWhereUniqueInput
 } from '../../generated';
 
@@ -59,7 +58,7 @@ export class EnvironmentResolver {
   async environments(
     @Args() { where, orderBy, limit, offset }: EnvironmentWhereArgs
   ): Promise<Environment[]> {
-    return this.service.find<EnvironmentWhereInput>(where, orderBy, limit, offset);
+    return this.service.find(where, orderBy, limit, offset);
   }
 
   @Query(() => Environment)

diff --git a/examples/07-feature-flags/src/feature-flag-segment/feature-flag-segment.resolver.ts b/examples/07-feature-flags/src/feature-flag-segment/feature-flag-segment.resolver.ts
@@ -6,7 +6,6 @@ import {
   FeatureFlagSegmentCreateInput,
   FeatureFlagSegmentUpdateArgs,
   FeatureFlagSegmentWhereArgs,
-  FeatureFlagSegmentWhereInput,
   FeatureFlagSegmentWhereUniqueInput
 } from '../../generated';
 
@@ -24,7 +23,7 @@ export class FeatureFlagSegmentResolver {
     @Args()
     { where, orderBy, limit, offset }: FeatureFlagSegmentWhereArgs
   ): Promise<FeatureFlagSegment[]> {
-    return this.service.find<FeatureFlagSegmentWhereInput>(where, orderBy, limit, offset);
+    return this.service.find(where, orderBy, limit, offset);
   }
 
   @Query(() => FeatureFlagSegment)

diff --git a/examples/07-feature-flags/src/feature-flag-user/feature-flag-user.resolver.ts b/examples/07-feature-flags/src/feature-flag-user/feature-flag-user.resolver.ts
@@ -6,7 +6,6 @@ import {
   FeatureFlagUserCreateInput,
   FeatureFlagUserUpdateArgs,
   FeatureFlagUserWhereArgs,
-  FeatureFlagUserWhereInput,
   FeatureFlagUserWhereUniqueInput
 } from '../../generated';
 
@@ -31,7 +30,7 @@ export class FeatureFlagUserResolver {
     @Args()
     { where, orderBy, limit, offset }: FeatureFlagUserWhereArgs
   ): Promise<FeatureFlagUser[]> {
-    return this.service.find<FeatureFlagUserWhereInput>(where, orderBy, limit, offset);
+    return this.service.find(where, orderBy, limit, offset);
   }
 
   @Query(() => FeatureFlagUser)

diff --git a/examples/07-feature-flags/src/feature-flag/feature-flag.resolver.ts b/examples/07-feature-flags/src/feature-flag/feature-flag.resolver.ts
@@ -17,7 +17,6 @@ import {
   FeatureFlagCreateInput,
   FeatureFlagUpdateArgs,
   FeatureFlagWhereArgs,
-  FeatureFlagWhereInput,
   FeatureFlagWhereUniqueInput
 } from '../../generated';
 
@@ -69,7 +68,7 @@ export class FeatureFlagResolver {
   async featureFlags(
     @Args() { where, orderBy, limit, offset }: FeatureFlagWhereArgs
   ): Promise<FeatureFlag[]> {
-    return this.service.find<FeatureFlagWhereInput>(where, orderBy, limit, offset);
+    return this.service.find(where, orderBy, limit, offset);
   }
 
   // Custom resolver that has it's own InputType and calls into custom service method

diff --git a/examples/07-feature-flags/src/project/project.resolver.ts b/examples/07-feature-flags/src/project/project.resolver.ts
@@ -6,7 +6,6 @@ import {
   ProjectCreateInput,
   ProjectUpdateArgs,
   ProjectWhereArgs,
-  ProjectWhereInput,
   ProjectWhereUniqueInput
 } from '../../generated';
 
@@ -62,7 +61,7 @@ export class ProjectResolver {
 
   @Query(() => [Project])
   async projects(@Args() { where, orderBy, limit, offset }: ProjectWhereArgs): Promise<Project[]> {
-    return this.service.find<ProjectWhereInput>(where, orderBy, limit, offset);
+    return this.service.find(where, orderBy, limit, offset);
   }
 
   @Query(() => Project)

diff --git a/examples/07-feature-flags/src/segment/segment.resolver.ts b/examples/07-feature-flags/src/segment/segment.resolver.ts
@@ -6,7 +6,6 @@ import {
   SegmentCreateInput,
   SegmentUpdateArgs,
   SegmentWhereArgs,
-  SegmentWhereInput,
   SegmentWhereUniqueInput
 } from '../../generated';
 
@@ -49,7 +48,7 @@ export class SegmentResolver {
 
   @Query(() => [Segment])
   async segments(@Args() { where, orderBy, limit, offset }: SegmentWhereArgs): Promise<Segment[]> {
-    return this.service.find<SegmentWhereInput>(where, orderBy, limit, offset);
+    return this.service.find(where, orderBy, limit, offset);
   }
 
   @Query(() => Segment)

diff --git a/examples/07-feature-flags/src/user-segment/user-segment.resolver.ts b/examples/07-feature-flags/src/user-segment/user-segment.resolver.ts
@@ -6,7 +6,6 @@ import {
   UserSegmentCreateInput,
   UserSegmentUpdateArgs,
   UserSegmentWhereArgs,
-  UserSegmentWhereInput,
   UserSegmentWhereUniqueInput
 } from '../../generated';
 
@@ -23,7 +22,7 @@ export class UserSegmentResolver {
   async userSegments(
     @Args() { where, orderBy, limit, offset }: UserSegmentWhereArgs
   ): Promise<UserSegment[]> {
-    return this.service.find<UserSegmentWhereInput>(where, orderBy, limit, offset);
+    return this.service.find(where, orderBy, limit, offset);
   }
 
   @Query(() => UserSegment)

diff --git a/examples/08-performance/src/modules/post/post.resolver.ts b/examples/08-performance/src/modules/post/post.resolver.ts
@@ -7,7 +7,6 @@ import {
   PostCreateManyArgs,
   PostUpdateArgs,
   PostWhereArgs,
-  PostWhereInput,
   PostWhereUniqueInput
 } from '../../../generated';
 
@@ -30,7 +29,7 @@ export class PostResolver {
     @Args() { where, orderBy, limit, offset }: PostWhereArgs,
     @Fields() fields: string[]
   ): Promise<Post[]> {
-    return this.service.find<PostWhereInput>(where, orderBy, limit, offset, fields);
+    return this.service.find(where, orderBy, limit, offset, fields);
   }
 
   @Query(() => Post)

diff --git a/examples/08-performance/src/modules/user/user.resolver.ts b/examples/08-performance/src/modules/user/user.resolver.ts
@@ -6,7 +6,6 @@ import {
   UserCreateInput,
   UserUpdateArgs,
   UserWhereArgs,
-  UserWhereInput,
   UserWhereUniqueInput
 } from '../../../generated';
 
@@ -26,7 +25,7 @@ export class UserResolver {
 
   @Query(() => [User])
   async users(@Args() { where, orderBy, limit, offset }: UserWhereArgs): Promise<User[]> {
-    return this.service.find<UserWhereInput>(where, orderBy, limit, offset);
+    return this.service.find(where, orderBy, limit, offset);
   }
 
   @Query(() => User)

diff --git a/examples/09-production/src/modules/post/post.resolver.ts b/examples/09-production/src/modules/post/post.resolver.ts
@@ -7,7 +7,6 @@ import {
   PostCreateManyArgs,
   PostUpdateArgs,
   PostWhereArgs,
-  PostWhereInput,
   PostWhereUniqueInput
 } from '../../../generated';
 
@@ -30,7 +29,7 @@ export class PostResolver {
     @Args() { where, orderBy, limit, offset }: PostWhereArgs,
     @Fields() fields: string[]
   ): Promise<Post[]> {
-    return this.service.find<PostWhereInput>(where, orderBy, limit, offset, fields);
+    return this.service.find(where, orderBy, limit, offset, fields);
   }
 
   @Query(() => Post)

diff --git a/examples/09-production/src/modules/user/user.resolver.ts b/examples/09-production/src/modules/user/user.resolver.ts
@@ -6,7 +6,6 @@ import {
   UserCreateInput,
   UserUpdateArgs,
   UserWhereArgs,
-  UserWhereInput,
   UserWhereUniqueInput
 } from '../../../generated';
 
@@ -26,7 +25,7 @@ export class UserResolver {
 
   @Query(() => [User])
   async users(@Args() { where, orderBy, limit, offset }: UserWhereArgs): Promise<User[]> {
-    return this.service.find<UserWhereInput>(where, orderBy, limit, offset);
+    return this.service.find(where, orderBy, limit, offset);
   }
 
   @Query(() => User)

diff --git a/examples/10-subscriptions/src/user.resolver.ts b/examples/10-subscriptions/src/user.resolver.ts
@@ -5,9 +5,7 @@ import {
   Arg,
   Args,
   Ctx,
-  // Field,
   Mutation,
-  // ObjectType,
   PubSub,
   Query,
   Resolver,
@@ -17,13 +15,7 @@ import {
 import { Inject } from 'typedi';
 
 import { BaseContext, StandardDeleteResponse } from '../../../src';
-import {
-  UserCreateInput,
-  UserUpdateArgs,
-  UserWhereArgs,
-  UserWhereInput,
-  UserWhereUniqueInput
-} from '../generated';
+import { UserCreateInput, UserUpdateArgs, UserWhereArgs, UserWhereUniqueInput } from '../generated';
 
 import { User } from './user.model';
 import { UserService } from './user.service';
@@ -43,7 +35,7 @@ export class UserResolver {
 
   @Query(() => [User])
   async users(@Args() { where, orderBy, limit, offset }: UserWhereArgs): Promise<User[]> {
-    return this.service.find<UserWhereInput>(where, orderBy, limit, offset);
+    return this.service.find(where, orderBy, limit, offset);
   }
 
   @Query(() => User)

diff --git a/examples/11-transactions/src/user.resolver.ts b/examples/11-transactions/src/user.resolver.ts
@@ -3,7 +3,7 @@ import { Inject } from 'typedi';
 
 import { BaseContext } from '../../../src';
 
-import { UserCreateInput, UserWhereArgs, UserWhereInput } from '../generated';
+import { UserCreateInput, UserWhereArgs } from '../generated';
 
 import { User } from './user.model';
 import { UserService } from './user.service';
@@ -14,7 +14,7 @@ export class UserResolver {
 
   @Query(() => [User])
   async users(@Args() { where, orderBy, limit, offset }: UserWhereArgs): Promise<User[]> {
-    return this.service.find<UserWhereInput>(where, orderBy, limit, offset);
+    return this.service.find(where, orderBy, limit, offset);
   }
 
   // If this was User instead of [User] you get "Cannot return null for non-nullable field User.id"

diff --git a/examples/14-base-service-v2/.env b/examples/14-base-service-v2/.env
@@ -0,0 +1,9 @@
+NODE_ENV=development
+PGUSER=postgres
+WARTHOG_APP_HOST=localhost
+WARTHOG_APP_PORT=4100
+WARTHOG_DB_DATABASE=warthog-14-base-service-v2
+WARTHOG_DB_USERNAME=postgres
+WARTHOG_DB_PASSWORD=
+WARTHOG_DB_SYNCHRONIZE=true
+WARTHOG_SUBSCRIPTIONS=true
diff --git a/examples/14-base-service-v2/README.md b/examples/14-base-service-v2/README.md
@@ -0,0 +1,20 @@
+## Example 11
+
+## Setup
+
+Run `yarn bootstrap && yarn start`
+
+## Bootstrapping the App
+
+Running `DEBUG=* yarn bootstrap` will do the following:
+
+- Install packages
+- Create the example DB
+- Seed the database with test data
+
+## Running the App
+
+To run the project, run `yarn start`. This will:
+
+- Run the API server
+- Open GraphQL Playground