fix(amplify-graphql-auth-transformer, amplify-graphql-relational-tran…

…sformer, amplify-graphql-transformer-core): support custom primary key with relational directives (aws-amplify#462) * fix(amplify-graphql-auth-transformer, amplify-graphql-relational-transformer, amplify-graphql-transformer-core): support custom primary key with relational directives * fix: fixed refactor incorrect hanlding for filter vs connection input names * fix: merge build errors * fix: merge caused unit test failures * fix: merge caused e2e failures * fix: merge caused e2e failures * addressing PR feedback * fix: corrected allowed fields for relational fields with custom PK and restricted auth * fix: fixed imports and e2e feature flag initialization
marcvberg · Aug 12, 2022 · 5e5f66e · 5e5f66e
1 parent 4c107d2
commit 5e5f66e
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 8 deletions.
diff --git a/packages/amplify-graphql-relational-transformer/src/__tests__/test-helpers.ts b/packages/amplify-graphql-relational-transformer/src/__tests__/test-helpers.ts
@@ -1,6 +1,6 @@
 import { FeatureFlagProvider } from '@aws-amplify/graphql-transformer-interfaces';
-import {getBaseType} from "graphql-transformer-common";
-import {DirectiveNode, DocumentNode} from "graphql";
+import { getBaseType } from 'graphql-transformer-common';
+import { DirectiveNode, DocumentNode } from 'graphql';
 
 /**
  * Merges passed in feature flags with default feature flags for tests
@@ -15,7 +15,7 @@ export const featureFlags: FeatureFlagProvider = {
     }
     return defaultValue;
   },
- 
+
 
   getNumber: jest.fn(),
   getObject: jest.fn(),

diff --git a/packages/amplify-graphql-relational-transformer/src/graphql-has-one-transformer.ts b/packages/amplify-graphql-relational-transformer/src/graphql-has-one-transformer.ts
@@ -129,6 +129,12 @@ export class HasOneTransformer extends TransformerPluginBase {
                 [connectionAttributeName, ...sortKeyFields.map(skf => skf.name.value)],
               )) as WritableDraft<ArgumentNode>];
               addFieldsToDefinition(def, [connField, ...sortKeyFields]);
+              def?.fields?.push(
+                makeField(
+                  connectionAttributeName, [], isNonNullType(field.type)
+                    ? makeNonNullType(makeNamedType('ID')) : makeNamedType('ID'), [],
+                ) as WritableDraft<FieldDefinitionNode>,
+              );
             }
           });
         });

diff --git a/packages/amplify-graphql-schema-test-library/src/__tests__/index.test.ts b/packages/amplify-graphql-schema-test-library/src/__tests__/index.test.ts
@@ -25,7 +25,7 @@ const featureFlags: FeatureFlagProvider = {
     }
     return false;
   },
- 
+
 
   getNumber: jest.fn(),
   getObject: jest.fn(),
@@ -90,7 +90,7 @@ function createV2Transformer(options: Partial<Writeable<GraphQLTransformOptions>
       }
       return defaultValue;
     },
-   
+
 
     getNumber: jest.fn(),
     getObject: jest.fn(),

diff --git a/packages/graphql-transformers-e2e-tests/src/__tests__/BelongsToTransformerV2.e2e.test.ts b/packages/graphql-transformers-e2e-tests/src/__tests__/BelongsToTransformerV2.e2e.test.ts
@@ -16,7 +16,7 @@ describe('@belongsTo transformer', () => {
         }
         return defaultValue;
       },
-     
+
 
       getNumber: jest.fn(),
       getObject: jest.fn(),

diff --git a/packages/graphql-transformers-e2e-tests/src/__tests__/MapsToTransformer.e2e.test.ts b/packages/graphql-transformers-e2e-tests/src/__tests__/MapsToTransformer.e2e.test.ts
@@ -15,8 +15,6 @@ describe('@mapsTo transformer', () => {
           }
           return defaultValue;
         },
-
-
         getNumber: jest.fn(),
         getObject: jest.fn(),
       },
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,7 +16,7 @@ describe('@belongsTo transformer', () => { @@
             }
             return defaultValue;
           },
           getNumber: jest.fn(),
           getObject: jest.fn(),
@@ Expand Down @@