fix(amplify-codegen-appsync-model-plugin): pass targetName for hasOne…

… relationships (#6031)
aws-amplify · Dec 11, 2020 · dc6bb85 · dc6bb85
1 parent d452e83
commit dc6bb85
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/...ages/amplify-codegen-appsync-model-plugin/src/__tests__/utils/process-connections.test.ts b/...ages/amplify-codegen-appsync-model-plugin/src/__tests__/utils/process-connections.test.ts
@@ -126,6 +126,7 @@ describe('process connection', () => {
         expect(connectionInfo.kind).toEqual(CodeGenConnectionType.HAS_ONE);
         expect(connectionInfo.associatedWith).toEqual(modelMap.License.fields[0]);
         expect(connectionInfo.isConnectingFieldAutoCreated).toEqual(true);
+        expect(connectionInfo.targetName).toEqual("personLicenseId");
       });
 
       it('should return BELONGS_TO License.person field', () => {

diff --git a/packages/amplify-codegen-appsync-model-plugin/src/utils/process-connections.ts b/packages/amplify-codegen-appsync-model-plugin/src/utils/process-connections.ts
@@ -20,6 +20,7 @@ export type CodeGenFieldConnectionBelongsTo = CodeGenConnectionTypeBase & {
 export type CodeGenFieldConnectionHasOne = CodeGenConnectionTypeBase & {
   kind: CodeGenConnectionType.HAS_ONE;
   associatedWith: CodeGenField;
+  targetName: string;
 };
 
 export type CodeGenFieldConnectionHasMany = CodeGenConnectionTypeBase & {
@@ -186,6 +187,7 @@ export function processConnections(
             associatedWith: otherSideField,
             connectedModel: otherSide,
             isConnectingFieldAutoCreated,
+            targetName: connectionFields[0] || makeConnectionAttributeName(model.name, field.name),
           };
         } else {
           /*

diff --git a/packages/amplify-codegen-appsync-model-plugin/src/visitors/appsync-swift-visitor.ts b/packages/amplify-codegen-appsync-model-plugin/src/visitors/appsync-swift-visitor.ts
@@ -247,7 +247,7 @@ export class AppSyncSwiftVisitor extends AppSyncModelVisitor {
       if (connectionInfo.kind === CodeGenConnectionType.HAS_ONE) {
         return `.hasOne(${name}, is: ${isRequired}, ofType: ${typeName}, associatedWith: ${this.getModelName(
           connectionInfo.connectedModel,
-        )}.keys.${this.getFieldName(connectionInfo.associatedWith)})`;
+        )}.keys.${this.getFieldName(connectionInfo.associatedWith)}, targetName: "${connectionInfo.targetName}")`;
       }
       if (connectionInfo.kind === CodeGenConnectionType.BELONGS_TO) {
         return `.belongsTo(${name}, is: ${isRequired}, ofType: ${typeName}, targetName: "${connectionInfo.targetName}")`;